Merge commit 'fafc11ad74601a1c4e4b2e28165af25bd19bb5a9' into master

chenxin

2020-11-20 09053388ef6d58a7de59fab450c11ee0affbceb2

 Assets/Scripts/TowerDefense/UI/EndlessBossSkill/EndlessBossSkillManager.cs

@@ -206,13 +206,15 @@
        {
            if (isPaused) return;

            cdList.Clear();
            waitList.Clear();

            for (int i = 0; i < skillList.Count; ++i)
            {
                skillList[i].Reset();
                waitList.Add(skillList[i]);
            }

            cdList.Clear();
            waitList.Clear();
            isPaused = true;
            ChangeState(EndlessBossSkillState.Init);
            ClearEvent();