From 68dd06e06c1a4a155884c31403da1155be6f10e8 Mon Sep 17 00:00:00 2001 From: hch <305670599@qq.com> Date: 星期四, 18 四月 2019 17:11:31 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode --- ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFriend.py | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFriend.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFriend.py index 62c7c82..4070bbf 100644 --- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFriend.py +++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFriend.py @@ -27,6 +27,7 @@ import PlayerSocial import copy import PlayerViewCache +import PlayerTeam #--------------------------------------------------------------------- @@ -80,8 +81,7 @@ #玩家的数据没有缓存过 PlayerControl.NotifyCode(curPlayer, 'Friend_OffLine') return - cacheDict = eval(curCache.GetPropData()) - tagLV = cacheDict["LV"] + tagLV = curCache.GetPlayerLV() else: tagLV = tagPlayer.GetLV() @@ -146,6 +146,13 @@ return curFriends return PyDataManager.GetFriendManager().AddFriends(playerID) + +def IsFriend(playerID, tagPlayerID): + ## 判断双方是否好友 + curFriends = PyDataManager.GetFriendManager().GetFriends(playerID) + if not curFriends: + return False + return curFriends.Find(tagPlayerID) != None #--------------------------------------------------------------------- ##好友检查 @@ -216,6 +223,7 @@ tagPlayer = GameWorld.GetPlayerManager().FindPlayerByID(friendID) if tagPlayer != None: PlayerControl.NotifyCode(tagPlayer, 'Friend_DeleteFriend2', [curPlayer.GetName()]) + PlayerTeam.OnTeamMemFriendChange(curPlayer, friendID, False) return @@ -318,6 +326,7 @@ PlayerControl.NotifyCode(curPlayer, 'Friend_MakeFriend', [cacheDict['Name']]) # 记录等对方上线通知地图,任务等会用到触发逻辑,通用记录次数即可, MapServer_SyncFriendInfo为具体的好友数量,根据策划需求制作 pass + PlayerTeam.OnTeamMemFriendChange(curPlayer, srcPlayerID, True) return -- Gitblit v1.8.0