Merge commit '67f6f473143047b0b0c9ba51791ff5747972f076' into master

chenxin

2020-11-06 a4c64bb18f6d754d3f1bc3785d83356cc0aef68c

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

@@ -103,8 +103,11 @@
        
        public virtual void Reset()
        {
            cdTimer.SetTime(0);
            cdTimer.Reset();
            if (cdTimer != null)
            {
                cdTimer.SetTime(0);
                cdTimer.Reset();
            }
            SkillAI.Reset();
        }