Merge remote-tracking branch 'origin/master'

ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1007.prefab

@@ -75,8 +75,8 @@ BoxCollider:
   m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 2.9687505, y: 9.994736, z: 2}
-  m_Center: {x: -1.4662361, y: 5.015275, z: 0}
+  m_Size: {x: 5.97427, y: 7.18157, z: 2}
+  m_Center: {x: -2.968996, y: 3.6086922, z: 0}
 --- !u!114 &8924180071245218248
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -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
@@ -168,8 +172,8 @@ BoxCollider:
   m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 0.64, y: 1.64, z: 2}
-  m_Center: {x: 0, y: 0.792, z: 0}
+  m_Size: {x: 6.0258904, y: 7.1701546, z: 2}
+  m_Center: {x: 0.45683897, y: 3.5570774, z: 0}
 --- !u!114 &9020361017135710302
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -291,6 +295,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   imgHp: {fileID: 3266580543050502037}
+  pc: {fileID: 0}
+  points: []
 --- !u!1 &2234394376273647362
 GameObject:
   m_ObjectHideFlags: 0
@@ -514,8 +520,8 @@ BoxCollider:
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 0.67, y: 1.6074685, z: 2}
-  m_Center: {x: 0, y: 0.79826576, z: 0}
+  m_Size: {x: 6.05589, y: 6.9693146, z: 2}
+  m_Center: {x: 0.43279457, y: 3.4791884, z: 0}
 --- !u!1 &2623922659733331491
 GameObject:
   m_ObjectHideFlags: 0
@@ -691,8 +697,8 @@ BoxCollider:
   m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 4.027113, y: 9.912502, z: 20}
-  m_Center: {x: -1.0120968, y: 5.03067, z: 0}
+  m_Size: {x: 5.9987326, y: 7.1233797, z: 20}
+  m_Center: {x: -3.9935718, y: 3.6361094, z: 0}
 --- !u!1 &5388987656270167698
 GameObject:
   m_ObjectHideFlags: 0
@@ -737,8 +743,8 @@ BoxCollider:
   m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 1.3769803, y: 10.007013, z: 20}
-  m_Center: {x: 0.09656358, y: 4.169545, z: 0}
+  m_Size: {x: 8.9028, y: 7.338113, z: 20}
+  m_Center: {x: -0.5406065, y: 2.835095, z: 0}
 --- !u!114 &316813748882225178
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1120,10 +1126,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 +1146,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 +1162,7 @@ MonoBehaviour:
   sustainedInjury_damage: 0
   heavyDamage: 0
   id: 0
-  baseSortingOrder: 7000
+  baseSortingOrder: 1001
   isBack: 0
   jumpSpeed: 10
   maxMoveSpeed: 12
@@ -1176,7 +1176,7 @@ MonoBehaviour:
   wallDamage: 0
   type: -1
   searchState: 0
-  attackDistance: 3
+  attackDistance: 7
   maxAttackDis: 0
   minAttackDis: 0
   needToChange: 0
@@ -1247,6 +1247,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
@@ -1289,6 +1293,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
@@ -1329,6 +1337,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
@@ -1368,10 +1380,12 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   curSpecialStates: ffffffff
-  strikeStunTime: 0
-  decelerationRatioX: 2
-  decelerationRatioY: 15
+  attributeTime: 0
   resistances:
+    Float: 0
     BlowUp: 0
     ShotDown: 0
     Stun: 0
+  decelerationRatioX: 2
+  decelerationRatioY: 15
+  floatingState: 0