From 9abbdf408daf5bc140ffd039125f6ac54f2774b9 Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Fri, 06 Nov 2020 10:13:55 +0800
Subject: [PATCH] Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle

---
 Assets/Scripts/TowerDefense/Level/EndlessWaveLineManager.cs |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Assets/Scripts/TowerDefense/Level/EndlessWaveLineManager.cs b/Assets/Scripts/TowerDefense/Level/EndlessWaveLineManager.cs
index 988f0cf..05623dd 100644
--- a/Assets/Scripts/TowerDefense/Level/EndlessWaveLineManager.cs
+++ b/Assets/Scripts/TowerDefense/Level/EndlessWaveLineManager.cs
@@ -62,7 +62,7 @@
         ps.Play();
         AudioSourceManager.Ins.Play(AudioEnum.FireSkill);
 
-        Destroy(obj, ps.main.duration);
+        Destroy(obj, 5f);
     }
 
     /// <summary>
@@ -82,7 +82,7 @@
         ps.Play();
         AudioSourceManager.Ins.Play(AudioEnum.LightningSkill);
 
-        Destroy(obj, ps.main.duration);
+        Destroy(obj, 5f);
     }
 
     /// <summary>
@@ -124,9 +124,9 @@
     /// 某一个位置攻击塔位放下。
     /// </summary>
     /// <param name="pos"></param>
-    public void AttackTowerFixed(int pos)
+    public void AttackTowerFixed(int pos, bool playEffect = true)
     {
-        if (pos >= waveLineList.Count || waveLineList[pos] == null) return;
+        if (pos >= waveLineList.Count || waveLineList[pos] == null || !playEffect) return;
 
         // 无尽模式改为只有一条兵线
         WaveLineFlash(pos);

--
Gitblit v1.9.1