diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs index 870c0d3a..4e362a87 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs @@ -43,7 +43,7 @@ public class TurnMaster : Singleton 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 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) { //广播遗物接口 @@ -134,42 +170,7 @@ public class TurnMaster : Singleton 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(); @@ -183,7 +184,7 @@ public class TurnMaster : Singleton TipManager.Instance.SendTip(" 玩家回合!"); //声音 AudioManager.Instance.TurnChangePlayer(); - yield return new WaitForSeconds(3.0f); // 等待3秒 + yield return new WaitForSeconds(1.0f); // 等待3秒 RecoverEndPlayerTurn();//重置回合结束按钮为可交互状态 turn = Turn.playerTurn;