From b4488bc3020cf5da3bf9fe4a0b27ba59b2d9f8cc Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 12 十二月 2025 20:18:02 +0800
Subject: [PATCH] 389 流向记录（每日累计在线时长流向 OnlineTimeToday）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/LogicProcess/UserCtrlDB.py | 575 +++++++++++++++++++++++++-------------------------------
1 files changed, 258 insertions(+), 317 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 38349a0..d4e8700 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
@@ -19,6 +19,7 @@
from ServerClientShareDefine import *
import ConfigParser
import IpyGameDataPY
+import PlayerCoin
#import IPY_GameWorld
#from Config import (DBConfig,)
DBConfig = __import__('Config.DBConfig')
@@ -27,7 +28,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
@@ -404,6 +405,16 @@
return
+ def onSecondProcess(self):
+ '''子类实现 - 每秒处理'''
+ if not self.Connected:
+ return
+ if self.IsMergeServer():
+ pass
+ else:
+ self.OnQueryRechargeByLoop()
+ return
+
def loadDBPlayerIDMap(self):
## 加载本服玩家映射关系
col = self.db[UCN_DBPlayer]
@@ -415,12 +426,54 @@
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
@@ -433,6 +486,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()
@@ -447,26 +515,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")
@@ -814,19 +862,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")
@@ -896,6 +932,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()
@@ -1164,198 +1233,151 @@
+ 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完成兑换，假设此处没有回复，则此单变成丢单，暂由人工维护
# 若真频繁发生则改为上线恢复
- try:
- buf = pack.getBuffer()
- packLen = pack.getLength()
- recvPack = RecvPackProtocol.tagMDFinishRecharge()
- pos = 0
- recvPack.ReadData(buf, pos)
- orderID = recvPack.OrderID.strip(chr(0))
- mylog.debug('OnFinishRecharge ...%s'%orderID)
-
- col = db[UCN_PayInfo]
- result = col.find({"OrderID":orderID})
+ return
+# try:
+# buf = pack.getBuffer()
+# packLen = pack.getLength()
+# recvPack = RecvPackProtocol.tagMDFinishRecharge()
+# pos = 0
+# recvPack.ReadData(buf, pos)
+# orderID = recvPack.OrderID.strip(chr(0))
+# mylog.debug('OnFinishRecharge ...%s'%orderID)
+#
+# col = db[UCN_PayInfo]
+# result = col.find({"OrderID":orderID})
+#
+# if not result or result.count() == 0:
+# # 没有充值订单
+# return
+#
+# curTime = datetime.datetime.today()
+# curTimeStr = str(curTime)
+# curTimeStr = curTimeStr.split(".")[0]
+# col.update({"OrderID":orderID}, {"$set":{"IsProcess":1, 'EndOrderTime':curTimeStr}})
+#
+# mylog.debug('OnFinishRecharge OrderID = %s'%(orderID))
+#
+# return
+# except Exception, e:
+# msg = error.formatMsg('error', error.ERROR_NO_170, "OnFinishRecharge error %s!pack = %s"%(e, binascii.b2a_hex(buf)))
+# mylog.error(msg)
+# except:
+# msg = error.formatMsg('error', error.ERROR_NO_170, "OnFinishRecharge error!pack = %s"%(binascii.b2a_hex(buf)))
+# mylog.error(msg)
+# return
+
+ def OnQueryRechargeByLoop(self):
+ '''定时处理充值订单兑换' 每秒处理一次
+ 充值流程
+ 客户端支付商品 -> 平台回调游戏中心服务器 -> 游戏服务器插入订单tagPayInfo
+ 商品兑换旧流程：
+ curPlayer.SendDBQueryRecharge() -> gstQueryRecharge -> OnQueryRecharge -> 【GameServerRefresh.PushRecharge】 -> PlayerCoin.PlayerCoinToGold ->
+ -> curPlayer.SendDBFinishRecharge(orderID) -> gstFinishRecharge -> OnFinishRecharge
+ 发起方式：
+ 1. 游戏服务器每秒轮询未处理的订单进行兑换商品 -> MT_GetCoinReqs -> curPlayer.SendDBQueryRecharge()
+ 2. A8 06 查询充值结果 #tagCMQueryRecharge -> curPlayer.SendDBQueryRecharge()
- if not result or result.count() == 0:
- # 没有充值订单
+ 商品兑换新流程:
+ 1. 游戏服务器每秒轮询未处理的订单进行兑换商品 -> 直接调用 PlayerCoin.OnDBPushRecharge -> 直接更新订单 IsProcess
+ 2. 废弃， A8 06 查询充值结果 #tagCMQueryRecharge，只使用后端轮询即可，后续有问题再补充优化
+ '''
+ PayRechargeCount = 5 # 单次处理条数
+ if PayRechargeCount <= 0:
+ return
+ if not PyGameData.g_onlineAccIDList:
+ return
+ if PyGameData.g_ctgOrderIDList:
+ GameWorld.DebugLog("还有正在处理兑换商品的充值订单! %s" % PyGameData.g_ctgOrderIDList)
+ return
+ try:
+ col = self.db[UCN_PayInfo]
+ spec = {'AccID':{'$in':PyGameData.g_onlineAccIDList}, 'IsProcess':0}
+ fields = {"_id":0, "AccID":1, "OrderID":1, "OrderInfo":1, "OrderAmount":1}
+ result = col.find(spec, fields).limit(PayRechargeCount)
+ if not result or not result.count():
+ # 没有在线玩家未兑换的充值订单
return
curTime = datetime.datetime.today()
curTimeStr = str(curTime)
curTimeStr = curTimeStr.split(".")[0]
- col.update({"OrderID":orderID}, {"$set":{"IsProcess":1, 'EndOrderTime':curTimeStr}})
- mylog.debug('OnFinishRecharge OrderID = %s'%(orderID))
-
- return
- except Exception, e:
- msg = error.formatMsg('error', error.ERROR_NO_170, "OnFinishRecharge error %s!pack = %s"%(e, binascii.b2a_hex(buf)))
- mylog.error(msg)
+ for billInfo in result:
+ accID = fix_outgoingText(billInfo['AccID'])
+ orderID = fix_outgoingText(billInfo['OrderID'])
+ orderInfo = fix_outgoingText(billInfo['OrderInfo'])
+ orderAmount = billInfo['OrderAmount']
+ curPlayer = GameWorld.GetPlayerManager().FindPlayerByAccID(accID)
+ if not curPlayer or curPlayer.IsEmpty():
+ GameWorld.Log("充值兑换商品时玩家不在线! accID=%s,orderAmount=%s,orderInfo=%s,orderID=%s" % (accID, orderAmount, orderInfo, orderID))
+ continue
+ if orderID in PyGameData.g_ctgOrderIDList:
+ continue
+ PyGameData.g_ctgOrderIDList.append(orderID)
+ # 直接设置为已处理，订单如果实际异常未到账的情况由人工补偿处理
+ col.update({"OrderID":orderID}, {"$set":{"IsProcess":1, 'EndOrderTime':curTimeStr}})
+ PlayerCoin.OnDBPushRecharge(curPlayer, orderID, orderInfo, orderAmount)
+
except:
- msg = error.formatMsg('error', error.ERROR_NO_170, "OnFinishRecharge error!pack = %s"%(binascii.b2a_hex(buf)))
+ msg = error.formatMsg('error', error.ERROR_NO_170, "traceback = %s" % (traceback.format_exc()))
mylog.error(msg)
+
+ PyGameData.g_ctgOrderIDList = []
return
-
def OnQueryRecharge(self, db, pack):
# map查询新的充值订单， 查询充值表
- try:
- buf = pack.getBuffer()
- packLen = pack.getLength()
- recvPack = RecvPackProtocol.tagMDQueryRecharge()
- pos = 0
- recvPack.ReadData(buf, pos)
- account = recvPack.Account.strip(chr(0))
- mylog.debug('OnQueryRecharge ...%s'%account)
-
- col = db[UCN_PayInfo]
- result = col.find({'AccID':account, 'IsProcess':0, 'EndOrderTime':0})
-
- if not result or result.count() == 0:
- # 没有充值订单
- return
-
- # 一单一单发
- # 先设置IsProcess为1兑换中，等回复结果在真正完成订单
- billInfo = result[0]
-
- sendPack = SendPackProtocol.tagDMRechargePush()
- sendPack.Type = CommonDefine.dgDBToMapServer
- sendPack.SubType = CommonDefine.gmReChargePush
- sendPack.OrderID = fix_outgoingText(billInfo['OrderID'])
- sendPack.OrderIDLen = len(sendPack.OrderID)
- sendPack.OrderInfo = fix_outgoingText(billInfo['OrderInfo'])
- sendPack.OrderInfoLen = len(sendPack.OrderInfo)
- sendPack.Money = int(billInfo['OrderAmount'])
- sendPack.Extras = fix_outgoingText(billInfo['Extras'])
- sendPack.ExtrasLen = len(sendPack.Extras)
-
- col.update({"OrderID":sendPack.OrderID}, {"$set":{"IsProcess":1}})
-
- self.sendString(pack, sendPack.GetBuffer())
- mylog.debug('OnQueryRecharge OrderID = %s'%(sendPack.OrderID))
- #mylog.debug('send %s'%sendPack.OutputString())
- return
- except Exception, e:
- msg = error.formatMsg('error', error.ERROR_NO_170, "OnQueryRecharge error %s!pack = %s"%(e, binascii.b2a_hex(buf)))
- mylog.error(msg)
- except:
- msg = error.formatMsg('error', error.ERROR_NO_170, "OnQueryRecharge error!pack = %s"%(binascii.b2a_hex(buf)))
- mylog.error(msg)
-
+ # 暂废弃
return
+# try:
+# buf = pack.getBuffer()
+# packLen = pack.getLength()
+# recvPack = RecvPackProtocol.tagMDQueryRecharge()
+# pos = 0
+# recvPack.ReadData(buf, pos)
+# account = recvPack.Account.strip(chr(0))
+# mylog.debug('OnQueryRecharge ...%s'%account)
+#
+# col = db[UCN_PayInfo]
+# result = col.find({'AccID':account, 'IsProcess':0, 'EndOrderTime':0})
+#
+# if not result or result.count() == 0:
+# # 没有充值订单
+# return
+#
+# # 一单一单发
+# # 先设置IsProcess为1兑换中，等回复结果在真正完成订单
+# billInfo = result[0]
+#
+# sendPack = SendPackProtocol.tagDMRechargePush()
+# sendPack.Type = CommonDefine.dgDBToMapServer
+# sendPack.SubType = CommonDefine.gmReChargePush
+# sendPack.OrderID = fix_outgoingText(billInfo['OrderID'])
+# sendPack.OrderIDLen = len(sendPack.OrderID)
+# sendPack.OrderInfo = fix_outgoingText(billInfo['OrderInfo'])
+# sendPack.OrderInfoLen = len(sendPack.OrderInfo)
+# sendPack.Money = int(billInfo['OrderAmount'])
+# sendPack.Extras = fix_outgoingText(billInfo['Extras'])
+# sendPack.ExtrasLen = len(sendPack.Extras)
+#
+# col.update({"OrderID":sendPack.OrderID}, {"$set":{"IsProcess":1}})
+#
+# self.sendString(pack, sendPack.GetBuffer())
+# mylog.debug('OnQueryRecharge OrderID = %s'%(sendPack.OrderID))
+# #mylog.debug('send %s'%sendPack.OutputString())
+# return
+# except Exception, e:
+# msg = error.formatMsg('error', error.ERROR_NO_170, "OnQueryRecharge error %s!pack = %s"%(e, binascii.b2a_hex(buf)))
+# mylog.error(msg)
+# except:
+# msg = error.formatMsg('error', error.ERROR_NO_170, "OnQueryRecharge error!pack = %s"%(binascii.b2a_hex(buf)))
+# mylog.error(msg)
+#
+# return
def OnQueryNewGuyCardState(self, db, pack):
try:
@@ -1551,8 +1573,11 @@
DataDumper.DumpData(GlobalFunctions.getAppPath(), 'UserLogs\\SaveFailDump', '%s.mdat'%playerID, saveData)
+ if accID in PyGameData.g_onlineAccIDList:
+ PyGameData.g_onlineAccIDList.remove(accID)
+
# 玩家下线恢复充值兑换中的订单,IsProcee为1,但endtime为空的情况
- self.RevoverBillProcess(db, accID)
+ #self.RevoverBillProcess(db, accID)
mylog.info("onSaveMapServerPlayerData result = %s, playerID = %s"%(result, playerID))
# 下线成功入库后同步移动玩家备档备份文件夹
@@ -1660,26 +1685,24 @@
return
# 玩家下线恢复充值兑换中的订单,IsProcee为1,但endtime为空的情况
- def RevoverBillProcess(self, db, accID):
- try:
- if not accID:
- return
- account = accID.strip(chr(0))
- col = db[UCN_PayInfo]
- result = col.find({'AccID':account, 'IsProcess':1, 'EndOrderTime':0})
-
- if not result or result.count() == 0:
- # 没有充值订单
- return
-
- # 一单一单 恢复
- billInfo = result[0]
- orderID = billInfo['OrderID']
- col.update({"OrderID":orderID}, {"$set":{"IsProcess":0}})
-
- mylog.debug('RevoverBillProcess success...%s'%orderID)
- except:
- mylog.error("RevoverBillProcess error %s"%traceback.format_exc())
+# def RevoverBillProcess(self, db, accID):
+# try:
+# if not accID:
+# return
+# account = accID.strip(chr(0))
+# col = db[UCN_PayInfo]
+# result = col.find({'AccID':account, 'IsProcess':1, 'EndOrderTime':0})
+#
+# if not result or result.count() == 0:
+# # 没有充值订单
+# return
+#
+# for billInfo in result:
+# orderID = billInfo['OrderID']
+# col.update({"OrderID":orderID}, {"$set":{"IsProcess":0}})
+# mylog.debug('RevoverBillProcess success...%s'%orderID)
+# except:
+# mylog.error("RevoverBillProcess error %s"%traceback.format_exc())
def SavePlayerMapServerData(self, db, saveData):
playerRec = DataServerPlayerData.tagDBPlayer()
@@ -3061,7 +3084,7 @@
#===================================================================
#if "@test@" in accountRec.ACCID or "@yun@" in accountRec.ACCID or accountRec.RegIP == "127.0.0.1":
- if CommonDefine.IsDebug() or accountRec.RegIP == "127.0.0.1":
+ if CommonDefine.IsDebug() or accountRec.RegIP == "127.0.0.1" or CommonDefine.IsInsideLogin():
#debug内部服务器不验证token, 脱机挂玩家不验证
mylog.debug('iner no check')
pass
@@ -3162,7 +3185,7 @@
the_page = response.read()
if the_page != "1":
- mylog.debug('checktoken fail:%s-%s'%(token, the_page))
+ mylog.info('checktoken fail:%s-%s'%(token, the_page))
self.sendFailString(CommonDefine.dgPlayerLogin, pack, disPswCheckError)
return True
except:
@@ -3341,7 +3364,9 @@
sendPack.MapID = GameWorld.GetGameWorld().GetMapID()
mylog.info('gstPlayerDetail Send OnCreate accid = %s'%(accountRec.ACCID))
NetPackCommon.SendPyPackToMapServerSelf(sendPack.GetBuffer(), sendPack.GetLength())
-
+
+ if authAccID not in PyGameData.g_onlineAccIDList:
+ PyGameData.g_onlineAccIDList.append(authAccID)
return True
def sendOKString(self, type, fromPacket, buf):
@@ -3509,21 +3534,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()
@@ -3926,9 +3936,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)
@@ -4062,9 +4069,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)
@@ -4218,7 +4222,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) #如果读取出错，后面全错了
@@ -5680,72 +5683,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
#导出单玩家数据
--
Gitblit v1.8.0