From 68a7251f0faee0ef44b3919c21ddb5a373664009 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期六, 08 九月 2018 09:43:21 +0800
Subject: [PATCH] 3243 【开发】开服限时活动定制
---
System/Dungeon/DungeonModel.cs | 2 +-
Core/GameEngine/Model/TelPartialConfig/DungeonSpecialStateTimeConfig.cs | 14 +++++++-------
System/FairyAu/FairyLeagueModel.cs | 11 ++++++-----
System/DailyQuest/DailyQuestModel.cs | 2 +-
4 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/Core/GameEngine/Model/TelPartialConfig/DungeonSpecialStateTimeConfig.cs b/Core/GameEngine/Model/TelPartialConfig/DungeonSpecialStateTimeConfig.cs
index c832c9b..eb76a94 100644
--- a/Core/GameEngine/Model/TelPartialConfig/DungeonSpecialStateTimeConfig.cs
+++ b/Core/GameEngine/Model/TelPartialConfig/DungeonSpecialStateTimeConfig.cs
@@ -7,23 +7,23 @@
public partial class DungeonSpecialStateTimeConfig : ConfigBase, IConfigPostProcess
{
- static Dictionary<int, List<DungeonSpecialStateTimeConfig>> dailyQuestTimes = new Dictionary<int, List<DungeonSpecialStateTimeConfig>>();
+ static Dictionary<int, List<DungeonSpecialStateTimeConfig>> dungeonTimes = new Dictionary<int, List<DungeonSpecialStateTimeConfig>>();
public void OnConfigParseCompleted()
{
- if (!dailyQuestTimes.ContainsKey(DataMapID))
+ if (!dungeonTimes.ContainsKey(DataMapID))
{
- dailyQuestTimes[DataMapID] = new List<DungeonSpecialStateTimeConfig>();
+ dungeonTimes[DataMapID] = new List<DungeonSpecialStateTimeConfig>();
}
- dailyQuestTimes[DataMapID].Add(this);
+ dungeonTimes[DataMapID].Add(this);
}
- public static List<DungeonSpecialStateTimeConfig> GetDailyQuestTimes(int dailyQuestId)
+ public static List<DungeonSpecialStateTimeConfig> GetDungeonTimes(int dataMapId)
{
- if (dailyQuestTimes.ContainsKey(dailyQuestId))
+ if (dungeonTimes.ContainsKey(dataMapId))
{
- return dailyQuestTimes[dailyQuestId];
+ return dungeonTimes[dataMapId];
}
else
{
diff --git a/System/DailyQuest/DailyQuestModel.cs b/System/DailyQuest/DailyQuestModel.cs
index 7bcd5a1..7befcfa 100644
--- a/System/DailyQuest/DailyQuestModel.cs
+++ b/System/DailyQuest/DailyQuestModel.cs
@@ -996,7 +996,7 @@
var dungeonOpenTimes = DungeonStateTimeConfig.DungeonStateCanEnterFB(config.RelatedID);
openTime = dailyQuestOpenTimes[config.ID] = new DailyQuestOpenTime(config.ID);
openTime.ParseDungeonNormalOpenTimes(dungeonOpenTimes);
- openTime.ParseDungeonSpecificOpenTimes(DungeonSpecialStateTimeConfig.GetDailyQuestTimes(config.RelatedID));
+ openTime.ParseDungeonSpecificOpenTimes(DungeonSpecialStateTimeConfig.GetDungeonTimes(config.RelatedID));
dungeonToDailyQuestTable[config.RelatedID] = config.ID;
break;
}
diff --git a/System/Dungeon/DungeonModel.cs b/System/Dungeon/DungeonModel.cs
index b874c64..1bd75e7 100644
--- a/System/Dungeon/DungeonModel.cs
+++ b/System/Dungeon/DungeonModel.cs
@@ -1349,7 +1349,7 @@
{
var openTime = dungeonOpenTimes[config.DataMapID] = new DailyQuestOpenTime(config.DataMapID);
openTime.ParseDungeonNormalOpenTimes(DungeonStateTimeConfig.DungeonStateCanEnterFB(config.DataMapID));
- openTime.ParseDungeonSpecificOpenTimes(DungeonSpecialStateTimeConfig.GetDailyQuestTimes(config.DataMapID));
+ openTime.ParseDungeonSpecificOpenTimes(DungeonSpecialStateTimeConfig.GetDungeonTimes(config.DataMapID));
}
}
diff --git a/System/FairyAu/FairyLeagueModel.cs b/System/FairyAu/FairyLeagueModel.cs
index 573e877..29f8876 100644
--- a/System/FairyAu/FairyLeagueModel.cs
+++ b/System/FairyAu/FairyLeagueModel.cs
@@ -259,7 +259,7 @@
fairyLeagueWeekTime.AddStage(configs[i]);
}
}
- var specialStateTimes = Config.Instance.GetAllValues<DungeonSpecificlStateTimeConfig>();
+ var specialStateTimes = Config.Instance.GetAllValues<DungeonSpecialStateTimeConfig>();
for (int i = 0; i < specialStateTimes.Count; i++)
{
var specificlConfig = specialStateTimes[i];
@@ -268,7 +268,7 @@
Dictionary<int, FairyLeagueWeekTime> dict;
if (!specificlLeagueTimes.TryGetValue(specificlConfig.OpenServerWeek, out dict))
{
- dict =new Dictionary<int, FairyLeagueWeekTime>();
+ dict = new Dictionary<int, FairyLeagueWeekTime>();
specificlLeagueTimes.Add(specificlConfig.OpenServerWeek, dict);
}
var dayOfWeek = 0;
@@ -1012,12 +1012,13 @@
ring.ParseConfig(config);
}
- public void AddStage(DungeonSpecificlStateTimeConfig config, int dayOfWeek)
+ public void AddStage(DungeonSpecialStateTimeConfig config, int dayOfWeek)
{
var ring = rings.Find((x) =>
{
return x.dayOfWeek == dayOfWeek;
});
+
if (ring == null)
{
ring = new Ring();
@@ -1115,7 +1116,7 @@
session.ParseConfig(config);
}
- public void ParseConfig(DungeonSpecificlStateTimeConfig config, int dayOfWeek)
+ public void ParseConfig(DungeonSpecialStateTimeConfig config, int dayOfWeek)
{
var session = sessions.Find((x) =>
{
@@ -1196,7 +1197,7 @@
stages.Add(stage);
}
- public void ParseConfig(DungeonSpecificlStateTimeConfig config, int dayOfWeek)
+ public void ParseConfig(DungeonSpecialStateTimeConfig config, int dayOfWeek)
{
var state = config.StateValue % 10;
var stage = new Stage()
--
Gitblit v1.8.0