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/FlyShoseConfirmwin.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/System/MainInterfacePanel/FlyShoseConfirmwin.cs b/System/MainInterfacePanel/FlyShoseConfirmwin.cs
index 1b0bf17..0f472cc 100644
--- a/System/MainInterfacePanel/FlyShoseConfirmwin.cs
+++ b/System/MainInterfacePanel/FlyShoseConfirmwin.cs
@@ -40,11 +40,11 @@
protected override void BindController()
{
- var funconfig = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("TransportPay");
+ var funconfig = Config.Instance.Get<FuncConfigConfig>("TransportPay");
FlyShoseID = int.Parse(funconfig.Numerical1);
NeedMoney = int.Parse(funconfig.Numerical2);
m_Text.text = string.Format(Language.Get("FlyShoseConfirmwin_Text1"), NeedMoney);
- var ItemConfig = ConfigManager.Instance.GetTemplate<ItemConfig>(FlyShoseID);
+ var ItemConfig = Config.Instance.Get<ItemConfig>(FlyShoseID);
m_Image.SetSprite(ItemConfig.IconKey);
}
@@ -66,14 +66,14 @@
if (taskmodel.allMissionDict.ContainsKey(mainModel.FlyShoseTaskID))
{
string str = taskmodel.allMissionDict[mainModel.FlyShoseTaskID].InforList;
- var taskinfo = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(str);
+ var taskinfo = Config.Instance.Get<TASKINFOConfig>(str);
if (taskinfo != null)
{
m_ContentText.text = taskinfo.show_writing;
}
if (taskmodel.BountyDic.ContainsKey(mainModel.FlyShoseTaskID) || taskmodel.FairyAuDic.ContainsKey(mainModel.FlyShoseTaskID))
{
- 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, mainModel.FlyShoseTaskID);
--
Gitblit v1.8.0