From 90d6578412b713ec00f31a9e5a1a1d865e484803 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期三, 06 三月 2019 15:45:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into Auction
---
System/MainInterfacePanel/SkillButtonEffects.cs | 53 +++++++++++++++++------------------------------------
1 files changed, 17 insertions(+), 36 deletions(-)
diff --git a/System/MainInterfacePanel/SkillButtonEffects.cs b/System/MainInterfacePanel/SkillButtonEffects.cs
index 18cf3ea..09b380f 100644
--- a/System/MainInterfacePanel/SkillButtonEffects.cs
+++ b/System/MainInterfacePanel/SkillButtonEffects.cs
@@ -272,26 +272,14 @@
break;
case "Btn_SkillXp":
Prompting((int)SkillEffects.skillEffect_xp);
- switch (PlayerDatas.Instance.baseData.Job)
- {
- case 1:
- if (PlayerDatas.Instance.skill.GetSKillById(150) != null)
- {
- BoolFb = true;
- AccordingBool = true;
- SkillsHole = (int)SkillEffects.skillEffect_xp;
- SkillSelectedXp.SetActive(true);
- }
- break;
- case 2:
- if (PlayerDatas.Instance.skill.GetSKillById(250) != null)
- {
- BoolFb = true;
- AccordingBool = true;
- SkillsHole = (int)SkillEffects.skillEffect_xp;
- SkillSelectedXp.SetActive(true);
- }
- break;
+ var skillModel = ModelCenter.Instance.GetModel<SkillModel>();
+ var xpSkillId = skillModel.GetXpSkillID();
+ if (PlayerDatas.Instance.skill.GetSKillById(xpSkillId) != null)
+ {
+ BoolFb = true;
+ AccordingBool = true;
+ SkillsHole = (int)SkillEffects.skillEffect_xp;
+ SkillSelectedXp.SetActive(true);
}
break;
default:
@@ -414,18 +402,13 @@
case SkillEffects.skillEffect_xp:
_LongPressShowPanel = XpSkillInfo.GetChild(0).GetComponent<LongPressShowPanel>();
break;
- }
- PlayerSkillData _PlayerSkillData=null;
+ }
+ PlayerSkillData _PlayerSkillData = null;
if ((SkillEffects)SkillsHole == SkillEffects.skillEffect_xp)
- {
- if (PlayerDatas.Instance.baseData.Job == 1)
- {
- _PlayerSkillData = PlayerDatas.Instance.skill.GetSKillById(150);
- }
- else if (PlayerDatas.Instance.baseData.Job == 2)
- {
- _PlayerSkillData = PlayerDatas.Instance.skill.GetSKillById(250);
- }
+ {
+ var skillModel = ModelCenter.Instance.GetModel<SkillModel>();
+ var xpSkillId = skillModel.GetXpSkillID();
+ _PlayerSkillData = PlayerDatas.Instance.skill.GetSKillById(xpSkillId);
}
else
{
@@ -489,11 +472,9 @@
SysNotifyMgr.Instance.ShowTip("Skill7Btn_Unlock");
break;
case SkillEffects.skillEffect_xp:
- if (PlayerDatas.Instance.baseData.Job == 1 && PlayerDatas.Instance.skill.GetSKillById(150) == null)
- {
- SysNotifyMgr.Instance.ShowTip("SkillXpBtn_Unlock");
- }
- if (PlayerDatas.Instance.baseData.Job == 2 && PlayerDatas.Instance.skill.GetSKillById(250) == null)
+ var skillModel = ModelCenter.Instance.GetModel<SkillModel>();
+ var xpSkillId = skillModel.GetXpSkillID();
+ if (PlayerDatas.Instance.skill.GetSKillById(xpSkillId) == null)
{
SysNotifyMgr.Instance.ShowTip("SkillXpBtn_Unlock");
}
--
Gitblit v1.8.0