From 4087d18ce7cbd1578a6e287962bd902386984048 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 14 七月 2025 10:55:57 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_ServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/LogicProcess/UserCtrlDB.py | 124 +++++++++++++++++++++++++++++++++++------
1 files changed, 105 insertions(+), 19 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 95d7abf..fdfb0ba 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
@@ -27,7 +27,7 @@
import inspect
from Collections.CollectionDefine import *
import binascii
-# from GMToolLogicProcess import ProjSpecialProcess
+from GMToolLogicProcess import ProjSpecialProcess
from Common import (CommFunc, mylog, CommFuncEx)
import PegasusCollectorProxy
import shutil
@@ -400,10 +400,60 @@
PyGameData.g_UserCtrlDBFirstInit = True
self.__PlayerBackupSave()
CheckGameVersion()
-
- #后续也要增加公共数据保存如家族等，考虑保存失败可以直接关闭地图
-
+ self.loadDBPlayerIDMap()
+
return
+
+ def loadDBPlayerIDMap(self):
+ ## 加载本服玩家映射关系
+ col = self.db[UCN_DBPlayer]
+ resultSet = col.find({}, {"PlayerID":1, "AccID":1, "_id":0})
+ if resultSet and resultSet.count():
+ for resultDict in resultSet:
+ PyGameData.g_dbPlayerIDMap[resultDict["PlayerID"]] = resultDict["AccID"]
+ GameWorld.Log("启动服务器加载DBPlayer玩家账号ID对应关系! %s" % (len(PyGameData.g_dbPlayerIDMap)))
+ 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
@@ -416,6 +466,14 @@
mylog.debug("begin process request type = %d"%requestType)
+ if requestType == CommonDefine.gstGMToolCommand:
+ oFuncGrade = self.GetFuncGrade('gstGMToolCommand')
+ oFuncGrade.Start()
+ self.OnGMToolCommand(db, pack)
+ oFuncGrade.End()
+ return True
+
+
if requestType == CommonDefine.gstGeneralDBOper:
oFuncGrade = self.GetFuncGrade('gstGeneralDBOper')
oFuncGrade.Start()
@@ -798,12 +856,7 @@
oFuncGrade.End()
return True
- if requestType == CommonDefine.gstGMToolCmdUserDBRequest:
- oFuncGrade = self.GetFuncGrade("gstGMToolCmdUserDBRequest")
- oFuncGrade.Start()
- self.OnGMToolCmdUserDBRequest(db, pack)
- oFuncGrade.End()
- return True
+
if requestType == CommonDefine.gstMergerChildToCenter:
oFuncGrade = self.GetFuncGrade("gstMergerChildToCenter")
oFuncGrade.Start()
@@ -879,6 +932,24 @@
self.packSend(sessionID, 0, 0, CommonDefine.atMergeLogic, MMORPGPack.stGame,
MMORPGPack.stData, sendPack.GetBuffer())
+ def OnPlayerLogin(self, curPlayer):
+ ProjSpecialProcess.GMCmdPlayerLogin(curPlayer)
+ return
+
+ def OnGMToolCommand(self, db, pack):
+
+ if CommonDefine.IsDebug():
+ import binascii
+ mylog.debug('buf = %s'%binascii.b2a_hex(pack.getBuffer()))
+
+ try:
+ ProjSpecialProcess.OnGMToolCommand(pack)
+ 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):
buf = pack.getBuffer()
recvPack = RecvPackProtocol.tagGDGameServerGeneralDBOper()
@@ -1662,7 +1733,7 @@
mylog.debug('RevoverBillProcess success...%s'%orderID)
except:
- mylog.error("RevoverBillProcess error %s"%orderID)
+ mylog.error("RevoverBillProcess error %s"%traceback.format_exc())
def SavePlayerMapServerData(self, db, saveData):
playerRec = DataServerPlayerData.tagDBPlayer()
@@ -2413,6 +2484,9 @@
return 0, disDataBaseError, createPlayer.AccID, ''
mylog.debug('insert role ok!accid = %s, PlayerName = %s'%(createPlayer.AccID, createPlayer.PlayerName))
+ PyGameData.g_dbPlayerIDMap[newPlayerID] = createPlayer.AccID
+ mylog.debug('PyGameData.g_dbPlayerIDMap = %s'%(len(PyGameData.g_dbPlayerIDMap)))
+
#构造其他角色初始数据
itemData = ''
itemData = CommFunc.WriteDWORD(itemData, 0)
@@ -3409,6 +3483,21 @@
data += DBFamilyAction.adoQueryAll(collection)
mylog.info("tagDBFamilyAction ok")
+ collection = db[UCN_DBGameRec]
+ DBGameRec = DataServerPlayerData.tagDBGameRec()
+ data += DBGameRec.adoQueryAll(collection)
+ mylog.info("tagDBGameRec ok")
+
+ collection = db[UCN_DBFuncTeam]
+ DBFuncTeam = DataServerPlayerData.tagDBFuncTeam()
+ data += DBFuncTeam.adoQueryAll(collection)
+ mylog.info("tagDBFuncTeam ok")
+
+ collection = db[UCN_DBFuncTeamMem]
+ DBFuncTeamMem = DataServerPlayerData.tagDBFuncTeamMem()
+ data += DBFuncTeamMem.adoQueryAll(collection)
+ mylog.info("tagDBFuncTeamMem ok")
+
mylog.info('readGameWorldData len:%s' % len(data))
return data
@@ -3430,6 +3519,9 @@
gameDataReadPos = self.savegameServerWorldData(saveData, gameDataReadPos, UCN_DBFamily, DataServerPlayerData.tagDBFamily, db)
gameDataReadPos = self.savegameServerWorldData(saveData, gameDataReadPos, UCN_DBFamilyMem, DataServerPlayerData.tagDBFamilyMem, db)
gameDataReadPos = self.savegameServerWorldData(saveData, gameDataReadPos, UCN_DBFamilyAction, DataServerPlayerData.tagDBFamilyAction, db)
+ gameDataReadPos = self.savegameServerWorldData(saveData, gameDataReadPos, UCN_DBGameRec, DataServerPlayerData.tagDBGameRec, db)
+ gameDataReadPos = self.savegameServerWorldData(saveData, gameDataReadPos, UCN_DBFuncTeam, DataServerPlayerData.tagDBFuncTeam, db)
+ gameDataReadPos = self.savegameServerWorldData(saveData, gameDataReadPos, UCN_DBFuncTeamMem, DataServerPlayerData.tagDBFuncTeamMem, db)
mylog.info('saveGameWorldData ok!')
@@ -5642,14 +5734,8 @@
mylog.error(msg)
return False
return True
- def OnGMToolCmdUserDBRequest(self,db, pack):
- # try:
- # ProjSpecialProcess.OnGMToolCmdUserDBRequest(db,pack)
- # except:
- # msg = error.formatMsg('error', error.ERROR_NO_172, "OnGMToolCmdUserDBRequest Catch a unexpetcted exception, error = %s"%traceback.format_exc())
- # mylog.error(msg)
- # return False
- return True
+
+
def OnMergerChildToCenter(self,db, pack):
mylog.debug('OnMergerChildToCenter in')
# #伪装来源，便于回包
--
Gitblit v1.8.0