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/FairyAu/PlayerRedPacketDatas.cs | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/System/FairyAu/PlayerRedPacketDatas.cs b/System/FairyAu/PlayerRedPacketDatas.cs
index 9bf5cd5..3b3862b 100644
--- a/System/FairyAu/PlayerRedPacketDatas.cs
+++ b/System/FairyAu/PlayerRedPacketDatas.cs
@@ -91,7 +91,7 @@
var list = _DicRedBag.Values.ToList();
for (int i = 0; i < list.Count; i++)
{
- if (list[i].GetWay != 5)
+ if (IsDisplayInFamily(list[i].GetWay))
{
_DicRedBag.Remove(list[i].RedPacketID);
}
@@ -196,7 +196,7 @@
if (_DicRedBag.ContainsKey(RedEnvelopeID) && WindowCenter.Instance.IsOpen<RedBagTipsWin>())
{
var redBag = _DicRedBag[RedEnvelopeID];
- if (redBag.GetWay != 5 && redBag.GetWay != 0 && redBag.PlayerID == PlayerDatas.Instance.PlayerId && redBag.State == 1)
+ if (IsDisplayInFamily(redBag.GetWay) && redBag.GetWay != 0 && redBag.PlayerID == PlayerDatas.Instance.PlayerId && redBag.State == 1)
{
RedBagId = RedEnvelopeID;
WindowCenter.Instance.Open<RedpackOpenWin>();//鎵撳紑棰嗗彇鐣岄潰
@@ -238,11 +238,11 @@
foreach (var value in _DicRedBag.Values)
{
- if (value.PlayerID == PlayerDatas.Instance.baseData.PlayerID && value.State == 0 && value.GetWay != 5)
+ if (value.PlayerID == PlayerDatas.Instance.baseData.PlayerID && value.State == 0 && IsDisplayInFamily(value.GetWay))
{
_bool = true;
}
- if (value.State == 1 && value.GetWay != 5)
+ if (value.State == 1 && IsDisplayInFamily(value.GetWay))
{
_bool = true;
}
@@ -292,5 +292,19 @@
}
-
+ public bool IsDisplayInFamily(int getWay)
+ {
+ if (getWay == 5)
+ {
+ return false;
+ }
+ if (getWay == FestivalRedpackModel.FESTIVALSYSTEMREDPACK1
+ || getWay == FestivalRedpackModel.FESTIVALSYSTEMREDPACK2
+ || getWay == FestivalRedpackModel.FESTIVALTASKREDPACKTYPE)
+ {
+ return false;
+ }
+ return true;
+ }
+
}
--
Gitblit v1.8.0