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

liuzhiwei

2020-11-17 df50daf0ca2cd0c442b10f83fdf0d25758fd9d2d

 Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs

@@ -83,7 +83,7 @@
            countDownTextNew.text = "";
            countDownTextNew.gameObject.SetActive(false);

            Instantiate(Resources.Load<GameObject>("UI/Guide/GuidePanel"), transform);
            Instantiate(Resources.Load<GameObject>("UI/Guide/GuidePanel"), transform.Find("Panel"));
            AddGuideEvent();
        }