From 8a060e4e3786ffe215dc198fd7fa2219d3d9e6fa Mon Sep 17 00:00:00 2001 From: xianyi Date: Tue, 2 Sep 2025 17:04:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=A1=E7=89=B9=E7=90=B3=E5=A8=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CardAcitiveSkill/activate_105801.asset | 38 +++++++++++++++++ .../activate_105801.asset.meta | 8 ++++ .../CardAcitiveSkill/activate_105802.asset | 40 ++++++++++++++++++ .../activate_105802.asset.meta | 8 ++++ .../CardAcitiveSkill/activate_105803.asset | 39 +++++++++++++++++ .../activate_105803.asset.meta | 8 ++++ .../CardAcitiveSkill/activate_105821.asset | 42 +++++++++++++++++++ .../activate_105821.asset.meta | 8 ++++ .../Resources/Cards/HeroInfo/1058.asset | 12 ++++-- .../Resources/Conditions/camp_diguojun.asset | 7 +++- .../Resources/Conditions/camp_shouqun.asset | 7 +++- .../Conditions/camp_wangguojun.asset | 7 +++- .../Resources/Conditions/camp_xiemo.asset | 7 +++- .../Resources/Conditions/camp_yiyongjun.asset | 7 +++- .../Resources/Conditions/camp_ziyouren.asset | 7 +++- .../Resources/Conditions/has_all_trait.asset | 22 ++++++++++ .../Conditions/has_all_trait.asset.meta | 8 ++++ .../Resources/Conditions/is_artifact.asset | 7 +++- .../Resources/Conditions/is_blue.asset | 4 ++ .../Resources/Conditions/is_character.asset | 7 +++- .../Resources/Conditions/is_dragon.asset | 3 ++ .../Resources/Conditions/is_equipment.asset | 4 ++ .../Resources/Conditions/is_green.asset | 4 ++ .../Resources/Conditions/is_red.asset | 4 ++ .../Resources/Conditions/is_secret.asset | 7 +++- .../Resources/Conditions/is_spell.asset | 7 +++- .../Resources/Conditions/is_wolf.asset | 6 ++- .../Resources/Conditions/only_not_ssr.asset | 1 + .../Resources/Conditions/team_dark.asset | 3 ++ .../Resources/Conditions/team_fire.asset | 3 ++ .../Resources/Conditions/team_light.asset | 3 ++ .../Resources/Conditions/team_neutral.asset | 3 ++ .../Resources/Conditions/team_water.asset | 3 ++ .../Resources/Conditions/team_wink.asset | 3 ++ .../TcgEngine/Resources/Traits/pirate.asset | 17 ++++++++ .../Resources/Traits/pirate.asset.meta | 8 ++++ .../Scripts/Conditions/ConditionCardType.cs | 27 ++++++++++++ 37 files changed, 378 insertions(+), 21 deletions(-) create mode 100644 Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105801.asset create mode 100644 Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105801.asset.meta create mode 100644 Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105802.asset create mode 100644 Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105802.asset.meta create mode 100644 Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105803.asset create mode 100644 Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105803.asset.meta create mode 100644 Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105821.asset create mode 100644 Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105821.asset.meta create mode 100644 Assets/TcgEngine/Resources/Conditions/has_all_trait.asset create mode 100644 Assets/TcgEngine/Resources/Conditions/has_all_trait.asset.meta create mode 100644 Assets/TcgEngine/Resources/Traits/pirate.asset create mode 100644 Assets/TcgEngine/Resources/Traits/pirate.asset.meta diff --git a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105801.asset b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105801.asset new file mode 100644 index 0000000..8086763 --- /dev/null +++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105801.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_105801 + m_EditorClassIdentifier: + id: 105801 + 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: 9125387663047351618, guid: b66600b51774daa49964ead5c6a00c49, + type: 3} + projectile_fx: {fileID: 0} + cast_audio: {fileID: 0} + target_audio: {fileID: 0} + charge_target: 0 + title: "\u6D77\u76D7" + desc: "\u4F24\u5BB3+\u7981\u7597" diff --git a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105801.asset.meta b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105801.asset.meta new file mode 100644 index 0000000..56bb215 --- /dev/null +++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105801.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 49274e64677da44fea1e12489a469994 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105802.asset b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105802.asset new file mode 100644 index 0000000..df4eb93 --- /dev/null +++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105802.asset @@ -0,0 +1,40 @@ +%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_105802 + m_EditorClassIdentifier: + id: 105802 + trigger: 2 + conditions_trigger: [] + target: 10 + conditions_target: + - {fileID: 11400000, guid: 7463bf87d3794e249b7610c9de9c5327, type: 2} + - {fileID: 11400000, guid: ef09540f94d8428408b69fea46ec3334, type: 2} + - {fileID: 11400000, guid: b7f2109afe5834bb2b7c72224a073f60, type: 2} + filters_target: [] + effects: [] + status: [] + value: 0 + duration: 0 + chain_abilities: [] + mana_cost: 0 + 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: "\u6D77\u76D7\u7EDF\u5FA1" + desc: "\u4F24\u5BB3+\u7981\u7597" diff --git a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105802.asset.meta b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105802.asset.meta new file mode 100644 index 0000000..3534f8e --- /dev/null +++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105802.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 41dffefe45dc24a65a99e897ff39ee46 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105803.asset b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105803.asset new file mode 100644 index 0000000..a77ac5a --- /dev/null +++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105803.asset @@ -0,0 +1,39 @@ +%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_105803 + m_EditorClassIdentifier: + id: 105803 + trigger: 5 + conditions_trigger: [] + target: 1 + conditions_target: [] + filters_target: [] + effects: [] + status: + - {fileID: 11400000, guid: 83592925901bfac42a301332a4829af2, type: 2} + - {fileID: 11400000, guid: e7c01ab4617b9ab428b88fc9c435c6c4, type: 2} + value: 2 + duration: 2 + chain_abilities: [] + mana_cost: 0 + 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: +4 + desc: "\u4F24\u5BB3+\u7981\u7597" diff --git a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105803.asset.meta b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105803.asset.meta new file mode 100644 index 0000000..5666e5d --- /dev/null +++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105803.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4fdaaac5b050845dc90697cd53ea1f07 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105821.asset b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105821.asset new file mode 100644 index 0000000..0eaeb58 --- /dev/null +++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105821.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_105821 + m_EditorClassIdentifier: + id: 105821 + trigger: 2 + conditions_trigger: [] + target: 10 + conditions_target: + - {fileID: 11400000, guid: 7463bf87d3794e249b7610c9de9c5327, type: 2} + - {fileID: 11400000, guid: ef09540f94d8428408b69fea46ec3334, type: 2} + - {fileID: 11400000, guid: b7f2109afe5834bb2b7c72224a073f60, type: 2} + - {fileID: 11400000, guid: 065da32cbd133734493695579723a718, type: 2} + filters_target: [] + effects: + - {fileID: 11400000, guid: 4c4c317ae3dd4cf4982e8d7c7f1043b9, type: 2} + status: [] + value: 1 + duration: 0 + chain_abilities: [] + mana_cost: 0 + 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: +1 + desc: +1 diff --git a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105821.asset.meta b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105821.asset.meta new file mode 100644 index 0000000..b823f76 --- /dev/null +++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105821.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c548215a779af43c3a40dd84ab0148cf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TcgEngine/Resources/Cards/HeroInfo/1058.asset b/Assets/TcgEngine/Resources/Cards/HeroInfo/1058.asset index 48c3a33..8882b02 100644 --- a/Assets/TcgEngine/Resources/Cards/HeroInfo/1058.asset +++ b/Assets/TcgEngine/Resources/Cards/HeroInfo/1058.asset @@ -14,8 +14,8 @@ MonoBehaviour: m_EditorClassIdentifier: id: 1058 title: "\u5361\u7279\u7433\u5A1C" - art_full: {fileID: 21300000, guid: d2ec197d4022ca94d8dc1ee2d7eda955, type: 3} - art_board: {fileID: 21300000, guid: c3ac28cd1113c594ebe11a5f70251135, type: 3} + art_full_path: + art_board_path: type: 10 camp: 0 team: {fileID: 11400000, guid: 6bbb96863ece0314fb318c0fce569afc, type: 2} @@ -23,9 +23,13 @@ MonoBehaviour: mana: 6 attack: 5 hp: 24 - traits: [] + traits: + - {fileID: 11400000, guid: 1a5c64fd2344f4fcb94553ed85a6ae64, type: 2} stats: [] - abilities: [] + abilities: + - {fileID: 11400000, guid: 49274e64677da44fea1e12489a469994, type: 2} + - {fileID: 11400000, guid: 41dffefe45dc24a65a99e897ff39ee46, type: 2} + - {fileID: 11400000, guid: 4fdaaac5b050845dc90697cd53ea1f07, type: 2} text: "\u5361\u7279\u7433\u5A1C" desc: "\u9886\u8896\u2014\u2014\u6D77\u76D7\u3002\u590D\u4EC7\uFF1A\u654C\u65B9\u5361\u724C\u5BF9\u6B64\u724C\u9020\u6210\u4F24\u5BB3\u540E\uFF0C\u5BF9\u5176\u53D1\u52A8\u4E00\u6B21\u653B\u51FB\u6307\u4EE4\u3002\u7EDF\u5FA1\uFF1A\u82E5\u573A\u4E0A\u62E5\u6709\u56DB\u5F20\u6D77\u76D7\u5361\u724C\uFF0C\u5219\u6240\u6709\u6D77\u76D7\u5361\u724C\u653B\u51FB+1\u3002\r\n\uFF084\uFF09\uFF1A\u4E0B\u4E2A\u56DE\u5408\u5185\uFF0C\u5361\u7279\u7433\u5A1C\u653B\u51FB\u529B+2\uFF0C\u5BF9\u65B9\u53EA\u80FD\u4EE5\u5361\u7279\u7433\u5A1C\u4F5C\u4E3A\u653B\u51FB\u548C\u6280\u80FD\u76EE\u6807\u3002" spawn_fx: {fileID: 9125387663047351618, guid: bac685160af4aff46ae561a51da6f5f4, diff --git a/Assets/TcgEngine/Resources/Conditions/camp_diguojun.asset b/Assets/TcgEngine/Resources/Conditions/camp_diguojun.asset index 06cc94c..6672cf9 100644 --- a/Assets/TcgEngine/Resources/Conditions/camp_diguojun.asset +++ b/Assets/TcgEngine/Resources/Conditions/camp_diguojun.asset @@ -14,6 +14,9 @@ MonoBehaviour: m_EditorClassIdentifier: has_type: 0 has_team: {fileID: 0} - has_trait: {fileID: 11400000, guid: 9124c4a8561cfd14d812a55b3e885662, type: 2} - has_camp: -1 + has_trait: {fileID: 0} + has_camp: 20 + has_rarity: {fileID: 0} + exclude_rarity: {fileID: 0} + allCardTrait: {fileID: 0} oper: 0 diff --git a/Assets/TcgEngine/Resources/Conditions/camp_shouqun.asset b/Assets/TcgEngine/Resources/Conditions/camp_shouqun.asset index 3e5660f..1e41fea 100644 --- a/Assets/TcgEngine/Resources/Conditions/camp_shouqun.asset +++ b/Assets/TcgEngine/Resources/Conditions/camp_shouqun.asset @@ -14,6 +14,9 @@ MonoBehaviour: m_EditorClassIdentifier: has_type: 0 has_team: {fileID: 0} - has_trait: {fileID: 11400000, guid: 9124c4a8561cfd14d812a55b3e885662, type: 2} - has_camp: -1 + has_trait: {fileID: 0} + has_camp: 30 + has_rarity: {fileID: 0} + exclude_rarity: {fileID: 0} + allCardTrait: {fileID: 0} oper: 0 diff --git a/Assets/TcgEngine/Resources/Conditions/camp_wangguojun.asset b/Assets/TcgEngine/Resources/Conditions/camp_wangguojun.asset index b3101f7..842f025 100644 --- a/Assets/TcgEngine/Resources/Conditions/camp_wangguojun.asset +++ b/Assets/TcgEngine/Resources/Conditions/camp_wangguojun.asset @@ -14,6 +14,9 @@ MonoBehaviour: m_EditorClassIdentifier: has_type: 0 has_team: {fileID: 0} - has_trait: {fileID: 11400000, guid: 9124c4a8561cfd14d812a55b3e885662, type: 2} - has_camp: -1 + has_trait: {fileID: 0} + has_camp: 10 + has_rarity: {fileID: 0} + exclude_rarity: {fileID: 0} + allCardTrait: {fileID: 0} oper: 0 diff --git a/Assets/TcgEngine/Resources/Conditions/camp_xiemo.asset b/Assets/TcgEngine/Resources/Conditions/camp_xiemo.asset index 486d15a..a832237 100644 --- a/Assets/TcgEngine/Resources/Conditions/camp_xiemo.asset +++ b/Assets/TcgEngine/Resources/Conditions/camp_xiemo.asset @@ -14,6 +14,9 @@ MonoBehaviour: m_EditorClassIdentifier: has_type: 0 has_team: {fileID: 0} - has_trait: {fileID: 11400000, guid: 9124c4a8561cfd14d812a55b3e885662, type: 2} - has_camp: -1 + has_trait: {fileID: 0} + has_camp: 40 + has_rarity: {fileID: 0} + exclude_rarity: {fileID: 0} + allCardTrait: {fileID: 0} oper: 0 diff --git a/Assets/TcgEngine/Resources/Conditions/camp_yiyongjun.asset b/Assets/TcgEngine/Resources/Conditions/camp_yiyongjun.asset index 4bec1d6..9a051c2 100644 --- a/Assets/TcgEngine/Resources/Conditions/camp_yiyongjun.asset +++ b/Assets/TcgEngine/Resources/Conditions/camp_yiyongjun.asset @@ -14,6 +14,9 @@ MonoBehaviour: m_EditorClassIdentifier: has_type: 0 has_team: {fileID: 0} - has_trait: {fileID: 11400000, guid: 9124c4a8561cfd14d812a55b3e885662, type: 2} - has_camp: -1 + has_trait: {fileID: 0} + has_camp: 5 + has_rarity: {fileID: 0} + exclude_rarity: {fileID: 0} + allCardTrait: {fileID: 0} oper: 0 diff --git a/Assets/TcgEngine/Resources/Conditions/camp_ziyouren.asset b/Assets/TcgEngine/Resources/Conditions/camp_ziyouren.asset index af89678..6706df8 100644 --- a/Assets/TcgEngine/Resources/Conditions/camp_ziyouren.asset +++ b/Assets/TcgEngine/Resources/Conditions/camp_ziyouren.asset @@ -14,6 +14,9 @@ MonoBehaviour: m_EditorClassIdentifier: has_type: 0 has_team: {fileID: 0} - has_trait: {fileID: 11400000, guid: 9124c4a8561cfd14d812a55b3e885662, type: 2} - has_camp: -1 + has_trait: {fileID: 0} + has_camp: 0 + has_rarity: {fileID: 0} + exclude_rarity: {fileID: 0} + allCardTrait: {fileID: 0} oper: 0 diff --git a/Assets/TcgEngine/Resources/Conditions/has_all_trait.asset b/Assets/TcgEngine/Resources/Conditions/has_all_trait.asset new file mode 100644 index 0000000..338aa82 --- /dev/null +++ b/Assets/TcgEngine/Resources/Conditions/has_all_trait.asset @@ -0,0 +1,22 @@ +%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: d028860b966ab8f44908a62e25280a39, type: 3} + m_Name: has_all_trait + m_EditorClassIdentifier: + has_type: 0 + has_team: {fileID: 0} + has_trait: {fileID: 0} + has_camp: -1 + has_rarity: {fileID: 0} + exclude_rarity: {fileID: 0} + allCardTrait: {fileID: 11400000, guid: 1a5c64fd2344f4fcb94553ed85a6ae64, type: 2} + oper: 0 diff --git a/Assets/TcgEngine/Resources/Conditions/has_all_trait.asset.meta b/Assets/TcgEngine/Resources/Conditions/has_all_trait.asset.meta new file mode 100644 index 0000000..d411d98 --- /dev/null +++ b/Assets/TcgEngine/Resources/Conditions/has_all_trait.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b7f2109afe5834bb2b7c72224a073f60 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TcgEngine/Resources/Conditions/is_artifact.asset b/Assets/TcgEngine/Resources/Conditions/is_artifact.asset index 16f4c6d..04951fa 100644 --- a/Assets/TcgEngine/Resources/Conditions/is_artifact.asset +++ b/Assets/TcgEngine/Resources/Conditions/is_artifact.asset @@ -13,5 +13,10 @@ MonoBehaviour: m_Name: is_artifact m_EditorClassIdentifier: has_type: 30 - has_team: 0 + has_team: {fileID: 0} + has_trait: {fileID: 0} + has_camp: -1 + has_rarity: {fileID: 0} + exclude_rarity: {fileID: 0} + allCardTrait: {fileID: 0} oper: 0 diff --git a/Assets/TcgEngine/Resources/Conditions/is_blue.asset b/Assets/TcgEngine/Resources/Conditions/is_blue.asset index f54102d..f4d5e4c 100644 --- a/Assets/TcgEngine/Resources/Conditions/is_blue.asset +++ b/Assets/TcgEngine/Resources/Conditions/is_blue.asset @@ -15,4 +15,8 @@ MonoBehaviour: has_type: 0 has_team: {fileID: 11400000, guid: ed6dfd9dc7797584994eaf1fba66535f, type: 2} has_trait: {fileID: 0} + has_camp: -1 + has_rarity: {fileID: 0} + exclude_rarity: {fileID: 0} + allCardTrait: {fileID: 0} oper: 0 diff --git a/Assets/TcgEngine/Resources/Conditions/is_character.asset b/Assets/TcgEngine/Resources/Conditions/is_character.asset index 1b50eb6..445bad8 100644 --- a/Assets/TcgEngine/Resources/Conditions/is_character.asset +++ b/Assets/TcgEngine/Resources/Conditions/is_character.asset @@ -13,5 +13,10 @@ MonoBehaviour: m_Name: is_character m_EditorClassIdentifier: has_type: 10 - has_team: 0 + has_team: {fileID: 0} + has_trait: {fileID: 0} + has_camp: -1 + has_rarity: {fileID: 0} + exclude_rarity: {fileID: 0} + allCardTrait: {fileID: 0} oper: 0 diff --git a/Assets/TcgEngine/Resources/Conditions/is_dragon.asset b/Assets/TcgEngine/Resources/Conditions/is_dragon.asset index 7d4bbcd..c869170 100644 --- a/Assets/TcgEngine/Resources/Conditions/is_dragon.asset +++ b/Assets/TcgEngine/Resources/Conditions/is_dragon.asset @@ -16,4 +16,7 @@ MonoBehaviour: has_team: {fileID: 0} has_trait: {fileID: 11400000, guid: 9124c4a8561cfd14d812a55b3e885662, type: 2} has_camp: -1 + has_rarity: {fileID: 0} + exclude_rarity: {fileID: 0} + allCardCamp: -1 oper: 0 diff --git a/Assets/TcgEngine/Resources/Conditions/is_equipment.asset b/Assets/TcgEngine/Resources/Conditions/is_equipment.asset index 8312433..35d4773 100644 --- a/Assets/TcgEngine/Resources/Conditions/is_equipment.asset +++ b/Assets/TcgEngine/Resources/Conditions/is_equipment.asset @@ -15,4 +15,8 @@ MonoBehaviour: has_type: 50 has_team: {fileID: 0} has_trait: {fileID: 0} + has_camp: -1 + has_rarity: {fileID: 0} + exclude_rarity: {fileID: 0} + allCardTrait: {fileID: 0} oper: 0 diff --git a/Assets/TcgEngine/Resources/Conditions/is_green.asset b/Assets/TcgEngine/Resources/Conditions/is_green.asset index 8e391c4..2687453 100644 --- a/Assets/TcgEngine/Resources/Conditions/is_green.asset +++ b/Assets/TcgEngine/Resources/Conditions/is_green.asset @@ -15,4 +15,8 @@ MonoBehaviour: has_type: 0 has_team: {fileID: 11400000, guid: b80d8061c5bdb2e408e62a08e0e743ca, type: 2} has_trait: {fileID: 0} + has_camp: 0 + has_rarity: {fileID: 0} + exclude_rarity: {fileID: 0} + allCardCamp: -1 oper: 0 diff --git a/Assets/TcgEngine/Resources/Conditions/is_red.asset b/Assets/TcgEngine/Resources/Conditions/is_red.asset index bb0e59e..8bfa190 100644 --- a/Assets/TcgEngine/Resources/Conditions/is_red.asset +++ b/Assets/TcgEngine/Resources/Conditions/is_red.asset @@ -15,4 +15,8 @@ MonoBehaviour: has_type: 0 has_team: {fileID: 11400000, guid: 6bbb96863ece0314fb318c0fce569afc, type: 2} has_trait: {fileID: 0} + has_camp: -1 + has_rarity: {fileID: 0} + exclude_rarity: {fileID: 0} + allCardTrait: {fileID: 0} oper: 0 diff --git a/Assets/TcgEngine/Resources/Conditions/is_secret.asset b/Assets/TcgEngine/Resources/Conditions/is_secret.asset index c3b706f..3762f29 100644 --- a/Assets/TcgEngine/Resources/Conditions/is_secret.asset +++ b/Assets/TcgEngine/Resources/Conditions/is_secret.asset @@ -13,5 +13,10 @@ MonoBehaviour: m_Name: is_secret m_EditorClassIdentifier: has_type: 40 - has_team: 0 + has_team: {fileID: 0} + has_trait: {fileID: 0} + has_camp: -1 + has_rarity: {fileID: 0} + exclude_rarity: {fileID: 0} + allCardTrait: {fileID: 0} oper: 0 diff --git a/Assets/TcgEngine/Resources/Conditions/is_spell.asset b/Assets/TcgEngine/Resources/Conditions/is_spell.asset index b266fe1..9f68657 100644 --- a/Assets/TcgEngine/Resources/Conditions/is_spell.asset +++ b/Assets/TcgEngine/Resources/Conditions/is_spell.asset @@ -13,5 +13,10 @@ MonoBehaviour: m_Name: is_spell m_EditorClassIdentifier: has_type: 20 - has_team: 0 + has_team: {fileID: 0} + has_trait: {fileID: 0} + has_camp: -1 + has_rarity: {fileID: 0} + exclude_rarity: {fileID: 0} + allCardTrait: {fileID: 0} oper: 0 diff --git a/Assets/TcgEngine/Resources/Conditions/is_wolf.asset b/Assets/TcgEngine/Resources/Conditions/is_wolf.asset index d20a886..a230664 100644 --- a/Assets/TcgEngine/Resources/Conditions/is_wolf.asset +++ b/Assets/TcgEngine/Resources/Conditions/is_wolf.asset @@ -13,6 +13,10 @@ MonoBehaviour: m_Name: is_wolf m_EditorClassIdentifier: has_type: 0 - has_team: 0 + has_team: {fileID: 0} has_trait: {fileID: 11400000, guid: 9436e14bc49faf74595ac5f19b793ba3, type: 2} + has_camp: -1 + has_rarity: {fileID: 0} + exclude_rarity: {fileID: 0} + allCardTrait: {fileID: 0} oper: 0 diff --git a/Assets/TcgEngine/Resources/Conditions/only_not_ssr.asset b/Assets/TcgEngine/Resources/Conditions/only_not_ssr.asset index 7517ed9..1e3e1d1 100644 --- a/Assets/TcgEngine/Resources/Conditions/only_not_ssr.asset +++ b/Assets/TcgEngine/Resources/Conditions/only_not_ssr.asset @@ -18,4 +18,5 @@ MonoBehaviour: has_camp: -1 has_rarity: {fileID: 0} exclude_rarity: {fileID: 11400000, guid: ff02c02b61217a54fb70114f29f0122d, type: 2} + allCardCamp: -1 oper: 0 diff --git a/Assets/TcgEngine/Resources/Conditions/team_dark.asset b/Assets/TcgEngine/Resources/Conditions/team_dark.asset index f4d97eb..cd60939 100644 --- a/Assets/TcgEngine/Resources/Conditions/team_dark.asset +++ b/Assets/TcgEngine/Resources/Conditions/team_dark.asset @@ -16,4 +16,7 @@ MonoBehaviour: has_team: {fileID: 11400000, guid: dcedff0b71bb54b8e998c0713fd12e3e, type: 2} has_trait: {fileID: 0} has_camp: -1 + has_rarity: {fileID: 0} + exclude_rarity: {fileID: 0} + allCardCamp: -1 oper: 0 diff --git a/Assets/TcgEngine/Resources/Conditions/team_fire.asset b/Assets/TcgEngine/Resources/Conditions/team_fire.asset index b97807d..11e7e28 100644 --- a/Assets/TcgEngine/Resources/Conditions/team_fire.asset +++ b/Assets/TcgEngine/Resources/Conditions/team_fire.asset @@ -16,4 +16,7 @@ MonoBehaviour: has_team: {fileID: 11400000, guid: 6bbb96863ece0314fb318c0fce569afc, type: 2} has_trait: {fileID: 0} has_camp: -1 + has_rarity: {fileID: 0} + exclude_rarity: {fileID: 0} + allCardCamp: -1 oper: 0 diff --git a/Assets/TcgEngine/Resources/Conditions/team_light.asset b/Assets/TcgEngine/Resources/Conditions/team_light.asset index 6eba5be..258e52e 100644 --- a/Assets/TcgEngine/Resources/Conditions/team_light.asset +++ b/Assets/TcgEngine/Resources/Conditions/team_light.asset @@ -16,4 +16,7 @@ MonoBehaviour: has_team: {fileID: 11400000, guid: 8e4b9ddb3f79d4ac9bc510c5bdc9e576, type: 2} has_trait: {fileID: 0} has_camp: -1 + has_rarity: {fileID: 0} + exclude_rarity: {fileID: 0} + allCardCamp: -1 oper: 0 diff --git a/Assets/TcgEngine/Resources/Conditions/team_neutral.asset b/Assets/TcgEngine/Resources/Conditions/team_neutral.asset index 2343a9f..3b0def4 100644 --- a/Assets/TcgEngine/Resources/Conditions/team_neutral.asset +++ b/Assets/TcgEngine/Resources/Conditions/team_neutral.asset @@ -16,4 +16,7 @@ MonoBehaviour: has_team: {fileID: 11400000, guid: 44accef98e769754d9edb8fe6051443a, type: 2} has_trait: {fileID: 0} has_camp: -1 + has_rarity: {fileID: 0} + exclude_rarity: {fileID: 0} + allCardCamp: -1 oper: 0 diff --git a/Assets/TcgEngine/Resources/Conditions/team_water.asset b/Assets/TcgEngine/Resources/Conditions/team_water.asset index 4850ef6..d30dba0 100644 --- a/Assets/TcgEngine/Resources/Conditions/team_water.asset +++ b/Assets/TcgEngine/Resources/Conditions/team_water.asset @@ -16,4 +16,7 @@ MonoBehaviour: has_team: {fileID: 11400000, guid: ed6dfd9dc7797584994eaf1fba66535f, type: 2} has_trait: {fileID: 0} has_camp: -1 + has_rarity: {fileID: 0} + exclude_rarity: {fileID: 0} + allCardCamp: -1 oper: 0 diff --git a/Assets/TcgEngine/Resources/Conditions/team_wink.asset b/Assets/TcgEngine/Resources/Conditions/team_wink.asset index f1aa4d8..f1c92bc 100644 --- a/Assets/TcgEngine/Resources/Conditions/team_wink.asset +++ b/Assets/TcgEngine/Resources/Conditions/team_wink.asset @@ -16,4 +16,7 @@ MonoBehaviour: has_team: {fileID: 11400000, guid: a85e46b2e94eb463bafb4bd0d7920745, type: 2} has_trait: {fileID: 0} has_camp: -1 + has_rarity: {fileID: 0} + exclude_rarity: {fileID: 0} + allCardCamp: -1 oper: 0 diff --git a/Assets/TcgEngine/Resources/Traits/pirate.asset b/Assets/TcgEngine/Resources/Traits/pirate.asset new file mode 100644 index 0000000..956d341 --- /dev/null +++ b/Assets/TcgEngine/Resources/Traits/pirate.asset @@ -0,0 +1,17 @@ +%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: 510a78cb12497a646b6e2a8ba36b4dcf, type: 3} + m_Name: pirate + m_EditorClassIdentifier: + id: pirate + title: pirate + icon: {fileID: 0} diff --git a/Assets/TcgEngine/Resources/Traits/pirate.asset.meta b/Assets/TcgEngine/Resources/Traits/pirate.asset.meta new file mode 100644 index 0000000..20dbd3d --- /dev/null +++ b/Assets/TcgEngine/Resources/Traits/pirate.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1a5c64fd2344f4fcb94553ed85a6ae64 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TcgEngine/Scripts/Conditions/ConditionCardType.cs b/Assets/TcgEngine/Scripts/Conditions/ConditionCardType.cs index 376c1e3..245b6c0 100644 --- a/Assets/TcgEngine/Scripts/Conditions/ConditionCardType.cs +++ b/Assets/TcgEngine/Scripts/Conditions/ConditionCardType.cs @@ -19,10 +19,37 @@ namespace TcgEngine public RarityData has_rarity; public RarityData exclude_rarity; + [Header("All cards on board are of camp")] + public TraitData allCardTrait; + public ConditionOperatorBool oper; public override bool IsTargetConditionMet(Game data, AbilityData ability, Card caster, Card target) { + // 检查allCardTrait条件 + if (allCardTrait != null && caster != null) + { + Player casterPlayer = data.GetPlayer(caster.player_id); + if (casterPlayer != null) + { + // 检查场上所有卡牌 + foreach (Card boardCard in casterPlayer.cards_board) + { + if (!boardCard.HasTrait(allCardTrait)) + { + return false; // 如果有任何一张卡牌没有指定特性，返回false + } + } + + if (casterPlayer.cards_board.Count == 0 && casterPlayer.cards_equip.Count == 0) + { + return false; + } + + Debug.Log("所有卡牌都具有指定特性 " + allCardTrait.id); + } + } + return CompareBool(IsTrait(target), oper); }