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

liuzhiwei

2020-11-12 18f96c9313bf24d2296e615f44fc0ca005f2e872

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

@@ -309,6 +309,7 @@

        // 还没到技能时间，忽略掉技能宝石
        Tower newTower = GetRandomTower(EndlessUIStart.instance.GameStartTime <= SKILL_TOWER_TIME);
        //Tower newTower = GetRandomTower(false);

        if (!newTower)
            throw new Exception("未能成功产生Tower");