From 70a89ab1f96dff5633cf9746167ba7e94e0b0c31 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期一, 25 二月 2019 16:40:02 +0800
Subject: [PATCH] 3028 【BUG】【1.6】【2.0】运营活动合服定制时间转化报错
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py | 12 +++++++++---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py | 11 ++++++++---
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py
index 6bfea6e..427fe6c 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py
@@ -32,6 +32,7 @@
import IpyGameDataPY
import PyGameData
import ReadChConfig
+import PlayerDBGSEvent
import ConfigParser
import GameConfig
import ShareDefine
@@ -546,11 +547,16 @@
@param dateInfo: 运营活动表配置的日期信息, 如果是纯数字代表开服天
@param openServerDay: 当前开服天
'''
- if not dateInfo.isdigit():
+ if dateInfo.startswith("Mix"):
+ diffDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_MixServerDay) + 1
+ actionServerDay = int(dateInfo[3:])
+ elif not dateInfo.isdigit():
return dateInfo
- actionServerDay = int(dateInfo)
+ else:
+ diffDay = openServerDay
+ actionServerDay = int(dateInfo)
curDateTime = datetime.datetime.today()
- actionDateTime = curDateTime + datetime.timedelta(days=(actionServerDay-openServerDay))
+ actionDateTime = curDateTime + datetime.timedelta(days=(actionServerDay-diffDay))
return "%d-%d-%d" % (actionDateTime.year, actionDateTime.month, actionDateTime.day)
##获得系统时间
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py
index 51e2f23..277ef26 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py
@@ -597,11 +597,16 @@
@param dateInfo: 运营活动表配置的日期信息, 如果是纯数字代表开服天
@param openServerDay: 当前开服天
'''
- if not dateInfo.isdigit():
+ if dateInfo.startswith("Mix"):
+ diffDay = GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_MixServerDay) + 1
+ actionServerDay = int(dateInfo[3:])
+ elif not dateInfo.isdigit():
return dateInfo
- actionServerDay = int(dateInfo)
+ else:
+ diffDay = openServerDay
+ actionServerDay = int(dateInfo)
curDateTime = datetime.datetime.today()
- actionDateTime = curDateTime + datetime.timedelta(days=(actionServerDay-openServerDay))
+ actionDateTime = curDateTime + datetime.timedelta(days=(actionServerDay-diffDay))
return "%d-%d-%d" % (actionDateTime.year, actionDateTime.month, actionDateTime.day)
##获得服务器系统时间
--
Gitblit v1.8.0