Browse Source

变身法师后按L键使所有漂浮敌方单位快速下落

SZAND\msx_2 1 year ago
parent
commit
50a6f89c08
23 changed files with 41 additions and 35 deletions
  1. 1 1
      ActionTowerDefense/Assets/Resources/Prefab/Demonic_Arrow.prefab
  2. 1 1
      ActionTowerDefense/Assets/Resources/Prefab/Demonic_Giant.prefab
  3. 1 1
      ActionTowerDefense/Assets/Resources/Prefab/Demonic_Sword.prefab
  4. 1 1
      ActionTowerDefense/Assets/Resources/Prefab/ESpirits_Assassin.prefab
  5. 1 1
      ActionTowerDefense/Assets/Resources/Prefab/ESpirits_Cook.prefab
  6. 1 1
      ActionTowerDefense/Assets/Resources/Prefab/ESpirits_Float.prefab
  7. 1 1
      ActionTowerDefense/Assets/Resources/Prefab/ESpirits_Invisible.prefab
  8. 1 1
      ActionTowerDefense/Assets/Resources/Prefab/Enemy_Arrow.prefab
  9. 1 1
      ActionTowerDefense/Assets/Resources/Prefab/Enemy_Giant.prefab
  10. 1 1
      ActionTowerDefense/Assets/Resources/Prefab/Enemy_Sword.prefab
  11. 1 1
      ActionTowerDefense/Assets/Resources/Prefab/MySpirit/Spirits_Assassin.prefab
  12. 1 1
      ActionTowerDefense/Assets/Resources/Prefab/MySpirit/Spirits_Cook.prefab
  13. 1 1
      ActionTowerDefense/Assets/Resources/Prefab/MySpirit/Spirits_Float.prefab
  14. 1 1
      ActionTowerDefense/Assets/Resources/Prefab/MySpirit/Spirits_Invisible.prefab
  15. 1 1
      ActionTowerDefense/Assets/Resources/Prefab/Player.prefab
  16. 1 1
      ActionTowerDefense/Assets/Resources/Prefab/Transfiguration/Trans_Assassin.prefab
  17. 1 1
      ActionTowerDefense/Assets/Resources/Prefab/Transfiguration/Trans_Cook.prefab
  18. 1 1
      ActionTowerDefense/Assets/Resources/Prefab/Transfiguration/Trans_Float.prefab
  19. 1 1
      ActionTowerDefense/Assets/Resources/Prefab/Transfiguration/Trans_Invisible.prefab
  20. 1 0
      ActionTowerDefense/Assets/Scripts/MoveCharacter.cs
  21. 2 7
      ActionTowerDefense/Assets/Scripts/Spirits/FloatData.cs
  22. 11 8
      ActionTowerDefense/Assets/Scripts/Spirits/FloatEffect.cs
  23. 8 1
      ActionTowerDefense/Assets/Scripts/Spirits/Trans_Float.cs

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

@@ -1054,7 +1054,7 @@ MonoBehaviour:
   floatTime: 20
   isFloat: 0
   normalFallSpeed: 10
-  rapidFallSpeed: 20
+  rapidFallSpeed: 30
   floatState: 0
   spinee: {fileID: 0}
   mesh: {fileID: 0}

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

@@ -506,7 +506,7 @@ MonoBehaviour:
   floatTime: 20
   isFloat: 0
   normalFallSpeed: 10
-  rapidFallSpeed: 20
+  rapidFallSpeed: 30
   floatState: 0
   spinee: {fileID: 0}
   mesh: {fileID: 0}

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

@@ -248,7 +248,7 @@ MonoBehaviour:
   floatTime: 20
   isFloat: 0
   normalFallSpeed: 10
-  rapidFallSpeed: 20
+  rapidFallSpeed: 30
   floatState: 0
   spinee: {fileID: 0}
   mesh: {fileID: 0}

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

@@ -296,7 +296,7 @@ MonoBehaviour:
   floatTime: 20
   isFloat: 0
   normalFallSpeed: 10
-  rapidFallSpeed: 20
+  rapidFallSpeed: 30
   floatState: 0
   spinee: {fileID: 0}
   mesh: {fileID: 0}

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

@@ -890,7 +890,7 @@ MonoBehaviour:
   floatTime: 20
   isFloat: 0
   normalFallSpeed: 10
-  rapidFallSpeed: 20
+  rapidFallSpeed: 30
   floatState: 0
   spinee: {fileID: 0}
   mesh: {fileID: 0}

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

@@ -1093,7 +1093,7 @@ MonoBehaviour:
   floatTime: 20
   isFloat: 0
   normalFallSpeed: 10
-  rapidFallSpeed: 20
+  rapidFallSpeed: 30
   floatState: 0
   spinee: {fileID: 0}
   mesh: {fileID: 0}

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

@@ -300,7 +300,7 @@ MonoBehaviour:
   floatTime: 20
   isFloat: 0
   normalFallSpeed: 10
-  rapidFallSpeed: 20
+  rapidFallSpeed: 30
   floatState: 0
   spinee: {fileID: 0}
   mesh: {fileID: 0}

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

@@ -1054,7 +1054,7 @@ MonoBehaviour:
   floatTime: 20
   isFloat: 0
   normalFallSpeed: 10
-  rapidFallSpeed: 20
+  rapidFallSpeed: 30
   floatState: 0
   spinee: {fileID: 0}
   mesh: {fileID: 0}

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

@@ -506,7 +506,7 @@ MonoBehaviour:
   floatTime: 20
   isFloat: 0
   normalFallSpeed: 10
-  rapidFallSpeed: 20
+  rapidFallSpeed: 30
   floatState: 0
   spinee: {fileID: 0}
   mesh: {fileID: 0}

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

@@ -301,7 +301,7 @@ MonoBehaviour:
   floatTime: 20
   isFloat: 0
   normalFallSpeed: 10
-  rapidFallSpeed: 20
+  rapidFallSpeed: 30
   floatState: 0
   spinee: {fileID: 0}
   mesh: {fileID: 0}

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

@@ -284,7 +284,7 @@ MonoBehaviour:
   floatTime: 20
   isFloat: 0
   normalFallSpeed: 10
-  rapidFallSpeed: 20
+  rapidFallSpeed: 30
   floatState: 0
   spinee: {fileID: 0}
   mesh: {fileID: 0}

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

@@ -856,7 +856,7 @@ MonoBehaviour:
   floatTime: 0
   isFloat: 0
   normalFallSpeed: 10
-  rapidFallSpeed: 20
+  rapidFallSpeed: 30
   floatState: 0
   spinee: {fileID: 0}
   mesh: {fileID: 0}

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

@@ -1071,7 +1071,7 @@ MonoBehaviour:
   floatTime: 5
   isFloat: 0
   normalFallSpeed: 10
-  rapidFallSpeed: 20
+  rapidFallSpeed: 30
   floatState: 0
   spinee: {fileID: 0}
   mesh: {fileID: 0}

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

@@ -279,7 +279,7 @@ MonoBehaviour:
   floatTime: 20
   isFloat: 0
   normalFallSpeed: 10
-  rapidFallSpeed: 20
+  rapidFallSpeed: 30
   floatState: 0
   spinee: {fileID: 0}
   mesh: {fileID: 0}

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

@@ -851,7 +851,7 @@ MonoBehaviour:
   floatTime: 5
   isFloat: 0
   normalFallSpeed: 10
-  rapidFallSpeed: 20
+  rapidFallSpeed: 30
   floatState: 0
   spinee: {fileID: 0}
   mesh: {fileID: 0}

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

@@ -283,7 +283,7 @@ MonoBehaviour:
   floatTime: 20
   isFloat: 0
   normalFallSpeed: 10
-  rapidFallSpeed: 20
+  rapidFallSpeed: 30
   floatState: 0
   spinee: {fileID: 0}
   mesh: {fileID: 0}

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

@@ -855,7 +855,7 @@ MonoBehaviour:
   floatTime: 0
   isFloat: 0
   normalFallSpeed: 10
-  rapidFallSpeed: 20
+  rapidFallSpeed: 30
   floatState: 0
   spinee: {fileID: 0}
   mesh: {fileID: 0}

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

@@ -1091,7 +1091,7 @@ MonoBehaviour:
   floatTime: 5
   isFloat: 0
   normalFallSpeed: 10
-  rapidFallSpeed: 20
+  rapidFallSpeed: 30
   floatState: 0
   spinee: {fileID: 0}
   mesh: {fileID: 0}

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

@@ -311,7 +311,7 @@ MonoBehaviour:
   floatTime: 20
   isFloat: 0
   normalFallSpeed: 10
-  rapidFallSpeed: 20
+  rapidFallSpeed: 30
   floatState: 0
   spinee: {fileID: 0}
   mesh: {fileID: 0}

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

@@ -151,6 +151,7 @@ public class MoveCharacter : Character
 
     public void FloatDrop()
     {
+        transform.localEulerAngles = new Vector3(0, 0, 0);
         ChangeState(CharacterState.Fall);
         floatState = 3;
         curFallSpeed = rapidFallSpeed;

+ 2 - 7
ActionTowerDefense/Assets/Scripts/Spirits/FloatData.cs

@@ -4,13 +4,8 @@ using UnityEngine;
 
 public class FloatData : MonoBehaviour
 {
-    static public List<Demonic> demIsFloating;
-    static public List<Enemy> eneIsFloating;
-
-    private void Start()
-    {
-        Clear(2);
-    }
+    static public List<Demonic> demIsFloating = new List<Demonic>();
+    static public List<Enemy> eneIsFloating = new List<Enemy>();
 
     static public void Clear(int id)
     {

+ 11 - 8
ActionTowerDefense/Assets/Scripts/Spirits/FloatEffect.cs

@@ -24,20 +24,23 @@ public class FloatEffect : MonoBehaviour
     {
         if (!isEnemy && other.gameObject.layer == 8)
         {
-            GameObject ga = other.transform.parent.parent.parent.gameObject;
-            ga.GetComponent<Enemy>().FloatStateOn();
+            Enemy ene = other.GetComponentInParent<Enemy>();
+            ene.FloatStateOn();
+            FloatData.eneIsFloating.Add(ene);
+
         }
         else if(isEnemy && other.gameObject.layer == 7)
         {
-            GameObject ga = other.transform.parent.parent.parent.gameObject;
-            ga.GetComponent<Demonic>().FloatStateOn();
+            Demonic dem = other.GetComponentInParent<Demonic>();
+            dem.FloatStateOn();
+            FloatData.demIsFloating.Add(dem);
         }
         else if(isEnemy && other.gameObject.layer == 6)
         {
-            GameObject ga = other.transform.parent.parent.parent.gameObject;
-            ga.GetComponent<PlayerController>().lostMp = 0;
-            ga.GetComponent<PlayerController>().soulCollector.enabled = false;
-            ga.GetComponent<PlayerController>().FloatStateOn();
+            PlayerController pc = other.GetComponentInParent<PlayerController>();
+            pc.lostMp = 0;
+            pc.soulCollector.enabled = false;
+            pc.FloatStateOn();
         }
     }
 

+ 8 - 1
ActionTowerDefense/Assets/Scripts/Spirits/Trans_Float.cs

@@ -93,7 +93,14 @@ public class Trans_Float : MonoBehaviour
         if (controller.isinputL)
         {
             controller.isinputL = false;
-            print(3);
+            foreach(MoveCharacter f in FloatData.eneIsFloating)
+            {
+                if (f.isFloat)
+                {
+                    f.FloatDrop();
+                    FloatData.Clear(1);
+                }
+            }
         }
     }
 }