From 1a593b10b7d9dd7887a5928f263702aa458478da Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 20 十月 2022 15:49:23 +0800
Subject: [PATCH] 9673 【后端】【越南】【BT7】【主干】古神战场增加玩家掉落BUFF功能(NPC击杀玩家也可掉落buff)

---
 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTalk.py |   29 +++++++++++++++++++++++------
 1 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTalk.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTalk.py
index b911b61..110ce43 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTalk.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTalk.py
@@ -147,7 +147,7 @@
                 g_ChatMi[tagPlayerID].pop(0)
                 return
         
-        PlayerGeTui.ChatMiGeTui(tagPlayerID, tagPlayerName, curPlayer.GetName())
+        #PlayerGeTui.ChatMiGeTui(tagPlayerID, tagPlayerName, curPlayer.GetName())
 
 # 登录时将离线消息下发
 def LoginChatMi(curPlayer):
@@ -187,10 +187,18 @@
 
 def ClientServerMsg_ChatCrossWorld(serverGroupID, msgData, tick):
     ## 收到子服跨服世界频道聊天
-    zoneIpyData = CrossRealmPlayer.GetCrossZoneIpyDataByServerGroupID(0, serverGroupID)
-    if not zoneIpyData:
-        return
-    serverGroupIDList = zoneIpyData.GetServerGroupIDList()
+    chatCrossType = IpyGameDataPY.GetFuncCfg("TalkCross", 1) # 跨服聊天范围设定 0-全服;1-boss分区;2-跨服竞技场分区
+    if chatCrossType == 0:
+        serverGroupIDList = []
+    else:
+        crossTypeMapDict = {1:ChConfig.Def_FBMapID_CrossPenglai, 2:ChConfig.Def_FBMapID_CrossRealmPK}
+        if chatCrossType not in crossTypeMapDict:
+            GameWorld.ErrLog("跨服聊天范围配置错误! chatCrossType=%s" % chatCrossType)
+            return
+        zoneIpyData = CrossRealmPlayer.GetCrossZoneIpyDataByServerGroupID(crossTypeMapDict[chatCrossType], serverGroupID)
+        if not zoneIpyData:
+            return
+        serverGroupIDList = zoneIpyData.GetServerGroupIDList()
     CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_ChatCrossWorld, msgData, serverGroupIDList)
     return
 
@@ -437,7 +445,8 @@
     vipLv = player.GetVIPLv()  # 玩家vip等级
     GMLevel = player.GetGMLevel()
     job = player.GetJob()
-
+    playerID = player.GetID()
+    
     extraValueStr = ""
     # vip等级
     extraValueStr += GetTalkExtraValueStar(ShareDefine.Def_TalkExtraValue_Bit_VipLv)%vipLv
@@ -451,6 +460,14 @@
     extraValueStr += GetTalkExtraValueStar(ShareDefine.Def_TalkExtraValue_Bit_ServerGroupID) % PlayerControl.GetPlayerServerGroupID(player)
     # 等级
     extraValueStr += GetTalkExtraValueStar(ShareDefine.Def_TalkExtraValue_Bit_LV) % player.GetLV()
+    # 伴侣信息
+    coupleName, coupleJob, bridePriceMaxID = "", 1, 0
+    couple = PyDataManager.GetDBPyCoupleManager().GetCouple(playerID)
+    if couple:
+        coupleName = couple.GetCoupleName(playerID)
+        coupleJob = couple.GetCoupleJob(playerID)
+        bridePriceMaxID = couple.BridePriceMaxID
+    extraValueStr = "%s|%s|%s|%s" % (extraValueStr, coupleName, coupleJob, bridePriceMaxID)
     return extraValueStr
 
 

--
Gitblit v1.8.0