diff --git a/Assets/Scripts/Actions/UIToolsAction.cs b/Assets/Scripts/Actions/UIToolsAction.cs index b230c731..d9cd82f7 100644 --- a/Assets/Scripts/Actions/UIToolsAction.cs +++ b/Assets/Scripts/Actions/UIToolsAction.cs @@ -29,6 +29,7 @@ public class UIToolsAction : IAction string random; string scrollSpeed; string position; + string errorCount; public static UIToolsAction Allocate(Dictionary datas, System.Action onDelayFinish = null) { var retNode = mPool.Allocate(); @@ -50,6 +51,7 @@ public class UIToolsAction : IAction retNode.random = datas.ContainsKey("random") ? datas["random"] : ""; retNode.scrollSpeed = datas.ContainsKey("scrollSpeed") ? datas["scrollSpeed"] : ""; retNode.position = datas.ContainsKey("position") ? datas["position"] : ""; + retNode.errorCount = datas.ContainsKey("errorCount") ? datas["errorCount"] : ""; return retNode; } @@ -100,6 +102,11 @@ public class UIToolsAction : IAction data.autoHideResult = -1; } data.position = position; + if (int.TryParse(errorCount, out data.errorCount) == false) + { + data.errorCount = 0; + } + UIKit.OpenPanelAsync(uiData: data, canvasLevel: UILevel.PopUI).ToAction().StartGlobal(() => this.Finish()); } diff --git a/Assets/Scripts/UI/UITools.cs b/Assets/Scripts/UI/UITools.cs index 1ceeaa42..d42e4ae6 100644 --- a/Assets/Scripts/UI/UITools.cs +++ b/Assets/Scripts/UI/UITools.cs @@ -26,11 +26,13 @@ namespace QFramework.Example public bool random = false; public float scrollSpeed = 25; public string position; + public int errorCount = 0; } public partial class UITools : UIPanel { ResLoader mResLoader; public List answers; + int curErrorCount = 0; protected override void OnInit(IUIData uiData = null) { mData = uiData as UIToolsData ?? new UIToolsData(); @@ -47,6 +49,7 @@ namespace QFramework.Example protected override void OnOpen(IUIData uiData = null) { mData = uiData as UIToolsData ?? new UIToolsData(); + curErrorCount = 0; TypeEventSystem.Global.Register(OnStepChanged).UnRegisterWhenDisabled(gameObject); if (mData.totalScore > 0) { @@ -90,6 +93,7 @@ namespace QFramework.Example Button btn = obj.GetComponent