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/XpSkill.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/System/MainInterfacePanel/XpSkill.cs b/System/MainInterfacePanel/XpSkill.cs
index 463c051..e356b84 100644
--- a/System/MainInterfacePanel/XpSkill.cs
+++ b/System/MainInterfacePanel/XpSkill.cs
@@ -52,7 +52,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())
{
@@ -68,7 +68,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++)
@@ -106,7 +106,7 @@
int SkillID = onMainModel.SkillID;
if (SkillID == 0)
return;
- _XpSkill = ConfigManager.Instance.GetTemplate<SkillConfig>(SkillID);
+ _XpSkill = Config.Instance.Get<SkillConfig>(SkillID);
XpButton.SetActive(true);
XpBtnImage.transform.localScale = Vector3.one;
XpBtnImage.SetSprite(_XpSkill.IconName);
@@ -188,8 +188,8 @@
{
if (_SkillAndPreTreasure.Count != 0)
return;
- m_PlayerXpSkillId = ConfigParse.GetDic<int, int>(ConfigManager.Instance.GetTemplate<FuncConfigConfig>("XpSkillID").Numerical1)[PlayerDatas.Instance.baseData.Job];//鑾峰彇鍚勪釜鑱屼笟鐨刋P鎶�鑳�
- var TreasureModel = ConfigManager.Instance.GetAllValues<TreasureConfig>();
+ m_PlayerXpSkillId = ConfigParse.GetDic<int, int>(Config.Instance.Get<FuncConfigConfig>("XpSkillID").Numerical1)[PlayerDatas.Instance.baseData.Job];//鑾峰彇鍚勪釜鑱屼笟鐨刋P鎶�鑳�
+ var TreasureModel = Config.Instance.GetAllValues<TreasureConfig>();
foreach (var config in TreasureModel)
{
//int[] Intlist = config.UnLockSkill;
@@ -207,10 +207,10 @@
Tran.gameObject.SetActive(true);
LongPressShowPanel _LongPressShowPanel = Tran.GetChild(0).GetComponent<LongPressShowPanel>();
TreasureID = _SkillAndPreTreasure[_XpSkill.SkillID];
- _LongPressShowPanel.Name.text = ConfigManager.Instance.GetTemplate<SkillConfig>(_XpSkill.SkillID).SkillName;
- _LongPressShowPanel.Describe.text = ConfigManager.Instance.GetTemplate<SkillConfig>(_XpSkill.SkillID).Description;
+ _LongPressShowPanel.Name.text = Config.Instance.Get<SkillConfig>(_XpSkill.SkillID).SkillName;
+ _LongPressShowPanel.Describe.text = Config.Instance.Get<SkillConfig>(_XpSkill.SkillID).Description;
- var treasureConfig = ConfigManager.Instance.GetTemplate<TreasureConfig>(TreasureID);
+ var treasureConfig = Config.Instance.Get<TreasureConfig>(TreasureID);
_LongPressShowPanel.m_Icon.SetSprite(treasureConfig.Icon);
}
--
Gitblit v1.8.0