WGL преди 4 месеца
родител
ревизия
87e28388a7

+ 21 - 0
ActionTowerDefense/Assets/Resources/Prefab/FX/Water_Ring_nor.prefab

@@ -14590,6 +14590,7 @@ GameObject:
   - component: {fileID: 6136447150923814638}
   - component: {fileID: 6136447150923814636}
   - component: {fileID: 6136447150923814639}
+  - component: {fileID: 7506517102777542803}
   m_Layer: 0
   m_Name: Water_Ring_nor
   m_TagString: Untagged
@@ -19462,6 +19463,26 @@ ParticleSystemRenderer:
   m_MeshWeighting2: 1
   m_MeshWeighting3: 1
   m_MaskInteraction: 0
+--- !u!114 &7506517102777542803
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6136447150923814641}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d9805ed1e1eb4034ba09501123850708, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  owner: {fileID: 0}
+  time: 0
+  disappearTime: 1
+  particleSystems:
+  - {fileID: 6136447150923814636}
+  - {fileID: 6136447150270685910}
+  - {fileID: 4674475015001898261}
+  isEnd: 0
 --- !u!1 &8430725504245724408
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -808,6 +808,7 @@ GameObject:
   - component: {fileID: 5507929826741927014}
   - component: {fileID: 3896813473903261645}
   - component: {fileID: 6710692963350512933}
+  - component: {fileID: 1048751460627304294}
   m_Layer: 6
   m_Name: Player
   m_TagString: Player
@@ -900,7 +901,10 @@ MonoBehaviour:
   extraFallGravity: -14.4
   extraGroundGravity: -28.8
   velocityAddition: 0
-  platformY: 0
+  platformPosY: 0
+  platformRotZ: 0
+  RotLerpSpeed: 0.6
+  RotLerpTime: 0
   matState: 1
   spinee: {fileID: 0}
   mesh: {fileID: 0}
@@ -941,6 +945,7 @@ MonoBehaviour:
   soulCollector: {fileID: 3739918129319493242}
   skeletonMecanim: {fileID: 6843453365888964567}
   wallTrigger: {fileID: 6725358484711746229}
+  playerFX: {fileID: 1048751460627304294}
   mp: 0
   totalMp: 450
   totalMp_2Players: 450
@@ -1346,6 +1351,21 @@ MonoBehaviour:
     photosphereHp: 1000
     havePhoton: 0
     photosphere: {fileID: 0}
+--- !u!114 &1048751460627304294
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3571941038519084344}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e6df14c58265aa94a8cccacf308b8fed, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  water_Ring_obj: {fileID: 6136447150923814641, guid: 2c60e6246e37b3e4685e1ed9bd2cbb35, type: 3}
+  Fx: {fileID: 0}
+  owner: {fileID: 3571941038519084336}
 --- !u!1 &3571941039716665622
 GameObject:
   m_ObjectHideFlags: 0

+ 3 - 1
ActionTowerDefense/Assets/Scripts/Characters/Foot.cs

@@ -116,7 +116,9 @@ public class Foot : MonoBehaviour
 
     private void OnTriggerEnter(Collider other)
     {
-        if (other.CompareTag("Ground")|| other.CompareTag("Platform"))
+        bool flag1 = other.CompareTag("Ground");
+        bool flag2 = other.CompareTag("Platform");
+        if (flag1|| flag2)
         {
             if (!trigGroundList.Exists(t => t == other.gameObject))
             {

+ 0 - 1
ActionTowerDefense/Assets/Scripts/Characters/PlayerController.cs

@@ -25,7 +25,6 @@ public class PlayerController : MoveCharacter
     [FoldoutGroup("×é¼þ")] public Collider soulCollector;
     [FoldoutGroup("×é¼þ")] public SkeletonMecanim skeletonMecanim;
     [FoldoutGroup("×é¼þ")] public WallTrigger wallTrigger;
-    [FoldoutGroup("×é¼þ")] public PlayerFX playerFX;
     private Spirits spirits;
     private SpiritSystem spiritSystem;
     private ScreenShake ss;

+ 0 - 24
ActionTowerDefense/Assets/Scripts/Characters/PlayerFX.cs

@@ -1,24 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class PlayerFX : MonoBehaviour
-{
-    public GameObject Water_Ring;
-
-    [DisplayOnly] public GameObject Fx;
-    public PlayerController owner;
-    
-    void Start()
-    {
-        
-    }
-
-    public void newOne()
-    {
-        Fx = Instantiate(Water_Ring);
-        Fx.SetActive(false);
-        Fx.transform.position = transform.position;
-    }
-
-}

+ 8 - 0
ActionTowerDefense/Assets/Scripts/FX.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1409c8c87fe772a419d9d31936b54e29
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 44 - 0
ActionTowerDefense/Assets/Scripts/FX/PlayerFX.cs

@@ -0,0 +1,44 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class PlayerFX : MonoBehaviour
+{
+    public GameObject water_Ring_obj;
+
+    [DisplayOnly] public GameObject Fx;
+    public PlayerController owner;
+    
+    void Start()
+    {
+        
+    }
+
+    private void Update()
+    {
+        if(Fx == null)
+        {
+            if (owner.foot.TrigGround && owner.foot.haveGravity)
+            {
+                foreach(var item in owner.foot.trigGroundList)
+                {
+                    if (item.CompareTag("Ground"))
+                    {
+                        newOne();
+                        return;
+                    }
+                }
+                
+            }
+        }
+    }
+    public void newOne()
+    {
+        Fx = Instantiate(water_Ring_obj);
+        //Fx.SetActive(false);
+        Fx.transform.position = new Vector3(owner.transform.position.x, 0, transform.position.z);
+        Water_Ring water_Ring = Fx.GetComponent<Water_Ring>();
+        water_Ring.owner = owner;
+    }
+
+}

+ 0 - 0
ActionTowerDefense/Assets/Scripts/Characters/PlayerFX.cs.meta → ActionTowerDefense/Assets/Scripts/FX/PlayerFX.cs.meta


+ 44 - 0
ActionTowerDefense/Assets/Scripts/FX/Water_Ring.cs

@@ -0,0 +1,44 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Water_Ring : MonoBehaviour
+{
+    public PlayerController owner;
+    [DisplayOnly] public float time;
+    public float disappearTime;
+    public ParticleSystem[] particleSystems;
+
+    [DisplayOnly] public bool isEnd;
+
+    public void Update()
+    {
+
+        if (isEnd)
+        {
+            time += Time.deltaTime;
+            if (time >= disappearTime)
+            {
+                
+                gameObject.SetActive(false);
+            }
+        }
+        else
+        {
+            if (owner.foot.TrigGround && owner.foot.haveGravity)
+            {
+                transform.position = new Vector3(owner.transform.position.x, 0, transform.position.z);
+            }
+            else
+            {
+                for (int i = 0; i < 3; i++)
+                {
+                    particleSystems[i].Stop(false, ParticleSystemStopBehavior.StopEmitting);
+                }
+                owner.GetComponent<PlayerFX>().Fx = null;
+                isEnd = true;
+            }
+
+        }
+    }
+}

+ 11 - 0
ActionTowerDefense/Assets/Scripts/FX/Water_Ring.cs.meta

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