From d3070b4cfa14d0073c8cb4e99819f7f45c6d2ec1 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期四, 22 十一月 2018 20:59:56 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Message/BattleHintWin.cs | 11 +++++++++++
System/Treasure/TreasureDemonBehaviour.cs | 8 ++++----
System/Treasure/DemonTreasureWin.cs | 1 +
System/Message/BattleHint.cs | 6 ++++--
4 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/System/Message/BattleHint.cs b/System/Message/BattleHint.cs
index c8b10fa..f61b078 100644
--- a/System/Message/BattleHint.cs
+++ b/System/Message/BattleHint.cs
@@ -79,7 +79,8 @@
public void Receive(int ancientType)
{
- if (battleHints.Contains(ancientType))
+ if (battleHints.Contains(ancientType)
+ || WindowCenter.Instance.IsOpen<TreasureBaseWin>())
{
return;
}
@@ -101,7 +102,8 @@
{
if (PlayerDatas.Instance.baseData.MapID != 31160
|| !(StageManager.Instance.CurrentStage is DungeonStage)
- || StageManager.Instance.isLoading)
+ || StageManager.Instance.isLoading
+ || WindowCenter.Instance.IsOpen<TreasureBaseWin>())
{
return;
}
diff --git a/System/Message/BattleHintWin.cs b/System/Message/BattleHintWin.cs
index 9662667..f3c2dcd 100644
--- a/System/Message/BattleHintWin.cs
+++ b/System/Message/BattleHintWin.cs
@@ -54,6 +54,7 @@
DisplayEvenKill();
BattleHint.Instance.battleHintUpdate += BattleHintUpdate;
BattleHint.Instance.evenKillUpdate += EvenKillUpdate;
+ WindowCenter.Instance.windowBeforeOpenEvent += WindowBeforeOpenEvent;
}
protected override void OnAfterOpen()
@@ -62,8 +63,10 @@
protected override void OnPreClose()
{
+ StopAllCoroutines();
BattleHint.Instance.battleHintUpdate -= BattleHintUpdate;
BattleHint.Instance.evenKillUpdate -= EvenKillUpdate;
+ WindowCenter.Instance.windowBeforeOpenEvent -= WindowBeforeOpenEvent;
}
protected override void OnAfterClose()
@@ -71,6 +74,14 @@
}
#endregion
+ private void WindowBeforeOpenEvent(Window window)
+ {
+ if (window is TreasureBaseWin)
+ {
+ CloseImmediately();
+ }
+ }
+
private void BattleHintUpdate()
{
if (!isBattleHint)
diff --git a/System/Treasure/DemonTreasureWin.cs b/System/Treasure/DemonTreasureWin.cs
index 96384ff..3d58ea3 100644
--- a/System/Treasure/DemonTreasureWin.cs
+++ b/System/Treasure/DemonTreasureWin.cs
@@ -389,6 +389,7 @@
DisplaySkill();
DisplayProperty();
DisplayChallenge();
+ DisplayDungeons();
UpdateAnimationStep();
}
diff --git a/System/Treasure/TreasureDemonBehaviour.cs b/System/Treasure/TreasureDemonBehaviour.cs
index 0845910..26f6ed2 100644
--- a/System/Treasure/TreasureDemonBehaviour.cs
+++ b/System/Treasure/TreasureDemonBehaviour.cs
@@ -34,20 +34,20 @@
private void OnEnable()
{
- model.treasureStateChangeEvent += treasureStateChangeEvent;
+ model.treasureStateChangeEvent += TreasureStateChangeEvent;
}
- private void treasureStateChangeEvent(int _id)
+ private void TreasureStateChangeEvent(int _id)
{
if (_id == m_Treasure.id)
{
- m_Limit.gameObject.SetActive(m_Treasure.state != TreasureState.Collected);
+ Display(_id);
}
}
private void OnDisable()
{
- model.treasureStateChangeEvent -= treasureStateChangeEvent;
+ model.treasureStateChangeEvent -= TreasureStateChangeEvent;
}
public void Display(int _id)
--
Gitblit v1.8.0