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

liuzhiwei

2020-12-09 b01151f932f8faa041a8facfb03059147170f40c

 Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs

@@ -191,8 +191,6 @@
        /// </summary>
        /// <value></value>
        public int SelectBuffNeddLevels { get; set; }
        // cx test
        // public int SelectBuffNeddLevels { get; set; } = 2;

        /// <summary>
        /// buff是否选择完成
@@ -533,6 +531,8 @@
        private void BeginLevel()
        {
            if (EndlessGameUI.instance.state == EndlessGameUI.State.GameOver) return;
        
            EndlessBossCtrl.instance.ClearBoss();

            if (CurrentLevel == startLevel)
                WaveManager.InitPort(CurrentLevel);