Merge commit '998ebc0dc00c103b365e36797c1a1ac4a6a2afa5' into master

chenxin

2020-11-19 fdfb88a9ee3652e716e603f759d3be5dcc0bd3bd

 Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs

@@ -170,13 +170,13 @@
            InitWaveData();
            RefreshBoss();

            // if (!GameConfig.IsNewbie)
            // {
            //     endless_boss bossData = EndlessBossData.GetDataById(waveData[0].Config.resource);
            if (!GameConfig.IsNewbie)
            {
                endless_boss bossData = EndlessBossData.GetDataById(waveData[0].Config.resource);

            //     if (bossData != null)
            //         EndlessBossSkillManager.instance.Init(bossData.skill);
            // }
                if (bossData != null)
                    EndlessBossSkillManager.instance.Init(bossData.skill);
            }
        }

        /// <summary>