From 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 26 十月 2018 20:05:36 +0800
Subject: [PATCH] Merge branch 'master' into leonard

---
 System/OpenServerActivity/OSGiftBehaviour.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/System/OpenServerActivity/OSGiftBehaviour.cs b/System/OpenServerActivity/OSGiftBehaviour.cs
index 42dac9b..ab48c3f 100644
--- a/System/OpenServerActivity/OSGiftBehaviour.cs
+++ b/System/OpenServerActivity/OSGiftBehaviour.cs
@@ -166,7 +166,7 @@
                     return;
                 case StoreFunc.OSGift:
                     {
-                        if (giftModel.IsGiftOverdue(_storeConfig.ID))
+                        if (!giftModel.IsGiftExist(_storeConfig.ID))
                         {
                             SysNotifyMgr.Instance.ShowTip("ActiveOutTime");
                             return;

--
Gitblit v1.8.0