From 5dd4c4454f10890ca98c63b330be557a28e1c79e Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期六, 18 八月 2018 16:24:01 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/OpenServerActivity/OSRedEnvelopeModel.cs | 24 +++++++-----------------
1 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/System/OpenServerActivity/OSRedEnvelopeModel.cs b/System/OpenServerActivity/OSRedEnvelopeModel.cs
index 43f4939..069a870 100644
--- a/System/OpenServerActivity/OSRedEnvelopeModel.cs
+++ b/System/OpenServerActivity/OSRedEnvelopeModel.cs
@@ -24,8 +24,7 @@
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()
@@ -334,23 +333,14 @@
if (envelopeModel.TryGetEnvelope(_id, out _envelope))
{
if (_envelope.player == PlayerDatas.Instance.PlayerId &&
- _envelope.type != 0
+ _envelope.type == OSRedEnvelopeType
&& _envelope.state == 1)
{
- 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>();//鎵撳紑棰嗗彇鐣岄潰
- }
-
+ envelopeModel.cacheEnvelopeId = _envelope.id;
+ envelopeModel.envelopeSfx = _envelope.id;
+ CAB12_tagCMGrabFamilyRedPacket _pak = new CAB12_tagCMGrabFamilyRedPacket();
+ _pak.RedPaketID = (uint)_envelope.id;
+ GameNetSystem.Instance.SendInfo(_pak);
}
}
}
--
Gitblit v1.8.0