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

liuzhiwei

2020-11-06 f44ad64eff5c66b711e2b8d28c44c85a92cbc393

 Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs

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

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