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/CardLevelTaskButton.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/System/MainInterfacePanel/CardLevelTaskButton.cs b/System/MainInterfacePanel/CardLevelTaskButton.cs
index 01b5ade..4e83c85 100644
--- a/System/MainInterfacePanel/CardLevelTaskButton.cs
+++ b/System/MainInterfacePanel/CardLevelTaskButton.cs
@@ -79,12 +79,12 @@
{
if (MainlineTaskType==null)
{
- MainlineTaskType = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("MainlineTaskType").Numerical1.Split('|');//涓荤嚎
- SideQuestsType = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("SideQuestsType").Numerical1.Split('|');//鏀嚎
- BountyMissionsType = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("BountyMissionsType").Numerical1.Split('|');//璧忛噾
- FairyAuMissionType = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("FairyAuMissionType").Numerical1.Split('|');//浠欑洘
+ MainlineTaskType = Config.Instance.Get<FuncConfigConfig>("MainlineTaskType").Numerical1.Split('|');//涓荤嚎
+ SideQuestsType = Config.Instance.Get<FuncConfigConfig>("SideQuestsType").Numerical1.Split('|');//鏀嚎
+ BountyMissionsType = Config.Instance.Get<FuncConfigConfig>("BountyMissionsType").Numerical1.Split('|');//璧忛噾
+ FairyAuMissionType = Config.Instance.Get<FuncConfigConfig>("FairyAuMissionType").Numerical1.Split('|');//浠欑洘
}
- var config = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(_AllMissionDict[taskID].InforList);
+ var config = Config.Instance.Get<TASKINFOConfig>(_AllMissionDict[taskID].InforList);
if (config == null)
{
DebugEx.LogError("閰嶇疆琛ㄦ牸鍑洪敊");
--
Gitblit v1.8.0