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/CrossServerOneVsOnePKSeason.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOnePKSeason.cs b/System/CrossServerOneVsOne/CrossServerOneVsOnePKSeason.cs
index f460d19..dc5803e 100644
--- a/System/CrossServerOneVsOne/CrossServerOneVsOnePKSeason.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOnePKSeason.cs
@@ -115,7 +115,7 @@
private void SecondEvent()
{
- if(!inDateNotify && InDay(TimeUtility.ServerNow))
+ if(!inDateNotify && InPkSeason(TimeUtility.ServerNow))
{
inDateNotify = true;
stepDateNotify = false;
@@ -124,7 +124,7 @@
activityStartEvent();
}
}
- else if(!stepDateNotify && !InDay(TimeUtility.ServerNow))
+ else if(!stepDateNotify && !InPkSeason(TimeUtility.ServerNow))
{
inDateNotify = false;
stepDateNotify = true;
@@ -220,7 +220,7 @@
return true;
}
- public bool InDay(DateTime time)
+ public bool InPkSeason(DateTime time)
{
OperationDate date = new OperationDate()
{
@@ -246,7 +246,7 @@
public int IndexOfDays(DateTime time)
{
- if (!InDay(time))
+ if (!InPkSeason(time))
{
return -1;
}
@@ -267,7 +267,7 @@
if(isSeason)
{
if (!seasonInfo.StartDate.Equals(default(OperationDate))
- && InDay(TimeUtility.ServerNow))
+ && InPkSeason(TimeUtility.ServerNow))
{
return Language.Get("CrossServer106", ToDisplayTime(seasonInfo.StartDate, seasonInfo.EndDate));
}
--
Gitblit v1.8.0