From 007d63b605f621933e5e6955ce73e74d86b1410a Mon Sep 17 00:00:00 2001 From: hxp <ale99527@vip.qq.com> Date: 星期四, 05 十一月 2020 18:39:59 +0800 Subject: [PATCH] 4853 【主干】【长尾】【BT】宗门试炼召唤未刷怪bug(未招完无法刷怪的bug) --- ServerPython/CoreServerGroup/GameServer/Script/PyDataManager.py | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 100 insertions(+), 0 deletions(-) diff --git a/ServerPython/CoreServerGroup/GameServer/Script/PyDataManager.py b/ServerPython/CoreServerGroup/GameServer/Script/PyDataManager.py index fe34525..5e225a8 100644 --- a/ServerPython/CoreServerGroup/GameServer/Script/PyDataManager.py +++ b/ServerPython/CoreServerGroup/GameServer/Script/PyDataManager.py @@ -23,6 +23,7 @@ import PyGameData import CrossRealmPK import AuctionHouse +import PlayerAssist import PyGameDataStruct import CommFunc @@ -42,6 +43,89 @@ GameWorld.Log("LoadPyGameData!!id = %s %s"%(id(pyGameDataMgr), len(gameBuffer))) return pyGameDataMgr.LoadGameData(gameBuffer, pos) +#协助感谢表 +class PlayerAssistThanksPyManager(object): + + def __init__(self): + self.allAssistThanksList = [] # 所有感谢 [tagDBAssistThanks, ...] + self.playerThanksDict = {} # 玩家未感谢的 {playerID:[tagDBAssistThanks, ...], ...} + self.assistPlayerThanksDict = {} # 协助玩家未接受感谢的协助 {assistPlayerID:[tagDBAssistThanks, ...], ...} + return + + # 保存数据 存数据库和realtimebackup + def GetSaveData(self): + savaData = "" + cntData = "" + cnt = 0 + + for dbData in self.allAssistThanksList: + cnt += 1 + PlayerAssist.OnSaveAssistThanksData(dbData) + savaData += dbData.getBuffer() + + GameWorld.Log("Save DBAssistThanks count :%s" % cnt) + return CommFunc.WriteDWORD(cntData, cnt) + savaData + + # 从数据库载入数据 + def LoadPyGameData(self, datas, pos, dataslen): + cnt, pos = CommFunc.ReadDWORD(datas, pos) + GameWorld.Log("Load DBAssistThanks count :%s" % cnt) + + for _ in xrange(cnt): + dbData = PyGameDataStruct.tagDBAssistThanks() + dbData.clear() + pos += dbData.readData(datas, pos, dataslen) + PlayerAssist.OnInitAssistThanksData(self, dbData) + + return pos + +#协助表 +class PlayerAssistPyManager(object): + + def __init__(self): + self.allAssistDict = {} # 所有协助 {GUID:tagDBAssist, ...} + self.familyAssistDict = {} # 仙盟协助缓存 {familyID:[tagDBAssist, ...], ...} + + self.playerNoSaveDBAssistDict = {} # 玩家发布的不存库协助 {playerID:[tagDBAssist, ...], ...} + self.playerAssistingDict = {} # 玩家正在协助中的协助,只能存在一条 {playerID:tagDBAssist, ...} + return + + # 保存数据 存数据库和realtimebackup + def GetSaveData(self): + savaData = "" + cntData = "" + cnt = 0 + + for dbData in self.allAssistDict.values(): + if not dbData.IsSaveDB: + continue + cnt += 1 + savaData += dbData.getBuffer() + + GameWorld.Log("Save DBAssist count :%s" % cnt) + return CommFunc.WriteDWORD(cntData, cnt) + savaData + + # 从数据库载入数据 + def LoadPyGameData(self, datas, pos, dataslen): + cnt, pos = CommFunc.ReadDWORD(datas, pos) + GameWorld.Log("Load DBAssist count :%s" % cnt) + + for _ in xrange(cnt): + dbData = PyGameDataStruct.tagDBAssist() + dbData.clear() + pos += dbData.readData(datas, pos, dataslen) + + PlayerAssist.OnInitAssistData(dbData, 1) + + self.allAssistDict[dbData.GUID] = dbData + familyID = dbData.FamilyID + if familyID not in self.familyAssistDict: + self.familyAssistDict[familyID] = [] + familyAssistList = self.familyAssistDict[familyID] + familyAssistList.append(dbData) + + return pos + #玩家缓存管理,该类只做数据缓存存取,不写功能逻辑,防止重读脚本时功能逻辑脚本不生效 class PlayerViewCachePyManager(object): @@ -211,6 +295,8 @@ class PyGameDataManager(object): def __init__(self): + self.PlayerAssistThanksPyManager = PlayerAssistThanksPyManager() + self.PlayerAssistPyManager = PlayerAssistPyManager() self.PlayerViewCachePyManager = PlayerViewCachePyManager() self.AuctionAttentionManager = AuctionAttentionManager() self.AuctionRecordManager = AuctionRecordManager() @@ -232,6 +318,8 @@ def GetSaveData(self): buff = "" + buff += self.PlayerAssistThanksPyManager.GetSaveData() + buff += self.PlayerAssistPyManager.GetSaveData() buff += self.PlayerViewCachePyManager.GetSaveData() buff += self.AuctionAttentionManager.GetSaveData() buff += self.AuctionRecordManager.GetSaveData() @@ -252,6 +340,8 @@ return buff def LoadGameData(self, gameBuffer, pos): + pos = self.PlayerAssistThanksPyManager.LoadPyGameData(gameBuffer, pos, len(gameBuffer)) + pos = self.PlayerAssistPyManager.LoadPyGameData(gameBuffer, pos, len(gameBuffer)) pos = self.PlayerViewCachePyManager.LoadPyGameData(gameBuffer, pos, len(gameBuffer)) pos = self.AuctionAttentionManager.LoadPyGameData(gameBuffer, pos, len(gameBuffer)) pos = self.AuctionRecordManager.LoadPyGameData(gameBuffer, pos, len(gameBuffer)) @@ -279,6 +369,16 @@ PyGameData.g_pyGameDataManager = pyGameDataMgr return pyGameDataMgr +def GetPlayerAssistThanksPyManager(): + # 协助感谢表 + pyGameDataMgr = GetPyGameDataManager() + return pyGameDataMgr.PlayerAssistThanksPyManager + +def GetPlayerAssistPyManager(): + # 协助表 + pyGameDataMgr = GetPyGameDataManager() + return pyGameDataMgr.PlayerAssistPyManager + def GetPlayerViewCachePyManager(): # 拍卖记录表 pyGameDataMgr = GetPyGameDataManager() -- Gitblit v1.8.0