Merge commit '2940e451058b1af7541ff651f485f33a10e92f7e' into master

chenxin

2020-11-07 d35d31d85fd4b827dc37008aef39c019b6a7781d

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

@@ -71,6 +71,17 @@
        {
            if (isPaused || EndlessGameUI.instance.state == EndlessGameUI.State.GameOver) return;

            for (int i = 0; i < skillList.Count; ++i)
            {
                skillList[i].Update(Time.deltaTime);
            }

            for (int i = 0; i < waitList.Count; ++i)
            {
                if (waitList[i].IsCDCompleted)
                    AddSkill(waitList[i]);
            }

            switch (skillState)
            {
                case EndlessBossSkillState.Init:
@@ -114,14 +125,6 @@

        private void HandleWait(float deltaTime)
        {
            for (int i = 0; i < skillList.Count; ++i)
            {
                skillList[i].Update(Time.deltaTime);

                if (skillList[i].IsCDCompleted)
                    AddSkill(skillList[i]);
            }

            for (int i = 0; i < cdList.Count; ++i)
            {
                if (cdList[i].IsConditionOK)
@@ -136,6 +139,9 @@
            }
        }

        /// <summary>
        /// 飘字闪烁完成
        /// </summary>
        private void OnGlintTitleCompleted()
        {
            EventCenter.Ins.Remove((int)KTGMGemClient.EventType.EndlessBossSkillGlintTitleCompleted, OnGlintTitleCompleted);
@@ -166,6 +172,7 @@
                {
                    skillList.Add(skill);
                    skill.Init();
                    waitList.Add(skill);
                }
            }

@@ -198,7 +205,7 @@
        public void Reset()
        {
            if (isPaused) return;
            

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