Merge remote-tracking branch 'remotes/origin/master' into douYou

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxWishView.cs

@@ -64,6 +64,8 @@ namespace GFGGame
             {
                 _ui.m_showType.selectedIndex = 0;
             }
+            
+            _ui.m_showType.selectedIndex = 0;
 
             int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(_actLimitTsy);
             ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityId);

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -1633,11 +1633,11 @@ namespace GFGGame
                 return;
             }
             
-            if (LauncherConfig.platformId == 1 && LauncherConfig.ChannelId == (int)ChannelID.DouYou)
-            {
-                ViewManager.Show<QieHuanView>();
-                return; 
-            }
+            // if (LauncherConfig.platformId == 1 && LauncherConfig.ChannelId == (int)ChannelID.DouYou)
+            // {
+            //     ViewManager.Show<QieHuanView>();
+            //     return; 
+            // }
 #endif
             
             if (!GameGlobal.AfterDataInited) return;