From fb1c33cc437d24b27f5e4e550005e40132019b60 Mon Sep 17 00:00:00 2001 From: hxp <ale99527@vip.qq.com> Date: 星期四, 06 二月 2025 16:48:58 +0800 Subject: [PATCH] 10382 【后台】称号和头像管理支持升星(支持升星、设置星级,支持离线设置;优化设置结果返回信息;支持在线查询玩家当前称号、头像、头像框状态明细;) --- ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py | 375 ++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 255 insertions(+), 120 deletions(-) diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py index 4950357..7dbf112 100644 --- a/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py +++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py @@ -21,11 +21,13 @@ import ReadChConfig import ChConfig import PlayerControl -import PlayerViewCache +import PlayerCompensation import ChPyNetSendPack -import IPY_PlayerDefine +import PlayerDBGSEvent import NetPackCommon +import IpyGameDataPY import PyGameData +import PlayerDBOper # 获取玩家跨服服务器上的名字 #=============================================================================== @@ -44,18 +46,138 @@ # 获取玩家跨服服务器上的名字 def GetCrossPlayerName(curPlayer): # 通过游戏账号中的平台标志获取名称,目前为spid - playerName = curPlayer.GetPlayerName() + playerName = curPlayer.GetName() - opName = ReadChConfig.GetPyMongoConfig("Merge", "OpName_%s_%s" % (GameWorld.GetPlayerPlatform(curPlayer)), - GameWorld.GetPlayerServerSID(curPlayer)) + opName = ReadChConfig.GetPyMongoConfig("Merge", "OpName_%s_%s" % (GameWorld.GetPlayerPlatform(curPlayer), + GameWorld.GetPlayerServerSID(curPlayer))) if not opName: return playerName return opName.decode('gbk').encode(GameWorld.GetCharacterEncoding()) + playerName +def GetCrossZoneIpyDataByZoneID(mapID, zoneID): + ## 获取跨服分区 + zoneTypeName = ChConfig.Def_CrossZoneTypeName.get(mapID, "CrossZoneComm") + crossZoneName = GameWorld.GetCrossZoneName() + return IpyGameDataPY.GetIpyGameData(zoneTypeName, crossZoneName, zoneID) + +def GetCrossZoneIpyDataByServerGroupID(mapID, serverGroupID): + ## 获取跨服分区 + zoneTypeName = ChConfig.Def_CrossZoneTypeName.get(mapID, "CrossZoneComm") + crossZoneName = GameWorld.GetCrossZoneName() + ipyDataList = IpyGameDataPY.GetIpyGameDataByCondition(zoneTypeName, {"CrossZoneName":crossZoneName}, True) + if not ipyDataList: + return + for ipyData in ipyDataList: + serverGroupIDList = ipyData.GetServerGroupIDList() + for serverGroupIDInfo in serverGroupIDList: + if (isinstance(serverGroupIDInfo, tuple) and serverGroupIDInfo[0] <= serverGroupID <= serverGroupIDInfo[1]) \ + or (isinstance(serverGroupIDInfo, int) and serverGroupIDInfo == serverGroupID): + return ipyData + GameWorld.ErrLog("没有找到跨服玩法对应分区! mapID=%s, serverGroupID=%s, zoneTypeName=%s" % (mapID, serverGroupID, zoneTypeName)) + return + +def GetCrossZoneIpyDataListByServerGroupID(mapID, serverGroupID): + ## 获取跨服常规分区列表 + if serverGroupID: + ipyData = GetCrossZoneIpyDataByServerGroupID(mapID, serverGroupID) + if not ipyData: + return + ipyDataList = [ipyData] + else: + crossZoneName = GameWorld.GetCrossZoneName() + zoneTypeName = ChConfig.Def_CrossZoneTypeName.get(mapID, "CrossZoneComm") + ipyDataList = IpyGameDataPY.GetIpyGameDataByCondition(zoneTypeName, {"CrossZoneName":crossZoneName}, True) + return ipyDataList + +def GetServerCommCrossZoneID(serverGroupID): + ## 获取跨服常规分区 + zoneTypeName = "CrossZoneComm" + crossZoneName = GameWorld.GetCrossZoneName() + ipyDataList = IpyGameDataPY.GetIpyGameDataByCondition(zoneTypeName, {"CrossZoneName":crossZoneName}, True) + if not ipyDataList: + return 0 + for ipyData in ipyDataList: + serverGroupIDList = ipyData.GetServerGroupIDList() + for serverGroupIDInfo in serverGroupIDList: + if (isinstance(serverGroupIDInfo, tuple) and serverGroupIDInfo[0] <= serverGroupID <= serverGroupIDInfo[1]) \ + or (isinstance(serverGroupIDInfo, int) and serverGroupIDInfo == serverGroupID): + return ipyData.GetZoneID() + return 0 + +def GetServerCrossZoneMapIpyData(zoneID, mapID): + ## 获取本服对应跨服玩法分区地图信息 - 仅适用于固定地图及虚拟分线的跨服玩法 + if mapID not in ChConfig.Def_CrossZoneMapTableName: + return + tableName = ChConfig.Def_CrossZoneMapTableName[mapID] + return IpyGameDataPY.GetIpyGameDataByCondition(tableName, {"ZoneID":zoneID}) + +def IsCrossServerOpen(): + ## 跨服服务器是否开放中 + return GameWorld.GetGameWorld().GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossServerOpen) + +def Sync_CrossCommInitDataToClientServer(serverGroupID=0): + ''' 同步跨服常规通用数据到子服务器 + @param serverGroupID: 为0时同步所有子服 + ''' + + isOpen = GameWorld.GetGameWorld().GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossServerOpen) + crossZoneName = GameWorld.GetCrossZoneName() + GameWorld.Log("通知当前跨服服务器状态: isOpen=%s,crossZoneName=%s,syncServerGroupID=%s" % (isOpen, crossZoneName, serverGroupID)) + serverGroupIDList = [serverGroupID] if serverGroupID else [] + CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_CrossServerState, {"isOpen":isOpen, "crossZoneName":crossZoneName}, serverGroupIDList) + return + +def DoChangeCrossServerState(isOpen): + ## 跨服服务器状态变更 + + PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_CrossServerClose, 0 if isOpen else 1) # 存DB的反着存 + GameWorld.GetGameWorld().SetDict(ShareDefine.Def_Notify_WorldKey_CrossServerOpen, isOpen) + + if not isOpen: + # 踢掉所有玩家 + playerManager = GameWorld.GetPlayerManager() + for i in xrange(playerManager.GetActivePlayerCount()): + curPlayer = playerManager.GetActivePlayerAt(i) + if curPlayer == None: + continue + PlayerControl.SetCrossMapID(curPlayer, 0) + curPlayer.Kick(0) + + # 广播所有子服,本服务器进入维护 + CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_CrossServerState, {"isOpen":isOpen}) + return + +def CrossServerMsg_CrossServerState(msgData): + ## 子服收到跨服服务器状态变更,子服不存DB,默认跨服维护中,连接跨服成功后由跨服同步状态直接更新到字典即可,没连上就默认维护中 + if "crossZoneName" in msgData: + PyGameData.g_crossZoneName = msgData["crossZoneName"] + GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_CrossZoneName, PyGameData.g_crossZoneName) + + isOpen = msgData["isOpen"] + isOpen = 1 if isOpen else 0 + GameWorld.Log("收到跨服服务器状态变更: 是否正常开放中=%s" % isOpen) + GameWorld.GetGameWorld().SetDict(ShareDefine.Def_Notify_WorldKey_CrossServerOpen, isOpen) + + if not isOpen: + playerManager = GameWorld.GetPlayerManager() + for i in xrange(playerManager.GetActivePlayerCount()): + curPlayer = playerManager.GetActivePlayerAt(i) + if curPlayer == None: + continue + PlayerControl.SetCrossMapID(curPlayer, 0) + + GameWorld.GetGameWorld().SendCrossServerStateToLoginServer(isOpen) + # 通知地图 + GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_CrossServerOpen, isOpen) + return + def PlayerExitCrossServer(curPlayer): ## 玩家退出跨服服务器 + + if not GameWorld.IsCrossServer(): + return # 通知子服玩家退出跨服服务器 playerID = curPlayer.GetPlayerID() @@ -63,7 +185,7 @@ CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_ExitCrossServer, playerID, [serverGroupID]) # 设置非跨服状态,踢下线 - PlayerControl.SetCrossRealmState(curPlayer, 0) + PlayerControl.SetCrossMapID(curPlayer, 0) curPlayer.Kick(0) GameWorld.Log("PlayerExitCrossServer...serverGroupID=%s" % serverGroupID, playerID) return @@ -75,19 +197,28 @@ curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(playerID) if not curPlayer: GameWorld.Log(" 退出跨服时本服玩家不在线!", playerID) + DoOfflinePlayerExitCrossServer(playerID) return - PlayerControl.SetCrossRealmState(curPlayer, 0) + PlayerControl.SetCrossMapID(curPlayer, 0) return -def SendCrossRealmReg(curPlayer, actionType, mapID=0, dataMapID=0, copyMapID=0, posX=0, posY=0): +def DoOfflinePlayerExitCrossServer(playerID): + ## 处理离线玩家退出跨服服务器更新DB数据逻辑 + + PlayerDBOper.UpdateDBOper(PlayerDBOper.Table_DBPlayer, {"PlayerID":playerID}, {"ExAttr5":0}) + return + +def SendCrossRealmReg(curPlayer, registerMap, mapID=0, dataMapID=0, copyMapID=0, posX=0, posY=0, lineID=0): # 发送跨服账号注册上传数据 + # @param mapID: 真实场景地图ID + # @param dataMapID: 真实场景地图ID对应场景数据地图ID # 设置上传数据的活动类型 - curPlayer.SetDict(ChConfig.Def_PlayerKey_MergeRegisterType, actionType) - sysMsg = str([actionType, mapID, dataMapID, copyMapID, posX, posY]) + curPlayer.SetDict(ChConfig.Def_PlayerKey_CrossRegisterMap, registerMap) + sysMsg = str([registerMap, mapID, dataMapID, copyMapID, posX, posY, lineID]) curPlayer.MapServer_QueryPlayerResult(0, 0, "CrossRealmReg", sysMsg, len(sysMsg)) - GameWorld.Log("SendCrossRealmReg actionType=%s,mapID=%s,dataMapID=%s,copyMapID=%s,posX=%s,posY=%s" - % (actionType, mapID, dataMapID, copyMapID, posX, posY), curPlayer.GetPlayerID()) + GameWorld.Log("SendCrossRealmReg registerMap=%s,mapID=%s,dataMapID=%s,copyMapID=%s,posX=%s,posY=%s" + % (registerMap, mapID, dataMapID, copyMapID, posX, posY), curPlayer.GetPlayerID()) return def OnCrossRealmRegOK(playerID, msgList, tick): @@ -97,38 +228,30 @@ if not curPlayer: return - #newAccount, newName = msgList + if not IsCrossServerOpen(): + return - actionType = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_MergeRegisterType) - GameWorld.Log("跨服报名成功 , actionType=%s" % (actionType), playerID) + registerMap = msgList[0] + playerRegisterMap = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_CrossRegisterMap) + if playerRegisterMap and registerMap != playerRegisterMap: + return + curPlayer.SetDict(ChConfig.Def_PlayerKey_CrossRegisterMap, 0) + + GameWorld.Log("跨服报名成功 , registerMap=%s" % (registerMap), playerID) # 跨服PK上传数据完毕,通知跨服服务器,准备完毕 - if actionType == ShareDefine.Def_CrossAction_PK: - regVSRoomID = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_MergeRegisterRoomID) - vsRoomID = curPlayer.GetVsRoomId() - - if regVSRoomID != vsRoomID: - GameWorld.Log("上传跨服服务器的 regVSRoomID=%s 与玩家当前的 roomID=%s 不同!不发送准备完毕!" - % (regVSRoomID, vsRoomID), playerID) - return - - dataMsg = { - "accID":curPlayer.GetAccID(), # 角色账号ID - "playerID":playerID, # 角色ID - "vsRoomID":vsRoomID, # 所属对战房间ID - } - CrossRealmMsg.SendMsgToCrossServer(ShareDefine.ClientServerMsg_PKPrepareOK, dataMsg) - GameWorld.Log("通知跨服服务器, 玩家匹配PK准备完毕!%s" % str(dataMsg), playerID) + if registerMap == ChConfig.Def_FBMapID_CrossRealmPK: + pass # 其他的,在上传数据完毕后,使用通用的通知可进入跨服 else: - NotifyCanEnterMergeServer(curPlayer, actionType) + NotifyCanEnterMergeServer(curPlayer, registerMap) # hxp 2015.09.10 跨服boss,后面的暂时不需要 return -def NotifyCanEnterMergeServer(curPlayer, actionType): +def NotifyCanEnterMergeServer(curPlayer, registerMap): # 通用包,通知客户端可进入跨服服务器 return @@ -144,99 +267,111 @@ ''' curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index) GameWorld.ErrLog("某些异常情况下,前端强制发包退出跨服状态! ", curPlayer.GetPlayerID()) - PlayerControl.SetCrossRealmState(curPlayer, 0) + PlayerControl.SetCrossMapID(curPlayer, 0) return -#// C0 02 查看跨服玩家信息 #tagCGViewCrossPlayerInfo -# -#struct tagCGViewCrossPlayerInfo -#{ -# tagHead Head; -# DWORD PlayerID; // 跨服玩家ID -#}; -def OnViewCrossPlayerInfo(index, clientData, tick): - if GameWorld.IsCrossServer(): - return +def CrossServerMsg_PutInItem(itemInfo): + ## 跨服获得物品 - curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index) - playerID = curPlayer.GetPlayerID() - tagPlayerID = clientData.PlayerID - curCache = PlayerViewCache.ViewCacheMgr.FindCache(tagPlayerID) - ## 本服有,直接回客户端 - if curCache: - GameWorld.DebugLog("查看跨服玩家,是本服玩家,直接回复!tagPlayerID=%s" % (tagPlayerID), playerID) - sendPack = ChPyNetSendPack.tagSCQueryPlayerCacheResult() - sendPack.PlayerID = tagPlayerID - sendPack.PropData = curCache.GetPropData() - sendPack.PropDataSize = len(sendPack.PropData) - sendPack.ItemData = PlayerViewCache.GetItemData(curCache) - sendPack.ItemDataSize = len(sendPack.ItemData) - sendPack.PlusData = PlayerViewCache.GetPlusData(curCache) - sendPack.PlusDataSize = len(sendPack.PlusData) - NetPackCommon.SendFakePack(curPlayer, sendPack) - return - - if tagPlayerID in PyGameData.g_crossPlayerViewCache: - validChaheTime = 5 * 60 * 1000 - cacheInfo, updTick = PyGameData.g_crossPlayerViewCache[tagPlayerID] - if tick - updTick <= validChaheTime: - GameWorld.DebugLog("查看跨服玩家数据同步CD中,直接用缓存数据回复!tagPlayerID=%s" % (tagPlayerID), playerID) - SyncPlayerViewCrossPlayerInfo(curPlayer, tagPlayerID, cacheInfo) - return - - for crossPlayerID, cacheInfoList in PyGameData.g_crossPlayerViewCache.items(): - if tick - cacheInfoList[1] > validChaheTime: - PyGameData.g_crossPlayerViewCache.pop(crossPlayerID) - - # 发送跨服服务器查询 - dataMsg = {"tagPlayerID":tagPlayerID, "playerID":playerID} - CrossRealmMsg.SendMsgToCrossServer(ShareDefine.ClientServerMsg_ViewPlayerCache, dataMsg) - return - -def ClientServerMsg_ViewPlayerCache(serverGroupID, msgData): - tagPlayerID = msgData["tagPlayerID"] - playerID = msgData["playerID"] - - GameWorld.Log("收到子服查看跨服玩家信息: serverGroupID=%s,playerID=%s,tagPlayerID=%s" % (serverGroupID, playerID, tagPlayerID)) - - cacheInfo = [] - curCache = PlayerViewCache.ViewCacheMgr.FindCache(tagPlayerID) - if curCache: - cacheInfo = [curCache.GetPropData(), PlayerViewCache.GetItemData(curCache), PlayerViewCache.GetPlusData(curCache)] - - viewPlayerCacheRet = [playerID, tagPlayerID, cacheInfo] - CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_ViewPlayerCacheRet, viewPlayerCacheRet, [serverGroupID]) - return - -def CrossServerMsg_ViewPlayerCacheRet(msgData, tick): - - playerID, tagPlayerID, cacheInfo = msgData - GameWorld.Log("收到跨服服务器回复的查看玩家信息: playerID=%s,tagPlayerID=%s" % (playerID, tagPlayerID)) - - PyGameData.g_crossPlayerViewCache[tagPlayerID] = [cacheInfo, tick] # 更新信息 - + GameWorld.DebugLog("收到跨服服务器获得物品!") + playerID = itemInfo["PlayerID"] + itemData = itemInfo["ItemData"] + event = itemInfo["Event"] curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(playerID) if curPlayer: - SyncPlayerViewCrossPlayerInfo(curPlayer, tagPlayerID, cacheInfo) - - return - -def SyncPlayerViewCrossPlayerInfo(curPlayer, tagPlayerID, cacheInfo): - if not cacheInfo: - PlayerControl.NotifyCode(curPlayer, "ViewPlayer_OffLine") + # 在线的话推到MapServer处理 + itemMsg = str(itemInfo) + curPlayer.MapServer_QueryPlayerResult(0, 0, "CrossPutInItem", itemMsg, len(itemMsg)) return - PropData, ItemData, PlusData = cacheInfo - sendPack = ChPyNetSendPack.tagSCQueryPlayerCacheResult() - sendPack.PlayerID = tagPlayerID - sendPack.PropData = PropData - sendPack.PropDataSize = len(sendPack.PropData) - sendPack.ItemData = ItemData - sendPack.ItemDataSize = len(sendPack.ItemData) - sendPack.PlusData = PlusData - sendPack.PlusDataSize = len(sendPack.PlusData) - NetPackCommon.SendFakePack(curPlayer, sendPack) + # 离线的话直接发邮件 + GameWorld.Log("收到跨服获得物品,玩家不在线,直接发邮件! itemInfo=%s" % str(itemInfo), playerID) + itemID, itemCount, isBind, itemUserData = itemData + addItemList = [{"ItemID":itemID, "Count":itemCount, "IsAuctionItem":isBind, "UserData":itemUserData}] + PlayerCompensation.SendMailByKey("", [playerID], addItemList, detail={"CrossPutInItem":1, "Event":event}) return - +def CrossServerMsg_GiveMoney(msgInfo): + ## 跨服获得货币 - \ No newline at end of file + playerID = msgInfo["PlayerID"] + curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(playerID) + if not curPlayer: + GameWorld.ErrLog("跨服获得货币时玩家不在线! msgInfo=%s" % str(msgInfo), playerID) + return + msgInfo = str(msgInfo) + curPlayer.MapServer_QueryPlayerResult(0, 0, "CrossGiveMoney", msgInfo, len(msgInfo)) + return + +def SetCrossPlayerAttrValue(msgInfo, tick): + ## 设置跨服玩家属性值 + playerID, setType, setDict, isDelay = msgInfo + if not PyGameData.g_crossSetPlayerAttr: + GameWorld.GetGameWorld().SetDict(ChConfig.Def_WorldKey_CrossSetPlayerAttrTick, tick) + playerSetInfoList = PyGameData.g_crossSetPlayerAttr.get(playerID, []) + playerSetInfoList.append([setType, setDict]) + PyGameData.g_crossSetPlayerAttr[playerID] = playerSetInfoList + if not isDelay: + __SendCrossServerSetPlayerAttr(0) + return + +def OnCrossProcess(tick): + __SendCrossServerSetPlayerAttr(tick) + return + +def __SendCrossServerSetPlayerAttr(tick): + if not PyGameData.g_crossSetPlayerAttr: + return + + if tick: + # 延迟10秒一次性同步,主要是比如OnDay的时候当多个玩家同时跨服时,减少同步次数,延迟统一发送 + if tick - GameWorld.GetGameWorld().GetDictByKey(ChConfig.Def_WorldKey_CrossSetPlayerAttrTick) < 10 * 1000: + return + GameWorld.GetGameWorld().SetDict(ChConfig.Def_WorldKey_CrossSetPlayerAttrTick, tick) + + CrossRealmMsg.SendMsgToCrossServer(ShareDefine.ClientServerMsg_SetPlayerAttrValue, PyGameData.g_crossSetPlayerAttr) + PyGameData.g_crossSetPlayerAttr = {} + return + +def OnPlayerLogin(curPlayer): + if not IsCrossServerOpen(): + return + + Sync_CrossZoneInfo(curPlayer) + LoginDoUnNotifyCrossMsg(curPlayer) + return + +def MapServer_QueryCrossPlayerResult(playerID, callName, msgInfo, offlineExitCross=False): + ## 同步地图跨服玩家处理信息,玩家可能不在线,缓存后等玩家上线处理,暂不考虑存档问题,服务器维护后未处理的命令将失效 + + curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(playerID) + if curPlayer and curPlayer.GetInitOK(): + msgInfo = str(msgInfo) + curPlayer.MapServer_QueryPlayerResult(0, 0, callName, msgInfo, len(msgInfo)) + return curPlayer + else: + # 缓存起来,等上线后处理 + if playerID not in PyGameData.g_unNotifyPlayerCrossMsgDict: + PyGameData.g_unNotifyPlayerCrossMsgDict[playerID] = [] + msgList = PyGameData.g_unNotifyPlayerCrossMsgDict[playerID] + msgList.append([callName, msgInfo]) + GameWorld.Log("玩家不在线,添加未通知的跨服命令: %s, msgInfo=%s" % (callName, msgInfo), playerID) + if offlineExitCross: + DoOfflinePlayerExitCrossServer(playerID) + return + +def LoginDoUnNotifyCrossMsg(curPlayer): + playerID = curPlayer.GetPlayerID() + msgList = PyGameData.g_unNotifyPlayerCrossMsgDict.pop(playerID, []) + if not msgList: + return + for callName, msgInfo in msgList: + GameWorld.Log("上线处理未通知的跨服命令: %s, msgInfo=%s" % (callName, msgInfo), playerID) + msgInfo = str(msgInfo) + curPlayer.MapServer_QueryPlayerResult(0, 0, callName, msgInfo, len(msgInfo)) + return + +def Sync_CrossZoneInfo(curPlayer): + clientPack = ChPyNetSendPack.tagGCCrossZoneInfo() + clientPack.CommZoneID = GetServerCommCrossZoneID(GameWorld.GetServerGroupID()) + NetPackCommon.SendFakePack(curPlayer, clientPack) + return -- Gitblit v1.8.0