From faeca70d5c95ccb4744931a176f671c7836b1a72 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 10 五月 2024 17:25:06 +0800
Subject: [PATCH] 10054 【后端】任务系统（是否完成任务改为领取完奖励才算；福地采集任务类型增加进度改为开始采集就算；）
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTalk.py | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTalk.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerTalk.py
index b911b61..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
@@ -437,7 +442,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 +457,15 @@
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
+ face = player.GetFace()
+ extraValueStr = "%s|%s|%s|%s|%s" % (extraValueStr, coupleName, coupleJob, bridePriceMaxID, face)
return extraValueStr
--
Gitblit v1.8.0