From 3bc2e9aae7e595d5be896a9db4c909b76fa6f5be Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 11 七月 2025 14:16:29 +0800
Subject: [PATCH] 0312 物品叠加数量支持配置DWORD
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/LogicProcess/UserCtrlDB.py | 647 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 322 insertions(+), 325 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 7ea3eda..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
@@ -18,6 +18,7 @@
from MangoDBCommon import (getADOExceptionCount, getSIDErrorCnt, addADOExceptionCount, seq, fix_outgoingText, fix_incomingText)
from ServerClientShareDefine import *
import ConfigParser
+import IpyGameDataPY
#import IPY_GameWorld
#from Config import (DBConfig,)
DBConfig = __import__('Config.DBConfig')
@@ -26,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
@@ -156,7 +157,7 @@
lockPlayerID.release()#解锁
return
-def CallDispatchFamilyID(db, fromPack, type, self):
+def CallDispatchFamilyID(db, self):
global lockFamilyID
lockFamilyID.acquire()#加锁
self.isDispatchingFamilyID = True
@@ -185,8 +186,11 @@
recs.append({'FamilyID':id})
collection = db[UCN_Dispatch_FamilyID]
collection.insert(recs)
- #新分配，通知GameServer
- self.CallBackToSendFamilyIDPack(fromPack, type, minID, maxID)
+
+ for newID in xrange(minID, maxID+1):
+ if newID not in self.m_emptyFamilyIDList:
+ self.m_emptyFamilyIDList.append(newID)
+ mylog.info("m_emptyFamilyIDList len=%s"%len(self.m_emptyFamilyIDList))
client.close()
except Exception, e:
mylog.error("IDDispatch CallDispatchFamilyID Connect Exception %s"%e)
@@ -332,8 +336,9 @@
self.translator = DBController.EncodeStringManipulator(DBConfig.encoding)
#是否正在请求分配新PlayerID池
self.isDispatchingPlayerID = False
- #是否正在请求分配新PlayerID池
+ #是否正在请求分配新FamilyID池
self.isDispatchingFamilyID = False
+ self.m_emptyFamilyIDList = [] # 当前可用的仙盟ID列表
self.loginHeap = 0
self.loginStartTime = time()
self.lastCleanMergePlayerTime = time()
@@ -395,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
@@ -411,12 +466,14 @@
mylog.debug("begin process request type = %d"%requestType)
- if requestType == CommonDefine.gstDiapatchFamilyID:
- oFuncGrade = self.GetFuncGrade('gstDiapatchFamilyID')
+ if requestType == CommonDefine.gstGMToolCommand:
+ oFuncGrade = self.GetFuncGrade('gstGMToolCommand')
oFuncGrade.Start()
- self.OnDiapatchFamilyID(db, pack)
+ self.OnGMToolCommand(db, pack)
oFuncGrade.End()
-
+ return True
+
+
if requestType == CommonDefine.gstGeneralDBOper:
oFuncGrade = self.GetFuncGrade('gstGeneralDBOper')
oFuncGrade.Start()
@@ -481,19 +538,19 @@
return True
#GameServer保存数据
- if requestType == CommonDefine.gstSaveGameServerData:
- oFuncGrade = self.GetFuncGrade("gstSaveGameServerData")
- oFuncGrade.Start()
- self.onSaveGameServerData(db, pack)
- oFuncGrade.End()
- return True
+ #if requestType == CommonDefine.gstSaveGameServerData:
+ # oFuncGrade = self.GetFuncGrade("gstSaveGameServerData")
+ # oFuncGrade.Start()
+ # self.onSaveGameServerData(db, pack)
+ # oFuncGrade.End()
+ # return True
#GameServer读取玩家数据
- if requestType == CommonDefine.gstGetGameServerPlayerData:
- oFuncGrade = self.GetFuncGrade("gstGetGameServerPlayerData")
- oFuncGrade.Start()
- self.onGetGameServerPlayerData(db, pack)
- oFuncGrade.End()
- return True
+ #if requestType == CommonDefine.gstGetGameServerPlayerData:
+ # oFuncGrade = self.GetFuncGrade("gstGetGameServerPlayerData")
+ # oFuncGrade.Start()
+ # self.onGetGameServerPlayerData(db, pack)
+ # oFuncGrade.End()
+ # return True
#GameServer读取GM命令列表
if requestType == CommonDefine.gstGMCommandListReq:
oFuncGrade = self.GetFuncGrade("gstGMCommandListReq")
@@ -556,19 +613,13 @@
oFuncGrade.End()
return True
if requestType == CommonDefine.gstUpdate:
- if DBConfig.IsOpenDbSaveServer:
- msg = error.formatMsg('DeployError', error.ERROR_NO_56, "DbSaveServer is open, type = %d request should be send to PyMongoDBSaveServer"%CommonDefine.gstUpdate)
- mylog.DeployError(msg, True)
- return False
-
oFuncGrade = self.GetFuncGrade("gstUpdate")
oFuncGrade.Start()
if self.IsMergeServer():
- if not self.onSaveMapServerPlayerDataMergeServer(db, pack):
- mylog.error("onSaveMapServerPlayerDataMergeServer failed!sessionID = 0x%X", pack.getPackHead().sessionID)
+ self.onSaveMapServerPlayerDataMergeServer(db, pack)
else:
- if not self.onSaveMapServerPlayerData(db, pack):
- mylog.error("onSaveMapServerPlayerData failed!sessionID = 0x%X", pack.getPackHead().sessionID)
+ self.onSaveMapServerPlayerData(db, pack)
+
oFuncGrade.End()
return True
if requestType == CommonDefine.gstSavePlayerInfo:
@@ -805,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()
@@ -828,55 +874,52 @@
mylog.warning('%s not processed!'%pack.outputString())
return True
- #发送通知GameServer可用的家族ID列表#tagDGCanUseFamilyIDList封包
- def CallBackToSendFamilyIDPack(self, fromPack, UpdateType, minID, maxID):
- sendPack = SendPackProtocol.tagDGCanUseFamilyIDList()
- sendPack.Type = CommonDefine.dgDiapatchFamilyID
- sendPack.UpdateType = UpdateType
- for id in range(minID, maxID + 1):
- sendPack.FamilyIDList.append(id)
- sendPack.Count = len(sendPack.FamilyIDList)
- self.sendString(fromPack, sendPack.GetBuffer())
+ def OnFamilyIDInit(self, serverFamilyIDList):
+ ## 仙盟ID初始化
+ # @param serverFamilyIDList: 服务器已经创建的仙盟ID列表
+ #初始化请求获取已分配的家族ID列表
+ db = self.db
+ collection = db[UCN_Dispatch_FamilyID]
+ result = collection.find()
+ if result:
+ idCnt = result.count()
+ mylog.debug('OnFamilyIDInit db[UCN_Dispatch_FamilyID] idCnt=%s' % idCnt)
+ for rec in result:
+ familyID = rec['FamilyID']
+ if familyID in serverFamilyIDList:
+ continue
+ if familyID in self.m_emptyFamilyIDList:
+ continue
+ self.m_emptyFamilyIDList.append(familyID)
+ mylog.debug('OnFamilyIDInit db[UCN_Dispatch_FamilyID] emptyIDCount=%s' % len(self.m_emptyFamilyIDList))
+ self.__checkDiapatchFamilyID()
return
- def OnDiapatchFamilyID(self,db, pack):
- buf = pack.getBuffer()
- recvPack = RecvPackProtocol.tagGDRequestCanUseFamilyIDList()
- pos = 0
- recvPack.ReadData(buf, pos)
- mylog.debug('OnDiapatchFamilyID pack = %s'%(recvPack.OutputString()))
- if recvPack.CallType == 0:
- #初始化请求获取已分配的家族ID列表
- collection = db[UCN_Dispatch_FamilyID]
- result = collection.find()
- mylog.debug('OnDiapatchFamilyID db[UCN_Dispatch_FamilyID] result = %s'%result)
- if not result or result.count() == 0:
- #未分配过 需要立即分配
- if self.isDispatchingFamilyID:
- return
- import threading
- t = threading.Thread(target = CallDispatchFamilyID, args =(db, pack, recvPack.CallType, self))
- t.start()
- mylog.debug('CallType 0 need dispatch')
- else:
- sendPack = SendPackProtocol.tagDGCanUseFamilyIDList()
- sendPack.Type = CommonDefine.dgDiapatchFamilyID
- sendPack.UpdateType = recvPack.CallType
- for rec in result:
- sendPack.FamilyIDList.append(rec['FamilyID'])
- sendPack.Count = len(sendPack.FamilyIDList)
- self.sendString(pack, sendPack.GetBuffer())
- mylog.debug('CallType 0 sendPack.FamilyIDList %s'%sendPack.OutputString())
- else:
- #请求添加新的家族ID
- if self.isDispatchingFamilyID:
- return
- import threading
- t = threading.Thread(target = CallDispatchFamilyID, args =(db, pack, recvPack.CallType, self))
- t.start()
- mylog.debug('CallType 1 need dispatch')
+ def __checkDiapatchFamilyID(self):
+ if len(self.m_emptyFamilyIDList) >= 10:
+ return
+ if self.isDispatchingFamilyID:
+ return
+ import threading
+ t = threading.Thread(target = CallDispatchFamilyID, args =(self.db, self))
+ t.start()
return
+ def GetNewFamilyID(self):
+ ## 获取一个新仙盟ID
+ self.__checkDiapatchFamilyID()
+ if self.m_emptyFamilyIDList:
+ newFamilyID = self.m_emptyFamilyIDList.pop(0)
+ #mylog.debug('pop newFamilyID=%s, emptyIDCount=%s' % (newFamilyID, len(self.m_emptyFamilyIDList)))
+ return newFamilyID
+ return 0
+
+ def FreeFamilyID(self, familyID):
+ ## 释放可用的仙盟ID，一般是删除仙盟时返还
+ if familyID not in self.m_emptyFamilyIDList:
+ self.m_emptyFamilyIDList.insert(0, familyID)
+ #mylog.debug('free familyID=%s, emptyIDCount=%s, %s' % (familyID, len(self.m_emptyFamilyIDList), self.m_emptyFamilyIDList))
+ return
def sendGameServerDBOperResult(self, sessionID, result, resultSet, errMsg):
sendPack = SendPackProtocol.tagDGGeneralDBOperResult()
@@ -889,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()
@@ -1506,124 +1567,62 @@
g_mergeRegisterPlayerDict = PyGameData.g_mergeRegisterPlayerDict
'''玩家下线，跨服服务器下线不保存'''
pos = 1 #跳过gstUpdate
- buf = pack.getBuffer()
- length = pack.getLength()
- type, pos = CommFunc.ReadBYTE(buf, pos)
- if type == CommonDefine.gstPlayerDetail:
- needReturn, pos = CommFunc.ReadBYTE(buf, pos)
- packCrcPos = pos
- packCrc, pos = CommFunc.ReadDWORD(buf, pos)
- serverTypePos = pos
- serverType, pos = CommFunc.ReadBYTE(buf, pos)
- if serverType == MMORPGPack.stMin:
- #其他服务器未发现异常，检查CRC
- saveData, pos = CommFunc.ReadString(buf, pos, length - pos)
- calcCrc = CommFunc.ToDWORD(crc32(saveData))
- if not packCrc == calcCrc:
- #CRC校验错误
- serverTypeData = chr(MMORPGPack.stData)
- buf = buf[:serverTypePos] + serverTypeData+ buf[(serverTypePos + 1):]
- self.onSavePlayerDataCRCError(db, pack, buf[packCrcPos:])
- return (False, 0)
- else:
- pass #正常情况
- else:
- self.onSavePlayerDataCRCError(db, pack, buf[packCrcPos:])
- return (False,0)
+ saveData, pos = CommFunc.ReadString(pack.getBuffer(), pos, pack.getLength() - pos)
+
+
+ # 与策划约定 离线超过3分钟则必须从子服再次登录汇报新数据
+ # 为了避免 g_mergeRegisterPlayerDict 占用过多内存，每10分钟清除一次已下线数据
+ result, playerID, accID = self.__ReadPlayerID(db, saveData)
+
+ # 保存跨服数据主要是为了避免短时间断线重连玩家数据不对应，如坐标又回到了起点
+ if accID in g_mergeRegisterPlayerDict:
+ g_mergeRegisterPlayerDict[accID][MergeRegPInfoIndex_LogoutTime] = time()
+ g_mergeRegisterPlayerDict[accID][MergeRegPInfoIndex_PackData].Data = saveData
+ g_mergeRegisterPlayerDict[accID][MergeRegPInfoIndex_PackData].DataLen = len(saveData)
- # 与策划约定 离线超过3分钟则必须从子服再次登录汇报新数据
- # 为了避免 g_mergeRegisterPlayerDict 占用过多内存，每10分钟清除一次已下线数据
- result, playerID, accID = self.__ReadPlayerID(db, saveData)
-
- # 保存跨服数据主要是为了避免短时间断线重连玩家数据不对应，如坐标又回到了起点
- if accID in g_mergeRegisterPlayerDict:
- g_mergeRegisterPlayerDict[accID][MergeRegPInfoIndex_LogoutTime] = time()
- g_mergeRegisterPlayerDict[accID][MergeRegPInfoIndex_PackData].Data = saveData
- g_mergeRegisterPlayerDict[accID][MergeRegPInfoIndex_PackData].DataLen = len(saveData)
-
- mylog.info("onSaveMapServerPlayerDataMergeServer result = %s, playerID = %s, sessionID = 0x%X"
- % (result, playerID, pack.getPackHead().sessionID))
- #回报
- if needReturn:
- updateReturn = SendPackProtocol.tagDBUpdateReturn()
- updateReturn.CallType = CommonDefine.dgUpDate
- updateReturn.UpdateType = CommonDefine.gstPlayerDetail
- updateReturn.Result = result
- updateReturn.PlayerID = playerID
- self.sendString(pack, updateReturn.GetBuffer())
- return (result, playerID)
+ mylog.info("onSaveMapServerPlayerDataMergeServer result = %s, playerID = %s" % (result, playerID))
+
+ return (result, playerID)
def onSaveMapServerPlayerData(self, db, pack):
'''玩家下线，保存玩家在MapServer的数据'''
pos = 1 #跳过gstUpdate
- buf = pack.getBuffer()
- length = pack.getLength()
- type, pos = CommFunc.ReadBYTE(buf, pos)
- if type == CommonDefine.gstPlayerDetail:
- needReturn, pos = CommFunc.ReadBYTE(buf, pos)
- packCrcPos = pos
- packCrc, pos = CommFunc.ReadDWORD(buf, pos)
- serverTypePos = pos
- serverType, pos = CommFunc.ReadBYTE(buf, pos)
- if serverType == MMORPGPack.stMin:
- #其他服务器未发现异常，检查CRC
- saveData, pos = CommFunc.ReadString(buf, pos, length - pos)
- calcCrc = CommFunc.ToDWORD(crc32(saveData))
- if not packCrc == calcCrc:
- #CRC校验错误
- serverTypeData = chr(MMORPGPack.stData)
- buf = buf[:serverTypePos] + serverTypeData+ buf[(serverTypePos + 1):]
- self.onSavePlayerDataCRCError(db, pack, buf[packCrcPos:])
- return (False, 0)
- else:
- pass #正常情况
- else:
- self.onSavePlayerDataCRCError(db, pack, buf[packCrcPos:])
- return (False,0)
- #正常情况
- #保存数据
- result = False
- playerID = 0
- if DBConfig.PackSave:
- result, playerID, accID = self.SavePlayerMapServerDataEx(db, saveData)
- else:
- result, playerID, accID = self.SavePlayerMapServerData(db, saveData)
- if not result:
- #保存失败
- sessionID = pack.getPackHead().sessionID
- msg = error.formatMsg('error', error.ERROR_NO_59, 'Player save data failed!sessionID = %s'%sessionID)
- mylog.error(msg)
-
- DataDumper.DumpData(GlobalFunctions.getAppPath(), 'UserLogs\\SaveFailDump', '%s.mdat'%sessionID, buf[pos:])
-# self.sendString(pack, updateReturn.GetBuffer())
-# return
- #回报
- if needReturn:
- updateReturn = SendPackProtocol.tagDBUpdateReturn()
- updateReturn.CallType = CommonDefine.dgUpDate
- updateReturn.UpdateType = CommonDefine.gstPlayerDetail
- updateReturn.Result = result
- updateReturn.PlayerID = playerID
- self.sendString(pack, updateReturn.GetBuffer())
-
- # 玩家下线恢复充值兑换中的订单,IsProcee为1,但endtime为空的情况
- self.RevoverBillProcess(db, accID)
- mylog.info("onSaveMapServerPlayerData result = %s, playerID = %s, sessionID = 0x%X"%(result, playerID, pack.getPackHead().sessionID))
+ saveData, pos = CommFunc.ReadString(pack.getBuffer(), pos, pack.getLength() - pos)
+
+ #正常情况
+ #保存数据
+ result = False
+ playerID = 0
+ if DBConfig.PackSave:
+ result, playerID, accID = self.SavePlayerMapServerDataEx(db, saveData)
+ else:
+ result, playerID, accID = self.SavePlayerMapServerData(db, saveData)
+ if not result:
+ #保存失败
+ msg = error.formatMsg('error', error.ERROR_NO_59, 'Player save data failed!playerID = %s'%playerID)
+ mylog.error(msg)
- # 下线成功入库后同步移动玩家备档备份文件夹
- PlayerBakDir = os.path.join(DBConfig.PlayerBakRoot, str(playerID))
- if os.path.exists(PlayerBakDir):
- BakCopyDir = os.path.join(PlayerBakDir, "Backup")
- for filename in os.listdir(PlayerBakDir):
- if not filename.endswith(DBConfig.PlayerBakFileType):
- continue
- fullPath = os.path.join(PlayerBakDir, filename)
- if not os.path.exists(os.path.join(BakCopyDir, filename)):
- shutil.move(fullPath, BakCopyDir)
- else:
- os.remove(fullPath)
-
- return (result, playerID)
+ DataDumper.DumpData(GlobalFunctions.getAppPath(), 'UserLogs\\SaveFailDump', '%s.mdat'%playerID, saveData)
+
+
+ # 玩家下线恢复充值兑换中的订单,IsProcee为1,但endtime为空的情况
+ self.RevoverBillProcess(db, accID)
+ mylog.info("onSaveMapServerPlayerData result = %s, playerID = %s"%(result, playerID))
+
+ # 下线成功入库后同步移动玩家备档备份文件夹
+ PlayerBakDir = os.path.join(DBConfig.PlayerBakRoot, str(playerID))
+ if os.path.exists(PlayerBakDir):
+ BakCopyDir = os.path.join(PlayerBakDir, "Backup")
+ for filename in os.listdir(PlayerBakDir):
+ if not filename.endswith(DBConfig.PlayerBakFileType):
+ continue
+ fullPath = os.path.join(PlayerBakDir, filename)
+ if not os.path.exists(os.path.join(BakCopyDir, filename)):
+ shutil.move(fullPath, BakCopyDir)
+ else:
+ os.remove(fullPath)
+
+ return (result, playerID)
def __PlayerBackupSave(self):
db = self.db
@@ -1734,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()
@@ -2187,12 +2186,12 @@
if self.updatePlayerAccState(db, playerRec.PlayerID, CommonDefine.pysForbidden):
#封号成功，记录封号日志
self.sendAccForbiddenLogReq(playerRec.AccID, 1)
- #回报保存失败
- updateReturn = SendPackProtocol.tagDBUpdateReturn()
- updateReturn.CallType = CommonDefine.dgUpDate
- updateReturn.UpdateType = CommonDefine.gstPlayerDetail
- updateReturn.Result = 0
- self.sendString(pack, updateReturn.GetBuffer())
+ # #回报保存失败
+ # updateReturn = SendPackProtocol.tagDBUpdateReturn()
+ # updateReturn.CallType = CommonDefine.dgUpDate
+ # updateReturn.UpdateType = CommonDefine.gstPlayerDetail
+ # updateReturn.Result = 0
+ # self.sendString(pack, updateReturn.GetBuffer())
def sendAccForbiddenLogReq(self, accid, isForbidden):
return
@@ -2467,8 +2466,9 @@
msg = error.formatMsg('error', error.ERROR_NO_65, 'PlayerID Dispatch failed!accid = %s'%createPlayer.AccID)
mylog.error(msg)
return 0, disDataBaseError, createPlayer.AccID, ''
+ nameFormat = IpyGameDataPY.GetFuncCfg("CreateRole", 1)
createPlayer.PlayerID = newPlayerID
- createPlayer.PlayerName = "role" + str(newPlayerID)
+ createPlayer.PlayerName = (nameFormat % newPlayerID).decode('gbk').encode(DBConfig.encoding)
#校验通过，往数据库中插入角色
mylog.debug('Before insert role!accid = %s, PlayerName = %s'%(createPlayer.AccID, createPlayer.PlayerName))
if not createPlayer.adoInsertC(collection):
@@ -2484,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)
@@ -3421,7 +3424,118 @@
#已废除
pass
+ def readGameWorldData(self):
+ '''读取服务器公共数据
+ 【注】：新建的表往后添加
+ '''
+ db = self.db
+
+ data = ''
+ mylog.info('readGameWorldData Start...')
+
+ collection = db[UCN_DBEventTrig]
+ DBEventTrig = DataServerPlayerData.tagDBEventTrig()
+ data += DBEventTrig.adoQueryAll(collection)
+ mylog.info("tagDBEventTrig ok")
+
+ collection = db[UCN_DBPlayerViewCache]
+ DBPlayerViewCache = DataServerPlayerData.tagDBPlayerViewCache()
+ data += DBPlayerViewCache.adoQueryAll(collection)
+ mylog.info("tagDBPlayerViewCache ok")
+
+ collection = db[UCN_DBBillboard]
+ DBBillboard = DataServerPlayerData.tagDBBillboard()
+ data += DBBillboard.adoQueryAll(collection)
+ mylog.info("tagDBBillboard ok")
+
+ collection = db[UCN_DBMailServer]
+ DBMailServer = DataServerPlayerData.tagDBMailServer()
+ data += DBMailServer.adoQueryAll(collection)
+ mylog.info("tagDBMailServer ok")
+
+ collection = db[UCN_DBMailPlayerRec]
+ DBMailPlayerRec = DataServerPlayerData.tagDBMailPlayerRec()
+ data += DBMailPlayerRec.adoQueryAll(collection)
+ mylog.info("tagDBMailPlayerRec ok")
+
+ collection = db[UCN_DBMailPersonal]
+ DBMailPersonal = DataServerPlayerData.tagDBMailPersonal()
+ data += DBMailPersonal.adoQueryAll(collection)
+ mylog.info("tagDBMailPersonal ok")
+
+ collection = db[UCN_DBMailItem]
+ DBMailItem = DataServerPlayerData.tagDBMailItem()
+ data += DBMailItem.adoQueryAll(collection)
+ mylog.info("tagDBMailItem ok")
+
+ collection = db[UCN_DBFamily]
+ DBFamily = DataServerPlayerData.tagDBFamily()
+ data += DBFamily.adoQueryAll(collection)
+ mylog.info("tagDBFamily ok")
+
+ collection = db[UCN_DBFamilyMem]
+ DBFamilyMem = DataServerPlayerData.tagDBFamilyMem()
+ data += DBFamilyMem.adoQueryAll(collection)
+ mylog.info("tagDBFamilyMem ok")
+
+ collection = db[UCN_DBFamilyAction]
+ DBFamilyAction = DataServerPlayerData.tagDBFamilyAction()
+ 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
+
+ def saveGameWorldData(self, saveData):
+ ## 保存服务器公共数据
+
+ db = self.db
+ dataLen = len(saveData)
+ mylog.info('saveGameWorldData, len = %s!saving...'%dataLen)
+ gameDataReadPos = 0
+ try:
+ gameDataReadPos = self.savegameServerWorldData(saveData, gameDataReadPos, UCN_DBEventTrig, DataServerPlayerData.tagDBEventTrig, db)
+ gameDataReadPos = self.savegameServerWorldData(saveData, gameDataReadPos, UCN_DBPlayerViewCache, DataServerPlayerData.tagDBPlayerViewCache, db)
+ gameDataReadPos = self.savegameServerWorldData(saveData, gameDataReadPos, UCN_DBBillboard, DataServerPlayerData.tagDBBillboard, db)
+ gameDataReadPos = self.savegameServerWorldData(saveData, gameDataReadPos, UCN_DBMailServer, DataServerPlayerData.tagDBMailServer, db)
+ gameDataReadPos = self.savegameServerWorldData(saveData, gameDataReadPos, UCN_DBMailPlayerRec, DataServerPlayerData.tagDBMailPlayerRec, db)
+ gameDataReadPos = self.savegameServerWorldData(saveData, gameDataReadPos, UCN_DBMailPersonal, DataServerPlayerData.tagDBMailPersonal, db)
+ gameDataReadPos = self.savegameServerWorldData(saveData, gameDataReadPos, UCN_DBMailItem, DataServerPlayerData.tagDBMailItem, db)
+ 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!')
+
+ # 如果是关服中的，设置关服保存数据处理完毕
+ if PyGameData.g_serverClosing:
+ PyGameData.g_closeSaveDataOK = True
+ except:
+ msg = error.formatMsg('error', error.ERROR_NO_81, '%s'%traceback.format_exc())
+ mylog.error(msg)
+
+ return
+
def onGetGameServerPlayerData(self, db, pack):
+ ## 废弃，改为使用 readGameWorldData
data = ''
#玩家打包数据表较大，不同步GameServer，由db自己管理
@@ -3808,6 +3922,7 @@
self.saveGameServerGameData(db, pack, pack.getBuffer(), pos, type, needReturn)
def saveGameServerGameData(self, db, pack, data, pos, saveType, needReturn):
+ ##废弃，改为使用 saveGameWorldData
if saveType == CommonDefine.dgGameServerCrashData:
#FileLog.getLogger('GameServerDataRestoreLog').info('解析崩溃数据中。。。')
#tagGDGameServerGameData
@@ -5619,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')
# #伪装来源，便于回包
@@ -5873,116 +5982,4 @@
return (True, playerRec.PlayerID)
- #读取静态表，与数据库无关
- def OnGetGameData(self):
- sysData = DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagChinNPC,
- os.path.join(GlobalFunctions.getServerConfigPath(),
- CommonDefine.SYSDB_PATH,
- 'tagChinNPC.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagNPCRefresh,
- os.path.join(GlobalFunctions.getServerConfigPath(),
- CommonDefine.SYSDB_PATH,
- 'tagNPCRefresh.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagChinSkill,
- os.path.join(GlobalFunctions.getServerConfigPath(),
- CommonDefine.SYSDB_PATH,
- 'tagChinSkill.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagChinExp,
- os.path.join(GlobalFunctions.getServerConfigPath(),
- CommonDefine.SYSDB_PATH,
- 'tagChinExp.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagChinItem,
- os.path.join(GlobalFunctions.getServerConfigPath(),
- CommonDefine.SYSDB_PATH,
- 'tagChinItem.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagTransportRefresh,
- os.path.join(GlobalFunctions.getServerConfigPath(),
- CommonDefine.SYSDB_PATH,
- 'tagTransportRefresh.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagChinShopItem,
- os.path.join(GlobalFunctions.getServerConfigPath(),
- CommonDefine.SYSDB_PATH,
- 'tagChinShopItem.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagBornRefresh,
- os.path.join(GlobalFunctions.getServerConfigPath(),
- CommonDefine.SYSDB_PATH,
- 'tagBornRefresh.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagChinMixItem,
- os.path.join(GlobalFunctions.getServerConfigPath(),
- CommonDefine.SYSDB_PATH,
- 'tagChinMixItem.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagBuildEquip,
- os.path.join(GlobalFunctions.getServerConfigPath(),
- CommonDefine.SYSDB_PATH,
- 'tagBuildEquip.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagSuiteActivation,
- os.path.join(GlobalFunctions.getServerConfigPath(),
- CommonDefine.SYSDB_PATH,
- 'tagSuiteActivation.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagSuiteEffect,
- os.path.join(GlobalFunctions.getServerConfigPath(),
- CommonDefine.SYSDB_PATH,
- 'tagSuiteEffect.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagRepeatEvent,
- os.path.join(GlobalFunctions.getServerConfigPath(),
- CommonDefine.SYSDB_PATH,
- 'tagRepeatEvent.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagEffectRefresh,
- os.path.join(GlobalFunctions.getServerConfigPath(),
- CommonDefine.SYSDB_PATH,
- 'tagEffectRefresh.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagChinMap,
- os.path.join(GlobalFunctions.getServerConfigPath(),
- CommonDefine.SYSDB_PATH,
- 'tagChinMap.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagDBStoreItem,
- os.path.join(GlobalFunctions.getServerConfigPath(),
- CommonDefine.SYSDB_PATH,
- 'tagDBStoreItem.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagOnMissionDelete,
- os.path.join(GlobalFunctions.getServerConfigPath(),
- CommonDefine.SYSDB_PATH,
- 'tagOnMissionDelete.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagPet,
- os.path.join(GlobalFunctions.getServerConfigPath(),
- CommonDefine.SYSDB_PATH,
- 'tagPet.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagPetGrade,
- os.path.join(GlobalFunctions.getServerConfigPath(),
- CommonDefine.SYSDB_PATH,
- 'tagPetGrade.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagPetFriendliness,
- os.path.join(GlobalFunctions.getServerConfigPath(),
- CommonDefine.SYSDB_PATH,
- 'tagPetFriendliness.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagPetExp,
- os.path.join(GlobalFunctions.getServerConfigPath(),
- CommonDefine.SYSDB_PATH,
- 'tagPetExp.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagNPC_Item_Pet,
- os.path.join(GlobalFunctions.getServerConfigPath(),
- CommonDefine.SYSDB_PATH,
- 'tagNPC_Item_Pet.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagFlyObjBaseInfo,
- os.path.join(GlobalFunctions.getServerConfigPath(),
- CommonDefine.SYSDB_PATH,
- 'tagFlyObjBaseInfo.txt'))
-
-
- #压缩
- try:
- compressSysData = zlib.compress(sysData, 9) #最大压缩
-
- #回发地图
- data = ''
- data = CommFunc.WriteBYTE(data, CommonDefine.dgGameData) #1
- data = CommFunc.WriteString(data, len(compressSysData), compressSysData)
-
- mylog.info('Load game sys data for len = %s - %s ok!'%(len(compressSysData), len(data)))
- NetPackCommon.SendPyPackToMapServerSelf(data, len(data))
- except:
- msg = error.formatMsg('fatal', error.ERROR_NO_53, 'Compress game sys data failed!error = \n%s'%traceback.format_exc())
- mylog.fatal(msg)
-
-
-
+
\ No newline at end of file
--
Gitblit v1.8.0