From 7bf61af608615884ab5a4a83569639d538ed665b Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 21 八月 2018 16:56:59 +0800
Subject: [PATCH] 提交天赋部分代码
---
System/Skill/SkillPanel.cs | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/System/Skill/SkillPanel.cs b/System/Skill/SkillPanel.cs
index 5c7bede..3b543df 100644
--- a/System/Skill/SkillPanel.cs
+++ b/System/Skill/SkillPanel.cs
@@ -62,6 +62,15 @@
private void OnTalentFunc()
{
CloseChild();
+ functionOrder = 2;
+ if (windowState == WindowState.Opened)
+ {
+ WindowCenter.Instance.OpenWithoutAnimation<TalentWin>();
+ }
+ else
+ {
+ WindowCenter.Instance.Open<TalentWin>();
+ }
}
private void OnAccordFunc()
@@ -83,7 +92,7 @@
protected override void OnActived()
{
base.OnActived();
- functionButtonTalent.state = TitleBtnState.Locked;
+ //functionButtonTalent.state = TitleBtnState.Locked;
if (functionOrder == 0 && model.jumpToPass)
{
@@ -123,6 +132,10 @@
if (WindowCenter.Instance.CheckOpen<SkillPassWin>()) {
WindowCenter.Instance.CloseImmediately<SkillPassWin>();
}
+ if (WindowCenter.Instance.CheckOpen<TalentWin>())
+ {
+ WindowCenter.Instance.CloseImmediately<TalentWin>();
+ }
}
}
}
--
Gitblit v1.8.0