From ebdb30f440b48c42840f03d7a7a415aed6913150 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 03 十一月 2021 11:16:40 +0800
Subject: [PATCH] 9319 【BT3】【BT4】【BT5】【主干】集字的掉落无等级限制（去除脱机掉落表最大等级掉落限制；集字表掉落等级限制依然有效）
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerSocial.py | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerSocial.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerSocial.py
index e5612fa..770c385 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerSocial.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerSocial.py
@@ -26,7 +26,6 @@
import IpyGameDataPY
import PlayerViewCache
import PyGameData
-import json
#--------------------社交圈基本结构-------------------
# 社交圈
class SocialPlayers(object):
@@ -149,7 +148,10 @@
sendPack.Count = 1
sendPack.Player = []
socialManager = PyDataManager.GetPersonalSocialManager()
- socialInfo = socialManager.GetSocialPlayer(tagID).GetPackStruct(ChPyNetSendPack.tagGCSocialPlayer())
+ socialPlayer = socialManager.GetSocialPlayer(tagID)
+ if not socialPlayer:
+ return
+ socialInfo = socialPlayer.GetPackStruct(ChPyNetSendPack.tagGCSocialPlayer())
sendPack.Player.append(socialInfo)
NetPackCommon.SendFakePack(curPlayer, sendPack)
@@ -266,7 +268,7 @@
cnt += 1
savaData += friend.getBuffer()
- GameWorld.Log("SaveFriendData cnt :%s"%cnt)
+ GameWorld.Log("SaveFriendData cnt :%s len=%s" % (cnt, len(savaData)))
return CommFunc.WriteDWORD(cntData, cnt) + savaData
# 从数据库载入好友数据
@@ -383,7 +385,7 @@
cnt += 1
savaData += socialPlayer.getBuffer()
- GameWorld.Log("!!SaveEnemyData cnt :%s"%cnt)
+ GameWorld.Log("!!SaveEnemyData cnt :%s len=%s" % (cnt, len(savaData)))
return CommFunc.WriteDWORD(cntData, cnt) + savaData
# 从数据库载入
@@ -539,7 +541,7 @@
cnt += 1
savaData += socialPlayer.getBuffer()
- GameWorld.Log("!!SaveContactsData cnt :%s"%cnt)
+ GameWorld.Log("!!SaveContactsData cnt :%s len=%s" % (cnt, len(savaData)))
return CommFunc.WriteDWORD(cntData, cnt) + savaData
# 从数据库载入
@@ -620,7 +622,7 @@
cnt += 1
savaData += socialPlayer.getBuffer()
- GameWorld.Log("!!SaveBlacklistData cnt :%s"%cnt)
+ GameWorld.Log("!!SaveBlacklistData cnt :%s len=%s" % (cnt, len(savaData)))
return CommFunc.WriteDWORD(cntData, cnt) + savaData
# 从数据库载入
@@ -711,7 +713,7 @@
# 增加社交对象信息，针对不在社交圈记录并且不在线玩家的情况
def AddPlayerInfoByViewCache(self, playerID):
- curCache = PlayerViewCache.ViewCacheMgr.FindCache(playerID)
+ curCache = PlayerViewCache.FindViewCache(playerID)
playerSocial = PyGameDataStruct.tagPersonalSocial()
if not curCache:
# 实在找不到设置为初始化数据
@@ -723,7 +725,7 @@
playerSocial.RealmLV = 1
playerSocial.OnlineType = ChConfig.Def_Offline
else:
- cacheDict = json.loads(curCache.GetPropData())
+ cacheDict = PlayerViewCache.GetCachePropDataDict(curCache)
playerSocial.clear()
playerSocial.PlayerID = playerID
@@ -763,7 +765,7 @@
cnt += 1
savaData += socialPlayer.playerInfo.getBuffer()
- GameWorld.Log("SaveSocialData cnt :%s"%cnt)
+ GameWorld.Log("SaveSocialData cnt :%s len=%s" % (cnt, len(savaData)))
return CommFunc.WriteDWORD(cntData, cnt) + savaData
--
Gitblit v1.8.0