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

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

@@ -365,7 +365,7 @@ namespace GFGGame
         //限定盲盒按钮显示
         private void RefreshBtnXdmhActivity()
         {
-            _ui.m_btnActivityXDMH.target.visible =true;
+            _ui.m_btnActivityXDMH.target.visible = ActivityGlobalDataManager.Instance.IsActivityOpen(10301);
         }
 
         private void RefreshBtnActivityFYJY()