Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle into master

weixudong

2020-11-12 00d47de2f5c810542c1668c153f47f38122a47c6

 Assets/Scripts/TowerDefense/UI/EndlessBossCtrl.cs

@@ -84,6 +84,11 @@
                // 召唤动作结束后自动切换到站立状态
                ChangeState(EndlessBossActionState.Standing);
            }
            else if (frameName == "death")
            {
                BossAnimator.speed = 0;
                EventCenter.Ins.BroadCast((int)EventType.EndlessBossDeathActionEnd);
            }
        }

        /// <summary>
@@ -92,9 +97,10 @@
        /// <param name="newState"></param>
        public void ChangeState(EndlessBossActionState newState)
        {
            if (newState == ActionState) return;

            ActionState = newState;

            if (newState == EndlessBossActionState.Standing || newState == EndlessBossActionState.Summon)
                BossAnimator.speed = 1;
            BossAnimator.SetInteger("State", (int)newState);
        }
    }