Merge branch 'master' of http://47.95.218.140:8090/r/GemBattle into master

liuzhiwei

2020-12-22 987fd66dc6d6c28e3ed08a08141ddc3dbd772cea

 Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs

@@ -513,6 +513,13 @@
            {
                return;
            }
            if (state == State.GameOver)
            {
                CommonDebugHelper.DebugError("已经游戏结束了，为什么还在修改状态");
                return;
            }
            CommonDebugHelper.Debug($"设置了状态 state:{state} newState:{newState} ");

            State oldState = state;
            if (oldState == State.Paused || oldState == State.GameOver)
            {
@@ -548,6 +555,8 @@
        /// </summary>
        public void GameOver()
        {
            CommonDebugHelper.Debug("游戏结束了");

            SetState(State.GameOver);
        }