From b5651b96bb1bfd53341af7fbe4cb46db54dee58c Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 27 十二月 2018 14:40:47 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 System/Activity/ActivityModel.cs |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/System/Activity/ActivityModel.cs b/System/Activity/ActivityModel.cs
index 7742222..66bd754 100644
--- a/System/Activity/ActivityModel.cs
+++ b/System/Activity/ActivityModel.cs
@@ -271,6 +271,14 @@
                         }
                     }
                     break;
+                case DailyQuestType.CrossServerPk:
+                    {
+                        if(TimeUtility.OpenDay < ModelCenter.Instance.GetModel<CrossServerOneVsOneModel>().afterOpenDayOpenCross)
+                        {
+                            return true;
+                        }
+                    }
+                    break;
             }
             if (config.UnLockFuncID != 0)
             {

--
Gitblit v1.8.0