From 2c6123a7605913bdbf3984b77fbe04446eb400c8 Mon Sep 17 00:00:00 2001
From: client_Lhy <995049470@qq.com>
Date: 星期四, 27 六月 2019 11:01:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Skill/ExpertSkillSelectWin.cs | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/System/Skill/ExpertSkillSelectWin.cs b/System/Skill/ExpertSkillSelectWin.cs
index 913a913..2f70e65 100644
--- a/System/Skill/ExpertSkillSelectWin.cs
+++ b/System/Skill/ExpertSkillSelectWin.cs
@@ -11,7 +11,7 @@
namespace Snxxz.UI
{
-
+ [XLua.LuaCallCSharp]
public class ExpertSkillSelectWin : Window
{
[SerializeField] Image m_SkillIcon;
@@ -30,7 +30,7 @@
bool firstActive = false;
- bool openByTreasure = false;
+ bool openFromOtherWindow = false;
List<int> datas = new List<int>();
@@ -52,7 +52,8 @@
protected override void OnPreOpen()
{
model.expertActiveRefresh += ExpertActiveRefresh;
- openByTreasure = WindowCenter.Instance.IsOpen<TreasureBaseWin>();
+ openFromOtherWindow = WindowCenter.Instance.IsOpen<TreasureBaseWin>()
+ || WindowCenter.Instance.IsOpen("SkillMatchWin");
firstActive = false;
}
@@ -138,10 +139,10 @@
var satisfyActive = model.SatisfyActiveExpert(skillId, out error);
m_Active.gameObject.SetActive((satisfyActive || error == 3)
- && !firstActive && !openByTreasure);
+ && !firstActive && !openFromOtherWindow);
if ((satisfyActive || error == 3)
- && !firstActive && !openByTreasure)
+ && !firstActive && !openFromOtherWindow)
{
if (satisfyActive && !m_ActiveEffect.IsPlaying)
{
--
Gitblit v1.8.0