Browse Source

修复飞剑起手式锁定敌人问题,飞剑子弹特效加入池

WGL 4 tháng trước cách đây
mục cha
commit
244ef98c9b

+ 17 - 2
ActionTowerDefense/Assets/Resources/Prefab/FX/Disspear.prefab

@@ -9,6 +9,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6831563428749086452}
+  - component: {fileID: 8960045967826291689}
   m_Layer: 0
   m_Name: Disspear
   m_TagString: Untagged
@@ -32,6 +33,20 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &8960045967826291689
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 417478504669294145}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 63e2d62f3b573954e827beb994374f15, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  time: 0
+  disappearTime: 1
 --- !u!1 &2163191380998875762
 GameObject:
   m_ObjectHideFlags: 0
@@ -75,7 +90,7 @@ ParticleSystem:
   serializedVersion: 8
   lengthInSec: 0.5
   simulationSpeed: 1
-  stopAction: 1
+  stopAction: 0
   cullingMode: 0
   ringBufferMode: 0
   ringBufferLoopRange: {x: 0, y: 1}
@@ -9819,7 +9834,7 @@ ParticleSystem:
   serializedVersion: 8
   lengthInSec: 1
   simulationSpeed: 1
-  stopAction: 1
+  stopAction: 0
   cullingMode: 0
   ringBufferMode: 0
   ringBufferLoopRange: {x: 0, y: 1}

+ 17 - 2
ActionTowerDefense/Assets/Resources/Prefab/FX/Hitted.prefab

@@ -9,6 +9,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6831563428749086452}
+  - component: {fileID: 6949685403678849292}
   m_Layer: 0
   m_Name: Hitted
   m_TagString: Untagged
@@ -32,6 +33,20 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &6949685403678849292
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 417478504669294145}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 63e2d62f3b573954e827beb994374f15, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  time: 0
+  disappearTime: 1
 --- !u!1 &2163191380998875762
 GameObject:
   m_ObjectHideFlags: 0
@@ -75,7 +90,7 @@ ParticleSystem:
   serializedVersion: 8
   lengthInSec: 0.5
   simulationSpeed: 1
-  stopAction: 1
+  stopAction: 0
   cullingMode: 0
   ringBufferMode: 0
   ringBufferLoopRange: {x: 0, y: 1}
@@ -14690,7 +14705,7 @@ ParticleSystem:
   serializedVersion: 8
   lengthInSec: 1
   simulationSpeed: 1
-  stopAction: 1
+  stopAction: 0
   cullingMode: 0
   ringBufferMode: 0
   ringBufferLoopRange: {x: 0, y: 1}

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

@@ -1410,8 +1410,6 @@ MonoBehaviour:
     isDemSummon: 0
   addAttackEffect: {fileID: 0}
   skill: {fileID: 0}
-  attackEffect: {fileID: 0}
-  effect: {fileID: 0}
   attackDistance: 0
   attackTrigger: {fileID: 5755692021491134919}
   isAttackTriggerOn: 0
@@ -1484,9 +1482,8 @@ MonoBehaviour:
     - {fileID: 6220414675483084992}
     maxUpAngle: 180
     maxDownAngle: 180
-    shootTrack: 1
+    shootTrack: 0
     shootAlwaysTrack: 0
-    skillPrefab: {fileID: 0}
     skill: {fileID: 0}
   - id: 1
     attackName: "\u5C04\u7BAD"
@@ -1547,7 +1544,6 @@ MonoBehaviour:
     maxDownAngle: 180
     shootTrack: 1
     shootAlwaysTrack: 0
-    skillPrefab: {fileID: 0}
     skill: {fileID: 0}
   curAttackMethod:
     id: 0
@@ -1608,7 +1604,6 @@ MonoBehaviour:
     maxDownAngle: 0
     shootTrack: 0
     shootAlwaysTrack: 0
-    skillPrefab: {fileID: 0}
     skill: {fileID: 0}
 --- !u!114 &7031356745553843355
 MonoBehaviour:

+ 2 - 2
ActionTowerDefense/Assets/Scripts/Bullet.cs

@@ -232,7 +232,7 @@ public class Bullet : MonoBehaviour
         if (effect)
         {
             GetEffectPos(other);
-            Instantiate(effect, effectPos, new Quaternion(0, 0, 0, 0), bht.owner.bodyTrans);
+            PoolManager.Instantiate(effect, effectPos, new Quaternion(0, 0, 0, 0), bht.owner.bodyTrans);
         }
     }
 
@@ -240,7 +240,7 @@ public class Bullet : MonoBehaviour
     {
         if (disappearEffect)
         {
-            Instantiate(disappearEffect, transform.position, new Quaternion(0, 0, 0, 0));
+            PoolManager.Instantiate(disappearEffect, transform.position, new Quaternion(0, 0, 0, 0));
         }
     }
 

+ 27 - 0
ActionTowerDefense/Assets/Scripts/FX/FXDisappear.cs

@@ -0,0 +1,27 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class FXDisappear : MonoBehaviour
+{
+    [DisplayOnly] public float time;
+    public float disappearTime;
+    private void OnEnable()
+    {
+        Init();
+    }
+
+    public void Init()
+    {
+        time = 0;
+    }
+
+    private void Update()
+    {
+        time += Time.deltaTime;
+        if(time >= disappearTime)
+        {
+            gameObject.SetActive(false);
+        }
+    }
+}

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

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