From 35d98e9c630fd4408561c8c54b4c09193bb9ce9e Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 20 三月 2026 14:57:32 +0800
Subject: [PATCH] 0312 修改服务端补主线进度通知
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py
index 1fb8f02..24c2e93 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py
@@ -700,20 +700,21 @@
return startDateStr, endDateStr
# 开服天
+ import DBDataMgr
if startDateStr.isdigit():
- diffDay = GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_ServerDay) + 1
+ diffDay = DBDataMgr.GetEventTrigMgr().GetValue(ShareDefine.Def_ServerDay) + 1
startDateTime = curDateTime + datetime.timedelta(days=(int(startDateStr)-diffDay))
endDateTime = curDateTime + datetime.timedelta(days=(int(endDateStr)-diffDay))
# K开服天
elif startDateStr.startswith("K"):
- diffDay = GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_ServerDay) + 1
+ diffDay = DBDataMgr.GetEventTrigMgr().GetValue(ShareDefine.Def_ServerDay) + 1
startDateTime = curDateTime + datetime.timedelta(days=(ToIntDef(startDateStr[1:])-diffDay))
endDateTime = curDateTime + datetime.timedelta(days=(ToIntDef(endDateStr[1:])-diffDay))
# 合服天
elif startDateStr.startswith("Mix"):
- diffDay = GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_MixServerDay) + 1
+ diffDay = DBDataMgr.GetEventTrigMgr().GetValue(ShareDefine.Def_MixServerDay) + 1
startDateTime = curDateTime + datetime.timedelta(days=(int(startDateStr[3:])-diffDay))
endDateTime = curDateTime + datetime.timedelta(days=(int(endDateStr[3:])-diffDay))
@@ -1440,12 +1441,6 @@
# return serverID
#return MainServerDict[serverID]
-##获得当前服务器平台
-# @param 无
-# @return
-def GetPlatform():
- return ReadChConfig.GetPyMongoConfig("platform", "PlatformName")
-
def GetAppID():
## 获取渠道ID
return ReadChConfig.GetPyMongoConfig("platform", "AppID")
@@ -2029,7 +2024,11 @@
return datetime.datetime.strptime(timeStr, timeFormat)
def ChangeStrToDatetime(timeStr, timeFormat=ChConfig.TYPE_Time_Format):
- return datetime.datetime.strptime(timeStr, timeFormat)
+ try:
+ return datetime.datetime.strptime(timeStr, timeFormat)
+ except:
+ # 转化失败返回默认，如传入0也可转换
+ return datetime.datetime(1970, 1, 1, 8, 0, 0)
## 时间格式转换成数值时间
# @param dateT: datetime.datetime
@@ -2477,6 +2476,8 @@
import CrossMsg
CrossMsg.SendToClientServer(ShareDefine.C2S_GMDebugAnswer, {"text":text}, [mainServerID], playerID)
return
+ if hasattr(curPlayer, "GetPlayer"):
+ curPlayer = curPlayer.GetPlayer()
DebugLog(text, playerID)
text = text.decode(ShareDefine.Def_Game_Character_Encoding).encode(GetCharacterEncoding())
curPlayer.DebugAnswer(text)
--
Gitblit v1.8.0