From 219316ab0f220e8253ef19b8671b6867a520914b Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 31 八月 2018 15:34:25 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/HighSettingTip.cs | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/System/MainInterfacePanel/HighSettingTip.cs b/System/MainInterfacePanel/HighSettingTip.cs
index cb10cfa..1a13b31 100644
--- a/System/MainInterfacePanel/HighSettingTip.cs
+++ b/System/MainInterfacePanel/HighSettingTip.cs
@@ -58,6 +58,8 @@
StoreModel storeModel { get { return ModelCenter.Instance.GetModel<StoreModel>(); } }
OSGiftModel osGiftModel { get { return ModelCenter.Instance.GetModel<OSGiftModel>(); } }
PlayerMainDate mainModel { get { return ModelCenter.Instance.GetModel<PlayerMainDate>(); } }
+
+ FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }
private void Start()
{
isNeedTip = true;
@@ -250,7 +252,14 @@
void LootPreciousButton()//澶哄疂
{
WindowCenter.Instance.Close<MainInterfaceWin>();
- WindowCenter.Instance.Open<LootPreciousFrameWin>();
+ if (fairyGrabBossModel.InActivityTime)
+ {
+ WindowCenter.Instance.Open<LootPreciousFrameWin>(false, 1);
+ }
+ else
+ {
+ WindowCenter.Instance.Open<LootPreciousFrameWin>();
+ }
}
void RechargeButton()//鍏呭�兼寜閽�
--
Gitblit v1.8.0