Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle

wangguan

2020-10-30 7f8b708e88b255f55e5cb1cebd2f45eb998bfaae

 Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs

@@ -53,9 +53,6 @@
        /// </summary>
        public void ReturnToMainMenu()
        {
            if (GameConfig.IsNewbieGuideCompleted)
                GameConfig.IsNewbie = false;

            // 清空所有Tween数据:
            DOTween.Clear();
            EndlessUIStart.bFirstLoaded = false;
@@ -89,6 +86,24 @@
        {
            EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessLevelCompleted);
            EndlessUIStart.instance.Pause();

            int showFavorite = PlayerPrefs.GetInt("GemBattleFavorite");

            if (showFavorite == 0)
            {
                GameObject go = Instantiate(Resources.Load<GameObject>("UI/Favorite/FavoritePanel"), this.transform.root);
                FavoritePanelUI panelUI = go.GetComponent<FavoritePanelUI>();
                panelUI.SetAC(ShowPanel);

            }
            else
            {
                ShowPanel();
            }
        }

        private void ShowPanel()
        {
            OpenEndGameScreen(true);
            if (VictoryAudio != null && AudioSource != null)
                AudioSource.PlayOneShot(VictoryAudio);