Merge commit '8380b3c000a04bd9bf6dfc11fd8337c1563ad265' into master

chenxin

2020-10-28 56f231f1f6523d7920cf32f033f9bb6f0015550f

 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>