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/StoryMissions.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/System/MainInterfacePanel/StoryMissions.cs b/System/MainInterfacePanel/StoryMissions.cs
index f7528e0..e718a79 100644
--- a/System/MainInterfacePanel/StoryMissions.cs
+++ b/System/MainInterfacePanel/StoryMissions.cs
@@ -87,7 +87,7 @@
private void OnClickDeliveryButton()//浼犻�佺
{
- string _FlyID = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("TransportPay").Numerical1;
+ string _FlyID = Config.Instance.Get<FuncConfigConfig>("TransportPay").Numerical1;
int itemNumber = playerPack.GetItemCountByID(PackType.rptItem, int.Parse(_FlyID));//鑾峰彇椋為瀷鐨勬暟閲�
if (ModelCenter.Instance.GetModel<VipModel>().GetVipPrivilegeCnt(VipPrivilegeType.FreeTransfer) > 0)
{
@@ -110,10 +110,10 @@
{
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('|');//浠欑洘
}
_AllMissionDict = taskmodel.allMissionDict;
@@ -133,7 +133,7 @@
m_GuidanceShowImage.SetActive(false);
string str = _AllMissionDict[TaskID].InforList;
- var taskinfo = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(str);
+ var taskinfo = Config.Instance.Get<TASKINFOConfig>(str);
m_ContentText.raycastTarget = false;
if (_DicTaskInforma.ContainsKey(TaskID))
{
@@ -153,7 +153,7 @@
}
if (taskmodel.BountyDic.ContainsKey(TaskID) || taskmodel.FairyAuDic.ContainsKey(TaskID))
{
- var config = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(str);
+ var config = Config.Instance.Get<TASKINFOConfig>(str);
if (config != null)
{
string strRichA = TaskAllocation.Instance.GetTaskInfo(config.show_writing, TaskID);
@@ -171,7 +171,7 @@
private string TaskTitle(int taskID)
{
- var config = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(_AllMissionDict[taskID].InforList);
+ var config = Config.Instance.Get<TASKINFOConfig>(_AllMissionDict[taskID].InforList);
if (config == null)
{
DebugEx.LogError("浠诲姟琛ㄦ牸PyTaskInfo閰嶇疆缂哄け");
--
Gitblit v1.8.0