From 69e0fea6c92fd4e153d45e5f26ef89baecf0405a Mon Sep 17 00:00:00 2001
From: weixudong <weixudong4700@ktgame.com>
Date: Thu, 19 Nov 2020 08:51:09 +0800
Subject: [PATCH] Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle into master
---
Assets/Scripts/TowerDefense/Level/EndlessWaveLineManager.cs | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/Level/EndlessWaveLineManager.cs b/Assets/Scripts/TowerDefense/Level/EndlessWaveLineManager.cs
index 037e498..05623dd 100644
--- a/Assets/Scripts/TowerDefense/Level/EndlessWaveLineManager.cs
+++ b/Assets/Scripts/TowerDefense/Level/EndlessWaveLineManager.cs
@@ -60,7 +60,9 @@
ps = obj.transform.GetChild(0).GetComponent<ParticleSystem>();
ps.transform.position = EndlessLevelManager.instance.WaveManager.GetWaveEndPos(id);
ps.Play();
- Destroy(ps.gameObject, ps.main.duration);
+ AudioSourceManager.Ins.Play(AudioEnum.FireSkill);
+
+ Destroy(obj, 5f);
}
/// <summary>
@@ -78,7 +80,9 @@
ps = obj.transform.GetChild(0).GetComponent<ParticleSystem>();
ps.transform.position = pos;
ps.Play();
- Destroy(ps.gameObject, ps.main.duration);
+ AudioSourceManager.Ins.Play(AudioEnum.LightningSkill);
+
+ Destroy(obj, 5f);
}
/// <summary>
@@ -120,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