From ee4705284b8064b4f3964dfd13c22386b7d5c20f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 26 二月 2025 15:48:24 +0800
Subject: [PATCH] 10407 【越南】【英语】【BT】【GM】【砍树】周末BUG汇总（修复排行榜功能开启时同步开服活动榜数据异常bug；）
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py | 193 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 181 insertions(+), 12 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py
index 40c7c07..d7ad0ea 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorld.py
@@ -118,6 +118,14 @@
except ValueError:
return defValue
+def ToFloat(input, defValue = 0):
+ try:
+ result = float(input)
+ return result
+
+ except ValueError:
+ return defValue
+
## 判断2个对象是否同国籍
# @param srcObj 起点对象
# @param desObj 目标对象
@@ -413,6 +421,31 @@
## 服务器组ID，必须唯一，代表这台物理服务器
return ToIntDef(ReadChConfig.GetPyMongoConfig("platform", "GroupID"), 0)
+def GetMainServerID(serverID):
+ ## 获取服务器ID所属主服ID
+ ServerIDMainServerDict = IpyGameDataPY.GetConfigEx("ServerIDMainServerDict")
+ if ServerIDMainServerDict == None:
+ filePath = ChConfig.GetDBPath() + ("\\MixServerMap_%s.json" % GetPlatform())
+ if not os.path.isfile(filePath):
+ SendGameErrorEx("GetMainServerIDError", "file can not found. %s" % filePath)
+ else:
+ fileObj = open(filePath, 'rb')
+ content = fileObj.read()
+ fileObj.close()
+ MixServerMapDict = eval(content)
+
+ ServerIDMainServerDict = {}
+ for mainServerIDStr, serverIDList in MixServerMapDict.items():
+ mainServerID = int(mainServerIDStr)
+ for sID in serverIDList:
+ ServerIDMainServerDict[sID] = mainServerID
+ IpyGameDataPY.SetConfigEx("ServerIDMainServerDict", ServerIDMainServerDict)
+ Log("加载 ServerIDMainServerDict=%s" % ServerIDMainServerDict)
+
+ if not ServerIDMainServerDict:
+ return serverID
+ return ServerIDMainServerDict.get(serverID, serverID)
+
def GetPlatformServerNum(platform):
# 获取服务器的平台编号
platformNumDict = ReadChConfig.GetDBEvalChConfig("DBPlatformNum")
@@ -449,10 +482,10 @@
##获取玩家所属区服ID
# @param curPlayer
# @return
-def GetPlayerServerID(curPlayer):
- accID = curPlayer.GetAccID()
+def GetPlayerServerID(curPlayer): return GetAccIDServerID(curPlayer.GetAccID())
+def GetAccIDServerID(accID):
infoList = accID.split(Def_AccID_Split_Sign)
- return 0 if len(infoList) < 3 else int(infoList[-1][1:])
+ return 0 if len(infoList) < 3 else ToIntDef(infoList[-1][1:])
def GetPlayerServerSID(curPlayer):
# 返回含s的serverID
@@ -468,6 +501,17 @@
return mainServerID
return 0
+def CheckServerIDInList(serverID, serverIDList):
+ if serverIDList == None:
+ return False
+ if not serverIDList:
+ return True
+ for serverIDInfo in serverIDList:
+ if (isinstance(serverIDInfo, tuple) and serverIDInfo[0] <= serverID <= serverIDInfo[1]) \
+ or (isinstance(serverIDInfo, list) and serverIDInfo[0] <= serverID <= serverIDInfo[1]) \
+ or (isinstance(serverIDInfo, int) and serverIDInfo == serverID):
+ return True
+ return False
#===============================================================================
# 平台ID = appid
@@ -538,6 +582,47 @@
#---------------------------------------------------------------------
+def GetTemplateID(ipyData, cfgID, dayIndex):
+ if cfgID == None or dayIndex == None or not ipyData:
+ return 0
+ templateIDList = ipyData.GetTemplateIDList()
+ if not templateIDList:
+ return 0
+ templateID = templateIDList[-1] if dayIndex >= len(templateIDList) else templateIDList[dayIndex]
+ return templateID
+
+def GetTemplateIDByList(templateIDList, dayIndex):
+ if dayIndex == None:
+ return 0
+ if not templateIDList:
+ return 0
+ templateID = templateIDList[-1] if dayIndex >= len(templateIDList) else templateIDList[dayIndex]
+ return templateID
+
+def GetOperationActionLoopDate(startDateStr, endDateStr, curDateTime):
+ ## 获取运营活动配置日期循环的具体活动时间
+ # @return: 开始日期, 结束日期, 返回的日期是第x次循环
+ startSplitList = startDateStr.split("_")
+ loopDays = int(startSplitList[0][1:])
+ startLoopDateStr = startSplitList[1]
+ startLoopDateTime = ChangeStrToDatetime(startLoopDateStr, ChConfig.TYPE_Time_YmdFormat)
+
+ endSplitList = endDateStr.split("_") # 可不配Lx_开头，防误配，做兼容
+ endLoopDateStr = endSplitList[0] if len(endSplitList) == 1 else endSplitList[1]
+ endLoopDateTime = ChangeStrToDatetime(endLoopDateStr, ChConfig.TYPE_Time_YmdFormat)
+
+ if curDateTime >= startLoopDateTime:
+ passDays = (curDateTime - startLoopDateTime).days
+ loopTimes = passDays / loopDays + 1 # 第x次循环
+ loopTimeMax = (endLoopDateTime - startLoopDateTime).days / loopDays + 1 # 最大循环次数
+ loopTimes = min(loopTimes, loopTimeMax)
+ else:
+ loopTimes = 1 # 还未开始取第一次
+
+ startDateTime = startLoopDateTime + datetime.timedelta((loopTimes - 1)*loopDays)
+ endDateTime = startDateTime + datetime.timedelta(days=(loopDays - 1))
+ return startDateTime, endDateTime, loopTimes
+
def GetOperationActionDateStr(ipyData):
## 获取运营活动对应日期，存数字代表开服天配置，需要转化为对应的日期
curDateTime = datetime.datetime.today()
@@ -549,7 +634,7 @@
endDateStr = "%d-%d-%d" % (curDateTime.year, curDateTime.month, curDateTime.day)
# 日期直接返回
- if startDateStr.count("-") == 2 and "W" not in startDateStr:
+ if startDateStr.count("-") == 2 and "W" not in startDateStr and not startDateStr.startswith("L"):
return startDateStr, endDateStr
# 开服天
@@ -596,7 +681,10 @@
# 只配置结束日期的时候可能导致开始日期计算出来比结束日期还大，即当前时间超过结束日期，且 配置还存在的情况
if startDateTime > endDateTime:
startDateTime = endDateTime # 反正都无法开启，随便给个日期，不超过结束日期即可
-
+ # 按日期循环
+ elif startDateStr.startswith("L"):
+ startDateTime, endDateTime, _ = GetOperationActionLoopDate(startDateStr, endDateStr, curDateTime)
+
# 默认
else:
startDateTime = curDateTime
@@ -675,6 +763,15 @@
return pastTimeDelta.days * 24 * 60 * 60 + pastTimeDelta.seconds
#---------------------------------------------------------------------
+
+def GetDiff_Day(timeA , timeB):
+ ## 获取 timeA - timeB 相差的日期天数
+ dateTimeA = ChangeTimeNumToDatetime(timeA)
+ dateTimeA = datetime.datetime(dateTimeA.year, dateTimeA.month, dateTimeA.day, 0, 0, 0)
+ dateTimeB = ChangeTimeNumToDatetime(timeB)
+ dateTimeB = datetime.datetime(dateTimeB.year, dateTimeB.month, dateTimeB.day, 0, 0, 0)
+ return (dateTimeA - dateTimeB).days
+
##设置世界服务器字典
# @param key 字典值
# @param tick 时间戳
@@ -918,6 +1015,17 @@
return ReadChConfig.GetPyMongoConfig("Merge", "CrossZoneName")
return PyGameData.g_crossZoneName
+def GetCrossServerTimeStr():
+ ## 跨服服务器时间
+ if IsCrossServer():
+ return GetCurrentDataTimeStr()
+ lastCrossServerTime, lastServerTime, _ = PyGameData.g_crossServerTimeInfo
+ if not lastCrossServerTime:
+ return GetCurrentDataTimeStr()
+ curTime = int(time.time())
+ crossServerTime = lastCrossServerTime + (curTime - lastServerTime)
+ return ChangeTimeNumToStr(crossServerTime)
+
## 获取玩家的区服名，仅在跨服有效
# @param curPlayer 玩家实例
# @return: 区服名
@@ -959,6 +1067,28 @@
return fullName
+def MergeItemList(itemList):
+ ## 合并物品列表，将相同物品数量合并
+ itemDict = {}
+ for itemInfo in itemList:
+ if len(itemInfo) == 3:
+ itemID, itemCount, isAuctionItem = itemInfo
+ elif len(itemInfo) == 2:
+ itemID, itemCount = itemInfo
+ isAuctionItem = None
+ else:
+ continue
+ key = (itemID, isAuctionItem)
+ itemDict[key] = itemDict.get(key, 0) + itemCount
+
+ mItemList = []
+ for key, itemCount in itemDict.items():
+ itemID, isAuctionItem = key
+ if isAuctionItem == None:
+ mItemList.append([itemID, itemCount])
+ else:
+ mItemList.append([itemID, itemCount, isAuctionItem])
+ return mItemList
## 从列表中产生物品，[[几率，object], ....],万分率
# @param itemList 待选列表
@@ -985,16 +1115,16 @@
## 从列表中产生物品，[[权重, object], ....]
# @param weightList 待选列表
-def GetResultByWeightList(weightList):
+def GetResultByWeightList(weightList, defValue=None):
randList = []
weight = 0
for info in weightList:
weight += info[0]
randList.append([weight, info[1] if len(info) == 2 else info[1:]])
if not randList:
- return
+ return defValue
rate = random.randint(1, randList[-1][0])
- return GetResultByRiseList(randList, rate)
+ return GetResultByRiseList(randList, rate, defValue)
## 获得对应数位的值
# @param numValue 数值
@@ -1080,7 +1210,7 @@
# @param order 名次，从1开始
# @param isDefaultLast 找不到的名次是否默认取最后一名的
# @return obj or None
-def GetOrderValueByDict(orderDict, order, isDefaultLast=True):
+def GetOrderValueByDict(orderDict, order, isDefaultLast=True, defaultValue=None):
if order in orderDict:
return orderDict[order]
@@ -1091,7 +1221,7 @@
return orderDict[dOrder]
# 找不到的默认取最后一名
- return orderDict[orderList[-1]] if isDefaultLast else None
+ return orderDict[orderList[-1]] if isDefaultLast else defaultValue
##概率相关, 这个事件是否能够出现
# @param rate 基础几率
@@ -1104,15 +1234,46 @@
return 0
-def DebugAnswer(curPlayer, text):
+def DebugAnswer(curPlayer, text, isLog=True):
'''转码后再发DebugAnswer'''
#===========================================================================
# if not GetGameWorld().GetDebugLevel():
# return
#===========================================================================
+ if IsCrossServer():
+ DebugAnswerCross(0, 0, text)
+ return
+ if isLog:
+ DebugLog(text)
+ text = text.decode(ShareDefine.Def_Game_Character_Encoding).encode(GetCharacterEncoding())
+ if curPlayer:
+ curPlayer.DebugAnswer(text)
+ return
+
+def CrossServerMsg_DebugAnswer(msgData):
+ playerID, text = msgData
+ if not playerID:
+ playerManager = GetPlayerManager()
+ for i in xrange(playerManager.GetActivePlayerCount()):
+ player = playerManager.GetActivePlayerAt(i)
+ if player == None:
+ continue
+ player.DebugAnswer(text)
+ return
+ curPlayer = GetPlayerManager().FindPlayerByID(playerID)
+ if not curPlayer:
+ return
+ curPlayer.DebugAnswer(text)
+ return
+
+def DebugAnswerCross(playerID, serverGroupID, text):
DebugLog(text)
text = text.decode(ShareDefine.Def_Game_Character_Encoding).encode(GetCharacterEncoding())
- curPlayer.DebugAnswer(text)
+
+ import CrossRealmMsg
+ dataMsg = [playerID, text]
+ serverGroupIDList = [serverGroupID] if serverGroupID else []
+ CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_DebugAnswer, dataMsg, serverGroupIDList)
return
def GetMap(mapID): return IpyGameDataPY.GetIpyGameData("ChinMap", mapID)
@@ -1168,6 +1329,14 @@
SendGameError("GameServerRaiseException", errorMsg)
return
+def SendGameErrorEx(errType, msgInfo="", playerID=0):
+ ErrLog("SendGameErrorEx: %s -> %s" % (errType, msgInfo), playerID)
+ if GetGameWorld().GetDebugLevel():
+ raise Exception("%s -> %s" % (errType, msgInfo))
+ else:
+ SendGameError(errType, msgInfo)
+ return
+
def SendGameError(errType, msgInfo=""):
''' 向运维发送邮件，用于需要紧急处理的信息
@param errType: 错误类型，自定义即可
--
Gitblit v1.8.0