From eeebc126b66cadbdcf321d9a7b08331a9d0e0acc Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 18 九月 2018 17:11:38 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/InGamePushContainer.cs | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/System/MainInterfacePanel/InGamePushContainer.cs b/System/MainInterfacePanel/InGamePushContainer.cs
index d98d594..a135d19 100644
--- a/System/MainInterfacePanel/InGamePushContainer.cs
+++ b/System/MainInterfacePanel/InGamePushContainer.cs
@@ -24,6 +24,7 @@
[SerializeField] OffLineTimeLackBehaviour m_OffLineTimeLackBehaviour;
[SerializeField] DungeonGuardCheckBehaviour m_DungeonGuardBehaviour;
[SerializeField] FirstChargeTrialBehaviour m_FirstChargeTrialBehaviour;
+ [SerializeField] FairyGrabBossHelpBehaviour m_FairyGrabBossHelpBehaviour;
WorldBossModel worldBossModel { get { return ModelCenter.Instance.GetModel<WorldBossModel>(); } }
BossHomeModel bossHomeModel { get { return ModelCenter.Instance.GetModel<BossHomeModel>(); } }
@@ -44,7 +45,7 @@
OffLineTimeLackModel offLineTimeLackModel { get { return ModelCenter.Instance.GetModel<OffLineTimeLackModel>(); } }
GuardModel guardModel { get { return ModelCenter.Instance.GetModel<GuardModel>(); } }
FirstTimeRechargeModel firstTimeRechargeModel { get { return ModelCenter.Instance.GetModel<FirstTimeRechargeModel>(); } }
-
+ FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }
public void Init()
{
CheckBetterEquip();
@@ -58,6 +59,7 @@
CheckOffLineLack();
CheckDungeonGuard();
FirstChargeTrialShow();
+ CheckFairyGrabBossHelp();
playerPack.RefreshDecomAttrAct += CheckEquipDecompose;
betterEquipGetModel.showEquipRefreshEvent += CheckBetterEquip;
realmEquipModel.showEquipRefreshEvent += CheckRealmBetterEquip;
@@ -68,10 +70,12 @@
NewBieCenter.Instance.guideBeginEvent += OnNewBieGuideBegin;
guardModel.onDungeonEquipGuardEvent += CheckDungeonGuard;
firstTimeRechargeModel.IsTipShowEvent += FirstChargeTrialShow;
+ fairyGrabBossModel.fairyGrabBossHelpUpdate += CheckFairyGrabBossHelp;
}
public void UnInit()
{
+ fairyGrabBossModel.helpCoolDown = false;
playerPack.RefreshDecomAttrAct -= CheckEquipDecompose;
betterEquipGetModel.showEquipRefreshEvent -= CheckBetterEquip;
preciousItemGetModel.showItemRefreshEvent -= CheckPreciousItem;
@@ -81,8 +85,8 @@
guardModel.onDungeonEquipGuardEvent -= CheckDungeonGuard;
firstTimeRechargeModel.IsTipShowEvent -= FirstChargeTrialShow;
realmEquipModel.showEquipRefreshEvent -= CheckRealmBetterEquip;
+ fairyGrabBossModel.fairyGrabBossHelpUpdate -= CheckFairyGrabBossHelp;
}
-
private void CheckRealmBetterEquip()
{
@@ -329,6 +333,19 @@
}
}
+
+ private void CheckFairyGrabBossHelp()
+ {
+ if (fairyGrabBossModel.fairyGrabBossHelps.Count > 0)
+ {
+ m_FairyGrabBossHelpBehaviour.gameObject.SetActive(true);
+ m_FairyGrabBossHelpBehaviour.Display();
+ }
+ else
+ {
+ m_FairyGrabBossHelpBehaviour.gameObject.SetActive(false);
+ }
+ }
}
}
--
Gitblit v1.8.0