From 9347db1945649abfec40e90d2eb80f58882d039e Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期六, 22 六月 2019 17:53:55 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerSocial.py | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerSocial.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerSocial.py
index 624de77..ac14101 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
-
#--------------------社交圈基本结构-------------------
# 社交圈
class SocialPlayers(object):
@@ -98,6 +97,8 @@
def GetCount(self):
return len(self.SocialDict)
+
+ def GetSocialIDList(self): return self.SocialDict.keys()
def Find(self, tagID):
return self.SocialDict.get(tagID, None)
@@ -189,18 +190,21 @@
# 通知地图好友信息
def MapServer_SyncFriendInfo(self, curPlayer):
- if not curPlayer:
- return
- sendPack = ChGameToMapPyPack.tagGMFriendInfo()
- sendPack.PlayerID = curPlayer.GetPlayerID()
- sendPack.FriendCnt = self.GetCount()
- sendPack.Friends = []
-
- for friendInfo in self.SocialDict.values():
- playerFriend = ChGameToMapPyPack.tagGMPlayerFrendInfo()
- playerFriend.TagID = friendInfo.PlayerID
- sendPack.Friends.append(playerFriend)
- NetPackCommon.SendPyPackToMapServer(curPlayer.GetLineNO(), curPlayer.GetRealMapID(), sendPack)
+ return
+ #=======================================================================
+ # if not curPlayer:
+ # return
+ # sendPack = ChGameToMapPyPack.tagGMFriendInfo()
+ # sendPack.PlayerID = curPlayer.GetPlayerID()
+ # sendPack.FriendCnt = self.GetCount()
+ # sendPack.Friends = []
+ #
+ # for friendInfo in self.SocialDict.values():
+ # playerFriend = ChGameToMapPyPack.tagGMPlayerFrendInfo()
+ # playerFriend.TagID = friendInfo.TagID
+ # sendPack.Friends.append(playerFriend)
+ # NetPackCommon.SendPyPackToMapServer(curPlayer.GetLineNO(), curPlayer.GetRealMapID(), sendPack)
+ #=======================================================================
# 整个游戏的好友管理
@@ -706,7 +710,7 @@
# 增加社交对象信息，针对不在社交圈记录并且不在线玩家的情况
def AddPlayerInfoByViewCache(self, playerID):
- curCache = PlayerViewCache.ViewCacheMgr.FindCache(playerID)
+ curCache = PlayerViewCache.FindViewCache(playerID)
playerSocial = PyGameDataStruct.tagPersonalSocial()
if not curCache:
# 实在找不到设置为初始化数据
@@ -718,7 +722,7 @@
playerSocial.RealmLV = 1
playerSocial.OnlineType = ChConfig.Def_Offline
else:
- cacheDict = eval(curCache.GetPropData())
+ cacheDict = PlayerViewCache.GetCachePropDataDict(curCache)
playerSocial.clear()
playerSocial.PlayerID = playerID
--
Gitblit v1.8.0