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

@@ -54,6 +54,8 @@ public class TurnMaster : Singleton<TurnMaster>
 
             //显示敌人攻击虚线
             EnemyManager.Instance.EnemyLine_Observer();
+            //回复敌人系数
+            EnemyManager.Instance.enemyMultiplierRestore();
 
             //阶段流转
             StartCoroutine(EndPlayerTurnBegin());  

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs

@@ -148,11 +148,19 @@ public class EnemyManager : Singleton<EnemyManager>
     {
         foreach (var observer in enemyObservers)
         {
-            observer.GetEnemyNode().enemyTurnSettleInit();
+            //observer.GetEnemyNode().enemyTurnSettleInit();
             observer.GetEnemyNode().enemyTurnSettle(settleTurn);   
         }
     }
 
+    public void enemyMultiplierRestore()
+    {
+        foreach (var observer in enemyObservers)
+        {
+            observer.GetEnemyNode().enemyTurnSettleInit();
+        }
+    }
+
     public void AttackRangePreviewInfluencedNode(MapUnity enemyNode, int step,List<MapUnity> influencePreviewPool)//可移动格子预览
     {    
         influencePreviewPool .Clear();

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs

@@ -299,7 +299,16 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
         {
             EnemyState.abnormalCondition[condition] = value;
         }
-        Debug.Log("异常层数" + EnemyState.abnormalCondition[condition]);
+        if (condition.Equals(CardFunction.coma))
+        {
+            EnemyState.damageMultiplier = 0;
+            EnemyState.stepRangeMultiplier = 0;
+        }
+        if (condition.Equals(CardFunction.sleep))
+        {
+            EnemyState.damageMultiplier = 0;
+            EnemyState.stepRangeMultiplier = 0;
+        }
     }
 
     public void sufferDamage(int damageVal)
@@ -318,6 +327,34 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
                 {
                     case AbnormalCondition.sleep:
                         EnemyState.abnormalCondition.Remove(key);
+                        EnemyState.damageMultiplier = 1;
+                        EnemyState.stepRangeMultiplier = 1;
+                        break;
+                }
+            }
+            foreach (var key in EnemyState.abnormalCondition.Keys.ToList())
+            {
+                switch (key)
+                {
+                    case AbnormalCondition.weak:
+                        EnemyState.damageMultiplier = 0.75;
+                        break;
+                    case AbnormalCondition.disarm:
+                        EnemyState.damageMultiplier = 0;
+                        break;
+                }
+            }
+            foreach (var key in EnemyState.abnormalCondition.Keys.ToList())
+            {
+                switch (key)
+                {
+                    case AbnormalCondition.coma:
+                        EnemyState.damageMultiplier = 0;
+                        EnemyState.stepRangeMultiplier = 0;
+                        break;
+                    case AbnormalCondition.sleep:
+                        EnemyState.damageMultiplier = 0;
+                        EnemyState.stepRangeMultiplier = 0;
                         break;
                 }
             }
@@ -328,6 +365,32 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
     {
         EnemyState.damageMultiplier = 1;
         EnemyState.stepRangeMultiplier = 1;
+        foreach (var key in EnemyState.abnormalCondition.Keys.ToList())
+        {
+            switch (key)
+            {
+                case AbnormalCondition.weak:
+                    EnemyState.damageMultiplier = 0.75;
+                    break;
+                case AbnormalCondition.disarm:
+                    EnemyState.damageMultiplier = 0;
+                    break;
+            }
+        }
+        foreach (var key in EnemyState.abnormalCondition.Keys.ToList())
+        {
+            switch (key)
+            {
+                case AbnormalCondition.coma:
+                    EnemyState.damageMultiplier = 0;
+                    EnemyState.stepRangeMultiplier = 0; 
+                    break;
+                case AbnormalCondition.sleep:
+                    EnemyState.damageMultiplier = 0;
+                    EnemyState.stepRangeMultiplier = 0;
+                    break;
+            }
+        }
     }
 
 

ColorlessWorld-2024-4-2/Assets/Scripts/manager/DestructionManager.cs

@@ -11,6 +11,10 @@ public class DestructionManager : Singleton<DestructionManager>
         {
             TurnMaster.Instance.usedCard.usedCardList.Add(target.GetComponent<CardEntity>().CardId);
         }
+        else
+        {
+            TurnMaster.Instance.usedCard.deleteCardList.Add(target.GetComponent<CardEntity>().CardId);
+        }
         Destroy(target);
         yield return null;
         yield return StartCoroutine(TurnMaster.Instance.MoveCards());