From badd820b23489c0af684ed075361e5a1d7332236 Mon Sep 17 00:00:00 2001
From: shenjianxing <”315615051@qq.com“>
Date: Wed, 18 Dec 2024 11:17:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A9=E5=B1=95=E5=8A=A8=E7=94=BBAction=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9Ereset=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Scripts/Actions/ActionBase.cs      |  4 ----
 Assets/Scripts/Actions/ActionHelper.cs    |  6 ++++--
 Assets/Scripts/Actions/AnimationAction.cs | 10 ++++++++--
 Assets/Scripts/Xml/XmlParser.cs           | 22 ++++++++++++++++++++--
 Doc/Xml配置文档.xml                       |  4 ++--
 5 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/Assets/Scripts/Actions/ActionBase.cs b/Assets/Scripts/Actions/ActionBase.cs
index 140d45dc..b1dafcd9 100644
--- a/Assets/Scripts/Actions/ActionBase.cs
+++ b/Assets/Scripts/Actions/ActionBase.cs
@@ -10,10 +10,6 @@ namespace XMLTool
         public float time;
     }
 
-    public class AnimationAction : Action
-    {
-        public string animName;
-    }
 
 
     public class StringListAction : Action
diff --git a/Assets/Scripts/Actions/ActionHelper.cs b/Assets/Scripts/Actions/ActionHelper.cs
index d39d6ed1..17c96bef 100644
--- a/Assets/Scripts/Actions/ActionHelper.cs
+++ b/Assets/Scripts/Actions/ActionHelper.cs
@@ -99,8 +99,10 @@ public class ActionHelper
                     case "Btns":
                         return BtnsAction.Allocate(act.Value);
                     case "Anim":
-                        var anim = (XMLTool.AnimationAction)act;
-                        return QFramework.AnimationAction.Allocate(anim.Value, anim.animName);
+                        {
+                            var strAction = (XMLTool.StringListAction)act;
+                            return QFramework.AnimationAction.Allocate(act.Value, strAction.args[0], strAction.args[1]);
+                        }
                     case "UITools":
                         {
                             var strAction = (XMLTool.StringListAction)act;
diff --git a/Assets/Scripts/Actions/AnimationAction.cs b/Assets/Scripts/Actions/AnimationAction.cs
index 8f976538..c211d434 100644
--- a/Assets/Scripts/Actions/AnimationAction.cs
+++ b/Assets/Scripts/Actions/AnimationAction.cs
@@ -20,15 +20,17 @@ namespace QFramework
 
         string path;
         string animName;
+        bool reset = false;
         Animation anim;
-        public static AnimationAction Allocate(string path, string animName, System.Action OnFinished = null)
+        public static AnimationAction Allocate(string path, string animName, string reset, System.Action OnFinished = null)
         {
             var retNode = mPool.Allocate();
             retNode.ActionID = ActionKit.ID_GENERATOR++;
             retNode.Deinited = false;
+            retNode.Reset();
             retNode.path = path;
             retNode.animName = animName;
-            retNode.Reset();
+            bool.TryParse(reset, out retNode.reset);
             retNode.OnFinished = OnFinished;
             return retNode;
         }
@@ -44,6 +46,10 @@ namespace QFramework
             {
                 anim = obj.GetComponent<Animation>();
                 anim.Play(animName);
+                if (reset)
+                {
+                    ActionKit.DelayFrame(1, () => anim.Stop());
+                }
             }
             else
             {
diff --git a/Assets/Scripts/Xml/XmlParser.cs b/Assets/Scripts/Xml/XmlParser.cs
index 8d9f385c..eb047213 100644
--- a/Assets/Scripts/Xml/XmlParser.cs
+++ b/Assets/Scripts/Xml/XmlParser.cs
@@ -317,8 +317,26 @@ namespace XMLTool
                     break;
                 case "Anim":
                     {
-                        var act = new AnimationAction();
-                        act.animName = action.Attribute("animName").Value;
+                        var act = new StringListAction();
+                        var animName = action.Attribute("animName");
+                        if (animName != null)
+                        {
+                            act.args.Add(animName.Value);
+                        }
+                        else
+                        {
+                            act.args.Add("");
+                        }
+                        var reset = action.Attribute("reset");
+                        if (reset != null)
+                        {
+                            act.args.Add(reset.Value);
+                        }
+                        else
+                        {
+                            act.args.Add("false");
+                        }
+
                         newAction = act;
                     }
                     break;
diff --git a/Doc/Xml配置文档.xml b/Doc/Xml配置文档.xml
index 1d08b8b7..63d97c07 100644
--- a/Doc/Xml配置文档.xml
+++ b/Doc/Xml配置文档.xml
@@ -15,8 +15,8 @@
 	<Action type="Rotate" value="Main Camera" to="0,180,0" time="0"></Action>
 	<!--执行下一步左侧步骤列表 默认开始的时候为-1步 要主动调用一次才到第1步-->
 	<Action type="NextOperation"></Action>
-	<!--播放动画-->
-	<Action type="Anim" value="物体路径" animName="动画名字"></Action>
+	<!--播放动画 reset=true则动画停在第一帧-->
+	<Action type="Anim" value="物体路径" animName="动画名字" reset="false"></Action>
 	<!--右下角生成按钮 可生成多个 用逗号分开-->
 	<Action type="Btns" value="按钮1,按钮2,按钮3"></Action>
 	<!--用于右侧道具栏选择正确的道具 event用于配合StrEventCondition 做检测 -->