修改怪物编号

ActionTowerDefense/Assets/GameLevelEditor/GameMap/CoreScripts/GameMapTile.cs

@@ -42,7 +42,7 @@ public class GameMapTile
 
 	public enum Type { Null = 0,  Tower=1, Enemy=2}
 	public Type type = Type.Null;   // the runtime might use something like this to identify what the placed tile means
-    public enum CH { Tower = 0, EnemyTower = 1, Enemy_Arrow = 2, Enemy_Giant = 3, Enemy_Sword = 4, Enemy_11001, Enemy_11002, Enemy_11004, Enemy_11005, Enemy_11008, Enemy_11006 };            // this value could depend on the chosen type. For example, if NPC then this could indicate which NPC prefab to spawn from an array of NPC prefabs.
+    public enum CH { Tower = 0, EnemyTower = 1, Enemy_Arrow = 2, Enemy_Giant = 3, Enemy_Sword = 4, Enemy_1001, Enemy_1002, Enemy_1003, Enemy_1004, Enemy_1005, Enemy_1006, Enemy_1007 };            // this value could depend on the chosen type. For example, if NPC then this could indicate which NPC prefab to spawn from an array of NPC prefabs.
     public CH ch;
 
     [GameMapTilePreview] public Color color = Color.white;

ActionTowerDefense/Assets/GameLevelEditor/tiles.asset

@@ -189,6 +189,22 @@ MonoBehaviour:
       MaxMoveSpeed: 0
       Attack_summon: 0
       Attack_march: 30
+  - id: 175
+    sprite: {fileID: 21300000, guid: 253419eaf52a86f4cbcc229bf6d4a13d, type: 3}
+    _aid: -1
+    type: 2
+    ch: 11
+    color: {r: 0, g: 0, b: 0, a: 1}
+    radius: {x: 0, y: 0}
+    name: 
+    index: -1
+    hasOut: 0
+    parameter:
+      HP: 0
+      MinMoveSpeed: 0
+      MaxMoveSpeed: 0
+      Attack_summon: 0
+      Attack_march: 0
   autoTiles: []
-  nextTileId: 175
+  nextTileId: 176
   nextAutoTileId: 1

ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11001.prefab → ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1001.prefab

@@ -188,7 +188,7 @@ MonoBehaviour:
     shotDown:
       dir: {x: 0, y: 0, z: 0}
       force: 0
-      timel: 0
+      time: 0
     stun:
       time: 0
     armor:
@@ -218,7 +218,7 @@ GameObject:
   - component: {fileID: 2437299196472462355}
   - component: {fileID: 4708446721582069133}
   m_Layer: 8
-  m_Name: Enemy_11001
+  m_Name: Enemy_1001
   m_TagString: Enemy
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -304,6 +304,8 @@ MonoBehaviour:
   extraFallGravity: -14.4
   canMove: 1
   moveSpeed: 5.59073
+  flyHeight: 0
+  flyUpSpeed: 10
   totalBeRepelValue: 30
   beRepelValue: 0
   weakTime: 0
@@ -345,8 +347,6 @@ MonoBehaviour:
   id: 0
   baseSortingOrder: 3000
   isBack: 0
-  flyHeight: 0
-  flyUpSpeed: 10
   jumpSpeed: 9
   maxMoveSpeed: 6
   minMoveSpeed: 5
@@ -370,7 +370,6 @@ MonoBehaviour:
   dropSoulMax: 1
   dropSoulMin: 1
   dropSoulAngle: 90
-  upFirstAfterWeaknessOrNot: 0
 --- !u!114 &1837193195824484407
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -429,7 +428,7 @@ MonoBehaviour:
     shotDown:
       dir: {x: 0, y: 0, z: 0}
       force: 0
-      timel: 0
+      time: 0
     stun:
       time: 0
     armor:
@@ -439,6 +438,7 @@ MonoBehaviour:
     sustainedInjury:
       damage: 0
   addAttackEffect: {fileID: 0}
+  skill: {fileID: 0}
   attackTrigger: {fileID: 2280520615464243483}
   isAttackTriggerOn: 0
   bulletPrefab: {fileID: 0}
@@ -469,7 +469,7 @@ MonoBehaviour:
       shotDown:
         dir: {x: 0, y: 0, z: 0}
         force: 0
-        timel: 0
+        time: 0
       stun:
         time: 0
       armor:
@@ -487,6 +487,7 @@ MonoBehaviour:
     shootTrack: 0
     shootAlwaysTrack: 0
     skillPrefab: {fileID: 0}
+    skill: {fileID: 0}
   curAttackMethod:
     id: 0
     attackName: 
@@ -509,7 +510,7 @@ MonoBehaviour:
       shotDown:
         dir: {x: 0, y: 0, z: 0}
         force: 0
-        timel: 0
+        time: 0
       stun:
         time: 0
       armor:
@@ -527,6 +528,7 @@ MonoBehaviour:
     shootTrack: 0
     shootAlwaysTrack: 0
     skillPrefab: {fileID: 0}
+    skill: {fileID: 0}
 --- !u!54 &2437299196472462355
 Rigidbody:
   m_ObjectHideFlags: 0

ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11002.prefab → ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1002.prefab

@@ -218,7 +218,7 @@ GameObject:
   - component: {fileID: 8283553518372576850}
   - component: {fileID: -235536916698660067}
   m_Layer: 8
-  m_Name: Enemy_11002
+  m_Name: Enemy_1002
   m_TagString: Enemy
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11004.prefab → ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1003.prefab

@@ -428,7 +428,7 @@ GameObject:
   - component: {fileID: 2979723395943220326}
   - component: {fileID: 8213328083811761964}
   m_Layer: 8
-  m_Name: Enemy_11004
+  m_Name: Enemy_1003
   m_TagString: Enemy
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11005.prefab → ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1004.prefab

@@ -112,7 +112,7 @@ MonoBehaviour:
     shotDown:
       dir: {x: 0, y: 0, z: 0}
       force: 0
-      timel: 0
+      time: 0
     stun:
       time: 0
     armor:
@@ -1040,7 +1040,7 @@ GameObject:
   - component: {fileID: 3979041853861796194}
   - component: {fileID: 1101096037844666831}
   m_Layer: 8
-  m_Name: Enemy_11005
+  m_Name: Enemy_1004
   m_TagString: Enemy
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1126,6 +1126,8 @@ MonoBehaviour:
   extraFallGravity: -14.4
   canMove: 1
   moveSpeed: 8.205597
+  flyHeight: 0
+  flyUpSpeed: 10
   totalBeRepelValue: 20
   beRepelValue: 0
   weakTime: 0
@@ -1167,8 +1169,6 @@ MonoBehaviour:
   id: 0
   baseSortingOrder: 7000
   isBack: 0
-  flyHeight: 0
-  flyUpSpeed: 10
   jumpSpeed: 10
   maxMoveSpeed: 12
   minMoveSpeed: 8
@@ -1192,7 +1192,6 @@ MonoBehaviour:
   dropSoulMax: 1
   dropSoulMin: 1
   dropSoulAngle: 90
-  upFirstAfterWeaknessOrNot: 1
 --- !u!54 &8639832132491289349
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -1267,7 +1266,7 @@ MonoBehaviour:
     shotDown:
       dir: {x: 0, y: 0, z: 0}
       force: 0
-      timel: 0
+      time: 0
     stun:
       time: 0
     armor:
@@ -1311,7 +1310,7 @@ MonoBehaviour:
       shotDown:
         dir: {x: 0, y: 0, z: 0}
         force: 0
-        timel: 0
+        time: 0
       stun:
         time: 0
       armor:
@@ -1355,7 +1354,7 @@ MonoBehaviour:
       shotDown:
         dir: {x: 0, y: 0, z: 0}
         force: 0
-        timel: 0
+        time: 0
       stun:
         time: 0
       armor:

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

@@ -1040,7 +1040,7 @@ GameObject:
   - component: {fileID: 3979041853861796194}
   - component: {fileID: -4025110304241557533}
   m_Layer: 8
-  m_Name: Enemy_11006
+  m_Name: Enemy_1005
   m_TagString: Enemy
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1235,10 +1235,10 @@ MonoBehaviour:
     - attackMethod: 0
       attackType: 0
       startKeyName: attack_on
-      startKeyTime: 1
+      startKeyTime: 0.43333337
       endType: 1
       endKeyName: attack_off
-      endKeyTime: 2
+      endKeyTime: 0.6666667
   keyTimes: []
   attackTime: 0
   attackKeyCount: 0

ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11008.prefab → ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_1006.prefab

@@ -179,6 +179,8 @@ MonoBehaviour:
     changeHurt: 0
     repelValue: 0
     canBlowUp: 0
+    floatState:
+      time: 0
     blowUp:
       dir: {x: 0, y: 0, z: 0}
       force: 0
@@ -186,10 +188,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
@@ -216,7 +218,7 @@ GameObject:
   - component: {fileID: 7875272022194174294}
   - component: {fileID: 1508165302587368955}
   m_Layer: 8
-  m_Name: Enemy_11008
+  m_Name: Enemy_1006
   m_TagString: Enemy
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -302,6 +304,8 @@ MonoBehaviour:
   extraFallGravity: -14.4
   canMove: 1
   moveSpeed: 5.988441
+  flyHeight: 0
+  flyUpSpeed: 10
   totalBeRepelValue: 30
   beRepelValue: 0
   weakTime: 0
@@ -343,8 +347,6 @@ MonoBehaviour:
   id: 0
   baseSortingOrder: 4000
   isBack: 0
-  flyHeight: 0
-  flyUpSpeed: 10
   jumpSpeed: 9
   maxMoveSpeed: 6
   minMoveSpeed: 5
@@ -368,7 +370,6 @@ MonoBehaviour:
   dropSoulMax: 2
   dropSoulMin: 2
   dropSoulAngle: 90
-  upFirstAfterWeaknessOrNot: 0
 --- !u!54 &2437299196472462355
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -398,7 +399,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   attackKeys:
-  - aniName: attack_summon
+  - aniName: attack_march
     keys:
     - attackMethod: 0
       attackType: 0
@@ -407,7 +408,7 @@ MonoBehaviour:
       endType: 1
       endKeyName: attack_off
       endKeyTime: 1.1333334
-  - aniName: attack_march
+  - aniName: attack_summon
     keys:
     - attackMethod: 0
       attackType: 0
@@ -434,6 +435,8 @@ MonoBehaviour:
     changeHurt: 0
     repelValue: 0
     canBlowUp: 0
+    floatState:
+      time: 0
     blowUp:
       dir: {x: 0, y: 0, z: 0}
       force: 0
@@ -441,16 +444,17 @@ 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}
   attackTrigger: {fileID: 2280520615464243483}
   isAttackTriggerOn: 0
   bulletPrefab: {fileID: 0}
@@ -472,6 +476,8 @@ MonoBehaviour:
       changeHurt: 0
       repelValue: 0
       canBlowUp: 0
+      floatState:
+        time: 0
       blowUp:
         dir: {x: 0, y: 0, z: 0}
         force: 0
@@ -479,10 +485,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
@@ -496,6 +502,8 @@ MonoBehaviour:
     shootPos: []
     shootTrack: 0
     shootAlwaysTrack: 0
+    skillPrefab: {fileID: 0}
+    skill: {fileID: 0}
   curAttackMethod:
     id: 0
     attackName: 
@@ -509,6 +517,8 @@ MonoBehaviour:
       changeHurt: 0
       repelValue: 0
       canBlowUp: 0
+      floatState:
+        time: 0
       blowUp:
         dir: {x: 0, y: 0, z: 0}
         force: 0
@@ -516,10 +526,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
@@ -533,6 +543,8 @@ MonoBehaviour:
     shootPos: []
     shootTrack: 0
     shootAlwaysTrack: 0
+    skillPrefab: {fileID: 0}
+    skill: {fileID: 0}
 --- !u!114 &1508165302587368955
 MonoBehaviour:
   m_ObjectHideFlags: 0

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

@@ -1039,7 +1039,7 @@ GameObject:
   - component: {fileID: 8639832132491289349}
   - component: {fileID: 3979041853861796194}
   m_Layer: 8
-  m_Name: Enemy_11012
+  m_Name: Enemy_1007
   m_TagString: Enemy
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

ActionTowerDefense/Assets/Resources/Prefab/Player.prefab

@@ -698,7 +698,6 @@ MonoBehaviour:
   totalWeakTime: 0.5
   newTotalWeakTime: 0
   weakHitRate: 2
-  weakForce: {x: 0, y: 0, z: 0}
   easyToGetHit: 0.2
   isDamageReduction: 0
   reductionDegree: 0
@@ -969,10 +968,6 @@ MonoBehaviour:
     damage: 0
     attackDir: {x: 0, y: 0, z: 0}
     attackEffect: 
-    force: 0
-    changeHurt: 0
-    repelValue: 0
-    canBlowUp: 0
     floatState:
       time: 0
     blowUp:
@@ -1011,10 +1006,6 @@ MonoBehaviour:
       damage: 0
       attackDir: {x: 0, y: 0, z: 0}
       attackEffect: 
-      force: 0
-      changeHurt: 0
-      repelValue: 0
-      canBlowUp: 0
       floatState:
         time: 0
       blowUp:
@@ -1718,10 +1709,6 @@ MonoBehaviour:
     damage: 0
     attackDir: {x: 0, y: 0, z: 0}
     attackEffect: 
-    force: 0
-    changeHurt: 0
-    repelValue: 0
-    canBlowUp: 0
     floatState:
       time: 0
     blowUp:

ActionTowerDefense/Assets/Scripts/Characters/PlayerController.cs

@@ -1073,7 +1073,6 @@ public class PlayerController : MoveCharacter
                 {
                     if (excludeState != CharacterState.Idle && summonTime <= 0)
                     {
-                        summonTime = 0;
                         ChangeState(CharacterState.Idle);
                         return true;
                     }