SZAND\msx_2 1 жил өмнө
parent
commit
75944dd2c9
21 өөрчлөгдсөн 148 нэмэгдсэн , 27 устгасан
  1. 10 1
      ActionTowerDefense/Assets/Resources/Prefab/Demonic_Arrow.prefab
  2. 10 1
      ActionTowerDefense/Assets/Resources/Prefab/Demonic_Giant.prefab
  3. 10 1
      ActionTowerDefense/Assets/Resources/Prefab/Demonic_Sword.prefab
  4. 4 1
      ActionTowerDefense/Assets/Resources/Prefab/ESpirits_Assassin.prefab
  5. 1 0
      ActionTowerDefense/Assets/Resources/Prefab/ESpirits_Cook.prefab
  6. 4 1
      ActionTowerDefense/Assets/Resources/Prefab/ESpirits_Float.prefab
  7. 4 1
      ActionTowerDefense/Assets/Resources/Prefab/ESpirits_Invisible.prefab
  8. 4 1
      ActionTowerDefense/Assets/Resources/Prefab/Enemy_Arrow.prefab
  9. 4 1
      ActionTowerDefense/Assets/Resources/Prefab/Enemy_Giant.prefab
  10. 4 1
      ActionTowerDefense/Assets/Resources/Prefab/Enemy_Sword.prefab
  11. 2 2
      ActionTowerDefense/Assets/Resources/Prefab/FX/CooksBird.prefab
  12. 10 1
      ActionTowerDefense/Assets/Resources/Prefab/MySpirit/Spirits_Assassin.prefab
  13. 1 0
      ActionTowerDefense/Assets/Resources/Prefab/MySpirit/Spirits_Cook.prefab
  14. 12 1
      ActionTowerDefense/Assets/Resources/Prefab/MySpirit/Spirits_Float.prefab
  15. 9 1
      ActionTowerDefense/Assets/Resources/Prefab/Player.prefab
  16. 1 0
      ActionTowerDefense/Assets/Resources/Prefab/Transfiguration/Trans_Assassin.prefab
  17. 5 2
      ActionTowerDefense/Assets/Resources/Prefab/Transfiguration/Trans_Cook.prefab
  18. 11 1
      ActionTowerDefense/Assets/Resources/Prefab/Transfiguration/Trans_Float.prefab
  19. 5 1
      ActionTowerDefense/Assets/Resources/Prefab/Transfiguration/Trans_Invisible.prefab
  20. 4 0
      ActionTowerDefense/Assets/Scripts/MoveCharacter.cs
  21. 33 9
      ActionTowerDefense/Assets/Scripts/Spirits/Trans_Cook.cs

+ 10 - 1
ActionTowerDefense/Assets/Resources/Prefab/Demonic_Arrow.prefab

@@ -575,8 +575,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
   owner: {fileID: 0}
   isCook: 0
   isCook: 0
+  isEnemy: 0
   trigObjList: []
   trigObjList: []
-  cook: {fileID: 0}
+  eCook: {fileID: 0}
+  dCook: {fileID: 0}
   needToChange: 1
   needToChange: 1
   maxLen: 45
   maxLen: 45
   minLen: 35
   minLen: 35
@@ -1033,6 +1035,8 @@ MonoBehaviour:
   hasHpUp: 0
   hasHpUp: 0
   beLarger: 0
   beLarger: 0
   attackToFloat: 0
   attackToFloat: 0
+  isSoulUnstable: 0
+  soulUnstableTime: 0
   canMove: 1
   canMove: 1
   foot: {fileID: 8639832132450015562}
   foot: {fileID: 8639832132450015562}
   extraRiseGravity: -28.8
   extraRiseGravity: -28.8
@@ -1059,6 +1063,7 @@ MonoBehaviour:
   minRotateSpeed: 5
   minRotateSpeed: 5
   floatTime: 10
   floatTime: 10
   isFloat: 0
   isFloat: 0
+  dropDamage: 100
   normalFallSpeed: 10
   normalFallSpeed: 10
   rapidFallSpeed: 30
   rapidFallSpeed: 30
   curFallSpeed: 0
   curFallSpeed: 0
@@ -1068,6 +1073,7 @@ MonoBehaviour:
   mats: []
   mats: []
   outlineMats:
   outlineMats:
   - {fileID: 2100000, guid: b634d447d9a02a14abc964532eedfc35, type: 2}
   - {fileID: 2100000, guid: b634d447d9a02a14abc964532eedfc35, type: 2}
+  outline1Mats: []
   playerMe: {fileID: 0}
   playerMe: {fileID: 0}
   playerAni: {fileID: 0}
   playerAni: {fileID: 0}
   playerCol: {fileID: 0}
   playerCol: {fileID: 0}
@@ -1082,6 +1088,8 @@ MonoBehaviour:
   playerOut: []
   playerOut: []
   isInvisible: 0
   isInvisible: 0
   canNotChangeHurt: 0
   canNotChangeHurt: 0
+  soulPrefab: {fileID: 0}
+  soulStartSpeed: 1
   id: 0
   id: 0
   costMp: 25
   costMp: 25
   totalSummonTime: 0.5
   totalSummonTime: 0.5
@@ -1097,6 +1105,7 @@ MonoBehaviour:
   playerID: 0
   playerID: 0
   hasEffect: 0
   hasEffect: 0
   soulCollector: {fileID: 0}
   soulCollector: {fileID: 0}
+  isBack: 0
 --- !u!54 &8639832132491289349
 --- !u!54 &8639832132491289349
 Rigidbody:
 Rigidbody:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0

+ 10 - 1
ActionTowerDefense/Assets/Resources/Prefab/Demonic_Giant.prefab

@@ -485,6 +485,8 @@ MonoBehaviour:
   hasHpUp: 0
   hasHpUp: 0
   beLarger: 0
   beLarger: 0
   attackToFloat: 0
   attackToFloat: 0
+  isSoulUnstable: 0
+  soulUnstableTime: 0
   canMove: 1
   canMove: 1
   foot: {fileID: 5440846222604650418}
   foot: {fileID: 5440846222604650418}
   extraRiseGravity: -28.8
   extraRiseGravity: -28.8
@@ -511,6 +513,7 @@ MonoBehaviour:
   minRotateSpeed: 5
   minRotateSpeed: 5
   floatTime: 10
   floatTime: 10
   isFloat: 0
   isFloat: 0
+  dropDamage: 100
   normalFallSpeed: 10
   normalFallSpeed: 10
   rapidFallSpeed: 30
   rapidFallSpeed: 30
   curFallSpeed: 0
   curFallSpeed: 0
@@ -520,6 +523,7 @@ MonoBehaviour:
   mats: []
   mats: []
   outlineMats:
   outlineMats:
   - {fileID: 2100000, guid: a30e0c3d2b8bf4e43a76fc2d5b3884cd, type: 2}
   - {fileID: 2100000, guid: a30e0c3d2b8bf4e43a76fc2d5b3884cd, type: 2}
+  outline1Mats: []
   playerMe: {fileID: 0}
   playerMe: {fileID: 0}
   playerAni: {fileID: 0}
   playerAni: {fileID: 0}
   playerCol: {fileID: 0}
   playerCol: {fileID: 0}
@@ -534,6 +538,8 @@ MonoBehaviour:
   playerOut: []
   playerOut: []
   isInvisible: 0
   isInvisible: 0
   canNotChangeHurt: 0
   canNotChangeHurt: 0
+  soulPrefab: {fileID: 0}
+  soulStartSpeed: 1
   id: 0
   id: 0
   costMp: 150
   costMp: 150
   totalSummonTime: 0.5
   totalSummonTime: 0.5
@@ -549,6 +555,7 @@ MonoBehaviour:
   playerID: 0
   playerID: 0
   hasEffect: 0
   hasEffect: 0
   soulCollector: {fileID: 0}
   soulCollector: {fileID: 0}
+  isBack: 0
 --- !u!54 &5440846222648032765
 --- !u!54 &5440846222648032765
 Rigidbody:
 Rigidbody:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -612,8 +619,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
   owner: {fileID: 0}
   isCook: 0
   isCook: 0
+  isEnemy: 0
   trigObjList: []
   trigObjList: []
-  cook: {fileID: 0}
+  eCook: {fileID: 0}
+  dCook: {fileID: 0}
   needToChange: 0
   needToChange: 0
   maxLen: 0
   maxLen: 0
   minLen: 0
   minLen: 0

+ 10 - 1
ActionTowerDefense/Assets/Resources/Prefab/Demonic_Sword.prefab

@@ -47,8 +47,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
   owner: {fileID: 0}
   isCook: 0
   isCook: 0
+  isEnemy: 0
   trigObjList: []
   trigObjList: []
-  cook: {fileID: 0}
+  eCook: {fileID: 0}
+  dCook: {fileID: 0}
   needToChange: 0
   needToChange: 0
   maxLen: 0
   maxLen: 0
   minLen: 0
   minLen: 0
@@ -227,6 +229,8 @@ MonoBehaviour:
   hasHpUp: 0
   hasHpUp: 0
   beLarger: 0
   beLarger: 0
   attackToFloat: 0
   attackToFloat: 0
+  isSoulUnstable: 0
+  soulUnstableTime: 0
   canMove: 1
   canMove: 1
   foot: {fileID: 2437299196663985756}
   foot: {fileID: 2437299196663985756}
   extraRiseGravity: -28.8
   extraRiseGravity: -28.8
@@ -253,6 +257,7 @@ MonoBehaviour:
   minRotateSpeed: 5
   minRotateSpeed: 5
   floatTime: 10
   floatTime: 10
   isFloat: 0
   isFloat: 0
+  dropDamage: 100
   normalFallSpeed: 10
   normalFallSpeed: 10
   rapidFallSpeed: 30
   rapidFallSpeed: 30
   curFallSpeed: 0
   curFallSpeed: 0
@@ -262,6 +267,7 @@ MonoBehaviour:
   mats: []
   mats: []
   outlineMats:
   outlineMats:
   - {fileID: 2100000, guid: 7d50f910288e95b4285a5fb549c94fe6, type: 2}
   - {fileID: 2100000, guid: 7d50f910288e95b4285a5fb549c94fe6, type: 2}
+  outline1Mats: []
   playerMe: {fileID: 0}
   playerMe: {fileID: 0}
   playerAni: {fileID: 0}
   playerAni: {fileID: 0}
   playerCol: {fileID: 0}
   playerCol: {fileID: 0}
@@ -276,6 +282,8 @@ MonoBehaviour:
   playerOut: []
   playerOut: []
   isInvisible: 0
   isInvisible: 0
   canNotChangeHurt: 0
   canNotChangeHurt: 0
+  soulPrefab: {fileID: 0}
+  soulStartSpeed: 1
   id: 0
   id: 0
   costMp: 100
   costMp: 100
   totalSummonTime: 0.5
   totalSummonTime: 0.5
@@ -291,6 +299,7 @@ MonoBehaviour:
   playerID: 0
   playerID: 0
   hasEffect: 0
   hasEffect: 0
   soulCollector: {fileID: 0}
   soulCollector: {fileID: 0}
+  isBack: 0
 --- !u!54 &2437299196472462355
 --- !u!54 &2437299196472462355
 Rigidbody:
 Rigidbody:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0

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

@@ -47,8 +47,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
   owner: {fileID: 0}
   isCook: 0
   isCook: 0
+  isEnemy: 0
   trigObjList: []
   trigObjList: []
-  cook: {fileID: 0}
+  eCook: {fileID: 0}
+  dCook: {fileID: 0}
   needToChange: 0
   needToChange: 0
   maxLen: 0
   maxLen: 0
   minLen: 0
   minLen: 0
@@ -303,6 +305,7 @@ MonoBehaviour:
   minRotateSpeed: 5
   minRotateSpeed: 5
   floatTime: 20
   floatTime: 20
   isFloat: 0
   isFloat: 0
+  dropDamage: 100
   normalFallSpeed: 10
   normalFallSpeed: 10
   rapidFallSpeed: 30
   rapidFallSpeed: 30
   curFallSpeed: 0
   curFallSpeed: 0

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

@@ -897,6 +897,7 @@ MonoBehaviour:
   minRotateSpeed: 5
   minRotateSpeed: 5
   floatTime: 20
   floatTime: 20
   isFloat: 0
   isFloat: 0
+  dropDamage: 100
   normalFallSpeed: 10
   normalFallSpeed: 10
   rapidFallSpeed: 30
   rapidFallSpeed: 30
   curFallSpeed: 0
   curFallSpeed: 0

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

@@ -577,8 +577,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
   owner: {fileID: 0}
   isCook: 0
   isCook: 0
+  isEnemy: 0
   trigObjList: []
   trigObjList: []
-  cook: {fileID: 0}
+  eCook: {fileID: 0}
+  dCook: {fileID: 0}
   needToChange: 0
   needToChange: 0
   maxLen: 0
   maxLen: 0
   minLen: 0
   minLen: 0
@@ -1100,6 +1102,7 @@ MonoBehaviour:
   minRotateSpeed: 5
   minRotateSpeed: 5
   floatTime: 20
   floatTime: 20
   isFloat: 0
   isFloat: 0
+  dropDamage: 100
   normalFallSpeed: 10
   normalFallSpeed: 10
   rapidFallSpeed: 30
   rapidFallSpeed: 30
   curFallSpeed: 0
   curFallSpeed: 0

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

@@ -47,8 +47,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
   owner: {fileID: 0}
   isCook: 0
   isCook: 0
+  isEnemy: 0
   trigObjList: []
   trigObjList: []
-  cook: {fileID: 0}
+  eCook: {fileID: 0}
+  dCook: {fileID: 0}
   needToChange: 0
   needToChange: 0
   maxLen: 0
   maxLen: 0
   minLen: 0
   minLen: 0
@@ -307,6 +309,7 @@ MonoBehaviour:
   minRotateSpeed: 5
   minRotateSpeed: 5
   floatTime: 20
   floatTime: 20
   isFloat: 0
   isFloat: 0
+  dropDamage: 100
   normalFallSpeed: 10
   normalFallSpeed: 10
   rapidFallSpeed: 30
   rapidFallSpeed: 30
   curFallSpeed: 0
   curFallSpeed: 0

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

@@ -575,8 +575,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
   owner: {fileID: 0}
   isCook: 0
   isCook: 0
+  isEnemy: 0
   trigObjList: []
   trigObjList: []
-  cook: {fileID: 0}
+  eCook: {fileID: 0}
+  dCook: {fileID: 0}
   needToChange: 1
   needToChange: 1
   maxLen: 45
   maxLen: 45
   minLen: 35
   minLen: 35
@@ -1061,6 +1063,7 @@ MonoBehaviour:
   minRotateSpeed: 5
   minRotateSpeed: 5
   floatTime: 10
   floatTime: 10
   isFloat: 0
   isFloat: 0
+  dropDamage: 100
   normalFallSpeed: 10
   normalFallSpeed: 10
   rapidFallSpeed: 30
   rapidFallSpeed: 30
   curFallSpeed: 0
   curFallSpeed: 0

+ 4 - 1
ActionTowerDefense/Assets/Resources/Prefab/Enemy_Giant.prefab

@@ -513,6 +513,7 @@ MonoBehaviour:
   minRotateSpeed: 5
   minRotateSpeed: 5
   floatTime: 10
   floatTime: 10
   isFloat: 0
   isFloat: 0
+  dropDamage: 100
   normalFallSpeed: 10
   normalFallSpeed: 10
   rapidFallSpeed: 30
   rapidFallSpeed: 30
   curFallSpeed: 0
   curFallSpeed: 0
@@ -639,8 +640,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
   owner: {fileID: 0}
   isCook: 0
   isCook: 0
+  isEnemy: 0
   trigObjList: []
   trigObjList: []
-  cook: {fileID: 0}
+  eCook: {fileID: 0}
+  dCook: {fileID: 0}
   needToChange: 0
   needToChange: 0
   maxLen: 0
   maxLen: 0
   minLen: 0
   minLen: 0

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

@@ -308,6 +308,7 @@ MonoBehaviour:
   minRotateSpeed: 5
   minRotateSpeed: 5
   floatTime: 10
   floatTime: 10
   isFloat: 0
   isFloat: 0
+  dropDamage: 100
   normalFallSpeed: 10
   normalFallSpeed: 10
   rapidFallSpeed: 30
   rapidFallSpeed: 30
   curFallSpeed: 0
   curFallSpeed: 0
@@ -720,8 +721,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   owner: {fileID: 2437299196472462361}
   owner: {fileID: 2437299196472462361}
   isCook: 0
   isCook: 0
+  isEnemy: 0
   trigObjList: []
   trigObjList: []
-  cook: {fileID: 0}
+  eCook: {fileID: 0}
+  dCook: {fileID: 0}
   needToChange: 0
   needToChange: 0
   maxLen: 0
   maxLen: 0
   minLen: 0
   minLen: 0

+ 2 - 2
ActionTowerDefense/Assets/Resources/Prefab/FX/CooksBird.prefab

@@ -139,8 +139,8 @@ Rigidbody:
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6827689530009399248}
   m_GameObject: {fileID: 6827689530009399248}
   serializedVersion: 2
   serializedVersion: 2
-  m_Mass: 1
-  m_Drag: 0.1
+  m_Mass: 0.1
+  m_Drag: 0
   m_AngularDrag: 0.05
   m_AngularDrag: 0.05
   m_UseGravity: 1
   m_UseGravity: 1
   m_IsKinematic: 0
   m_IsKinematic: 0

+ 10 - 1
ActionTowerDefense/Assets/Resources/Prefab/MySpirit/Spirits_Assassin.prefab

@@ -47,8 +47,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
   owner: {fileID: 0}
   isCook: 0
   isCook: 0
+  isEnemy: 0
   trigObjList: []
   trigObjList: []
-  cook: {fileID: 0}
+  eCook: {fileID: 0}
+  dCook: {fileID: 0}
   needToChange: 0
   needToChange: 0
   maxLen: 0
   maxLen: 0
   minLen: 0
   minLen: 0
@@ -263,6 +265,8 @@ MonoBehaviour:
   hasHpUp: 0
   hasHpUp: 0
   beLarger: 0
   beLarger: 0
   attackToFloat: 0
   attackToFloat: 0
+  isSoulUnstable: 0
+  soulUnstableTime: 0
   canMove: 1
   canMove: 1
   foot: {fileID: 2437299196663985756}
   foot: {fileID: 2437299196663985756}
   extraRiseGravity: -28.8
   extraRiseGravity: -28.8
@@ -289,6 +293,7 @@ MonoBehaviour:
   minRotateSpeed: 4
   minRotateSpeed: 4
   floatTime: 5
   floatTime: 5
   isFloat: 0
   isFloat: 0
+  dropDamage: 100
   normalFallSpeed: 10
   normalFallSpeed: 10
   rapidFallSpeed: 30
   rapidFallSpeed: 30
   curFallSpeed: 0
   curFallSpeed: 0
@@ -298,6 +303,7 @@ MonoBehaviour:
   mats: []
   mats: []
   outlineMats:
   outlineMats:
   - {fileID: 2100000, guid: eb0e26c1a9cf9a14799273e742b98d21, type: 2}
   - {fileID: 2100000, guid: eb0e26c1a9cf9a14799273e742b98d21, type: 2}
+  outline1Mats: []
   playerMe: {fileID: 0}
   playerMe: {fileID: 0}
   playerAni: {fileID: 0}
   playerAni: {fileID: 0}
   playerCol: {fileID: 0}
   playerCol: {fileID: 0}
@@ -312,6 +318,8 @@ MonoBehaviour:
   playerOut: []
   playerOut: []
   isInvisible: 0
   isInvisible: 0
   canNotChangeHurt: 0
   canNotChangeHurt: 0
+  soulPrefab: {fileID: 0}
+  soulStartSpeed: 1
   id: 0
   id: 0
   costMp: 1
   costMp: 1
   totalSummonTime: 0.5
   totalSummonTime: 0.5
@@ -327,6 +335,7 @@ MonoBehaviour:
   playerID: 0
   playerID: 0
   hasEffect: 0
   hasEffect: 0
   soulCollector: {fileID: 0}
   soulCollector: {fileID: 0}
+  isBack: 0
 --- !u!54 &2437299196472462355
 --- !u!54 &2437299196472462355
 Rigidbody:
 Rigidbody:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0

+ 1 - 0
ActionTowerDefense/Assets/Resources/Prefab/MySpirit/Spirits_Cook.prefab

@@ -870,6 +870,7 @@ MonoBehaviour:
   minRotateSpeed: 4
   minRotateSpeed: 4
   floatTime: 5
   floatTime: 5
   isFloat: 0
   isFloat: 0
+  dropDamage: 100
   normalFallSpeed: 10
   normalFallSpeed: 10
   rapidFallSpeed: 30
   rapidFallSpeed: 30
   curFallSpeed: 0
   curFallSpeed: 0

+ 12 - 1
ActionTowerDefense/Assets/Resources/Prefab/MySpirit/Spirits_Float.prefab

@@ -577,8 +577,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
   owner: {fileID: 0}
   isCook: 0
   isCook: 0
+  isEnemy: 0
   trigObjList: []
   trigObjList: []
-  cook: {fileID: 0}
+  eCook: {fileID: 0}
+  dCook: {fileID: 0}
   needToChange: 0
   needToChange: 0
   maxLen: 0
   maxLen: 0
   minLen: 0
   minLen: 0
@@ -1050,6 +1052,8 @@ MonoBehaviour:
   hasHpUp: 0
   hasHpUp: 0
   beLarger: 0
   beLarger: 0
   attackToFloat: 0
   attackToFloat: 0
+  isSoulUnstable: 0
+  soulUnstableTime: 0
   canMove: 1
   canMove: 1
   foot: {fileID: 8639832132450015562}
   foot: {fileID: 8639832132450015562}
   extraRiseGravity: -28.8
   extraRiseGravity: -28.8
@@ -1076,8 +1080,10 @@ MonoBehaviour:
   minRotateSpeed: 4
   minRotateSpeed: 4
   floatTime: 5
   floatTime: 5
   isFloat: 0
   isFloat: 0
+  dropDamage: 100
   normalFallSpeed: 10
   normalFallSpeed: 10
   rapidFallSpeed: 30
   rapidFallSpeed: 30
+  curFallSpeed: 0
   floatState: 0
   floatState: 0
   spinee: {fileID: 0}
   spinee: {fileID: 0}
   mesh: {fileID: 0}
   mesh: {fileID: 0}
@@ -1086,6 +1092,7 @@ MonoBehaviour:
   - {fileID: 2100000, guid: b89f4b5b01e92784ab27611e2b014a10, type: 2}
   - {fileID: 2100000, guid: b89f4b5b01e92784ab27611e2b014a10, type: 2}
   - {fileID: 2100000, guid: 0d24ea357a09df448b788aed95b96541, type: 2}
   - {fileID: 2100000, guid: 0d24ea357a09df448b788aed95b96541, type: 2}
   - {fileID: 2100000, guid: b89f4b5b01e92784ab27611e2b014a10, type: 2}
   - {fileID: 2100000, guid: b89f4b5b01e92784ab27611e2b014a10, type: 2}
+  outline1Mats: []
   playerMe: {fileID: 0}
   playerMe: {fileID: 0}
   playerAni: {fileID: 0}
   playerAni: {fileID: 0}
   playerCol: {fileID: 0}
   playerCol: {fileID: 0}
@@ -1100,6 +1107,8 @@ MonoBehaviour:
   playerOut: []
   playerOut: []
   isInvisible: 0
   isInvisible: 0
   canNotChangeHurt: 0
   canNotChangeHurt: 0
+  soulPrefab: {fileID: 0}
+  soulStartSpeed: 1
   id: 0
   id: 0
   costMp: 1
   costMp: 1
   totalSummonTime: 0.5
   totalSummonTime: 0.5
@@ -1114,6 +1123,8 @@ MonoBehaviour:
   sortingOrder: 2000
   sortingOrder: 2000
   playerID: 0
   playerID: 0
   hasEffect: 0
   hasEffect: 0
+  soulCollector: {fileID: 0}
+  isBack: 0
 --- !u!54 &8639832132491289349
 --- !u!54 &8639832132491289349
 Rigidbody:
 Rigidbody:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0

+ 9 - 1
ActionTowerDefense/Assets/Resources/Prefab/Player.prefab

@@ -830,6 +830,8 @@ MonoBehaviour:
   hasHpUp: 0
   hasHpUp: 0
   beLarger: 0
   beLarger: 0
   attackToFloat: 0
   attackToFloat: 0
+  isSoulUnstable: 0
+  soulUnstableTime: 0
   canMove: 1
   canMove: 1
   foot: {fileID: 3571941039716665623}
   foot: {fileID: 3571941039716665623}
   extraRiseGravity: -28.8
   extraRiseGravity: -28.8
@@ -856,6 +858,7 @@ MonoBehaviour:
   minRotateSpeed: 5
   minRotateSpeed: 5
   floatTime: 5
   floatTime: 5
   isFloat: 0
   isFloat: 0
+  dropDamage: 100
   normalFallSpeed: 10
   normalFallSpeed: 10
   rapidFallSpeed: 30
   rapidFallSpeed: 30
   curFallSpeed: 0
   curFallSpeed: 0
@@ -865,6 +868,7 @@ MonoBehaviour:
   mats: []
   mats: []
   outlineMats:
   outlineMats:
   - {fileID: 2100000, guid: 81069b2e594d94340983febc6c5ff9b3, type: 2}
   - {fileID: 2100000, guid: 81069b2e594d94340983febc6c5ff9b3, type: 2}
+  outline1Mats: []
   playerMe: {fileID: 0}
   playerMe: {fileID: 0}
   playerAni: {fileID: 0}
   playerAni: {fileID: 0}
   playerCol: {fileID: 0}
   playerCol: {fileID: 0}
@@ -879,6 +883,8 @@ MonoBehaviour:
   playerOut: []
   playerOut: []
   isInvisible: 0
   isInvisible: 0
   canNotChangeHurt: 0
   canNotChangeHurt: 0
+  soulPrefab: {fileID: 0}
+  soulStartSpeed: 1
   changePrefabs:
   changePrefabs:
   - {fileID: 8639832132491289359, guid: b924426f768fd34418c3332de33d391a, type: 3}
   - {fileID: 8639832132491289359, guid: b924426f768fd34418c3332de33d391a, type: 3}
   - {fileID: 2437299196472462361, guid: 00861cbb6651ced4a85013d35a07b3e6, type: 3}
   - {fileID: 2437299196472462361, guid: 00861cbb6651ced4a85013d35a07b3e6, type: 3}
@@ -1584,8 +1590,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
   owner: {fileID: 0}
   isCook: 0
   isCook: 0
+  isEnemy: 0
   trigObjList: []
   trigObjList: []
-  cook: {fileID: 0}
+  eCook: {fileID: 0}
+  dCook: {fileID: 0}
   needToChange: 0
   needToChange: 0
   maxLen: 0
   maxLen: 0
   minLen: 0
   minLen: 0

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

@@ -284,6 +284,7 @@ MonoBehaviour:
   minRotateSpeed: 4
   minRotateSpeed: 4
   floatTime: 5
   floatTime: 5
   isFloat: 0
   isFloat: 0
+  dropDamage: 100
   normalFallSpeed: 10
   normalFallSpeed: 10
   rapidFallSpeed: 30
   rapidFallSpeed: 30
   curFallSpeed: 0
   curFallSpeed: 0

+ 5 - 2
ActionTowerDefense/Assets/Resources/Prefab/Transfiguration/Trans_Cook.prefab

@@ -654,7 +654,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4737949113454210572}
   m_GameObject: {fileID: 4737949113454210572}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -0.5, y: 1, z: 0}
+  m_LocalPosition: {x: -0.5, y: 3.16, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Children: []
@@ -929,6 +929,7 @@ MonoBehaviour:
   minRotateSpeed: 4
   minRotateSpeed: 4
   floatTime: 5
   floatTime: 5
   isFloat: 0
   isFloat: 0
+  dropDamage: 100
   normalFallSpeed: 10
   normalFallSpeed: 10
   rapidFallSpeed: 30
   rapidFallSpeed: 30
   curFallSpeed: 0
   curFallSpeed: 0
@@ -990,8 +991,10 @@ MonoBehaviour:
   UIoffset: {x: 0, y: 2, z: 0}
   UIoffset: {x: 0, y: 2, z: 0}
   bottle: {fileID: 6827689530009399248, guid: 263e3d90178b89146933e46f2fce55df, type: 3}
   bottle: {fileID: 6827689530009399248, guid: 263e3d90178b89146933e46f2fce55df, type: 3}
   intervalTime: 0.5
   intervalTime: 0.5
-  throwForce: {x: -20, y: 0, z: 0}
+  throwForceUp: {x: 0, y: 5, z: 0}
   throwPos: {fileID: 4737949113454210572}
   throwPos: {fileID: 4737949113454210572}
+  speed: 10
+  maxDis: 20
 --- !u!1 &6026815487321357762
 --- !u!1 &6026815487321357762
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0

+ 11 - 1
ActionTowerDefense/Assets/Resources/Prefab/Transfiguration/Trans_Float.prefab

@@ -636,8 +636,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
   owner: {fileID: 0}
   isCook: 0
   isCook: 0
+  isEnemy: 0
   trigObjList: []
   trigObjList: []
-  cook: {fileID: 0}
+  eCook: {fileID: 0}
+  dCook: {fileID: 0}
   needToChange: 0
   needToChange: 0
   maxLen: 0
   maxLen: 0
   minLen: 0
   minLen: 0
@@ -1029,6 +1031,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   controller: {fileID: 0}
   controller: {fileID: 0}
   changeTime: 30
   changeTime: 30
+  UIoffset: {x: 0, y: 0, z: 0}
   intervalTime: 0.5
   intervalTime: 0.5
   minTime: 7
   minTime: 7
   maxTime: 9
   maxTime: 9
@@ -1132,6 +1135,8 @@ MonoBehaviour:
   hasHpUp: 0
   hasHpUp: 0
   beLarger: 0
   beLarger: 0
   attackToFloat: 0
   attackToFloat: 0
+  isSoulUnstable: 0
+  soulUnstableTime: 0
   canMove: 1
   canMove: 1
   foot: {fileID: 8639832132450015562}
   foot: {fileID: 8639832132450015562}
   extraRiseGravity: -28.8
   extraRiseGravity: -28.8
@@ -1158,6 +1163,7 @@ MonoBehaviour:
   minRotateSpeed: 4
   minRotateSpeed: 4
   floatTime: 5
   floatTime: 5
   isFloat: 0
   isFloat: 0
+  dropDamage: 100
   normalFallSpeed: 10
   normalFallSpeed: 10
   rapidFallSpeed: 30
   rapidFallSpeed: 30
   curFallSpeed: 0
   curFallSpeed: 0
@@ -1169,6 +1175,7 @@ MonoBehaviour:
   - {fileID: 2100000, guid: b89f4b5b01e92784ab27611e2b014a10, type: 2}
   - {fileID: 2100000, guid: b89f4b5b01e92784ab27611e2b014a10, type: 2}
   - {fileID: 2100000, guid: 0d24ea357a09df448b788aed95b96541, type: 2}
   - {fileID: 2100000, guid: 0d24ea357a09df448b788aed95b96541, type: 2}
   - {fileID: 2100000, guid: b89f4b5b01e92784ab27611e2b014a10, type: 2}
   - {fileID: 2100000, guid: b89f4b5b01e92784ab27611e2b014a10, type: 2}
+  outline1Mats: []
   playerMe: {fileID: 0}
   playerMe: {fileID: 0}
   playerAni: {fileID: 0}
   playerAni: {fileID: 0}
   playerCol: {fileID: 0}
   playerCol: {fileID: 0}
@@ -1183,6 +1190,8 @@ MonoBehaviour:
   playerOut: []
   playerOut: []
   isInvisible: 0
   isInvisible: 0
   canNotChangeHurt: 0
   canNotChangeHurt: 0
+  soulPrefab: {fileID: 0}
+  soulStartSpeed: 1
   id: 0
   id: 0
   costMp: 1
   costMp: 1
   totalSummonTime: 0.5
   totalSummonTime: 0.5
@@ -1198,3 +1207,4 @@ MonoBehaviour:
   playerID: 0
   playerID: 0
   hasEffect: 0
   hasEffect: 0
   soulCollector: {fileID: 2509289168932687770}
   soulCollector: {fileID: 2509289168932687770}
+  isBack: 0

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

@@ -47,8 +47,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
   owner: {fileID: 0}
   isCook: 0
   isCook: 0
+  isEnemy: 0
   trigObjList: []
   trigObjList: []
-  cook: {fileID: 0}
+  eCook: {fileID: 0}
+  dCook: {fileID: 0}
   needToChange: 0
   needToChange: 0
   maxLen: 0
   maxLen: 0
   minLen: 0
   minLen: 0
@@ -322,6 +324,7 @@ MonoBehaviour:
   minRotateSpeed: 4
   minRotateSpeed: 4
   floatTime: 5
   floatTime: 5
   isFloat: 0
   isFloat: 0
+  dropDamage: 100
   normalFallSpeed: 10
   normalFallSpeed: 10
   rapidFallSpeed: 30
   rapidFallSpeed: 30
   curFallSpeed: 0
   curFallSpeed: 0
@@ -362,6 +365,7 @@ MonoBehaviour:
   playerID: 0
   playerID: 0
   hasEffect: 0
   hasEffect: 0
   soulCollector: {fileID: 0}
   soulCollector: {fileID: 0}
+  isBack: 0
 --- !u!1 &2437299196663985757
 --- !u!1 &2437299196663985757
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0

+ 4 - 0
ActionTowerDefense/Assets/Scripts/MoveCharacter.cs

@@ -51,6 +51,8 @@ public class MoveCharacter : Character
     private float backSpeed;    //往后退的速度
     private float backSpeed;    //往后退的速度
     public bool isFloat;        //正在漂浮中
     public bool isFloat;        //正在漂浮中
 
 
+    public int dropDamage;      //漂浮摔落伤害
+
     public float normalFallSpeed;
     public float normalFallSpeed;
     public float rapidFallSpeed;
     public float rapidFallSpeed;
     public float curFallSpeed;
     public float curFallSpeed;
@@ -274,6 +276,8 @@ public class MoveCharacter : Character
                 else
                 else
                 {
                 {
                     ChangeState(CharacterState.Coma);
                     ChangeState(CharacterState.Coma);
+                    hp -= dropDamage;
+                    uiHp.Show(hp, totalHp);
                     isBeDropped = false;
                     isBeDropped = false;
                 }
                 }
                 ChangeMat(1);
                 ChangeMat(1);

+ 33 - 9
ActionTowerDefense/Assets/Scripts/Spirits/Trans_Cook.cs

@@ -5,30 +5,33 @@ using UnityEngine;
 public class Trans_Cook : MonoBehaviour
 public class Trans_Cook : MonoBehaviour
 {
 {
     public PlayerController controller;
     public PlayerController controller;
+    private GameObject player;
     public float changeTime;
     public float changeTime;
     public Vector3 UIoffset;                //UI调整值
     public Vector3 UIoffset;                //UI调整值
 
 
     private Demonic dem;
     private Demonic dem;
-    private Rigidbody demRB;
+    private int dir;
 
 
     [Header("J技能:撒辣椒粉")]
     [Header("J技能:撒辣椒粉")]
     public GameObject bottle;
     public GameObject bottle;
     public float intervalTime;              //攻击硬直
     public float intervalTime;              //攻击硬直
     private float pastAttackTime;
     private float pastAttackTime;
     private bool canAttack = true;
     private bool canAttack = true;
-    private Rigidbody rb;
-    public Vector3 throwForce;              //抛出辣椒粉调料瓶的力
+    public Vector3 throwForceUp;            //抛出辣椒粉调料瓶的向上的力
     public GameObject throwPos;
     public GameObject throwPos;
     private GameObject curBottle;
     private GameObject curBottle;
+    private bool isThrow = false;
+    public float speed;
+    public float maxDis;                    //调料瓶最远距离
 
 
     private void Start()
     private void Start()
     {
     {
         controller = GetComponentInParent<PlayerController>();
         controller = GetComponentInParent<PlayerController>();
+        player = controller.gameObject;
         controller.changeTime = changeTime;
         controller.changeTime = changeTime;
         controller.uiHp.transform.position += UIoffset;
         controller.uiHp.transform.position += UIoffset;
         controller.uiMp.transform.position += UIoffset;
         controller.uiMp.transform.position += UIoffset;
         dem = GetComponent<Demonic>();
         dem = GetComponent<Demonic>();
-        demRB = dem.GetComponentInParent<Rigidbody>();
     }
     }
 
 
     private void OnDisable()
     private void OnDisable()
@@ -37,12 +40,29 @@ public class Trans_Cook : MonoBehaviour
         controller.uiMp.transform.position -= UIoffset;
         controller.uiMp.transform.position -= UIoffset;
     }
     }
 
 
-    private void SprinklePaprika()  //J技能:撒辣椒粉
+    private void ThrowBottle()  //J技能:撒辣椒粉
     {
     {
         curBottle = Instantiate(bottle, throwPos.transform.position, new Quaternion(0, 0, 0, 0), null);
         curBottle = Instantiate(bottle, throwPos.transform.position, new Quaternion(0, 0, 0, 0), null);
-        rb = curBottle.GetComponent<Rigidbody>();
-        rb.velocity = throwForce;
-        rb.AddForce(Vector3.up);
+        curBottle.GetComponent<Rigidbody>().velocity = throwForceUp;
+        if (player.transform.localScale.x > 0)
+        {
+            dir = -1;
+        }
+        else
+        {
+            dir = 1;
+        }
+        isThrow = true;
+    }
+
+    private void BottleMove()
+    {
+        curBottle.transform.position += new Vector3(dir * speed * Time.deltaTime, 0, 0);
+        if (dir == 1 && curBottle.transform.position.x >= maxDis || dir == -1 && curBottle.transform.position.x <= -maxDis)
+        {
+            curBottle.SetActive(false);
+            isThrow = false;
+        }
     }
     }
 
 
     private void Update()
     private void Update()
@@ -60,7 +80,7 @@ public class Trans_Cook : MonoBehaviour
         {
         {
             canAttack = false;
             canAttack = false;
             controller.isinputJ = false;
             controller.isinputJ = false;
-            SprinklePaprika();
+            ThrowBottle();
 
 
         }
         }
         if (controller.isinputK)
         if (controller.isinputK)
@@ -71,5 +91,9 @@ public class Trans_Cook : MonoBehaviour
         {
         {
             controller.isinputL = false;
             controller.isinputL = false;
         }
         }
+        if (isThrow)
+        {
+            BottleMove();
+        }
     }
     }
 }
 }