From a14173f2788287574561b279a7fe09c3d05ea7ea Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 17 九月 2018 15:41:41 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/Welfare/MultipleExpModel.cs |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/System/Welfare/MultipleExpModel.cs b/System/Welfare/MultipleExpModel.cs
index e87989b..7d67a9c 100644
--- a/System/Welfare/MultipleExpModel.cs
+++ b/System/Welfare/MultipleExpModel.cs
@@ -45,7 +45,7 @@
                     {
                         for (int i = 0; i < operationBase.times.Count; i++)
                         {
-                            if (operationBase.times[i].SideOfTime(TimeUtility.ServerNow) == -1)
+                            if (operationBase.times[i].CompareTime(TimeUtility.ServerNow) == -1)
                             {
                                 SysNotifyMgr.Instance.ShowTip("ExpActivity_Ready",
                                     operation.GetMultipleCHS(),
@@ -128,6 +128,14 @@
             }
         }
 
+        public bool IsAdvance
+        {
+            get
+            {
+                return OperationTimeHepler.Instance.SatisfyAdvanceCondition(Operation.MultipleExp);
+            }
+        }
+
         public void SetDayRemind()
         {
             if (multipleExpRedpoint.state == RedPointState.Simple)

--
Gitblit v1.8.0