画廊

GameClient/Assets/Game/HotUpdate/Data/PoemGalleryDataManager.cs

@@ -249,11 +249,18 @@ namespace GFGGame
         /// <returns></returns>
         public bool IsCurThemeWork(long time)
         {
-            long start = TimeUtil.GetCurWeekTime(GlobalCfgArray.globalCfg.galleryClearingWeekTime, GlobalCfgArray.globalCfg.galleryClearingStartTime); ;//本周一5点刷新本周
-            long end = TimeUtil.GetNextWeekTime(GlobalCfgArray.globalCfg.galleryClearingWeekTime, GlobalCfgArray.globalCfg.galleryClearingEndTime); ;//本周一5点刷新本周
-
-            return time > start && time < end;
-
+            long monday = TimeUtil.GetCurWeekTime(GlobalCfgArray.globalCfg.galleryClearingWeekTime, GlobalCfgArray.globalCfg.galleryClearingStartTime);//本周结算时间
+            long startTime = 0;
+            if ((TimeInfo.Instance.ServerNow()) < monday)//本周一5点之前显示上周
+            {
+                startTime = TimeUtil.GetLastWeekTime(GlobalCfgArray.globalCfg.galleryClearingWeekTime, GlobalCfgArray.globalCfg.galleryClearingStartTime);
+                return time > startTime;
+            }
+            else
+            {
+                startTime = monday;
+            }
+            return time > startTime;
         }
     }
 }