From bc49768eaf9757e20bd264dc6183b2497780ee08 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 18 九月 2018 14:18:08 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/LowSettingTip.cs | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/System/MainInterfacePanel/LowSettingTip.cs b/System/MainInterfacePanel/LowSettingTip.cs
index 5ed198c..7427041 100644
--- a/System/MainInterfacePanel/LowSettingTip.cs
+++ b/System/MainInterfacePanel/LowSettingTip.cs
@@ -26,6 +26,8 @@
[SerializeField] Button m_TreasureSoulBtn;//瑙夐啋鎸夐挳
[SerializeField] Button m_GodBeastBtn;//绁炲吔鎸夐挳
+
+ FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }
public void Init()
{
_Role1Btn.onClick.AddListener(Role1Button);
@@ -133,8 +135,15 @@
void Pet1Button()
{
WindowCenter.Instance.Close<MainInterfaceWin>();
- WindowCenter.Instance.Open<PetWin>();
-
+ if (fairyGrabBossModel.InActivityTime && !NewBieCenter.Instance.inGuiding)
+ {
+ WindowCenter.Instance.Open<PetWin>(false, 2);
+ }
+ else
+ {
+ WindowCenter.Instance.Open<PetWin>();
+ }
+
//DesignDebug.Log("瀹犵墿鎸夐挳");
}
--
Gitblit v1.8.0