From e89c81f45f344186069dc9cfa8b4e232f6f9822d Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 24 十月 2018 17:30:48 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/MainInterfaceWin.cs | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/System/MainInterfacePanel/MainInterfaceWin.cs b/System/MainInterfacePanel/MainInterfaceWin.cs
index 9b410d1..03404f4 100644
--- a/System/MainInterfacePanel/MainInterfaceWin.cs
+++ b/System/MainInterfacePanel/MainInterfaceWin.cs
@@ -202,7 +202,7 @@
m_TeamInvitationEntrance.Init();
m_FairyCallBehaviour.Init();
m_BossBriefInfos.gameObject.SetActive(false);
- ClickWishAward();
+ UpdateWishAwardImag();
ArticleExperience();//鍏充簬缁忛獙鏉�
FriendQuestBtn();
UpdateFairyRequest();
@@ -228,7 +228,7 @@
RedpointCenter.Instance.redpointValueChangeEvent += RedpointValueChangeEvent;
NewBieCenter.Instance.guideBeginEvent += GuideBeginEvent;
fairyGrabBossModel.bossGrabHintEvent += bossGrabHintEvent;
- wishModel.UpdateWishAwardEvent += ClickWishAward;
+ wishModel.UpdateWishAwardEvent += UpdateWishAwardImag;
fairyGrabBossModel.gotoBossStateUpdate += ShowFairyGrabBoss;
}
@@ -400,7 +400,7 @@
GA_NpcCollect.OnArrive -= OnArriveCollectNPC;
GA_NpcCollect.OnLeave -= OnLeaveCollectNpc;
fairyGrabBossModel.bossGrabHintEvent -= bossGrabHintEvent;
- wishModel.UpdateWishAwardEvent -= ClickWishAward;
+ wishModel.UpdateWishAwardEvent -= UpdateWishAwardImag;
m_CollectBtn.gameObject.SetActive(false);
}
@@ -660,6 +660,11 @@
private void ClickWishAward()
{
+ WindowCenter.Instance.Open<WishingGetItemWin>();
+ }
+
+ private void UpdateWishAwardImag()
+ {
WishingAwardImg.gameObject.SetActive(wishModel.wishingAwardDict.Count > 0 ? true : false);
}
--
Gitblit v1.8.0