332 【主界面】座骑系统-服务端

hxp

5 天以前 26958aff1b844a743a805b4f9075bee800b72a46

 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

@@ -399,10 +400,69 @@
            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 updateDBPlayerName(self, playerID, newName):

        ## 根据玩家ID更新dbPlayer的玩家名，一般是改名用

        col = self.db[UCN_DBPlayer]

        dbPlayer = DataServerPlayerData.tagDBPlayer()

        if not dbPlayer.adoLoadCEx(col, {"PlayerID":playerID}):

            return

        dbPlayer.PlayerName = newName

        return dbPlayer.adoUpdateC(col)

    

    def requestLogicProcess(self, pack):

        db = self.db

@@ -415,6 +475,21 @@
        

        mylog.debug("begin process request type = %d"%requestType)

        

        if requestType == CommonDefine.gstCrossServerToServerPack:

            oFuncGrade = self.GetFuncGrade('gstCrossServerToServerPack')

            oFuncGrade.Start()

            self.OnCrossServerToServerPack(db, pack)

            oFuncGrade.End()

            return True



        if requestType == CommonDefine.gstGMToolCommand:

            oFuncGrade = self.GetFuncGrade('gstGMToolCommand')

            oFuncGrade.Start()

            self.OnGMToolCommand(db, pack)

            oFuncGrade.End()

            return True





        if requestType == CommonDefine.gstGeneralDBOper:

            oFuncGrade = self.GetFuncGrade('gstGeneralDBOper')

            oFuncGrade.Start()

@@ -429,26 +504,6 @@
            oFuncGrade.End()

            return True

        

        if requestType == CommonDefine.gstMergeQueryRegisterResult:

            oFuncGrade = self.GetFuncGrade('gstMergeQueryRegisterResult')

            oFuncGrade.Start()

            self.OnMergeQueryRegisterResult(db, pack)

            oFuncGrade.End()

            return True

        
        if requestType == CommonDefine.gstMergeRegisterPlayer:

            oFuncGrade = self.GetFuncGrade('gstMergeRegisterPlayer')

            oFuncGrade.Start()

            self.OnMergeRegisterPlayerByCache(db, pack)

            oFuncGrade.End()

            return True

        
        if requestType == CommonDefine.gstMergePlayerData:

            oFuncGrade = self.GetFuncGrade('gstMergePlayerData')

            oFuncGrade.Start()

            self.OnMergeChildToCenterPlayerData(db, pack)

            oFuncGrade.End()

            return True

        

        if requestType == CommonDefine.gstQueryNewGuyCardState:

            oFuncGrade = self.GetFuncGrade("gstQueryNewGuyCardState")

@@ -479,19 +534,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")

@@ -796,19 +851,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")

@@ -878,6 +921,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()

@@ -1146,114 +1222,6 @@
                     + gmIPData + rolePetData + petSkillData + roleNormalDictData + roleDienstgradData+battleFormationData

        





    # 查询返回0/1 代表是否成功

    def OnMergeQueryRegisterResult(self, db, pack): 
        g_mergeRegisterPlayerDict = PyGameData.g_mergeRegisterPlayerDict

        buf = pack.getBuffer()

        #len = pack.getLength()

        recvPack = MergeServerRecvProtocol.tagLPQueryRegisterResult()

        pos = 0

        recvPack.ReadData(buf, pos)

        accID = recvPack.AccID.strip(chr(0))

        mylog.debug('accID = %s.'%(accID))

        
        clientSessionID = pack.getSessionID()

        client = MergeProxyClientMgr.getMergeProxyClientMgr().findClientBySessionID(clientSessionID)

        if not client:

            mylog.warning('client not found!sessionID = %s'%(clientSessionID))

            return





        sendPack = MergeServerSendProtocol.tagMPQueryRegisterResult()

        sendPack.Type = CommonDefine.dgMergeQueryNewAccount

        if g_mergeRegisterPlayerDict.get(accID, []):       
            sendPack.Result = 0

            self.packSend(pack.getSessionID(), pack.getPackHead().sessionID, 0, CommonDefine.atMergeLogic, MMORPGPack.stNoSense,

                          MMORPGPack.stNoSense, sendPack.GetBuffer())

            mylog.warning('query failed!spec = %s'%accID)

            return

        sendPack.Result = 1

        sendPack.Account = accID

        sendPack.AccountLen = len(accID)

        sendPack.Pwd = ""

        sendPack.PwdLen = 0

        self.packSend(pack.getSessionID(), pack.getPackHead().sessionID, 0, CommonDefine.atMergeLogic, MMORPGPack.stNoSense,

                          MMORPGPack.stNoSense, sendPack.GetBuffer())

        
        
    def OnMergeRegisterPlayerByCache(self, db, pack):

        ''' 缓存跨服玩家上传数据信息 
            目前账号、玩家ID、角色名均已确保唯一，故无需再重新生成新的账号及角色信息

            直接接收更新缓存即可，玩家登陆跨服服务器时直接从缓存数据中解析角色数据，从而节省db存取步骤

        '''

        g_mergeRegisterPlayerDict = PyGameData.g_mergeRegisterPlayerDict

        try:

            buf = pack.getBuffer()

            recvPack = MergeServerRecvProtocol.tagLPRegisterPlayer()

            pos = 0

            recvPack.ReadData(buf, pos)

            #mylog.debug('pack = %s'%(binascii.b2a_hex(buf)))

            
            loginResultPack = MergeServerSendProtocol.tagMPRegisterPlayerResult()

            loginResultPack.Type = CommonDefine.dgMergeRegisterResult

            
            #玩家地图数据，和下线保存包 SavePlayerMapServerDataEx 一致          
            playerData = recvPack.Data

            playerRec = DataServerPlayerData.tagDBPlayer()

            pos = 0

            dbPlayerReadLen = playerRec.readData(playerData, pos, len(playerData))

            if -1 == dbPlayerReadLen:

                #数据异常，长度不足

                #回复失败

                loginResultPack.Result = 0

                loginResultPack.ErrorMsg = 'Player data length not enough!'

                loginResultPack.ErrorMsgLen = len(loginResultPack.ErrorMsg)

                self.packSend(pack.getSessionID(), pack.getPackHead().sessionID, 0, CommonDefine.atMergeLogic, MMORPGPack.stNoSense,

                              MMORPGPack.stNoSense, loginResultPack.GetBuffer())

                mylog.warning('player data too short!')

                return

            
            if playerRec.PlayerID == 0:

                loginResultPack.Result = 0

                loginResultPack.ErrorMsg = 'Player data error!'

                loginResultPack.ErrorMsgLen = len(loginResultPack.ErrorMsg)

                self.packSend(pack.getSessionID(), pack.getPackHead().sessionID, 0, CommonDefine.atMergeLogic, MMORPGPack.stNoSense,

                              MMORPGPack.stNoSense, loginResultPack.GetBuffer())

                mylog.warning('player data error!')

                return

            
            clientSessionID = pack.getSessionID()

            client = MergeProxyClientMgr.getMergeProxyClientMgr().findClientBySessionID(clientSessionID)

            if not client:

                mylog.warning('client not found!sessionID = %s'%(clientSessionID))

                return

            groupID = client.groupID

            
            playerID = playerRec.PlayerID

            accID = playerRec.AccID.lower().strip(chr(0))

                
            playerName = playerRec.PlayerName.strip()

            
            #成功，返回新帐号密码

            loginResultPack.Result = 1

            loginResultPack.Account = accID

            loginResultPack.AccountLen = len(accID)

            loginResultPack.Pwd = ""

            loginResultPack.PwdLen = 0

            self.packSend(pack.getSessionID(), pack.getPackHead().sessionID, 0, CommonDefine.atMergeLogic, MMORPGPack.stNoSense,

                              MMORPGPack.stNoSense, loginResultPack.GetBuffer())

            
            mylog.info('player %s accID=%s, playerID=%s, %s register PK ok!'%(groupID, accID, playerID, playerName))

            g_mergeRegisterPlayerDict[accID] = [time(), 0, recvPack, groupID] # 更新跨服玩家数据缓存

        except Exception, e:

            msg = error.formatMsg('error', error.ERROR_NO_175, "OnMergeRegisterPlayer error %s!traceback = %s, pack = %s"%(e, traceback.format_exc(), binascii.b2a_hex(buf)))

            mylog.error(msg)

        except:

            msg = error.formatMsg('error', error.ERROR_NO_176, "OnMergeRegisterPlayer error!traceback = %s, pack = %s"%(traceback.format_exc(), binascii.b2a_hex(buf)))

            mylog.error(msg)

        return

    
    

    def OnFinishRecharge(self, db, pack):

        # map完成兑换，假设此处没有回复，则此单变成丢单，暂由人工维护

@@ -1661,7 +1629,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()

@@ -2394,8 +2362,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):

@@ -2411,6 +2380,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)

@@ -3348,7 +3320,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自己管理

@@ -3376,21 +3459,6 @@
        DBPlayerRecData = DataServerPlayerData.tagDBPlayerRecData()

        data += DBPlayerRecData.adoQueryAll(collection)

        mylog.debug("tagDBPlayerRecData ok")



        collection = db[UCN_DBPyMineAreaAward]

        DBPyMineAreaAward = DataServerPlayerData.tagDBPyMineAreaAward()

        data += DBPyMineAreaAward.adoQueryAll(collection)

        mylog.debug("tagDBPyMineAreaAward ok")

        
        collection = db[UCN_DBPyMineAreaRecord]

        DBPyMineAreaRecord = DataServerPlayerData.tagDBPyMineAreaRecord()

        data += DBPyMineAreaRecord.adoQueryAll(collection)

        mylog.debug("tagDBPyMineAreaRecord ok")

        
        collection = db[UCN_DBPyMineAreaItem]

        DBPyMineAreaItem = DataServerPlayerData.tagDBPyMineAreaItem()

        data += DBPyMineAreaItem.adoQueryAll(collection)

        mylog.debug("tagDBPyMineAreaItem ok")

        

        collection = db[UCN_DBPyCouple]

        DBPyCouple = DataServerPlayerData.tagDBPyCouple()

@@ -3735,6 +3803,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

@@ -3792,9 +3861,6 @@
                        gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPyFuncTeam, DataServerPlayerData.tagDBPyFuncTeam, db)

                        gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPyFuncTeamMem, DataServerPlayerData.tagDBPyFuncTeamMem, db)

                        gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPlayerRecData, DataServerPlayerData.tagDBPlayerRecData, db)

                        gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPyMineAreaAward, DataServerPlayerData.tagDBPyMineAreaAward, db)

                        gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPyMineAreaRecord, DataServerPlayerData.tagDBPyMineAreaRecord, db)

                        gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPyMineAreaItem, DataServerPlayerData.tagDBPyMineAreaItem, db)

                        gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPyCouple, DataServerPlayerData.tagDBPyCouple, db)

                        gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPyUnNotifyLoveGiftRec, DataServerPlayerData.tagDBPyUnNotifyLoveGiftRec, db)

                        gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPyCharmValueRec, DataServerPlayerData.tagDBPyCharmValueRec, db)

@@ -3928,9 +3994,6 @@
                        gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPyFuncTeam, DataServerPlayerData.tagDBPyFuncTeam, db)

                        gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPyFuncTeamMem, DataServerPlayerData.tagDBPyFuncTeamMem, db)

                        gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPlayerRecData, DataServerPlayerData.tagDBPlayerRecData, db)

                        gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPyMineAreaAward, DataServerPlayerData.tagDBPyMineAreaAward, db)

                        gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPyMineAreaRecord, DataServerPlayerData.tagDBPyMineAreaRecord, db)

                        gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPyMineAreaItem, DataServerPlayerData.tagDBPyMineAreaItem, db)

                        gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPyCouple, DataServerPlayerData.tagDBPyCouple, db)

                        gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPyUnNotifyLoveGiftRec, DataServerPlayerData.tagDBPyUnNotifyLoveGiftRec, db)

                        gameDataReadPos = self.savegameServerWorldData(decompressGameData, gameDataReadPos, UCN_DBPyCharmValueRec, DataServerPlayerData.tagDBPyCharmValueRec, db)

@@ -4084,7 +4147,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)    #如果读取出错，后面全错了

@@ -5546,72 +5608,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

    

    

    #导出单玩家数据