From 5b8be8efb7dbb6a10421b6dde5624ab9c3e1ac63 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 23 二月 2024 16:12:04 +0800
Subject: [PATCH] 9802 9762 【BT9】【后端】藏宝阁修改（背包计算转化物品占用格子数逻辑优化；开宝箱计算获得物品占用格子数逻辑优化；）
---
ServerPython/CoreServerGroup/GameServer/Script/PyDataManager.py | 48 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/PyDataManager.py b/ServerPython/CoreServerGroup/GameServer/Script/PyDataManager.py
index a4df3e7..d69ec33 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/PyDataManager.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/PyDataManager.py
@@ -28,6 +28,8 @@
import PlayerAssist
import PyGameDataStruct
import IpyGameDataPY
+import PlayerCharm
+import PlayerLove
import CommFunc
import time
@@ -58,6 +60,7 @@
# 保存数据 存数据库和realtimebackup
def GetSaveData(self):
+ PlayerAssist.RemoveOutofdateAssistThanks()
savaData = ""
cntData = ""
cnt = 0
@@ -88,9 +91,8 @@
def __init__(self):
self.allAssistDict = {} # 所有协助 {GUID:tagDBAssist, ...}
- self.familyAssistDict = {} # 仙盟协助缓存 {familyID:[tagDBAssist, ...], ...}
- self.playerNoSaveDBAssistDict = {} # 玩家发布的不存库协助 {playerID:[tagDBAssist, ...], ...}
+ self.playerAssistDict = {} # 玩家发布的协助 {playerID:[tagDBAssist, ...], ...}
self.playerAssistingDict = {} # 玩家正在协助中的协助，只能存在一条 {playerID:tagDBAssist, ...}
return
@@ -122,11 +124,11 @@
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)
+ PlayerID = dbData.PlayerID
+ if PlayerID not in self.playerAssistDict:
+ self.playerAssistDict[PlayerID] = []
+ playerAssistList = self.playerAssistDict[PlayerID]
+ playerAssistList.append(dbData)
return pos
@@ -307,6 +309,10 @@
class PyGameDataManager(object):
def __init__(self):
+ self.DBPyCoupleManager = PlayerLove.DBPyCoupleManager()
+ self.DBPyUnNotifyLoveGiftRecManager = PlayerLove.DBPyUnNotifyLoveGiftRecManager()
+ self.DBPyCharmValueRecManager = PlayerCharm.DBPyCharmValueRecManager()
+ self.IntimacyManager = PlayerSocial.IntimacyManager()
self.CrossPersonalCompensationManager = PlayerCompensation.CrossPersonalCompensationManager()
self.CrossBillboardManager = CrossBillboard.CrossBillboardManager()
self.PlayerAssistThanksPyManager = PlayerAssistThanksPyManager()
@@ -332,6 +338,10 @@
def GetSaveData(self):
buff = ""
+ buff += self.DBPyCoupleManager.GetSaveData()
+ buff += self.DBPyUnNotifyLoveGiftRecManager.GetSaveData()
+ buff += self.DBPyCharmValueRecManager.GetSaveData()
+ buff += self.IntimacyManager.GetSaveData()
buff += self.CrossPersonalCompensationManager.GetSaveData()
buff += self.CrossBillboardManager.GetSaveData()
buff += self.PlayerAssistThanksPyManager.GetSaveData()
@@ -356,6 +366,10 @@
return buff
def LoadGameData(self, gameBuffer, pos):
+ pos = self.DBPyCoupleManager.LoadPyGameData(gameBuffer, pos, len(gameBuffer))
+ pos = self.DBPyUnNotifyLoveGiftRecManager.LoadPyGameData(gameBuffer, pos, len(gameBuffer))
+ pos = self.DBPyCharmValueRecManager.LoadPyGameData(gameBuffer, pos, len(gameBuffer))
+ pos = self.IntimacyManager.LoadPyGameData(gameBuffer, pos, len(gameBuffer))
pos = self.CrossPersonalCompensationManager.LoadPyGameData(gameBuffer, pos, len(gameBuffer))
pos = self.CrossBillboardManager.LoadPyGameData(gameBuffer, pos, len(gameBuffer))
pos = self.PlayerAssistThanksPyManager.LoadPyGameData(gameBuffer, pos, len(gameBuffer))
@@ -467,6 +481,26 @@
pyGameDataMgr = GetPyGameDataManager()
return pyGameDataMgr.familyStoreItemManager
+def GetDBPyCoupleManager():
+ # 伴侣管理
+ pyGameDataMgr = GetPyGameDataManager()
+ return pyGameDataMgr.DBPyCoupleManager
+
+def GetDBPyUnNotifyLoveGiftRecManager():
+ # 未通知的赠送礼物记录
+ pyGameDataMgr = GetPyGameDataManager()
+ return pyGameDataMgr.DBPyUnNotifyLoveGiftRecManager
+
+def GetDBPyCharmValueRecManager():
+ # 魅力管理
+ pyGameDataMgr = GetPyGameDataManager()
+ return pyGameDataMgr.DBPyCharmValueRecManager
+
+def GetIntimacyManager():
+ # 亲密管理
+ pyGameDataMgr = GetPyGameDataManager()
+ return pyGameDataMgr.IntimacyManager
+
# 好友系统
def GetFriendManager():
pyGameDataMgr = GetPyGameDataManager()
--
Gitblit v1.8.0