Merge branch 'main' of https://git.ambigrat.com/card_game/tcg_client

Assets/TcgEngine/Scripts/Data/StatusData.cs

@@ -32,7 +32,8 @@ namespace TcgEngine
         Paralysed = 32,     //Cant do any actions for X turns
         Poisoned = 34,     //Lose hp each start of turn
         Sleep = 36,         //Doesnt untap at the start of turn
-
+        Counterattack = 38, // 允许反击
+        NoTreatment = 39, // 禁疗
 
     }
 

Assets/TcgEngine/Scripts/Effects/EffectAddStat.cs

@@ -36,7 +36,9 @@ namespace TcgEngine
         {
             if (type == EffectStatType.Attack)
                 target.attack += ability.value;
-            if (type == EffectStatType.HP)
+            if (type == EffectStatType.HP) 
+                if (target.HasStatus(StatusType.NoTreatment)) // 禁疗时不会增加hp
+                    return;
                 target.hp += ability.value;
             if (type == EffectStatType.Mana)
                 target.mana += ability.value;

Assets/TcgEngine/Scripts/GameLogic/GameLogic.cs

@@ -569,7 +569,10 @@ namespace TcgEngine.Gameplay
             DamageCard(attacker, target, datt1);
 
             //Counter Damage
-            if (!attacker.HasStatus(StatusType.Intimidate))
+            // if (!attacker.HasStatus(StatusType.Intimidate)) // 威慑时不会反击
+            //     DamageCard(target, attacker, datt2);
+
+            if (attacker.HasStatus(StatusType.Counterattack)) // 允许反击
                 DamageCard(target, attacker, datt2);
 
             //Save attack and exhaust
@@ -853,6 +856,9 @@ namespace TcgEngine.Gameplay
             if (target.HasStatus(StatusType.Invincibility))
                 return;
 
+            if (target.HasStatus(StatusType.NoTreatment)) // 禁疗时不会治疗
+                return;
+
             target.damage -= value;
             target.damage = Mathf.Max(target.damage, 0);
 

Assets/TcgEngine/Scripts/Network/ResourceDownloader.cs

@@ -117,10 +117,10 @@ namespace TcgEngine
                 return false;
             }
             
-            Debug.Log($"版本匹配，开始检查MD5校验... 当前版本: {currentVersion} 目标版本: {targetVersion} 当前MD5: {currentMd5} 目标MD5: {targetMd5}");
             
             string localMd5 = await CalculateDirectoryMd5(spritesPath);
-            
+            Debug.Log($"版本匹配，开始检查MD5校验... 当前版本: {currentVersion} 目标版本: {targetVersion} 当前MD5: {localMd5} 目标MD5: {targetMd5}");
+
             if (localMd5 != targetMd5)
             {
                 Debug.Log("MD5校验失败，正在删除损坏的文件并重新下载...");