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/SkillButtonEffects.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/System/MainInterfacePanel/SkillButtonEffects.cs b/System/MainInterfacePanel/SkillButtonEffects.cs
index 954922c..f1e60e4 100644
--- a/System/MainInterfacePanel/SkillButtonEffects.cs
+++ b/System/MainInterfacePanel/SkillButtonEffects.cs
@@ -55,7 +55,7 @@
private void Awake()
{
- 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鎶�鑳�
MagicWeapon();
}
@@ -439,10 +439,10 @@
else
{
int FBID = _SkillAndPreTreasure[_PlayerSkillData.id];
- _LongPressShowPanel.Name.text = ConfigManager.Instance.GetTemplate<SkillConfig>(_PlayerSkillData.id).SkillName;
- _LongPressShowPanel.Describe.text = ConfigManager.Instance.GetTemplate<SkillConfig>(_PlayerSkillData.id).Description;
+ _LongPressShowPanel.Name.text = Config.Instance.Get<SkillConfig>(_PlayerSkillData.id).SkillName;
+ _LongPressShowPanel.Describe.text = Config.Instance.Get<SkillConfig>(_PlayerSkillData.id).Description;
- var treasureConfig = ConfigManager.Instance.GetTemplate<TreasureConfig>(FBID);
+ var treasureConfig = Config.Instance.Get<TreasureConfig>(FBID);
_LongPressShowPanel.m_Icon.SetSprite(treasureConfig.Icon);
}
--
Gitblit v1.8.0