From a4f28fbd46f23514eed3c03e64cfc9e4010670ca Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 26 十二月 2018 11:31:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Cross_Server' into 【1.4】王者法宝
---
System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs b/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
index d1e0df5..60ce934 100644
--- a/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
@@ -403,7 +403,7 @@
var playerInfo = CrossServerOneVsOnePlayerInfo.Instance;
var pkSeason = CrossServerOneVsOnePKSeason.Instance;
- if(pkSeason.InDay(TimeUtility.ServerNow)
+ if(pkSeason.InPkSeason(TimeUtility.ServerNow)
&& pkSeason.InOpenTime()
&& playerInfo.GetDayRemainNum() > 0)
{
--
Gitblit v1.8.0