From affca29e7500fc8e2e65cf15d19496a370f6329e Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 27 十二月 2018 16:22:58 +0800
Subject: [PATCH] 860312 机器人

---
 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFriend.py |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFriend.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFriend.py
index 7507d08..ef6881f 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
 
 #---------------------------------------------------------------------
 
@@ -147,6 +148,13 @@
     
     return PyDataManager.GetFriendManager().AddFriends(playerID)
 
+def IsFriend(playerID, tagPlayerID):
+    ## 判断双方是否好友
+    curFriends = PyDataManager.GetFriendManager().GetFriends(playerID)
+    if not curFriends:
+        return False
+    return curFriends.Find(tagPlayerID) != None
+
 #---------------------------------------------------------------------
 ##好友检查
 # @param curPlayer 申请好友的玩家
@@ -216,6 +224,7 @@
     tagPlayer = GameWorld.GetPlayerManager().FindPlayerByID(friendID)
     if tagPlayer != None:
         PlayerControl.NotifyCode(tagPlayer, 'Friend_DeleteFriend2', [curPlayer.GetName()])
+    PlayerTeam.OnTeamMemFriendChange(curPlayer, friendID, False)
     return
 
 
@@ -272,9 +281,10 @@
         GameWorld.Log("JoinFriendAnswer -> 封包异常 ->玩家没有这个请求", playerID)
         return
     
-    if not clientData.Answer and srcPlayer:
-        #XW_SJ_RefuseApply  XXX拒绝把你加为好友
-        PlayerControl.NotifyCode(srcPlayer, 'Friend_RejectFriend', [curPlayer.GetName()])
+    if not clientData.Answer: 
+        if srcPlayer:
+            #XW_SJ_RefuseApply  XXX拒绝把你加为好友
+            PlayerControl.NotifyCode(srcPlayer, 'Friend_RejectFriend', [curPlayer.GetName()])
         return
     
     # 黑名单检查
@@ -317,6 +327,7 @@
         PlayerControl.NotifyCode(curPlayer, 'Friend_MakeFriend', [cacheDict['Name']])  
         # 记录等对方上线通知地图,任务等会用到触发逻辑,通用记录次数即可, MapServer_SyncFriendInfo为具体的好友数量,根据策划需求制作
         pass
+    PlayerTeam.OnTeamMemFriendChange(curPlayer, srcPlayerID, True)
     return
 
 

--
Gitblit v1.8.0