From 4bf976c6e6af3c7bb6bcb2798544b7f47cd7844d Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 22 三月 2024 15:48:37 +0800
Subject: [PATCH] 10138 内存分析（修复读取活动配置部分属性错误bug）

---
 ServerPython/CoreServerGroup/GameServer/Script/PyDataManager.py |   73 +++++++++++++++++++++++++++++++++---
 1 files changed, 66 insertions(+), 7 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/PyDataManager.py b/ServerPython/CoreServerGroup/GameServer/Script/PyDataManager.py
index a4df3e7..e35a1a5 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/PyDataManager.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/PyDataManager.py
@@ -26,8 +26,11 @@
 import CrossRealmPK
 import AuctionHouse
 import PlayerAssist
+import GameWorldMineArea
 import PyGameDataStruct
 import IpyGameDataPY
+import PlayerCharm
+import PlayerLove
 import CommFunc
 import time
 
@@ -58,6 +61,7 @@
     
     # 保存数据 存数据库和realtimebackup
     def GetSaveData(self):
+        PlayerAssist.RemoveOutofdateAssistThanks()
         savaData = ""
         cntData = ""
         cnt = 0
@@ -88,9 +92,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 +125,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 +310,13 @@
 
 class PyGameDataManager(object):
     def __init__(self):
+        self.DBPyMineAreaAwardManager = GameWorldMineArea.DBPyMineAreaAwardManager()
+        self.DBPyMineAreaRecordManager = GameWorldMineArea.DBPyMineAreaRecordManager()
+        self.DBPyMineAreaItemManager = GameWorldMineArea.DBPyMineAreaItemManager()
+        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 +342,13 @@
 
     def GetSaveData(self):
         buff = ""
+        buff += self.DBPyMineAreaAwardManager.GetSaveData()
+        buff += self.DBPyMineAreaRecordManager.GetSaveData()
+        buff += self.DBPyMineAreaItemManager.GetSaveData()
+        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 +373,13 @@
         return buff
     
     def LoadGameData(self, gameBuffer, pos):
+        pos = self.DBPyMineAreaAwardManager.LoadPyGameData(gameBuffer, pos, len(gameBuffer))
+        pos = self.DBPyMineAreaRecordManager.LoadPyGameData(gameBuffer, pos, len(gameBuffer))
+        pos = self.DBPyMineAreaItemManager.LoadPyGameData(gameBuffer, pos, len(gameBuffer))
+        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 +491,41 @@
     pyGameDataMgr = GetPyGameDataManager()
     return pyGameDataMgr.familyStoreItemManager
 
+def GetDBPyMineAreaAwardManager():
+    # 福地奖励结算管理
+    pyGameDataMgr = GetPyGameDataManager()
+    return pyGameDataMgr.DBPyMineAreaAwardManager
+
+def GetDBPyMineAreaRecordManager():
+    # 福地矿物记录管理
+    pyGameDataMgr = GetPyGameDataManager()
+    return pyGameDataMgr.DBPyMineAreaRecordManager
+
+def GetDBPyMineAreaItemManager():
+    # 福地矿物管理
+    pyGameDataMgr = GetPyGameDataManager()
+    return pyGameDataMgr.DBPyMineAreaItemManager
+
+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