From c11f841ae1ccc99327f196ae469159d08c1033a0 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 03 八月 2021 15:14:26 +0800
Subject: [PATCH] 9130 【BT3】【主干】仙盟红包逻辑调整（仙盟红包可领个数由按仙盟当前人数改为按配置的红包个数）
---
ServerPython/CoreServerGroup/GameServer/Script/PyDataManager.py | 146 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 140 insertions(+), 6 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/PyDataManager.py b/ServerPython/CoreServerGroup/GameServer/Script/PyDataManager.py
index 0772738..a4df3e7 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/PyDataManager.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/PyDataManager.py
@@ -14,7 +14,9 @@
import GameWorld
import PlayerSocial
+import CrossBillboard
import PlayerFamilyStore
+import PlayerCompensation
import PlayerBourse
import GameWorldBoss
import PlayerSealDemon
@@ -23,13 +25,16 @@
import PyGameData
import CrossRealmPK
import AuctionHouse
+import PlayerAssist
import PyGameDataStruct
+import IpyGameDataPY
import CommFunc
+import time
def GetSavePyData():
pyGameDataMgr = GetPyGameDataManager()
result = pyGameDataMgr.GetSaveData()
- GameWorld.DebugLog("GetSavePyData!! id = %s-%s"%(id(pyGameDataMgr), len(result)))
+ GameWorld.Log("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，但是可以正常保存，错误会在下次调用便宜接口才会触发
@@ -42,6 +47,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 len=%s" % (cnt, len(savaData)))
+ 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 len=%s" % (cnt, len(savaData)))
+ 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):
@@ -59,7 +147,7 @@
cnt += 1
savaData += dbData.getBuffer()
- GameWorld.Log("Save PlayerViewCachePy count :%s" % cnt)
+ GameWorld.Log("Save PlayerViewCachePy count :%s len=%s" % (cnt, len(savaData)))
return CommFunc.WriteDWORD(cntData, cnt) + savaData
# 从数据库载入数据
@@ -91,13 +179,21 @@
cntData = ""
cnt = 0
+ unSaveCnt = 0
+ curTime = int(time.time())
+ vaildSeconds = IpyGameDataPY.GetFuncCfg("AuctionHouse", 1) * 3600 * 24
for recordDict in [self.myAuctionItemRecordDict, self.myBidItemRecordDict, self.familyAuctionItemRecordDict]:
for recordList in recordDict.values():
for dbData in recordList:
+ if vaildSeconds:
+ recordTime = GameWorld.ChangeTimeStrToNum(dbData.RecordTime)
+ if curTime - recordTime > vaildSeconds:
+ unSaveCnt += 1
+ continue
cnt += 1
savaData += dbData.getBuffer()
- GameWorld.Log("Save AuctionRecord count :%s" % cnt)
+ GameWorld.Log("Save AuctionRecord count :%s len=%s unSaveCnt=%s" % (cnt, len(savaData), unSaveCnt))
return CommFunc.WriteDWORD(cntData, cnt) + savaData
# 从数据库载入数据
@@ -131,7 +227,7 @@
cnt += 1
savaData += dbData.getBuffer()
- GameWorld.Log("Save AuctionAttention count :%s" % cnt)
+ GameWorld.Log("Save AuctionAttention count :%s len=%s" % (cnt, len(savaData)))
return CommFunc.WriteDWORD(cntData, cnt) + savaData
# 从数据库载入数据
@@ -151,7 +247,9 @@
def __InitAuctionAttentionAttrEx(self, attentionData):
## 初始化拍卖关注实例附加属性
- setattr(attentionData, "AttentionItemIDList", [] if not attentionData.AttentionInfo else eval(attentionData.AttentionInfo))
+ setattr(attentionData, "AttentionItemIDList", [])
+ if attentionData.AttentionInfo.startswith("[") and attentionData.AttentionInfo.endswith("]"):
+ attentionData.AttentionItemIDList = eval(attentionData.AttentionInfo)
return
#拍卖物品数据缓存，该类只做数据缓存存取，不写功能逻辑，防止重读脚本时功能逻辑脚本不生效
@@ -169,6 +267,10 @@
self.hisBiddingAuctionItemDict = {} # 玩家曾经参与过竞价的拍品，含所有拍品 {playerID:[tagDBAuctionItem, ...], ...}
self.myAuctionItemDict = {} # 玩家拍卖中的物品 ，不包含仙盟拍品，由前端界面自行整合数据 {playerID:[tagDBAuctionItem, ...], ...}
self.myAttentionItemDict = {} # 玩家关注中的物品 ，不包含仙盟拍品，由前端界面自行整合数据，只保存在线的玩家，离线清除，上线不同步，由前端查询 {playerID:[tagDBAuctionItem, ...], ...}
+
+ self.worldAuctionItemCountDict = {} # 全服拍品物品ID对应件数统计 {itemID:件数, ...}
+ self.worldAuctionJobEquipCountDict = {} # 全服拍品职业装备对应件数统计 {(职业,阶,颜色,是否套装):件数, ...}
+ self.worldAuctionReplenishTimeDict = {} # 全服拍品动态上架历史处理时间 {cfgID:time, ...}
return
# 保存数据 存数据库和realtimebackup
@@ -181,7 +283,7 @@
cnt += 1
savaData += dbData.getBuffer()
- GameWorld.Log("Save AuctionItem count :%s" % cnt)
+ GameWorld.Log("Save AuctionItem count :%s len=%s" % (cnt, len(savaData)))
return CommFunc.WriteDWORD(cntData, cnt) + savaData
# 从数据库载入数据
@@ -205,6 +307,10 @@
class PyGameDataManager(object):
def __init__(self):
+ self.CrossPersonalCompensationManager = PlayerCompensation.CrossPersonalCompensationManager()
+ self.CrossBillboardManager = CrossBillboard.CrossBillboardManager()
+ self.PlayerAssistThanksPyManager = PlayerAssistThanksPyManager()
+ self.PlayerAssistPyManager = PlayerAssistPyManager()
self.PlayerViewCachePyManager = PlayerViewCachePyManager()
self.AuctionAttentionManager = AuctionAttentionManager()
self.AuctionRecordManager = AuctionRecordManager()
@@ -226,6 +332,10 @@
def GetSaveData(self):
buff = ""
+ buff += self.CrossPersonalCompensationManager.GetSaveData()
+ buff += self.CrossBillboardManager.GetSaveData()
+ buff += self.PlayerAssistThanksPyManager.GetSaveData()
+ buff += self.PlayerAssistPyManager.GetSaveData()
buff += self.PlayerViewCachePyManager.GetSaveData()
buff += self.AuctionAttentionManager.GetSaveData()
buff += self.AuctionRecordManager.GetSaveData()
@@ -246,6 +356,10 @@
return buff
def LoadGameData(self, gameBuffer, pos):
+ pos = self.CrossPersonalCompensationManager.LoadPyGameData(gameBuffer, pos, len(gameBuffer))
+ pos = self.CrossBillboardManager.LoadPyGameData(gameBuffer, pos, len(gameBuffer))
+ 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))
@@ -273,6 +387,26 @@
PyGameData.g_pyGameDataManager = pyGameDataMgr
return pyGameDataMgr
+def GetCrossPersonalCompensationManager():
+ # 跨服个人补偿邮件管理
+ pyGameDataMgr = GetPyGameDataManager()
+ return pyGameDataMgr.CrossPersonalCompensationManager
+
+def GetCrossBillboardManager():
+ # 跨服排行榜管理
+ pyGameDataMgr = GetPyGameDataManager()
+ return pyGameDataMgr.CrossBillboardManager
+
+def GetPlayerAssistThanksPyManager():
+ # 协助感谢表
+ pyGameDataMgr = GetPyGameDataManager()
+ return pyGameDataMgr.PlayerAssistThanksPyManager
+
+def GetPlayerAssistPyManager():
+ # 协助表
+ pyGameDataMgr = GetPyGameDataManager()
+ return pyGameDataMgr.PlayerAssistPyManager
+
def GetPlayerViewCachePyManager():
# 拍卖记录表
pyGameDataMgr = GetPyGameDataManager()
--
Gitblit v1.8.0