画廊

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

@@ -211,18 +211,18 @@ namespace GFGGame
 
         public string GetThemeTime()
         {
-            long monday = TimeUtil.GetCurWeekMondayTime(GlobalCfgArray.globalCfg.refreshTime);//本周一5点
+            long monday = TimeUtil.GetCurWeekTime(GlobalCfgArray.globalCfg.galleryClearingWeekTime, GlobalCfgArray.globalCfg.galleryClearingStartTime);//本周刷新时间
             long startTime = 0;
             long endTime = 0;
             if ((TimeInfo.Instance.ServerNow()) < monday)//本周一5点之前显示上周
             {
-                startTime = TimeUtil.GetLastWeekMondayTime();
-                endTime = TimeUtil.GetLastWeekSundayTime();
+                startTime = TimeUtil.GetLastWeekTime(GlobalCfgArray.globalCfg.galleryClearingWeekTime, GlobalCfgArray.globalCfg.galleryClearingStartTime);
+                endTime = TimeUtil.GetLastWeekTime(GlobalCfgArray.globalCfg.galleryClearingWeekTime, GlobalCfgArray.globalCfg.galleryClearingEndTime);
             }
             else
             {
                 startTime = monday;
-                endTime = TimeUtil.GetCurWeekSundayTime();
+                endTime = TimeUtil.GetCurWeekTime(GlobalCfgArray.globalCfg.galleryClearingWeekTime, GlobalCfgArray.globalCfg.galleryClearingEndTime);
             }
             string strStartTime = TimeUtil.FormattingTime3(startTime);
             string strEndTime = TimeUtil.FormattingTime3(endTime); ;
@@ -235,24 +235,24 @@ namespace GFGGame
         /// <returns></returns>
         public bool IsResulting()
         {
-            long monday0 = TimeUtil.GetCurWeekMondayTime(GlobalCfgArray.globalCfg.galleryClearingEndTime);//本周一结算点
-            long monday5 = TimeUtil.GetCurWeekMondayTime(GlobalCfgArray.globalCfg.refreshTime);//本周一刷新点
+            long monday0 = TimeUtil.GetCurWeekTime(GlobalCfgArray.globalCfg.galleryClearingWeekTime, GlobalCfgArray.globalCfg.galleryClearingEndTime);
+            long monday5 = TimeUtil.GetCurWeekTime(GlobalCfgArray.globalCfg.galleryClearingWeekTime, GlobalCfgArray.globalCfg.galleryClearingStartTime); ;//本周一刷新点
             long now = TimeInfo.Instance.ServerNow();
             return now > monday0 && now < monday5;
 
         }
 
-        /// <summary>
-        /// 是否为本期作品
-        /// </summary>
-        /// <returns></returns>
-        public bool IsCurThemeWork(long time)
-        {
-            long monday05 = TimeUtil.GetCurWeekMondayTime(GlobalCfgArray.globalCfg.refreshTime);//本周一刷新点
-            long nextMonday05 = TimeUtil.GetNextWeekTime(GlobalCfgArray.globalCfg.refreshTime);//下周一刷新点
-            return time > monday05 && time < nextMonday05;
+        // /// <summary>
+        // /// 是否为本期作品
+        // /// </summary>
+        // /// <returns></returns>
+        // public bool IsCurThemeWork(long time)
+        // {
+        //     long monday05 = TimeUtil.GetCurWeekMondayTime(GlobalCfgArray.globalCfg.refreshTime);//本周一刷新点
+        //     long nextMonday05 = TimeUtil.GetNextWeekTime(GlobalCfgArray.globalCfg.refreshTime);//下周一刷新点
+        //     return time > monday05 && time < nextMonday05;
 
-        }
+        // }
 
 
     }