【m】增加同步状态及

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

@@ -8,24 +8,15 @@ namespace Stary.Evo
         {
             
         }
-        public override UniTask OnExitAsync()
+
+        public override void OnEnter()
         {
-            return UniTask.CompletedTask;
+            
         }
 
-        public override UniTask OnEnterAsync()
+        public override void OnExit()
         {
-            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/DefaultStateAsync.cs

@@ -0,0 +1,31 @@
+using Cysharp.Threading.Tasks;
+
+namespace Stary.Evo
+{
+    public class DefaultStateAsync : AbstractFSMIStateAsync
+    {
+        public DefaultStateAsync(IFsmSystemAsync system) : base(system)
+        {
+        }
+
+        public override UniTask OnExitAsync()
+        {
+            return UniTask.CompletedTask;
+        }
+
+        public override UniTask OnEnterAsync()
+        {
+            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/DefaultStateAsync.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 220c409c3499492ca07525d7323eb17f
+timeCreated: 1753696060

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

@@ -9,20 +9,23 @@ namespace Stary.Evo
         IFsmSystem FsmSystem { get; }
         string Name { get; }
 
+        
                 //进入该状态时调用
-        UniTask OnEnterAsync();
+         void OnEnter();
         
-        UniTask OnEnterAsync(object param);
+                void OnEnter(object param);
+                
+                void OnEnter<T>(T param);
+        
+                void OnEnter<T1, T2>(T1 param1, T2 param2);
 
-        UniTask OnEnterAsync<T>(T param);
 
-        UniTask OnEnterAsync<T1, T2>(T1 param1, T2 param2);
 
         //每帧调用
         void OnUpdate();
         //退出该状态时调用
 
-        UniTask OnExitAsync();
+        void OnExit();
     }
 
     public abstract class AbstractFSMIState : FSMIState
@@ -36,21 +39,21 @@ namespace Stary.Evo
             Name = GetType().Name;
         }
 
-        public virtual UniTask OnEnterAsync(object param) 
+        public virtual void OnEnter(object param) 
         {
-            return UniTask.CompletedTask;
+         
         }
 
-        public virtual UniTask OnEnterAsync<T>(T param)
+        public virtual void OnEnter<T>(T param)
         {
-            return UniTask.CompletedTask;
+           
         }
 
-        public virtual UniTask OnEnterAsync<T1, T2>(T1 param1, T2 param2)
+        public virtual void OnEnter<T1, T2>(T1 param1, T2 param2)
         {
-            return UniTask.CompletedTask;
+          
         }
-        public abstract UniTask OnEnterAsync();
+        public abstract void OnEnter();
 
         public virtual void OnUpdate()
         {
@@ -58,6 +61,6 @@ namespace Stary.Evo
         }
 
 
-        public abstract UniTask OnExitAsync();
+        public abstract void OnExit();
     }
 }

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

@@ -0,0 +1,64 @@
+using System;
+using Cysharp.Threading.Tasks;
+using UnityEngine;
+
+namespace Stary.Evo
+{
+    public interface FSMIStateAsync
+    {
+        IFsmSystemAsync FsmSystem { get; }
+        string Name { get; }
+        
+
+        //进入该状态时调用
+        UniTask OnEnterAsync();
+
+        UniTask OnEnterAsync(object param);
+        
+        UniTask OnEnterAsync<T>(T param);
+
+        UniTask OnEnterAsync<T1, T2>(T1 param1, T2 param2);
+
+        //每帧调用
+        void OnUpdate();
+        //退出该状态时调用
+
+        UniTask OnExitAsync();
+    }
+
+    public abstract class AbstractFSMIStateAsync : FSMIStateAsync
+    {
+        public IFsmSystemAsync FsmSystem { get; }
+        public string Name { get; }
+
+        public AbstractFSMIStateAsync(IFsmSystemAsync system)
+        {
+            FsmSystem = system;
+            Name = GetType().Name;
+        }
+
+        public virtual UniTask OnEnterAsync(object param) 
+        {
+            return UniTask.CompletedTask;
+        }
+
+        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/FSMIStateAsync.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 67ef9a881ef94206a5bc80eab8f8e2df
+timeCreated: 1753695833

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

@@ -9,11 +9,11 @@ namespace Stary.Evo
         FSMIState CurState { get; set; }
         void AddState(FSMIState state);
         void RemoveState(FSMIState state);
-        UniTask SetCurState(string name);
+        void SetCurState(string name);
 
-        UniTask SetCurState(string name, object param);
+        void SetCurState(string name, object param);
-        UniTask SetCurState<T>(string name, T param);
+        void SetCurState<T>(string name, T param);
-        UniTask SetCurState<T1, T2>(string name, T1 param1, T2 param2);
+        void SetCurState<T1, T2>(string name, T1 param1, T2 param2);
         FSMIState GetStateWithName(string name);
         HashMap<string, FSMIState> States { get; set; }
     }
@@ -58,47 +58,49 @@ namespace Stary.Evo
         /// 普通状态切换，适用于无参
         /// </summary>
         /// <param name="name"></param>
-        public async UniTask SetCurState(string name)
+        public async void SetCurState(string name)
         {
             if (CurState != null)
-               await CurState.OnExitAsync();
+                CurState.OnExit();
             FSMIState state = GetStateWithName(name);
             CurState = state;
-            CurState.OnEnterAsync();
+            CurState.OnEnter();
         }
+
         /// <summary>
         /// 异步状态切换，适用于有参
         /// </summary>
         /// <param name="name"></param>
         /// <param name="param"></param>
         /// <typeparam name="T"></typeparam>
-        public async UniTask SetCurState(string name, object param)
+        public async void SetCurState(string name, object param)
         {
             if (CurState != null)
             {
-                await CurState.OnExitAsync();
+                CurState.OnExit();
             }
 
             FSMIState state = GetStateWithName(name);
             CurState = state;
-            await CurState.OnEnterAsync(param);
+            CurState.OnEnter(param);
         }
+
         /// <summary>
         /// 异步状态切换，适用于有参
         /// </summary>
         /// <param name="name"></param>
         /// <param name="param"></param>
         /// <typeparam name="T"></typeparam>
-        public async UniTask SetCurState<T>(string name, T param)
+        public async void SetCurState<T>(string name, T param)
         {
             if (CurState != null)
             {
-                await CurState.OnExitAsync();
+                CurState.OnExit();
             }
 
             FSMIState state = GetStateWithName(name);
             CurState = state;
-            await CurState.OnEnterAsync<T>(param);
+            CurState.OnEnter<T>(param);
         }
 
         /// <summary>
@@ -109,16 +111,16 @@ namespace Stary.Evo
         /// <param name="param2"></param>
         /// <typeparam name="T1"></typeparam>
         /// <typeparam name="T2"></typeparam>
-        public async UniTask SetCurState<T1, T2>(string name, T1 param1, T2 param2)
+        public async void SetCurState<T1, T2>(string name, T1 param1, T2 param2)
         {
             if (CurState != null)
             {
-                await CurState.OnExitAsync();
+                CurState.OnExit();
             }
 
             FSMIState state = GetStateWithName(name);
             CurState = state;
-            await CurState.OnEnterAsync(param1, param2);
+            CurState.OnEnter(param1, param2);
         }
 
         public FSMIState GetStateWithName(string name)

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

@@ -0,0 +1,137 @@
+using System.Collections.Generic;
+using Cysharp.Threading.Tasks;
+using UnityEngine;
+
+namespace Stary.Evo
+{
+    public interface IFsmSystemAsync
+    {
+        FSMIStateAsync CurState { get; set; }
+        void AddState(FSMIStateAsync state);
+        void RemoveState(FSMIStateAsync 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);
+        FSMIStateAsync GetStateWithName(string name);
+        HashMap<string, FSMIStateAsync> States { get; set; }
+    }
+
+    public class FsmSystemAsync : IFsmSystemAsync
+    {
+        public FSMIStateAsync CurState { get; set; }
+        public HashMap<string, FSMIStateAsync> States { get; set; }
+
+        public FsmSystemAsync()
+        {
+            States = new HashMap<string, FSMIStateAsync>();
+            AddState(new DefaultStateAsync(this));
+        }
+
+        public void AddState(FSMIStateAsync state)
+        {
+            Debug.Log(state.Name);
+            if (!States.ContainsKey(state.Name))
+            {
+                States.Add(state.Name, state);
+            }
+            else
+            {
+                Debug.LogErrorFormat("States状态机容器里已存在名字为--【{0}】--的状态", state.Name.ToString());
+            }
+        }
+
+
+        public void RemoveState(FSMIStateAsync state)
+        {
+            if (States.ContainsKey(state.Name))
+            {
+                States.Remove(state.Name);
+            }
+            else
+            {
+                Debug.LogErrorFormat("States状态机容器里不存在名字为--【{0}】--的状态", state.Name.ToString());
+            }
+        }
+
+        /// <summary>
+        /// 普通状态切换，适用于无参
+        /// </summary>
+        /// <param name="name"></param>
+        public async UniTask SetCurState(string name)
+        {
+            if (CurState != null)
+                await CurState.OnExitAsync();
+            FSMIStateAsync state = GetStateWithName(name);
+            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();
+            }
+
+            FSMIStateAsync state = GetStateWithName(name);
+            CurState = state;
+            await CurState.OnEnterAsync(param);
+        }
+
+        /// <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();
+            }
+
+            FSMIStateAsync state = GetStateWithName(name);
+            CurState = state;
+            await CurState.OnEnterAsync<T>(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();
+            }
+
+            FSMIStateAsync state = GetStateWithName(name);
+            CurState = state;
+            await CurState.OnEnterAsync(param1, param2);
+        }
+
+        public FSMIStateAsync GetStateWithName(string name)
+        {
+            if (States.ContainsKey(name))
+            {
+                return States[name];
+            }
+
+            return null;
+        }
+    }
+}

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

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: e04d52ffeda84bf4a096108e88667852
+timeCreated: 1753695847

Assets/00.StaryEvo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.staryevo.main",
-  "version": "1.3.23",
+  "version": "1.3.24",
   "displayName": "00.StaryEvo",
   "description": "This is an Framework package(后台服务器版本，端口9527)",
   "unity": "2021.3",