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')
@@ -479,19 +480,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")
@@ -2394,8 +2395,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):
@@ -3348,7 +3350,100 @@
        #已废除
        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")
        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)
            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自己管理
@@ -3735,6 +3830,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