diff --git a/Assets/Scripts/Actions/ActionHelper.cs b/Assets/Scripts/Actions/ActionHelper.cs index 2123075d..0db5a7fc 100644 --- a/Assets/Scripts/Actions/ActionHelper.cs +++ b/Assets/Scripts/Actions/ActionHelper.cs @@ -142,8 +142,8 @@ public class ActionHelper } case "TipWindow": { - var strAction = (XMLTool.StringListAction)act; - return TipWindowAction.Allocate(act.Value, strAction.args[0], strAction.args[1]); + var strAction = (XMLTool.DictionaryAction)act; + return TipWindowAction.Allocate(act.Value, strAction.args); } case "TextTip": { diff --git a/Assets/Scripts/Actions/TipWindowAction.cs b/Assets/Scripts/Actions/TipWindowAction.cs index e7a5540c..2c987f51 100644 --- a/Assets/Scripts/Actions/TipWindowAction.cs +++ b/Assets/Scripts/Actions/TipWindowAction.cs @@ -15,17 +15,15 @@ public class TipWindowAction : IAction private static readonly SimpleObjectPool mPool = new SimpleObjectPool(() => new TipWindowAction(), null, 10); string text = string.Empty; - string btns = string.Empty; - string audio = string.Empty; - public static TipWindowAction Allocate(string text, string audio, string btns, System.Action onDelayFinish = null) + Dictionary datas; + public static TipWindowAction Allocate(string text, Dictionary datas, System.Action onDelayFinish = null) { var retNode = mPool.Allocate(); retNode.ActionID = ActionKit.ID_GENERATOR++; retNode.Deinited = false; retNode.Reset(); retNode.text = text; - retNode.btns = btns; - retNode.audio = audio; + retNode.datas = datas; return retNode; } @@ -52,12 +50,15 @@ public class TipWindowAction : IAction { UITipWindowData data = new UITipWindowData(); data.txt = text; - var btnText = btns.Split(',').ToList(); - foreach (var item in btnText) + var btnText = datas.ContainsKey("btns") ? datas["btns"].Split(',').ToList() : null; + if (btnText != null) { - data.btns.Add(new UITipWindowData.ItemData() { txt = item }); + foreach (var item in btnText) + { + data.btns.Add(new UITipWindowData.ItemData() { txt = item }); + } } - data.audio = audio; + data.audio = datas.ContainsKey("audio") ? datas["audio"] : null; UIKit.OpenPanelAsync(uiData: data, canvasLevel: UILevel.PopUI).ToAction().StartGlobal(() => this.Finish()); }