From 67e4a6aaf732dc6e884330b893a6daa1958b6902 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期六, 08 九月 2018 09:57:41 +0800
Subject: [PATCH] Merge branch '3243Activity' of http://192.168.0.87:10010/r/snxxz_scripts into 3243Activity
---
System/DailyQuest/DailyQuestData.cs | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/System/DailyQuest/DailyQuestData.cs b/System/DailyQuest/DailyQuestData.cs
index 650e8f6..4aa5d6f 100644
--- a/System/DailyQuest/DailyQuestData.cs
+++ b/System/DailyQuest/DailyQuestData.cs
@@ -55,8 +55,10 @@
public int id;
public bool always;
- Dictionary<int, List<HourMinute>> openTimes;//甯歌鐨勬椿鍔ㄦ椂闂达紝key鏄槦鏈焫
- Dictionary<int, Dictionary<int, List<HourMinute>>> specificOpenTimes;//寮�鏈嶅墠2鍛ㄧ殑娲诲姩鏃堕棿,key1鏄紑鏈嶆棩鐨勬槦鏈燂紝key2鏄紑鏈嶇鍑犲ぉ
+ //甯歌鐨勬椿鍔ㄦ椂闂达紝key鏄槦鏈焫
+ Dictionary<int, List<HourMinute>> openTimes = new Dictionary<int, List<HourMinute>>();
+ //寮�鏈嶅墠2鍛ㄧ殑娲诲姩鏃堕棿,key1鏄紑鏈嶆棩鐨勬槦鏈燂紝key2鏄紑鏈嶇鍑犲ぉ
+ Dictionary<int, Dictionary<int, List<HourMinute>>> specificOpenTimes = new Dictionary<int, Dictionary<int, List<HourMinute>>>();
public DailyQuestOpenTime(int _id)
{
@@ -67,7 +69,6 @@
{
var matches = Regex.Matches(timeString, "\\\"[0-9]\\\":\\[[0-9|,|\\[|\\]]+");
always = matches.Count == 0;
- openTimes = new Dictionary<int, List<HourMinute>>();
for (int i = 0; i < matches.Count; i++)
{
@@ -112,7 +113,11 @@
public void ParseQuestSpecificOpenTimes(List<DailyQuestSpecialOpenTimeConfig> configs)
{
- specificOpenTimes = new Dictionary<int, Dictionary<int, List<HourMinute>>>(); ;
+ if (configs == null)
+ {
+ return;
+ }
+
foreach (var config in configs)
{
var openDayWeek = config.OpenServerWeek % 7;
@@ -143,7 +148,6 @@
public void ParseDungeonNormalOpenTimes(List<DungeonStateTimeConfig> configs)
{
always = configs == null || configs.Count == 0;
- openTimes = new Dictionary<int, List<HourMinute>>();
if (!always)
{
@@ -179,7 +183,11 @@
public void ParseDungeonSpecificOpenTimes(List<DungeonSpecialStateTimeConfig> configs)
{
- specificOpenTimes = new Dictionary<int, Dictionary<int, List<HourMinute>>>(); ;
+ if (configs == null)
+ {
+ return;
+ }
+
foreach (var config in configs)
{
var openDayWeek = config.OpenServerWeek % 7;
--
Gitblit v1.8.0