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

chenxin

2020-12-12 9e0ad4beb3ec784d54e42b013af20b0f1924ae81

 Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs

@@ -172,6 +172,8 @@

        if (GameConfig.IsNewbie)
        {
            EndlessRandomTower.instance.SetCountDown(false);

            Debug.Log("开始新手引导");
            GameConfig.CanDragTower = false;
            Pause();
@@ -559,6 +561,7 @@
        }
        else
        {
            //Debug.Log("能量不够");
            if (fireSkillBgImg.color != normalColor)
            {
                fireSkillBgImg.color = normalColor;
@@ -639,7 +642,6 @@

            if (!isUpgradeTowerLevel && startTime >= JsonDataCenter.DOUBLE_GEM_TIME)
            {
                EndlessGameUI.instance.UpgradeAllTowerMinLevel(1);
                EndlessRandomTower.instance.UpdateDescDisplay();
                isUpgradeTowerLevel = true;
            }