From 2b47fde8e7902ddddd898309f281b9c310fc877f Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 22 八月 2018 12:00:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackPlayer
---
System/MainInterfacePanel/StoryMissionsModel.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/System/MainInterfacePanel/StoryMissionsModel.cs b/System/MainInterfacePanel/StoryMissionsModel.cs
index 1868aa3..e40808e 100644
--- a/System/MainInterfacePanel/StoryMissionsModel.cs
+++ b/System/MainInterfacePanel/StoryMissionsModel.cs
@@ -30,7 +30,7 @@
PlayerTaskDatas onPlayerTask { get { return m_PlayerTaskDatas ?? (m_PlayerTaskDatas = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); } }
public override void Init()
{
- var configTaskListValue = ConfigManager.Instance.GetAllValues<TaskListConfig>();
+ var configTaskListValue = Config.Instance.GetAllValues<TaskListConfig>();
foreach (var value in configTaskListValue)
{
List<TaskListConfig> _list = null;
@@ -60,7 +60,7 @@
{
foreach (int key in onPlayerTask.MainTaskDic.Keys)
{
- int chapterID = ConfigManager.Instance.GetTemplate<TaskListConfig>(key).ChapterID;
+ int chapterID = Config.Instance.Get<TaskListConfig>(key).ChapterID;
if (TaskMainDic.ContainsKey(chapterID))
{
TaskMainDic[chapterID] = key;
--
Gitblit v1.8.0