From d1ab8046f9c23cdd704fa41087b1c834b0f63293 Mon Sep 17 00:00:00 2001
From: shenjianxing <”315615051@qq.com“>
Date: Wed, 26 Mar 2025 15:19:30 +0800
Subject: [PATCH] =?UTF-8?q?UITools=E6=94=AF=E6=8C=81=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E6=AC=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Scripts/Actions/UIToolsAction.cs |  7 +++++++
 Assets/Scripts/UI/UITools.cs            | 21 +++++++++++++++++----
 Assets/Scripts/Xml/XmlParser.cs         |  5 +++++
 3 files changed, 29 insertions(+), 4 deletions(-)

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<string, string> 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<UITools>(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<string> 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<StepStatusOnChange>(OnStepChanged).UnRegisterWhenDisabled(gameObject);
             if (mData.totalScore > 0)
             {
@@ -90,6 +93,7 @@ namespace QFramework.Example
                 Button btn = obj.GetComponent<Button>();
                 btn.onClick.AddListener(() =>
                 {
+
                     if (answers != null)
                     {
                         if (answers.Contains(item.Name))
@@ -122,7 +126,10 @@ namespace QFramework.Example
                                 {
                                     if (string.IsNullOrEmpty(mData.rightEvent) == false)
                                     {
-                                        StringEventSystem.Global.Send(mData.rightEvent);
+                                        if (curErrorCount >= mData.errorCount)
+                                        {
+                                            StringEventSystem.Global.Send(mData.rightEvent);
+                                        }
                                     }
                                 }
                             }
@@ -140,7 +147,10 @@ namespace QFramework.Example
 
                                     if (string.IsNullOrEmpty(mData.wrongEvent) == false)
                                     {
-                                        StringEventSystem.Global.Send(mData.wrongEvent);
+                                        if (curErrorCount >= mData.errorCount)
+                                        {
+                                            StringEventSystem.Global.Send(mData.wrongEvent);
+                                        }
                                     }
                                     SetSelected(obj, false);
                                 };
@@ -151,14 +161,17 @@ namespace QFramework.Example
                             {
                                 if (string.IsNullOrEmpty(mData.wrongEvent) == false)
                                 {
-                                    StringEventSystem.Global.Send(mData.wrongEvent);
+                                    if (curErrorCount >= mData.errorCount)
+                                    {
+                                        StringEventSystem.Global.Send(mData.wrongEvent);
+                                    }
                                 }
                                 SetSelected(obj, false);
 
                             }
                         }
                     }
-
+                    this.curErrorCount++;
                 });
             }
             mResLoader.LoadAsync();
diff --git a/Assets/Scripts/Xml/XmlParser.cs b/Assets/Scripts/Xml/XmlParser.cs
index 580bf747..57bac02a 100644
--- a/Assets/Scripts/Xml/XmlParser.cs
+++ b/Assets/Scripts/Xml/XmlParser.cs
@@ -592,6 +592,11 @@ namespace XMLTool
                         {
                             act.args.Add("position", position.Value);
                         }
+                        var errorCount = action.Attribute("errorCount");
+                        if (errorCount != null)
+                        {
+                            act.args.Add("errorCount", errorCount.Value);
+                        }
                         newAction = act;
                     }
                     break;