Merge remote-tracking branch 'origin/master'

ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Arrow.prefab

@@ -115,6 +115,7 @@ MonoBehaviour:
       damage: 0
       attackDir: {x: 0, y: 0, z: 0}
       criticalChance: 0
+      criticalStrikeEffect: 0
       lifesteal: 0
       effect: {fileID: 0}
       attackEffect: 
@@ -226,6 +227,7 @@ MonoBehaviour:
       damage: 0
       attackDir: {x: 0, y: 0, z: 0}
       criticalChance: 0
+      criticalStrikeEffect: 0
       lifesteal: 0
       effect: {fileID: 0}
       attackEffect: 
@@ -789,6 +791,7 @@ MonoBehaviour:
       damage: 0
       attackDir: {x: 0, y: 0, z: 0}
       criticalChance: 0
+      criticalStrikeEffect: 0
       lifesteal: 0
       effect: {fileID: 7473170563405908938, guid: 8ad3c225050205945b10657aa300afd6, type: 3}
       attackEffect: 
@@ -964,6 +967,7 @@ MonoBehaviour:
       damage: 0
       attackDir: {x: 0, y: 0, z: 0}
       criticalChance: 0
+      criticalStrikeEffect: 0
       lifesteal: 0
       effect: {fileID: 0}
       attackEffect: 
@@ -1440,11 +1444,11 @@ GameObject:
   m_Component:
   - component: {fileID: 8639832132491289354}
   - component: {fileID: 8639832132491289351}
+  - component: {fileID: 6714591057465281647}
   - component: {fileID: 8639832132491289349}
   - component: {fileID: 6589564398742701796}
   - component: {fileID: 7031356745553843355}
   - component: {fileID: 8684670505913003432}
-  - component: {fileID: 1024845279644969800}
   m_Layer: 7
   m_Name: Demonic_Arrow
   m_TagString: Demonic
@@ -1529,7 +1533,7 @@ MonoBehaviour:
   Attack_summonShootCanTransmit: 0
   debugAttackFrom: 0
   hitResistance: 0
-  bc: {fileID: 1024845279644969800}
+  bc: {fileID: 0}
   foot: {fileID: 8639832132450015562}
   attributeStatus: {fileID: 0}
   hitFeedbackSystem: {fileID: 0}
@@ -1587,7 +1591,140 @@ MonoBehaviour:
   summonEndToDie: 0
   canSizeChange: 0
   ignoresOnState: 0
-  skillTree: []
+  soldierType: 0
+  player: {fileID: 0}
+  playerID: 0
+  id: 0
+  costMp: 50
+  isBack: 0
+  baseSortingOrder: 8000
+  runSpeed: 0
+  demoicTags: 5
+  ownDamageScale: 0
+  isReturnSoulTower: 0
+  origSoulPos: {x: 0, y: 0, z: 0}
+  isRecorded: 0
+  adsorbSpeed: 0
+  adsorbTarget: {x: 0, y: 0, z: 0}
+  effectPrefab: {fileID: 0}
+  dropSoulMax: 3
+  dropSoulMin: 1
+  dropSoulAngle: 60
+--- !u!114 &6714591057465281647
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8639832132491289359}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cac10a714c84d8d4d9cd047690378fb6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  rb: {fileID: 8639832132491289349}
+  bodyTrans: {fileID: 5769591908339262981}
+  beSearchTrigger: {fileID: 316813748882225178}
+  searchTrigger: {fileID: 3566347593191160092}
+  bodyCollider: {fileID: 2616922587087395095}
+  uiHp: {fileID: 3586716274361854270}
+  beHitTrigger: {fileID: 9020361017135710302}
+  attackController: {fileID: 6589564398742701796}
+  platform: {fileID: 0}
+  mecanim: {fileID: 3354085511906294621}
+  meshRenderer: {fileID: 0}
+  ani: {fileID: 5978259926173120695}
+  totalDieKeepTime: 2
+  showInjuryNum: 0
+  injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
+  injuryNumTextSummon: {fileID: 6467251191553420251, guid: 4a700717bc3a50f45bd603f36382651f, type: 3}
+  injuryNumPos_summon: {x: 0, y: 1}
+  injuryNumRandom_summon: {x: 1, y: 1}
+  injuryNumPos_march: {x: 0, y: 1}
+  injuryNumRandom_march: {x: 2, y: 2}
+  dieKeepTime: 0
+  beHitDistance: 0.1
+  attackDis: 0
+  targetCharacter: {fileID: 0}
+  attackTarget: {fileID: 0}
+  state: 0
+  totalHp: 10
+  hp: 0
+  regenerationTime: 0
+  canFly: 1
+  canControlFly: 0
+  nowCanFly: 0
+  canNotShotDown: 1
+  canNotAddForce: 0
+  canNotChangeHurt: 0
+  isDie: 0
+  isRevive: 0
+  invincibleTime: 0
+  statePre: {fileID: 4272231268506418309, guid: cf5ca93704f49c744b0d6cfc2cd25a01, type: 3}
+  ls: {fileID: 0}
+  isInSoulTower: 0
+  beLarger: 0
+  toLargeSize: 0
+  cookEffect: {fileID: 0}
+  Attack_summonShootCanTransmit: 0
+  debugAttackFrom: 0
+  hitResistance: 0
+  bc: {fileID: 0}
+  foot: {fileID: 8639832132450015562}
+  attributeStatus: {fileID: 0}
+  hitFeedbackSystem: {fileID: 0}
+  spineEvent: {fileID: 0}
+  extraRiseGravity: -28.8
+  extraFallGravity: -14.4
+  extraGroundGravity: -28.8
+  velocityAddition: 0
+  platformPosY: 0
+  platformRotZ: 0
+  RotLerpSpeed: 0.6
+  RotLerpTime: 0
+  needToAdjustFlyHeight: 1
+  flyHeight: 0
+  maxFlyHeight: 9
+  minFlyHeight: 5
+  flyUpTime: 0.241
+  isAdjustHeight: 0
+  matState: 1
+  spinee: {fileID: 0}
+  mesh: {fileID: 0}
+  mats: []
+  outlineMats: []
+  outline1Mats: []
+  moveSpeed: 5
+  moveSpeedScale: 1
+  isDamageReduction: 0
+  reductionDegree: 0
+  reductionEffect: {fileID: 0}
+  effect: {fileID: 0}
+  soulPrefab: {fileID: 0}
+  soulStartSpeed: 1
+  isInvisible: 0
+  invisibleTime: 0
+  haveTransmit: 0
+  transmitTime: 0
+  portalsController: {fileID: 0}
+  isSustainedInjury: 0
+  sustainedInjuryTime: 0
+  sustainedInjury_IntervalTime: 0
+  sustainedInjury_damage: 0
+  heavyDamage: 0
+  killer: {fileID: 0}
+  isFrozen: 0
+  isElectrify: 0
+  electrifyEffect: {fileID: 0}
+  isOnFire: 0
+  fireStacks: 0
+  searchState: 0
+  bigSoldier: {fileID: 8684670505913003432}
+  dragonTrigger: {fileID: 4619289108872985744}
+  myName: "\u98DE\u5251"
+  summonEndToDie: 0
+  canSizeChange: 0
+  ignoresOnState: 0
   soldierType: 0
   player: {fileID: 0}
   playerID: 0
@@ -1635,6 +1772,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 565fb65a48a8ef648b3096d46e15efd9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  owner: {fileID: 0}
   attackInterval: 0
   addAttackEffect: {fileID: 0}
   isAttackTriggerOn: 0
@@ -1655,6 +1793,7 @@ MonoBehaviour:
       damage: 1
       attackDir: {x: -1, y: 0, z: 0}
       criticalChance: 0
+      criticalStrikeEffect: 0
       lifesteal: 0
       effect: {fileID: 0}
       attackEffect: 06000000
@@ -1723,6 +1862,7 @@ MonoBehaviour:
       damage: 1
       attackDir: {x: -1, y: 0, z: 0}
       criticalChance: 0
+      criticalStrikeEffect: 0
       lifesteal: 0
       effect: {fileID: 0}
       attackEffect: 06000000
@@ -1791,6 +1931,7 @@ MonoBehaviour:
       damage: 1
       attackDir: {x: -1, y: 0, z: 0}
       criticalChance: 0
+      criticalStrikeEffect: 0
       lifesteal: 0
       effect: {fileID: 0}
       attackEffect: 06000000
@@ -1859,6 +2000,7 @@ MonoBehaviour:
       damage: 1
       attackDir: {x: -1, y: 0, z: 0}
       criticalChance: 0
+      criticalStrikeEffect: 0
       lifesteal: 0
       effect: {fileID: 0}
       attackEffect: 06000000
@@ -1927,6 +2069,7 @@ MonoBehaviour:
       damage: 5
       attackDir: {x: -1, y: 0, z: 0}
       criticalChance: 0
+      criticalStrikeEffect: 0
       lifesteal: 0
       effect: {fileID: 0}
       attackEffect: 06000000
@@ -1996,6 +2139,7 @@ MonoBehaviour:
       damage: 1
       attackDir: {x: -1, y: 0, z: 0}
       criticalChance: 0
+      criticalStrikeEffect: 0
       lifesteal: 0
       effect: {fileID: 0}
       attackEffect: 
@@ -2065,6 +2209,7 @@ MonoBehaviour:
       damage: 0
       attackDir: {x: 0, y: 0, z: 0}
       criticalChance: 0
+      criticalStrikeEffect: 0
       lifesteal: 0
       effect: {fileID: 0}
       attackEffect: 
@@ -2253,16 +2398,3 @@ MonoBehaviour:
   nowSize: 0
   changeSizeSpeed: 0.2
   baseSortingOrder: 100
---- !u!114 &1024845279644969800
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8639832132491289359}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 2d4cd446e688d604bbb660bd0354fa2c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  buffList: []

ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Giant.prefab

@@ -108,6 +108,7 @@ MonoBehaviour:
       damage: 0
       attackDir: {x: 0, y: 0, z: 0}
       criticalChance: 0
+      criticalStrikeEffect: 0
       lifesteal: 0
       effect: {fileID: 0}
       attackEffect: 
@@ -263,6 +264,7 @@ MonoBehaviour:
       damage: 0
       attackDir: {x: 0, y: 0, z: 0}
       criticalChance: 0
+      criticalStrikeEffect: 0
       lifesteal: 0
       effect: {fileID: 0}
       attackEffect: 
@@ -348,6 +350,7 @@ MonoBehaviour:
       damage: 0
       attackDir: {x: 0, y: 0, z: 0}
       criticalChance: 0
+      criticalStrikeEffect: 0
       lifesteal: 0
       effect: {fileID: 0}
       attackEffect: 
@@ -674,7 +677,6 @@ GameObject:
   - component: {fileID: 7709923136427189747}
   - component: {fileID: 802636448221205106}
   - component: {fileID: 1496688819680216204}
-  - component: {fileID: 4698975884413946318}
   m_Layer: 7
   m_Name: Demonic_Giant
   m_TagString: Demonic
@@ -697,7 +699,6 @@ Transform:
   - {fileID: 6459001683917408033}
   - {fileID: 770599430276839403}
   - {fileID: 3103190932458336017}
-  - {fileID: 4234186424859525906}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -760,7 +761,7 @@ MonoBehaviour:
   Attack_summonShootCanTransmit: 0
   debugAttackFrom: 0
   hitResistance: 0
-  bc: {fileID: 4698975884413946318}
+  bc: {fileID: 0}
   foot: {fileID: 5440846222604650418}
   attributeStatus: {fileID: 0}
   hitFeedbackSystem: {fileID: 0}
@@ -816,12 +817,6 @@ MonoBehaviour:
   summonEndToDie: 0
   canSizeChange: 0
   ignoresOnState: 0
-  skillTree:
-  - skillType: 1
-    skillName: 
-    skillDescription: []
-    attributeType: 0
-    value: 0
   soldierType: 1
   player: {fileID: 0}
   playerID: 0
@@ -841,7 +836,6 @@ MonoBehaviour:
   dropSoulMax: 5
   dropSoulMin: 5
   dropSoulAngle: 60
-  ba: {fileID: 867647653288613018}
 --- !u!54 &5440846222648032765
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -870,6 +864,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 565fb65a48a8ef648b3096d46e15efd9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  owner: {fileID: 0}
   attackInterval: 4
   addAttackEffect: {fileID: 0}
   isAttackTriggerOn: 0
@@ -886,6 +881,7 @@ MonoBehaviour:
       damage: 10
       attackDir: {x: 0, y: 0, z: 0}
       criticalChance: 0
+      criticalStrikeEffect: 0
       lifesteal: 0
       effect: {fileID: 0}
       attackEffect: 01000000
@@ -954,6 +950,7 @@ MonoBehaviour:
       damage: 2
       attackDir: {x: 0, y: 0, z: 0}
       criticalChance: 0
+      criticalStrikeEffect: 0
       lifesteal: 0
       effect: {fileID: 0}
       attackEffect: 
@@ -1022,6 +1019,7 @@ MonoBehaviour:
       damage: 0
       attackDir: {x: 0, y: 0, z: 0}
       criticalChance: 0
+      criticalStrikeEffect: 0
       lifesteal: 0
       effect: {fileID: 0}
       attackEffect: 
@@ -1150,19 +1148,6 @@ MonoBehaviour:
   nowSize: 0
   changeSizeSpeed: 0.2
   baseSortingOrder: 100
---- !u!114 &4698975884413946318
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5440846222648032759}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 2d4cd446e688d604bbb660bd0354fa2c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  buffList: []
 --- !u!1 &6139679835290116115
 GameObject:
   m_ObjectHideFlags: 0
@@ -1340,68 +1325,6 @@ MonoBehaviour:
   imgHp: {fileID: 891910447640254832}
   pc: {fileID: 0}
   points: []
---- !u!1 &6388486695562442069
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 4234186424859525906}
-  - component: {fileID: 1764052328248983656}
-  - component: {fileID: 867647653288613018}
-  m_Layer: 17
-  m_Name: Buff Aura
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &4234186424859525906
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6388486695562442069}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -0.5633472, y: 2.5797377, z: 0}
-  m_LocalScale: {x: 15, y: 15, z: 15}
-  m_ConstrainProportionsScale: 1
-  m_Children: []
-  m_Father: {fileID: 5440846222648032754}
-  m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!135 &1764052328248983656
-SphereCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6388486695562442069}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 1
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Radius: 0.5
-  m_Center: {x: 0, y: 0, z: 0}
---- !u!114 &867647653288613018
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6388486695562442069}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5fc5e4663fc21134b9f0c95468e5f3e9, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  buff:
-    buffName: "\u76FE\u5175Buff"
-    value: 0
-    buffType: 0
 --- !u!1 &7208291223413765209
 GameObject:
   m_ObjectHideFlags: 0
@@ -1741,7 +1664,7 @@ MonoBehaviour:
   m_BlockingObjects: 0
   m_BlockingMask:
     serializedVersion: 2
-    m_Bits: 4294967295
+    m_Bits: 16777215
 --- !u!1001 &3635963917053146706
 PrefabInstance:
   m_ObjectHideFlags: 0

ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Sword.prefab

@@ -45,7 +45,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 21f006d2c845e2e43bce70ea7a2d8dcc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  owner: {fileID: 2437299196472462353}
+  owner: {fileID: 0}
   trigDemonicList: []
   trigTowerList: []
   trigPlayerList: []
@@ -201,6 +201,7 @@ MonoBehaviour:
       damage: 0
       attackDir: {x: 0, y: 0, z: 0}
       criticalChance: 0
+      criticalStrikeEffect: 0
       lifesteal: 0
       effect: {fileID: 0}
       attackEffect: 
@@ -277,12 +278,11 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2437299196472462364}
-  - component: {fileID: 2437299196472462353}
+  - component: {fileID: 151365113786509414}
   - component: {fileID: 2437299196472462355}
   - component: {fileID: 6797330787108410633}
   - component: {fileID: 434976657695320859}
   - component: {fileID: 1119516841680091051}
-  - component: {fileID: 2569954541183682079}
   m_Layer: 7
   m_Name: Demonic_Sword
   m_TagString: Demonic
@@ -308,7 +308,7 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &2437299196472462353
+--- !u!114 &151365113786509414
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -317,7 +317,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 2437299196472462361}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c1bedfb340186164dbac1499b49b879e, type: 3}
+  m_Script: {fileID: 11500000, guid: b21587ef9f9f79f48abbb993fd86f00d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   rb: {fileID: 2437299196472462355}
@@ -335,13 +335,13 @@ MonoBehaviour:
   totalDieKeepTime: 2
   showInjuryNum: 0
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
-  injuryNumTextSummon: {fileID: 6467251191553420251, guid: 71b4c570c9e403d429846b71878a20c4, type: 3}
+  injuryNumTextSummon: {fileID: 6467251191553420251, guid: 4a700717bc3a50f45bd603f36382651f, type: 3}
   injuryNumPos_summon: {x: 0, y: 1}
   injuryNumRandom_summon: {x: 1, y: 1}
   injuryNumPos_march: {x: 0, y: 1}
   injuryNumRandom_march: {x: 2, y: 2}
   dieKeepTime: 0
-  beHitDistance: 0.5
+  beHitDistance: 0
   attackDis: 0
   targetCharacter: {fileID: 0}
   attackTarget: {fileID: 0}
@@ -367,7 +367,7 @@ MonoBehaviour:
   Attack_summonShootCanTransmit: 0
   debugAttackFrom: 0
   hitResistance: 0
-  bc: {fileID: 2569954541183682079}
+  bc: {fileID: 0}
   foot: {fileID: 2437299196663985756}
   attributeStatus: {fileID: 0}
   hitFeedbackSystem: {fileID: 0}
@@ -390,10 +390,8 @@ MonoBehaviour:
   spinee: {fileID: 0}
   mesh: {fileID: 0}
   mats: []
-  outlineMats:
-  - {fileID: 2100000, guid: 7d50f910288e95b4285a5fb549c94fe6, type: 2}
-  outline1Mats:
-  - {fileID: 2100000, guid: 79dada70fee9fbc49a327168481d3def, type: 2}
+  outlineMats: []
+  outline1Mats: []
   moveSpeed: 3
   moveSpeedScale: 1
   isDamageReduction: 0
@@ -434,6 +432,7 @@ MonoBehaviour:
   baseSortingOrder: 6000
   runSpeed: 0
   demoicTags: 10
+  ownDamageScale: 0
   isReturnSoulTower: 0
   origSoulPos: {x: 0, y: 0, z: 0}
   isRecorded: 0
@@ -471,6 +470,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 565fb65a48a8ef648b3096d46e15efd9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  owner: {fileID: 151365113786509414}
   attackInterval: 0
   addAttackEffect: {fileID: 0}
   isAttackTriggerOn: 0
@@ -489,6 +489,7 @@ MonoBehaviour:
       damage: 5
       attackDir: {x: 0, y: 0, z: 0}
       criticalChance: 0
+      criticalStrikeEffect: 0
       lifesteal: 0
       effect: {fileID: 0}
       attackEffect: 
@@ -556,6 +557,7 @@ MonoBehaviour:
       damage: 5
       attackDir: {x: 0, y: 0, z: 0}
       criticalChance: 0
+      criticalStrikeEffect: 0
       lifesteal: 0
       effect: {fileID: 0}
       attackEffect: 
@@ -623,6 +625,7 @@ MonoBehaviour:
       damage: 8
       attackDir: {x: 0, y: 0, z: 0}
       criticalChance: 0
+      criticalStrikeEffect: 0
       lifesteal: 0
       effect: {fileID: 7473170563405908938, guid: 981f0db1de7eb4f4385a451c34bd3773, type: 3}
       attackEffect: 02000000
@@ -691,6 +694,7 @@ MonoBehaviour:
       damage: 1
       attackDir: {x: 0, y: 0, z: 0}
       criticalChance: 0
+      criticalStrikeEffect: 0
       lifesteal: 0
       effect: {fileID: 0}
       attackEffect: 
@@ -759,6 +763,7 @@ MonoBehaviour:
       damage: 0
       attackDir: {x: 0, y: 0, z: 0}
       criticalChance: 0
+      criticalStrikeEffect: 0
       lifesteal: 0
       effect: {fileID: 0}
       attackEffect: 
@@ -916,7 +921,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8562f76ec9f88004b9eade117489ef49, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  demonic: {fileID: 2437299196472462353}
+  demonic: {fileID: 151365113786509414}
   stageSize:
   - 1.5
   - 2
@@ -932,19 +937,6 @@ MonoBehaviour:
   nowSize: 0
   changeSizeSpeed: 0.2
   baseSortingOrder: 100
---- !u!114 &2569954541183682079
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2437299196472462361}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 2d4cd446e688d604bbb660bd0354fa2c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  buffList: []
 --- !u!1 &2437299196663985757
 GameObject:
   m_ObjectHideFlags: 0
@@ -1208,7 +1200,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8ff1eeae99d9b8142acd628550a50e26, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  owner: {fileID: 2437299196472462353}
+  owner: {fileID: 0}
 --- !u!1 &6594324537872882015
 GameObject:
   m_ObjectHideFlags: 0
@@ -1284,6 +1276,7 @@ MonoBehaviour:
       damage: 0
       attackDir: {x: 0, y: 0, z: 0}
       criticalChance: 0
+      criticalStrikeEffect: 0
       lifesteal: 0
       effect: {fileID: 0}
       attackEffect: 
@@ -1721,7 +1714,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8b2c8973c65adf4448805aa906f6ad29, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  owner: {fileID: 2437299196472462353}
+  owner: {fileID: 0}
   attackerID: 0
   curX: 0
 --- !u!114 &8560863157126245607
@@ -1749,6 +1742,7 @@ MonoBehaviour:
       damage: 0
       attackDir: {x: 0, y: 0, z: 0}
       criticalChance: 0
+      criticalStrikeEffect: 0
       lifesteal: 0
       effect: {fileID: 0}
       attackEffect: 
@@ -1834,6 +1828,7 @@ MonoBehaviour:
       damage: 0
       attackDir: {x: 0, y: 0, z: 0}
       criticalChance: 0
+      criticalStrikeEffect: 0
       lifesteal: 0
       effect: {fileID: 0}
       attackEffect: 
@@ -1900,7 +1895,7 @@ MonoBehaviour:
   isFly: 0
   decelerationRatioX: 2
   decelerationRatioY: 15
-  landingDamageFrom: {fileID: 0}
+  landingDamageFrom: {fileID: 151365113786509414}
   rotateCenterHeight: 1
   startFlyAngle: 15
   flyingRotateSpeedRange: {x: 15, y: 45}

ActionTowerDefense/Assets/Scripts/Characters/AttackController.cs

@@ -32,6 +32,7 @@ public class AttackInfo
     public int damage;
     public Vector3 attackDir;
     [LabelText("暴击率")] public int criticalChance;
+    [LabelText("暴击效果")] public int criticalStrikeEffect;
     [LabelText("吸血")] public int lifesteal;
     [LabelText("击中特效")] public GameObject effect;
     public List<AttackEffect> attackEffect;

ActionTowerDefense/Assets/Scripts/Characters/DemonicArrow.cs

@@ -0,0 +1,12 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class DemonicArrow : Demonic
+{
+    public override void AfterInit()
+    {
+        base.AfterInit();
+        ownDamageScale += attributeStatus.resistances.dodge * 2;
+    }
+}

ActionTowerDefense/Assets/Scripts/Characters/DemonicArrow.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: cac10a714c84d8d4d9cd047690378fb6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ActionTowerDefense/Assets/Scripts/Characters/DemonicGiant.cs

@@ -4,42 +4,43 @@ using UnityEngine;
 
 public class DemonicGiant : Demonic
 {
-    public BuffAura ba;
+    //public BuffAura ba;
 
-    public override void Attack_summon()
-    {
-        base.Attack_summon();
-        if (GameManager.instance.demonicAttributes[id].trigger1)
-        {
-            GameObject obj = PoolManager.Instantiate(Resources.Load<GameObject>("Prefab/Meteorite"));
-            int faceDir = bodyTrans.localScale.x >= 0 ? 1 : -1;
-            obj.GetComponent<Meteorite>().Init(transform.position + Vector3.left * faceDir * 3, this);
-        }
-    }
+    //public override void Attack_summon()
+    //{
+    //    base.Attack_summon();
+    //    if (GameManager.instance.demonicAttributes[id].trigger1)
+    //    {
+    //        GameObject obj = PoolManager.Instantiate(Resources.Load<GameObject>("Prefab/Meteorite"));
+    //        int faceDir = bodyTrans.localScale.x >= 0 ? 1 : -1;
+    //        obj.GetComponent<Meteorite>().Init(transform.position + Vector3.left * faceDir * 3, this);
+    //    }
+    //}
 
     public override void AfterInit()
     {
         base.AfterInit();
-        if (GameManager.instance.demonicAttributes[id].trigger0)
-        {
-            ownDamageScale += attributeStatus.resistances.armor * 5;
-        }
-        for (int i = 0; i < attackController.attackMethod_summon.Length; i++)
-        {
-            AttackInfo attackInfo = attackController.attackMethod_summon[i].attackInfo;
-            attackInfo.blowUp.landingDamageRate += attackInfo.blowUp.landingDamageRate * GameManager.instance.demonicAttributes[id].blowUpDamage/100;
-            attackInfo.blowUp.time += attackInfo.blowUp.time * GameManager.instance.demonicAttributes[id].blowUpStunTime / 100;
-        }
+        ownDamageScale += (int)(GameManager.instance.totalHp / 10f);
+        //if (GameManager.instance.demonicAttributes[id].trigger0)
+        //{
+        //    ownDamageScale += attributeStatus.resistances.armor * 5;
+        //}
+        //for (int i = 0; i < attackController.attackMethod_summon.Length; i++)
+        //{
+        //    AttackInfo attackInfo = attackController.attackMethod_summon[i].attackInfo;
+        //    attackInfo.blowUp.landingDamageRate += attackInfo.blowUp.landingDamageRate * GameManager.instance.demonicAttributes[id].blowUpDamage/100;
+        //    attackInfo.blowUp.time += attackInfo.blowUp.time * GameManager.instance.demonicAttributes[id].blowUpStunTime / 100;
+        //}
     }
 
-    public override void Init()
-    {
-        base.Init();
-        if (GameManager.instance.demonicAttributes[id].trigger2)
-        {
-            ba.buff.value = attributeStatus.resistances.armor * (10 + GameManager.instance.myTreasuresTag[3]);
-            ba.gameObject.SetActive(true);
-        }
-        else ba.gameObject.SetActive(false);
-    }
+    //public override void Init()
+    //{
+    //    base.Init();
+    //    if (GameManager.instance.demonicAttributes[id].trigger2)
+    //    {
+    //        ba.buff.value = attributeStatus.resistances.armor * (10 + GameManager.instance.myTreasuresTag[3]);
+    //        ba.gameObject.SetActive(true);
+    //    }
+    //    else ba.gameObject.SetActive(false);
+    //}
 }

ActionTowerDefense/Assets/Scripts/Characters/DemonicSword.cs

@@ -0,0 +1,21 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class DemonicSword : Demonic
+{
+    public override void AfterInit()
+    {
+        base.AfterInit();
+        for (int i = 0; i < attackController.attackMethod_summon.Length; i++)
+        {
+            AttackInfo attackInfo = attackController.attackMethod_summon[i].attackInfo;
+            attackInfo.criticalStrikeEffect += 50;
+        }
+        for (int i = 0; i < attackController.attackMethod_march.Length; i++)
+        {
+            AttackInfo attackInfo = attackController.attackMethod_march[i].attackInfo;
+            attackInfo.criticalStrikeEffect += 50;
+        }
+    }
+}

ActionTowerDefense/Assets/Scripts/Characters/DemonicSword.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b21587ef9f9f79f48abbb993fd86f00d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ActionTowerDefense/Assets/Scripts/Characters/MoveCharacter.cs

@@ -301,7 +301,7 @@ public class MoveCharacter : Character
             return;
         }
 
-        if (Random.Range(0, 100) < attributeStatus.resistances.dodge)
+        if (Random.Range(0, 100) < attributeStatus.resistances.dodge && attackFrom.CompareTag("Demonic") || attackFrom.CompareTag("Player"))
         {
             GameObject missTxt = PoolManager.Instantiate(injuryNumTextSummon);
             missTxt.transform.position = new Vector3(
@@ -372,7 +372,7 @@ public class MoveCharacter : Character
 
         if (Random.Range(0, 100) < attackInfo.criticalChance)
         {
-            damageData *= 2;
+            damageData = (int)((2 + attackInfo.criticalStrikeEffect/100f) * damageData);
         }
 
         hp -= damageData;

ActionTowerDefense/Assets/Scripts/GameManager.cs

@@ -404,42 +404,43 @@ public class GameManager : MonoBehaviour
         int demonicId;
         skillUI.gameObject.SetActive(false);
         GameUI.instance.gameObject.SetActive(false);
-        if (CheckSoliderSkill(out demonicId))
-        {
-            shopUI.Init();
-        }
-        else
-        {
-            DemonicSkill[] demonicSkills = new DemonicSkill[]
-            {
-                demonicAttributes[demonicId].skillTree[demonicAttributes[demonicId].levelCount * 2], demonicAttributes[demonicId].skillTree[demonicAttributes[demonicId].levelCount * 2 + 1]
-            };
-            demonicAttributes[demonicId].levelCount++;
-            ShowSkillChose(demonicSkills, demonicId);
-        }
+        shopUI.Init();
+        //if (CheckSoliderSkill(out demonicId))
+        //{
+        //    shopUI.Init();
+        //}
+        //else
+        //{
+        //    DemonicSkill[] demonicSkills = new DemonicSkill[]
+        //    {
+        //        demonicAttributes[demonicId].skillTree[demonicAttributes[demonicId].levelCount * 2], demonicAttributes[demonicId].skillTree[demonicAttributes[demonicId].levelCount * 2 + 1]
+        //    };
+        //    demonicAttributes[demonicId].levelCount++;
+        //    ShowSkillChose(demonicSkills, demonicId);
+        //}
     }
 
-    #region 士兵技能相关
-    public bool CheckSoliderSkill(out int demonicId)
-    {
-        demonicId = 0;
-        for (int i = 0; i < 3; i++) 
-        {
-            if(SoldierEXP.expInstance.ssexp[i].level >= (demonicAttributes[i].levelCount +1) * gradeInterval)
-            {
-                demonicId = i;
-                return false;
-            }
-        }
-        return true;
-    }
-
-    public void ShowSkillChose(DemonicSkill[] demonicSkills, int demonicId )
-    {
-        skillUI.gameObject.SetActive(true);
-        skillUI.Init(demonicSkills, demonicId);
-    }
-    #endregion 
+    //#region 士兵技能相关
+    //public bool CheckSoliderSkill(out int demonicId)
+    //{
+    //    demonicId = 0;
+    //    for (int i = 0; i < 3; i++) 
+    //    {
+    //        if(SoldierEXP.expInstance.ssexp[i].level >= (demonicAttributes[i].levelCount +1) * gradeInterval)
+    //        {
+    //            demonicId = i;
+    //            return false;
+    //        }
+    //    }
+    //    return true;
+    //}
+
+    //public void ShowSkillChose(DemonicSkill[] demonicSkills, int demonicId )
+    //{
+    //    skillUI.gameObject.SetActive(true);
+    //    skillUI.Init(demonicSkills, demonicId);
+    //}
+    //#endregion 
     public void GetTreasure(Treasure treasure)
     {
         for (int i = 0; i < treasure.type.Count; i++)

ActionTowerDefense/Assets/Scripts/UI/SkillUI.cs

@@ -15,7 +15,10 @@ public class SkillUI : MonoBehaviour
         {
             Destroy(panel);
         }
-        //sg.skeletonDataAsset = GameManager.instance.demonicAttributes[demonicId].sda;
+        sg.skeletonDataAsset = GameManager.instance.demonicAttributes[demonicId].sda;
+        sg.Initialize(true);
+        sg.UpdateMesh();
+        Debug.Log(GameManager.instance.demonicAttributes[demonicId].sda.name);
         skillInformationPanels.Clear();
         SkillInformationPanel skillInformationPanel;
         foreach(DemonicSkill demonicSkill in demonicSkills)