From 469dbd2e5a06faab01e8190d038db83edb12cbe0 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 16 五月 2019 17:52:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Skill/ExpertSkillActiveRemindWin.cs | 51 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 39 insertions(+), 12 deletions(-)
diff --git a/System/Skill/ExpertSkillActiveRemindWin.cs b/System/Skill/ExpertSkillActiveRemindWin.cs
index 5ce729e..efcdc42 100644
--- a/System/Skill/ExpertSkillActiveRemindWin.cs
+++ b/System/Skill/ExpertSkillActiveRemindWin.cs
@@ -14,9 +14,11 @@
public class ExpertSkillActiveRemindWin : Window
{
+ [SerializeField] Text m_Reiki;
[SerializeField] Text m_Remind;
[SerializeField] Button m_GotoReiki;
- [SerializeField] Button m_GetPath;
+ [SerializeField] Button m_Confirm;
+ [SerializeField] Button m_Cancel;
[SerializeField] Button m_Close;
public static int skillId = 0;
@@ -32,7 +34,8 @@
protected override void AddListeners()
{
m_GotoReiki.AddListener(GotoReiki);
- m_GetPath.AddListener(GetPath);
+ m_Confirm.AddListener(Confirm);
+ m_Cancel.AddListener(CloseClick);
m_Close.AddListener(CloseClick);
}
@@ -65,27 +68,50 @@
var requireProperty = skillConfig.RequireProperty();
var requireValue = skillConfig.RequirePropertyValue();
var propertyConfig = PlayerPropertyConfig.Get(requireProperty);
- m_Remind.text = Language.Get("ExpertSkillActiveRemind", propertyConfig.Name, requireValue);
- if (reikiRootModel.freePoint + reikiRootModel.GetReikiRootPoint(requireProperty) >= requireValue)
+ var point = requireValue - reikiRootModel.GetReikiRootPoint(requireProperty);
+ if (reikiRootModel.freePoint >= point)
{
- m_GotoReiki.gameObject.SetActive(true);
- m_GetPath.gameObject.SetActive(false);
+ m_Reiki.text = StringUtility.Contact(propertyConfig.Name, ":", requireValue);
+ m_Reiki.color = UIHelper.GetUIColor(TextColType.Green, true);
+ m_GotoReiki.gameObject.SetActive(false);
+ m_Confirm.gameObject.SetActive(true);
+ m_Cancel.gameObject.SetActive(true);
+ m_Remind.gameObject.SetActive(true);
}
else
{
- m_GotoReiki.gameObject.SetActive(false);
- m_GetPath.gameObject.SetActive(true);
+ m_Reiki.text = StringUtility.Contact(propertyConfig.Name, ":", requireValue
+ , Language.Get("ExpertSkillActiveRemind", point));
+ m_Reiki.color = UIHelper.GetUIColor(TextColType.Red, true);
+ m_GotoReiki.gameObject.SetActive(true);
+ m_Confirm.gameObject.SetActive(false);
+ m_Cancel.gameObject.SetActive(false);
+ m_Remind.gameObject.SetActive(false);
}
}
}
- private void GetPath()
+ private void Confirm()
{
+ TreasurePotential expert;
+ if (model.TryGetPotential(skillId, out expert))
+ {
+ var level = 0;
+ model.TryGetExpertActiveLevel(skillId, out level);
+ var skillConfig = SkillConfig.Get(skillId + level);
+ var requireProperty = skillConfig.RequireProperty();
+ var requireValue = skillConfig.RequirePropertyValue();
+ var propertyConfig = PlayerPropertyConfig.Get(requireProperty);
+ var point = requireValue - reikiRootModel.GetReikiRootPoint(requireProperty);
+
+ if (reikiRootModel.freePoint >= point)
+ {
+ reikiRootModel.SendAddPoint(new byte[1] { (byte)requireProperty }, new ushort[1] { (ushort)point });
+ }
+ }
+
CloseImmediately();
- RealmRecommandEquipGetWayWin.equipGetWays.Clear();
- RealmRecommandEquipGetWayWin.equipGetWays.AddRange(reikiRootModel.reikiRootGetWays);
- WindowCenter.Instance.Open<RealmRecommandEquipGetWayWin>();
}
private void GotoReiki()
@@ -94,6 +120,7 @@
WindowCenter.Instance.CloseImmediately("ExpertSkillSelectWin");
var skillConfig = SkillConfig.Get(skillId);
reikiRootModel.selectReikiRoot = skillConfig.RequireProperty();
+ reikiRootModel.openFromTreasureSkill = true;
WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.RolePoint);
}
}
--
Gitblit v1.8.0