From 608bd56472d25fcbccb572df24a71eab836e1fe7 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 21 五月 2019 17:23:15 +0800
Subject: [PATCH] 6603 【后端】【2.0】增加新版的sp和被动技能 - 1090减速受符文影响
---
ServerPython/CoreServerGroup/GameServer/Script/PyDataManager.py | 267 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 228 insertions(+), 39 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/PyDataManager.py b/ServerPython/CoreServerGroup/GameServer/Script/PyDataManager.py
index 3ce1150..e45663f 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/PyDataManager.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/PyDataManager.py
@@ -23,10 +23,13 @@
import PyGameData
import CrossRealmPK
import AuctionHouse
+import PyGameDataStruct
+import CommFunc
def GetSavePyData():
- result = PyGameData.g_pyGameDataManager.GetSaveData()
- GameWorld.DebugLog("GetSavePyData!! id = %s-%s"%(id(PyGameData.g_pyGameDataManager), len(result)))
+ pyGameDataMgr = GetPyGameDataManager()
+ result = pyGameDataMgr.GetSaveData()
+ GameWorld.DebugLog("GetSavePyData!! id = %s-%s"%(id(pyGameDataMgr), len(result)))
result = binascii.b2a_hex(result)
#GameWorld.DebugLog("GetSavePyData!! result = %s-%s"%(result, len(result)))
# 字节码在C++转化会发生错误must be string without null bytes, not str，但是可以正常保存，错误会在下次调用便宜接口才会触发
@@ -35,18 +38,176 @@
def LoadPyGameData(gameBuffer, pos):
- PyGameData.g_pyGameDataManager = PyGameDataManager()
- GameWorld.Log("LoadPyGameData!!id = %s %s"%(id(PyGameData.g_pyGameDataManager), len(gameBuffer)))
- return PyGameData.g_pyGameDataManager.LoadGameData(gameBuffer, pos)
+ pyGameDataMgr = GetPyGameDataManager()
+ GameWorld.Log("LoadPyGameData!!id = %s %s"%(id(pyGameDataMgr), len(gameBuffer)))
+ return pyGameDataMgr.LoadGameData(gameBuffer, pos)
-
+#玩家缓存管理，该类只做数据缓存存取，不写功能逻辑，防止重读脚本时功能逻辑脚本不生效
+class PlayerViewCachePyManager(object):
+
+ def __init__(self):
+ self.playerViewCachePyDict = {} # 玩家缓存 {playerID:tagPlayerViewCachePy, ...}
+ return
+
+ # 保存数据 存数据库和realtimebackup
+ def GetSaveData(self):
+ savaData = ""
+ cntData = ""
+ cnt = 0
+
+ for dbData in self.playerViewCachePyDict.values():
+ cnt += 1
+ savaData += dbData.getBuffer()
+
+ GameWorld.Log("Save PlayerViewCachePy count :%s" % cnt)
+ return CommFunc.WriteDWORD(cntData, cnt) + savaData
+
+ # 从数据库载入数据
+ def LoadPyGameData(self, datas, pos, dataslen):
+ cnt, pos = CommFunc.ReadDWORD(datas, pos)
+ GameWorld.Log("Load PlayerViewCachePy count :%s" % cnt)
+
+ for _ in xrange(cnt):
+ dbData = PyGameDataStruct.tagPlayerViewCachePy()
+ dbData.clear()
+ pos += dbData.readData(datas, pos, dataslen)
+
+ self.playerViewCachePyDict[dbData.PlayerID] = dbData
+
+ return pos
+
+#拍卖记录管理，该类只做数据缓存存取，不写功能逻辑，防止重读脚本时功能逻辑脚本不生效
+class AuctionRecordManager(object):
+
+ def __init__(self):
+ self.myAuctionItemRecordDict = {} # 我的拍品记录 {playerID:[tagDBAuctionRecord, ...], ...}
+ self.myBidItemRecordDict = {} # 我的竞拍记录 {playerID:[tagDBAuctionRecord, ...], ...}
+ self.familyAuctionItemRecordDict = {} # 仙盟拍品记录 {familyID:[tagDBAuctionRecord, ...], ...}
+ return
+
+ # 保存数据 存数据库和realtimebackup
+ def GetSaveData(self):
+ savaData = ""
+ cntData = ""
+ cnt = 0
+
+ for recordDict in [self.myAuctionItemRecordDict, self.myBidItemRecordDict, self.familyAuctionItemRecordDict]:
+ for recordList in recordDict.values():
+ for dbData in recordList:
+ cnt += 1
+ savaData += dbData.getBuffer()
+
+ GameWorld.Log("Save AuctionRecord count :%s" % cnt)
+ return CommFunc.WriteDWORD(cntData, cnt) + savaData
+
+ # 从数据库载入数据
+ def LoadPyGameData(self, datas, pos, dataslen):
+ cnt, pos = CommFunc.ReadDWORD(datas, pos)
+ GameWorld.Log("Load AuctionRecord count :%s" % cnt)
+
+ for _ in xrange(cnt):
+ dbData = PyGameDataStruct.tagDBAuctionRecord()
+ dbData.clear()
+ pos += dbData.readData(datas, pos, dataslen)
+
+ AuctionHouse.AddNewAuctionRecord(dbData)
+
+ return pos
+
+#拍卖关注管理，该类只做数据缓存存取，不写功能逻辑，防止重读脚本时功能逻辑脚本不生效
+class AuctionAttentionManager(object):
+
+ def __init__(self):
+ self.playerAttentionDict = {} # 玩家关注拍卖品ID {playerID:tagDBAuctionAttention, ...}
+ return
+
+ # 保存数据 存数据库和realtimebackup
+ def GetSaveData(self):
+ savaData = ""
+ cntData = ""
+ cnt = 0
+
+ for dbData in self.playerAttentionDict.values():
+ cnt += 1
+ savaData += dbData.getBuffer()
+
+ GameWorld.Log("Save AuctionAttention count :%s" % cnt)
+ return CommFunc.WriteDWORD(cntData, cnt) + savaData
+
+ # 从数据库载入数据
+ def LoadPyGameData(self, datas, pos, dataslen):
+ cnt, pos = CommFunc.ReadDWORD(datas, pos)
+ GameWorld.Log("Load AuctionAttention count :%s" % cnt)
+
+ for _ in xrange(cnt):
+ dbData = PyGameDataStruct.tagDBAuctionAttention()
+ dbData.clear()
+ pos += dbData.readData(datas, pos, dataslen)
+
+ self.playerAttentionDict[dbData.PlayerID] = dbData
+ AuctionHouse.OnLoadAuctionAttentionDataEx(dbData)
+
+ return pos
+
+ def __InitAuctionAttentionAttrEx(self, attentionData):
+ ## 初始化拍卖关注实例附加属性
+ setattr(attentionData, "AttentionItemIDList", [] if not attentionData.AttentionInfo else eval(attentionData.AttentionInfo))
+ return
+
+#拍卖物品数据缓存，该类只做数据缓存存取，不写功能逻辑，防止重读脚本时功能逻辑脚本不生效
+class AuctionItemManager():
+
+ def __init__(self):
+ self.allAuctionItemDict = {} # 所有拍品字典缓存 {ItemGUID:tagDBAuctionItem, ...}
+ self.allAuctionItemByEndTimeList = [] # 根据结束时间排序的所有拍品缓存 [tagDBAuctionItem, ...]
+ self.worldAuctionItemList = [] # 全服拍品列表缓存 [tagDBAuctionItem, ...]
+ self.worldAuctionItemQueryDict = {} # 全服拍品过滤查询缓存，添加拍品时重置 {(job, (itemType, ...), itemClassLV, (itemID, ...)):[tagDBAuctionItem, ...], ...}
+ self.familyAuctionItemDict = {} # 仙盟拍品列表缓存，包含转移到全服的仙盟拍品 {familyID:[tagDBAuctionItem, ...], ...}
+
+ self.nowBiddingAuctionItemDict = {} # 玩家当前是最高竞价的拍品，含所有拍品 {playerID:[tagDBAuctionItem, ...], ...}
+ self.hisBiddingAuctionItemDict = {} # 玩家曾经参与过竞价的拍品，含所有拍品 {playerID:[tagDBAuctionItem, ...], ...}
+ self.myAuctionItemDict = {} # 玩家拍卖中的物品 ，不包含仙盟拍品，由前端界面自行整合数据 {playerID:[tagDBAuctionItem, ...], ...}
+ self.myAttentionItemDict = {} # 玩家关注中的物品 ，不包含仙盟拍品，由前端界面自行整合数据，只保存在线的玩家，离线清除，上线不同步，由前端查询 {playerID:[tagDBAuctionItem, ...], ...}
+ return
+
+ # 保存数据 存数据库和realtimebackup
+ def GetSaveData(self):
+ savaData = ""
+ cntData = ""
+ cnt = 0
+
+ for dbData in self.allAuctionItemDict.values():
+ cnt += 1
+ savaData += dbData.getBuffer()
+
+ GameWorld.Log("Save AuctionItem count :%s" % cnt)
+ return CommFunc.WriteDWORD(cntData, cnt) + savaData
+
+ # 从数据库载入数据
+ def LoadPyGameData(self, datas, pos, dataslen):
+ cnt, pos = CommFunc.ReadDWORD(datas, pos)
+ GameWorld.Log("Load AuctionItem count :%s" % cnt)
+
+ for _ in xrange(cnt):
+ dbData = PyGameDataStruct.tagDBAuctionItem()
+ dbData.clear()
+ pos += dbData.readData(datas, pos, dataslen)
+
+ self.allAuctionItemDict[dbData.ItemGUID] = dbData
+ AuctionHouse.OnLoadAuctionItemDataEx(dbData)
+
+ AuctionHouse.OnLoadAuctionItemDataOK()
+ return pos
+
# 个人社交相关表
# 好友表，仇人表，最近联系人，黑名单，四张表公用的社交信息表
class PyGameDataManager(object):
def __init__(self):
- self.AuctionRecord = AuctionHouse.AuctionRecordManager()
- self.AuctionItem = AuctionHouse.AuctionItemManager()
+ self.PlayerViewCachePyManager = PlayerViewCachePyManager()
+ self.AuctionAttentionManager = AuctionAttentionManager()
+ self.AuctionRecordManager = AuctionRecordManager()
+ self.AuctionItemManager = AuctionItemManager()
self.crossPKUnNotifyOverInfo = CrossRealmPK.CrossPKUnNotifyOverInfoManager()
self.crossPKBillboard = CrossRealmPK.CrossPKBillboardManager()
self.XMZZManager = PlayerXMZZ.XMZZManager()
@@ -64,8 +225,10 @@
def GetSaveData(self):
buff = ""
- buff += self.AuctionRecord.GetSaveData()
- buff += self.AuctionItem.GetSaveData()
+ buff += self.PlayerViewCachePyManager.GetSaveData()
+ buff += self.AuctionAttentionManager.GetSaveData()
+ buff += self.AuctionRecordManager.GetSaveData()
+ buff += self.AuctionItemManager.GetSaveData()
buff += self.crossPKUnNotifyOverInfo.GetSaveData()
buff += self.crossPKBillboard.GetSaveData()
buff += self.XMZZManager.GetSaveData()
@@ -82,8 +245,10 @@
return buff
def LoadGameData(self, gameBuffer, pos):
- pos = self.AuctionRecord.LoadPyGameData(gameBuffer, pos, len(gameBuffer))
- pos = self.AuctionItem.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))
+ pos = self.AuctionItemManager.LoadPyGameData(gameBuffer, pos, len(gameBuffer))
pos = self.crossPKUnNotifyOverInfo.LoadPyGameData(gameBuffer, pos, len(gameBuffer))
pos = self.crossPKBillboard.LoadPyGameData(gameBuffer, pos, len(gameBuffer))
pos = self.XMZZManager.LoadPyGameData(gameBuffer, pos, len(gameBuffer))
@@ -98,72 +263,96 @@
pos = self.blacklistManager.LoadPyGameData(gameBuffer, pos, len(gameBuffer))
pos = self.socialInfoManager.LoadPyGameData(gameBuffer, pos, len(gameBuffer))
return pos
+
+def GetPyGameDataManager():
+ ## py数据库表数据管理器
+ pyGameDataMgr = PyGameData.g_pyGameDataManager
+ if not pyGameDataMgr:
+ pyGameDataMgr = PyGameDataManager()
+ PyGameData.g_pyGameDataManager = pyGameDataMgr
+ return pyGameDataMgr
-# 拍卖记录表
-def GetAuctionRecordManager():
- return PyGameData.g_pyGameDataManager.AuctionRecord
+def GetPlayerViewCachePyManager():
+ # 拍卖记录表
+ pyGameDataMgr = GetPyGameDataManager()
+ return pyGameDataMgr.PlayerViewCachePyManager
-# 拍卖物品表
def GetAuctionItemManager():
- return PyGameData.g_pyGameDataManager.AuctionItem
+ ## 拍卖物品缓存数据管理
+ pyGameDataMgr = GetPyGameDataManager()
+ return pyGameDataMgr.AuctionItemManager
+
+def GetAuctionAttentionManager():
+ # 拍卖记录表
+ pyGameDataMgr = GetPyGameDataManager()
+ return pyGameDataMgr.AuctionAttentionManager
+
+def GetAuctionRecordManager():
+ # 拍卖记录表
+ pyGameDataMgr = GetPyGameDataManager()
+ return pyGameDataMgr.AuctionRecordManager
# 跨服竞技场未通知玩家的比赛结果
def GetCrossPKUnNotifyOverInfoManager():
- return PyGameData.g_pyGameDataManager.crossPKUnNotifyOverInfo
+ pyGameDataMgr = GetPyGameDataManager()
+ return pyGameDataMgr.crossPKUnNotifyOverInfo
# 跨服竞技场排行榜管理
def GetCrossPKBillboardManager():
- return PyGameData.g_pyGameDataManager.crossPKBillboard
+ pyGameDataMgr = GetPyGameDataManager()
+ return pyGameDataMgr.crossPKBillboard
# 仙魔之争管理
def GetXMZZManager():
- return PyGameData.g_pyGameDataManager.XMZZManager
+ pyGameDataMgr = GetPyGameDataManager()
+ return pyGameDataMgr.XMZZManager
# 封魔坛结果管理
def GetSealDemonRecordManager():
- return PyGameData.g_pyGameDataManager.sealDemonManager
+ pyGameDataMgr = GetPyGameDataManager()
+ return pyGameDataMgr.sealDemonManager
# Boss关注记录管理
def GetBossAttentionManager():
- return PyGameData.g_pyGameDataManager.bossAttentionManager
+ pyGameDataMgr = GetPyGameDataManager()
+ return pyGameDataMgr.bossAttentionManager
# 交易所物品最近成交单价管理
def GetBourseItemLastPriceManager():
- return PyGameData.g_pyGameDataManager.bourseItemLastPriceManager
+ pyGameDataMgr = GetPyGameDataManager()
+ return pyGameDataMgr.bourseItemLastPriceManager
# 交易所记录管理
def GetBourseRecordManager():
- return PyGameData.g_pyGameDataManager.bourseRecordManager
+ pyGameDataMgr = GetPyGameDataManager()
+ return pyGameDataMgr.bourseRecordManager
# 战盟仓库物品管理
def GetFamilyStoreItemManager():
- return PyGameData.g_pyGameDataManager.familyStoreItemManager
+ pyGameDataMgr = GetPyGameDataManager()
+ return pyGameDataMgr.familyStoreItemManager
# 好友系统
def GetFriendManager():
- return PyGameData.g_pyGameDataManager.friendManager
+ pyGameDataMgr = GetPyGameDataManager()
+ return pyGameDataMgr.friendManager
# 社交信息管理
def GetPersonalSocialManager():
- return PyGameData.g_pyGameDataManager.socialInfoManager
+ pyGameDataMgr = GetPyGameDataManager()
+ return pyGameDataMgr.socialInfoManager
# 仇人系统
def GetEnemyManager():
- return PyGameData.g_pyGameDataManager.enemyManager
+ pyGameDataMgr = GetPyGameDataManager()
+ return pyGameDataMgr.enemyManager
# 最近联系人系统
def GetContactsManager():
- return PyGameData.g_pyGameDataManager.contactsManager
+ pyGameDataMgr = GetPyGameDataManager()
+ return pyGameDataMgr.contactsManager
# 黑名单系统
def GetBlacklistManager():
- return PyGameData.g_pyGameDataManager.blacklistManager
-
-#===============================================================================
-# PyGameData.g_pyGameDataManager = PyGameDataManager()
-#
-# PyGameData.g_pyGameDataManager.GetFriendManager().AddFriendBoth(3, 4)
-# PyGameData.g_pyGameDataManager.GetFriendManager().AddFriendBoth(3, 5)
-# PyGameData.g_pyGameDataManager.GetFriendManager().AddFriendBoth(3, 6)
-# PyGameData.g_pyGameDataManager.GetFriendManager().AddFriendBoth(6, 4)
-#===============================================================================
+ pyGameDataMgr = GetPyGameDataManager()
+ return pyGameDataMgr.blacklistManager
--
Gitblit v1.8.0