From 2669e465a82faa0440165f7c38ca69f11135587a Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Wed, 28 Oct 2020 20:27:36 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/TowerDefense/Level/EndlessWaveLineManager.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/Level/EndlessWaveLineManager.cs b/Assets/Scripts/TowerDefense/Level/EndlessWaveLineManager.cs
index 037e498..b3cc483 100644
--- a/Assets/Scripts/TowerDefense/Level/EndlessWaveLineManager.cs
+++ b/Assets/Scripts/TowerDefense/Level/EndlessWaveLineManager.cs
@@ -60,7 +60,7 @@
ps = obj.transform.GetChild(0).GetComponent<ParticleSystem>();
ps.transform.position = EndlessLevelManager.instance.WaveManager.GetWaveEndPos(id);
ps.Play();
- Destroy(ps.gameObject, ps.main.duration);
+ Destroy(obj, ps.main.duration);
}
/// <summary>
@@ -78,7 +78,7 @@
ps = obj.transform.GetChild(0).GetComponent<ParticleSystem>();
ps.transform.position = pos;
ps.Play();
- Destroy(ps.gameObject, ps.main.duration);
+ Destroy(obj, ps.main.duration);
}
/// <summary>
--
Gitblit v1.9.1