From 36a67fa54ddfa8638c3488d00bbcd2d87a076041 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 20 九月 2018 17:29:16 +0800
Subject: [PATCH] 1871天赋功能
---
System/Skill/TalentWin.cs | 67 ++++++++-------------------------
1 files changed, 16 insertions(+), 51 deletions(-)
diff --git a/System/Skill/TalentWin.cs b/System/Skill/TalentWin.cs
index addb72e..df1b291 100644
--- a/System/Skill/TalentWin.cs
+++ b/System/Skill/TalentWin.cs
@@ -16,15 +16,9 @@
{
[SerializeField] TalentButtonBehaviour[] m_TalentButtons;
[SerializeField] TalentTreeBehaviour[] m_TalentTrees;
-
[SerializeField] RectTransform m_ContainerSelect;
-
[SerializeField] Button m_TalentSeriesSelect;
[SerializeField] Text m_TalentSeries;
-
- [SerializeField] ScrollRect m_SkillScroller;
- [SerializeField] TalentSkillBehaviour[] m_SkillBehaviours;
-
[SerializeField] RectTransform m_ContainerSelectSkill;
[SerializeField] Image m_SelectSkillIcon;
[SerializeField] Text m_SelectSkillLevel;
@@ -81,10 +75,9 @@
{
m_TalentButtons[i].Dispose();
}
-
- for (int i = 0; i < m_SkillBehaviours.Length; i++)
+ for (int i = 0; i < m_TalentTrees.Length; i++)
{
- m_SkillBehaviours[i].Dispose();
+ m_TalentTrees[i].Dispose();
}
}
@@ -108,29 +101,20 @@
void DisplaySkills()
{
- //var job = PlayerDatas.Instance.baseData.Job;
- //List<int> talentSkills;
- //model.TryGetTalents(job, model.selectSeries, model.selectTalentType, out talentSkills);
- //var config = model.selectTalentType == 1 ? m_TalentAtkConfig : model.selectTalentType == 2 ?
- // m_TalentDefConfig : m_TalentGeneralConfig;
- //m_SkillScroller.verticalNormalizedPosition = 1;
- //for (int i = 0; i < m_SkillBehaviours.Length; i++)
- //{
- // if (talentSkills != null && i < talentSkills.Count)
- // {
- // m_SkillBehaviours[i].gameObject.SetActive(true);
- // var position = config == null ? Vector3.zero : config.GetSkillPosition(i);
- // m_SkillBehaviours[i].transform.localPosition = position;
- // m_SkillBehaviours[i].Display(talentSkills[i]);
- // }
- // else
- // {
- // m_SkillBehaviours[i].Dispose();
- // m_SkillBehaviours[i].gameObject.SetActive(false);
- // }
- //}
- //
- //model.selectSkill = talentSkills != null ? talentSkills[0] : 0;
+ var job = PlayerDatas.Instance.baseData.Job;
+ for (int i = 0; i < m_TalentTrees.Length; i++)
+ {
+ m_TalentTrees[i].Dispose();
+ if (m_TalentTrees[i].BelongToTalentTree(job, model.selectSeries, model.selectTalentType))
+ {
+ m_TalentTrees[i].gameObject.SetActive(true);
+ m_TalentTrees[i].Display(model.selectSeries, model.selectTalentType);
+ }
+ else
+ {
+ m_TalentTrees[i].gameObject.SetActive(false);
+ }
+ }
}
void DisplaySeries()
@@ -145,25 +129,6 @@
void DisplaySelectSkill()
{
m_ContainerSelect.gameObject.SetActive(false);
- var job = PlayerDatas.Instance.baseData.Job;
- List<int> talentSkills;
- model.TryGetTalents(job, model.selectSeries, model.selectTalentType, out talentSkills);
- if (talentSkills != null)
- {
- var index = talentSkills.FindIndex((x) =>
- {
- return x == model.selectSkill;
- });
- if (index != -1)
- {
- if (index < m_SkillBehaviours.Length)
- {
- m_ContainerSelect.gameObject.SetActive(true);
- m_ContainerSelect.SetParent(m_SkillBehaviours[index].transform);
- m_ContainerSelect.localPosition = Vector3.zero;
- }
- }
- }
DisplaySkillInfo();
DisplayConditions();
--
Gitblit v1.8.0