From 10668d5c705391df124a600de234008e91c6d9ea Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 05 十一月 2018 19:49:23 +0800
Subject: [PATCH] 4574 【后端】【1.2】开服前14天活动定制优化(如果开服前14天的活动配置开始时间在14天之内而结束时间超过第14天,那么该活动不开启)

---
 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFairyCeremony.py |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFairyCeremony.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFairyCeremony.py
index 1495e8a..c95d060 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFairyCeremony.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFairyCeremony.py
@@ -88,12 +88,14 @@
     if not ipyData:
         return
     
+    openServerDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ServerDay) + 1
     fairyCeremonyInfo = ChPyNetSendPack.tagGCFairyCeremonyInfo()
     fairyCeremonyInfo.Clear()
-    fairyCeremonyInfo.StartDate = ipyData.GetStartDate()
-    fairyCeremonyInfo.EndtDate = ipyData.GetEndDate()
+    fairyCeremonyInfo.StartDate = GameWorld.GetOperationActionDateStr(ipyData.GetStartDate(), openServerDay)
+    fairyCeremonyInfo.EndtDate = GameWorld.GetOperationActionDateStr(ipyData.GetEndDate(), openServerDay)
     fairyCeremonyInfo.WorldLV = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_OActWorldLV % ShareDefine.OperationActionName_FairyCeremony)
     fairyCeremonyInfo.LimitLV = ipyData.GetLVLimit()
+    fairyCeremonyInfo.ResetType = ipyData.GetResetType()
     if not curPlayer:
         # 全服广播在线玩家
         playerManager = GameWorld.GetPlayerManager()

--
Gitblit v1.8.0