ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/LogicProcess/UserCtrlDB.py
@@ -27,7 +27,7 @@
import inspect
from Collections.CollectionDefine import *
import binascii
# from GMToolLogicProcess import  ProjSpecialProcess
from GMToolLogicProcess import  ProjSpecialProcess
from Common import (CommFunc, mylog, CommFuncEx)
import PegasusCollectorProxy
import shutil
@@ -433,6 +433,14 @@
        
        mylog.debug("begin process request type = %d"%requestType)
        
        if requestType == CommonDefine.gstGMToolCommand:
            oFuncGrade = self.GetFuncGrade('gstGMToolCommand')
            oFuncGrade.Start()
            self.OnGMToolCommand(db, pack)
            oFuncGrade.End()
            return True
        if requestType == CommonDefine.gstGeneralDBOper:
            oFuncGrade = self.GetFuncGrade('gstGeneralDBOper')
            oFuncGrade.Start()
@@ -815,12 +823,7 @@
            oFuncGrade.End()    
            return True                                                        
        
        if requestType ==  CommonDefine.gstGMToolCmdUserDBRequest:
            oFuncGrade = self.GetFuncGrade("gstGMToolCmdUserDBRequest")
            oFuncGrade.Start()
            self.OnGMToolCmdUserDBRequest(db, pack)
            oFuncGrade.End()
            return True
        if requestType == CommonDefine.gstMergerChildToCenter:
            oFuncGrade = self.GetFuncGrade("gstMergerChildToCenter")
            oFuncGrade.Start()      
@@ -896,6 +899,21 @@
        self.packSend(sessionID, 0, 0, CommonDefine.atMergeLogic, MMORPGPack.stGame,
                      MMORPGPack.stData, sendPack.GetBuffer())
    
    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()
@@ -5680,14 +5698,8 @@
            mylog.error(msg)
            return False            
        return True   
    def OnGMToolCmdUserDBRequest(self,db, pack):
        # try:
        #     ProjSpecialProcess.OnGMToolCmdUserDBRequest(db,pack)
        # except:
        #     msg = error.formatMsg('error', error.ERROR_NO_172, "OnGMToolCmdUserDBRequest Catch a unexpetcted exception, error = %s"%traceback.format_exc())
        #     mylog.error(msg)
        #     return False
        return True
    def OnMergerChildToCenter(self,db, pack):
        mylog.debug('OnMergerChildToCenter in')
#        #伪装来源,便于回包