From 0e9ba2633babd063e3639d89fb75244d9df9b018 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 07 二月 2025 19:01:13 +0800
Subject: [PATCH] 5562 【英文】【越南】【BT】【砍树】跨服子服玩家打包数据较大(优化跨服、子服打包数据、查看玩家日志输出)

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

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFriend.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFriend.py
index 96adcd2..82dad65 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFriend.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFriend.py
@@ -126,6 +126,8 @@
         askFriendPack.Name = curPlayer.GetName()
         askFriendPack.LV = curPlayer.GetLV()
         askFriendPack.RealmLV = curPlayer.GetOfficialRank()
+        askFriendPack.Face = curPlayer.GetFace()
+        askFriendPack.FacePic = curPlayer.GetFacePic()
         
         NetPackCommon.SendFakePack(tagPlayer, askFriendPack) 
 
@@ -214,6 +216,12 @@
         GameWorld.Log('DeleteFriend -> 封包异常 ->没有这个玩家', playerID)
         return
     
+    couple = PyDataManager.GetDBPyCoupleManager().GetCouple(playerID)
+    if couple and couple.GetCoupleID(playerID) == friendID:
+        #GameWorld.Log('DeleteFriend -> 封包异常 ->伴侣不能删除好友.friendID=%s' % friendID, playerID)
+        PlayerControl.NotifyCode(curPlayer, "DelFriendCoupleLimit")
+        return
+    
     #离线好友同时删除记录
     PyDataManager.GetFriendManager().DelFriendBoth(playerID, friendID)
     
@@ -224,6 +232,12 @@
     if tagPlayer != None:
         PlayerControl.NotifyCode(tagPlayer, 'Friend_DeleteFriend2', [curPlayer.GetName()])
     PlayerTeam.OnTeamMemFriendChange(curPlayer, friendID, False)
+    
+    # 亲密度减少
+    decIntimacyPer = IpyGameDataPY.GetFuncCfg("IntimacyReduce", 1)
+    if decIntimacyPer:
+        PyDataManager.GetIntimacyManager().DelIntimacyBothPer(playerID, friendID, decIntimacyPer)
+        
     return
 
 
@@ -389,6 +403,12 @@
     #    return
     #===========================================================================
     
+    couple = PyDataManager.GetDBPyCoupleManager().GetCouple(curPlayer.GetID())
+    if couple and couple.GetCoupleID(curPlayer.GetID()) == tagID:
+        #GameWorld.DebugLog("伴侣不能加入黑名单! tagID=%s" % tagID, curPlayer.GetID())
+        PlayerControl.NotifyCode(curPlayer, "AddBlackCoupleLimit")
+        return
+    
     tagPlayer = GameWorld.GetPlayerManager().FindPlayerByID(tagID)
     if not tagPlayer:
         curCache = PlayerViewCache.FindViewCache(tagID)
@@ -410,6 +430,11 @@
     
     PlayerControl.NotifyCode(curPlayer, 'AddBlackList', [playerName])
     
+    # 亲密度减少
+    decIntimacyPer = IpyGameDataPY.GetFuncCfg("IntimacyReduce", 2)
+    if decIntimacyPer:
+        PyDataManager.GetIntimacyManager().DelIntimacyBothPer(curPlayer.GetPlayerID(), tagID, decIntimacyPer)
+        
     return
 
 
@@ -473,6 +498,15 @@
     players.Sync_SocialsInfo(curPlayer)
     return
 
+#亲密
+def __OnPlayerLoginIntimacylist(curPlayer, tick):
+    intimacys = PyDataManager.GetIntimacyManager().GetIntimacys(curPlayer.GetID())
+    if intimacys == None:
+        return
+    
+    intimacys.Sync_SocialsInfo(curPlayer)
+    return
+
 ## 玩家登陆
 #  @param curPlayer 当前玩家
 #  @param tick 当前时间
@@ -486,6 +520,7 @@
     __OnPlayerLoginEnemy(curPlayer, tick)
     __OnPlayerLoginContacts(curPlayer, tick)
     __OnPlayerLoginBlacklist(curPlayer, tick)
+    __OnPlayerLoginIntimacylist(curPlayer, tick)
     
     # 向当前玩家通知相关联的所有玩家信息
     PlayerSocial.Sync_AllSocialsInfo(curPlayer)
@@ -625,6 +660,8 @@
         rceFriendsData.LV = tagPlayer.GetLV()
         rceFriendsData.Job = tagPlayer.GetJob()
         rceFriendsData.RealmLV = tagPlayer.GetOfficialRank()
+        rceFriendsData.Face = tagPlayer.GetFace()
+        rceFriendsData.FacePic = tagPlayer.GetFacePic()
         sendPack.FriendsList.append(rceFriendsData)
         
     #GameWorld.DebugLog("Client_RecommendFriends:%s"%sendPack.FriendsList)
@@ -684,6 +721,9 @@
         rceFriendsData.Name = tagPlayer.GetName()
         rceFriendsData.LV = tagPlayer.GetLV()
         rceFriendsData.Job = tagPlayer.GetJob()
+        rceFriendsData.RealmLV = tagPlayer.GetOfficialRank()
+        rceFriendsData.Face = tagPlayer.GetFace()
+        rceFriendsData.FacePic = tagPlayer.GetFacePic()
         sendPack.FriendsList.append(rceFriendsData)
         
     

--
Gitblit v1.8.0