diff --git a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104601.asset b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104601.asset new file mode 100644 index 0000000..4ee06e0 --- /dev/null +++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104601.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_104601 + m_EditorClassIdentifier: + id: 104601 + trigger: 5 + conditions_trigger: [] + target: 30 + conditions_target: + - {fileID: 11400000, guid: 902733d12f434e94b904de5ebf4112de, type: 2} + - {fileID: 11400000, guid: 41c58513071a53b4e9066a58c439760f, type: 2} + - {fileID: 11400000, guid: ef09540f94d8428408b69fea46ec3334, type: 2} + filters_target: [] + effects: + - {fileID: 11400000, guid: 4369324687c62ca488c57afd73a2be36, type: 2} + status: [] + value: 10 + duration: 0 + chain_abilities: + - {fileID: 11400000, guid: 40d1c3a6bbb804b5694ef2969884d61e, type: 2} + 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: "\u4E2D\u6BD2" + desc: "\u4F24" diff --git a/Assets/TcgEngine/Resources/Teams/forest.asset.meta b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104601.asset.meta similarity index 79% rename from Assets/TcgEngine/Resources/Teams/forest.asset.meta rename to Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104601.asset.meta index 1b4f865..04142ff 100644 --- a/Assets/TcgEngine/Resources/Teams/forest.asset.meta +++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104601.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b80d8061c5bdb2e408e62a08e0e743ca +guid: fc64e614a721144ba9811e364874c126 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104611.asset b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104611.asset new file mode 100644 index 0000000..4ff3426 --- /dev/null +++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104611.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_104611 + m_EditorClassIdentifier: + id: 104611 + trigger: 0 + conditions_trigger: [] + target: 72 + conditions_target: [] + filters_target: [] + effects: [] + status: + - {fileID: 11400000, guid: 0575c2a0156c025489185876f380ee7e, type: 2} + value: 2 + 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: "\u4E2D\u6BD2" + desc: "\u4F24" diff --git a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104611.asset.meta b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104611.asset.meta new file mode 100644 index 0000000..dcdba56 --- /dev/null +++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104611.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 40d1c3a6bbb804b5694ef2969884d61e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104801.asset b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104801.asset new file mode 100644 index 0000000..54d1102 --- /dev/null +++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104801.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_104801 + m_EditorClassIdentifier: + id: 104801 + trigger: 5 + conditions_trigger: [] + target: 30 + conditions_target: + - {fileID: 11400000, guid: 902733d12f434e94b904de5ebf4112de, type: 2} + - {fileID: 11400000, guid: 41c58513071a53b4e9066a58c439760f, type: 2} + filters_target: [] + effects: + - {fileID: 11400000, guid: 54fe12841e9154b6999f066e0713b046, type: 2} + status: [] + value: 10 + 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: "\u51FB\u6740\u53EC\u5524\u52A9\u624B" + desc: "\u4F24" diff --git a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104801.asset.meta b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104801.asset.meta new file mode 100644 index 0000000..e6d9888 --- /dev/null +++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104801.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e4fc67090dfd749a2b2bd1def97308cd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104811.asset b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104811.asset new file mode 100644 index 0000000..9f7f40f --- /dev/null +++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104811.asset @@ -0,0 +1,41 @@ +%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_104811 + m_EditorClassIdentifier: + id: 104811 + trigger: 0 + conditions_trigger: [] + target: 15 + conditions_target: + - {fileID: 11400000, guid: 7463bf87d3794e249b7610c9de9c5327, type: 2} + - {fileID: 11400000, guid: dfcba82135ff9a7408e821bcdad2fd39, type: 2} + filters_target: + - {fileID: 11400000, guid: 507a3373a2fe2e7419a20621a468048f, type: 2} + effects: + - {fileID: 11400000, guid: 95fad4aeea26b0c45920ede7c021f75f, type: 2} + 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: "\u53EC\u5524\u89E6\u624B" + desc: "\u4F24" diff --git a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104811.asset.meta b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104811.asset.meta new file mode 100644 index 0000000..959b748 --- /dev/null +++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104811.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6684238849c8440f287b48861b54b52a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104901.asset b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104901.asset new file mode 100644 index 0000000..d2cc5df --- /dev/null +++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104901.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_104901 + m_EditorClassIdentifier: + id: 104901 + trigger: 5 + conditions_trigger: [] + target: 30 + conditions_target: + - {fileID: 11400000, guid: 902733d12f434e94b904de5ebf4112de, type: 2} + - {fileID: 11400000, guid: 41c58513071a53b4e9066a58c439760f, type: 2} + - {fileID: 11400000, guid: dd9d44dc1f52c444d81f5035c2c19a50, type: 2} + filters_target: [] + effects: + - {fileID: 11400000, guid: e2bf0256d75a94014a056fbbc74e709b, type: 2} + status: [] + value: 0 + duration: 0 + chain_abilities: + - {fileID: 11400000, guid: 9cbc3c8a45c4a4d58b51f0a4ba503ad6, type: 2} + 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: "\u56DE\u624B\u65BD\u653E(2): \u5C06\u4E00\u5F20\u6CD5\u672F\u724C\u9001\u56DE\u4F60\u7684\u624B\u724C\u3002" desc: spawn_fx: {fileID: 9125387663047351618, guid: bac685160af4aff46ae561a51da6f5f4, diff --git a/Assets/TcgEngine/Resources/Cards/Water/fish.asset b/Assets/TcgEngine/Resources/Cards/Water/fish.asset index 37e6e35..4fe213f 100644 --- a/Assets/TcgEngine/Resources/Cards/Water/fish.asset +++ b/Assets/TcgEngine/Resources/Cards/Water/fish.asset @@ -14,14 +14,12 @@ MonoBehaviour: m_EditorClassIdentifier: id: fish title: "\u9C7C" - art_full: {fileID: 21300000, guid: b2db8c6ecb5b1b64cbf5abac9d783ddc, type: 3} - art_board: {fileID: 21300000, guid: 68c5a00c7e31297439b6342a300a89d9, type: 3} art_full_path: Cards/fish.png art_board_path: CardsBoard/fish_board.png type: 10 camp: 0 team: {fileID: 11400000, guid: ed6dfd9dc7797584994eaf1fba66535f, type: 2} - rarity: {fileID: 11400000, guid: fab1a52f5a36cc942985dea95be18ac9, type: 2} + rarity: {fileID: 11400000, guid: ff02c02b61217a54fb70114f29f0122d, type: 2} mana: 1 attack: 1 hp: 1 diff --git a/Assets/TcgEngine/Resources/Conditions/only_not_ssr.asset b/Assets/TcgEngine/Resources/Conditions/only_not_ssr.asset new file mode 100644 index 0000000..7517ed9 --- /dev/null +++ b/Assets/TcgEngine/Resources/Conditions/only_not_ssr.asset @@ -0,0 +1,21 @@ +%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: only_not_ssr + m_EditorClassIdentifier: + has_type: 0 + has_team: {fileID: 0} + has_trait: {fileID: 0} + has_camp: -1 + has_rarity: {fileID: 0} + exclude_rarity: {fileID: 11400000, guid: ff02c02b61217a54fb70114f29f0122d, type: 2} + oper: 0 diff --git a/Assets/TcgEngine/Resources/Conditions/only_not_ssr.asset.meta b/Assets/TcgEngine/Resources/Conditions/only_not_ssr.asset.meta new file mode 100644 index 0000000..7a849e2 --- /dev/null +++ b/Assets/TcgEngine/Resources/Conditions/only_not_ssr.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dd9d44dc1f52c444d81f5035c2c19a50 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TcgEngine/Resources/Teams/forest.asset b/Assets/TcgEngine/Resources/Conditions/team_dark.asset similarity index 53% rename from Assets/TcgEngine/Resources/Teams/forest.asset rename to Assets/TcgEngine/Resources/Conditions/team_dark.asset index 91c4c72..f4d97eb 100644 --- a/Assets/TcgEngine/Resources/Teams/forest.asset +++ b/Assets/TcgEngine/Resources/Conditions/team_dark.asset @@ -9,10 +9,11 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55e41d6c5fb036a40bc0a37bfe1f52ac, type: 3} - m_Name: forest + m_Script: {fileID: 11500000, guid: d028860b966ab8f44908a62e25280a39, type: 3} + m_Name: team_dark m_EditorClassIdentifier: - id: forest - title: Forest - icon: {fileID: 21300000, guid: d9c34e3dd92c08d479c93826f3ad9a01, type: 3} - color: {r: 0.2789343, g: 0.6792453, b: 0.060234927, a: 1} + has_type: 0 + has_team: {fileID: 11400000, guid: dcedff0b71bb54b8e998c0713fd12e3e, type: 2} + has_trait: {fileID: 0} + has_camp: -1 + oper: 0 diff --git a/Assets/TcgEngine/Resources/Conditions/team_dark.asset.meta b/Assets/TcgEngine/Resources/Conditions/team_dark.asset.meta new file mode 100644 index 0000000..aa46672 --- /dev/null +++ b/Assets/TcgEngine/Resources/Conditions/team_dark.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 684693e77864745c2a3cfe758a65ba23 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TcgEngine/Resources/Conditions/team_fire.asset b/Assets/TcgEngine/Resources/Conditions/team_fire.asset new file mode 100644 index 0000000..b97807d --- /dev/null +++ b/Assets/TcgEngine/Resources/Conditions/team_fire.asset @@ -0,0 +1,19 @@ +%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: team_fire + m_EditorClassIdentifier: + has_type: 0 + has_team: {fileID: 11400000, guid: 6bbb96863ece0314fb318c0fce569afc, type: 2} + has_trait: {fileID: 0} + has_camp: -1 + oper: 0 diff --git a/Assets/TcgEngine/Resources/Conditions/team_fire.asset.meta b/Assets/TcgEngine/Resources/Conditions/team_fire.asset.meta new file mode 100644 index 0000000..582be08 --- /dev/null +++ b/Assets/TcgEngine/Resources/Conditions/team_fire.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 47f81166a11284919ae6d8d39b5eecc3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TcgEngine/Resources/Conditions/team_light.asset b/Assets/TcgEngine/Resources/Conditions/team_light.asset new file mode 100644 index 0000000..6eba5be --- /dev/null +++ b/Assets/TcgEngine/Resources/Conditions/team_light.asset @@ -0,0 +1,19 @@ +%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: team_light + m_EditorClassIdentifier: + has_type: 0 + has_team: {fileID: 11400000, guid: 8e4b9ddb3f79d4ac9bc510c5bdc9e576, type: 2} + has_trait: {fileID: 0} + has_camp: -1 + oper: 0 diff --git a/Assets/TcgEngine/Resources/Conditions/team_light.asset.meta b/Assets/TcgEngine/Resources/Conditions/team_light.asset.meta new file mode 100644 index 0000000..4eabb60 --- /dev/null +++ b/Assets/TcgEngine/Resources/Conditions/team_light.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 69302b89741a3487abf38f7c9ccc706a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TcgEngine/Resources/Conditions/team_neutral.asset b/Assets/TcgEngine/Resources/Conditions/team_neutral.asset new file mode 100644 index 0000000..2343a9f --- /dev/null +++ b/Assets/TcgEngine/Resources/Conditions/team_neutral.asset @@ -0,0 +1,19 @@ +%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: team_neutral + m_EditorClassIdentifier: + has_type: 0 + has_team: {fileID: 11400000, guid: 44accef98e769754d9edb8fe6051443a, type: 2} + has_trait: {fileID: 0} + has_camp: -1 + oper: 0 diff --git a/Assets/TcgEngine/Resources/Conditions/team_neutral.asset.meta b/Assets/TcgEngine/Resources/Conditions/team_neutral.asset.meta new file mode 100644 index 0000000..21fa6ee --- /dev/null +++ b/Assets/TcgEngine/Resources/Conditions/team_neutral.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3df93f28d75934890810585aa9033008 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TcgEngine/Resources/Conditions/team_water.asset b/Assets/TcgEngine/Resources/Conditions/team_water.asset new file mode 100644 index 0000000..4850ef6 --- /dev/null +++ b/Assets/TcgEngine/Resources/Conditions/team_water.asset @@ -0,0 +1,19 @@ +%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: team_water + m_EditorClassIdentifier: + has_type: 0 + has_team: {fileID: 11400000, guid: ed6dfd9dc7797584994eaf1fba66535f, type: 2} + has_trait: {fileID: 0} + has_camp: -1 + oper: 0 diff --git a/Assets/TcgEngine/Resources/Conditions/team_water.asset.meta b/Assets/TcgEngine/Resources/Conditions/team_water.asset.meta new file mode 100644 index 0000000..0bbed63 --- /dev/null +++ b/Assets/TcgEngine/Resources/Conditions/team_water.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f2dda094bc9b841bc8d6a35021d1fd46 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TcgEngine/Resources/Conditions/team_wink.asset b/Assets/TcgEngine/Resources/Conditions/team_wink.asset new file mode 100644 index 0000000..f1aa4d8 --- /dev/null +++ b/Assets/TcgEngine/Resources/Conditions/team_wink.asset @@ -0,0 +1,19 @@ +%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: team_wink + m_EditorClassIdentifier: + has_type: 0 + has_team: {fileID: 11400000, guid: a85e46b2e94eb463bafb4bd0d7920745, type: 2} + has_trait: {fileID: 0} + has_camp: -1 + oper: 0 diff --git a/Assets/TcgEngine/Resources/Conditions/team_wink.asset.meta b/Assets/TcgEngine/Resources/Conditions/team_wink.asset.meta new file mode 100644 index 0000000..bf94ac9 --- /dev/null +++ b/Assets/TcgEngine/Resources/Conditions/team_wink.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ca400d47300bf47289442bf061249bca +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TcgEngine/Resources/Decks/water_deck.asset b/Assets/TcgEngine/Resources/Decks/water_deck.asset index b2196ed..5344c09 100644 --- a/Assets/TcgEngine/Resources/Decks/water_deck.asset +++ b/Assets/TcgEngine/Resources/Decks/water_deck.asset @@ -17,14 +17,14 @@ MonoBehaviour: hero: {fileID: 11400000, guid: 111d60b13ae137f4597da2789d94ecce, type: 2} cards: - {fileID: 11400000, guid: 89f3d73097f233148896600d94d482c0, type: 2} - - {fileID: 11400000, guid: f11bd6abea1b4c24ab733ae003dfa279, type: 2} - - {fileID: 11400000, guid: f11bd6abea1b4c24ab733ae003dfa279, type: 2} - - {fileID: 11400000, guid: 3eb5d82b098a31640981aa400ef099f0, type: 2} - - {fileID: 11400000, guid: 3eb5d82b098a31640981aa400ef099f0, type: 2} - - {fileID: 11400000, guid: 7522cb2b475fdca45aae97664d79e53c, type: 2} - {fileID: 11400000, guid: 89f3d73097f233148896600d94d482c0, type: 2} - - {fileID: 11400000, guid: 6d25f87d5e8912e4aae6b2e8cdb51378, type: 2} - - {fileID: 11400000, guid: e777946125cd2eb49a3b2ac17bea169a, type: 2} + - {fileID: 11400000, guid: 89f3d73097f233148896600d94d482c0, type: 2} + - {fileID: 11400000, guid: 3eb5d82b098a31640981aa400ef099f0, type: 2} + - {fileID: 11400000, guid: 3eb5d82b098a31640981aa400ef099f0, type: 2} + - {fileID: 11400000, guid: 3eb5d82b098a31640981aa400ef099f0, type: 2} + - {fileID: 11400000, guid: 3eb5d82b098a31640981aa400ef099f0, type: 2} + - {fileID: 11400000, guid: 3eb5d82b098a31640981aa400ef099f0, type: 2} + - {fileID: 11400000, guid: 3eb5d82b098a31640981aa400ef099f0, type: 2} + - {fileID: 11400000, guid: 3eb5d82b098a31640981aa400ef099f0, type: 2} + - {fileID: 11400000, guid: 3eb5d82b098a31640981aa400ef099f0, type: 2} - {fileID: 11400000, guid: 3eb5d82b098a31640981aa400ef099f0, type: 2} - - {fileID: 11400000, guid: 74ffbe8087a7ec64696352b9013d5d21, type: 2} - - {fileID: 11400000, guid: ee0eb5f42cd646d4c92cc5bae97f8512, type: 2} diff --git a/Assets/TcgEngine/Resources/Effects/damage_kill_104811.asset b/Assets/TcgEngine/Resources/Effects/damage_kill_104811.asset new file mode 100644 index 0000000..02f5c99 --- /dev/null +++ b/Assets/TcgEngine/Resources/Effects/damage_kill_104811.asset @@ -0,0 +1,18 @@ +%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: 31aa9b0b846e37e47bb7896cc026a560, type: 3} + m_Name: damage_kill_104811 + m_EditorClassIdentifier: + bonus_damage: {fileID: 11400000, guid: 50116f133bd899842ab1d2a5b71412ee, type: 2} + double_damage_on_half_hp: 0 + kill_trigger_ability: {fileID: 11400000, guid: 6684238849c8440f287b48861b54b52a, + type: 2} diff --git a/Assets/TcgEngine/Resources/Effects/damage_kill_104811.asset.meta b/Assets/TcgEngine/Resources/Effects/damage_kill_104811.asset.meta new file mode 100644 index 0000000..3d9d7c6 --- /dev/null +++ b/Assets/TcgEngine/Resources/Effects/damage_kill_104811.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 54fe12841e9154b6999f066e0713b046 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TcgEngine/Scripts/Conditions/ConditionCardType.cs b/Assets/TcgEngine/Scripts/Conditions/ConditionCardType.cs index a0126fa..376c1e3 100644 --- a/Assets/TcgEngine/Scripts/Conditions/ConditionCardType.cs +++ b/Assets/TcgEngine/Scripts/Conditions/ConditionCardType.cs @@ -16,6 +16,8 @@ namespace TcgEngine public TeamData has_team; public TraitData has_trait; public CardCamp has_camp; + public RarityData has_rarity; + public RarityData exclude_rarity; public ConditionOperatorBool oper; @@ -40,7 +42,9 @@ namespace TcgEngine bool is_team = target.team == has_team || has_team == null; bool is_trait = target.HasTrait(has_trait) || has_trait == null; bool is_camp = target.camp == has_camp || has_camp == CardCamp.None; - return (is_type && is_team && is_trait && is_camp); + bool is_rarity = target.rarity == has_rarity || has_rarity == null; + bool not_excluded_rarity = target.rarity != exclude_rarity || exclude_rarity == null; + return (is_type && is_team && is_trait && is_camp && is_rarity && not_excluded_rarity); } private bool IsTrait(Card card) @@ -49,7 +53,9 @@ namespace TcgEngine bool is_team = card.CardData.team == has_team || has_team == null; bool is_trait = card.HasTrait(has_trait) || has_trait == null; bool is_camp = card.CardData.camp == has_camp || has_camp == CardCamp.None; - return (is_type && is_team && is_trait && is_camp); + bool is_rarity = card.CardData.rarity == has_rarity || has_rarity == null; + bool not_excluded_rarity = card.CardData.rarity != exclude_rarity || exclude_rarity == null; + return (is_type && is_team && is_trait && is_camp && is_rarity && not_excluded_rarity); } } } \ No newline at end of file diff --git a/Assets/TcgEngine/Scripts/Effects/EffectDamage.cs b/Assets/TcgEngine/Scripts/Effects/EffectDamage.cs index e445283..3c1fee0 100644 --- a/Assets/TcgEngine/Scripts/Effects/EffectDamage.cs +++ b/Assets/TcgEngine/Scripts/Effects/EffectDamage.cs @@ -35,6 +35,32 @@ namespace TcgEngine int target_hp_before = target != null ? target.GetHP() : 0; bool will_kill = target != null && target_hp_before <= damage; + // 无敌状态 + if (target.HasStatus(StatusType.Invincibility)) + { + will_kill = false; + } + + // 免疫伤害 + if (target.HasStatus(StatusType.Shell)) + { + Debug.Log("目标处于贝壳状态,免疫本次伤害"); + will_kill = false; + } + + int armor_reduction = 0; + int damageBeforeArmor = 0; + // 护甲状态 + if (target.HasStatus(StatusType.Armor)) + { + armor_reduction = target.GetStatusValue(StatusType.Armor); + damageBeforeArmor = Mathf.Max(0, damage - armor_reduction); + if (damageBeforeArmor > 0) + { + will_kill = false; + } + } + // 造成伤害 logic.DamageCard(caster, target, damage, true);