Merge remote-tracking branch 'origin/master'

ActionTowerDefense/Assets/Resources/Prefab/ESpirits/ESpirits_Assassin.prefab

@@ -233,7 +233,8 @@ MonoBehaviour:
         force: 0
         time: 0
         haveLandingDamage: 0
-        landingDamage: 0
+        landingDamageRate: 0
+        minLandingDamage: 0
         ControlOrder: 0
       weak:
         time: 0
@@ -300,7 +301,8 @@ MonoBehaviour:
         force: 0
         time: 0
         haveLandingDamage: 0
-        landingDamage: 0
+        landingDamageRate: 0
+        minLandingDamage: 0
         ControlOrder: 0
       weak:
         time: 0
@@ -367,7 +369,8 @@ MonoBehaviour:
         force: 0
         time: 0
         haveLandingDamage: 0
-        landingDamage: 0
+        landingDamageRate: 0
+        minLandingDamage: 0
         ControlOrder: 0
       weak:
         time: 0
@@ -466,7 +469,6 @@ MonoBehaviour:
   state: 0
   totalHp: 100
   hp: 0
-  regeneration: 0
   regenerationTime: 0
   canFly: 0
   canControlFly: 0
@@ -530,12 +532,8 @@ MonoBehaviour:
   heavyDamage: 0
   killer: {fileID: 0}
   isFrozen: 0
-  electrifyAttackSpeedScale: 0.6
-  electrifyMoveSpeedScale: 0.6
   isElectrify: 0
-  isPetrify: 0
-  petrifyTime: 0
-  petrifyHp: 0
+  electrifyEffect: {fileID: 0}
   isOnFire: 0
   fireStacks: 0
   exp: 0
@@ -566,7 +564,7 @@ MonoBehaviour:
   dashTrigger: {fileID: 5076973120259515033}
   eSpiritsState: 1
   time: 1
-  attackCD: 5
+  attackCD: 0
   readyDistance: 15
   rushDistance: 15
   readyTime: 1.5
@@ -898,10 +896,12 @@ MonoBehaviour:
   canBreakWall: 0
   wallBrealNum: 10
   isShoot: 0
-  owner: {fileID: 0}
   isSingleAttack: 0
+  isDoT: 0
+  owner: {fileID: 0}
   cantSingleAttack: 0
   trigedObjs: []
+  trigedTime: []
   attackMethod:
     attackName: 
     attackType: 0
@@ -937,7 +937,8 @@ MonoBehaviour:
         force: 0
         time: 0
         haveLandingDamage: 0
-        landingDamage: 0
+        landingDamageRate: 0
+        minLandingDamage: 0
         ControlOrder: 0
       weak:
         time: 0
@@ -974,6 +975,7 @@ MonoBehaviour:
   repelValue: 0
   offsetY: 1
   hitRate: 1
+  interval: 0
   isCreatedByDemonicSummon: 0
 --- !u!1 &7669620205589286043
 GameObject:
@@ -1185,10 +1187,12 @@ MonoBehaviour:
   canBreakWall: 0
   wallBrealNum: 10
   isShoot: 0
-  owner: {fileID: 0}
   isSingleAttack: 0
+  isDoT: 0
+  owner: {fileID: 0}
   cantSingleAttack: 0
   trigedObjs: []
+  trigedTime: []
   attackMethod:
     attackName: 
     attackType: 0
@@ -1224,7 +1228,8 @@ MonoBehaviour:
         force: 0
         time: 0
         haveLandingDamage: 0
-        landingDamage: 0
+        landingDamageRate: 0
+        minLandingDamage: 0
         ControlOrder: 0
       weak:
         time: 0
@@ -1261,6 +1266,7 @@ MonoBehaviour:
   repelValue: 0
   offsetY: 1
   hitRate: 1
+  interval: 0
   isCreatedByDemonicSummon: 0
 --- !u!1 &8203964573996106666
 GameObject:
@@ -1519,7 +1525,8 @@ MonoBehaviour:
         force: 0
         time: 0
         haveLandingDamage: 0
-        landingDamage: 0
+        landingDamageRate: 0
+        minLandingDamage: 0
         ControlOrder: 0
       weak:
         time: 0
@@ -1557,6 +1564,7 @@ MonoBehaviour:
   isFly: 0
   decelerationRatioX: 2
   decelerationRatioY: 15
+  landingDamageFrom: {fileID: 0}
   rotateCenterHeight: 1
   startFlyAngle: 15
   flyingRotateSpeedRange: {x: 15, y: 45}
@@ -1628,7 +1636,8 @@ MonoBehaviour:
         force: 0
         time: 0
         haveLandingDamage: 0
-        landingDamage: 0
+        landingDamageRate: 0
+        minLandingDamage: 0
         ControlOrder: 0
       weak:
         time: 0

ActionTowerDefense/GenerateDatas/json/cfgcreateenemy1.json

@@ -826,7 +826,7 @@
     ],
     "StartTime": 0,
     "EndTime": 10,
-    "Count": 2,
+    "Count": 1,
     "AttackRatio": 1,
     "SpeedRatio": 1,
     "HPRatio": 1,
@@ -866,7 +866,7 @@
     ],
     "StartTime": 0,
     "EndTime": 10,
-    "Count": 2,
+    "Count": 1,
     "AttackRatio": 1,
     "SpeedRatio": 1,
     "HPRatio": 1,
@@ -966,7 +966,7 @@
     ],
     "StartTime": 0,
     "EndTime": 10,
-    "Count": 2,
+    "Count": 1,
     "AttackRatio": 1,
     "SpeedRatio": 1,
     "HPRatio": 1,