From 97fef842ed56dfd7c7dd73f9c7acf20df55b9a23 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 05 九月 2025 11:35:20 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（优化主线掉落装备：改为按Boss类型掉落，祝福树区分不同的Boss类型掉落概率；分解装备按消耗的战锤进行均分计算分解所得；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/LogicProcess/UserCtrlDB.py | 115 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 77 insertions(+), 38 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 a500a86..9c88912 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
@@ -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
@@ -411,16 +411,49 @@
if resultSet and resultSet.count():
for resultDict in resultSet:
PyGameData.g_dbPlayerIDMap[resultDict["PlayerID"]] = resultDict["AccID"]
- GameWorld.Log("启动服务器加载DBPlayer玩家账号ID对应关系! %s, %s" % (len(PyGameData.g_dbPlayerIDMap), PyGameData.g_dbPlayerIDMap))
+ 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
@@ -433,6 +466,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 +856,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 +932,24 @@
self.packSend(sessionID, 0, 0, CommonDefine.atMergeLogic, MMORPGPack.stGame,
MMORPGPack.stData, sendPack.GetBuffer())
+ def OnPlayerLogin(self, curPlayer):
+ ProjSpecialProcess.GMCmdPlayerLogin(curPlayer)
+ return
+
+ 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()
@@ -2431,7 +2485,7 @@
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， %s'%(len(PyGameData.g_dbPlayerIDMap), PyGameData.g_dbPlayerIDMap))
+ mylog.debug('PyGameData.g_dbPlayerIDMap = %s'%(len(PyGameData.g_dbPlayerIDMap)))
#构造其他角色初始数据
itemData = ''
@@ -3434,6 +3488,16 @@
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
@@ -3456,6 +3520,8 @@
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!')
@@ -3497,21 +3563,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()
@@ -3914,9 +3965,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)
@@ -4050,9 +4098,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)
@@ -5668,14 +5713,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')
# #伪装来源，便于回包
--
Gitblit v1.8.0