From 29a5e154e1628b11815ee5524f54daa9f7069a4f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 25 三月 2021 15:01:06 +0800
Subject: [PATCH] 8877 【主干】【BT2】节日游历任务ID支持绝世寻宝（boss复活、仙界盛典、节日游历都支持）
---
ServerPython/CoreServerGroup/GameServer/Script/PyDataManager.py | 56 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 40 insertions(+), 16 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/PyDataManager.py b/ServerPython/CoreServerGroup/GameServer/Script/PyDataManager.py
index 15f575f..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
@@ -25,12 +27,14 @@
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，但是可以正常保存，错误会在下次调用便宜接口才会触发
@@ -47,8 +51,9 @@
class PlayerAssistThanksPyManager(object):
def __init__(self):
- self.assistThanksDict = {} # 所有感谢 {GUID:tagDBAssistThanks, ...}
+ self.allAssistThanksList = [] # 所有感谢 [tagDBAssistThanks, ...]
self.playerThanksDict = {} # 玩家未感谢的 {playerID:[tagDBAssistThanks, ...], ...}
+ self.assistPlayerThanksDict = {} # 协助玩家未接受感谢的协助 {assistPlayerID:[tagDBAssistThanks, ...], ...}
return
# 保存数据 存数据库和realtimebackup
@@ -57,11 +62,12 @@
cntData = ""
cnt = 0
- for dbData in self.assistThanksDict.values():
+ for dbData in self.allAssistThanksList:
cnt += 1
+ PlayerAssist.OnSaveAssistThanksData(dbData)
savaData += dbData.getBuffer()
- GameWorld.Log("Save DBAssistThanks count :%s" % cnt)
+ GameWorld.Log("Save DBAssistThanks count :%s len=%s" % (cnt, len(savaData)))
return CommFunc.WriteDWORD(cntData, cnt) + savaData
# 从数据库载入数据
@@ -73,13 +79,7 @@
dbData = PyGameDataStruct.tagDBAssistThanks()
dbData.clear()
pos += dbData.readData(datas, pos, dataslen)
-
- self.assistThanksDict[dbData.GUID] = dbData
- playerID = dbData.PlayerID
- if playerID not in self.playerThanksDict:
- self.playerThanksDict[playerID] = []
- playerThanksList = self.playerThanksDict[playerID]
- playerThanksList.append(dbData)
+ PlayerAssist.OnInitAssistThanksData(self, dbData)
return pos
@@ -106,7 +106,7 @@
cnt += 1
savaData += dbData.getBuffer()
- GameWorld.Log("Save DBAssist count :%s" % cnt)
+ GameWorld.Log("Save DBAssist count :%s len=%s" % (cnt, len(savaData)))
return CommFunc.WriteDWORD(cntData, cnt) + savaData
# 从数据库载入数据
@@ -147,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
# 从数据库载入数据
@@ -179,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
# 从数据库载入数据
@@ -219,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
# 从数据库载入数据
@@ -275,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
# 从数据库载入数据
@@ -299,6 +307,8 @@
class PyGameDataManager(object):
def __init__(self):
+ self.CrossPersonalCompensationManager = PlayerCompensation.CrossPersonalCompensationManager()
+ self.CrossBillboardManager = CrossBillboard.CrossBillboardManager()
self.PlayerAssistThanksPyManager = PlayerAssistThanksPyManager()
self.PlayerAssistPyManager = PlayerAssistPyManager()
self.PlayerViewCachePyManager = PlayerViewCachePyManager()
@@ -322,6 +332,8 @@
def GetSaveData(self):
buff = ""
+ buff += self.CrossPersonalCompensationManager.GetSaveData()
+ buff += self.CrossBillboardManager.GetSaveData()
buff += self.PlayerAssistThanksPyManager.GetSaveData()
buff += self.PlayerAssistPyManager.GetSaveData()
buff += self.PlayerViewCachePyManager.GetSaveData()
@@ -344,6 +356,8 @@
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))
@@ -373,6 +387,16 @@
PyGameData.g_pyGameDataManager = pyGameDataMgr
return pyGameDataMgr
+def GetCrossPersonalCompensationManager():
+ # 跨服个人补偿邮件管理
+ pyGameDataMgr = GetPyGameDataManager()
+ return pyGameDataMgr.CrossPersonalCompensationManager
+
+def GetCrossBillboardManager():
+ # 跨服排行榜管理
+ pyGameDataMgr = GetPyGameDataManager()
+ return pyGameDataMgr.CrossBillboardManager
+
def GetPlayerAssistThanksPyManager():
# 协助感谢表
pyGameDataMgr = GetPyGameDataManager()
--
Gitblit v1.8.0