From bbd7bbe9ed3a1eae6cd9ca45ca149cc7f882daa2 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 18 九月 2018 15:01:26 +0800
Subject: [PATCH] 3243  【开发】开服限时活动定制

---
 System/DailyQuest/DailyQuestData.cs |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/System/DailyQuest/DailyQuestData.cs b/System/DailyQuest/DailyQuestData.cs
index f44b370..b09eec9 100644
--- a/System/DailyQuest/DailyQuestData.cs
+++ b/System/DailyQuest/DailyQuestData.cs
@@ -357,7 +357,9 @@
     private bool ContainWeek(int week)
     {
         var openDayWeek = (int)TimeUtility.openServerTime.DayOfWeek;
-        var dayDelta = (week == 0 ? 7 : week) - openDayWeek;
+        var todayWeek = (int)TimeUtility.ServerNow.DayOfWeek;
+        var dayDelta = ((week == 0 ? 7 : week) - (todayWeek == 0 ? 7 : todayWeek)) + TimeUtility.OpenWeekCnt * 7;
+
         if (TimeUtility.OpenWeekCnt < 1 && dayDelta < 0)
         {
             return openTimes.ContainsKey(week);
@@ -420,7 +422,8 @@
         if (isSpecificDay)
         {
             var openDayWeek = (int)TimeUtility.openServerTime.DayOfWeek;
-            var dayDelta = ((week == 0 ? 7 : week) - openDayWeek) + TimeUtility.OpenWeekCnt * 7;
+            var todayWeek = (int)TimeUtility.ServerNow.DayOfWeek;
+            var dayDelta = ((week == 0 ? 7 : week) - (todayWeek == 0 ? 7 : todayWeek)) + TimeUtility.OpenWeekCnt * 7;
             var dayIndex = TimeUtility.OpenDay + 1 + dayDelta;
             if (specialOpenTimes.ContainsKey(openDayWeek) && specialOpenTimes[openDayWeek].ContainsKey(dayIndex))
             {

--
Gitblit v1.8.0