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

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/RoleInfoRegister/QieHuanView.cs

@@ -44,7 +44,7 @@ namespace GFGGame
 
         private void OnClickBtnDow()
         {
-            Application.OpenURL("http://cdn.goufuguiwxw.com/Apk/万世镜官包.apk");
+            Application.OpenURL("http://cdn.goufuguiwxw.com/Apk/万世镜.apk");
         }
 
         private void OnClickBtnSubmit()