DESKTOP-27RMV90\A 6 сар өмнө
parent
commit
8dcd065848

+ 13 - 6
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1001.prefab

@@ -263,6 +263,8 @@ MonoBehaviour:
   totalAttack_summonTime: 1.8333334
   totalAttack_marchTime: 1.8333334
   dieKeepTime: 0
+  beHitDistance: 0.5
+  attackDis: 0
   rb: {fileID: 2437299196472462355}
   bodyTrans: {fileID: 5075820377452290163}
   beSearchTrigger: {fileID: 6542925321707027015}
@@ -354,10 +356,6 @@ MonoBehaviour:
   wallDamage: 0
   type: -1
   searchState: 0
-  attackDistance: 2
-  maxAttackDis: 0
-  minAttackDis: 0
-  needToChange: 0
   attackRatio: 0
   dropSoulMax: 1
   dropSoulMin: 1
@@ -433,6 +431,7 @@ MonoBehaviour:
   skill: {fileID: 0}
   attackEffect: {fileID: 0}
   effect: {fileID: 0}
+  attackDistance: 0
   attackTrigger: {fileID: 2280520615464243483}
   isAttackTriggerOn: 0
   bulletPrefab: {fileID: 0}
@@ -473,6 +472,10 @@ MonoBehaviour:
       sustainedInjury:
         damage: 0
     attackTrigger: {fileID: 2280520615464243483}
+    attackDistance: 1
+    maxAttackDis: 0
+    minAttackDis: 0
+    needToChange: 0
     targetTypes: 010000000300000002000000
     canHitFly: 1
     armorPiercing: 0
@@ -514,6 +517,10 @@ MonoBehaviour:
       sustainedInjury:
         damage: 0
     attackTrigger: {fileID: 0}
+    attackDistance: 0
+    maxAttackDis: 0
+    minAttackDis: 0
+    needToChange: 0
     targetTypes: 
     canHitFly: 0
     armorPiercing: 0
@@ -836,8 +843,8 @@ BoxCollider:
   m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 0.8995418, y: 1.64, z: 2}
-  m_Center: {x: -0.26193073, y: 0.792, z: 0}
+  m_Size: {x: 1.2740195, y: 1.464109, z: 2}
+  m_Center: {x: -0.07469189, y: 0.7040545, z: 0}
 --- !u!114 &6427563181875878110
 MonoBehaviour:
   m_ObjectHideFlags: 0

+ 53 - 44
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1002.prefab

@@ -107,6 +107,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   imgHp: {fileID: 7211513204843255236}
+  pc: {fileID: 0}
+  points: []
 --- !u!1 &1916444301582183241
 GameObject:
   m_ObjectHideFlags: 0
@@ -175,12 +177,12 @@ MonoBehaviour:
     damage: 0
     attackDir: {x: 0, y: 0, z: 0}
     attackEffect: 
-    force: 0
-    changeHurt: 0
-    repelValue: 0
-    canBlowUp: 0
     floatState:
       time: 0
+      upTime: {x: 0, y: 0}
+      backSpeed: {x: 0, y: 0}
+      rotateSpeed: {x: 0, y: 0}
+      height: {x: 0, y: 0}
     blowUp:
       dir: {x: 0, y: 0, z: 0}
       force: 0
@@ -188,7 +190,7 @@ MonoBehaviour:
     shotDown:
       dir: {x: 0, y: 0, z: 0}
       force: 0
-      timel: 0
+      time: 0
     stun:
       time: 0
     armor:
@@ -261,6 +263,8 @@ MonoBehaviour:
   totalAttack_summonTime: 1.8333
   totalAttack_marchTime: 1.8333
   dieKeepTime: 0
+  beHitDistance: 0.5
+  attackDis: 0
   rb: {fileID: 2437299196472462355}
   bodyTrans: {fileID: 5075820377452290163}
   beSearchTrigger: {fileID: 6542925321707027015}
@@ -302,15 +306,19 @@ MonoBehaviour:
   attributeStatus: {fileID: 0}
   extraRiseGravity: -28.8
   extraFallGravity: -14.4
-  canMove: 1
   moveSpeed: 5.801691
+  needToAdjustFlyHeight: 0
+  flyHeight: 0
+  maxFlyHeight: 0
+  minFlyHeight: 0
+  flyUpTime: 0
+  isAdjustHeight: 0
   totalBeRepelValue: 30
   beRepelValue: 0
   weakTime: 0
   totalWeakTime: 10
   newTotalWeakTime: 0
   weakHitRate: 2
-  weakForce: {x: 0, y: 0, z: 0}
   easyToGetHit: 0.2
   isDamageReduction: 0
   reductionDegree: 0
@@ -318,16 +326,7 @@ MonoBehaviour:
   decelerationRatio: 2
   comaTime: 5
   pastComaTime: 0
-  floatState: 0
-  maxTime: 1.5
-  minTime: 0.1
-  maxHeight: 9
-  minHeight: 4
   floatTime: 10
-  maxRotateSpeed: 20
-  minRotateSpeed: 5
-  isFloat: 0
-  normalFallSpeed: 10
   effect: {fileID: 0}
   soulPrefab: {fileID: 1723151111827507807, guid: e2b65aa482f2f1447a4074208d72b778, type: 3}
   soulStartSpeed: 1
@@ -345,8 +344,6 @@ MonoBehaviour:
   id: 0
   baseSortingOrder: 5000
   isBack: 0
-  flyHeight: 0
-  flyUpSpeed: 10
   jumpSpeed: 9
   maxMoveSpeed: 6
   minMoveSpeed: 5
@@ -357,20 +354,12 @@ MonoBehaviour:
   reboundXSpeed: 0
   reboundYSpeed: 0
   wallDamage: 0
-  willBeComa: 0
-  willComaTime: 0
-  comaDamage: 0
   type: -1
   searchState: 0
-  attackDistance: 4
-  maxAttackDis: 0
-  minAttackDis: 0
-  needToChange: 0
   attackRatio: 0
   dropSoulMax: 2
   dropSoulMin: 2
   dropSoulAngle: 90
-  upFirstAfterWeaknessOrNot: 0
 --- !u!54 &2437299196472462355
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -432,12 +421,12 @@ MonoBehaviour:
     damage: 0
     attackDir: {x: 0, y: 0, z: 0}
     attackEffect: 
-    force: 0
-    changeHurt: 0
-    repelValue: 0
-    canBlowUp: 0
     floatState:
       time: 0
+      upTime: {x: 0, y: 0}
+      backSpeed: {x: 0, y: 0}
+      rotateSpeed: {x: 0, y: 0}
+      height: {x: 0, y: 0}
     blowUp:
       dir: {x: 0, y: 0, z: 0}
       force: 0
@@ -445,7 +434,7 @@ MonoBehaviour:
     shotDown:
       dir: {x: 0, y: 0, z: 0}
       force: 0
-      timel: 0
+      time: 0
     stun:
       time: 0
     armor:
@@ -455,6 +444,10 @@ MonoBehaviour:
     sustainedInjury:
       damage: 0
   addAttackEffect: {fileID: 0}
+  skill: {fileID: 0}
+  attackEffect: {fileID: 0}
+  effect: {fileID: 0}
+  attackDistance: 0
   attackTrigger: {fileID: 2280520615464243483}
   isAttackTriggerOn: 0
   bulletPrefab: {fileID: 0}
@@ -472,12 +465,12 @@ MonoBehaviour:
       damage: 60
       attackDir: {x: 0, y: 0, z: 0}
       attackEffect: 
-      force: 0
-      changeHurt: 0
-      repelValue: 0
-      canBlowUp: 0
       floatState:
         time: 0
+        upTime: {x: 0, y: 0}
+        backSpeed: {x: 0, y: 0}
+        rotateSpeed: {x: 0, y: 0}
+        height: {x: 0, y: 0}
       blowUp:
         dir: {x: 0, y: 0, z: 0}
         force: 0
@@ -485,7 +478,7 @@ MonoBehaviour:
       shotDown:
         dir: {x: 0, y: 0, z: 0}
         force: 0
-        timel: 0
+        time: 0
       stun:
         time: 0
       armor:
@@ -495,6 +488,10 @@ MonoBehaviour:
       sustainedInjury:
         damage: 0
     attackTrigger: {fileID: 2280520615464243483}
+    attackDistance: 4
+    maxAttackDis: 0
+    minAttackDis: 0
+    needToChange: 0
     targetTypes: 010000000200000003000000
     canHitFly: 1
     armorPiercing: 0
@@ -503,6 +500,7 @@ MonoBehaviour:
     shootTrack: 0
     shootAlwaysTrack: 0
     skillPrefab: {fileID: 0}
+    skill: {fileID: 0}
   curAttackMethod:
     id: 0
     attackName: 
@@ -512,12 +510,12 @@ MonoBehaviour:
       damage: 0
       attackDir: {x: 0, y: 0, z: 0}
       attackEffect: 
-      force: 0
-      changeHurt: 0
-      repelValue: 0
-      canBlowUp: 0
       floatState:
         time: 0
+        upTime: {x: 0, y: 0}
+        backSpeed: {x: 0, y: 0}
+        rotateSpeed: {x: 0, y: 0}
+        height: {x: 0, y: 0}
       blowUp:
         dir: {x: 0, y: 0, z: 0}
         force: 0
@@ -525,7 +523,7 @@ MonoBehaviour:
       shotDown:
         dir: {x: 0, y: 0, z: 0}
         force: 0
-        timel: 0
+        time: 0
       stun:
         time: 0
       armor:
@@ -535,6 +533,10 @@ MonoBehaviour:
       sustainedInjury:
         damage: 0
     attackTrigger: {fileID: 0}
+    attackDistance: 0
+    maxAttackDis: 0
+    minAttackDis: 0
+    needToChange: 0
     targetTypes: 
     canHitFly: 0
     armorPiercing: 0
@@ -543,6 +545,7 @@ MonoBehaviour:
     shootTrack: 0
     shootAlwaysTrack: 0
     skillPrefab: {fileID: 0}
+    skill: {fileID: 0}
 --- !u!114 &-235536916698660067
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -556,9 +559,15 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   curSpecialStates: ffffffff
-  strikeStunTime: 0
+  attributeTime: 0
+  resistances:
+    Float: 0
+    BlowUp: 0
+    ShotDown: 0
+    Stun: 0
   decelerationRatioX: 2
   decelerationRatioY: 15
+  floatingState: 0
 --- !u!1 &2437299196663985757
 GameObject:
   m_ObjectHideFlags: 0
@@ -834,8 +843,8 @@ BoxCollider:
   m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 0.49, y: 1.64, z: 2}
-  m_Center: {x: 0, y: 0.792, z: 0}
+  m_Size: {x: 1.1752828, y: 1.64, z: 2}
+  m_Center: {x: 0.013985336, y: 0.792, z: 0}
 --- !u!114 &6427563181875878110
 MonoBehaviour:
   m_ObjectHideFlags: 0

+ 3 - 3
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1003.prefab

@@ -77,8 +77,8 @@ BoxCollider:
   m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 2.6117325, y: 4.0983477, z: 2}
-  m_Center: {x: -2.6158664, y: 1.954174, z: 0}
+  m_Size: {x: 2.0996065, y: 4.0983477, z: 2}
+  m_Center: {x: -2.3598015, y: 1.954174, z: 0}
 --- !u!114 &7729941002223262554
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -981,7 +981,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7208291223413765209}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0.46, y: 0, z: 0}
   m_LocalScale: {x: 0.72, y: 0.72, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []

+ 44 - 37
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1004.prefab

@@ -99,12 +99,12 @@ MonoBehaviour:
     damage: 0
     attackDir: {x: 0, y: 0, z: 0}
     attackEffect: 
-    force: 0
-    changeHurt: 0
-    repelValue: 0
-    canBlowUp: 0
     floatState:
       time: 0
+      upTime: {x: 0, y: 0}
+      backSpeed: {x: 0, y: 0}
+      rotateSpeed: {x: 0, y: 0}
+      height: {x: 0, y: 0}
     blowUp:
       dir: {x: 0, y: 0, z: 0}
       force: 0
@@ -295,6 +295,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   imgHp: {fileID: 3266580543050502037}
+  pc: {fileID: 0}
+  points: []
 --- !u!1 &2234394376273647362
 GameObject:
   m_ObjectHideFlags: 0
@@ -1083,6 +1085,8 @@ MonoBehaviour:
   totalAttack_summonTime: 1
   totalAttack_marchTime: 2
   dieKeepTime: 0
+  beHitDistance: 0.2
+  attackDis: 0
   rb: {fileID: 8639832132491289349}
   bodyTrans: {fileID: 5769591908339262981}
   beSearchTrigger: {fileID: 316813748882225178}
@@ -1124,17 +1128,19 @@ MonoBehaviour:
   attributeStatus: {fileID: 0}
   extraRiseGravity: -28.8
   extraFallGravity: -14.4
-  canMove: 1
   moveSpeed: 8.205597
+  needToAdjustFlyHeight: 0
   flyHeight: 0
-  flyUpSpeed: 10
+  maxFlyHeight: 0
+  minFlyHeight: 0
+  flyUpTime: 0
+  isAdjustHeight: 0
   totalBeRepelValue: 20
   beRepelValue: 0
   weakTime: 0
   totalWeakTime: 10
   newTotalWeakTime: 0
   weakHitRate: 2
-  weakForce: {x: 0, y: 0, z: 0}
   easyToGetHit: 0.2
   isDamageReduction: 0
   reductionDegree: 0
@@ -1142,16 +1148,7 @@ MonoBehaviour:
   decelerationRatio: 1
   comaTime: 5
   pastComaTime: 0
-  floatState: 0
-  maxTime: 1.5
-  minTime: 0.1
-  maxHeight: 9
-  minHeight: 4
   floatTime: 10
-  maxRotateSpeed: 20
-  minRotateSpeed: 5
-  isFloat: 0
-  normalFallSpeed: 10
   effect: {fileID: 0}
   soulPrefab: {fileID: 1723151111827507807, guid: e2b65aa482f2f1447a4074208d72b778, type: 3}
   soulStartSpeed: 1
@@ -1179,15 +1176,8 @@ MonoBehaviour:
   reboundXSpeed: 0
   reboundYSpeed: 0
   wallDamage: 0
-  willBeComa: 0
-  willComaTime: 0
-  comaDamage: 0
   type: -1
   searchState: 0
-  attackDistance: 10
-  maxAttackDis: 15
-  minAttackDis: 9
-  needToChange: 1
   attackRatio: 0
   dropSoulMax: 1
   dropSoulMin: 1
@@ -1253,12 +1243,12 @@ MonoBehaviour:
     damage: 0
     attackDir: {x: 0, y: 0, z: 0}
     attackEffect: 
-    force: 0
-    changeHurt: 0
-    repelValue: 0
-    canBlowUp: 0
     floatState:
       time: 0
+      upTime: {x: 0, y: 0}
+      backSpeed: {x: 0, y: 0}
+      rotateSpeed: {x: 0, y: 0}
+      height: {x: 0, y: 0}
     blowUp:
       dir: {x: 0, y: 0, z: 0}
       force: 0
@@ -1277,6 +1267,9 @@ MonoBehaviour:
       damage: 0
   addAttackEffect: {fileID: 0}
   skill: {fileID: 0}
+  attackEffect: {fileID: 0}
+  effect: {fileID: 0}
+  attackDistance: 0
   attackTrigger: {fileID: 8924180071245218248}
   isAttackTriggerOn: 0
   bulletPrefab: {fileID: 7473170563405908938, guid: 0460e8750cef0df4292f6d2bb56a4843, type: 3}
@@ -1297,12 +1290,12 @@ MonoBehaviour:
       damage: 60
       attackDir: {x: -1, y: 0, z: 0}
       attackEffect: 
-      force: 0
-      changeHurt: 0
-      repelValue: 0
-      canBlowUp: 0
       floatState:
         time: 0
+        upTime: {x: 0, y: 0}
+        backSpeed: {x: 0, y: 0}
+        rotateSpeed: {x: 0, y: 0}
+        height: {x: 0, y: 0}
       blowUp:
         dir: {x: 0, y: 0, z: 0}
         force: 0
@@ -1320,6 +1313,10 @@ MonoBehaviour:
       sustainedInjury:
         damage: 0
     attackTrigger: {fileID: 8924180071245218248}
+    attackDistance: 0
+    maxAttackDis: 15
+    minAttackDis: 9
+    needToChange: 1
     targetTypes: 010000000200000003000000
     canHitFly: 1
     armorPiercing: 0
@@ -1341,12 +1338,12 @@ MonoBehaviour:
       damage: 0
       attackDir: {x: 0, y: 0, z: 0}
       attackEffect: 
-      force: 0
-      changeHurt: 0
-      repelValue: 0
-      canBlowUp: 0
       floatState:
         time: 0
+        upTime: {x: 0, y: 0}
+        backSpeed: {x: 0, y: 0}
+        rotateSpeed: {x: 0, y: 0}
+        height: {x: 0, y: 0}
       blowUp:
         dir: {x: 0, y: 0, z: 0}
         force: 0
@@ -1364,6 +1361,10 @@ MonoBehaviour:
       sustainedInjury:
         damage: 0
     attackTrigger: {fileID: 0}
+    attackDistance: 0
+    maxAttackDis: 0
+    minAttackDis: 0
+    needToChange: 0
     targetTypes: 
     canHitFly: 0
     armorPiercing: 0
@@ -1386,6 +1387,12 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   curSpecialStates: ffffffff
-  strikeStunTime: 0
+  attributeTime: 0
+  resistances:
+    Float: 0
+    BlowUp: 0
+    ShotDown: 0
+    Stun: 0
   decelerationRatioX: 2
-  decelerationRatioY: 15
+  decelerationRatioY: 0
+  floatingState: 0

+ 40 - 19
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1005.prefab

@@ -101,6 +101,10 @@ MonoBehaviour:
     attackEffect: 
     floatState:
       time: 0
+      upTime: {x: 0, y: 0}
+      backSpeed: {x: 0, y: 0}
+      rotateSpeed: {x: 0, y: 0}
+      height: {x: 0, y: 0}
     blowUp:
       dir: {x: 0, y: 0, z: 0}
       force: 0
@@ -291,6 +295,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   imgHp: {fileID: 3266580543050502037}
+  pc: {fileID: 0}
+  points: []
 --- !u!1 &2234394376273647362
 GameObject:
   m_ObjectHideFlags: 0
@@ -1079,6 +1085,8 @@ MonoBehaviour:
   totalAttack_summonTime: 1
   totalAttack_marchTime: 2
   dieKeepTime: 0
+  beHitDistance: 0.2
+  attackDis: 0
   rb: {fileID: 8639832132491289349}
   bodyTrans: {fileID: 5769591908339262981}
   beSearchTrigger: {fileID: 316813748882225178}
@@ -1120,10 +1128,13 @@ MonoBehaviour:
   attributeStatus: {fileID: 0}
   extraRiseGravity: -28.8
   extraFallGravity: -14.4
-  canMove: 1
   moveSpeed: 8.205597
+  needToAdjustFlyHeight: 0
   flyHeight: 0
-  flyUpSpeed: 10
+  maxFlyHeight: 0
+  minFlyHeight: 0
+  flyUpTime: 0
+  isAdjustHeight: 0
   totalBeRepelValue: 20
   beRepelValue: 0
   weakTime: 0
@@ -1137,16 +1148,7 @@ MonoBehaviour:
   decelerationRatio: 1
   comaTime: 5
   pastComaTime: 0
-  floatState: 0
-  maxTime: 1.5
-  minTime: 0.1
-  maxHeight: 9
-  minHeight: 4
   floatTime: 10
-  maxRotateSpeed: 20
-  minRotateSpeed: 5
-  isFloat: 0
-  normalFallSpeed: 10
   effect: {fileID: 0}
   soulPrefab: {fileID: 1723151111827507807, guid: e2b65aa482f2f1447a4074208d72b778, type: 3}
   soulStartSpeed: 1
@@ -1162,7 +1164,7 @@ MonoBehaviour:
   sustainedInjury_damage: 0
   heavyDamage: 0
   id: 0
-  baseSortingOrder: 7000
+  baseSortingOrder: 7001
   isBack: 0
   jumpSpeed: 10
   maxMoveSpeed: 12
@@ -1176,10 +1178,6 @@ MonoBehaviour:
   wallDamage: 0
   type: -1
   searchState: 0
-  attackDistance: 10
-  maxAttackDis: 15
-  minAttackDis: 9
-  needToChange: 1
   attackRatio: 0
   dropSoulMax: 1
   dropSoulMin: 1
@@ -1247,6 +1245,10 @@ MonoBehaviour:
     attackEffect: 
     floatState:
       time: 0
+      upTime: {x: 0, y: 0}
+      backSpeed: {x: 0, y: 0}
+      rotateSpeed: {x: 0, y: 0}
+      height: {x: 0, y: 0}
     blowUp:
       dir: {x: 0, y: 0, z: 0}
       force: 0
@@ -1267,6 +1269,7 @@ MonoBehaviour:
   skill: {fileID: 0}
   attackEffect: {fileID: 0}
   effect: {fileID: 0}
+  attackDistance: 0
   attackTrigger: {fileID: 8924180071245218248}
   isAttackTriggerOn: 0
   bulletPrefab: {fileID: 7473170563405908938, guid: 0460e8750cef0df4292f6d2bb56a4843, type: 3}
@@ -1289,6 +1292,10 @@ MonoBehaviour:
       attackEffect: 
       floatState:
         time: 0
+        upTime: {x: 0, y: 0}
+        backSpeed: {x: 0, y: 0}
+        rotateSpeed: {x: 0, y: 0}
+        height: {x: 0, y: 0}
       blowUp:
         dir: {x: 0, y: 0, z: 0}
         force: 0
@@ -1306,6 +1313,10 @@ MonoBehaviour:
       sustainedInjury:
         damage: 0
     attackTrigger: {fileID: 8924180071245218248}
+    attackDistance: 0
+    maxAttackDis: 15
+    minAttackDis: 9
+    needToChange: 1
     targetTypes: 010000000200000003000000
     canHitFly: 1
     armorPiercing: 0
@@ -1329,6 +1340,10 @@ MonoBehaviour:
       attackEffect: 
       floatState:
         time: 0
+        upTime: {x: 0, y: 0}
+        backSpeed: {x: 0, y: 0}
+        rotateSpeed: {x: 0, y: 0}
+        height: {x: 0, y: 0}
       blowUp:
         dir: {x: 0, y: 0, z: 0}
         force: 0
@@ -1346,6 +1361,10 @@ MonoBehaviour:
       sustainedInjury:
         damage: 0
     attackTrigger: {fileID: 0}
+    attackDistance: 0
+    maxAttackDis: 0
+    minAttackDis: 0
+    needToChange: 0
     targetTypes: 
     canHitFly: 0
     armorPiercing: 0
@@ -1368,10 +1387,12 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   curSpecialStates: ffffffff
-  strikeStunTime: 0
-  decelerationRatioX: 2
-  decelerationRatioY: 100
+  attributeTime: 0
   resistances:
+    Float: 0
     BlowUp: 0
     ShotDown: 0
     Stun: 0
+  decelerationRatioX: 2
+  decelerationRatioY: 100
+  floatingState: 0

+ 45 - 38
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1006.prefab

@@ -107,6 +107,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   imgHp: {fileID: 7211513204843255236}
+  pc: {fileID: 0}
+  points: []
 --- !u!1 &1916444301582183241
 GameObject:
   m_ObjectHideFlags: 0
@@ -175,12 +177,12 @@ MonoBehaviour:
     damage: 0
     attackDir: {x: 0, y: 0, z: 0}
     attackEffect: 
-    force: 0
-    changeHurt: 0
-    repelValue: 0
-    canBlowUp: 0
     floatState:
       time: 0
+      upTime: {x: 0, y: 0}
+      backSpeed: {x: 0, y: 0}
+      rotateSpeed: {x: 0, y: 0}
+      height: {x: 0, y: 0}
     blowUp:
       dir: {x: 0, y: 0, z: 0}
       force: 0
@@ -261,6 +263,8 @@ MonoBehaviour:
   totalAttack_summonTime: 1.8333334
   totalAttack_marchTime: 1.8333334
   dieKeepTime: 0
+  beHitDistance: 0.5
+  attackDis: 0
   rb: {fileID: 2437299196472462355}
   bodyTrans: {fileID: 5075820377452290163}
   beSearchTrigger: {fileID: 6542925321707027015}
@@ -302,17 +306,19 @@ MonoBehaviour:
   attributeStatus: {fileID: 0}
   extraRiseGravity: -28.8
   extraFallGravity: -14.4
-  canMove: 1
   moveSpeed: 5.988441
+  needToAdjustFlyHeight: 0
   flyHeight: 0
-  flyUpSpeed: 10
+  maxFlyHeight: 0
+  minFlyHeight: 0
+  flyUpTime: 0
+  isAdjustHeight: 0
   totalBeRepelValue: 30
   beRepelValue: 0
   weakTime: 0
   totalWeakTime: 10
   newTotalWeakTime: 0
   weakHitRate: 2
-  weakForce: {x: 0, y: 0, z: 0}
   easyToGetHit: 0.2
   isDamageReduction: 0
   reductionDegree: 0
@@ -320,16 +326,7 @@ MonoBehaviour:
   decelerationRatio: 2
   comaTime: 5
   pastComaTime: 0
-  floatState: 0
-  maxTime: 1.5
-  minTime: 0.1
-  maxHeight: 9
-  minHeight: 4
   floatTime: 10
-  maxRotateSpeed: 20
-  minRotateSpeed: 5
-  isFloat: 0
-  normalFallSpeed: 10
   effect: {fileID: 0}
   soulPrefab: {fileID: 1723151111827507807, guid: e2b65aa482f2f1447a4074208d72b778, type: 3}
   soulStartSpeed: 1
@@ -357,15 +354,8 @@ MonoBehaviour:
   reboundXSpeed: 0
   reboundYSpeed: 0
   wallDamage: 0
-  willBeComa: 0
-  willComaTime: 0
-  comaDamage: 0
   type: -1
   searchState: 0
-  attackDistance: 2
-  maxAttackDis: 0
-  minAttackDis: 0
-  needToChange: 0
   attackRatio: 0
   dropSoulMax: 2
   dropSoulMin: 2
@@ -431,12 +421,12 @@ MonoBehaviour:
     damage: 0
     attackDir: {x: 0, y: 0, z: 0}
     attackEffect: 
-    force: 0
-    changeHurt: 0
-    repelValue: 0
-    canBlowUp: 0
     floatState:
       time: 0
+      upTime: {x: 0, y: 0}
+      backSpeed: {x: 0, y: 0}
+      rotateSpeed: {x: 0, y: 0}
+      height: {x: 0, y: 0}
     blowUp:
       dir: {x: 0, y: 0, z: 0}
       force: 0
@@ -455,6 +445,9 @@ MonoBehaviour:
       damage: 0
   addAttackEffect: {fileID: 0}
   skill: {fileID: 0}
+  attackEffect: {fileID: 0}
+  effect: {fileID: 0}
+  attackDistance: 0
   attackTrigger: {fileID: 2280520615464243483}
   isAttackTriggerOn: 0
   bulletPrefab: {fileID: 0}
@@ -472,12 +465,12 @@ MonoBehaviour:
       damage: 100
       attackDir: {x: 0, y: 0, z: 0}
       attackEffect: 
-      force: 0
-      changeHurt: 0
-      repelValue: 0
-      canBlowUp: 0
       floatState:
         time: 0
+        upTime: {x: 0, y: 0}
+        backSpeed: {x: 0, y: 0}
+        rotateSpeed: {x: 0, y: 0}
+        height: {x: 0, y: 0}
       blowUp:
         dir: {x: 0, y: 0, z: 0}
         force: 0
@@ -495,6 +488,10 @@ MonoBehaviour:
       sustainedInjury:
         damage: 0
     attackTrigger: {fileID: 2280520615464243483}
+    attackDistance: 0.5
+    maxAttackDis: 0
+    minAttackDis: 0
+    needToChange: 0
     targetTypes: 010000000200000003000000
     canHitFly: 1
     armorPiercing: 0
@@ -513,12 +510,12 @@ MonoBehaviour:
       damage: 0
       attackDir: {x: 0, y: 0, z: 0}
       attackEffect: 
-      force: 0
-      changeHurt: 0
-      repelValue: 0
-      canBlowUp: 0
       floatState:
         time: 0
+        upTime: {x: 0, y: 0}
+        backSpeed: {x: 0, y: 0}
+        rotateSpeed: {x: 0, y: 0}
+        height: {x: 0, y: 0}
       blowUp:
         dir: {x: 0, y: 0, z: 0}
         force: 0
@@ -536,6 +533,10 @@ MonoBehaviour:
       sustainedInjury:
         damage: 0
     attackTrigger: {fileID: 0}
+    attackDistance: 0
+    maxAttackDis: 0
+    minAttackDis: 0
+    needToChange: 0
     targetTypes: 
     canHitFly: 0
     armorPiercing: 0
@@ -558,9 +559,15 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   curSpecialStates: ffffffff
-  strikeStunTime: 0
+  attributeTime: 0
+  resistances:
+    Float: 0
+    BlowUp: 0
+    ShotDown: 0
+    Stun: 0
   decelerationRatioX: 2
   decelerationRatioY: 15
+  floatingState: 0
 --- !u!1 &2437299196663985757
 GameObject:
   m_ObjectHideFlags: 0
@@ -836,8 +843,8 @@ BoxCollider:
   m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 0.49, y: 1.64, z: 2}
-  m_Center: {x: 0, y: 0.792, z: 0}
+  m_Size: {x: 1.2110057, y: 1.64, z: 2}
+  m_Center: {x: 0.038823366, y: 0.792, z: 0}
 --- !u!114 &6427563181875878110
 MonoBehaviour:
   m_ObjectHideFlags: 0

+ 16 - 9
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1007.prefab

@@ -172,8 +172,8 @@ BoxCollider:
   m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 6.0258904, y: 7.1701546, z: 2}
-  m_Center: {x: 0.45683897, y: 3.5570774, z: 0}
+  m_Size: {x: 5.977802, y: 7.1701546, z: 2}
+  m_Center: {x: 0.024044752, y: 3.5570774, z: 0}
 --- !u!114 &9020361017135710302
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -325,7 +325,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2234394376273647362}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.21, y: 0, z: 0}
+  m_LocalPosition: {x: -0.19, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1085,6 +1085,8 @@ MonoBehaviour:
   totalAttack_summonTime: 1
   totalAttack_marchTime: 2
   dieKeepTime: 0
+  beHitDistance: 3
+  attackDis: 0
   rb: {fileID: 8639832132491289349}
   bodyTrans: {fileID: 5769591908339262981}
   beSearchTrigger: {fileID: 316813748882225178}
@@ -1176,13 +1178,9 @@ MonoBehaviour:
   wallDamage: 0
   type: -1
   searchState: 0
-  attackDistance: 7
-  maxAttackDis: 0
-  minAttackDis: 0
-  needToChange: 0
   attackRatio: 0
-  dropSoulMax: 1
-  dropSoulMin: 1
+  dropSoulMax: 5
+  dropSoulMin: 5
   dropSoulAngle: 90
 --- !u!54 &8639832132491289349
 Rigidbody:
@@ -1271,6 +1269,7 @@ MonoBehaviour:
   skill: {fileID: 0}
   attackEffect: {fileID: 0}
   effect: {fileID: 0}
+  attackDistance: 0
   attackTrigger: {fileID: 8924180071245218248}
   isAttackTriggerOn: 0
   bulletPrefab: {fileID: 7473170563405908938, guid: 0460e8750cef0df4292f6d2bb56a4843, type: 3}
@@ -1314,6 +1313,10 @@ MonoBehaviour:
       sustainedInjury:
         damage: 0
     attackTrigger: {fileID: 8924180071245218248}
+    attackDistance: 3
+    maxAttackDis: 0
+    minAttackDis: 0
+    needToChange: 0
     targetTypes: 010000000200000003000000
     canHitFly: 1
     armorPiercing: 0
@@ -1358,6 +1361,10 @@ MonoBehaviour:
       sustainedInjury:
         damage: 0
     attackTrigger: {fileID: 0}
+    attackDistance: 0
+    maxAttackDis: 0
+    minAttackDis: 0
+    needToChange: 0
     targetTypes: 
     canHitFly: 0
     armorPiercing: 0

+ 1 - 1
ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Arrow.prefab

@@ -1085,7 +1085,7 @@ MonoBehaviour:
   totalAttack_summonTime: 1.5333334
   totalAttack_marchTime: 1
   dieKeepTime: 0
-  beHitDistance: 0
+  beHitDistance: 0.1
   attackDis: 0
   rb: {fileID: 8639832132491289349}
   bodyTrans: {fileID: 5769591908339262981}

+ 81 - 51
ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Giant.prefab

@@ -101,10 +101,12 @@ MonoBehaviour:
     damage: 0
     attackDir: {x: 0, y: 0, z: 0}
     attackEffect: 
-    force: 0
-    changeHurt: 0
-    repelValue: 0
-    canBlowUp: 0
+    floatState:
+      time: 0
+      upTime: {x: 0, y: 0}
+      backSpeed: {x: 0, y: 0}
+      rotateSpeed: {x: 0, y: 0}
+      height: {x: 0, y: 0}
     blowUp:
       dir: {x: 0, y: 0, z: 0}
       force: 0
@@ -112,10 +114,10 @@ MonoBehaviour:
     shotDown:
       dir: {x: 0, y: 0, z: 0}
       force: 0
-      timel: 0
+      time: 0
     stun:
       time: 0
-    armorPenetration:
+    armor:
       rate: 0
     changeDamage:
       rate: 0
@@ -470,6 +472,8 @@ MonoBehaviour:
   totalAttack_summonTime: 2.2
   totalAttack_marchTime: 4
   dieKeepTime: 0
+  beHitDistance: 2
+  attackDis: 0
   rb: {fileID: 5440846222648032765}
   bodyTrans: {fileID: 6459001683917408033}
   beSearchTrigger: {fileID: 4259433079752244006}
@@ -511,15 +515,19 @@ MonoBehaviour:
   attributeStatus: {fileID: 0}
   extraRiseGravity: -28.8
   extraFallGravity: -14.4
-  canMove: 1
   moveSpeed: 2
+  needToAdjustFlyHeight: 0
+  flyHeight: 0
+  maxFlyHeight: 0
+  minFlyHeight: 0
+  flyUpTime: 0
+  isAdjustHeight: 0
   totalBeRepelValue: 100
   beRepelValue: 0
   weakTime: 0
   totalWeakTime: 10
   newTotalWeakTime: 0
   weakHitRate: 2
-  weakForce: {x: 0, y: 0, z: 0}
   easyToGetHit: 0.2
   isDamageReduction: 0
   reductionDegree: 0
@@ -527,16 +535,7 @@ MonoBehaviour:
   decelerationRatio: 1
   comaTime: 5
   pastComaTime: 0
-  floatState: 0
-  maxTime: 1.5
-  minTime: 0.1
-  maxHeight: 12
-  minHeight: 7
   floatTime: 10
-  maxRotateSpeed: 20
-  minRotateSpeed: 5
-  isFloat: 0
-  normalFallSpeed: 10
   effect: {fileID: 0}
   soulPrefab: {fileID: 0}
   soulStartSpeed: 1
@@ -555,29 +554,22 @@ MonoBehaviour:
   playerID: 0
   id: 1
   costMp: 150
-  totalSummonTime: 0.5
   isBack: 0
-  flyHeight: 0
-  flyUpSpeed: 10
   baseSortingOrder: 1000
   runSpeed: 0
+  summonTime: 0
   isReturnSoulTower: 0
   origSoulPos: {x: 0, y: 0, z: 0}
   isRecorded: 0
   searchState: 0
   soulCollector: {fileID: 0}
-  attackDistance: 3
-  maxAttackDis: 0
-  minAttackDis: 0
-  needToChange: 0
+  curAttackID: 0
   adsorbSpeed: 0
   adsorbTarget: {x: 0, y: 0, z: 0}
   effectPrefab: {fileID: 0}
   dropSoulMax: 3
   dropSoulMin: 1
   dropSoulAngle: 60
-  upFirstAfterWeaknessOrNot: 0
-  isBeBlownUp: 0
 --- !u!54 &5440846222648032765
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -639,10 +631,12 @@ MonoBehaviour:
     damage: 0
     attackDir: {x: 0, y: 0, z: 0}
     attackEffect: 
-    force: 0
-    changeHurt: 0
-    repelValue: 0
-    canBlowUp: 0
+    floatState:
+      time: 0
+      upTime: {x: 0, y: 0}
+      backSpeed: {x: 0, y: 0}
+      rotateSpeed: {x: 0, y: 0}
+      height: {x: 0, y: 0}
     blowUp:
       dir: {x: 0, y: 0, z: 0}
       force: 0
@@ -650,16 +644,20 @@ MonoBehaviour:
     shotDown:
       dir: {x: 0, y: 0, z: 0}
       force: 0
-      timel: 0
+      time: 0
     stun:
       time: 0
-    armorPenetration:
+    armor:
       rate: 0
     changeDamage:
       rate: 0
     sustainedInjury:
       damage: 0
   addAttackEffect: {fileID: 0}
+  skill: {fileID: 0}
+  attackEffect: {fileID: 0}
+  effect: {fileID: 0}
+  attackDistance: 0
   attackTrigger: {fileID: 7729941002223262554}
   isAttackTriggerOn: 0
   bulletPrefab: {fileID: 0}
@@ -677,10 +675,12 @@ MonoBehaviour:
       damage: 20
       attackDir: {x: 0, y: 0, z: 0}
       attackEffect: 
-      force: 0
-      changeHurt: 0
-      repelValue: 0
-      canBlowUp: 0
+      floatState:
+        time: 0
+        upTime: {x: 0, y: 0}
+        backSpeed: {x: 0, y: 0}
+        rotateSpeed: {x: 0, y: 0}
+        height: {x: 0, y: 0}
       blowUp:
         dir: {x: 0, y: 0, z: 0}
         force: 0
@@ -688,16 +688,20 @@ MonoBehaviour:
       shotDown:
         dir: {x: 0, y: 0, z: 0}
         force: 0
-        timel: 0
+        time: 0
       stun:
         time: 0
-      armorPenetration:
+      armor:
         rate: 0
       changeDamage:
         rate: 0
       sustainedInjury:
         damage: 0
     attackTrigger: {fileID: 7729941002223262554}
+    attackDistance: 0
+    maxAttackDis: 0
+    minAttackDis: 0
+    needToChange: 0
     targetTypes: 040000000500000006000000
     canHitFly: 1
     armorPiercing: 0
@@ -705,6 +709,8 @@ MonoBehaviour:
     shootPos: []
     shootTrack: 0
     shootAlwaysTrack: 0
+    skillPrefab: {fileID: 0}
+    skill: {fileID: 0}
   - id: 1
     attackName: "\u884C\u519B\u5F0F\u6376\u5730"
     attackType: 0
@@ -713,10 +719,12 @@ MonoBehaviour:
       damage: 20
       attackDir: {x: 0, y: 0, z: 0}
       attackEffect: 
-      force: 0
-      changeHurt: 0
-      repelValue: 0
-      canBlowUp: 0
+      floatState:
+        time: 0
+        upTime: {x: 0, y: 0}
+        backSpeed: {x: 0, y: 0}
+        rotateSpeed: {x: 0, y: 0}
+        height: {x: 0, y: 0}
       blowUp:
         dir: {x: 0, y: 0, z: 0}
         force: 0
@@ -724,16 +732,20 @@ MonoBehaviour:
       shotDown:
         dir: {x: 0, y: 0, z: 0}
         force: 0
-        timel: 0
+        time: 0
       stun:
         time: 0
-      armorPenetration:
+      armor:
         rate: 0
       changeDamage:
         rate: 0
       sustainedInjury:
         damage: 0
     attackTrigger: {fileID: 7729941002223262554}
+    attackDistance: 2.1
+    maxAttackDis: 0
+    minAttackDis: 0
+    needToChange: 0
     targetTypes: 040000000500000006000000
     canHitFly: 1
     armorPiercing: 0
@@ -741,6 +753,8 @@ MonoBehaviour:
     shootPos: []
     shootTrack: 0
     shootAlwaysTrack: 0
+    skillPrefab: {fileID: 0}
+    skill: {fileID: 0}
   curAttackMethod:
     id: 0
     attackName: 
@@ -750,10 +764,12 @@ MonoBehaviour:
       damage: 0
       attackDir: {x: 0, y: 0, z: 0}
       attackEffect: 
-      force: 0
-      changeHurt: 0
-      repelValue: 0
-      canBlowUp: 0
+      floatState:
+        time: 0
+        upTime: {x: 0, y: 0}
+        backSpeed: {x: 0, y: 0}
+        rotateSpeed: {x: 0, y: 0}
+        height: {x: 0, y: 0}
       blowUp:
         dir: {x: 0, y: 0, z: 0}
         force: 0
@@ -761,16 +777,20 @@ MonoBehaviour:
       shotDown:
         dir: {x: 0, y: 0, z: 0}
         force: 0
-        timel: 0
+        time: 0
       stun:
         time: 0
-      armorPenetration:
+      armor:
         rate: 0
       changeDamage:
         rate: 0
       sustainedInjury:
         damage: 0
     attackTrigger: {fileID: 0}
+    attackDistance: 0
+    maxAttackDis: 0
+    minAttackDis: 0
+    needToChange: 0
     targetTypes: 
     canHitFly: 0
     armorPiercing: 0
@@ -778,6 +798,8 @@ MonoBehaviour:
     shootPos: []
     shootTrack: 0
     shootAlwaysTrack: 0
+    skillPrefab: {fileID: 0}
+    skill: {fileID: 0}
 --- !u!114 &2548478253414805934
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -791,9 +813,15 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   curSpecialStates: ffffffff
-  strikeStunTime: 0
+  attributeTime: 0
+  resistances:
+    Float: 0
+    BlowUp: 0
+    ShotDown: 0
+    Stun: 0
   decelerationRatioX: 2
   decelerationRatioY: 15
+  floatingState: 0
 --- !u!1 &6139679835290116115
 GameObject:
   m_ObjectHideFlags: 0
@@ -969,6 +997,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   imgHp: {fileID: 891910447640254832}
+  pc: {fileID: 0}
+  points: []
 --- !u!1 &7208291223413765209
 GameObject:
   m_ObjectHideFlags: 0

+ 15 - 4
ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Sword.prefab

@@ -183,6 +183,8 @@ MonoBehaviour:
   totalAttack_summonTime: 1.2667
   totalAttack_marchTime: 1.8333
   dieKeepTime: 0
+  beHitDistance: 0.1
+  attackDis: 0
   rb: {fileID: 2437299196472462355}
   bodyTrans: {fileID: 2730232521377132808}
   beSearchTrigger: {fileID: 1317309795988277421}
@@ -272,10 +274,6 @@ MonoBehaviour:
   isRecorded: 0
   searchState: 0
   soulCollector: {fileID: 0}
-  attackDistance: 1.5
-  maxAttackDis: 0
-  minAttackDis: 0
-  needToChange: 0
   curAttackID: 0
   adsorbSpeed: 0
   adsorbTarget: {x: 0, y: 0, z: 0}
@@ -384,6 +382,7 @@ MonoBehaviour:
   skill: {fileID: 0}
   attackEffect: {fileID: 0}
   effect: {fileID: 0}
+  attackDistance: 0
   attackTrigger: {fileID: 4347565098670608659}
   isAttackTriggerOn: 0
   bulletPrefab: {fileID: 0}
@@ -424,6 +423,10 @@ MonoBehaviour:
       sustainedInjury:
         damage: 0
     attackTrigger: {fileID: 4347565098670608659}
+    attackDistance: 2
+    maxAttackDis: 0
+    minAttackDis: 0
+    needToChange: 0
     targetTypes: 040000000500000006000000
     canHitFly: 1
     armorPiercing: 0
@@ -464,6 +467,10 @@ MonoBehaviour:
       sustainedInjury:
         damage: 0
     attackTrigger: {fileID: 3063112574554332383}
+    attackDistance: 2
+    maxAttackDis: 0
+    minAttackDis: 0
+    needToChange: 0
     targetTypes: 040000000500000006000000
     canHitFly: 1
     armorPiercing: 0
@@ -505,6 +512,10 @@ MonoBehaviour:
       sustainedInjury:
         damage: 0
     attackTrigger: {fileID: 0}
+    attackDistance: 0
+    maxAttackDis: 0
+    minAttackDis: 0
+    needToChange: 0
     targetTypes: 
     canHitFly: 0
     armorPiercing: 0