From 99ec4075b3cf616d4047c830175be62221ef7104 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期六, 22 九月 2018 00:05:30 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/DailyQuest/DailyQuestData.cs |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/System/DailyQuest/DailyQuestData.cs b/System/DailyQuest/DailyQuestData.cs
index 04f1d09..da10ba2 100644
--- a/System/DailyQuest/DailyQuestData.cs
+++ b/System/DailyQuest/DailyQuestData.cs
@@ -229,9 +229,9 @@
         }
 
         var isSpecialDay = TimeUtility.OpenWeekCnt <= 1;
-        var openDayWeek = (int)TimeUtility.openServerTime.DayOfWeek;
+        var openDayWeek = (int)TimeUtility.openServerDayOfWeek;
         var dayIndex = TimeUtility.OpenDay + 1;
-        if (isSpecialDay && specialOpenTimes.ContainsKey(openDayWeek) && specialOpenTimes[openDayWeek].ContainsKey(dayIndex))
+        if (isSpecialDay)
         {
             if (specialOpenTimes.ContainsKey(openDayWeek) && specialOpenTimes[openDayWeek].ContainsKey(dayIndex))
             {
@@ -278,7 +278,7 @@
     public bool TryGetTodayNearestOpenTime(out HourMinute _hourMinute)
     {
         var isSpecialDay = TimeUtility.OpenWeekCnt <= 1;
-        var openDayWeek = (int)TimeUtility.openServerTime.DayOfWeek;
+        var openDayWeek = (int)TimeUtility.openServerDayOfWeek;
         var dayIndex = TimeUtility.OpenDay + 1;
         if (isSpecialDay)
         {
@@ -336,7 +336,7 @@
 
     public bool ContainTimeNode(int week, int timeNode)
     {
-        var openDayWeek = (int)TimeUtility.openServerTime.DayOfWeek;
+        var openDayWeek = (int)TimeUtility.openServerDayOfWeek;
 
         List<HourMinute> hourMinutes = null;
         var dayDelta = (week == 0 ? 7 : week) - (openDayWeek == 0 ? 7 : openDayWeek);
@@ -365,7 +365,7 @@
 
     private bool ContainWeek(int week)
     {
-        var openDayWeek = (int)TimeUtility.openServerTime.DayOfWeek;
+        var openDayWeek = (int)TimeUtility.openServerDayOfWeek;
         var todayWeek = (int)TimeUtility.ServerNow.DayOfWeek;
         var dayDelta = (week == 0 ? 7 : week) - (openDayWeek == 0 ? 7 : openDayWeek);
 
@@ -430,7 +430,7 @@
         var isSpecificDay = TimeUtility.OpenWeekCnt <= 1;
         if (isSpecificDay)
         {
-            var openDayWeek = (int)TimeUtility.openServerTime.DayOfWeek;
+            var openDayWeek = (int)TimeUtility.openServerDayOfWeek;
             var todayWeek = (int)TimeUtility.ServerNow.DayOfWeek;
             var dayDelta = ((week == 0 ? 7 : week) - (todayWeek == 0 ? 7 : todayWeek));
             var dayIndex = TimeUtility.OpenDay + 1 + dayDelta;

--
Gitblit v1.8.0