From bc5f3f1c88d225109fa39a85b209ef13f5fb52a9 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 06 二月 2026 21:28:13 +0800
Subject: [PATCH] 66 【公会】基础主体-服务端（跨服公会所有基本功能支持、跨服砍价支持；修改查看目标公会、查看目标玩家方式；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py | 247 ++++++++++++++++++++++++++++---------------------
1 files changed, 142 insertions(+), 105 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py
index 13de66e..1fb8f02 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.py
@@ -95,23 +95,23 @@
# @return 返回值无意义
# @remarks 重新加载脚本
def ReloadScript(scriptPath, importDir):
- gameWorld = GetGameWorld()
- tick = gameWorld.GetTick()
-
- #未到刷新间隔
- if tick - gameWorld.GetTickByType(ChConfig.TYPE_Map_Tick_ReloadScript) < \
- ChConfig.TYPE_Map_Tick_Time[ChConfig.TYPE_Map_Tick_ReloadScript]:
- return
-
- gameWorld.SetTickByType(ChConfig.TYPE_Map_Tick_ReloadScript, tick)
-
- if __GetPsycoIsOpen():
- #Psyco开启
- PsycoReload(tick)
- return
+# gameWorld = GetGameWorld()
+# tick = gameWorld.GetTick()
+#
+# #未到刷新间隔
+# if tick - gameWorld.GetTickByType(ChConfig.TYPE_Map_Tick_ReloadScript) < \
+# ChConfig.TYPE_Map_Tick_Time[ChConfig.TYPE_Map_Tick_ReloadScript]:
+# return
+#
+# gameWorld.SetTickByType(ChConfig.TYPE_Map_Tick_ReloadScript, tick)
+#
+# if __GetPsycoIsOpen():
+# #Psyco开启
+# PsycoReload(tick)
+# return
#Psyco关闭
- __ReloadScript()
+ #__ReloadScript() 不再调用，c++会触发多个Reload，py默认只在 ReloadEvent 调用一次
return
#---------------------------------------------------------------------
@@ -121,6 +121,7 @@
# @remarks
def __ReloadScript():
#重新加载已经预存的脚本
+ Log("=============================== ReloadScript Begin ===============================")
for name, reloadPath in sys.modules.items():
try:
pathStr = str(reloadPath)
@@ -136,7 +137,8 @@
import DataRecordPack
DataRecordPack.DR_Reload("script")
- Log("Reload Begin : time = %s"%GetCurrentDataTimeStr())
+ Log("=============================== ReloadScript End ===============================")
+ ReadChConfig.OnReloadConfig()
return
#---------------------------------------------------------------------
@@ -617,8 +619,8 @@
return False
#if not curPlayer.GetInitOK():
# return False
- if IsMirrorPlayer(curPlayer):
- return False
+ #if IsMirrorPlayer(curPlayer):
+ # return False
return True
#---------------------------------------------------------------------
@@ -905,6 +907,22 @@
return
return
+
+## 获得指定的时间格式
+# @param timeStr 时间列表
+# @param timeFormat 指定的转换格式
+# @return 时间datetime格式
+# @remarks 获得指定的时间格式
+def GetDateTimeByFormatStr(timeStr, timeFormat):
+ timeStr = timeStr.strip().split(".")[0]
+ try:
+ return datetime.datetime.strptime(timeStr, timeFormat)
+ except BaseException , e :
+ Log("%s : %s"%(e, timeStr))
+ return
+
+ return
+
#---------------------------------------------------------------------
##获得与现实时间差距的小时数
# @param dateTimeStr 比较时间字符 如"2010-05-26 11:21:25"
@@ -1309,7 +1327,7 @@
msg = logFormat % args[:-1]
playerID = args[-1]
LogUI.Msg('%s\t%s\tPyDebug:%s'%(par, playerID, msg))
- return
+ return True
#---------------------------------------------------------------------
##获得当前服务器跨服ID
@@ -1345,52 +1363,82 @@
def GetServerVersion():
return GetGameWorld().GetServerVersion()
+def IsCrossServer():
+ ## 是否跨服服务器，跨服中心跟常规跨服都算跨服
+ return GetServerType() in [ShareDefine.serverType_Cross, ShareDefine.serverType_CrossCenter]
+
+def IsCrossCenter():
+ ## 是否跨服中心服务器
+ return GetServerType() == ShareDefine.serverType_CrossCenter
+
+def CheckCrossCenterUniquenessErr():
+ ## 检查跨服中心唯一性
+ # @return: 是否异常
+ if not IsCrossCenter():
+ return
+ serverCnt = 0
+ serverDict = ReadChConfig.GetServerConfigDict()
+ for serverInfo in serverDict.values():
+ serverType = serverInfo[ShareDefine.serverCfgIndex_ServerType]
+ if serverType == ShareDefine.serverType_CrossCenter:
+ serverCnt += 1
+ if serverCnt > 1:
+ SendGameErrorEx("CrossCenterUniquenessErr", "跨服中心只允许配置一台", isRaiseErr=True)
+ return
+ return
+
+def IsMainServer():
+ ## 是否游戏服
+ return GetServerType() == ShareDefine.serverType_Main
+
def IsBattleServer():
## 是否战斗服务器
- return ToIntDef(ReadChConfig.GetPyMongoConfig("platform", "BattleServer"), 0) == 1
+ return GetServerType() == ShareDefine.serverType_Battle
+
+def GetServerType():
+ ## 本服服务器类型
+ ServerType = IpyGameDataPY.GetConfigEx("ServerType")
+ if ServerType == None:
+ ServerType = 0
+ serverDict = ReadChConfig.GetServerConfigDict()
+ serverID = GetGameWorld().GetServerID()
+ if serverID in serverDict:
+ serverInfo = serverDict[serverID]
+ ServerType = serverInfo[ShareDefine.serverCfgIndex_ServerType]
+ DebugLog("加载本服服务器类型: serverID=%s,ServerType=%s,serverInfo=%s" % (serverID, ServerType, serverInfo))
+ IpyGameDataPY.SetConfigEx("ServerType", ServerType)
+ return ServerType
def GetServerGroupName():
## 服务器组名，取 ServersRoute 中的配置
return ReadChConfig.GetServersRouteConfig("platform", "GroupName")
-def GetServerGroupID():
- ## 服务器组ID，必须唯一，代表这台物理服务器
- return ToIntDef(ReadChConfig.GetPyMongoConfig("platform", "GroupID"), 0)
+def GetMixServerDict():
+ ## 获取合服信息
+ # @return: {主服ID:[主服ID, 子服ID, ...], ...}
+ return # 待处理，以后有合服需要再写
+ #MixServerDict = IpyGameDataPY.GetConfigEx("MixServerDict")
+ #if MixServerDict == None:
+ # MixServerDict = {}
+ # MainServerDict = {} # 所属主服ID {子服ID:主服ID, ...}
+ # groupName = GetServerGroupName()
+ # serverDict = ReadChConfig.GetServerConfigDict()
+ # for serverInfo in serverDict.values():
+ # groupName = serverInfo[ShareDefine.serverCfgIndex_GroupName]
+ # serverMapID = serverInfo[ShareDefine.serverCfgIndex_MapID]
+ # serverType = serverInfo[ShareDefine.serverCfgIndex_ServerType]
+ # IpyGameDataPY.SetConfigEx("MixServerDict", MixServerDict)
+ # IpyGameDataPY.SetConfigEx("MainServerDict", MainServerDict)
+ #return MixServerDict
def GetMainServerID(serverID):
## 获取服务器ID所属主服ID
- ServerIDMainServerDict = IpyGameDataPY.GetConfigEx("ServerIDMainServerDict")
- if ServerIDMainServerDict == None:
- filePath = ChConfig.GetServerConfigPath() + ("\\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")
- #===========================================================================
- # if platform not in platformNumDict:
- # ErrLog("DBPlatformNum没有配置该服务器平台所对应的编号！platfrom=%s" % platform)
- # raise Exception("DBPlatformNum没有配置该服务器平台所对应的编号！platfrom=%s" % platform)
- #===========================================================================
- return platformNumDict.get(platform, 0)
+ return serverID
+ #GetMixServerDict()
+ #MainServerDict = IpyGameDataPY.GetConfigEx("MainServerDict")
+ #if not MainServerDict or serverID not in MainServerDict:
+ # return serverID
+ #return MainServerDict[serverID]
##获得当前服务器平台
# @param 无
@@ -1398,21 +1446,11 @@
def GetPlatform():
return ReadChConfig.GetPyMongoConfig("platform", "PlatformName")
+def GetAppID():
+ ## 获取渠道ID
+ return ReadChConfig.GetPyMongoConfig("platform", "AppID")
+
def IsTestPlatform(platform): return platform in ["test", "yun"]
-
-#===============================================================================
-# ##获得当前服务器ID
-# # @param 无
-# # @return
-# def GetServerID():
-# return ToIntDef(GetServerSID()[1:], 0)
-#===============================================================================
-
-#===============================================================================
-# def GetServerSID():
-# ##获得当前服务器ID, 带s的
-# return ReadChConfig.GetPyMongoConfig("platform", "ServerID")
-#===============================================================================
def GetCreateRoleDays(curPlayer):
# 获取创角第几天
@@ -1437,17 +1475,20 @@
infoList = accID.split(Def_AccID_Split_Sign)
return "" if len(infoList) < 3 else infoList[-1]
-def GetPlayerMainServerID(accIDPlatform):
- # 玩家合服后所属主服ID
- # @param accIDPlatform: 玩家账号所属的平台
- mainServerID = ToIntDef(ReadChConfig.GetPyMongoConfig("platform", "%sMainServerID" % accIDPlatform), None)
- if mainServerID != None:
- return mainServerID
- return 0
-
def GetDBPlayerAccIDByID(playerID):
## 获取玩家表账号ID - 根据玩家ID， 可用于判断是否本服玩家
return PyGameData.g_dbPlayerIDMap.get(playerID, "")
+
+def CheckServerIDInList(serverID, serverIDList):
+ if serverIDList == None:
+ return False
+ if not serverIDList:
+ return True
+ for serverIDInfo in serverIDList:
+ if (isinstance(serverIDInfo, (list, tuple)) and len(serverIDInfo) == 2 and serverIDInfo[0] <= serverID <= serverIDInfo[1]) \
+ or (isinstance(serverIDInfo, int) and serverIDInfo == serverID):
+ return True
+ return False
#===============================================================================
# 平台ID = appid
@@ -1967,27 +2008,6 @@
return inputText
-def IsCrossServer():
- ## 是否跨服服务器
- return ToIntDef(ReadChConfig.GetPyMongoConfig("Merge", "IsMergeServer"), 0)
-
-def GetCrossZoneName():
- ## 跨服服务器分区名，标记一起跨服分区的名字，配置在跨服服务器，子服不用配置，由跨服服务器同步
- if IsCrossServer():
- 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)
-
## 时间格式转换成数值时间，可参考datetime.datetime.fromtimestamp(102645645)
# @param timeNum
# @return 时间数值 1970年起
@@ -2441,15 +2461,32 @@
def DebugAnswer(curPlayer, text):
- '''转码后再发DebugAnswer'''
+ '''转码后再发DebugAnswer
+ @param curPlayer: 跨服服务器时支持直接传入 crossPlayer
+ '''
#===========================================================================
# if not GetGameWorld().GetDebugLevel():
# return
#===========================================================================
-
- DebugLog(text, curPlayer.GetPlayerID())
+ playerID = curPlayer.GetPlayerID()
+ if IsCrossServer():
+ crossPlayer = curPlayer
+ mainServerID = crossPlayer.GetMainServerID()
+ if not mainServerID:
+ return
+ import CrossMsg
+ CrossMsg.SendToClientServer(ShareDefine.C2S_GMDebugAnswer, {"text":text}, [mainServerID], playerID)
+ return
+ DebugLog(text, playerID)
text = text.decode(ShareDefine.Def_Game_Character_Encoding).encode(GetCharacterEncoding())
curPlayer.DebugAnswer(text)
+ return
+
+def C2S_GMDebugAnswer(dataMsg, playerID):
+ text = dataMsg["text"]
+ curPlayer = GetPlayerManager().FindPlayerByID(playerID)
+ if curPlayer:
+ DebugAnswer(curPlayer, text)
return
def RaiseException(errorMsg, playerID=0):
@@ -2461,10 +2498,10 @@
SendGameError("MapServerRaiseException", errorMsg)
return
-def SendGameErrorEx(errType, msgInfo="", playerID=0):
+def SendGameErrorEx(errType, msgInfo="", playerID=0, isRaiseErr=False):
ErrLog("SendGameErrorEx: %s -> %s" % (errType, msgInfo), playerID)
SendGameError(errType, msgInfo)
- if GetGameWorld().GetDebugLevel():
+ if isRaiseErr or GetGameWorld().GetDebugLevel():
raise Exception("%s -> %s" % (errType, msgInfo))
return
@@ -2474,9 +2511,9 @@
@param msgInfo: 错误信息，可选
'''
getUrl = ReadChConfig.GetPyMongoConfig("EventReport", "OpenStateUrl")
- groupID = ReadChConfig.GetPyMongoConfig("platform", "GroupID")
+ groupName = GetServerGroupName()
userDBName = ReadChConfig.GetPyMongoConfig("connect", "USER_DB_NAME")
- getUrl = getUrl + "?Type=%s&groupID=%s&userDBName=%s&mapID=%s"%(errType, groupID, userDBName, GetMap().GetMapID())
+ getUrl = getUrl + "?Type=%s&groupID=%s&userDBName=%s&mapID=%s"%(errType, groupName, userDBName, GetMap().GetMapID())
if msgInfo:
getUrl = getUrl + "&MsgInfo=%s" % urllib.quote_plus(msgInfo)
GetGameWorld().EventReport_EventReport("", "", "", "", 0, getUrl)
--
Gitblit v1.8.0