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

liuzhiwei

2020-12-08 48da25609d13d5d727859eaf941217b224381e5c

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

@@ -790,6 +790,7 @@
                    PlayUpgradeEffect(m_listTower[i]);
                }
            }
            UpdateMinLevelArr();
        }

        /// <summary>
@@ -1236,6 +1237,8 @@
            else if (EndlessLevelManager.instanceExists && IsSubstitute(pointerInfo))
            {
                CheckCanChangePos(pointerInfo);
                if (EndlessUIStart.instance.GameStartTime >= JsonDataCenter.DOUBLE_GEM_TIME)
                    UpgradeAllTowerMinLevel(1);
            }
            // 当前是Skill塔位的状态.
            else if (bSkill)