Merge commit 'f2f4e1e45981bb294a5221ade7b4646cc3e29d35' into master

chenxin

2020-11-11 515d6439e79793dc903b249cfeb8fc2f217f2e4e

 Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs

@@ -80,7 +80,7 @@

            GameObject go = Instantiate(Resources.Load<GameObject>("UI/Final/FinalPanel"), GameObject.Find("MainUI").transform);
            FinalPanel panelUI = go.GetComponent<FinalPanel>();
            panelUI.SetData("成绩 5关 2波", 777777);
            panelUI.SetData($"成绩 {EndlessLevelManager.instance.CurrentLevel}关 {EndlessLevelManager.instance.WaveManager.CurrentWaveIndex}波", EndlessScoreData.CurrentSocre);

            GameObject.Find("BottomUI").GetComponent<Canvas>().enabled = false;
            return;