妻子和矿工的互动状态BUG 解决

Author: floatval

StateMachineLearn/Program.cs

@@ -8,7 +8,7 @@
 {
     FSM =
     {
-        GlobalState = new WifeGlobalState()
+        GlobalState = WifeGlobalState.Instance
     }
 };
 

StateMachineLearn/WestWord/MinerOwnedState.cs

@@ -303,13 +303,9 @@ public override void Enter(Miner owner)
         }
         owner.CurrentLocation = Location.LocationType.Home;
 
-        /*
-         错误的处理方式!!,不应该在 Enter 的时候去发消息,让其他关联对象改变状态,
-         如果 Enter 的时候发消息了,会造成,一个 Update (逻辑帧) 里面处理多个状态的迁移,而应该在 Execute 里面进行处理
         // 2. 通知妻子自己回家了
         MessageDispatcher.Instance.DispatchMessage(EntityName.EntityElsa, owner.Name,
             ConstDefine.MessageType.HiHoneyImHome, 0, null);
-        */
 
         WriteExt.WriteBgWhiteAndFgYellow($"MinerId:{owner.InsId}, GoHomeAndSleepTilRestedState，回到家里，并告知妻子自己回来了");
     }
@@ -326,10 +322,6 @@ public override void Execute(Miner owner)
             return;
         }
 
-        // 0. 发送回家的通知
-        MessageDispatcher.Instance.DispatchMessage(owner.Name, EntityName.EntityElsa,
-            ConstDefine.MessageType.HiHoneyImHome, 0, null); // todo:解决硬编码问题
-        
         owner.CurrentTirednessThreshold--;
         WriteExt.WriteBgWhiteAndFgBlue($"MinerId:{owner.InsId}, GoHomeAndSleepTilRestedState，在家里休息中");
 
@@ -377,7 +369,7 @@ public override bool OnMessage(in Telegram message, Miner owner)
             // 1. 处理吃饭
             case ConstDefine.MessageType.StewReady:
             {
-                WriteExt.WriteBgWhiteAndFgRed($"minderId:{owner.InsId}, 收到肉煮好的消息");
+                WriteExt.WriteBgWhiteAndFgRed($"minderId:{owner.InsId}, 开始在家里吃肉");
                 owner.FSM.ChangeState(EatStew.Instance);
                 return true;
             }

StateMachineLearn/WestWord/StateMachine.cs

@@ -79,7 +79,8 @@ public bool ChangeState(IState<TOwner> state)
    /// <returns></returns>
    public bool RevertToPreviousState()
    {
-      return ChangeState(PreviousState);
+      // 1. 之前的状态与当前状态不一样,则进行状态反转,并返回true
+      return !IsInState(PreviousState) && ChangeState(PreviousState);
    }
 
    /// <summary>

StateMachineLearn/WestWord/WifeOwnedState.cs

@@ -76,6 +76,10 @@ public static WifeInitState Instance
 /// </summary>
 public class VisitBathroom : State<Wife>
 {
+    private VisitBathroom()
+    {
+    }
+    
     #region Implementation of IState<in Wife>
 
     /// <summary>
@@ -91,7 +95,7 @@ public override void Enter(Wife owner)
         }
 
         // 1. 将妻子放置到家里
-        owner.CurrentLocation= Location.Home;
+        owner.CurrentLocation= Location.BathRoom;
 
         WriteExt.WriteBgWhiteAndFgYellow($"WifeId:{entity.InsId}, 初始化状态：在家里");
     }
@@ -102,7 +106,14 @@ public override void Enter(Wife owner)
     /// <param name="owner"></param>
     public override void Execute(Wife owner)
     {
-        owner.CurrentTirednessThreshold++;
+        // 1. 清空基类的疲劳度
+        owner.CurrentTirednessThreshold = 0;
+        
+        // 2. 反转回以前的状态
+        owner.FSM.RevertToPreviousState();
+        
+        // 3. 打日志
+        WriteExt.WriteBgWhiteAndFgYellow($"WifeId:{owner.InsId}, 去洗手间");
     }
 
     /// <summary>
@@ -111,10 +122,34 @@ public override void Execute(Wife owner)
     /// <param name="owner"></param>
     public override void Exit(Wife owner)
     {
-        throw new NotImplementedException();
+        WriteExt.WriteBgWhiteAndFgRed($"wifeId{owner.InsId} 退出去洗手间");
     }
 
     #endregion
+
+    #region Singleton
+
+    /// <summary>
+    /// 对象缓存
+    /// </summary>
+    private static VisitBathroom? m_instance;
+    
+    /// <summary>
+    /// 对象获取接口
+    /// </summary>
+    public static VisitBathroom Instance
+    {
+        get
+        {
+            if (m_instance == null)
+            {
+                m_instance = new VisitBathroom();
+            }
+            return m_instance;
+        }
+    }
+    
+    #endregion
 }
 
 /// <summary>
@@ -213,6 +248,11 @@ public static DoHouseWork Instance
 /// </summary>
 public class WifeGlobalState :State<Wife>
 {
+    private WifeGlobalState()
+    {
+        m_instance = this;
+    }
+    
     #region Implementation of IState<in Wife>
 
     /// <summary>
@@ -236,6 +276,14 @@ public override void Enter(Wife owner)
     /// <param name="owner"></param>
     public override void Execute(Wife owner)
     {
+        // 1. 检查是否需要切换状态
+        if (owner.IsNeedToGoBathroom())
+        {
+            owner.FSM.ChangeState(VisitBathroom.Instance);
+        }
+        
+        // 2. 打日志
+        WriteExt.WriteBgWhiteAndFgBlue($"WifeId:{owner.InsId}, 全局状态");
     }
 
     /// <summary>