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

2025-09-01 17:26:38 +08:00
parent 37fc708d5d 6d40a8075f
commit 8b79e329d0
16 changed files with 256 additions and 5 deletions
--- a/Assets/TcgEngine/Resources/Abilities/activated/activate_counterattack_2turns.asset
+++ b/Assets/TcgEngine/Resources/Abilities/activated/activate_counterattack_2turns.asset
@@ -0,0 +1,38 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8ce5f81e5cc37f547af6923758602c8c, type: 3}
+  m_Name: activate_counterattack_2turns
+  m_EditorClassIdentifier: 
+  id: activate_counterattack_2turns
+  trigger: 5
+  conditions_trigger: []
+  target: 1
+  conditions_target: []
+  filters_target: []
+  effects:
+  - {fileID: 11400000, guid: 4c4c317ae3dd4cf4982e8d7c7f1043b9, type: 2}
+  status:
+  - {fileID: 11400000, guid: e536240f3421c48a49c3ef0eb19b1042, type: 2}
+  value: 0
+  duration: 2
+  chain_abilities: []
+  mana_cost: 3
+  exhaust: 0
+  board_fx: {fileID: 0}
+  caster_fx: {fileID: 0}
+  target_fx: {fileID: 0}
+  projectile_fx: {fileID: 0}
+  cast_audio: {fileID: 0}
+  target_audio: {fileID: 0}
+  charge_target: 0
+  title: "\u5141\u8BB8\u53CD\u51FB"
+  desc: "\u5141\u8BB8\u53CD\u51FB \u6301\u7EED2\u56DE\u5408"
--- a/Assets/TcgEngine/Resources/Abilities/activated/activate_counterattack_2turns.asset.meta
+++ b/Assets/TcgEngine/Resources/Abilities/activated/activate_counterattack_2turns.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a7e1a976297b94e0b935f5e6126d8d11
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/TcgEngine/Resources/Abilities/activated/activate_damage_notreatment.asset
+++ b/Assets/TcgEngine/Resources/Abilities/activated/activate_damage_notreatment.asset
@@ -0,0 +1,42 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8ce5f81e5cc37f547af6923758602c8c, type: 3}
+  m_Name: activate_damage_notreatment
+  m_EditorClassIdentifier: 
+  id: activate_damage_notreatment
+  trigger: 5
+  conditions_trigger: []
+  target: 30
+  conditions_target:
+  - {fileID: 11400000, guid: ef09540f94d8428408b69fea46ec3334, type: 2}
+  - {fileID: 11400000, guid: 47221d412dc0a014b8a33abb0cbfc773, type: 2}
+  - {fileID: 11400000, guid: a1fb3a7171663234280fdfb41c99ab0a, type: 2}
+  filters_target: []
+  effects:
+  - {fileID: 11400000, guid: 4369324687c62ca488c57afd73a2be36, type: 2}
+  status: []
+  value: 2
+  duration: 0
+  chain_abilities:
+  - {fileID: 11400000}
+  mana_cost: 3
+  exhaust: 0
+  board_fx: {fileID: 0}
+  caster_fx: {fileID: 0}
+  target_fx: {fileID: 9125387663047351618, guid: b66600b51774daa49964ead5c6a00c49,
+    type: 3}
+  projectile_fx: {fileID: 0}
+  cast_audio: {fileID: 0}
+  target_audio: {fileID: 0}
+  charge_target: 0
+  title: "\u4F24\u5BB3+\u7981\u7597"
+  desc: "\u9020\u62102\u70B9\u4F24\u5BB3\u3002"
--- a/Assets/TcgEngine/Resources/Abilities/activated/activate_damage_notreatment.asset.meta
+++ b/Assets/TcgEngine/Resources/Abilities/activated/activate_damage_notreatment.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2f41339738bf94e3bb86a85423f6cd44
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/TcgEngine/Resources/Abilities/ongoing/alwaysCounterattack.asset
+++ b/Assets/TcgEngine/Resources/Abilities/ongoing/alwaysCounterattack.asset
@@ -0,0 +1,37 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8ce5f81e5cc37f547af6923758602c8c, type: 3}
+  m_Name: alwaysCounterattack
+  m_EditorClassIdentifier: 
+  id: alwaysCounterattack
+  trigger: 2
+  conditions_trigger: []
+  target: 1
+  conditions_target: []
+  filters_target: []
+  effects: []
+  status:
+  - {fileID: 11400000, guid: e536240f3421c48a49c3ef0eb19b1042, type: 2}
+  value: 0
+  duration: 0
+  chain_abilities: []
+  mana_cost: 0
+  exhaust: 0
+  board_fx: {fileID: 0}
+  caster_fx: {fileID: 0}
+  target_fx: {fileID: 0}
+  projectile_fx: {fileID: 0}
+  cast_audio: {fileID: 0}
+  target_audio: {fileID: 0}
+  charge_target: 0
+  title: "\u59CB\u7EC8\u53CD\u51FB"
+  desc: "\u59CB\u7EC8\u53CD\u51FB"
--- a/Assets/TcgEngine/Resources/Abilities/ongoing/alwaysCounterattack.asset.meta
+++ b/Assets/TcgEngine/Resources/Abilities/ongoing/alwaysCounterattack.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f2db8435fd93e4777a91deee49c478b4
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/TcgEngine/Resources/Abilities/other/notreatment.asset
+++ b/Assets/TcgEngine/Resources/Abilities/other/notreatment.asset
@@ -0,0 +1,37 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8ce5f81e5cc37f547af6923758602c8c, type: 3}
+  m_Name: notreatment
+  m_EditorClassIdentifier: 
+  id: notreatment
+  trigger: 0
+  conditions_trigger: []
+  target: 72
+  conditions_target: []
+  filters_target: []
+  effects: []
+  status:
+  - {fileID: 11400000, guid: 6ed88dbafd8814aa89ec79d6c6a6087c, type: 2}
+  value: 0
+  duration: 2
+  chain_abilities: []
+  mana_cost: 0
+  exhaust: 0
+  board_fx: {fileID: 0}
+  caster_fx: {fileID: 0}
+  target_fx: {fileID: 0}
+  projectile_fx: {fileID: 0}
+  cast_audio: {fileID: 0}
+  target_audio: {fileID: 0}
+  charge_target: 0
+  title: "\u4E24\u56DE\u5408\u7981\u7597"
+  desc: "\u4E24\u56DE\u5408\u7981\u7597"
--- a/Assets/TcgEngine/Resources/Abilities/other/notreatment.asset.meta
+++ b/Assets/TcgEngine/Resources/Abilities/other/notreatment.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3fdf35a57c8d9478dbd36a8c2c83857e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/TcgEngine/Resources/Status/counterattack.asset
+++ b/Assets/TcgEngine/Resources/Status/counterattack.asset
@@ -0,0 +1,20 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7edf116efdfa73646a6de43812f81a4a, type: 3}
+  m_Name: counterattack
+  m_EditorClassIdentifier: 
+  effect: 38
+  title: counterattack
+  icon: {fileID: 0}
+  desc: "\u5141\u8BB8\u53CD\u51FB"
+  status_fx: {fileID: 0}
+  hvalue: 1
--- a/Assets/TcgEngine/Resources/Status/counterattack.asset.meta
+++ b/Assets/TcgEngine/Resources/Status/counterattack.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e536240f3421c48a49c3ef0eb19b1042
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/TcgEngine/Resources/Status/notreatment.asset
+++ b/Assets/TcgEngine/Resources/Status/notreatment.asset
@@ -0,0 +1,20 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7edf116efdfa73646a6de43812f81a4a, type: 3}
+  m_Name: notreatment
+  m_EditorClassIdentifier: 
+  effect: 39
+  title: Notreatment
+  icon: {fileID: 0}
+  desc: "\u8FDB\u6599"
+  status_fx: {fileID: 0}
+  hvalue: 1
--- a/Assets/TcgEngine/Resources/Status/notreatment.asset.meta
+++ b/Assets/TcgEngine/Resources/Status/notreatment.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6ed88dbafd8814aa89ec79d6c6a6087c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/TcgEngine/Scripts/Data/StatusData.cs
+++ b/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, // 禁疗

    }

--- a/Assets/TcgEngine/Scripts/Effects/EffectAddStat.cs
+++ b/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;
--- a/Assets/TcgEngine/Scripts/GameLogic/GameLogic.cs
+++ b/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);

--- a/Assets/TcgEngine/Scripts/Network/ResourceDownloader.cs
+++ b/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校验失败，正在删除损坏的文件并重新下载...");