From a29b9dd38264a40996b1f039c3d434563488ccfb Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 18 九月 2018 16:44:39 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
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..b7d275b 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));
+
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));
var dayIndex = TimeUtility.OpenDay + 1 + dayDelta;
if (specialOpenTimes.ContainsKey(openDayWeek) && specialOpenTimes[openDayWeek].ContainsKey(dayIndex))
{
--
Gitblit v1.8.0