SZAND\msx_2 1 год назад
Родитель
Сommit
a0c74926ec
22 измененных файлов с 246 добавлено и 14 удалено
  1. 4 0
      ActionTowerDefense/Assets/Resources/Prefab/Demonic_Arrow.prefab
  2. 4 0
      ActionTowerDefense/Assets/Resources/Prefab/Demonic_Giant.prefab
  3. 4 0
      ActionTowerDefense/Assets/Resources/Prefab/Demonic_Sword.prefab
  4. 4 0
      ActionTowerDefense/Assets/Resources/Prefab/ESpirits_Assassin.prefab
  5. 4 0
      ActionTowerDefense/Assets/Resources/Prefab/ESpirits_Cook.prefab
  6. 23 1
      ActionTowerDefense/Assets/Resources/Prefab/ESpirits_Float.prefab
  7. 4 0
      ActionTowerDefense/Assets/Resources/Prefab/ESpirits_Invisible.prefab
  8. 4 0
      ActionTowerDefense/Assets/Resources/Prefab/Enemy_Arrow.prefab
  9. 6 0
      ActionTowerDefense/Assets/Resources/Prefab/Enemy_Giant.prefab
  10. 4 0
      ActionTowerDefense/Assets/Resources/Prefab/Enemy_Sword.prefab
  11. 25 2
      ActionTowerDefense/Assets/Resources/Prefab/MySpirit/Spirits_Assassin.prefab
  12. 34 2
      ActionTowerDefense/Assets/Resources/Prefab/MySpirit/Spirits_Cook.prefab
  13. 23 2
      ActionTowerDefense/Assets/Resources/Prefab/MySpirit/Spirits_Float.prefab
  14. 6 1
      ActionTowerDefense/Assets/Resources/Prefab/MySpirit/Spirits_Invisible.prefab
  15. 4 0
      ActionTowerDefense/Assets/Resources/Prefab/Player.prefab
  16. 9 1
      ActionTowerDefense/Assets/Resources/Prefab/Transfiguration/Trans_Assassin.prefab
  17. 9 1
      ActionTowerDefense/Assets/Resources/Prefab/Transfiguration/Trans_Cook.prefab
  18. 3 0
      ActionTowerDefense/Assets/Resources/Prefab/Transfiguration/Trans_Float.prefab
  19. 6 1
      ActionTowerDefense/Assets/Resources/Prefab/Transfiguration/Trans_Invisible.prefab
  20. 19 3
      ActionTowerDefense/Assets/Scripts/MoveCharacter.cs
  21. 36 0
      ActionTowerDefense/Assets/Scripts/Spirits/FloatData.cs
  22. 11 0
      ActionTowerDefense/Assets/Scripts/Spirits/FloatData.cs.meta

+ 4 - 0
ActionTowerDefense/Assets/Resources/Prefab/Demonic_Arrow.prefab

@@ -1052,6 +1052,9 @@ MonoBehaviour:
   maxRotateSpeed: 20
   minRotateSpeed: 5
   floatTime: 20
+  isFloat: 0
+  normalFallSpeed: 10
+  rapidFallSpeed: 20
   floatState: 0
   spinee: {fileID: 0}
   mesh: {fileID: 0}
@@ -1071,6 +1074,7 @@ MonoBehaviour:
   playerMats: []
   playerOut: []
   isInvisible: 0
+  canNotChangeHurt: 0
   id: 0
   costMp: 25
   totalSummonTime: 0.5

+ 4 - 0
ActionTowerDefense/Assets/Resources/Prefab/Demonic_Giant.prefab

@@ -504,6 +504,9 @@ MonoBehaviour:
   maxRotateSpeed: 20
   minRotateSpeed: 5
   floatTime: 20
+  isFloat: 0
+  normalFallSpeed: 10
+  rapidFallSpeed: 20
   floatState: 0
   spinee: {fileID: 0}
   mesh: {fileID: 0}
@@ -523,6 +526,7 @@ MonoBehaviour:
   playerMats: []
   playerOut: []
   isInvisible: 0
+  canNotChangeHurt: 0
   id: 0
   costMp: 150
   totalSummonTime: 0.5

+ 4 - 0
ActionTowerDefense/Assets/Resources/Prefab/Demonic_Sword.prefab

@@ -246,6 +246,9 @@ MonoBehaviour:
   maxRotateSpeed: 20
   minRotateSpeed: 5
   floatTime: 20
+  isFloat: 0
+  normalFallSpeed: 10
+  rapidFallSpeed: 20
   floatState: 0
   spinee: {fileID: 0}
   mesh: {fileID: 0}
@@ -265,6 +268,7 @@ MonoBehaviour:
   playerMats: []
   playerOut: []
   isInvisible: 0
+  canNotChangeHurt: 0
   id: 0
   costMp: 100
   totalSummonTime: 0.5

+ 4 - 0
ActionTowerDefense/Assets/Resources/Prefab/ESpirits_Assassin.prefab

@@ -294,6 +294,9 @@ MonoBehaviour:
   maxRotateSpeed: 20
   minRotateSpeed: 5
   floatTime: 20
+  isFloat: 0
+  normalFallSpeed: 10
+  rapidFallSpeed: 20
   floatState: 0
   spinee: {fileID: 0}
   mesh: {fileID: 0}
@@ -313,6 +316,7 @@ MonoBehaviour:
   playerMats: []
   playerOut: []
   isInvisible: 0
+  canNotChangeHurt: 0
   id: 0
   jumpSpeed: 9
   searchState: 0

+ 4 - 0
ActionTowerDefense/Assets/Resources/Prefab/ESpirits_Cook.prefab

@@ -888,6 +888,9 @@ MonoBehaviour:
   maxRotateSpeed: 20
   minRotateSpeed: 5
   floatTime: 20
+  isFloat: 0
+  normalFallSpeed: 10
+  rapidFallSpeed: 20
   floatState: 0
   spinee: {fileID: 0}
   mesh: {fileID: 0}
@@ -908,6 +911,7 @@ MonoBehaviour:
   playerMats: []
   playerOut: []
   isInvisible: 0
+  canNotChangeHurt: 0
   id: 0
   jumpSpeed: 9
   searchState: 0

+ 23 - 1
ActionTowerDefense/Assets/Resources/Prefab/ESpirits_Float.prefab

@@ -578,6 +578,7 @@ MonoBehaviour:
   owner: {fileID: 0}
   isCook: 0
   trigObjList: []
+  cook: {fileID: 0}
   needToChange: 0
   maxLen: 0
   minLen: 0
@@ -1006,7 +1007,6 @@ MonoBehaviour:
   - {fileID: 5388987656270167698}
   - {fileID: 1190225091429982147}
   cookNum: 3
-  cooks: []
   mecanim: {fileID: 3354085511906294621}
   meshRenderer: {fileID: 0}
   ani: {fileID: 5978259926173120695}
@@ -1069,6 +1069,7 @@ MonoBehaviour:
   rope: {fileID: 0}
   hasHpUp: 0
   beLarger: 0
+  attackToFloat: 0
   canMove: 1
   foot: {fileID: 8639832132450015562}
   extraRiseGravity: -28.8
@@ -1090,11 +1091,31 @@ MonoBehaviour:
   maxRotateSpeed: 20
   minRotateSpeed: 5
   floatTime: 20
+  isFloat: 0
+  normalFallSpeed: 10
+  rapidFallSpeed: 20
   floatState: 0
+  spinee: {fileID: 0}
+  mesh: {fileID: 0}
+  mats: []
   outlineMats:
   - {fileID: 2100000, guid: b89f4b5b01e92784ab27611e2b014a10, type: 2}
   - {fileID: 2100000, guid: 0d24ea357a09df448b788aed95b96541, type: 2}
   - {fileID: 2100000, guid: b89f4b5b01e92784ab27611e2b014a10, type: 2}
+  playerMe: {fileID: 0}
+  playerAni: {fileID: 0}
+  playerCol: {fileID: 0}
+  playerTran: {fileID: 0}
+  playerBst: {fileID: 0}
+  playerBullet: {fileID: 0}
+  playerST: {fileID: 0}
+  playerFoot: {fileID: 0}
+  playerSpinee: {fileID: 0}
+  playerMesh: {fileID: 0}
+  playerMats: []
+  playerOut: []
+  isInvisible: 0
+  canNotChangeHurt: 0
   id: 0
   jumpSpeed: 10
   searchState: 0
@@ -1105,6 +1126,7 @@ MonoBehaviour:
   canFly: 1
   flyHeight: 0
   flyUpSpeed: 10
+  sortingOrder: 0
   attackRatio: 0
   maxMoveSpeed: 12
   minMoveSpeed: 8

+ 4 - 0
ActionTowerDefense/Assets/Resources/Prefab/ESpirits_Invisible.prefab

@@ -298,6 +298,9 @@ MonoBehaviour:
   maxRotateSpeed: 20
   minRotateSpeed: 5
   floatTime: 20
+  isFloat: 0
+  normalFallSpeed: 10
+  rapidFallSpeed: 20
   floatState: 0
   spinee: {fileID: 0}
   mesh: {fileID: 0}
@@ -316,6 +319,7 @@ MonoBehaviour:
   playerMats: []
   playerOut: []
   isInvisible: 0
+  canNotChangeHurt: 0
   id: 0
   jumpSpeed: 10
   searchState: 0

+ 4 - 0
ActionTowerDefense/Assets/Resources/Prefab/Enemy_Arrow.prefab

@@ -1052,6 +1052,9 @@ MonoBehaviour:
   maxRotateSpeed: 20
   minRotateSpeed: 5
   floatTime: 20
+  isFloat: 0
+  normalFallSpeed: 10
+  rapidFallSpeed: 20
   floatState: 0
   spinee: {fileID: 0}
   mesh: {fileID: 0}
@@ -1071,6 +1074,7 @@ MonoBehaviour:
   playerMats: []
   playerOut: []
   isInvisible: 0
+  canNotChangeHurt: 0
   id: 0
   jumpSpeed: 10
   searchState: 0

+ 6 - 0
ActionTowerDefense/Assets/Resources/Prefab/Enemy_Giant.prefab

@@ -482,6 +482,7 @@ MonoBehaviour:
   rope: {fileID: 0}
   hasHpUp: 0
   beLarger: 0
+  attackToFloat: 0
   canMove: 1
   foot: {fileID: 5440846222604650418}
   extraRiseGravity: -28.8
@@ -503,6 +504,9 @@ MonoBehaviour:
   maxRotateSpeed: 20
   minRotateSpeed: 5
   floatTime: 20
+  isFloat: 0
+  normalFallSpeed: 10
+  rapidFallSpeed: 20
   floatState: 0
   spinee: {fileID: 0}
   mesh: {fileID: 0}
@@ -522,6 +526,7 @@ MonoBehaviour:
   playerMats: []
   playerOut: []
   isInvisible: 0
+  canNotChangeHurt: 0
   id: 0
   jumpSpeed: 10
   searchState: 0
@@ -532,6 +537,7 @@ MonoBehaviour:
   canFly: 0
   flyHeight: 0
   flyUpSpeed: 10
+  sortingOrder: 0
   attackRatio: 0
   maxMoveSpeed: 2
   minMoveSpeed: 1

+ 4 - 0
ActionTowerDefense/Assets/Resources/Prefab/Enemy_Sword.prefab

@@ -299,6 +299,9 @@ MonoBehaviour:
   maxRotateSpeed: 20
   minRotateSpeed: 5
   floatTime: 20
+  isFloat: 0
+  normalFallSpeed: 10
+  rapidFallSpeed: 20
   floatState: 0
   spinee: {fileID: 0}
   mesh: {fileID: 0}
@@ -318,6 +321,7 @@ MonoBehaviour:
   playerMats: []
   playerOut: []
   isInvisible: 0
+  canNotChangeHurt: 0
   id: 0
   jumpSpeed: 9
   searchState: 0

+ 25 - 2
ActionTowerDefense/Assets/Resources/Prefab/MySpirit/Spirits_Assassin.prefab

@@ -48,6 +48,7 @@ MonoBehaviour:
   owner: {fileID: 0}
   isCook: 0
   trigObjList: []
+  cook: {fileID: 0}
   needToChange: 0
   maxLen: 0
   minLen: 0
@@ -209,7 +210,6 @@ MonoBehaviour:
   - {fileID: 6526817785665782971}
   - {fileID: 8769150919382874379}
   cookNum: 6
-  cooks: []
   mecanim: {fileID: 5617185463097218335}
   meshRenderer: {fileID: 0}
   ani: {fileID: 6496896669866891404}
@@ -260,6 +260,7 @@ MonoBehaviour:
   rope: {fileID: 0}
   hasHpUp: 0
   beLarger: 0
+  attackToFloat: 0
   canMove: 1
   foot: {fileID: 2437299196663985756}
   extraRiseGravity: -28.8
@@ -281,9 +282,29 @@ MonoBehaviour:
   maxRotateSpeed: 0
   minRotateSpeed: 0
   floatTime: 20
+  isFloat: 0
+  normalFallSpeed: 10
+  rapidFallSpeed: 20
   floatState: 0
+  spinee: {fileID: 0}
+  mesh: {fileID: 0}
+  mats: []
   outlineMats:
   - {fileID: 2100000, guid: eb0e26c1a9cf9a14799273e742b98d21, type: 2}
+  playerMe: {fileID: 0}
+  playerAni: {fileID: 0}
+  playerCol: {fileID: 0}
+  playerTran: {fileID: 0}
+  playerBst: {fileID: 0}
+  playerBullet: {fileID: 0}
+  playerST: {fileID: 0}
+  playerFoot: {fileID: 0}
+  playerSpinee: {fileID: 0}
+  playerMesh: {fileID: 0}
+  playerMats: []
+  playerOut: []
+  isInvisible: 0
+  canNotChangeHurt: 0
   id: 0
   costMp: 1
   totalSummonTime: 0.5
@@ -639,6 +660,8 @@ MonoBehaviour:
   repelValue: 0
   spiritsAttackEffect: {fileID: 7473170563405908938, guid: 8ad3c225050205945b10657aa300afd6, type: 3}
   offsetY: 1
+  hitRate: 1
+  Miss: {fileID: 0}
 --- !u!1 &7669620205589286043
 GameObject:
   m_ObjectHideFlags: 0
@@ -721,7 +744,7 @@ MeshRenderer:
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: -690842069
-  m_SortingLayer: 4
+  m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
 --- !u!95 &6496896669866891404

+ 34 - 2
ActionTowerDefense/Assets/Resources/Prefab/MySpirit/Spirits_Cook.prefab

@@ -206,6 +206,8 @@ MonoBehaviour:
   repelValue: 0
   spiritsAttackEffect: {fileID: 0}
   offsetY: 1
+  hitRate: 1
+  Miss: {fileID: 0}
 --- !u!1 &2460330936527559963
 GameObject:
   m_ObjectHideFlags: 0
@@ -789,8 +791,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c1bedfb340186164dbac1499b49b879e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  HitCols: []
   cookNum: 10
-  cooks: []
   mecanim: {fileID: 7573527827155227431}
   meshRenderer: {fileID: 0}
   ani: {fileID: 3333436509305836838}
@@ -821,6 +823,7 @@ MonoBehaviour:
   invincibleTime: 0
   totalInvincibleTime: 0
   targetCharacter: {fileID: 0}
+  beTargetCharacter: []
   searchTrigger: {fileID: 2932762729738363159}
   targetTypes: 
   canHitFly: 0
@@ -829,6 +832,7 @@ MonoBehaviour:
   rope: {fileID: 0}
   hasHpUp: 0
   beLarger: 0
+  attackToFloat: 0
   canMove: 0
   foot: {fileID: 5440846222604650418}
   extraRiseGravity: 0
@@ -850,16 +854,39 @@ MonoBehaviour:
   maxRotateSpeed: 0
   minRotateSpeed: 0
   floatTime: 0
+  isFloat: 0
+  normalFallSpeed: 10
+  rapidFallSpeed: 20
   floatState: 0
+  spinee: {fileID: 0}
+  mesh: {fileID: 0}
+  mats: []
   outlineMats:
   - {fileID: 2100000, guid: 30969c92738eb7d4da3885e08f1ec2f0, type: 2}
   - {fileID: 2100000, guid: 98fc94309ab120b4c83b2cebb9226222, type: 2}
   - {fileID: 2100000, guid: 30969c92738eb7d4da3885e08f1ec2f0, type: 2}
+  playerMe: {fileID: 0}
+  playerAni: {fileID: 0}
+  playerCol: {fileID: 0}
+  playerTran: {fileID: 0}
+  playerBst: {fileID: 0}
+  playerBullet: {fileID: 0}
+  playerST: {fileID: 0}
+  playerFoot: {fileID: 0}
+  playerSpinee: {fileID: 0}
+  playerMesh: {fileID: 0}
+  playerMats: []
+  playerOut: []
+  isInvisible: 0
+  canNotChangeHurt: 0
   id: 0
   costMp: 1
   totalSummonTime: 0.5
   searchState: 0
   attackDistance: 0
+  maxAttackDis: 0
+  minAttackDis: 0
+  needToChange: 0
   canFly: 0
   flyHeight: 0
   flyUpSpeed: 10
@@ -1005,7 +1032,12 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
+  isCook: 0
   trigObjList: []
+  cook: {fileID: 0}
+  needToChange: 0
+  maxLen: 0
+  minLen: 0
 --- !u!65 &826799689842861252
 BoxCollider:
   m_ObjectHideFlags: 0
@@ -1180,7 +1212,7 @@ MeshRenderer:
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: -690842069
-  m_SortingLayer: 4
+  m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
 --- !u!95 &3333436509305836838

+ 23 - 2
ActionTowerDefense/Assets/Resources/Prefab/MySpirit/Spirits_Float.prefab

@@ -281,7 +281,7 @@ MeshRenderer:
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: -690842069
-  m_SortingLayer: 4
+  m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
 --- !u!95 &5978259926173120695
@@ -578,6 +578,7 @@ MonoBehaviour:
   owner: {fileID: 0}
   isCook: 0
   trigObjList: []
+  cook: {fileID: 0}
   needToChange: 0
   maxLen: 0
   minLen: 0
@@ -984,7 +985,6 @@ MonoBehaviour:
   - {fileID: 5388987656270167698}
   - {fileID: 1190225091429982147}
   cookNum: 3
-  cooks: []
   mecanim: {fileID: 3354085511906294621}
   meshRenderer: {fileID: 0}
   ani: {fileID: 5978259926173120695}
@@ -1047,6 +1047,7 @@ MonoBehaviour:
   rope: {fileID: 0}
   hasHpUp: 0
   beLarger: 0
+  attackToFloat: 0
   canMove: 1
   foot: {fileID: 8639832132450015562}
   extraRiseGravity: -28.8
@@ -1068,11 +1069,31 @@ MonoBehaviour:
   maxRotateSpeed: 10
   minRotateSpeed: 4
   floatTime: 5
+  isFloat: 0
+  normalFallSpeed: 10
+  rapidFallSpeed: 20
   floatState: 0
+  spinee: {fileID: 0}
+  mesh: {fileID: 0}
+  mats: []
   outlineMats:
   - {fileID: 2100000, guid: b89f4b5b01e92784ab27611e2b014a10, type: 2}
   - {fileID: 2100000, guid: 0d24ea357a09df448b788aed95b96541, type: 2}
   - {fileID: 2100000, guid: b89f4b5b01e92784ab27611e2b014a10, type: 2}
+  playerMe: {fileID: 0}
+  playerAni: {fileID: 0}
+  playerCol: {fileID: 0}
+  playerTran: {fileID: 0}
+  playerBst: {fileID: 0}
+  playerBullet: {fileID: 0}
+  playerST: {fileID: 0}
+  playerFoot: {fileID: 0}
+  playerSpinee: {fileID: 0}
+  playerMesh: {fileID: 0}
+  playerMats: []
+  playerOut: []
+  isInvisible: 0
+  canNotChangeHurt: 0
   id: 0
   costMp: 1
   totalSummonTime: 0.5

+ 6 - 1
ActionTowerDefense/Assets/Resources/Prefab/MySpirit/Spirits_Invisible.prefab

@@ -255,6 +255,7 @@ MonoBehaviour:
   rope: {fileID: 0}
   hasHpUp: 0
   beLarger: 0
+  attackToFloat: 0
   canMove: 0
   foot: {fileID: 2437299196663985756}
   extraRiseGravity: -28.8
@@ -276,6 +277,9 @@ MonoBehaviour:
   maxRotateSpeed: 20
   minRotateSpeed: 5
   floatTime: 20
+  isFloat: 0
+  normalFallSpeed: 10
+  rapidFallSpeed: 20
   floatState: 0
   spinee: {fileID: 0}
   mesh: {fileID: 0}
@@ -294,6 +298,7 @@ MonoBehaviour:
   playerMats: []
   playerOut: []
   isInvisible: 0
+  canNotChangeHurt: 0
   id: 0
   costMp: 1
   totalSummonTime: 0.5
@@ -732,7 +737,7 @@ MeshRenderer:
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: -690842069
-  m_SortingLayer: 4
+  m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
 --- !u!95 &6496896669866891404

+ 4 - 0
ActionTowerDefense/Assets/Resources/Prefab/Player.prefab

@@ -849,6 +849,9 @@ MonoBehaviour:
   maxRotateSpeed: 20
   minRotateSpeed: 5
   floatTime: 5
+  isFloat: 0
+  normalFallSpeed: 10
+  rapidFallSpeed: 20
   floatState: 0
   spinee: {fileID: 0}
   mesh: {fileID: 0}
@@ -868,6 +871,7 @@ MonoBehaviour:
   playerMats: []
   playerOut: []
   isInvisible: 0
+  canNotChangeHurt: 0
   changePrefabs:
   - {fileID: 8639832132491289359, guid: b924426f768fd34418c3332de33d391a, type: 3}
   - {fileID: 2437299196472462361, guid: 00861cbb6651ced4a85013d35a07b3e6, type: 3}

+ 9 - 1
ActionTowerDefense/Assets/Resources/Prefab/Transfiguration/Trans_Assassin.prefab

@@ -259,6 +259,7 @@ MonoBehaviour:
   rope: {fileID: 0}
   hasHpUp: 0
   beLarger: 0
+  attackToFloat: 0
   canMove: 1
   foot: {fileID: 2437299196663985756}
   extraRiseGravity: -28.8
@@ -280,6 +281,9 @@ MonoBehaviour:
   maxRotateSpeed: 0
   minRotateSpeed: 0
   floatTime: 20
+  isFloat: 0
+  normalFallSpeed: 10
+  rapidFallSpeed: 20
   floatState: 0
   spinee: {fileID: 0}
   mesh: {fileID: 0}
@@ -298,6 +302,8 @@ MonoBehaviour:
   playerMesh: {fileID: 0}
   playerMats: []
   playerOut: []
+  isInvisible: 0
+  canNotChangeHurt: 0
   id: 0
   costMp: 1
   totalSummonTime: 0.5
@@ -637,6 +643,8 @@ MonoBehaviour:
   repelValue: 0
   spiritsAttackEffect: {fileID: 7473170563405908938, guid: 8ad3c225050205945b10657aa300afd6, type: 3}
   offsetY: 1
+  hitRate: 1
+  Miss: {fileID: 0}
 --- !u!1 &7669620205589286043
 GameObject:
   m_ObjectHideFlags: 0
@@ -719,7 +727,7 @@ MeshRenderer:
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: -690842069
-  m_SortingLayer: 4
+  m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
 --- !u!95 &6496896669866891404

+ 9 - 1
ActionTowerDefense/Assets/Resources/Prefab/Transfiguration/Trans_Cook.prefab

@@ -206,6 +206,8 @@ MonoBehaviour:
   repelValue: 0
   spiritsAttackEffect: {fileID: 0}
   offsetY: 1
+  hitRate: 1
+  Miss: {fileID: 0}
 --- !u!1 &2460330936527559963
 GameObject:
   m_ObjectHideFlags: 0
@@ -829,6 +831,7 @@ MonoBehaviour:
   rope: {fileID: 0}
   hasHpUp: 0
   beLarger: 0
+  attackToFloat: 0
   canMove: 0
   foot: {fileID: 5440846222604650418}
   extraRiseGravity: 0
@@ -850,6 +853,9 @@ MonoBehaviour:
   maxRotateSpeed: 0
   minRotateSpeed: 0
   floatTime: 0
+  isFloat: 0
+  normalFallSpeed: 10
+  rapidFallSpeed: 20
   floatState: 0
   spinee: {fileID: 0}
   mesh: {fileID: 0}
@@ -870,6 +876,8 @@ MonoBehaviour:
   playerMesh: {fileID: 0}
   playerMats: []
   playerOut: []
+  isInvisible: 0
+  canNotChangeHurt: 0
   id: 0
   costMp: 1
   totalSummonTime: 0.5
@@ -1187,7 +1195,7 @@ MeshRenderer:
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: -690842069
-  m_SortingLayer: 4
+  m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
 --- !u!95 &3333436509305836838

+ 3 - 0
ActionTowerDefense/Assets/Resources/Prefab/Transfiguration/Trans_Float.prefab

@@ -1089,6 +1089,9 @@ MonoBehaviour:
   maxRotateSpeed: 10
   minRotateSpeed: 4
   floatTime: 5
+  isFloat: 0
+  normalFallSpeed: 10
+  rapidFallSpeed: 20
   floatState: 0
   spinee: {fileID: 0}
   mesh: {fileID: 0}

+ 6 - 1
ActionTowerDefense/Assets/Resources/Prefab/Transfiguration/Trans_Invisible.prefab

@@ -287,6 +287,7 @@ MonoBehaviour:
   rope: {fileID: 0}
   hasHpUp: 0
   beLarger: 0
+  attackToFloat: 0
   canMove: 0
   foot: {fileID: 2437299196663985756}
   extraRiseGravity: -28.8
@@ -308,6 +309,9 @@ MonoBehaviour:
   maxRotateSpeed: 20
   minRotateSpeed: 5
   floatTime: 20
+  isFloat: 0
+  normalFallSpeed: 10
+  rapidFallSpeed: 20
   floatState: 0
   spinee: {fileID: 0}
   mesh: {fileID: 0}
@@ -326,6 +330,7 @@ MonoBehaviour:
   playerMats: []
   playerOut: []
   isInvisible: 0
+  canNotChangeHurt: 0
   id: 0
   costMp: 1
   totalSummonTime: 0.5
@@ -749,7 +754,7 @@ MeshRenderer:
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: -690842069
-  m_SortingLayer: 4
+  m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
 --- !u!95 &6496896669866891404

+ 19 - 3
ActionTowerDefense/Assets/Scripts/MoveCharacter.cs

@@ -38,13 +38,18 @@ public class MoveCharacter : Character
 
     private float curTime;      //漂浮已进行时长
     private float height;       //漂浮高度
-    private float riseTime;   //上升时间
+    private float riseTime;     //上升时间
     private float curHeight;    //当前所在高度
     private float rotateSpeed;  //旋转速度
     private float rotateDir;    //旋转方向
     private float backSpeed;    //往后退的速度
+    public bool isFloat;        //正在漂浮中
 
-    private Vector3 origPos;     //初始位置
+    public float normalFallSpeed;
+    public float rapidFallSpeed;
+    private float curFallSpeed;
+
+    private Vector3 origPos;    //初始位置
     private float origY;
     private float pastTime;     //上升已用时间
     private float rise = 1;
@@ -96,6 +101,7 @@ public class MoveCharacter : Character
         playerMesh = mesh;
         playerMats = mats;
         playerOut = outlineMats;
+        curFallSpeed = normalFallSpeed;
     }
 
     private void ChangeMat(int state)
@@ -120,6 +126,7 @@ public class MoveCharacter : Character
     {
         if (canMove)
         {
+            isFloat = true;
             ChangeMat(0);
             curTime = 0;
             if (floatState == 0)
@@ -142,6 +149,13 @@ public class MoveCharacter : Character
         }
     }
 
+    public void FloatDrop()
+    {
+        ChangeState(CharacterState.Fall);
+        floatState = 3;
+        curFallSpeed = rapidFallSpeed;
+    }
+
     private void RotateSelf()
     {
         transform.localEulerAngles += new Vector3(0, 0, 1) * rotateDir * rotateSpeed * Time.deltaTime;
@@ -182,7 +196,7 @@ public class MoveCharacter : Character
             aniCollider.Play("Fall", 0, 0);
             if (transform.position.y >= origY + 0.05f)
             {
-                curHeight -= 10 * Time.deltaTime;
+                curHeight -= curFallSpeed * Time.deltaTime;
                 transform.position = new Vector3(origPos.x, curHeight, origPos.z);
             }
             else if (foot.TrigGround || curHeight <= origY + 0.05f)
@@ -194,6 +208,8 @@ public class MoveCharacter : Character
                 {
                     m.SetInt("_Outline", 0);
                     floatState = 0;
+                    isFloat = false;
+                    curFallSpeed = normalFallSpeed;
                     if (gameObject.tag == "Player")
                     {
                         GetComponent<PlayerController>().soulCollector.enabled = true;

+ 36 - 0
ActionTowerDefense/Assets/Scripts/Spirits/FloatData.cs

@@ -0,0 +1,36 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class FloatData : MonoBehaviour
+{
+    static public List<Demonic> demIsFloating;
+    static public List<Enemy> eneIsFloating;
+
+    private void Start()
+    {
+        Clear(2);
+    }
+
+    static public void Clear(int id)
+    {
+        switch (id)
+        {
+            //清空友方所有漂浮记录
+            case 0:
+                demIsFloating = new List<Demonic>();
+                break;
+            //清空敌方所有漂浮记录
+            case 1:
+                eneIsFloating = new List<Enemy>();
+                break;
+            //清空所有漂浮记录
+            case 2:
+                demIsFloating = new List<Demonic>();
+                eneIsFloating = new List<Enemy>();
+                break;
+            default:
+                break;
+        }
+    }
+}

+ 11 - 0
ActionTowerDefense/Assets/Scripts/Spirits/FloatData.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 893fd9fefa9cb974c857eccc657637ce
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: