画廊

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

@@ -213,19 +213,35 @@ namespace GFGGame
 
         public string GetThemeTime()
         {
+            // int week = GlobalCfgArray.globalCfg.galleryClearingWeekTime - 1 == 0 ? 7 : GlobalCfgArray.globalCfg.galleryClearingWeekTime - 1;
             long monday00 = TimeUtil.GetCurWeekTime(1);//本周一0点
             long monday = TimeUtil.GetCurWeekTime(GlobalCfgArray.globalCfg.galleryClearingWeekTime, GlobalCfgArray.globalCfg.galleryClearingStartTime);//本周结算时间
             long startTime = 0;
             long endTime = 0;
+
             if ((TimeInfo.Instance.ServerNow()) < monday)//本周一5点之前显示上周
             {
                 startTime = TimeUtil.GetLastWeekTime(GlobalCfgArray.globalCfg.galleryClearingWeekTime, GlobalCfgArray.globalCfg.galleryClearingStartTime);
-                endTime = TimeUtil.GetCurWeekTime(GlobalCfgArray.globalCfg.galleryClearingWeekTime - 1);
+                if (GlobalCfgArray.globalCfg.galleryClearingWeekTime == 1)
+                {
+                    endTime = TimeUtil.GetLastWeekTime(7);
+                }
+                else
+                {
+                    endTime = TimeUtil.GetCurWeekTime(GlobalCfgArray.globalCfg.galleryClearingWeekTime - 1);
+                }
             }
             else
             {
                 startTime = monday;
-                endTime = TimeUtil.GetNextWeekTime(GlobalCfgArray.globalCfg.galleryClearingWeekTime - 1, GlobalCfgArray.globalCfg.galleryClearingEndTime);
+                if (GlobalCfgArray.globalCfg.galleryClearingWeekTime == 1)
+                {
+                    endTime = TimeUtil.GetCurWeekTime(7);
+                }
+                else
+                {
+                    endTime = TimeUtil.GetNextWeekTime(GlobalCfgArray.globalCfg.galleryClearingWeekTime - 1, GlobalCfgArray.globalCfg.galleryClearingEndTime);
+                }
             }
             string strStartTime = TimeUtil.FormattingTime3(startTime);
             string strEndTime = TimeUtil.FormattingTime3(endTime); ;