wgl 6 tháng trước cách đây
mục cha
commit
6b7aab9f07

+ 57 - 40
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1001.prefab

@@ -191,15 +191,17 @@ MonoBehaviour:
       dir: {x: 0, y: 0, z: 0}
       force: 0
       time: 0
-    stun:
+    weak:
       time: 0
     armor:
       rate: 0
+    vulnerable:
+      rate: 0
+      time: 0
     changeDamage:
       rate: 0
     sustainedInjury:
       damage: 0
-  damage: 0
   force: {x: 0, y: 0, z: 0}
   changeHurt: 0
   repelValue: 0
@@ -218,7 +220,6 @@ GameObject:
   - component: {fileID: 5720304588384615462}
   - component: {fileID: 1837193195824484407}
   - component: {fileID: 2437299196472462355}
-  - component: {fileID: 4708446721582069133}
   m_Layer: 8
   m_Name: Enemy_1001
   m_TagString: Enemy
@@ -286,7 +287,6 @@ MonoBehaviour:
   injuryNumText: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
   showInjuryNum: 1
   canFly: 0
-  armor: 0
   ls: {fileID: 0}
   isInSoulTower: 0
   beLarger: 0
@@ -313,20 +313,9 @@ MonoBehaviour:
   minFlyHeight: 0
   flyUpTime: 0
   isAdjustHeight: 0
-  totalBeRepelValue: 30
-  beRepelValue: 0
-  weakTime: 0
-  totalWeakTime: 10
-  newTotalWeakTime: 0
-  weakHitRate: 2
-  easyToGetHit: 0.2
   isDamageReduction: 0
   reductionDegree: 0
   reductionEffect: {fileID: 0}
-  decelerationRatio: 2
-  comaTime: 5
-  pastComaTime: 0
-  floatTime: 10
   effect: {fileID: 0}
   soulPrefab: {fileID: 1723151111827507807, guid: e2b65aa482f2f1447a4074208d72b778, type: 3}
   soulStartSpeed: 1
@@ -419,10 +408,13 @@ MonoBehaviour:
       dir: {x: 0, y: 0, z: 0}
       force: 0
       time: 0
-    stun:
+    weak:
       time: 0
     armor:
       rate: 0
+    vulnerable:
+      rate: 0
+      time: 0
     changeDamage:
       rate: 0
     sustainedInjury:
@@ -463,10 +455,13 @@ MonoBehaviour:
         dir: {x: 0, y: 0, z: 0}
         force: 0
         time: 0
-      stun:
+      weak:
         time: 0
       armor:
         rate: 0
+      vulnerable:
+        rate: 0
+        time: 0
       changeDamage:
         rate: 0
       sustainedInjury:
@@ -508,10 +503,13 @@ MonoBehaviour:
         dir: {x: 0, y: 0, z: 0}
         force: 0
         time: 0
-      stun:
+      weak:
         time: 0
       armor:
         rate: 0
+      vulnerable:
+        rate: 0
+        time: 0
       changeDamage:
         rate: 0
       sustainedInjury:
@@ -546,28 +544,6 @@ Rigidbody:
   m_Interpolate: 0
   m_Constraints: 120
   m_CollisionDetection: 0
---- !u!114 &4708446721582069133
-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: 1d04dd6e35d71724689001e450625c39, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  curSpecialStates: ffffffff
-  attributeTime: 0
-  resistances:
-    Float: 0
-    BlowUp: 0
-    ShotDown: 0
-    Stun: 0
-  decelerationRatioX: 2
-  decelerationRatioY: 15
-  floatingState: 0
 --- !u!1 &2437299196663985757
 GameObject:
   m_ObjectHideFlags: 0
@@ -810,6 +786,8 @@ GameObject:
   - component: {fileID: 6936852277045865654}
   - component: {fileID: 2640996939016594402}
   - component: {fileID: 6427563181875878110}
+  - component: {fileID: 2908060674811269511}
+  - component: {fileID: 1309181151941048349}
   m_Layer: 19
   m_Name: BeHitTrigger
   m_TagString: Untagged
@@ -859,6 +837,45 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   owner: {fileID: 5720304588384615462}
   attackerID: 0
+  curX: 0
+--- !u!114 &2908060674811269511
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4960124152152785005}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1d04dd6e35d71724689001e450625c39, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  curSpecialStates: -1
+  attributeTime: 0
+  resistances:
+    Float: 0
+    BlowUp: 0
+    ShotDown: 0
+    Weak: 0
+    armor: 0
+  decelerationRatioX: 2
+  decelerationRatioY: 15
+  floatingState: 0
+  haveVulnerable: 0
+  vulnerableTime: 0
+--- !u!114 &1309181151941048349
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4960124152152785005}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 38dc6c579f75e924697fbe3639d11c9f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isFreeze: 0
 --- !u!1 &6164447163453378808
 GameObject:
   m_ObjectHideFlags: 0

+ 45 - 30
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1002.prefab

@@ -191,7 +191,7 @@ MonoBehaviour:
       dir: {x: 0, y: 0, z: 0}
       force: 0
       time: 0
-    stun:
+    weak:
       time: 0
     armor:
       rate: 0
@@ -220,7 +220,6 @@ GameObject:
   - component: {fileID: 5720304588384615462}
   - component: {fileID: 2437299196472462355}
   - component: {fileID: 8283553518372576850}
-  - component: {fileID: -235536916698660067}
   m_Layer: 8
   m_Name: Enemy_1002
   m_TagString: Enemy
@@ -425,7 +424,7 @@ MonoBehaviour:
       dir: {x: 0, y: 0, z: 0}
       force: 0
       time: 0
-    stun:
+    weak:
       time: 0
     armor:
       rate: 0
@@ -472,7 +471,7 @@ MonoBehaviour:
         dir: {x: 0, y: 0, z: 0}
         force: 0
         time: 0
-      stun:
+      weak:
         time: 0
       armor:
         rate: 0
@@ -520,7 +519,7 @@ MonoBehaviour:
         dir: {x: 0, y: 0, z: 0}
         force: 0
         time: 0
-      stun:
+      weak:
         time: 0
       armor:
         rate: 0
@@ -545,31 +544,6 @@ MonoBehaviour:
     shootAlwaysTrack: 0
     skillPrefab: {fileID: 0}
     skill: {fileID: 0}
---- !u!114 &-235536916698660067
-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: 1d04dd6e35d71724689001e450625c39, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  curSpecialStates: 0
-  attributeTime: 0
-  resistances:
-    Float: 0
-    BlowUp: 0
-    ShotDown: 0
-    Stun: 0
-    armor: 0
-  decelerationRatioX: 2
-  decelerationRatioY: 15
-  floatingState: 0
-  haveVulnerable: 0
-  vulnerableTime: 0
 --- !u!1 &2437299196663985757
 GameObject:
   m_ObjectHideFlags: 0
@@ -812,6 +786,8 @@ GameObject:
   - component: {fileID: 6936852277045865654}
   - component: {fileID: 2640996939016594402}
   - component: {fileID: 6427563181875878110}
+  - component: {fileID: 7185972278712444361}
+  - component: {fileID: 1258808193756396050}
   m_Layer: 19
   m_Name: BeHitTrigger
   m_TagString: Untagged
@@ -861,6 +837,45 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   owner: {fileID: 5720304588384615462}
   attackerID: 0
+  curX: 0
+--- !u!114 &7185972278712444361
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4960124152152785005}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1d04dd6e35d71724689001e450625c39, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  curSpecialStates: -1
+  attributeTime: 0
+  resistances:
+    Float: 0
+    BlowUp: 0
+    ShotDown: 0
+    Weak: 0
+    armor: 0
+  decelerationRatioX: 2
+  decelerationRatioY: 15
+  floatingState: 0
+  haveVulnerable: 0
+  vulnerableTime: 0
+--- !u!114 &1258808193756396050
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4960124152152785005}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 38dc6c579f75e924697fbe3639d11c9f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isFreeze: 0
 --- !u!1 &6164447163453378808
 GameObject:
   m_ObjectHideFlags: 0

+ 58 - 29
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1003.prefab

@@ -115,10 +115,13 @@ MonoBehaviour:
       dir: {x: 0, y: 0, z: 0}
       force: 0
       time: 0
-    stun:
+    weak:
       time: 0
     armor:
       rate: 0
+    vulnerable:
+      rate: 0
+      time: 0
     changeDamage:
       rate: 0
     sustainedInjury:
@@ -140,6 +143,8 @@ GameObject:
   - component: {fileID: 6069085609270885073}
   - component: {fileID: 5217712517297835056}
   - component: {fileID: 3377671071202039733}
+  - component: {fileID: 6665864621919866219}
+  - component: {fileID: 5531803388628851645}
   m_Layer: 19
   m_Name: BeHitTrigger
   m_TagString: Untagged
@@ -189,6 +194,45 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
   attackerID: 0
+  curX: 0
+--- !u!114 &6665864621919866219
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2460330936527559963}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1d04dd6e35d71724689001e450625c39, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  curSpecialStates: -1
+  attributeTime: 0
+  resistances:
+    Float: 0
+    BlowUp: 0
+    ShotDown: 0
+    Weak: 0
+    armor: 0
+  decelerationRatioX: 2
+  decelerationRatioY: 15
+  floatingState: 0
+  haveVulnerable: 0
+  vulnerableTime: 0
+--- !u!114 &5531803388628851645
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2460330936527559963}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 38dc6c579f75e924697fbe3639d11c9f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isFreeze: 0
 --- !u!1 &4480734502875862885
 GameObject:
   m_ObjectHideFlags: 0
@@ -425,7 +469,6 @@ GameObject:
   - component: {fileID: 3719607727864895532}
   - component: {fileID: 5440846222648032765}
   - component: {fileID: 2979723395943220326}
-  - component: {fileID: 8213328083811761964}
   m_Layer: 8
   m_Name: Enemy_1003
   m_TagString: Enemy
@@ -630,10 +673,13 @@ MonoBehaviour:
       dir: {x: 0, y: 0, z: 0}
       force: 0
       time: 0
-    stun:
+    weak:
       time: 0
     armor:
       rate: 0
+    vulnerable:
+      rate: 0
+      time: 0
     changeDamage:
       rate: 0
     sustainedInjury:
@@ -674,10 +720,13 @@ MonoBehaviour:
         dir: {x: 0, y: 0, z: 0}
         force: 0
         time: 0
-      stun:
-        time: 3
+      weak:
+        time: 0
       armor:
         rate: 0
+      vulnerable:
+        rate: 0
+        time: 0
       changeDamage:
         rate: 0
       sustainedInjury:
@@ -719,10 +768,13 @@ MonoBehaviour:
         dir: {x: 0, y: 0, z: 0}
         force: 0
         time: 0
-      stun:
+      weak:
         time: 0
       armor:
         rate: 0
+      vulnerable:
+        rate: 0
+        time: 0
       changeDamage:
         rate: 0
       sustainedInjury:
@@ -741,29 +793,6 @@ MonoBehaviour:
     shootAlwaysTrack: 0
     skillPrefab: {fileID: 0}
     skill: {fileID: 0}
---- !u!114 &8213328083811761964
-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: 1d04dd6e35d71724689001e450625c39, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  curSpecialStates: ffffffff
-  attributeTime: 0
-  resistances:
-    Float: 0
-    BlowUp: 0
-    ShotDown: 0
-    Stun: 0.654
-    armor: 100
-  decelerationRatioX: 2
-  decelerationRatioY: 15
-  floatingState: 0
 --- !u!1 &6139679835290116115
 GameObject:
   m_ObjectHideFlags: 0

+ 45 - 30
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1004.prefab

@@ -113,7 +113,7 @@ MonoBehaviour:
       dir: {x: 0, y: 0, z: 0}
       force: 0
       time: 0
-    stun:
+    weak:
       time: 0
     armor:
       rate: 0
@@ -141,6 +141,8 @@ GameObject:
   - component: {fileID: 6076127848463763}
   - component: {fileID: 8507032990732667563}
   - component: {fileID: 9020361017135710302}
+  - component: {fileID: 1645771639631463631}
+  - component: {fileID: 3106972092633757933}
   m_Layer: 19
   m_Name: BeHitTrigger
   m_TagString: Untagged
@@ -190,6 +192,45 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   owner: {fileID: 1986582536140952583}
   attackerID: 0
+  curX: 0
+--- !u!114 &1645771639631463631
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1190225091429982147}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1d04dd6e35d71724689001e450625c39, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  curSpecialStates: -1
+  attributeTime: 0
+  resistances:
+    Float: 0
+    BlowUp: 0
+    ShotDown: 0
+    Weak: 0
+    armor: 0
+  decelerationRatioX: 2
+  decelerationRatioY: 15
+  floatingState: 0
+  haveVulnerable: 0
+  vulnerableTime: 0
+--- !u!114 &3106972092633757933
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1190225091429982147}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 38dc6c579f75e924697fbe3639d11c9f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isFreeze: 0
 --- !u!1 &1637528673901708253
 GameObject:
   m_ObjectHideFlags: 0
@@ -1042,7 +1083,6 @@ GameObject:
   - component: {fileID: 1986582536140952583}
   - component: {fileID: 8639832132491289349}
   - component: {fileID: 3979041853861796194}
-  - component: {fileID: 1101096037844666831}
   m_Layer: 8
   m_Name: Enemy_1004
   m_TagString: Enemy
@@ -1247,7 +1287,7 @@ MonoBehaviour:
       dir: {x: 0, y: 0, z: 0}
       force: 0
       time: 0
-    stun:
+    weak:
       time: 0
     armor:
       rate: 0
@@ -1297,7 +1337,7 @@ MonoBehaviour:
         dir: {x: 0, y: 0, z: 0}
         force: 0
         time: 0
-      stun:
+      weak:
         time: 0
       armor:
         rate: 30
@@ -1348,7 +1388,7 @@ MonoBehaviour:
         dir: {x: 0, y: 0, z: 0}
         force: 0
         time: 0
-      stun:
+      weak:
         time: 0
       armor:
         rate: 0
@@ -1373,28 +1413,3 @@ MonoBehaviour:
     shootAlwaysTrack: 0
     skillPrefab: {fileID: 0}
     skill: {fileID: 0}
---- !u!114 &1101096037844666831
-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: 1d04dd6e35d71724689001e450625c39, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  curSpecialStates: 0
-  attributeTime: 0
-  resistances:
-    Float: 0
-    BlowUp: 0
-    ShotDown: 0
-    Stun: 0
-    armor: 0
-  decelerationRatioX: 2
-  decelerationRatioY: 0
-  floatingState: 0
-  haveVulnerable: 0
-  vulnerableTime: 0

+ 45 - 30
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1005.prefab

@@ -113,7 +113,7 @@ MonoBehaviour:
       dir: {x: 0, y: 0, z: 0}
       force: 0
       time: 0
-    stun:
+    weak:
       time: 0
     armor:
       rate: 0
@@ -141,6 +141,8 @@ GameObject:
   - component: {fileID: 6076127848463763}
   - component: {fileID: 8507032990732667563}
   - component: {fileID: 9020361017135710302}
+  - component: {fileID: 5163334812499902333}
+  - component: {fileID: 9032497731069455840}
   m_Layer: 19
   m_Name: BeHitTrigger
   m_TagString: Untagged
@@ -190,6 +192,45 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   owner: {fileID: 1986582536140952583}
   attackerID: 0
+  curX: 0
+--- !u!114 &5163334812499902333
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1190225091429982147}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1d04dd6e35d71724689001e450625c39, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  curSpecialStates: -1
+  attributeTime: 0
+  resistances:
+    Float: 0
+    BlowUp: 0
+    ShotDown: 0
+    Weak: 0
+    armor: 0
+  decelerationRatioX: 2
+  decelerationRatioY: 15
+  floatingState: 0
+  haveVulnerable: 0
+  vulnerableTime: 0
+--- !u!114 &9032497731069455840
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1190225091429982147}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 38dc6c579f75e924697fbe3639d11c9f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isFreeze: 0
 --- !u!1 &1637528673901708253
 GameObject:
   m_ObjectHideFlags: 0
@@ -1042,7 +1083,6 @@ GameObject:
   - component: {fileID: 1986582536140952583}
   - component: {fileID: 8639832132491289349}
   - component: {fileID: 3979041853861796194}
-  - component: {fileID: -4025110304241557533}
   m_Layer: 8
   m_Name: Enemy_1005
   m_TagString: Enemy
@@ -1247,7 +1287,7 @@ MonoBehaviour:
       dir: {x: 0, y: 0, z: 0}
       force: 0
       time: 0
-    stun:
+    weak:
       time: 0
     armor:
       rate: 0
@@ -1297,7 +1337,7 @@ MonoBehaviour:
         dir: {x: 0, y: 0, z: 0}
         force: 0
         time: 0
-      stun:
+      weak:
         time: 0
       armor:
         rate: 30
@@ -1348,7 +1388,7 @@ MonoBehaviour:
         dir: {x: 0, y: 0, z: 0}
         force: 0
         time: 0
-      stun:
+      weak:
         time: 0
       armor:
         rate: 0
@@ -1373,28 +1413,3 @@ MonoBehaviour:
     shootAlwaysTrack: 0
     skillPrefab: {fileID: 0}
     skill: {fileID: 0}
---- !u!114 &-4025110304241557533
-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: 1d04dd6e35d71724689001e450625c39, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  curSpecialStates: 0
-  attributeTime: 0
-  resistances:
-    Float: 0
-    BlowUp: 0
-    ShotDown: 0
-    Stun: 0
-    armor: 0
-  decelerationRatioX: 2
-  decelerationRatioY: 100
-  floatingState: 0
-  haveVulnerable: 0
-  vulnerableTime: 0

+ 57 - 28
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1006.prefab

@@ -191,10 +191,13 @@ MonoBehaviour:
       dir: {x: 0, y: 0, z: 0}
       force: 0
       time: 0
-    stun:
+    weak:
       time: 0
     armor:
       rate: 0
+    vulnerable:
+      rate: 0
+      time: 0
     changeDamage:
       rate: 0
     sustainedInjury:
@@ -217,7 +220,6 @@ GameObject:
   - component: {fileID: 5720304588384615462}
   - component: {fileID: 2437299196472462355}
   - component: {fileID: 7875272022194174294}
-  - component: {fileID: 1508165302587368955}
   m_Layer: 8
   m_Name: Enemy_1006
   m_TagString: Enemy
@@ -422,10 +424,13 @@ MonoBehaviour:
       dir: {x: 0, y: 0, z: 0}
       force: 0
       time: 0
-    stun:
+    weak:
       time: 0
     armor:
       rate: 0
+    vulnerable:
+      rate: 0
+      time: 0
     changeDamage:
       rate: 0
     sustainedInjury:
@@ -466,10 +471,13 @@ MonoBehaviour:
         dir: {x: 0, y: 0, z: 0}
         force: 0
         time: 0
-      stun:
+      weak:
         time: 0
       armor:
         rate: 0
+      vulnerable:
+        rate: 0
+        time: 0
       changeDamage:
         rate: 0
       sustainedInjury:
@@ -511,10 +519,13 @@ MonoBehaviour:
         dir: {x: 0, y: 0, z: 0}
         force: 0
         time: 0
-      stun:
+      weak:
         time: 0
       armor:
         rate: 0
+      vulnerable:
+        rate: 0
+        time: 0
       changeDamage:
         rate: 0
       sustainedInjury:
@@ -533,29 +544,6 @@ MonoBehaviour:
     shootAlwaysTrack: 0
     skillPrefab: {fileID: 0}
     skill: {fileID: 0}
---- !u!114 &1508165302587368955
-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: 1d04dd6e35d71724689001e450625c39, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  curSpecialStates: ffffffff
-  attributeTime: 0
-  resistances:
-    Float: 0
-    BlowUp: 0
-    ShotDown: 0
-    Stun: 0
-    armor: 0
-  decelerationRatioX: 2
-  decelerationRatioY: 15
-  floatingState: 0
 --- !u!1 &2437299196663985757
 GameObject:
   m_ObjectHideFlags: 0
@@ -798,6 +786,8 @@ GameObject:
   - component: {fileID: 6936852277045865654}
   - component: {fileID: 2640996939016594402}
   - component: {fileID: 6427563181875878110}
+  - component: {fileID: 7095292901101286790}
+  - component: {fileID: 2884937719710578007}
   m_Layer: 19
   m_Name: BeHitTrigger
   m_TagString: Untagged
@@ -847,6 +837,45 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   owner: {fileID: 5720304588384615462}
   attackerID: 0
+  curX: 0
+--- !u!114 &7095292901101286790
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4960124152152785005}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1d04dd6e35d71724689001e450625c39, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  curSpecialStates: -1
+  attributeTime: 0
+  resistances:
+    Float: 0
+    BlowUp: 0
+    ShotDown: 0
+    Weak: 0
+    armor: 0
+  decelerationRatioX: 2
+  decelerationRatioY: 15
+  floatingState: 0
+  haveVulnerable: 0
+  vulnerableTime: 0
+--- !u!114 &2884937719710578007
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4960124152152785005}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 38dc6c579f75e924697fbe3639d11c9f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isFreeze: 0
 --- !u!1 &6164447163453378808
 GameObject:
   m_ObjectHideFlags: 0

+ 58 - 29
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1007.prefab

@@ -113,10 +113,13 @@ MonoBehaviour:
       dir: {x: 0, y: 0, z: 0}
       force: 0
       time: 0
-    stun:
+    weak:
       time: 0
     armor:
       rate: 0
+    vulnerable:
+      rate: 0
+      time: 0
     changeDamage:
       rate: 0
     sustainedInjury:
@@ -138,6 +141,8 @@ GameObject:
   - component: {fileID: 6076127848463763}
   - component: {fileID: 8507032990732667563}
   - component: {fileID: 9020361017135710302}
+  - component: {fileID: 9182774060409537036}
+  - component: {fileID: 7039260392684945265}
   m_Layer: 19
   m_Name: BeHitTrigger
   m_TagString: Untagged
@@ -187,6 +192,45 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   owner: {fileID: 1986582536140952583}
   attackerID: 0
+  curX: 0
+--- !u!114 &9182774060409537036
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1190225091429982147}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 38dc6c579f75e924697fbe3639d11c9f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isFreeze: 0
+--- !u!114 &7039260392684945265
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1190225091429982147}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1d04dd6e35d71724689001e450625c39, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  curSpecialStates: -1
+  attributeTime: 0
+  resistances:
+    Float: 0
+    BlowUp: 0
+    ShotDown: 0
+    Weak: 0
+    armor: 0
+  decelerationRatioX: 2
+  decelerationRatioY: 15
+  floatingState: 0
+  haveVulnerable: 0
+  vulnerableTime: 0
 --- !u!1 &1637528673901708253
 GameObject:
   m_ObjectHideFlags: 0
@@ -1039,7 +1083,6 @@ GameObject:
   - component: {fileID: 1986582536140952583}
   - component: {fileID: 8639832132491289349}
   - component: {fileID: 3979041853861796194}
-  - component: {fileID: 5610645399107145286}
   m_Layer: 8
   m_Name: Enemy_1007
   m_TagString: Enemy
@@ -1244,10 +1287,13 @@ MonoBehaviour:
       dir: {x: 0, y: 0, z: 0}
       force: 0
       time: 0
-    stun:
+    weak:
       time: 0
     armor:
       rate: 0
+    vulnerable:
+      rate: 0
+      time: 0
     changeDamage:
       rate: 0
     sustainedInjury:
@@ -1291,10 +1337,13 @@ MonoBehaviour:
         dir: {x: 0, y: 0, z: 0}
         force: 0
         time: 0
-      stun:
-        time: 3
+      weak:
+        time: 0
       armor:
         rate: 30
+      vulnerable:
+        rate: 0
+        time: 0
       changeDamage:
         rate: 0
       sustainedInjury:
@@ -1339,10 +1388,13 @@ MonoBehaviour:
         dir: {x: 0, y: 0, z: 0}
         force: 0
         time: 0
-      stun:
+      weak:
         time: 0
       armor:
         rate: 0
+      vulnerable:
+        rate: 0
+        time: 0
       changeDamage:
         rate: 0
       sustainedInjury:
@@ -1361,26 +1413,3 @@ MonoBehaviour:
     shootAlwaysTrack: 0
     skillPrefab: {fileID: 0}
     skill: {fileID: 0}
---- !u!114 &5610645399107145286
-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: 1d04dd6e35d71724689001e450625c39, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  curSpecialStates: ffffffff
-  attributeTime: 0
-  resistances:
-    Float: 0
-    BlowUp: 0
-    ShotDown: 0
-    Stun: 0
-    armor: 100
-  decelerationRatioX: 2
-  decelerationRatioY: 15
-  floatingState: 0

+ 3 - 3
ActionTowerDefense/Assets/Scripts/Characters/AttributeStatus.cs

@@ -70,9 +70,9 @@ public class AttributeStatus : MonoBehaviour
 
     private void Awake()
     {
-        character = GetComponent<MoveCharacter>();
-        rb = GetComponent<Rigidbody>();
-        foot = GetComponentInChildren<Foot>();
+        character = GetComponentInParent<MoveCharacter>();
+        rb = character.rb;
+        foot = character.foot;
     }
 
     public void Update()

+ 1 - 1
ActionTowerDefense/Assets/Scripts/Characters/HitFeedbackSystem.cs

@@ -15,7 +15,7 @@ public class HitFeedbackSystem : MonoBehaviour
 
     private void Awake()
     {
-        character = GetComponent<MoveCharacter>();
+        character = GetComponentInParent<MoveCharacter>();
     }
 
     void Start()

+ 1 - 1
ActionTowerDefense/Assets/Scripts/Characters/MoveCharacter.cs

@@ -76,7 +76,7 @@ public class MoveCharacter : Character
         spinee = bodyTrans.GetChild(0).gameObject;
         mesh = spinee.GetComponent<MeshRenderer>();
         mats = mesh.materials;
-        attributeStatus = GetComponent<AttributeStatus>();
+        attributeStatus = GetComponentInChildren<AttributeStatus>();
     }
 
     private void Start()

+ 4 - 4
ActionTowerDefense/Assets/Scripts/Spirits/FloatEffect.cs

@@ -26,20 +26,20 @@ public class FloatEffect : MonoBehaviour
     {
         if (other.gameObject.layer == 8 )
         {
-            AttributeStatus attributeStatus = other.GetComponentInParent<AttributeStatus>();
+            AttributeStatus attributeStatus = other.GetComponent<AttributeStatus>();
             attributeStatus.AddFloat(attackInfo.floatState);
         }
         else if(isEnemy && other.gameObject.layer == 7)
         {
-            AttributeStatus attributeStatus = other.GetComponentInParent<AttributeStatus>();
+            AttributeStatus attributeStatus = other.GetComponent<AttributeStatus>();
             attributeStatus.AddFloat(attackInfo.floatState);
         }
         if(isEnemy && other.gameObject.layer == 6)
         {
-            PlayerController pc = other.GetComponentInParent<PlayerController>();
+            PlayerController pc = other.GetComponent<PlayerController>();
             pc.lostMp = 0;
             pc.soulCollector.enabled = false;
-            AttributeStatus attributeStatus = other.GetComponentInParent<AttributeStatus>();
+            AttributeStatus attributeStatus = other.GetComponent<AttributeStatus>();
             attributeStatus.AddFloat(attackInfo.floatState);
         }
     }