diff --git a/Assets/TcgEngine/Resources/Abilities/activated/activate_counterattack_2turns.asset b/Assets/TcgEngine/Resources/Abilities/activated/activate_counterattack_2turns.asset new file mode 100644 index 0000000..111cb87 --- /dev/null +++ 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" diff --git a/Assets/TcgEngine/Resources/Abilities/activated/activate_counterattack_2turns.asset.meta b/Assets/TcgEngine/Resources/Abilities/activated/activate_counterattack_2turns.asset.meta new file mode 100644 index 0000000..12f8706 --- /dev/null +++ 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: diff --git a/Assets/TcgEngine/Resources/Abilities/ongoing/alwaysCounterattack.asset b/Assets/TcgEngine/Resources/Abilities/ongoing/alwaysCounterattack.asset new file mode 100644 index 0000000..064bfb3 --- /dev/null +++ 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" diff --git a/Assets/TcgEngine/Resources/Abilities/ongoing/alwaysCounterattack.asset.meta b/Assets/TcgEngine/Resources/Abilities/ongoing/alwaysCounterattack.asset.meta new file mode 100644 index 0000000..a12fc7e --- /dev/null +++ b/Assets/TcgEngine/Resources/Abilities/ongoing/alwaysCounterattack.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f2db8435fd93e4777a91deee49c478b4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TcgEngine/Resources/Status/counterattack.asset b/Assets/TcgEngine/Resources/Status/counterattack.asset new file mode 100644 index 0000000..5db7949 --- /dev/null +++ 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 diff --git a/Assets/TcgEngine/Resources/Status/counterattack.asset.meta b/Assets/TcgEngine/Resources/Status/counterattack.asset.meta new file mode 100644 index 0000000..4334b93 --- /dev/null +++ b/Assets/TcgEngine/Resources/Status/counterattack.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e536240f3421c48a49c3ef0eb19b1042 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TcgEngine/Scripts/Data/StatusData.cs b/Assets/TcgEngine/Scripts/Data/StatusData.cs index e0d4120..d86af57 100644 --- a/Assets/TcgEngine/Scripts/Data/StatusData.cs +++ b/Assets/TcgEngine/Scripts/Data/StatusData.cs @@ -32,8 +32,7 @@ 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, // 允许反击 } /// diff --git a/Assets/TcgEngine/Scripts/GameLogic/GameLogic.cs b/Assets/TcgEngine/Scripts/GameLogic/GameLogic.cs index 41f5b82..7400f48 100644 --- 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 diff --git a/Assets/TcgEngine/Scripts/Network/ResourceDownloader.cs b/Assets/TcgEngine/Scripts/Network/ResourceDownloader.cs index 5dca260..bce4d20 100644 --- 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校验失败,正在删除损坏的文件并重新下载...");