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

wangguan

2020-12-12 938aa4da26e0109e16ded70d13a43c187498b901

 Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs

@@ -649,11 +649,11 @@
        {
            startTime += Time.deltaTime;

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

            timeTextNew.text = ConvertTime((float)Math.Ceiling(startTime));
        }