From 61ecdebb21abddc10ea86fa002dd7e7801eccc6a Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 30 九月 2019 16:22:18 +0800
Subject: [PATCH] 0312 技能调整初版
---
System/MainWin/SkillContainer.cs | 70 ++++++++++++++++------------------
1 files changed, 33 insertions(+), 37 deletions(-)
diff --git a/System/MainWin/SkillContainer.cs b/System/MainWin/SkillContainer.cs
index 8ff1f2a..73f1628 100644
--- a/System/MainWin/SkillContainer.cs
+++ b/System/MainWin/SkillContainer.cs
@@ -44,8 +44,8 @@
[SerializeField] SkillButton m_Skill7;
public SkillButton skill7 { get { return m_Skill7; } }
- [SerializeField] SkillButton m_SkillXP;
- public SkillButton skillXP { get { return m_SkillXP; } }
+ [SerializeField] SkillButton m_Skill8;
+ public SkillButton skill8 { get { return m_Skill8; } }
const int SKILL_COUNT_MAX = 8;
Dictionary<int, int> indexSkillDataDict = new Dictionary<int, int>();
@@ -64,7 +64,7 @@
m_Skill5.AddDownListener(CastSkill5);
m_Skill6.AddDownListener(CastSkill6);
m_Skill7.AddDownListener(CastSkill7);
- m_SkillXP.AddDownListener(CastSkillXp);
+ m_Skill8.AddDownListener(CastSkill8);
m_BlinkSkill.AddUpListener(PrepareCastBlinkSkill);
m_Skill1.AddUpListener(PrepareCastSkill1);
@@ -74,11 +74,11 @@
m_Skill5.AddUpListener(PrepareCastSkill5);
m_Skill6.AddUpListener(PrepareCastSkill6);
m_Skill7.AddUpListener(PrepareCastSkill7);
- m_SkillXP.AddUpListener(PrepareCastSkillXp);
+ m_Skill8.AddUpListener(PrepareCastSkill8);
MainWinSkillController.Instance.InitSkill();
OnSkillRefresh();
- HandleAchievement();
+ //HandleAchievement();
PlayerSkillDatas.OnRefreshSkill += OnSkillRefresh;
}
@@ -95,7 +95,7 @@
m_Skill5.RemoveAllListeners();
m_Skill6.RemoveAllListeners();
m_Skill7.RemoveAllListeners();
- skillXP.RemoveAllListeners();
+ m_Skill8.RemoveAllListeners();
m_BlinkSkill.Dispose();
m_Skill1.Dispose();
@@ -105,13 +105,13 @@
m_Skill5.Dispose();
m_Skill6.Dispose();
m_Skill7.Dispose();
- skillXP.Dispose();
+ m_Skill8.Dispose();
PlayerSkillDatas.OnRefreshSkill -= OnSkillRefresh;
- if (AchievementGoto.achievementType == AchievementGoto.ExcuteSkill)
- {
- AchievementGoto.achievementType = 0;
- }
+ //if (AchievementGoto.achievementType == AchievementGoto.ExcuteSkill)
+ //{
+ // AchievementGoto.achievementType = 0;
+ //}
}
private void OnSkillRefresh()
@@ -129,14 +129,11 @@
m_Skill5.Initialize(indexSkillDataDict[4]);
m_Skill6.Initialize(indexSkillDataDict[5]);
m_Skill7.Initialize(indexSkillDataDict[6]);
+ m_Skill8.Initialize(indexSkillDataDict[7]);
var blinkSkillData = PlayerDatas.Instance.skill.GetSKillById(190);
m_BlinkSkill.Initialize(blinkSkillData == null ? 0 : blinkSkillData.id);
-
- var model = ModelCenter.Instance.GetModel<SkillModel>();
- var skillXpId = model.GetXpSkillID();
- var skillXpData = PlayerDatas.Instance.skill.GetSKillById(skillXpId);
- m_SkillXP.Initialize(skillXpData != null ? skillXpId : 0);
+
}
void SwitchTarget()
@@ -241,19 +238,19 @@
}
DoCastSkill(indexSkillDataDict[6]);
- }
+ }
+
+ void CastSkill8()
+ {
+ if (indexSkillDataDict[7] == 0)
+ {
+ DebugEx.Log("鎶�鑳芥湭瑙ｉ攣");
+ return;
+ }
- void CastSkillXp()
- {
- var model = ModelCenter.Instance.GetModel<SkillModel>();
- var skillXpId = model.GetXpSkillID();
- if (PlayerDatas.Instance.skill.GetSKillById(skillXpId) == null)
- {
- DebugEx.Log("鎶�鑳芥湭瑙ｉ攣");
- return;
- }
- DoCastSkill(skillXpId);
- }
+ DoCastSkill(indexSkillDataDict[7]);
+ }
+
void PrepareCastSkill1()
{
@@ -333,16 +330,15 @@
DoPrepareCast(indexSkillDataDict[6]);
}
- void PrepareCastSkillXp()
+ void PrepareCastSkill8()
{
- var model = ModelCenter.Instance.GetModel<SkillModel>();
- var skillXpId = model.GetXpSkillID();
- if (PlayerDatas.Instance.skill.GetSKillById(skillXpId) == null)
- {
- DebugEx.Log("鎶�鑳芥湭瑙ｉ攣");
- return;
- }
- DoPrepareCast(skillXpId);
+ if (indexSkillDataDict[7] == 0)
+ {
+ DebugEx.Log("鎶�鑳芥湭瑙ｉ攣");
+ return;
+ }
+
+ DoPrepareCast(indexSkillDataDict[7]);
}
void PrepareCastBlinkSkill()
--
Gitblit v1.8.0