From 0c52af038fdc092d09880b89b494df916b944579 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 25 三月 2019 17:11:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into ReikiRoot
---
System/MainInterfacePanel/InGamePushContainer.cs | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/System/MainInterfacePanel/InGamePushContainer.cs b/System/MainInterfacePanel/InGamePushContainer.cs
index 32f84d7..79052b3 100644
--- a/System/MainInterfacePanel/InGamePushContainer.cs
+++ b/System/MainInterfacePanel/InGamePushContainer.cs
@@ -29,16 +29,12 @@
[SerializeField] InSevenDayBehavior m_InSevenDayBehavior;
[SerializeField] FBHelpPointExchageNotify m_HelpPointExchangeNotify;
[SerializeField] MyFocusBehavior m_MyFocusBehavio;
+ [SerializeField] AuctionNewGetBehaviour m_AuctionNewGetBehaviour;
WorldBossModel worldBossModel { get { return ModelCenter.Instance.GetModel<WorldBossModel>(); } }
- BossHomeModel bossHomeModel { get { return ModelCenter.Instance.GetModel<BossHomeModel>(); } }
- ElderGodAreaModel elderGodAreaModel { get { return ModelCenter.Instance.GetModel<ElderGodAreaModel>(); } }
- DemonJarModel demonJarModel { get { return ModelCenter.Instance.GetModel<DemonJarModel>(); } }
DogzDungeonModel dogzDungeonModel { get { return ModelCenter.Instance.GetModel<DogzDungeonModel>(); } }
CrossServerBossModel crossServerBossModel { get { return ModelCenter.Instance.GetModel<CrossServerBossModel>(); } }
- JadeDynastyBossModel jadeDynastyBossModel { get { return ModelCenter.Instance.GetModel<JadeDynastyBossModel>(); } }
- VipModel vipModel { get { return ModelCenter.Instance.GetModel<VipModel>(); } }
DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
FBHelpPointExchageModel exchageModel { get { return ModelCenter.Instance.GetModel<FBHelpPointExchageModel>(); } }
FindPreciousModel findPreciousModel { get { return ModelCenter.Instance.GetModel<FindPreciousModel>(); } }
@@ -55,6 +51,7 @@
FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }
DogzModel dogzModel { get { return ModelCenter.Instance.GetModel<DogzModel>(); } }
InSevenDayModel inSevenDayModel { get { return ModelCenter.Instance.GetModel<InSevenDayModel>(); } }
+ AuctionNewGetShowModel auctionNewGetShowModel { get { return ModelCenter.Instance.GetModel<AuctionNewGetShowModel>(); } }
public void Init()
{
@@ -73,6 +70,7 @@
CheckDogzNotify();
InSevenDayShow();
CheckHelpPointExchange();
+ CheckNewAuction();
m_MyFocusBehavio.Init();
exchageModel.UpdateHelpPointShopEvent += CheckHelpPointExchange;
playerPack.RefreshDecomAttrAct += CheckEquipDecompose;
@@ -87,6 +85,7 @@
firstTimeRechargeModel.IsTipShowEvent += FirstChargeTrialShow;
fairyGrabBossModel.fairyGrabBossHelpUpdate += CheckFairyGrabBossHelp;
dogzModel.UpdateDogzPutRedEvent += CheckDogzNotify;
+ auctionNewGetShowModel.newAcutionRefreshEvent += CheckNewAuction;
}
public void UnInit()
@@ -105,6 +104,7 @@
realmEquipModel.showEquipRefreshEvent -= CheckRealmBetterEquip;
fairyGrabBossModel.fairyGrabBossHelpUpdate -= CheckFairyGrabBossHelp;
dogzModel.UpdateDogzPutRedEvent -= CheckDogzNotify;
+ auctionNewGetShowModel.newAcutionRefreshEvent -= CheckNewAuction;
}
private void CheckHelpPointExchange()
@@ -167,6 +167,11 @@
m_DogzNotifyBehaviour.SetDisplay();
}
+ private void CheckNewAuction()
+ {
+ m_AuctionNewGetBehaviour.Display(auctionNewGetShowModel.showingAuction);
+ }
+
private void CheckPreciousItem()
{
if (preciousItemGetModel.currentShowItem == default(PreciousItemGetModel.PreciousItem))
--
Gitblit v1.8.0