From 0012445c0109fa67987800a1bac8f32e989b2d19 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 15 八月 2018 15:16:01 +0800
Subject: [PATCH] Merge branch 'master' into leonard

---
 System/Welfare/ConsumeRebateModel.cs |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/System/Welfare/ConsumeRebateModel.cs b/System/Welfare/ConsumeRebateModel.cs
index b114732..6c6638d 100644
--- a/System/Welfare/ConsumeRebateModel.cs
+++ b/System/Welfare/ConsumeRebateModel.cs
@@ -4,15 +4,18 @@
 using UnityEngine;
 namespace Snxxz.UI
 {
-    public class ConsumeRebateModel : Model, IPlayerLoginOk, IBeforePlayerDataInitialize
+    public class ConsumeRebateModel : Model, IPlayerLoginOk, IBeforePlayerDataInitialize, IOpenServerActivity
     {
         public event Action consumeRebateUpdateEvent;
+        public event Action<int> onStateUpate;
+
         public override void Init()
         {
             PlayerDatas.Instance.PlayerDataRefreshInfoEvent += PlayerDataRefreshInfoEvent;
             OperationTimeHepler.Instance.operationStartEvent += OperationStartEvent;
             OperationTimeHepler.Instance.operationEndEvent += OperationEndEvent;
             GlobalTimeEvent.Instance.secondEvent += SecondEvent;
+            OpenServerActivityCenter.Instance.Register(1, this);
         }
 
         public void OnBeforePlayerDataInitialize()
@@ -49,6 +52,14 @@
         public int costTotal { get; private set; }
 
         private uint consumeGotRecord { get; set; }
+
+        public bool priorityOpen
+        {
+            get
+            {
+                return consumeRebateRedpoint.state == RedPointState.Simple;
+            }
+        }
 
         int rebateOpenDayIndex = -1;
 
@@ -93,6 +104,10 @@
             if (type == Operation.ConsumeRebate && state == 0)
             {
                 UpdateRedpoint();
+                if (onStateUpate != null)
+                {
+                    onStateUpate(1);
+                }
             }
         }
 
@@ -101,6 +116,10 @@
             if (type == Operation.ConsumeRebate && state == 0)
             {
                 UpdateRedpoint();
+                if (onStateUpate != null)
+                {
+                    onStateUpate(1);
+                }
             }
         }
 

--
Gitblit v1.8.0