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

liuzhiwei

2020-12-08 ed4fb637a9a0477750d284bf0a42569ed0c0c26a

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

@@ -82,7 +82,10 @@

    public void UpdateDescDisplay()
    {
        int minLevel = Mathf.Min(EndlessGameUI.instance.MinLevel, 1);
        int minLevel = 0;

        if (EndlessUIStart.instance.GameStartTime >= JsonDataCenter.DOUBLE_GEM_TIME)
            minLevel = Mathf.Min(EndlessGameUI.instance.MinLevel, 1);

        NormalDesc.text = $"购买{minLevel + 1}级宝石";
    }