From 0815093c729d555c21be60688a84af2796ffdb09 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 08 五月 2019 11:47:32 +0800
Subject: [PATCH] 6680 子 【2.0】【开发】五行专精激活方式变更 / 【2.0】【前端】五行专精激活方式变更
---
System/Skill/ExpertSkillSelectWin.cs | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/System/Skill/ExpertSkillSelectWin.cs b/System/Skill/ExpertSkillSelectWin.cs
index a702a6c..dab09f2 100644
--- a/System/Skill/ExpertSkillSelectWin.cs
+++ b/System/Skill/ExpertSkillSelectWin.cs
@@ -160,8 +160,9 @@
m_Reiki.text = propertyConfig.Name;
m_Reiki.color = UIHelper.GetPropertyColor(property);
+ var propertyValueLabel = UIHelper.AppendColor(TextColType.Green, UIHelper.GetPropertyValue((PropertyType)property).ToString());
m_ReikiPoint.text = string.Format("鎴戠殑{0}鐏垫牴锛歿1}",
- propertyConfig.Name, UIHelper.GetPropertyValue((PropertyType)property));
+ propertyConfig.Name, propertyValueLabel);
datas.Clear();
for (int i = 1; i <= skillConfig.SkillMaxLV; i++)
@@ -172,15 +173,17 @@
}
}
- if (!animationStep)
- {
- m_LayoutElement.preferredHeight = datas.Count > 2 ? 440 : 302;
- }
-
m_CyclicScroll.enabled = true;
m_CyclicScroll.Dispose();
m_CyclicScroll.Init(datas);
+
+ if (!animationStep)
+ {
+ m_LayoutElement.preferredHeight = datas.Count > 2 ? 440 : 302;
+ m_CyclicScroll.ReArrange();
+ }
+
StartCoroutine(Co_Arrange(animationStep, datas.Count > 2 ? 440 : 302));
}
}
@@ -216,13 +219,18 @@
void DisplayButtonState()
{
+ var selectExpertSkill = 0;
+ model.TryGetExpertSkill(selectSkillId, out selectExpertSkill);
+
+ var used = selectExpertSkill == selectExpert;
+
TreasurePotential expert;
if (model.TryGetPotential(selectExpert, out expert))
{
var satisfyActive = model.SatisfyActiveExpert(selectExpert);
var activeLevel = 0;
model.TryGetExpertActiveLevel(selectExpert, out activeLevel);
- m_Select.gameObject.SetActive(activeLevel > 0 && !satisfyActive);
+ m_Select.gameObject.SetActive(activeLevel > 0 && !satisfyActive && !used);
m_Active.gameObject.SetActive(satisfyActive);
}
}
--
Gitblit v1.8.0