修复击杀钩子,添加技能

2025-09-02 16:20:42 +08:00
parent 1386d7d431
commit 88006275ca
53 changed files with 1023 additions and 27 deletions
--- a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104601.asset
+++ 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"
--- a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104601.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
--- a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104611.asset
+++ 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"
--- a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104611.asset.meta
+++ 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: 
--- a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104801.asset
+++ 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"
--- a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104801.asset.meta
+++ 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: 
--- a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104811.asset
+++ 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"
--- a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104811.asset.meta
+++ 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: 
--- a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104901.asset
+++ 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<ssr"
+  desc: "\u4F24"
--- a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104901.asset.meta
+++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104901.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c91b871a43fae467a94a4f9208b226a3
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104911.asset
+++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104911.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_104911
+  m_EditorClassIdentifier: 
+  id: 104911
+  trigger: 0
+  conditions_trigger: []
+  target: 5
+  conditions_target: []
+  filters_target: []
+  effects:
+  - {fileID: 11400000, guid: c5a0683a1620b9c49b27007307e08117, 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: "\u56DE\u624B<ssr"
+  desc: "\u4F24"
--- a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104911.asset.meta
+++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_104911.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9cbc3c8a45c4a4d58b51f0a4ba503ad6
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105301.asset
+++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105301.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_105301
+  m_EditorClassIdentifier: 
+  id: 105301
+  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: e2bf0256d75a94014a056fbbc74e709b, type: 2}
+  status: []
+  value: 0
+  duration: 0
+  chain_abilities:
+  - {fileID: 11400000, guid: 02643477f32084f2dad61a5ce049ff70, 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+\u6C89\u9ED8"
+  desc: "\u4F24"
--- a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105301.asset.meta
+++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105301.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 65602949d5f144e41a0faa6534c741b3
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105311.asset
+++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105311.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_105311
+  m_EditorClassIdentifier: 
+  id: 105311
+  trigger: 0
+  conditions_trigger: []
+  target: 10
+  conditions_target:
+  - {fileID: 11400000, guid: 902733d12f434e94b904de5ebf4112de, type: 2}
+  - {fileID: 11400000, guid: 41c58513071a53b4e9066a58c439760f, type: 2}
+  - {fileID: 11400000, guid: ef09540f94d8428408b69fea46ec3334, type: 2}
+  filters_target: []
+  effects: []
+  status:
+  - {fileID: 11400000, guid: 8580d5669cd3e624c825c09fbba0b4f0, type: 2}
+  value: 0
+  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: "\u6C89\u9ED8"
+  desc: "\u4F24"
--- a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105311.asset.meta
+++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105311.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 02643477f32084f2dad61a5ce049ff70
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105701.asset
+++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105701.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_105701
+  m_EditorClassIdentifier: 
+  id: 105701
+  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: 4369324687c62ca488c57afd73a2be36, type: 2}
+  status: []
+  value: 12
+  duration: 0
+  chain_abilities:
+  - {fileID: 11400000, guid: a76bdb705f5004c30be18907f1e7f87e, 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: "\u4F24\u5BB32\u6B21"
+  desc: "\u4F24"
--- a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105701.asset.meta
+++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105701.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 80a56a5dba9644cac829b86528107a29
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105711.asset
+++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105711.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_105711
+  m_EditorClassIdentifier: 
+  id: 105711
+  trigger: 0
+  conditions_trigger: []
+  target: 30
+  conditions_target:
+  - {fileID: 11400000, guid: 902733d12f434e94b904de5ebf4112de, type: 2}
+  - {fileID: 11400000, guid: 41c58513071a53b4e9066a58c439760f, type: 2}
+  filters_target: []
+  effects:
+  - {fileID: 11400000, guid: 4369324687c62ca488c57afd73a2be36, type: 2}
+  status: []
+  value: 12
+  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: "\u4F24\u5BB3"
+  desc: "\u4F24\u5BB3+\u7981\u7597"
--- a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105711.asset.meta
+++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105711.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a76bdb705f5004c30be18907f1e7f87e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105901.asset
+++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105901.asset
@@ -0,0 +1,45 @@
+%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_105901
+  m_EditorClassIdentifier: 
+  id: 105901
+  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: 4369324687c62ca488c57afd73a2be36, type: 2}
+  status: []
+  value: 1
+  duration: 0
+  chain_abilities:
+  - {fileID: 11400000, guid: 609477f9ccda64394ab7233b33831a1e, type: 2}
+  - {fileID: 11400000, guid: 609477f9ccda64394ab7233b33831a1e, type: 2}
+  - {fileID: 11400000, guid: 609477f9ccda64394ab7233b33831a1e, type: 2}
+  - {fileID: 11400000, guid: 609477f9ccda64394ab7233b33831a1e, type: 2}
+  - {fileID: 11400000, guid: 609477f9ccda64394ab7233b33831a1e, 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: "\u4F24\u5BB36\u6B21"
+  desc: "\u4F24\u5BB3+\u7981\u7597"
--- a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105901.asset.meta
+++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105901.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7427ae1aa0ade410dbc6c40570dc0e5a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105911.asset
+++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105911.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_105911
+  m_EditorClassIdentifier: 
+  id: 105911
+  trigger: 0
+  conditions_trigger: []
+  target: 30
+  conditions_target:
+  - {fileID: 11400000, guid: 902733d12f434e94b904de5ebf4112de, type: 2}
+  - {fileID: 11400000, guid: 41c58513071a53b4e9066a58c439760f, type: 2}
+  filters_target: []
+  effects:
+  - {fileID: 11400000, guid: 4369324687c62ca488c57afd73a2be36, 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: "\u4F24\u5BB3"
+  desc: "\u4F24\u5BB3+\u7981\u7597"
--- a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105911.asset.meta
+++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_105911.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 609477f9ccda64394ab7233b33831a1e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_106501.asset
+++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_106501.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_106501
+  m_EditorClassIdentifier: 
+  id: 106501
+  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: 4369324687c62ca488c57afd73a2be36, type: 2}
+  status: []
+  value: 12
+  duration: 0
+  chain_abilities:
+  - {fileID: 11400000, guid: 0886dd146b9a442e9add80ed3a9ebff0, 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: "\u4F24\u5BB3"
+  desc: "\u4F24\u5BB3+\u7981\u7597"
--- a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_106501.asset.meta
+++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_106501.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 960f11ed10b5d45e3b17f5c17f0b4000
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_106511.asset
+++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_106511.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_106511
+  m_EditorClassIdentifier: 
+  id: 106511
+  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: 9125387663047351618, guid: b66600b51774daa49964ead5c6a00c49,
+    type: 3}
+  projectile_fx: {fileID: 0}
+  cast_audio: {fileID: 0}
+  target_audio: {fileID: 0}
+  charge_target: 0
+  title: "\u7981\u7597"
+  desc: "\u7981\u75971\u56DE\u5408"
--- a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_106511.asset.meta
+++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_106511.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0886dd146b9a442e9add80ed3a9ebff0
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_106601.asset
+++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_106601.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_106601
+  m_EditorClassIdentifier: 
+  id: 106601
+  trigger: 5
+  conditions_trigger: []
+  target: 30
+  conditions_target:
+  - {fileID: 11400000, guid: 902733d12f434e94b904de5ebf4112de, type: 2}
+  - {fileID: 11400000, guid: 7463bf87d3794e249b7610c9de9c5327, type: 2}
+  - {fileID: 11400000, guid: ef09540f94d8428408b69fea46ec3334, type: 2}
+  filters_target: []
+  effects:
+  - {fileID: 11400000, guid: 5e489970bbb948c409125b3ab22f2aac, type: 2}
+  status: []
+  value: 12
+  duration: 0
+  chain_abilities:
+  - {fileID: 11400000, guid: ae42f5c8c0e684709aeacd26024660ac, type: 2}
+  mana_cost: 0
+  exhaust: 0
+  board_fx: {fileID: 0}
+  caster_fx: {fileID: 0}
+  target_fx: {fileID: 5988812109917292199, guid: be19380a491c8c245afe0dd96e02ba78,
+    type: 3}
+  projectile_fx: {fileID: 0}
+  cast_audio: {fileID: 0}
+  target_audio: {fileID: 0}
+  charge_target: 0
+  title: "\u56DE\u8840"
+  desc: "\u56DE\u884012 + \u51494"
--- a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_106601.asset.meta
+++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_106601.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f3daade4a7f254a969d74db4142a7f0f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_106611.asset
+++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_106611.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_106611
+  m_EditorClassIdentifier: 
+  id: 106611
+  trigger: 0
+  conditions_trigger: []
+  target: 72
+  conditions_target:
+  - {fileID: 11400000, guid: 69302b89741a3487abf38f7c9ccc706a, type: 2}
+  filters_target: []
+  effects:
+  - {fileID: 11400000, guid: 5e489970bbb948c409125b3ab22f2aac, type: 2}
+  status: []
+  value: 4
+  duration: 0
+  chain_abilities: []
+  mana_cost: 0
+  exhaust: 0
+  board_fx: {fileID: 0}
+  caster_fx: {fileID: 0}
+  target_fx: {fileID: 5988812109917292199, guid: be19380a491c8c245afe0dd96e02ba78,
+    type: 3}
+  projectile_fx: {fileID: 0}
+  cast_audio: {fileID: 0}
+  target_audio: {fileID: 0}
+  charge_target: 0
+  title: "\u56DE\u8840"
+  desc: "\u5149\u56DE4"
--- a/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_106611.asset.meta
+++ b/Assets/TcgEngine/Resources/Abilities/activated/CardAcitiveSkill/activate_106611.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ae42f5c8c0e684709aeacd26024660ac
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/TcgEngine/Resources/Cards/Fire/firefox.asset
+++ b/Assets/TcgEngine/Resources/Cards/Fire/firefox.asset
@@ -14,21 +14,19 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  id: firefox
  title: "\u706B\u72D0"
-  art_full: {fileID: 21300000, guid: d2ec197d4022ca94d8dc1ee2d7eda955, type: 3}
-  art_board: {fileID: 21300000, guid: c3ac28cd1113c594ebe11a5f70251135, type: 3}
  art_full_path: Cards/firefox.png
  art_board_path: CardsBoard/firefox_board.png
  type: 10
  camp: 0
-  team: {fileID: 11400000, guid: 6bbb96863ece0314fb318c0fce569afc, type: 2}
+  team: {fileID: 11400000, guid: 8e4b9ddb3f79d4ac9bc510c5bdc9e576, type: 2}
  rarity: {fileID: 11400000, guid: 72248f07232412e4db2f6864dbb4e271, type: 2}
  mana: 1
-  attack: 1
-  hp: 20
+  attack: 5
+  hp: 100
  traits: []
  stats: []
  abilities:
-  - {fileID: 11400000, guid: d006aa7902864824d907d4aa6b62de09, type: 2}
+  - {fileID: 11400000, guid: e4fc67090dfd749a2b2bd1def97308cd, type: 2}
  text: "<b>\u65BD\u653E(2):</b> \u5C06\u4E00\u5F20\u6CD5\u672F\u724C\u9001\u56DE\u4F60\u7684\u624B\u724C\u3002"
  desc: 
  spawn_fx: {fileID: 9125387663047351618, guid: bac685160af4aff46ae561a51da6f5f4,
--- 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
--- a/Assets/TcgEngine/Resources/Conditions/only_not_ssr.asset
+++ 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
--- a/Assets/TcgEngine/Resources/Conditions/only_not_ssr.asset.meta
+++ 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: 
--- a/Assets/TcgEngine/Resources/Conditions/team_dark.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
--- a/Assets/TcgEngine/Resources/Conditions/team_dark.asset.meta
+++ b/Assets/TcgEngine/Resources/Conditions/team_dark.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 684693e77864745c2a3cfe758a65ba23
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/TcgEngine/Resources/Conditions/team_fire.asset
+++ 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
--- a/Assets/TcgEngine/Resources/Conditions/team_fire.asset.meta
+++ b/Assets/TcgEngine/Resources/Conditions/team_fire.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 47f81166a11284919ae6d8d39b5eecc3
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/TcgEngine/Resources/Conditions/team_light.asset
+++ 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
--- a/Assets/TcgEngine/Resources/Conditions/team_light.asset.meta
+++ b/Assets/TcgEngine/Resources/Conditions/team_light.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 69302b89741a3487abf38f7c9ccc706a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/TcgEngine/Resources/Conditions/team_neutral.asset
+++ 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
--- a/Assets/TcgEngine/Resources/Conditions/team_neutral.asset.meta
+++ b/Assets/TcgEngine/Resources/Conditions/team_neutral.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3df93f28d75934890810585aa9033008
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/TcgEngine/Resources/Conditions/team_water.asset
+++ 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
--- a/Assets/TcgEngine/Resources/Conditions/team_water.asset.meta
+++ b/Assets/TcgEngine/Resources/Conditions/team_water.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f2dda094bc9b841bc8d6a35021d1fd46
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/TcgEngine/Resources/Conditions/team_wink.asset
+++ 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
--- a/Assets/TcgEngine/Resources/Conditions/team_wink.asset.meta
+++ b/Assets/TcgEngine/Resources/Conditions/team_wink.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ca400d47300bf47289442bf061249bca
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- 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}
--- a/Assets/TcgEngine/Resources/Effects/damage_kill_104811.asset
+++ 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}
--- a/Assets/TcgEngine/Resources/Effects/damage_kill_104811.asset.meta
+++ 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: 
--- 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);
        }
    }
 }
--- 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);