fix bugs

dudu502 · Apr 28, 2023 · c86a7c5 · c86a7c5
1 parent ee6153e
commit c86a7c5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/FSM/State.cs b/FSM/State.cs
@@ -33,6 +33,8 @@ public State(TState name, StateMachine<TState, TParam> stateMachine)
             m_Machine = stateMachine;
         }
 
+        internal int GetStateInt() { return Name.GetHashCode(); }
+
         internal TParam GetParameter()
         {
             return m_Machine.GetParameter();

diff --git a/FSM/StateMachine.cs b/FSM/StateMachine.cs
@@ -67,11 +67,12 @@ public State<TState, TParam> NewState(TState stateName)
             m_States.Add(state);
             return state;
         }
+
         public StateMachine<TState, TParam> Any(Func<TParam, bool> valid, Action<TParam> transfer,TState to)
         {
             foreach (State<TState, TParam> state in m_States)
             {
-                if (to.GetHashCode() != state.Name.GetHashCode())
+                if (to.GetHashCode() != state.GetStateInt())
                 {
                     Transition<TState, TParam> transition = new Transition<TState, TParam>(state, valid).Transfer(transfer);
                     transition.To(to);
@@ -80,11 +81,12 @@ public StateMachine<TState, TParam> Any(Func<TParam, bool> valid, Action<TParam>
             }
             return this;
         }
+
         public StateMachine<TState, TParam> Where(TState from, Func<TParam, bool> valid, Action<TParam> transfer, TState to)
         {
             foreach(State<TState,TParam> state in m_States)
             {
-                if ((from.GetHashCode() & state.GetHashCode()) == state.GetHashCode())
+                if ((from.GetHashCode() & state.GetStateInt()) == state.GetStateInt())
                 {
                     Transition<TState, TParam> transition = new Transition<TState, TParam>(state, valid).Transfer(transfer);
                     transition.To(to);
@@ -103,7 +105,7 @@ public StateMachine<TState, TParam> Initialize()
         private State<TState, TParam> GetState(TState stateName)
         {
             foreach (State<TState, TParam> state in m_States)
-                if (state.Name.GetHashCode() == stateName.GetHashCode())
+                if (state.GetStateInt() == stateName.GetHashCode())
                     return state;
             throw new Exception($"{stateName} is not exist! Please call {nameof(NewState)} to create this state");
         }