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

liuzhiwei

2020-12-08 ae487b742c792c43b81cce6f060b881e5609d160

 Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs

@@ -612,6 +612,8 @@

    public bool IsGameRunning { get { return !isPause; } }

    private bool isUpgradeTowerLevel;

    // Update is called once per frame
    void Update()
    {
@@ -630,6 +632,13 @@
        if (bGameStart)
        {
            startTime += Time.deltaTime;

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

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