From 758c00df67da77c14c0b84390a23d49c3e64429a Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 15 十月 2025 17:00:33 +0800
Subject: [PATCH] 66 【公会】基础主体-服务端（增加称号同步：公会成员A520 A522，排行榜Value2，演武场匹配A922; 修复演武场战斗日志记录json格式错误bug；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/LogicProcess/UserCtrlDB.py | 275 ++++++++++++-------------------------------------------
1 files changed, 60 insertions(+), 215 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/LogicProcess/UserCtrlDB.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/LogicProcess/UserCtrlDB.py
index f3e9f06..fda4278 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/LogicProcess/UserCtrlDB.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/LogicProcess/UserCtrlDB.py
@@ -415,12 +415,45 @@
return
def findDBPlayer(self, playerID):
+ '''根据玩家ID查找dbPlayer
+ @return: None or tagDBPlayer
+ '''
col = self.db[UCN_DBPlayer]
dbPlayer = DataServerPlayerData.tagDBPlayer()
dbPlayer.IsDeleted = 0
if not dbPlayer.adoLoadCEx(col, {"PlayerID":playerID}):
return
return dbPlayer
+
+ def findDBPlayerByName(self, playerName, backDBPlayer=False):
+ '''根据玩家名查找dbPlayer
+ @param backDBPlayer: 可指定返回 tagDBPlayer 实例，默认false，直接返回db数据字典
+ @return: None or db数据字典{k:v, ...} or tagDBPlayer
+ '''
+ collection = self.db[UCN_DBPlayer]
+ rec = collection.find_one({'PlayerName':fix_incomingText(playerName), 'IsDeleted':0})
+ if not rec:
+ return
+ if backDBPlayer:
+ dbPlayer = DataServerPlayerData.tagDBPlayer()
+ dbPlayer.readRecord(rec)
+ return dbPlayer
+ return rec
+
+ def findDBPlayerByAccID(self, accID, backDBPlayer=False):
+ '''根据玩家账号查找dbPlayer
+ @param backDBPlayer: 可指定返回 tagDBPlayer 实例，默认false，直接返回db数据字典
+ @return: None or db数据字典{k:v, ...} or tagDBPlayer
+ '''
+ collection = self.db[UCN_DBPlayer]
+ rec = collection.find_one({'AccID':fix_incomingText(accID), 'IsDeleted':0})
+ if not rec:
+ return
+ if backDBPlayer:
+ dbPlayer = DataServerPlayerData.tagDBPlayer()
+ dbPlayer.readRecord(rec)
+ return dbPlayer
+ return rec
def requestLogicProcess(self, pack):
db = self.db
@@ -433,6 +466,13 @@
mylog.debug("begin process request type = %d"%requestType)
+ if requestType == CommonDefine.gstCrossServerToServerPack:
+ oFuncGrade = self.GetFuncGrade('gstCrossServerToServerPack')
+ oFuncGrade.Start()
+ self.OnCrossServerToServerPack(db, pack)
+ oFuncGrade.End()
+ return True
+
if requestType == CommonDefine.gstGMToolCommand:
oFuncGrade = self.GetFuncGrade('gstGMToolCommand')
oFuncGrade.Start()
@@ -455,26 +495,6 @@
oFuncGrade.End()
return True
- if requestType == CommonDefine.gstMergeQueryRegisterResult:
- oFuncGrade = self.GetFuncGrade('gstMergeQueryRegisterResult')
- oFuncGrade.Start()
- self.OnMergeQueryRegisterResult(db, pack)
- oFuncGrade.End()
- return True
-
- if requestType == CommonDefine.gstMergeRegisterPlayer:
- oFuncGrade = self.GetFuncGrade('gstMergeRegisterPlayer')
- oFuncGrade.Start()
- self.OnMergeRegisterPlayerByCache(db, pack)
- oFuncGrade.End()
- return True
-
- if requestType == CommonDefine.gstMergePlayerData:
- oFuncGrade = self.GetFuncGrade('gstMergePlayerData')
- oFuncGrade.Start()
- self.OnMergeChildToCenterPlayerData(db, pack)
- oFuncGrade.End()
- return True
if requestType == CommonDefine.gstQueryNewGuyCardState:
oFuncGrade = self.GetFuncGrade("gstQueryNewGuyCardState")
@@ -822,14 +842,7 @@
self.OnInsertImpeach(db, pack)
oFuncGrade.End()
return True
-
-
- if requestType == CommonDefine.gstMergerChildToCenter:
- oFuncGrade = self.GetFuncGrade("gstMergerChildToCenter")
- oFuncGrade.Start()
- self.OnMergerChildToCenter(db, pack)
- oFuncGrade.End()
- return True
+
if requestType == CommonDefine.gstPrepareCreateRole:
oFuncGrade = self.GetFuncGrade("gstPrepareCreateRole")
@@ -899,6 +912,25 @@
self.packSend(sessionID, 0, 0, CommonDefine.atMergeLogic, MMORPGPack.stGame,
MMORPGPack.stData, sendPack.GetBuffer())
+ def OnPlayerLogin(self, curPlayer):
+ ProjSpecialProcess.GMCmdPlayerLogin(curPlayer)
+ return
+
+ def OnCrossServerToServerPack(self, db, pack):
+
+ if CommonDefine.IsDebug():
+ import binascii
+ mylog.debug('buf = %s'%binascii.b2a_hex(pack.getBuffer()))
+
+ try:
+ recvPack = MergeServerRecvProtocol.tagLPStringData()
+ recvPack.ReadData(pack.getBuffer())
+ NetPackCommon.RecCrossServerNetPack(recvPack.Data)
+ except:
+ msg = error.formatMsg('error', error.ERROR_NO_172, "LogicProcessThread::OnCrossServerToServerPack Catch a unexpetcted exception, error = %s"%traceback.format_exc())
+ mylog.error(msg)
+
+
def OnGMToolCommand(self, db, pack):
@@ -911,7 +943,6 @@
except:
msg = error.formatMsg('error', error.ERROR_NO_172, "LogicProcessThread::OnGMToolCommand Catch a unexpetcted exception, error = %s"%traceback.format_exc())
mylog.error(msg)
-
def OnGeneralDBOper(self, db, pack):
@@ -1182,114 +1213,6 @@
+ gmIPData + rolePetData + petSkillData + roleNormalDictData + roleDienstgradData+battleFormationData
-
- # 查询返回0/1 代表是否成功
- def OnMergeQueryRegisterResult(self, db, pack):
- g_mergeRegisterPlayerDict = PyGameData.g_mergeRegisterPlayerDict
- buf = pack.getBuffer()
- #len = pack.getLength()
- recvPack = MergeServerRecvProtocol.tagLPQueryRegisterResult()
- pos = 0
- recvPack.ReadData(buf, pos)
- accID = recvPack.AccID.strip(chr(0))
- mylog.debug('accID = %s.'%(accID))
-
- clientSessionID = pack.getSessionID()
- client = MergeProxyClientMgr.getMergeProxyClientMgr().findClientBySessionID(clientSessionID)
- if not client:
- mylog.warning('client not found!sessionID = %s'%(clientSessionID))
- return
-
-
- sendPack = MergeServerSendProtocol.tagMPQueryRegisterResult()
- sendPack.Type = CommonDefine.dgMergeQueryNewAccount
- if g_mergeRegisterPlayerDict.get(accID, []):
- sendPack.Result = 0
- self.packSend(pack.getSessionID(), pack.getPackHead().sessionID, 0, CommonDefine.atMergeLogic, MMORPGPack.stNoSense,
- MMORPGPack.stNoSense, sendPack.GetBuffer())
- mylog.warning('query failed!spec = %s'%accID)
- return
- sendPack.Result = 1
- sendPack.Account = accID
- sendPack.AccountLen = len(accID)
- sendPack.Pwd = ""
- sendPack.PwdLen = 0
- self.packSend(pack.getSessionID(), pack.getPackHead().sessionID, 0, CommonDefine.atMergeLogic, MMORPGPack.stNoSense,
- MMORPGPack.stNoSense, sendPack.GetBuffer())
-
-
- def OnMergeRegisterPlayerByCache(self, db, pack):
- ''' 缓存跨服玩家上传数据信息
- 目前账号、玩家ID、角色名均已确保唯一，故无需再重新生成新的账号及角色信息
- 直接接收更新缓存即可，玩家登陆跨服服务器时直接从缓存数据中解析角色数据，从而节省db存取步骤
- '''
- g_mergeRegisterPlayerDict = PyGameData.g_mergeRegisterPlayerDict
- try:
- buf = pack.getBuffer()
- recvPack = MergeServerRecvProtocol.tagLPRegisterPlayer()
- pos = 0
- recvPack.ReadData(buf, pos)
- #mylog.debug('pack = %s'%(binascii.b2a_hex(buf)))
-
- loginResultPack = MergeServerSendProtocol.tagMPRegisterPlayerResult()
- loginResultPack.Type = CommonDefine.dgMergeRegisterResult
-
- #玩家地图数据，和下线保存包 SavePlayerMapServerDataEx 一致
- playerData = recvPack.Data
- playerRec = DataServerPlayerData.tagDBPlayer()
- pos = 0
- dbPlayerReadLen = playerRec.readData(playerData, pos, len(playerData))
- if -1 == dbPlayerReadLen:
- #数据异常，长度不足
- #回复失败
- loginResultPack.Result = 0
- loginResultPack.ErrorMsg = 'Player data length not enough!'
- loginResultPack.ErrorMsgLen = len(loginResultPack.ErrorMsg)
- self.packSend(pack.getSessionID(), pack.getPackHead().sessionID, 0, CommonDefine.atMergeLogic, MMORPGPack.stNoSense,
- MMORPGPack.stNoSense, loginResultPack.GetBuffer())
- mylog.warning('player data too short!')
- return
-
- if playerRec.PlayerID == 0:
- loginResultPack.Result = 0
- loginResultPack.ErrorMsg = 'Player data error!'
- loginResultPack.ErrorMsgLen = len(loginResultPack.ErrorMsg)
- self.packSend(pack.getSessionID(), pack.getPackHead().sessionID, 0, CommonDefine.atMergeLogic, MMORPGPack.stNoSense,
- MMORPGPack.stNoSense, loginResultPack.GetBuffer())
- mylog.warning('player data error!')
- return
-
- clientSessionID = pack.getSessionID()
- client = MergeProxyClientMgr.getMergeProxyClientMgr().findClientBySessionID(clientSessionID)
- if not client:
- mylog.warning('client not found!sessionID = %s'%(clientSessionID))
- return
- groupID = client.groupID
-
- playerID = playerRec.PlayerID
- accID = playerRec.AccID.lower().strip(chr(0))
-
- playerName = playerRec.PlayerName.strip()
-
- #成功，返回新帐号密码
- loginResultPack.Result = 1
- loginResultPack.Account = accID
- loginResultPack.AccountLen = len(accID)
- loginResultPack.Pwd = ""
- loginResultPack.PwdLen = 0
- self.packSend(pack.getSessionID(), pack.getPackHead().sessionID, 0, CommonDefine.atMergeLogic, MMORPGPack.stNoSense,
- MMORPGPack.stNoSense, loginResultPack.GetBuffer())
-
- mylog.info('player %s accID=%s, playerID=%s, %s register PK ok!'%(groupID, accID, playerID, playerName))
- g_mergeRegisterPlayerDict[accID] = [time(), 0, recvPack, groupID] # 更新跨服玩家数据缓存
- except Exception, e:
- msg = error.formatMsg('error', error.ERROR_NO_175, "OnMergeRegisterPlayer error %s!traceback = %s, pack = %s"%(e, traceback.format_exc(), binascii.b2a_hex(buf)))
- mylog.error(msg)
- except:
- msg = error.formatMsg('error', error.ERROR_NO_176, "OnMergeRegisterPlayer error!traceback = %s, pack = %s"%(traceback.format_exc(), binascii.b2a_hex(buf)))
- mylog.error(msg)
- return
-
def OnFinishRecharge(self, db, pack):
# map完成兑换，假设此处没有回复，则此单变成丢单，暂由人工维护
@@ -3527,21 +3450,6 @@
DBPlayerRecData = DataServerPlayerData.tagDBPlayerRecData()
data += DBPlayerRecData.adoQueryAll(collection)
mylog.debug("tagDBPlayerRecData ok")
-
- collection = db[UCN_DBPyMineAreaAward]
- DBPyMineAreaAward = DataServerPlayerData.tagDBPyMineAreaAward()
- data += DBPyMineAreaAward.adoQueryAll(collection)
- mylog.debug("tagDBPyMineAreaAward ok")
-
- collection = db[UCN_DBPyMineAreaRecord]
- DBPyMineAreaRecord = DataServerPlayerData.tagDBPyMineAreaRecord()
- data += DBPyMineAreaRecord.adoQueryAll(collection)
- mylog.debug("tagDBPyMineAreaRecord ok")
-
- collection = db[UCN_DBPyMineAreaItem]
- DBPyMineAreaItem = DataServerPlayerData.tagDBPyMineAreaItem()
- data += DBPyMineAreaItem.adoQueryAll(collection)
- mylog.debug("tagDBPyMineAreaItem ok")
collection = db[UCN_DBPyCouple]
DBPyCouple = DataServerPlayerData.tagDBPyCouple()
@@ -3944,9 +3852,6 @@
gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPyFuncTeam, DataServerPlayerData.tagDBPyFuncTeam, db)
gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPyFuncTeamMem, DataServerPlayerData.tagDBPyFuncTeamMem, db)
gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPlayerRecData, DataServerPlayerData.tagDBPlayerRecData, db)
- gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPyMineAreaAward, DataServerPlayerData.tagDBPyMineAreaAward, db)
- gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPyMineAreaRecord, DataServerPlayerData.tagDBPyMineAreaRecord, db)
- gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPyMineAreaItem, DataServerPlayerData.tagDBPyMineAreaItem, db)
gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPyCouple, DataServerPlayerData.tagDBPyCouple, db)
gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPyUnNotifyLoveGiftRec, DataServerPlayerData.tagDBPyUnNotifyLoveGiftRec, db)
gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPyCharmValueRec, DataServerPlayerData.tagDBPyCharmValueRec, db)
@@ -4080,9 +3985,6 @@
gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPyFuncTeam, DataServerPlayerData.tagDBPyFuncTeam, db)
gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPyFuncTeamMem, DataServerPlayerData.tagDBPyFuncTeamMem, db)
gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPlayerRecData, DataServerPlayerData.tagDBPlayerRecData, db)
- gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPyMineAreaAward, DataServerPlayerData.tagDBPyMineAreaAward, db)
- gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPyMineAreaRecord, DataServerPlayerData.tagDBPyMineAreaRecord, db)
- gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPyMineAreaItem, DataServerPlayerData.tagDBPyMineAreaItem, db)
gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPyCouple, DataServerPlayerData.tagDBPyCouple, db)
gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPyUnNotifyLoveGiftRec, DataServerPlayerData.tagDBPyUnNotifyLoveGiftRec, db)
gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPyCharmValueRec, DataServerPlayerData.tagDBPyCharmValueRec, db)
@@ -4236,7 +4138,6 @@
for i in xrange(0, recCnt):
rec.clear()
readLen = rec.readData(data, pos, len(data))
- rec.dumpString()
if -1 == readLen:
mylog.error('%s.%s readData failed, index = %s'%(self.__class__.__name_, inspect.stack()[0][3], i) )
raise CommonDefine.ShortBuf(collectionName) #如果读取出错，后面全错了
@@ -5700,64 +5601,8 @@
return True
- def OnMergerChildToCenter(self,db, pack):
- mylog.debug('OnMergerChildToCenter in')
-# #伪装来源，便于回包
-# pack.getPackHead().srcSvrType = MMORPGPack.stGame
-# pack.getPackHead().type = CommonDefine.dgMergerChildToCenter
- #获取发包参数
- ServerMgr = MongoDBServer.getServerMgr()
- sendViaSessionID = ServerMgr.getClientSessionIDByName("CenterGate",0)
- SessionID = 0
- PoolIndex = -1
-
- #读取数据
- buf = pack.getBuffer()
- recvPack = MergeServerRecvProtocol.tagLPStringData()
- pos = 0
- recvPack.ReadData(buf, pos)
- #转发数据到GameServer
- sendPack = SendPackProtocol.tagDGMergerChildToGameStringData()
- sendPack.Type = CommonDefine.dgMergerChildToCenter
- sendPack.DataLen = recvPack.DataLen
- sendPack.Data = recvPack.Data
-
- ServerMgr.packSendBySessionID(sendViaSessionID, SessionID, PoolIndex,
- CommonDefine.atInner,
- MMORPGPack.stGame, MMORPGPack.stData,
- sendPack.GetBuffer())
- mylog.debug('OnMergerChildToCenter sendString toGameServer %s'%recvPack.Data)
- return True
- def OnMergeChildToCenterPlayerData(self,db, pack):
- mylog.debug('OnMergeChildToCenterPlayerData in')
- #伪装来源，便于回包
- #获取发包参数
- ServerMgr = MongoDBServer.getServerMgr()
- sendViaSessionID = ServerMgr.getClientSessionIDByName("CenterGate",0)
- SessionID = 0
- PoolIndex = -1
-
- #读取数据
- buf = pack.getBuffer()
- recvPack = MergeServerRecvProtocol.tagLPPlayerData()
- pos = 0
- recvPack.ReadData(buf, pos)
- #转发数据到MapServer
- sendPack = SendPackProtocol.tagDMMergePlayerData()
- sendPack.Type = CommonDefine.dgDBToMapServer
- sendPack.SubType = CommonDefine.gmMergePlayerData
- sendPack.DataLen = recvPack.DataLen
- sendPack.Data = recvPack.Data
- sendPack.PlayerID = recvPack.PlayerID
-
- ServerMgr.packSendBySessionID(sendViaSessionID, SessionID, PoolIndex,
- CommonDefine.atInner,
- MMORPGPack.stRoute, MMORPGPack.stData,
- sendPack.GetBuffer())
- mylog.debug('OnMergeChildToCenterPlayerData sendString toMapServer %s'%([recvPack.PlayerID, sendPack.DataLen,]))
- return True
#导出单玩家数据
--
Gitblit v1.8.0