From 78bfe524ea4776c47f6314e56e97f39970b00fce Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 25 九月 2018 15:07:07 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能
---
System/DailyQuest/DailyQuestData.cs | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/System/DailyQuest/DailyQuestData.cs b/System/DailyQuest/DailyQuestData.cs
index a44ca39..da10ba2 100644
--- a/System/DailyQuest/DailyQuestData.cs
+++ b/System/DailyQuest/DailyQuestData.cs
@@ -152,6 +152,11 @@
for (int i = 0; i < configs.Count; i++)
{
var config = configs[i];
+ if (config.CanEnter == 0)
+ {
+ continue;
+ }
+
if (config.StartWeekday == 0 && config.EndWeekday == 0)
{
for (int j = 0; j < 7; j++)
@@ -188,6 +193,11 @@
foreach (var config in configs)
{
+ if (config.CanEnter == 0)
+ {
+ continue;
+ }
+
var openDayWeek = config.OpenServerWeek % 7;
if (!specialOpenTimes.ContainsKey(openDayWeek))
{
@@ -206,7 +216,6 @@
}
}
-
public bool IsValidServerOpenTime()
{
return true;
@@ -220,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))
{
@@ -269,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)
{
@@ -327,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);
@@ -356,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);
@@ -421,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