From 0102e94422c896d8f6e4eb2d647d748a2f882b07 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 14 八月 2018 18:08:08 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/OpenServerActivity/OSRedEnvelopeModel.cs | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/System/OpenServerActivity/OSRedEnvelopeModel.cs b/System/OpenServerActivity/OSRedEnvelopeModel.cs
index 2dc36e7..069a870 100644
--- a/System/OpenServerActivity/OSRedEnvelopeModel.cs
+++ b/System/OpenServerActivity/OSRedEnvelopeModel.cs
@@ -5,7 +5,7 @@
using TableConfig;
namespace Snxxz.UI
{
- public class OSRedEnvelopeModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
+ public class OSRedEnvelopeModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk, IOpenServerActivity
{
AchievementModel m_AchievementModel;
AchievementModel achieveModel
@@ -37,6 +37,7 @@
envelopeModel.EnvelopeUpdateEvent += EnvelopeUpdateEvent;
envelopeModel.EnvelopeDelEvent += EnvelopeUpdateEvent;
envelopeModel.EnvelopeGetEvent += EnvelopeGetEvent;
+ OpenServerActivityCenter.Instance.Register(2, this);
}
public override void UnInit()
@@ -62,6 +63,10 @@
if (OSRedEnvelopeUpdateEvent != null)
{
OSRedEnvelopeUpdateEvent();
+ }
+ if (onStateUpate != null)
+ {
+ onStateUpate(2);
}
}
}
@@ -407,7 +412,26 @@
public int totalJadeGet { get; private set; }
public int getEnvelopeTimes { get; private set; }
+ public bool IsOpen
+ {
+ get
+ {
+ return TimeUtility.OpenDay < openDays && FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.OpenServerRedEnvelope);
+ }
+ }
+
+ public bool priorityOpen
+ {
+ get
+ {
+ return m_RedAchieveRedpoint.state == RedPointState.Simple
+ || m_OpenServerGetRedpin.state == RedPointState.Simple;
+ }
+ }
+
public event Action OSRedEnvelopeInfoEnvent;
+ public event Action<int> onStateUpate;
+
public void UpdateOSRedEnvelope(HAB24_tagMCOpenServerRedPacketInfo _pak)
{
totalJadeGet = (int)_pak.MoneyNum;
--
Gitblit v1.8.0