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

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

@@ -326,7 +326,7 @@ namespace GFGGame
         private void RefreshBtnActivityFYJY()
         {
             _ui.m_btnActivityFYJY.target.visible 
-                = (ActivityDataManager.Instance.GetCurOpenActiveByType(ActivityType.AfternoonLeisure) > 0);
+                = (ActivityGlobalDataManager.Instance.IsActivityOpen(5016));
         }
 
         private void AddEffect()