From 0ed1cf288b8a6cd657c4c83b82bcc9f71c435ab2 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 08 五月 2019 16:36:16 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/MainButtonMisc.cs | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/System/MainInterfacePanel/MainButtonMisc.cs b/System/MainInterfacePanel/MainButtonMisc.cs
index f05af9c..90b0981 100644
--- a/System/MainInterfacePanel/MainButtonMisc.cs
+++ b/System/MainInterfacePanel/MainButtonMisc.cs
@@ -5,6 +5,7 @@
using UnityEngine;
using System.Collections;
using UnityEngine.UI;
+using System;
namespace Snxxz.UI
{
@@ -23,6 +24,7 @@
[SerializeField] Button m_FlyToFairyGrabBoss;
[SerializeField] Button m_FriendQuestBtn;
[SerializeField] Button m_FairyRequestBtn;
+ [SerializeField] Button m_ReikiResetRemind;
FestivalRedpackModel festivalRedpackModel { get { return ModelCenter.Instance.GetModel<FestivalRedpackModel>(); } }
OSRedEnvelopeModel OSEnvelopeModel { get { return ModelCenter.Instance.GetModel<OSRedEnvelopeModel>(); } }
@@ -33,6 +35,7 @@
FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }
FriendsModel friendsModel { get { return ModelCenter.Instance.GetModel<FriendsModel>(); } }
FairyModel fairyModel { get { return ModelCenter.Instance.GetModel<FairyModel>(); } }
+ ReikiRootModel reikiRootModel { get { return ModelCenter.Instance.GetModel<ReikiRootModel>(); } }
private void Start()
{
@@ -44,6 +47,7 @@
m_GotoFairyGrabBoss.SetListener(GotoFairyGrabBoss);
m_FlyToFairyGrabBoss.SetListener(FlyToFairyGrabBoss);
m_FairyRequestBtn.SetListener(OnFairyRequestClick);
+ m_ReikiResetRemind.SetListener(OnReikiRemind);
}
public void Init()
@@ -53,6 +57,7 @@
CheckSendRedpackBtn();
ShowFairyGrabBoss();
IsCrossServerOneVsOne();
+ DisplayReikiRemind();
RedPacketModel.OnRedBagGetEvent += OnRedBagGet;
OSEnvelopeModel.OSRedEnvelopeUpdateEvent += OnRedBagGet;
@@ -115,6 +120,7 @@
m_DungeonAssistImg.gameObject.SetActive(false);
m_FriendQuestBtn.gameObject.SetActive(false);
m_FairyRequestBtn.gameObject.SetActive(false);
+ m_ReikiResetRemind.gameObject.SetActive(false);
}
else
{
@@ -124,6 +130,7 @@
UpdateDungeonAssistImag();
FriendQuestBtn();
UpdateFairyRequest();
+ DisplayReikiRemind();
}
}//鍐嶈法鏈嶇姸鎬佺殑寮�鍏虫樉闅愭帶鍒�
@@ -381,6 +388,12 @@
m_FriendQuestBtn.gameObject.SetActive(false);
}
}
+
+ void DisplayReikiRemind()
+ {
+ m_ReikiResetRemind.gameObject.SetActive(reikiRootModel.resetReikiRemind);
+ }
+
private void OnClickFriendQuest()
{
WindowCenter.Instance.Open<FriendQuestWin>();
@@ -389,6 +402,12 @@
{
WindowCenter.Instance.Open<FairyInviteWin>();
}
+
+ private void OnReikiRemind()
+ {
+ WindowCenter.Instance.Open<ReikiRootRemindWin>();
+ }
+
private void UpdateFairyRequest()
{
m_FairyRequestBtn.gameObject.SetActive(fairyModel.FairyRequestRedPoint.count > 0);
--
Gitblit v1.8.0