From df178fec76b6f6fed0326ff9f07bef2206dd75f9 Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Fri, 04 Dec 2020 18:11:17 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

---
 Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs b/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs
index b8c143b..0048b14 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs
@@ -116,19 +116,21 @@
             EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessLevelCompleted);
             EndlessUIStart.instance.Pause();
 
-            int showFavorite = PlayerPrefs.GetInt("GemBattleFavorite");
+            ShowPanel();
 
-            if (showFavorite == 0)
-            {
-                GameObject go = Instantiate(Resources.Load<GameObject>("UI/Favorite/FavoritePanel"), this.transform.parent.parent);
-                FavoritePanelUI panelUI = go.GetComponent<FavoritePanelUI>();
-                panelUI.SetAC(ShowPanel);
+            // int showFavorite = PlayerPrefs.GetInt("GemBattleFavorite");
 
-            }
-            else
-            {
-                ShowPanel();
-            }
+            // if (showFavorite == 0)
+            // {
+            //     GameObject go = Instantiate(Resources.Load<GameObject>("UI/Favorite/FavoritePanel"), this.transform.parent.parent);
+            //     FavoritePanelUI panelUI = go.GetComponent<FavoritePanelUI>();
+            //     panelUI.SetAC(ShowPanel);
+
+            // }
+            // else
+            // {
+            //     ShowPanel();
+            // }
         }
 
         private void ShowPanel()

--
Gitblit v1.9.1