From 0c7d47ae29d60a715b35a281fd8d2d5022567d93 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 27 三月 2019 10:09:22 +0800
Subject: [PATCH] Merge branch 'master' into TreasureMission
---
System/MainInterfacePanel/MainButtonMisc.cs | 56 +++++++++++++++++++++++++++++---------------------------
1 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/System/MainInterfacePanel/MainButtonMisc.cs b/System/MainInterfacePanel/MainButtonMisc.cs
index 4d5aa88..896c0f8 100644
--- a/System/MainInterfacePanel/MainButtonMisc.cs
+++ b/System/MainInterfacePanel/MainButtonMisc.cs
@@ -1,14 +1,14 @@
-锘�//--------------------------------------------------------
-// [Author]: 绗簩涓栫晫
-// [ Date ]: Tuesday, February 19, 2019
-//--------------------------------------------------------
-using UnityEngine;
-using System.Collections;
-using UnityEngine.UI;
-
+锘�//--------------------------------------------------------
+// [Author]: 绗簩涓栫晫
+// [ Date ]: Tuesday, February 19, 2019
+//--------------------------------------------------------
+using UnityEngine;
+using System.Collections;
+using UnityEngine.UI;
+
namespace Snxxz.UI
-{
-
+{
+
public class MainButtonMisc : MonoBehaviour
{
[SerializeField] Button m_RedBag;//绾㈠寘鍏ュ彛鎸夐挳
@@ -52,7 +52,7 @@
CheckSendRedpackBtn();
ShowFairyGrabBoss();
IsCrossServerOneVsOne();
-
+
RedPacketModel.OnRedBagGetEvent += OnRedBagGet;
OSEnvelopeModel.OSRedEnvelopeUpdateEvent += OnRedBagGet;
OSEnvelopeModel.OSRedEnvelopeInfoEnvent += OnRedBagGet;
@@ -60,6 +60,8 @@
PlayerDatas.Instance.playerDataRefreshEvent += Updatefighting;
GA_NpcCollect.OnArrive += OnArriveCollectNPC;
GA_NpcCollect.OnLeave += OnLeaveCollectNpc;
+ GA_NpcClientCollect.OnArrive += OnArriveCollectNPC;
+ GA_NpcClientCollect.OnLeave += OnLeaveCollectNpc;
wishModel.UpdateWishAwardEvent += UpdateWishAwardImag;
purchaseModel.UpdateNewMysticalEvent += UpdateMysticalPurchaseImag;
assistModel.UpdateRedpointEvent += UpdateDungeonAssistImag;
@@ -67,12 +69,12 @@
fairyGrabBossModel.gotoBossStateUpdate += ShowFairyGrabBoss;
ChatTip.OnChatUpEvent += RefreshAdaptiveChat;
fairyModel.UpdateFairyRequestEvent += UpdateFairyRequest;
- }
+ }
public void OnActived()
{
- RefreshAdaptiveChat();
+ RefreshAdaptiveChat();
- }
+ }
public void Unit()
{
m_CollectBehaviour.Dispose();
@@ -215,11 +217,11 @@
{
m_CollectBehaviour.Dispose();
m_CollectBehaviour.gameObject.SetActive(false);
- }
+ }
private void ClickWishAward()
{
WindowCenter.Instance.Open<WishingGetItemWin>();
- }
+ }
private void UpdateWishAwardImag()
{
m_WishingAwardImg.gameObject.SetActive(wishModel.wishingAwardDict.Count > 0 ? true : false);
@@ -235,7 +237,7 @@
private void ClickDungeonAssist()
{
WindowCenter.Instance.Open<DungeonAssistWin>();
- }
+ }
private void UpdateDungeonAssistImag()
{
m_DungeonAssistImg.gameObject.SetActive(assistModel.IsNewAssistInfo);
@@ -297,7 +299,7 @@
{
if (fairyGrabBossModel.flyToGrabBossRemind)
{
- var money = (int)UIHelper.GetMoneyCnt(1) ;
+ var money = (int)UIHelper.GetMoneyCnt(1);
if (money >= 1)
{
FlyShoesUseCallback();
@@ -369,18 +371,18 @@
private void OnClickFriendQuest()
{
WindowCenter.Instance.Open<FriendQuestWin>();
- }
+ }
private void OnFairyRequestClick()
{
WindowCenter.Instance.Open<FairyInviteWin>();
- }
+ }
private void UpdateFairyRequest()
{
m_FairyRequestBtn.gameObject.SetActive(fairyModel.FairyRequestRedPoint.count > 0);
- }
- }
-
-}
-
-
-
+ }
+ }
+
+}
+
+
+
--
Gitblit v1.8.0