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 | 1302 +++++++++++++++++++++++++++++------------------------------
1 files changed, 641 insertions(+), 661 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 a5b0d62..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
@@ -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
@@ -44,6 +45,8 @@
import DataRecordPack
import GameWorld
import CtrlDB
+import base64
+
#-------------------------------------------------------------------------------
@@ -76,9 +79,11 @@
port = DBConfig.IDDispatchServerPort
addr = (host, port)
BUF_SIZE = 1024
+ curVersion = ""
+ centerVersion = ""
try:
cfGameVer = ConfigParser.ConfigParser()
- cfGameVer.read("GameVersion.ini")
+ cfGameVer.read(os.path.join(GlobalFunctions.getServerConfigPath(), 'GameVersion.ini'))
gameID = cfGameVer.get("config", "GameID")
curVersion = cfGameVer.get("config", "Version")
@@ -109,7 +114,7 @@
except:
mylog.error("IDDispatch CheckGameVersion Connect unknown Exception")
- return
+ return curVersion, centerVersion
import thread
lockPlayerID = thread.allocate_lock()
@@ -152,7 +157,7 @@
lockPlayerID.release()#解锁
return
-def CallDispatchFamilyID(db, fromPack, type, self):
+def CallDispatchFamilyID(db, self):
global lockFamilyID
lockFamilyID.acquire()#加锁
self.isDispatchingFamilyID = True
@@ -181,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)
@@ -328,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()
@@ -390,10 +399,61 @@
if not PyGameData.g_UserCtrlDBFirstInit:
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
@@ -406,39 +466,35 @@
mylog.debug("begin process request type = %d"%requestType)
- if requestType == CommonDefine.gstDiapatchFamilyID:
- oFuncGrade = self.GetFuncGrade('gstDiapatchFamilyID')
+ if requestType == CommonDefine.gstCrossServerToServerPack:
+ oFuncGrade = self.GetFuncGrade('gstCrossServerToServerPack')
oFuncGrade.Start()
- self.OnDiapatchFamilyID(db, pack)
+ self.OnCrossServerToServerPack(db, pack)
oFuncGrade.End()
-
+ return True
+
+ 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('gstMergeGeneralReturn')
+ oFuncGrade = self.GetFuncGrade('gstGeneralDBOper')
oFuncGrade.Start()
self.OnGeneralDBOper(db, pack)
oFuncGrade.End()
return True
- if requestType == CommonDefine.gstMergeQueryRegisterResult:
- oFuncGrade = self.GetFuncGrade('gstMergeQueryRegisterResult')
+ if requestType == CommonDefine.gstDBLogic:
+ oFuncGrade = self.GetFuncGrade('gstDBLogic')
oFuncGrade.Start()
- self.OnMergeQueryRegisterResult(db, pack)
+ self.OnGameServerToDBLogic(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")
@@ -469,19 +525,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")
@@ -544,19 +600,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:
@@ -792,19 +842,7 @@
self.OnInsertImpeach(db, pack)
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()
- self.OnMergerChildToCenter(db, pack)
- oFuncGrade.End()
- return True
+
if requestType == CommonDefine.gstPrepareCreateRole:
oFuncGrade = self.GetFuncGrade("gstPrepareCreateRole")
@@ -816,55 +854,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()
@@ -877,6 +912,39 @@
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):
+
+ 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()
@@ -1021,114 +1089,130 @@
self.sendGameServerDBOperResult(pack.getSessionID(), result, resultSet, errorMsg)
return
mylog.warning('oper %s not support!'%oper)
-
- # 查询返回0/1 代表是否成功
- def OnMergeQueryRegisterResult(self, db, pack):
- g_mergeRegisterPlayerDict = PyGameData.g_mergeRegisterPlayerDict
+
+
+ def OnGameServerToDBLogic(self, db, pack):
buf = pack.getBuffer()
- #len = pack.getLength()
- recvPack = MergeServerRecvProtocol.tagLPQueryRegisterResult()
+ recvPack = RecvPackProtocol.tagGDGameServerToDBLogic()
pos = 0
recvPack.ReadData(buf, pos)
- accID = recvPack.AccID.strip(chr(0))
- mylog.debug('accID = %s.'%(accID))
+ queryType = recvPack.QueryType
+ mylog.debug('pack = %s'%(recvPack.OutputString()))
- clientSessionID = pack.getSessionID()
- client = MergeProxyClientMgr.getMergeProxyClientMgr().findClientBySessionID(clientSessionID)
- if not client:
- mylog.warning('client not found!sessionID = %s'%(clientSessionID))
+ if queryType == CommonDefine.gstDBLogic_PlayerPackDataReq:
+ #请求玩家打包数据
+ playerID = recvPack.ID
+ packData = self.getPlayerPackData(playerID) # 有直接取，没有的话再从db整合数据
+ if packData:
+ result = 1
+ mylog.debug("packData get from cache. playerID=%s" % playerID)
+ else:
+ result, playerData = self.GetPlayerDataByPlayerID(db, playerID)
+ mylog.debug("packData get from db. playerID=%s,result=%s" % (playerID, result))
+ if result:
+ packData = base64.b64encode(playerData)
+ self.updPlayerPackData(playerID, packData)
+ self.SendGameServerToDBLogicResult(pack.getSessionID(), result, recvPack, packData)
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)
+
+ if queryType == CommonDefine.gstDBLogic_PlayerPackDataUpd:
+ #更新玩家打包数据，仅子服用，不需要回复GameServer
+ playerID = recvPack.ID
+ packData = recvPack.Data
+ self.updPlayerPackData(playerID, packData)
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())
+
+ if queryType == CommonDefine.gstDBLogic_GMCmd:
+ dbAnswerList = GMShell.DBGMCommand(recvPack.Data)
+ self.SendGameServerToDBLogicResult(pack.getSessionID(), 1, recvPack, str(dbAnswerList))
+ return
-
- 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 SendGameServerToDBLogicResult(self, sessionID, result, recvPack, resultSet):
+ '''回复GameServer发送的SendDBLogic，可以不回复，由具体类型决定
+ @param result: 结果：1成功，0失败
+ @param recvPack: GameServer发来的数据包，Data可原值返回，也可修改后返回，由具体类型决定
+ @param resultSet: 回复数据
+ '''
+ sendPack = SendPackProtocol.tagDGGameServerToDBLogicResult()
+ sendPack.Type = CommonDefine.dgDBGameServerToDBLogicResult
+ sendPack.Result = result
+ sendPack.ID = recvPack.ID
+ sendPack.QueryType = recvPack.QueryType
+ sendPack.Data = recvPack.Data
+ sendPack.DataLen = len(sendPack.Data)
+ sendPack.ResultSet = resultSet
+ sendPack.ResultSetLen = len(sendPack.ResultSet)
+ self.packSend(sessionID, 0, 0, CommonDefine.atInner, MMORPGPack.stGame,
+ MMORPGPack.stData, sendPack.GetBuffer())
+
+ mylog.debug("回复 SendGameServerToDBLogicResult")
+ return
+
+ def GetPlayerDataByPlayerID(self, db, playerID):
+ dbPlayer = DataServerPlayerData.tagDBPlayer()
+ dbPlayer.PlayerID = playerID
+ collection = db[UCN_DBPlayer]
+ loadOK = dbPlayer.adoLoadCEx(collection, {'PlayerID':playerID})
+ if not loadOK:
+ mylog.warning('GetPlayerDataByPlayerID Exception playerID = %s'%(dbPlayer.PlayerID))
+ return 0, ''
+
+ #测试
+ mylog.info("accid = %s"%(dbPlayer.AccID))
+
+ #读取物品等其他数据
+ queryDict = {'PlayerID':dbPlayer.PlayerID}
+ collection = db[UCN_RoleItem]
+ itemData = self.readPlayerPackSaveData(collection, queryDict, DataServerPlayerData.tagRoleItem, True)
+
+ collection = db[UCN_RoleMission]
+ missionData = self.readPlayerPackSaveData(collection, queryDict, DataServerPlayerData.tagRoleMission)
+
+ collection = db[UCN_RoleMissionDict]
+ roleMissionDictData = self.readPlayerPackSaveData(collection, queryDict, DataServerPlayerData.tagRoleMissionDict)
+
+ collection = db[UCN_RoleSkill]
+ roleSkillData = self.readPlayerPackSaveData(collection, queryDict, DataServerPlayerData.tagRoleSkill)
+
+ collection = db[UCN_RoleBuff]
+ roleBuffData = self.readPlayerPackSaveData(collection, queryDict, DataServerPlayerData.tagRoleBuff)
+
+ collection = db[UCN_RoleRepeatTime]
+ roleRepeatTimeData = self.readPlayerPackSaveData(collection, queryDict, DataServerPlayerData.tagRoleRepeatTime)
+
+ collection = db[UCN_PlayerHorseTable]
+ roleHorseData = self.readPlayerPackSaveData(collection, queryDict, DataServerPlayerData.tagPlayerHorseTable)
+
+ collection = db[UCN_GMOper]
+ gmOperData = self.readPlayerPackSaveData(collection, queryDict, DataServerPlayerData.tagGMOper)
+
+ collection = db[UCN_RolePet]
+ rolePetData = self.readPlayerPackSaveData(collection, queryDict, DataServerPlayerData.tagRolePet)
+
+ collection = db[UCN_PetSkill]
+ petSkillData = self.readPlayerPackSaveData(collection, queryDict, DataServerPlayerData.tagPetSkill)
+
+ collection = db[UCN_RoleNomalDict]
+ roleNormalDictData = self.readPlayerPackSaveData(collection, queryDict, DataServerPlayerData.tagRoleNomalDict)
+
+ collection = db[UCN_PlayerDienstgrad]
+ roleDienstgradData = self.readPlayerPackSaveData(collection, queryDict, DataServerPlayerData.tagPlayerDienstgrad)
+
+ collection = db[UCN_BattleFormation]
+ battleFormationData = self.readPlayerPackSaveData(collection, queryDict, DataServerPlayerData.tagBattleFormation)
+
+ #读取禁止IP数据
+ gmIP = DataServerPlayerData.tagDBGMIP()
+ gmIP.AccID = dbPlayer.AccID.lower()
+ collection = db[UCN_DBGMIP]
+ gmIPData = gmIP.adoQueryIndex(collection)
+
+ return 1, dbPlayer.getBuffer() + itemData + missionData + roleMissionDictData + roleSkillData + roleBuffData + roleRepeatTimeData + roleHorseData + gmOperData\
+ + gmIPData + rolePetData + petSkillData + roleNormalDictData + roleDienstgradData+battleFormationData
+
+
def OnFinishRecharge(self, db, pack):
# map完成兑换，假设此处没有回复，则此单变成丢单，暂由人工维护
@@ -1370,124 +1454,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
@@ -1598,7 +1620,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()
@@ -1737,7 +1759,7 @@
return (False, playerRec.PlayerID, '')
oFuncGrade.End()
#记录下线日志流向
- if playerRec.FacePic == 0: # 约定为下线标识
+ if playerRec.CountryLastWeekHornor == 0: # 约定为下线标识
self.recPlayerLogoff(playerRec)
#保存物品等其他数据
#不再支持单表模式
@@ -2010,26 +2032,27 @@
return pos
def recPlayerLogoff(self, dbPlayer):
- req = DataServerLogData.tagDBPlayerLogInfoOnLogOff()
- req.AccID = dbPlayer.AccID
- req.PlayerName = dbPlayer.PlayerName
- req.AccState = dbPlayer.AccState
- req.LV = dbPlayer.LV
- req.Gold = dbPlayer.Gold
- req.GoldPaper = dbPlayer.GoldPaper
- req.Silver = dbPlayer.Silver
- req.SilverPaper = dbPlayer.SilverPaper
- req.GMLevel = dbPlayer.GMLevel
- req.Job = dbPlayer.Job
- req.TJGTime = dbPlayer.HappyPoint # 脱机挂时间
- req.TJGState = dbPlayer.State # 0正常登录，1脱机登录，2脱机登录死亡
- req.LastLogoffTime = time()
- req.PlayerID = dbPlayer.PlayerID
- req.IsOnline = 0 #默认0因关服时没收到loginserver全部下线包
- sendBuf = ''
- sendBuf = CommFunc.WriteBYTE(sendBuf, CommonDefine.gstSavePlayerInfoLogOnLogOff)
- sendBuf = CommFunc.WriteString(sendBuf, req.getLength(), req.getBuffer())
- self.sendDBRequest(sendBuf)
+ # req = DataServerLogData.tagDBPlayerLogInfoOnLogOff()
+ # req.AccID = dbPlayer.AccID
+ # req.PlayerName = dbPlayer.PlayerName
+ # req.AccState = dbPlayer.AccState
+ # req.LV = dbPlayer.LV
+ # req.Gold = dbPlayer.Gold
+ # req.GoldPaper = dbPlayer.GoldPaper
+ # req.Silver = dbPlayer.Silver
+ # req.SilverPaper = dbPlayer.SilverPaper
+ # req.GMLevel = dbPlayer.GMLevel
+ # req.Job = dbPlayer.Job
+ # req.TJGTime = dbPlayer.HappyPoint # 脱机挂时间
+ # req.TJGState = dbPlayer.State # 0正常登录，1脱机登录，2脱机登录死亡
+ # req.LastLogoffTime = time()
+ # req.PlayerID = dbPlayer.PlayerID
+ # req.IsOnline = 0 #默认0因关服时没收到loginserver全部下线包
+ # sendBuf = ''
+ # sendBuf = CommFunc.WriteBYTE(sendBuf, CommonDefine.gstSavePlayerInfoLogOnLogOff)
+ # sendBuf = CommFunc.WriteString(sendBuf, req.getLength(), req.getBuffer())
+ # self.sendDBRequest(sendBuf)
+ return
def onSavePlayerDataCRCError(self, db, pack, saveDataWithCRC):
@@ -2050,12 +2073,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
@@ -2330,8 +2353,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):
@@ -2347,6 +2371,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)
@@ -2793,7 +2820,7 @@
mylog.info("###dgPlayerInit cntError accid = %s" % queryAccid)
PegasusCollectorProxy.ErrorReport("login data cntError accid=%s" % queryAccid)
dbIni = ConfigParser.ConfigParser() # 每次重新加载，确保随时修改有效
- dbIni.read(os.path.join(GlobalFunctions.getAppPath(), 'PyMongoDataServer.ini'))
+ dbIni.read(os.path.join(GlobalFunctions.getServerConfigPath(), 'PyMongoDataServer.ini'))
DataCntErrorKick = dbIni.has_option("dataset", "DataCntErrorKick") and (dbIni.getint("dataset", "DataCntErrorKick") == 1) # 数据存取条数异常时是否禁止登录
if DataCntErrorKick:
self.sendFailString(CommonDefine.dgPlayerInit, pack, disAccStateError)
@@ -2883,18 +2910,19 @@
# self.sendDBRequest(dbPlayerFobiddenLogReq)
self.sendAccForbiddenLogReq(accid.lower(), isForbidden)
- accForbiddenLogReq = ''
- accForbiddenLogReq = CommFunc.WriteBYTE(accForbiddenLogReq, CommonDefine.gstAccForbiddenLog)
- accForbiddenLog = DataServerLogData.tagAccForbiddenLog()
- accForbiddenLog.AccID = accid.lower()
- accForbiddenLog.PlayerID = playerID
- accForbiddenLog.Oper = isForbidden
- accForbiddenLog.OperTime = operTime
- accForbiddenLog.TimeLimit = timeLimit
- accForbiddenLog.GMAccID = operGMAccid
- accForbiddenLog.Msg = msg
- accForbiddenLogReq = CommFunc.WriteString(accForbiddenLogReq, accForbiddenLog.getLength(), accForbiddenLog.getBuffer())
- self.sendDBRequest(accForbiddenLogReq)
+ # accForbiddenLogReq = ''
+ # accForbiddenLogReq = CommFunc.WriteBYTE(accForbiddenLogReq, CommonDefine.gstAccForbiddenLog)
+ # accForbiddenLog = DataServerLogData.tagAccForbiddenLog()
+ # accForbiddenLog.AccID = accid.lower()
+ # accForbiddenLog.PlayerID = playerID
+ # accForbiddenLog.Oper = isForbidden
+ # accForbiddenLog.OperTime = operTime
+ # accForbiddenLog.TimeLimit = timeLimit
+ # accForbiddenLog.GMAccID = operGMAccid
+ # accForbiddenLog.Msg = msg
+ # accForbiddenLogReq = CommFunc.WriteString(accForbiddenLogReq, accForbiddenLog.getLength(), accForbiddenLog.getBuffer())
+ # self.sendDBRequest(accForbiddenLogReq)
+ return
def extractGMOper(self, accid, gmOper, gmOperData):
pos = 0
@@ -3176,7 +3204,7 @@
if len(infoList) > 3:
accountRec.DeviceFlag = md5.md5(infoList[1]).hexdigest()
# 倒数第二个元素为客户端版本号 仙宝奇缘新定义
- accountRec.ClientVersion = infoList[-2]
+ accountRec.SetClientVersion(infoList[-2])
PegasusCollectorProxy.EventReport(9001, "OperatorID=%s&Step=%s&AccountID=%s&Flag=1000&DeviceFlag=%s"%(
accountRec.AppID, 1, CommFunc.GetPlatformAccID(authAccID), accountRec.DeviceFlag))
@@ -3283,23 +3311,145 @@
#已废除
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 = ''
- collection = db[UCN_DBPyMineAreaAward]
- DBPyMineAreaAward = DataServerPlayerData.tagDBPyMineAreaAward()
- data += DBPyMineAreaAward.adoQueryAll(collection)
- mylog.debug("tagDBPyMineAreaAward ok")
+ #玩家打包数据表较大，不同步GameServer，由db自己管理
+ #collection = db[UCN_DBPlayerPackData]
+ #DBPlayerPackData = DataServerPlayerData.tagDBPlayerPackData()
+ #data += DBPlayerPackData.adoQueryAll(collection)
+ #mylog.debug("tagDBPlayerPackData ok")
- collection = db[UCN_DBPyMineAreaRecord]
- DBPyMineAreaRecord = DataServerPlayerData.tagDBPyMineAreaRecord()
- data += DBPyMineAreaRecord.adoQueryAll(collection)
- mylog.debug("tagDBPyMineAreaRecord ok")
+ collection = db[UCN_DBGameRec]
+ DBGameRec = DataServerPlayerData.tagDBGameRec()
+ data += DBGameRec.adoQueryAll(collection)
+ mylog.debug("tagDBGameRec ok")
- collection = db[UCN_DBPyMineAreaItem]
- DBPyMineAreaItem = DataServerPlayerData.tagDBPyMineAreaItem()
- data += DBPyMineAreaItem.adoQueryAll(collection)
- mylog.debug("tagDBPyMineAreaItem ok")
+ collection = db[UCN_DBPyFuncTeam]
+ DBPyFuncTeam = DataServerPlayerData.tagDBPyFuncTeam()
+ data += DBPyFuncTeam.adoQueryAll(collection)
+ mylog.debug("tagDBPyFuncTeam ok")
+
+ collection = db[UCN_DBPyFuncTeamMem]
+ DBPyFuncTeamMem = DataServerPlayerData.tagDBPyFuncTeamMem()
+ data += DBPyFuncTeamMem.adoQueryAll(collection)
+ mylog.debug("tagDBPyFuncTeamMem ok")
+
+ collection = db[UCN_DBPlayerRecData]
+ DBPlayerRecData = DataServerPlayerData.tagDBPlayerRecData()
+ data += DBPlayerRecData.adoQueryAll(collection)
+ mylog.debug("tagDBPlayerRecData ok")
collection = db[UCN_DBPyCouple]
DBPyCouple = DataServerPlayerData.tagDBPyCouple()
@@ -3644,6 +3794,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
@@ -3696,9 +3847,11 @@
#mylog.debug("GameData = %s"%b2a_hex(decompressGameData))
gameDataReadPos = 0
try:
- 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_DBPlayerPackData, DataServerPlayerData.tagDBPlayerPackData, db)
+ gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBGameRec, DataServerPlayerData.tagDBGameRec, db)
+ 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_DBPyCouple, DataServerPlayerData.tagDBPyCouple, db)
gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPyUnNotifyLoveGiftRec, DataServerPlayerData.tagDBPyUnNotifyLoveGiftRec, db)
gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPyCharmValueRec, DataServerPlayerData.tagDBPyCharmValueRec, db)
@@ -3827,9 +3980,11 @@
#mylog.debug("GameData = %s"%b2a_hex(decompressGameData))
gameDataReadPos = 0
try:
- 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_DBPlayerPackData, DataServerPlayerData.tagDBPlayerPackData, db)
+ gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBGameRec, DataServerPlayerData.tagDBGameRec, db)
+ 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_DBPyCouple, DataServerPlayerData.tagDBPyCouple, db)
gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPyUnNotifyLoveGiftRec, DataServerPlayerData.tagDBPyUnNotifyLoveGiftRec, db)
gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPyCharmValueRec, DataServerPlayerData.tagDBPyCharmValueRec, db)
@@ -3983,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) #如果读取出错，后面全错了
@@ -4233,10 +4387,10 @@
#=======================================================================================
# 记录玩家点券变化日志
- oDBPlayerLogInfoOnCoinChange = DataServerLogData.tagDBPlayerLogInfoOnCoinChange()
- oDBPlayerLogInfoOnCoinChange.AccID = oCoinChangeReq.Acc
- oDBPlayerLogInfoOnCoinChange.Coin = oCoinChangeReq.Coin
- self.sendDBRequest(chr(CommonDefine.gstSavePlayerInfoLogOnOnCoinChange) + oDBPlayerLogInfoOnCoinChange.getBuffer())
+ # oDBPlayerLogInfoOnCoinChange = DataServerLogData.tagDBPlayerLogInfoOnCoinChange()
+ # oDBPlayerLogInfoOnCoinChange.AccID = oCoinChangeReq.Acc
+ # oDBPlayerLogInfoOnCoinChange.Coin = oCoinChangeReq.Coin
+ # self.sendDBRequest(chr(CommonDefine.gstSavePlayerInfoLogOnOnCoinChange) + oDBPlayerLogInfoOnCoinChange.getBuffer())
except:
msg = error.formatMsg('error', error.ERROR_NO_88, "OnCoinChange throw exception\n%s"%traceback.format_exc())
mylog.error(msg)
@@ -4396,59 +4550,59 @@
return False
self.sendString(pack, sendPack.GetBuffer())
- #通知写补偿日志
- for i in xrange(sendPack.Count):
- dbData = sendPack.Datas[i]
- saveLog = DataServerLogData.tagExpiationLog()
- saveLog.ReceiveDate = time()
- saveLog.ExpiationIndex = dbData.ExpiationIndex;
- saveLog.AccID = dbData.AccID
- saveLog.MakerName = dbData.MakerName
- saveLog.CreateTime = dbData.CreateTime
- saveLog.ExpiationTime = dbData.ExpiationTime;
- saveLog.Gold = dbData.Gold;
- saveLog.GoldPaper = dbData.GoldPaper;
- saveLog.Silver = dbData.Silver;
- saveLog.SilverPaper = dbData.SilverPaper;
- saveLog.ItemTypeID = dbData.ItemTypeID;
- saveLog.Count = dbData.Count;
- saveLog.IsLocked = dbData.IsLocked;
- saveLog.ItemPlaceType = dbData.ItemPlaceType;
- saveLog.ItemPlaceIndex = dbData.ItemPlaceIndex;
- saveLog.IsBind = dbData.IsBind;
- saveLog.ItemStarLV = dbData.ItemStarLV;
- saveLog.IdentifyPar = dbData.IdentifyPar;
- saveLog.CurDurg = dbData.CurDurg;
- saveLog.MaxDurg = dbData.MaxDurg;
- saveLog.CanPlaceStoneCount = dbData.CanPlaceStoneCount;
- saveLog.ItemProperty = dbData.ItemProperty;
- saveLog.SoulProperty = dbData.SoulProperty;
- saveLog.Maker = dbData.Maker;
- saveLog.Stone1 = dbData.Stone1;
- saveLog.Stone2 = dbData.Stone2;
- saveLog.Stone3 = dbData.Stone3;
- saveLog.Stone4 = dbData.Stone4;
- saveLog.Stone5 = dbData.Stone5;
- saveLog.Stone6 = dbData.Stone6;
- saveLog.Stone7 = dbData.Stone7;
- saveLog.Stone8 = dbData.Stone8;
- saveLog.Stone9 = dbData.Stone9;
- saveLog.RemainHour = dbData.RemainHour;
- saveLog.ElementEffect = dbData.ElementEffect;
- saveLog.IsSuite = dbData.IsSuite;
- saveLog.FitLV = dbData.FitLV;
- saveLog.EquipAddSkillCnt = dbData.EquipAddSkillCnt;
- saveLog.ExpireTime = dbData.ExpireTime;
- saveLog.BaseAtkPlus = dbData.BaseAtkPlus;
- saveLog.BaseDefPlus = dbData.BaseDefPlus;
- saveLog.AddSkillData = dbData.AddSkillData
- saveLog.BaseHP = dbData.BaseHP;
- saveLog.BaseMagicDef = dbData.BaseMagicDef;
- saveLog.EquipMinAtkValue = dbData.EquipMinAtkValue;
- saveLog.Proficiency = dbData.Proficiency;
- saveLog.RelMaxAddSkillCnt = dbData.RelMaxAddSkillCnt;
- saveLog.FamilyActiveValue = dbData.FamilyActiveValue;
- self.sendDBRequest(chr(CommonDefine.gstGetExpiationLog) + saveLog.getBuffer())
+ # #通知写补偿日志
+ # for i in xrange(sendPack.Count):
+ # dbData = sendPack.Datas[i]
+ # saveLog = DataServerLogData.tagExpiationLog()
+ # saveLog.ReceiveDate = time()
+ # saveLog.ExpiationIndex = dbData.ExpiationIndex;
+ # saveLog.AccID = dbData.AccID
+ # saveLog.MakerName = dbData.MakerName
+ # saveLog.CreateTime = dbData.CreateTime
+ # saveLog.ExpiationTime = dbData.ExpiationTime;
+ # saveLog.Gold = dbData.Gold;
+ # saveLog.GoldPaper = dbData.GoldPaper;
+ # saveLog.Silver = dbData.Silver;
+ # saveLog.SilverPaper = dbData.SilverPaper;
+ # saveLog.ItemTypeID = dbData.ItemTypeID;
+ # saveLog.Count = dbData.Count;
+ # saveLog.IsLocked = dbData.IsLocked;
+ # saveLog.ItemPlaceType = dbData.ItemPlaceType;
+ # saveLog.ItemPlaceIndex = dbData.ItemPlaceIndex;
+ # saveLog.IsBind = dbData.IsBind;
+ # saveLog.ItemStarLV = dbData.ItemStarLV;
+ # saveLog.IdentifyPar = dbData.IdentifyPar;
+ # saveLog.CurDurg = dbData.CurDurg;
+ # saveLog.MaxDurg = dbData.MaxDurg;
+ # saveLog.CanPlaceStoneCount = dbData.CanPlaceStoneCount;
+ # saveLog.ItemProperty = dbData.ItemProperty;
+ # saveLog.SoulProperty = dbData.SoulProperty;
+ # saveLog.Maker = dbData.Maker;
+ # saveLog.Stone1 = dbData.Stone1;
+ # saveLog.Stone2 = dbData.Stone2;
+ # saveLog.Stone3 = dbData.Stone3;
+ # saveLog.Stone4 = dbData.Stone4;
+ # saveLog.Stone5 = dbData.Stone5;
+ # saveLog.Stone6 = dbData.Stone6;
+ # saveLog.Stone7 = dbData.Stone7;
+ # saveLog.Stone8 = dbData.Stone8;
+ # saveLog.Stone9 = dbData.Stone9;
+ # saveLog.RemainHour = dbData.RemainHour;
+ # saveLog.ElementEffect = dbData.ElementEffect;
+ # saveLog.IsSuite = dbData.IsSuite;
+ # saveLog.FitLV = dbData.FitLV;
+ # saveLog.EquipAddSkillCnt = dbData.EquipAddSkillCnt;
+ # saveLog.ExpireTime = dbData.ExpireTime;
+ # saveLog.BaseAtkPlus = dbData.BaseAtkPlus;
+ # saveLog.BaseDefPlus = dbData.BaseDefPlus;
+ # saveLog.AddSkillData = dbData.AddSkillData
+ # saveLog.BaseHP = dbData.BaseHP;
+ # saveLog.BaseMagicDef = dbData.BaseMagicDef;
+ # saveLog.EquipMinAtkValue = dbData.EquipMinAtkValue;
+ # saveLog.Proficiency = dbData.Proficiency;
+ # saveLog.RelMaxAddSkillCnt = dbData.RelMaxAddSkillCnt;
+ # saveLog.FamilyActiveValue = dbData.FamilyActiveValue;
+ # self.sendDBRequest(chr(CommonDefine.gstGetExpiationLog) + saveLog.getBuffer())
return True
# curPack = RecvPackProtocol.tagDGetValueByAcc()
# curPack.ReadData(pack.getBuffer())
@@ -4545,26 +4699,26 @@
return False
#存日志
- saveLog = DataServerLogData.tagPetExpiationLog()
- saveLog.ReceiveDate = time();
+ # saveLog = DataServerLogData.tagPetExpiationLog()
+ # saveLog.ReceiveDate = time();
- saveLog.ExpiationIndex = dbData.ExpiationIndex;
- saveLog.AccID = dbData.AccID
- saveLog.ExpiationTime = dbData.ExpiationTime;
- saveLog.NPCID = dbData.NPCID;
- saveLog.Lv = dbData.Lv;
- saveLog.Exp = dbData.Exp;
- saveLog.BindType = dbData.BindType;
- saveLog.UseCreatorDrugCnt = dbData.UseCreatorDrugCnt;
- saveLog.Friendliness = dbData.Friendliness;
- saveLog.SkillIDList = dbData.SkillIDList
- saveLog.HPTalent = dbData.HPTalent;
- saveLog.PhysicAtkTalent = dbData.PhysicAtkTalent;
- saveLog.MagicAtkTalent = dbData.MagicAtkTalent;
- saveLog.PhysicDefTalent = dbData.PhysicDefTalent;
- saveLog.MagicDefTalent = dbData.MagicDefTalent;
+ # saveLog.ExpiationIndex = dbData.ExpiationIndex;
+ # saveLog.AccID = dbData.AccID
+ # saveLog.ExpiationTime = dbData.ExpiationTime;
+ # saveLog.NPCID = dbData.NPCID;
+ # saveLog.Lv = dbData.Lv;
+ # saveLog.Exp = dbData.Exp;
+ # saveLog.BindType = dbData.BindType;
+ # saveLog.UseCreatorDrugCnt = dbData.UseCreatorDrugCnt;
+ # saveLog.Friendliness = dbData.Friendliness;
+ # saveLog.SkillIDList = dbData.SkillIDList
+ # saveLog.HPTalent = dbData.HPTalent;
+ # saveLog.PhysicAtkTalent = dbData.PhysicAtkTalent;
+ # saveLog.MagicAtkTalent = dbData.MagicAtkTalent;
+ # saveLog.PhysicDefTalent = dbData.PhysicDefTalent;
+ # saveLog.MagicDefTalent = dbData.MagicDefTalent;
- self.sendDBRequest(chr(CommonDefine.gstGetPetExpiationLog) + saveLog.getBuffer(), pack)
+ # self.sendDBRequest(chr(CommonDefine.gstGetPetExpiationLog) + saveLog.getBuffer(), pack)
return True
def gstUpdateServerDataVersionNO(self, db, pack):
@@ -4612,28 +4766,28 @@
def OnUpdateTotalSavePoint(self, db, pack):
try:
mylog.info("begin process gstUpdateTotalSavePoint")
- recvPack = RecvPackProtocol.tagBDStringTypeSend()
- recvPack.ReadData(pack.getBuffer())
+ # recvPack = RecvPackProtocol.tagBDStringTypeSend()
+ # recvPack.ReadData(pack.getBuffer())
- dbData = DataServerLogData.tagDBPlayerSaveCoinLog()
- if -1 == dbData.readData(recvPack.Data):
- msg = error.formatMsg('error', error.ERROR_NO_95, "tagDBPlayerSaveCoinLog:lack of pack data:data = %s,datalen = %d"%(b2a_hex(recvPack.Data), len(recvPack.Data)))
- mylog.error(msg)
- return False
+ # dbData = DataServerLogData.tagDBPlayerSaveCoinLog()
+ # if -1 == dbData.readData(recvPack.Data):
+ # msg = error.formatMsg('error', error.ERROR_NO_95, "tagDBPlayerSaveCoinLog:lack of pack data:data = %s,datalen = %d"%(b2a_hex(recvPack.Data), len(recvPack.Data)))
+ # mylog.error(msg)
+ # return False
- col = db[UCN_DSAccount]
- dbDoc = DataServerPlayerData.tagDSAccount()
- dbDoc.AccID = recvPack.AccID
- ret = dbDoc.adoLoadC(col)
- if ret:
- dbDoc.TotalSavePoint += dbData.Coin
- else:
- dbDoc.TotalSavePoint = 0
+ # col = db[UCN_DSAccount]
+ # dbDoc = DataServerPlayerData.tagDSAccount()
+ # dbDoc.AccID = recvPack.AccID
+ # ret = dbDoc.adoLoadC(col)
+ # if ret:
+ # dbDoc.TotalSavePoint += dbData.Coin
+ # else:
+ # dbDoc.TotalSavePoint = 0
- if not dbDoc.adoCheckUpdateC(col):
- msg = error.formatMsg('error', error.ERROR_NO_86, "UpdateTotalSavePoint failed,data = %s,datalen = %d"%(b2a_hex(recvPack.Data), len(recvPack.Data)))
- mylog.error(msg)
- return False
+ # if not dbDoc.adoCheckUpdateC(col):
+ # msg = error.formatMsg('error', error.ERROR_NO_86, "UpdateTotalSavePoint failed,data = %s,datalen = %d"%(b2a_hex(recvPack.Data), len(recvPack.Data)))
+ # mylog.error(msg)
+ # return False
except:
msg = error.formatMsg('error', error.ERROR_NO_96, "OnUpdateTotalSavePoint throw a exception, packdata = %s, packdata len = %d\n%s"(b2a_hex(pack.getBuffer()), len(pack.getBuffer()), traceback.format_exc()))
@@ -5080,14 +5234,14 @@
return False;
#插入ChinLog表记录
- curLog = DataServerLogData.tagAccTransactionLog()
- curLog.TransactionID = doc.CheckValue
- curLog.AccID = recvData.Acc
- curLog.OperReason = "gstAddAccItem"
- curLog.ProcessTime = time();
- curLog.ItemID = recvData.ItemID;
- curLog.ItemCount = recvData.ItemCnt;
- self.sendDBRequest(chr(CommonDefine.gstItemTransactionLog) + curLog.getBuffer())
+ # curLog = DataServerLogData.tagAccTransactionLog()
+ # curLog.TransactionID = doc.CheckValue
+ # curLog.AccID = recvData.Acc
+ # curLog.OperReason = "gstAddAccItem"
+ # curLog.ProcessTime = time();
+ # curLog.ItemID = recvData.ItemID;
+ # curLog.ItemCount = recvData.ItemCnt;
+ # self.sendDBRequest(chr(CommonDefine.gstItemTransactionLog) + curLog.getBuffer())
#回报BalanceServer插入成功
#dgAddAccItemOK
@@ -5445,72 +5599,10 @@
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')
-# #伪装来源，便于回包
-# 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
#导出单玩家数据
@@ -5699,116 +5791,4 @@
return (True, playerRec.PlayerID)
- #读取静态表，与数据库无关
- def OnGetGameData(self):
- sysData = DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagChinNPC,
- os.path.join(GlobalFunctions.getAppPath(),
- CommonDefine.SYSDB_PATH,
- 'tagChinNPC.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagNPCRefresh,
- os.path.join(GlobalFunctions.getAppPath(),
- CommonDefine.SYSDB_PATH,
- 'tagNPCRefresh.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagChinSkill,
- os.path.join(GlobalFunctions.getAppPath(),
- CommonDefine.SYSDB_PATH,
- 'tagChinSkill.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagChinExp,
- os.path.join(GlobalFunctions.getAppPath(),
- CommonDefine.SYSDB_PATH,
- 'tagChinExp.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagChinItem,
- os.path.join(GlobalFunctions.getAppPath(),
- CommonDefine.SYSDB_PATH,
- 'tagChinItem.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagTransportRefresh,
- os.path.join(GlobalFunctions.getAppPath(),
- CommonDefine.SYSDB_PATH,
- 'tagTransportRefresh.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagChinShopItem,
- os.path.join(GlobalFunctions.getAppPath(),
- CommonDefine.SYSDB_PATH,
- 'tagChinShopItem.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagBornRefresh,
- os.path.join(GlobalFunctions.getAppPath(),
- CommonDefine.SYSDB_PATH,
- 'tagBornRefresh.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagChinMixItem,
- os.path.join(GlobalFunctions.getAppPath(),
- CommonDefine.SYSDB_PATH,
- 'tagChinMixItem.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagBuildEquip,
- os.path.join(GlobalFunctions.getAppPath(),
- CommonDefine.SYSDB_PATH,
- 'tagBuildEquip.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagSuiteActivation,
- os.path.join(GlobalFunctions.getAppPath(),
- CommonDefine.SYSDB_PATH,
- 'tagSuiteActivation.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagSuiteEffect,
- os.path.join(GlobalFunctions.getAppPath(),
- CommonDefine.SYSDB_PATH,
- 'tagSuiteEffect.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagRepeatEvent,
- os.path.join(GlobalFunctions.getAppPath(),
- CommonDefine.SYSDB_PATH,
- 'tagRepeatEvent.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagEffectRefresh,
- os.path.join(GlobalFunctions.getAppPath(),
- CommonDefine.SYSDB_PATH,
- 'tagEffectRefresh.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagChinMap,
- os.path.join(GlobalFunctions.getAppPath(),
- CommonDefine.SYSDB_PATH,
- 'tagChinMap.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagDBStoreItem,
- os.path.join(GlobalFunctions.getAppPath(),
- CommonDefine.SYSDB_PATH,
- 'tagDBStoreItem.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagOnMissionDelete,
- os.path.join(GlobalFunctions.getAppPath(),
- CommonDefine.SYSDB_PATH,
- 'tagOnMissionDelete.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagPet,
- os.path.join(GlobalFunctions.getAppPath(),
- CommonDefine.SYSDB_PATH,
- 'tagPet.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagPetGrade,
- os.path.join(GlobalFunctions.getAppPath(),
- CommonDefine.SYSDB_PATH,
- 'tagPetGrade.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagPetFriendliness,
- os.path.join(GlobalFunctions.getAppPath(),
- CommonDefine.SYSDB_PATH,
- 'tagPetFriendliness.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagPetExp,
- os.path.join(GlobalFunctions.getAppPath(),
- CommonDefine.SYSDB_PATH,
- 'tagPetExp.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagNPC_Item_Pet,
- os.path.join(GlobalFunctions.getAppPath(),
- CommonDefine.SYSDB_PATH,
- 'tagNPC_Item_Pet.txt'))
- sysData += DataServerGameData.sysDBLoadFromFile(DataServerGameData.tagFlyObjBaseInfo,
- os.path.join(GlobalFunctions.getAppPath(),
- 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