From d5bf165ef28b530ed531aed097ad301278c5fcae Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 15 十一月 2018 14:33:35 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/TipPanel.cs | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/System/MainInterfacePanel/TipPanel.cs b/System/MainInterfacePanel/TipPanel.cs
index e5e3a3e..3bc2eef 100644
--- a/System/MainInterfacePanel/TipPanel.cs
+++ b/System/MainInterfacePanel/TipPanel.cs
@@ -24,12 +24,19 @@
LoginAdModel loginAdModel { get { return ModelCenter.Instance.GetModel<LoginAdModel>(); } }
FirstTimeRechargeModel firstTimeRechargeModel { get { return ModelCenter.Instance.GetModel<FirstTimeRechargeModel>(); } }
StoreModel storeModel { get { return ModelCenter.Instance.GetModel<StoreModel>(); } }
+ TreasureModel treasureModel { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } }
public TipPanel()
{
WindowCenter.Instance.windowAfterOpenEvent += windowBeforeOpen;
NewBieCenter.Instance.guideCompletedEvent += guideCompleted;
StageManager.Instance.onStageLoadFinish += OnStageLoadFinish;
+ TreasureNewGotWin.CloseTreasureNewGotWinEvent += CloseTreasureNewGotWinEvent;
+ }
+
+ private void CloseTreasureNewGotWinEvent()
+ {
+ SnxxzGame.Instance.StartCoroutine(Co_Load());
}
private void OnStageLoadFinish()
@@ -54,7 +61,8 @@
{
yield return null;
if (WindowCenter.Instance.IsOpen<MainInterfaceWin>() && !NewBieCenter.Instance.inGuiding
- && !WindowCenter.Instance.ExitAnyFullScreenOrMaskWin() && !StageManager.Instance.isLoading)
+ && !WindowCenter.Instance.ExitAnyFullScreenOrMaskWin() && !StageManager.Instance.isLoading
+ && !treasureModel.newGotShowing)
{
IsOPenTip();
}
@@ -65,7 +73,7 @@
yield return WaitingForSecondConst.WaitMS500;
if (WindowCenter.Instance.IsOpen<MainInterfaceWin>() && !NewBieCenter.Instance.inGuiding
&& !WindowCenter.Instance.ExitAnyFullScreenOrMaskWin() && !StageManager.Instance.isLoading
- && StageManager.Instance.CurrentStage is DungeonStage)
+ && StageManager.Instance.CurrentStage is DungeonStage && !treasureModel.newGotShowing)
{
IsOPenTip();
}
--
Gitblit v1.8.0