From 867c5145e4e860ed85c8eb24b272f30729e77e34 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 15 一月 2024 21:12:47 +0800
Subject: [PATCH] 10019 【砍树】回合战斗（战斗实例全部统一使用NPC，包含玩家自己及其他玩家镜像数据；）
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTalk.py | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTalk.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTalk.py
index a1c8215..0a3d524 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTalk.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTalk.py
@@ -26,7 +26,6 @@
import CrossRealmMsg
import ChNetSendPack
import NetPackCommon
-import PlayerGeTui
import PyGameData
import re
@@ -146,8 +145,6 @@
if len(g_ChatMi[tagPlayerID]) > 8:
g_ChatMi[tagPlayerID].pop(0)
return
-
- #PlayerGeTui.ChatMiGeTui(tagPlayerID, tagPlayerName, curPlayer.GetName())
# 登录时将离线消息下发
def LoginChatMi(curPlayer):
@@ -187,10 +184,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
@@ -459,7 +464,8 @@
coupleName = couple.GetCoupleName(playerID)
coupleJob = couple.GetCoupleJob(playerID)
bridePriceMaxID = couple.BridePriceMaxID
- extraValueStr = "%s|%s|%s|%s" % (extraValueStr, coupleName, coupleJob, bridePriceMaxID)
+ face = player.GetFace()
+ extraValueStr = "%s|%s|%s|%s|%s" % (extraValueStr, coupleName, coupleJob, bridePriceMaxID, face)
return extraValueStr
--
Gitblit v1.8.0