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/IsShowXpButton.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/System/MainInterfacePanel/IsShowXpButton.cs b/System/MainInterfacePanel/IsShowXpButton.cs
index 27b3082..e334019 100644
--- a/System/MainInterfacePanel/IsShowXpButton.cs
+++ b/System/MainInterfacePanel/IsShowXpButton.cs
@@ -21,7 +21,7 @@
public void Init()
{
- m_PlayerXpSkillId = ConfigParse.GetDic<int, int>(ConfigManager.Instance.GetTemplate<FuncConfigConfig>("XpSkillID").Numerical1)[PlayerDatas.Instance.baseData.Job];//鑾峰彇鍚勪釜鑱屼笟鐨刋P鎶�鑳�
+ m_PlayerXpSkillId = ConfigParse.GetDic<int, int>(Config.Instance.Get<FuncConfigConfig>("XpSkillID").Numerical1)[PlayerDatas.Instance.baseData.Job];//鑾峰彇鍚勪釜鑱屼笟鐨刋P鎶�鑳�
StorageList();
Skill.OnSkillCDFinished += OnSkillCDFinished;
Skill.OnSkillCast += OnSkillCast;
@@ -40,7 +40,7 @@
{
return;
}
- _XpSkill = ConfigManager.Instance.GetTemplate<SkillConfig>(SkillID);
+ _XpSkill = Config.Instance.Get<SkillConfig>(SkillID);
Skill _skill = PlayerDatas.Instance.hero.SkillMgr.Get(_XpSkill.SkillID);
if (_skill.IsValid())
{
@@ -112,7 +112,7 @@
{
if (ProhibitedToRelease.Count <= 0)
{
- string str = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("XpNoUseDungeon").Numerical1;
+ string str = Config.Instance.Get<FuncConfigConfig>("XpNoUseDungeon").Numerical1;
string[] list = ConfigParse.GetMultipleStr(str);//瑙ｆ瀽鍑烘暟缁剕
for (int i = 0; i < list.Length; i++)
--
Gitblit v1.8.0