From ec68dabc97521a7706344e7d038e9f08462f4fe8 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 16 十二月 2025 10:26:34 +0800
Subject: [PATCH] 16 卡牌服务端(删除多余备档报错防范;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py |   45 +++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py
index 05ffe43..ea5120e 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py
@@ -123,6 +123,10 @@
     #重新加载已经预存的脚本
     for name, reloadPath in sys.modules.items():
         try:
+            pathStr = str(reloadPath)
+            if "\\Lib\\" in pathStr or "\\DLLs\\" in pathStr:
+                #DebugLog("Py库脚本不重读,会引起类继承出现问题导致报错! %s, %s" % (name, reloadPath))
+                continue
             if name in ["PyGameData"]:
                 DebugLog("%s 模块不重读!" % name)
                 continue
@@ -974,6 +978,16 @@
     dateTimeB = datetime.datetime(dateTimeB.year, dateTimeB.month, dateTimeB.day, 0, 0, 0)
     return (dateTimeA - dateTimeB).days
 
+def GetEndTimeByZeroTime(startTime, addDays):
+    ## 获取结束时间,根据0点结束计算
+    # @param startTime: 起始时间戳
+    # @param addDays: 增加的天数,如果是1天实际为当天,即1代表当天
+    startDate = ChangeTimeNumToDatetime(startTime)
+    startZeroDate = datetime.datetime(startDate.year, startDate.month, startDate.day, 23, 59, 59)
+    startZeroTime = int(time.mktime(startZeroDate.timetuple()))
+    endTime = startTime + (startZeroTime - startTime) + max(addDays - 1, 0) * 24 * 3600
+    return endTime
+
 #---------------------------------------------------------------------
 ##获取与当前时间相差天数的datetime格式数据
 # @param diffDays 差距天数
@@ -1279,6 +1293,22 @@
     LogUI.Msg('%s\t%s\tPyDebug:%s'%(par, playerID, msg))
     return
 
+def DebugLogEx(logFormat, *args):
+    ## DEBUG调试输出信息,只传入日志格式跟参数,非debug下不进行日志内容格式化
+    # @param logFormat: 日志内容格式,也可以直接传入完整的日志内容
+    # @param args: 日志参数,最后一个参数可以多传一个参数作为playerID用
+    if not __GameWorld.GetDebugLevel():
+        return
+    par = 0
+    playerID = 0
+    try:
+        msg = logFormat % args
+    except:
+        msg = logFormat % args[:-1]
+        playerID = args[-1]
+    LogUI.Msg('%s\t%s\tPyDebug:%s'%(par, playerID, msg))
+    return
+
 #---------------------------------------------------------------------
 ##获得当前服务器跨服ID
 # @param 无
@@ -1312,6 +1342,10 @@
 # @remarks 获得当前服务器的版本号
 def GetServerVersion():
     return GetGameWorld().GetServerVersion()
+
+def IsBattleServer():
+    ## 是否战斗服务器
+    return ToIntDef(ReadChConfig.GetPyMongoConfig("platform", "BattleServer"), 0) == 1
 
 def GetServerGroupID():
     ## 服务器组ID,必须唯一,代表这台物理服务器
@@ -1427,7 +1461,10 @@
 
 ##获取玩家所属平台
 def GetPlayerPlatform(curPlayer):
-    return curPlayer.GetAccountData().GetOperator()
+    appID = curPlayer.GetAccountData().GetOperator()
+    if not appID:
+        appID = GetAppIDByAccID(curPlayer.GetAccID())
+    return appID
 
 ##获取平台账号
 def GetPlatformAccID(gameAccID):
@@ -1435,6 +1472,10 @@
     paInfoList = infoList[:-2]
     platformAccID = Def_AccID_Split_Sign.join(paInfoList)
     return platformAccID
+def GetAppIDByAccID(gameAccID):
+    ## 根据账号获取appID
+    infoList = gameAccID.split(Def_AccID_Split_Sign)
+    return infoList[-2]
 
 def GetSessionID(curPlayer):
     return md5.md5(curPlayer.GetAccID() + curPlayer.GetAccountData().GetLastLoginTime() +'mobile').hexdigest()
@@ -1934,7 +1975,7 @@
     ## 跨服服务器时间
     if IsCrossServer():
         return GetCurrentDataTimeStr()
-    lastCrossServerTime, lastServerTime, _ = PyGameData.g_crossServerTimeInfo
+    lastCrossServerTime, lastServerTime = PyGameData.g_crossServerTimeInfo
     if not lastCrossServerTime:
         return GetCurrentDataTimeStr()
     curTime = int(time.time())

--
Gitblit v1.8.0