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/TaskListTip.cs |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/System/MainInterfacePanel/TaskListTip.cs b/System/MainInterfacePanel/TaskListTip.cs
index d9c2afa..5981779 100644
--- a/System/MainInterfacePanel/TaskListTip.cs
+++ b/System/MainInterfacePanel/TaskListTip.cs
@@ -73,8 +73,8 @@
         public void Init()//鍒濆鍖�
         {
 
-            var TaskSortType = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("TaskSortType");
-            var RenzhuTaskID = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("RenzhuTaskID");
+            var TaskSortType = Config.Instance.Get<FuncConfigConfig>("TaskSortType");
+            var RenzhuTaskID = Config.Instance.Get<FuncConfigConfig>("RenzhuTaskID");
             if (ListSort.Count <= 0)
             {
                 int[] TaskSortType1 = ConfigParse.GetMultipleStr<int>(TaskSortType.Numerical1);
@@ -385,7 +385,7 @@
         private bool IsDungeon()//鍒ゆ柇鏄惁鍦ㄥ壇鏈腑
         {
             var mapId = PlayerDatas.Instance.baseData.MapID;
-            var mapConfig = ConfigManager.Instance.GetTemplate<MapConfig>(mapId);
+            var mapConfig = Config.Instance.Get<MapConfig>(mapId);
             return mapConfig != null && mapConfig.MapFBType != 0;
         }
 

--
Gitblit v1.8.0