From bb98d8ae9ff4d799bd8e2c11ddf3335ab4e0b017 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 29 一月 2019 14:09:29 +0800
Subject: [PATCH] 6086 【前端】【1.5.200】春节红包雨活动
---
System/MainInterfacePanel/MainInterfaceWin.cs | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/System/MainInterfacePanel/MainInterfaceWin.cs b/System/MainInterfacePanel/MainInterfaceWin.cs
index 620f784..10a561e 100644
--- a/System/MainInterfacePanel/MainInterfaceWin.cs
+++ b/System/MainInterfacePanel/MainInterfaceWin.cs
@@ -136,6 +136,7 @@
PKModel m_PKModel;
PKModel pKModel { get { return m_PKModel ?? (m_PKModel = ModelCenter.Instance.GetModel<PKModel>()); } }
OSRedEnvelopeModel OSEnvelopeModel { get { return ModelCenter.Instance.GetModel<OSRedEnvelopeModel>(); } }
+ FestivalRedpackModel festivalRedpackModel { get { return ModelCenter.Instance.GetModel<FestivalRedpackModel>(); } }
RuneTowerModel runeTowerModel { get { return ModelCenter.Instance.GetModel<RuneTowerModel>(); } }
TreasureModel treasureModel { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } }
DemonJarModel demonJarModel { get { return ModelCenter.Instance.GetModel<DemonJarModel>(); } }
@@ -464,7 +465,8 @@
private void RedpointValueChangeEvent(int _id)
{
- if (_id == OSEnvelopeModel.m_RedAchieveRedpoint.id)
+ if (_id == OSEnvelopeModel.m_RedAchieveRedpoint.id
+ || _id == festivalRedpackModel.taskRedpoint.id)
{
CheckSendRedpackBtn();
}
@@ -477,7 +479,8 @@
m_RedpackGetSfx.StopImediatly();
}
var requireRedpack = (OSEnvelopeModel.CanGetEnvelope()
- || redPacket.IsRedBagGetBool) && !CrossServerUtility.IsCrossServer();
+ || redPacket.IsRedBagGetBool || festivalRedpackModel.redpoint.state == RedPointState.GetReward)
+ && !CrossServerUtility.IsCrossServer();
if (requireRedpack)
{
m_RedBag.gameObject.SetActive(true);
@@ -495,7 +498,8 @@
private void CheckSendRedpackBtn()
{
- m_SendRedbagBtn.gameObject.SetActive(!m_RedBag.gameObject.activeSelf && OSEnvelopeModel.m_RedAchieveRedpoint.state == RedPointState.Simple);
+ m_SendRedbagBtn.gameObject.SetActive(!m_RedBag.gameObject.activeSelf && OSEnvelopeModel.m_RedAchieveRedpoint.state == RedPointState.Simple
+ && festivalRedpackModel.taskRedpoint.state == RedPointState.Simple);
}
private void OnGuideBegin()//寮曞寮�濮�
--
Gitblit v1.8.0