修改00 框架代码

Assets/00.StaryEvo/Runtime/Utility/FSM/DefaultState.cs

@@ -0,0 +1,37 @@
+using Cysharp.Threading.Tasks;
+
+namespace Stary.Evo
+{
+    public class DefaultState : AbstractFSMIState
+    {
+        public DefaultState(IFsmSystem system) : base(system)
+        {
+            
+        }
+
+        public override void OnEnter()
+        {
+            
+        }
+
+        public override void OnExit()
+        {
+           
+        }
+
+        public override UniTask OnExitAsync()
+        {
+            return UniTask.CompletedTask;
+        }
+
+        public override UniTask OnEnterAsync<T>(T param)
+        {
+            return UniTask.CompletedTask;
+        }
+
+        public override UniTask OnEnterAsync<T1, T2>(T1 param1, T2 param2)
+        {
+            return UniTask.CompletedTask;
+        }
+    }
+}

Assets/00.StaryEvo/Runtime/Utility/FSM/DefaultState.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: fa9b0b9ba7a849f597744565a49bd61a
+timeCreated: 1744547550

Assets/00.StaryEvo/Runtime/Utility/FSM/FSMIState.cs

@@ -1,4 +1,5 @@
 using System;
+using Cysharp.Threading.Tasks;
 using UnityEngine;
 
 namespace Stary.Evo
@@ -6,20 +7,25 @@ namespace Stary.Evo
     public interface FSMIState {
         IFsmSystem FsmSystem { get; }
         string Name { get; }
-        float Timer { get; set; }
+  
         //进入该状态时调用
         void OnEnter();
+        
+        UniTask OnEnterAsync<T>(T param);
+        
+        UniTask OnEnterAsync<T1,T2>(T1 param1, T2 param2);
         //每帧调用
         void OnUpdate();
         //退出该状态时调用
         void OnExit();
+        
+        UniTask OnExitAsync();
     }
     
     public abstract class AbstractFSMIState : FSMIState
     {
         public IFsmSystem FsmSystem { get; }
         public  string Name { get; }
-        public abstract float Timer { get; set; }
 
         public AbstractFSMIState(IFsmSystem system)
         {
@@ -27,13 +33,17 @@ namespace Stary.Evo
             Name = GetType().Name;
         }
 
-        public abstract void OnEnter();
+        public abstract UniTask OnEnterAsync<T>(T param);
 
+        public abstract  UniTask OnEnterAsync<T1,T2>(T1 param1, T2 param2);
+        public abstract void OnEnter();
         public virtual void OnUpdate()
         {
-            Timer += Time.deltaTime;
+            // Timer += Time.deltaTime;
         }
 
         public abstract void OnExit();
+        
+        public abstract UniTask OnExitAsync();
     }
 }

Assets/00.StaryEvo/Runtime/Utility/FSM/FSMISystem.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Cysharp.Threading.Tasks;
 using UnityEngine;
 
 namespace Stary.Evo
@@ -9,6 +10,8 @@ namespace Stary.Evo
         void AddState(FSMIState state);
         void RemoveState(FSMIState state);
         void SetCurState(string name);
+        UniTask SetCurState<T>(string name, T param);
+        UniTask SetCurState<T1, T2>(string name, T1 param1, T2 param2);
         FSMIState GetStateWithName(string name);
         HashMap<string, FSMIState> States { get; set; }
     }
@@ -21,6 +24,7 @@ namespace Stary.Evo
         public FsmSystem()
         {
             States = new HashMap<string, FSMIState>();
+            AddState(new DefaultState(this));
         }
 
         public void AddState(FSMIState state)
@@ -48,15 +52,57 @@ namespace Stary.Evo
             }
         }
 
+        /// <summary>
+        /// 普通状态切换，适用于无参
+        /// </summary>
+        /// <param name="name"></param>
         public void SetCurState(string name)
         {
             if (CurState != null)
-                CurState.OnExit();
+                CurState.OnExitAsync();
             FSMIState state = GetStateWithName(name);
             CurState = state;
             CurState.OnEnter();
         }
 
+        /// <summary>
+        /// 异步状态切换，适用于有参
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="param"></param>
+        /// <typeparam name="T"></typeparam>
+        public async UniTask SetCurState<T>(string name, T param)
+        {
+            if (CurState != null)
+            {
+                await CurState.OnExitAsync();
+            }
+
+            FSMIState state = GetStateWithName(name);
+            CurState = state;
+            await CurState.OnEnterAsync(param);
+        }
+
+        /// <summary>
+        /// 异步状态切换，适用于有参
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="param1"></param>
+        /// <param name="param2"></param>
+        /// <typeparam name="T1"></typeparam>
+        /// <typeparam name="T2"></typeparam>
+        public async UniTask SetCurState<T1, T2>(string name, T1 param1, T2 param2)
+        {
+            if (CurState != null)
+            {
+                await CurState.OnExitAsync();
+            }
+
+            FSMIState state = GetStateWithName(name);
+            CurState = state;
+            await CurState.OnEnterAsync(param1, param2);
+        }
+
         public FSMIState GetStateWithName(string name)
         {
             if (States.ContainsKey(name))

Assets/00.StaryEvo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.staryevo.main",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "displayName": "00.StaryEvo",
   "description": "This is an Framework package",
   "unity": "2021.3",