Merge remote-tracking branch 'origin/master'

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

@@ -112,7 +112,7 @@ MonoBehaviour:
     shotDown:
       dir: {x: 0, y: 0, z: 0}
       force: 0
-      timel: 0
+      time: 0
     stun:
       time: 0
     armor:
@@ -172,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: 0.64, y: 1.619351, z: 2}
+  m_Center: {x: 0, y: 0.8023245, z: 0}
 --- !u!114 &9020361017135710302
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1038,6 +1038,7 @@ GameObject:
   - component: {fileID: 1986582536140952583}
   - component: {fileID: 8639832132491289349}
   - component: {fileID: 3979041853861796194}
+  - component: {fileID: -4025110304241557533}
   m_Layer: 8
   m_Name: Enemy_11006
   m_TagString: Enemy
@@ -1125,6 +1126,8 @@ MonoBehaviour:
   extraFallGravity: -14.4
   canMove: 1
   moveSpeed: 8.205597
+  flyHeight: 0
+  flyUpSpeed: 10
   totalBeRepelValue: 20
   beRepelValue: 0
   weakTime: 0
@@ -1166,8 +1169,6 @@ MonoBehaviour:
   id: 0
   baseSortingOrder: 7000
   isBack: 0
-  flyHeight: 0
-  flyUpSpeed: 10
   jumpSpeed: 10
   maxMoveSpeed: 12
   minMoveSpeed: 8
@@ -1191,7 +1192,6 @@ MonoBehaviour:
   dropSoulMax: 1
   dropSoulMin: 1
   dropSoulAngle: 90
-  upFirstAfterWeaknessOrNot: 1
 --- !u!54 &8639832132491289349
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -1235,10 +1235,10 @@ MonoBehaviour:
     - attackMethod: 0
       attackType: 0
       startKeyName: attack_on
-      startKeyTime: 0.43333337
+      startKeyTime: 1
       endType: 1
       endKeyName: attack_off
-      endKeyTime: 0.6666667
+      endKeyTime: 2
   keyTimes: []
   attackTime: 0
   attackKeyCount: 0
@@ -1266,7 +1266,7 @@ MonoBehaviour:
     shotDown:
       dir: {x: 0, y: 0, z: 0}
       force: 0
-      timel: 0
+      time: 0
     stun:
       time: 0
     armor:
@@ -1310,7 +1310,7 @@ MonoBehaviour:
       shotDown:
         dir: {x: 0, y: 0, z: 0}
         force: 0
-        timel: 0
+        time: 0
       stun:
         time: 0
       armor:
@@ -1354,7 +1354,7 @@ MonoBehaviour:
       shotDown:
         dir: {x: 0, y: 0, z: 0}
         force: 0
-        timel: 0
+        time: 0
       stun:
         time: 0
       armor:
@@ -1373,3 +1373,19 @@ 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: ffffffff
+  strikeStunTime: 0
+  decelerationRatioX: 2
+  decelerationRatioY: 100

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

@@ -102,6 +102,7 @@ Transform:
   - {fileID: 5718990486604556333}
   - {fileID: 3277761006413294872}
   - {fileID: 2288379621507428556}
+  - {fileID: 5140460497945123740}
   m_Father: {fileID: 2730232521377132808}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -282,6 +283,7 @@ MonoBehaviour:
   maxAttackDis: 0
   minAttackDis: 0
   needToChange: 0
+  curAttackID: 0
   adsorbSpeed: 0
   adsorbTarget: {x: 0, y: 0, z: 0}
   effectPrefab: {fileID: 0}
@@ -401,7 +403,7 @@ MonoBehaviour:
     attackType: 0
     attackEffect: {fileID: 0}
     attackInfo:
-      damage: 80
+      damage: 10
       attackDir: {x: 0, y: 0, z: 0}
       attackEffect: 02000000
       force: 0
@@ -466,7 +468,7 @@ MonoBehaviour:
         rate: 0
       sustainedInjury:
         damage: 0
-    attackTrigger: {fileID: 4347565098670608659}
+    attackTrigger: {fileID: 3063112574554332383}
     targetTypes: 040000000500000006000000
     canHitFly: 1
     armorPiercing: 0
@@ -596,6 +598,103 @@ MonoBehaviour:
   trigGroundList: []
   myBaGuaTrigger: {fileID: 0}
   baGuaTrigger: []
+--- !u!1 &2888240249657181453
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5140460497945123740}
+  - component: {fileID: 7628619626582874170}
+  - component: {fileID: 3063112574554332383}
+  m_Layer: 20
+  m_Name: AttackTrigger (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &5140460497945123740
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2888240249657181453}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7794457276998281569}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &7628619626582874170
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2888240249657181453}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 2.8200002, y: 1.5022345, z: 20}
+  m_Center: {x: -1.28, y: 0.7511172, z: 0}
+--- !u!114 &3063112574554332383
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2888240249657181453}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5eaed0a6b9d6fc6409bef80cf41a0a8e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isShoot: 0
+  type: 0
+  owner: {fileID: 0}
+  isSingleAttack: 1
+  cantSingleAttack: 0
+  trigedObjs: []
+  attackInfo:
+    damage: 0
+    attackDir: {x: 0, y: 0, z: 0}
+    attackEffect: 
+    force: 0
+    changeHurt: 0
+    repelValue: 0
+    canBlowUp: 0
+    floatState:
+      time: 0
+    blowUp:
+      dir: {x: 0, y: 0, z: 0}
+      force: 0
+      time: 0
+    shotDown:
+      dir: {x: 0, y: 0, z: 0}
+      force: 0
+      time: 0
+    stun:
+      time: 0
+    armor:
+      rate: 0
+    changeDamage:
+      rate: 0
+    sustainedInjury:
+      damage: 0
+  damage: 0
+  force: {x: 0, y: 0, z: 0}
+  changeHurt: 0
+  repelValue: 0
+  offsetY: 1
+  hitRate: 1
+  onlyFlyCanWeak: 1
 --- !u!1 &5216717017252562314
 GameObject:
   m_ObjectHideFlags: 0

ActionTowerDefense/Assets/Resources/Prefab/Skills/multiShot.prefab

@@ -47,9 +47,9 @@ MonoBehaviour:
   owner: {fileID: 0}
   arrow: {fileID: 7473170563405908938, guid: 2671de5f0ce77d84a86c1ec4998dc15e, type: 3}
   num: 5
-  angle: 20
-  arrivalAngle: 10
+  angle: 40
+  arrivalAngle: 50
   damage: 100
   tryy: 0
-  gravity: 9.8
-  speed: 10
+  gravity: 40
+  speed: 0