turnmaster的反转

ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs

@@ -43,7 +43,7 @@ public class TurnMaster : Singleton<TurnMaster>
         enemyTurnEnd,
         turnStop
     };
-    public Turn turn = Turn.playerTurnBegin;
+    public Turn turn = Turn.enemyTurnBegin;
     [Header("角色动作")]
     public PlayerAction playerAction;
     public enum PlayerAction
@@ -84,6 +84,42 @@ public class TurnMaster : Singleton<TurnMaster>
 
     private void Update()
     {
+        if (turn == Turn.enemyTurnBegin)
+        {
+
+            //广播遗物接口
+            LegacyManager.Instance.BroadCastSettleInEnemyTurnBegin();
+
+            //EnemyManager.Instance.enemyTurnBeginSettle(0);
+            turn = Turn.enemyTurn;
+        }
+
+        if (turn == Turn.enemyTurn)
+        {
+            //等待准备阶段效果结算完毕开始回合
+            //StartCoroutine(EnemyTurn());
+
+            //敌人动作如移动，涂色   
+            //EnemyManager.Instance.EnemyTurn_Observer();  
+
+
+            turn = Turn.turnStop;
+            turn = Turn.enemyTurnEnd;
+        }
+
+        if (turn == Turn.enemyTurnEnd)
+        {
+            //广播遗物接口
+            LegacyManager.Instance.BroadCastSettleInEnemyTurnEnd();
+
+            //结算地块Buff
+            MapUnitySettleManager.Instance.MapGridsEndSettle();
+
+            //EnemyManager.Instance.enemyTurnSettle(0);
+
+
+            turn = Turn.playerTurnBegin;
+        }
         if (turn == Turn.playerTurnBegin)
         {
             //广播遗物接口
@@ -131,42 +167,7 @@ public class TurnMaster : Singleton<TurnMaster>
             StartCoroutine(WaitEndPlayerTurn());
         }
 
-        if (turn == Turn.enemyTurnBegin)
-        {
-            
-            //广播遗物接口
-            LegacyManager.Instance.BroadCastSettleInEnemyTurnBegin();
-
-            //EnemyManager.Instance.enemyTurnBeginSettle(0);
-            turn = Turn.enemyTurn;
-        }
-
-        if (turn == Turn.enemyTurn)
-        {
-            //等待准备阶段效果结算完毕开始回合
-            //StartCoroutine(EnemyTurn());
-            
-            //敌人动作如移动，涂色   
-            //EnemyManager.Instance.EnemyTurn_Observer();  
-            
         
-            turn = Turn.turnStop;
-            turn = Turn.enemyTurnEnd;
-        }
-
-        if (turn == Turn.enemyTurnEnd)
-        {
-            //广播遗物接口
-            LegacyManager.Instance.BroadCastSettleInEnemyTurnEnd();
-
-            //结算地块Buff
-            MapUnitySettleManager.Instance.MapGridsEndSettle();
-
-            //EnemyManager.Instance.enemyTurnSettle(0);
-
-
-            turn = Turn.playerTurnBegin;
-        }
 
         //同步UI
         cardDeckNumberText.text = cardDeck.cardList.Count.ToString();
@@ -180,7 +181,7 @@ public class TurnMaster : Singleton<TurnMaster>
         TipManager.Instance.SendTip(" 玩家回合！");
         //声音
         AudioManager.Instance.TurnChangePlayer();
-        yield return new WaitForSeconds(3.0f); // 等待3秒
+        yield return new WaitForSeconds(1.0f); // 等待3秒
 
         RecoverEndPlayerTurn();//重置回合结束按钮为可交互状态
         turn = Turn.playerTurn;