From 8aff3138b049309477495d05336031d02365f726 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期六, 18 八月 2018 15:39:21 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/OpenServerActivity/OSRedEnvelopeModel.cs | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/System/OpenServerActivity/OSRedEnvelopeModel.cs b/System/OpenServerActivity/OSRedEnvelopeModel.cs
index 069a870..43f4939 100644
--- a/System/OpenServerActivity/OSRedEnvelopeModel.cs
+++ b/System/OpenServerActivity/OSRedEnvelopeModel.cs
@@ -24,7 +24,8 @@
return m_RedEnvelopeModel ?? (m_RedEnvelopeModel = ModelCenter.Instance.GetModel<RedEnvelopeModel>());
}
}
-
+ PlayerRedPacketDatas m_RedPacket;
+ PlayerRedPacketDatas redPacket { get { return m_RedPacket ?? (m_RedPacket = ModelCenter.Instance.GetModel<PlayerRedPacketDatas>()); } }
bool servereInited = false;
public override void Init()
@@ -333,14 +334,23 @@
if (envelopeModel.TryGetEnvelope(_id, out _envelope))
{
if (_envelope.player == PlayerDatas.Instance.PlayerId &&
- _envelope.type == OSRedEnvelopeType
+ _envelope.type != 0
&& _envelope.state == 1)
{
- envelopeModel.cacheEnvelopeId = _envelope.id;
- envelopeModel.envelopeSfx = _envelope.id;
- CAB12_tagCMGrabFamilyRedPacket _pak = new CAB12_tagCMGrabFamilyRedPacket();
- _pak.RedPaketID = (uint)_envelope.id;
- GameNetSystem.Instance.SendInfo(_pak);
+ if (_envelope.type == OSRedEnvelopeType)
+ {
+ envelopeModel.cacheEnvelopeId = _envelope.id;
+ envelopeModel.envelopeSfx = _envelope.id;
+ CAB12_tagCMGrabFamilyRedPacket _pak = new CAB12_tagCMGrabFamilyRedPacket();
+ _pak.RedPaketID = (uint)_envelope.id;
+ GameNetSystem.Instance.SendInfo(_pak);
+ }
+ else
+ {
+ redPacket.RedBagId = _envelope.id;
+ WindowCenter.Instance.Open<RedOPenBGMWin>();//鎵撳紑棰嗗彇鐣岄潰
+ }
+
}
}
}
--
Gitblit v1.8.0