From 56f231f1f6523d7920cf32f033f9bb6f0015550f Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Wed, 28 Oct 2020 18:05:11 +0800
Subject: [PATCH] Merge commit '8380b3c000a04bd9bf6dfc11fd8337c1563ad265' 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