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

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

@@ -65,7 +65,7 @@ namespace GFGGame
                 _ui.m_showType.selectedIndex = 0;
             }
             
-            _ui.m_showType.selectedIndex = 4;
+            _ui.m_showType.selectedIndex = 2;
 
             int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(_actLimitTsy);
             ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityId);