Bladeren bron

显示层级调整

DESKTOP-27RMV90\A 7 maanden geleden
bovenliggende
commit
22b38ef4ad

+ 1 - 0
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11001.prefab

@@ -277,6 +277,7 @@ MonoBehaviour:
   bulletPrefab: {fileID: 0}
   shootPos: []
   shootTrack: 0
+  shootAlwaysTrack: 0
   Attack_summonInfos:
   - damage: 0
     attackDir: {x: 0, y: 0, z: 0}

+ 3 - 22
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11002.prefab

@@ -169,6 +169,7 @@ MonoBehaviour:
   type: 0
   owner: {fileID: 0}
   isSingleAttack: 0
+  cantSingleAttack: 0
   trigedObjs: []
   damage: 0
   force: {x: 0, y: 0, z: 0}
@@ -277,6 +278,7 @@ MonoBehaviour:
   bulletPrefab: {fileID: 0}
   shootPos: []
   shootTrack: 0
+  shootAlwaysTrack: 0
   Attack_summonInfos:
   - damage: 0
     attackDir: {x: 0, y: 0, z: 0}
@@ -311,8 +313,6 @@ MonoBehaviour:
   isTran: 0
   pc: {fileID: 0}
   hptp: 0
-  joint: {fileID: 0}
-  rope: {fileID: 0}
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
@@ -382,7 +382,7 @@ MonoBehaviour:
   sustainedInjury_damage: 0
   heavyDamage: 0
   id: 0
-  baseSortingOrder: 3000
+  baseSortingOrder: 5000
   isBack: 0
   flyHeight: 0
   flyUpSpeed: 10
@@ -409,24 +409,6 @@ MonoBehaviour:
   dropSoulMax: 2
   dropSoulMin: 2
   dropSoulAngle: 90
-  aimEffect: {fileID: 0}
-  dashEffect: {fileID: 0}
-  noOnSearchState: 0
-  isFindingPlayer: 0
-  isFindPlayer: 0
-  hateDistance: 0
-  distance: 0
-  rushEndPos: {x: 0, y: 0, z: 0}
-  aimDistance: 0
-  rushTime: 0
-  rushSpeed: 0
-  time: 0
-  readyCD: 0
-  targetDir: {x: 0, y: 0, z: 0}
-  haveDownRush: 0
-  rushHaveAttack: 0
-  downRushTime: 0
-  finishRushTime: 0
   upFirstAfterWeaknessOrNot: 0
 --- !u!54 &2437299196472462355
 Rigidbody:
@@ -507,7 +489,6 @@ MonoBehaviour:
   trigGroundList: []
   myBaGuaTrigger: {fileID: 0}
   baGuaTrigger: []
-  notOnGiant: 0
 --- !u!1 &3381575400802596466
 GameObject:
   m_ObjectHideFlags: 0

+ 4 - 23
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11004.prefab

@@ -95,6 +95,7 @@ MonoBehaviour:
   type: 0
   owner: {fileID: 0}
   isSingleAttack: 0
+  cantSingleAttack: 0
   trigedObjs: []
   damage: 0
   force: {x: 0, y: 0, z: 0}
@@ -387,7 +388,6 @@ MonoBehaviour:
   trigGroundList: []
   myBaGuaTrigger: {fileID: 0}
   baGuaTrigger: []
-  notOnGiant: 0
 --- !u!1 &5440846222648032759
 GameObject:
   m_ObjectHideFlags: 0
@@ -488,6 +488,7 @@ MonoBehaviour:
   bulletPrefab: {fileID: 0}
   shootPos: []
   shootTrack: 0
+  shootAlwaysTrack: 0
   Attack_summonInfos:
   - damage: 0
     attackDir: {x: 0, y: 0, z: 0}
@@ -522,8 +523,6 @@ MonoBehaviour:
   isTran: 0
   pc: {fileID: 0}
   hptp: 0
-  joint: {fileID: 0}
-  rope: {fileID: 0}
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
@@ -593,7 +592,7 @@ MonoBehaviour:
   sustainedInjury_damage: 0
   heavyDamage: 0
   id: 0
-  baseSortingOrder: 0
+  baseSortingOrder: 1000
   isBack: 0
   flyHeight: 0
   flyUpSpeed: 10
@@ -620,24 +619,6 @@ MonoBehaviour:
   dropSoulMax: 5
   dropSoulMin: 5
   dropSoulAngle: 90
-  aimEffect: {fileID: 0}
-  dashEffect: {fileID: 0}
-  noOnSearchState: 0
-  isFindingPlayer: 0
-  isFindPlayer: 0
-  hateDistance: 0
-  distance: 0
-  rushEndPos: {x: 0, y: 0, z: 0}
-  aimDistance: 0
-  rushTime: 0
-  rushSpeed: 0
-  time: 0
-  readyCD: 0
-  targetDir: {x: 0, y: 0, z: 0}
-  haveDownRush: 0
-  rushHaveAttack: 0
-  downRushTime: 0
-  finishRushTime: 0
   upFirstAfterWeaknessOrNot: 0
 --- !u!54 &5440846222648032765
 Rigidbody:
@@ -925,7 +906,7 @@ Animator:
   m_GameObject: {fileID: 7208291223413765209}
   m_Enabled: 1
   m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: c5c1beb54fbc9404ebd2c237086f19c2, type: 2}
+  m_Controller: {fileID: 9100000, guid: 85fc2e3455c42ee41982e4ab4b63891d, type: 2}
   m_CullingMode: 0
   m_UpdateMode: 0
   m_ApplyRootMotion: 0

+ 6 - 26
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11005.prefab

@@ -93,6 +93,7 @@ MonoBehaviour:
   type: 0
   owner: {fileID: 0}
   isSingleAttack: 0
+  cantSingleAttack: 0
   trigedObjs: []
   damage: 0
   force: {x: 0, y: 0, z: 0}
@@ -803,7 +804,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   owner: {fileID: 1986582536140952583}
-  smoke: {fileID: 0}
   hitRate: 1
 --- !u!1 &7414577738945366659
 GameObject:
@@ -1000,7 +1000,6 @@ MonoBehaviour:
   trigGroundList: []
   myBaGuaTrigger: {fileID: 0}
   baGuaTrigger: []
-  notOnGiant: 0
 --- !u!1 &8639832132491289359
 GameObject:
   m_ObjectHideFlags: 0
@@ -1054,16 +1053,16 @@ MonoBehaviour:
   ani: {fileID: 5978259926173120695}
   totalDieKeepTime: 0
   totalAttack_summonTime: 1.8667
-  totalAttack_marchTime: 1.3333
+  totalAttack_marchTime: 4
   attackKeys:
   - aniName: attack_march
     keys:
     - attackType: 0
       startKeyName: attack
-      startKeyTime: 0.1
+      startKeyTime: 2
       endType: 1
       endKeyName: attack
-      endKeyTime: 0.4667
+      endKeyTime: 3
     - attackType: 0
       startKeyName: attack
       startKeyTime: 0.8667
@@ -1102,6 +1101,7 @@ MonoBehaviour:
   - {fileID: 776105162125788029}
   - {fileID: 6220414675483084992}
   shootTrack: 1
+  shootAlwaysTrack: 0
   Attack_summonInfos:
   - damage: 0
     attackDir: {x: -1, y: 0, z: 0}
@@ -1136,8 +1136,6 @@ MonoBehaviour:
   isTran: 0
   pc: {fileID: 0}
   hptp: 0
-  joint: {fileID: 0}
-  rope: {fileID: 0}
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
@@ -1207,7 +1205,7 @@ MonoBehaviour:
   sustainedInjury_damage: 0
   heavyDamage: 0
   id: 0
-  baseSortingOrder: 5000
+  baseSortingOrder: 7000
   isBack: 0
   flyHeight: 0
   flyUpSpeed: 10
@@ -1234,24 +1232,6 @@ MonoBehaviour:
   dropSoulMax: 1
   dropSoulMin: 1
   dropSoulAngle: 90
-  aimEffect: {fileID: 0}
-  dashEffect: {fileID: 0}
-  noOnSearchState: 0
-  isFindingPlayer: 0
-  isFindPlayer: 0
-  hateDistance: 0
-  distance: 0
-  rushEndPos: {x: 0, y: 0, z: 0}
-  aimDistance: 0
-  rushTime: 0
-  rushSpeed: 0
-  time: 0
-  readyCD: 0
-  targetDir: {x: 0, y: 0, z: 0}
-  haveDownRush: 0
-  rushHaveAttack: 0
-  downRushTime: 0
-  finishRushTime: 0
   upFirstAfterWeaknessOrNot: 1
 --- !u!54 &8639832132491289349
 Rigidbody:

+ 3 - 22
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_11008.prefab

@@ -169,6 +169,7 @@ MonoBehaviour:
   type: 0
   owner: {fileID: 0}
   isSingleAttack: 0
+  cantSingleAttack: 0
   trigedObjs: []
   damage: 0
   force: {x: 0, y: 0, z: 0}
@@ -277,6 +278,7 @@ MonoBehaviour:
   bulletPrefab: {fileID: 0}
   shootPos: []
   shootTrack: 0
+  shootAlwaysTrack: 0
   Attack_summonInfos:
   - damage: 0
     attackDir: {x: 0, y: 0, z: 0}
@@ -311,8 +313,6 @@ MonoBehaviour:
   isTran: 0
   pc: {fileID: 0}
   hptp: 0
-  joint: {fileID: 0}
-  rope: {fileID: 0}
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
@@ -382,7 +382,7 @@ MonoBehaviour:
   sustainedInjury_damage: 0
   heavyDamage: 0
   id: 0
-  baseSortingOrder: 3000
+  baseSortingOrder: 4000
   isBack: 0
   flyHeight: 0
   flyUpSpeed: 10
@@ -409,24 +409,6 @@ MonoBehaviour:
   dropSoulMax: 2
   dropSoulMin: 2
   dropSoulAngle: 90
-  aimEffect: {fileID: 0}
-  dashEffect: {fileID: 0}
-  noOnSearchState: 0
-  isFindingPlayer: 0
-  isFindPlayer: 0
-  hateDistance: 0
-  distance: 0
-  rushEndPos: {x: 0, y: 0, z: 0}
-  aimDistance: 0
-  rushTime: 0
-  rushSpeed: 0
-  time: 0
-  readyCD: 0
-  targetDir: {x: 0, y: 0, z: 0}
-  haveDownRush: 0
-  rushHaveAttack: 0
-  downRushTime: 0
-  finishRushTime: 0
   upFirstAfterWeaknessOrNot: 0
 --- !u!54 &2437299196472462355
 Rigidbody:
@@ -507,7 +489,6 @@ MonoBehaviour:
   trigGroundList: []
   myBaGuaTrigger: {fileID: 0}
   baGuaTrigger: []
-  notOnGiant: 0
 --- !u!1 &3381575400802596466
 GameObject:
   m_ObjectHideFlags: 0

+ 5 - 7
ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Arrow.prefab

@@ -594,6 +594,7 @@ MonoBehaviour:
   type: 0
   owner: {fileID: 0}
   isSingleAttack: 0
+  cantSingleAttack: 0
   trigedObjs: []
   damage: 0
   force: {x: 0, y: 0, z: 0}
@@ -668,8 +669,8 @@ BoxCollider:
   m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 20, y: 13.118744, z: 20}
-  m_Center: {x: 0, y: -0.8093717, z: 0}
+  m_Size: {x: 20, y: 19.640514, z: 20}
+  m_Center: {x: 0, y: 1.5108852, z: 0}
 --- !u!1 &5388987656270167698
 GameObject:
   m_ObjectHideFlags: 0
@@ -803,7 +804,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   owner: {fileID: 8639832132491289351}
-  smoke: {fileID: 0}
   hitRate: 1
 --- !u!1 &7414577738945366659
 GameObject:
@@ -1000,7 +1000,6 @@ MonoBehaviour:
   trigGroundList: []
   myBaGuaTrigger: {fileID: 0}
   baGuaTrigger: []
-  notOnGiant: 0
 --- !u!1 &8639832132491289359
 GameObject:
   m_ObjectHideFlags: 0
@@ -1116,6 +1115,7 @@ MonoBehaviour:
   - {fileID: 776105162125788029}
   - {fileID: 6220414675483084992}
   shootTrack: 1
+  shootAlwaysTrack: 0
   Attack_summonInfos:
   - damage: 50
     attackDir: {x: -1, y: 0, z: 0}
@@ -1160,8 +1160,6 @@ MonoBehaviour:
   isTran: 0
   pc: {fileID: 0}
   hptp: 0
-  joint: {fileID: 0}
-  rope: {fileID: 0}
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
@@ -1238,7 +1236,7 @@ MonoBehaviour:
   isBack: 0
   flyHeight: 0
   flyUpSpeed: 10
-  baseSortingOrder: 6000
+  baseSortingOrder: 8000
   runSpeed: 0
   isReturnSoulTower: 0
   origSoulPos: {x: 0, y: 0, z: 0}

+ 1 - 2
ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Giant_Yang.prefab

@@ -443,7 +443,6 @@ MonoBehaviour:
   trigGroundList: []
   myBaGuaTrigger: {fileID: 3772849473770541225}
   baGuaTrigger: []
-  notOnGiant: 0
 --- !u!1 &5440846222648032759
 GameObject:
   m_ObjectHideFlags: 0
@@ -656,7 +655,7 @@ MonoBehaviour:
   isBack: 0
   flyHeight: 0
   flyUpSpeed: 10
-  baseSortingOrder: 1000
+  baseSortingOrder: 2000
   runSpeed: 0
   isReturnSoulTower: 0
   origSoulPos: {x: 0, y: 0, z: 0}

+ 1 - 2
ActionTowerDefense/Assets/Resources/Prefab/MySoldier/Demonic_Giant_Yin.prefab

@@ -443,7 +443,6 @@ MonoBehaviour:
   trigGroundList: []
   myBaGuaTrigger: {fileID: 255609098785955142}
   baGuaTrigger: []
-  notOnGiant: 0
 --- !u!1 &5440846222648032759
 GameObject:
   m_ObjectHideFlags: 0
@@ -656,7 +655,7 @@ MonoBehaviour:
   isBack: 0
   flyHeight: 0
   flyUpSpeed: 10
-  baseSortingOrder: 1000
+  baseSortingOrder: 2000
   runSpeed: 0
   isReturnSoulTower: 0
   origSoulPos: {x: 0, y: 0, z: 0}

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

@@ -237,8 +237,9 @@ MonoBehaviour:
   bulletPrefab: {fileID: 0}
   shootPos: []
   shootTrack: 0
+  shootAlwaysTrack: 0
   Attack_summonInfos:
-  - damage: 10
+  - damage: 60
     attackDir: {x: 0, y: 0, z: 0}
     force: 0
     changeHurt: 0
@@ -271,8 +272,6 @@ MonoBehaviour:
   isTran: 0
   pc: {fileID: 0}
   hptp: 0
-  joint: {fileID: 0}
-  rope: {fileID: 0}
   beLarger: 0
   toLargeSize: 0
   cookEffect: {fileID: 0}
@@ -349,7 +348,7 @@ MonoBehaviour:
   isBack: 0
   flyHeight: 0
   flyUpSpeed: 10
-  baseSortingOrder: 4000
+  baseSortingOrder: 6000
   runSpeed: 0
   isReturnSoulTower: 0
   origSoulPos: {x: 0, y: 0, z: 0}
@@ -447,7 +446,6 @@ MonoBehaviour:
   trigGroundList: []
   myBaGuaTrigger: {fileID: 0}
   baGuaTrigger: []
-  notOnGiant: 0
 --- !u!1 &5216717017252562314
 GameObject:
   m_ObjectHideFlags: 0
@@ -709,6 +707,7 @@ MonoBehaviour:
   type: 0
   owner: {fileID: 0}
   isSingleAttack: 0
+  cantSingleAttack: 0
   trigedObjs: []
   damage: 0
   force: {x: 0, y: 0, z: 0}