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

liuzhiwei

2020-12-26 56d95fa59a9f6dc12d0fc0723ea449e5b317f994

 Assets/Scripts/TowerDefense/Towers/TowerLevel.cs

@@ -157,7 +157,7 @@
        /// <param name="level">从1开始</param>
        public void SetShowLevel(int level)
        {
            LevelText.text = level < 5 ? "" : level.ToString();
            LevelText.text = level < 4 ? "" : level.ToString();
            levelBorder.sprite = level < 5 ? sprites[level - 1] : sprites[4];
            // elf_upgrade info = ElfUpgradeData.GetDataById(level);
            // LevelText.text = $"{level}";