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/HeadPortraitTip.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/System/MainInterfacePanel/HeadPortraitTip.cs b/System/MainInterfacePanel/HeadPortraitTip.cs
index 1f912ca..bf75628 100644
--- a/System/MainInterfacePanel/HeadPortraitTip.cs
+++ b/System/MainInterfacePanel/HeadPortraitTip.cs
@@ -193,7 +193,7 @@
void PatternButton(GameObject obj)
{
int mapID = PlayerDatas.Instance.baseData.MapID;
- var config = ConfigManager.Instance.GetTemplate<MapConfig>(mapID);
+ var config = Config.Instance.Get<MapConfig>(mapID);
int[] atkInt = pKModel.GetArea(config.AtkType).ToArray();
bool IsBossBool = MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);//鏄惁鍦˙oss鍖哄煙
if (atkInt.Length > 1)
@@ -408,9 +408,9 @@
string str = _Job + "0" + _ReincarnationLv;
int JobName = int.Parse(str);
string Name = "";
- if (ConfigManager.Instance.GetTemplate<JobNameConfig>(JobName) != null)
+ if (Config.Instance.Get<JobNameConfig>(JobName) != null)
{
- Name = ConfigManager.Instance.GetTemplate<JobNameConfig>(JobName).name;
+ Name = Config.Instance.Get<JobNameConfig>(JobName).name;
}
}
--
Gitblit v1.8.0