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/MainWin/SkillContainer.cs | 83 +++++++++++------------------------------
1 files changed, 22 insertions(+), 61 deletions(-)
diff --git a/System/MainWin/SkillContainer.cs b/System/MainWin/SkillContainer.cs
index 889a366..76d8544 100644
--- a/System/MainWin/SkillContainer.cs
+++ b/System/MainWin/SkillContainer.cs
@@ -97,7 +97,7 @@
m_Skill7.RemoveAllListeners();
skillXP.RemoveAllListeners();
PlayerSkillDatas.OnRefreshSkill -= OnSkillRefresh;
- if(AchievementGoto.achievementType == AchievementGoto.ExcuteSkill)
+ if (AchievementGoto.achievementType == AchievementGoto.ExcuteSkill)
{
AchievementGoto.achievementType = 0;
}
@@ -119,17 +119,10 @@
m_Skill7.SetSkillData(indexSkillDataDict[6]);
m_BlinkSkill.SetSkillData(PlayerDatas.Instance.skill.GetSKillById(190));
- switch (PlayerDatas.Instance.baseData.Job)
- {
- case 1:
- m_SkillXP.SetSkillData(PlayerDatas.Instance.skill.GetSKillById(150));
- break;
- case 2:
- m_SkillXP.SetSkillData(PlayerDatas.Instance.skill.GetSKillById(250));
- break;
- default:
- break;
- }
+
+ var model = ModelCenter.Instance.GetModel<SkillModel>();
+ var skillXpId = model.GetXpSkillID();
+ m_SkillXP.SetSkillData(PlayerDatas.Instance.skill.GetSKillById(skillXpId));
}
void SwitchTarget()
@@ -244,32 +237,15 @@
}
void CastSkillXp()
- {
- switch (PlayerDatas.Instance.baseData.Job)
- {
- case 1:
- if (PlayerDatas.Instance.skill.GetSKillById(150) == null)
- {
- DebugEx.Log("鎶�鑳芥湭瑙ｉ攣");
- return;
- }
-
- DoCastSkill(150);
- break;
- case 2:
- if (PlayerDatas.Instance.skill.GetSKillById(250) == null)
- {
- DebugEx.Log("鎶�鑳芥湭瑙ｉ攣");
- return;
- }
-
- DoCastSkill(250);
- break;
- default:
- break;
- }
-
-
+ {
+ var model = ModelCenter.Instance.GetModel<SkillModel>();
+ var skillXpId = model.GetXpSkillID();
+ if (PlayerDatas.Instance.skill.GetSKillById(skillXpId) == null)
+ {
+ DebugEx.Log("鎶�鑳芥湭瑙ｉ攣");
+ return;
+ }
+ DoCastSkill(skillXpId);
}
void PrepareCastSkill1()
@@ -353,29 +329,14 @@
void PrepareCastSkillXp()
{
- switch (PlayerDatas.Instance.baseData.Job)
- {
- case 1:
- if (PlayerDatas.Instance.skill.GetSKillById(150) == null)
- {
- DebugEx.Log("鎶�鑳芥湭瑙ｉ攣");
- return;
- }
-
- DoPrepareCast(150);
- break;
- case 2:
- if (PlayerDatas.Instance.skill.GetSKillById(250) == null)
- {
- DebugEx.Log("鎶�鑳芥湭瑙ｉ攣");
- return;
- }
-
- DoPrepareCast(250);
- break;
- default:
- break;
- }
+ var model = ModelCenter.Instance.GetModel<SkillModel>();
+ var skillXpId = model.GetXpSkillID();
+ if (PlayerDatas.Instance.skill.GetSKillById(skillXpId) == null)
+ {
+ DebugEx.Log("鎶�鑳芥湭瑙ｉ攣");
+ return;
+ }
+ DoPrepareCast(skillXpId);
}
void PrepareCastBlinkSkill()
--
Gitblit v1.8.0