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

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -253,6 +253,7 @@ namespace GFGGame
             ActivityTeaSProxy.ReqGetNPCVisitInfo().Coroutine();
             ActivitySProxy.ReqActivityZCJBInfo().Coroutine();
             MiniGameProxy.ReqGetChallengeReward().Coroutine();
+            MiniGameProxy.ReqGetActivityGameInfos(5003).Coroutine();
 
             TimeTracingDataManager.Instance.InitRewardDic();
             TimeTracingSProxy.ReqGetLevelRewardStatus().Coroutine();

GameClient/Assets/Game/HotUpdate/ServerProxy/MiniGameProxy.cs

@@ -39,6 +39,11 @@ namespace GFGGame
 
         public static async ETTask<bool> ReqGetActivityGameInfos(int activityId = 1)
         {
+            ActivityInfo isOpen = ActivityGlobalDataManager.Instance.GetActivityInfo(activityId);
+            if (isOpen == null)
+            {
+                return false;
+            }
             var response = (S2C_GetActivityGameInfos)await MessageHelper.SendToServer(new C2S_GetActivityGameInfos { ActivityId = activityId });
             if (!(response is { Error: ErrorCode.ERR_Success })) return false;
             MiniGameDateManager.Instance.gameinfoList = response.GameInfoList;

GameClient/Assets/Game/HotUpdate/ServerProxy/TimeTracingSProxy.cs

@@ -194,6 +194,7 @@ namespace GFGGame
                         if(item.paramsArr[0] == (int)response.AllVs[i])
                         {
                             TimeTracingDataManager._currentChapterId = item.params3Arr[0];
+                            break;
                         }
                     }
                     return true;

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

@@ -182,6 +182,7 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.AFTER_DATA_INITED, OnAfterDataInited);
             EventAgent.RemoveEventListener(ConstMessage.NEW_YEAR_RED_ENVELOPE_INFO, RefreshBtnNewYearRedEnvelope);
             EventAgent.RemoveEventListener(ConstMessage.ACTIVITY_RED_CHANGE, UpdateActivityRedDot);
+            EventAgent.RemoveEventListener(ConstMessage.RESET_DAILY_DATA, ResetDailyData);
         }
 
         protected override void OnShown()