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/CombatModeWin.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/System/MainInterfacePanel/CombatModeWin.cs b/System/MainInterfacePanel/CombatModeWin.cs
index cba20f7..fee363e 100644
--- a/System/MainInterfacePanel/CombatModeWin.cs
+++ b/System/MainInterfacePanel/CombatModeWin.cs
@@ -34,7 +34,7 @@
PKModel pKModel { get { return m_PKModel ?? (m_PKModel = ModelCenter.Instance.GetModel<PKModel>()); } }
protected override void BindController()
{
- string PkStr = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("PKText").Numerical1;
+ string PkStr = Config.Instance.Get<FuncConfigConfig>("PKText").Numerical1;
_dic = ConfigParse.GetDic<int, string>(PkStr);
}
@@ -46,7 +46,7 @@
protected override void OnPreOpen()
{
int MapID = PlayerDatas.Instance.baseData.MapID;
- var config = ConfigManager.Instance.GetTemplate<MapConfig>(MapID);
+ var config = Config.Instance.Get<MapConfig>(MapID);
AtkTypeList = pKModel.GetArea(config.AtkType).ToArray();
_PkType = Buffmodel.PkType;//鑾峰彇褰撳墠PK鐘舵��
if (_PkType != 2)
--
Gitblit v1.8.0