Merge branch 'master' of http://192.168.31.100:8088/framework/xosmopluginlibrary

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

@@ -4,27 +4,31 @@ using UnityEngine;
 
 namespace Stary.Evo
 {
-    public interface FSMIState {
+    public interface FSMIState
+    {
         IFsmSystem FsmSystem { get; }
         string Name { get; }
-  
+
         //进入该状态时调用
         UniTask OnEnterAsync();
+
+        UniTask OnEnterAsync(object param);
         
         UniTask OnEnterAsync<T>(T param);
-        
-        UniTask OnEnterAsync<T1,T2>(T1 param1, T2 param2);
+
+        UniTask OnEnterAsync<T1, T2>(T1 param1, T2 param2);
+
         //每帧调用
         void OnUpdate();
         //退出该状态时调用
-        
+
         UniTask OnExitAsync();
     }
-    
+
     public abstract class AbstractFSMIState : FSMIState
     {
         public IFsmSystem FsmSystem { get; }
-        public  string Name { get; }
+        public string Name { get; }
 
         public AbstractFSMIState(IFsmSystem system)
         {
@@ -32,17 +36,28 @@ namespace Stary.Evo
             Name = GetType().Name;
         }
 
-        public abstract UniTask OnEnterAsync<T>(T param);
+        public virtual UniTask OnEnterAsync(object param) 
+        {
+            return UniTask.CompletedTask;
+        }
 
-        public abstract  UniTask OnEnterAsync<T1,T2>(T1 param1, T2 param2);
+        public virtual UniTask OnEnterAsync<T>(T param)
+        {
+            return UniTask.CompletedTask;
+        }
+
+        public virtual UniTask OnEnterAsync<T1, T2>(T1 param1, T2 param2)
+        {
+            return UniTask.CompletedTask;
+        }
         public abstract UniTask OnEnterAsync();
+
         public virtual void OnUpdate()
         {
             // Timer += Time.deltaTime;
         }
 
 
-        
         public abstract UniTask OnExitAsync();
     }
-}
+}

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

@@ -10,6 +10,8 @@ namespace Stary.Evo
         void AddState(FSMIState state);
         void RemoveState(FSMIState state);
         UniTask SetCurState(string name);
+        
+        UniTask SetCurState(string name, object param);
         UniTask SetCurState<T>(string name, T param);
         UniTask SetCurState<T1, T2>(string name, T1 param1, T2 param2);
         FSMIState GetStateWithName(string name);
@@ -64,7 +66,23 @@ namespace Stary.Evo
             CurState = state;
             CurState.OnEnterAsync();
         }
+        /// <summary>
+        /// 异步状态切换，适用于有参
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="param"></param>
+        /// <typeparam name="T"></typeparam>
+        public async UniTask SetCurState(string name, object param)
+        {
+            if (CurState != null)
+            {
+                await CurState.OnExitAsync();
+            }
 
+            FSMIState state = GetStateWithName(name);
+            CurState = state;
+            await CurState.OnEnterAsync(param);
+        }
         /// <summary>
         /// 异步状态切换，适用于有参
         /// </summary>
@@ -80,7 +98,7 @@ namespace Stary.Evo
 
             FSMIState state = GetStateWithName(name);
             CurState = state;
-            await CurState.OnEnterAsync(param);
+            await CurState.OnEnterAsync<T>(param);
         }
 
         /// <summary>

Assets/00.StaryEvo/package.json

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