From fdc93e9592be7de1dff464c911aae6489f1a6eed Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 11 一月 2019 18:23:21 +0800
Subject: [PATCH] 5512 子 【开发】【1.4】跨服竞技场 / 【后端】【1.4】跨服竞技场开发 -- 指定gameworld的npc管理
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTalk.py | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTalk.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTalk.py
index fac69d7..32ebc56 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTalk.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTalk.py
@@ -261,7 +261,7 @@
def __CheckTalk(curPlayer, content, length, tick, checkGMForbidenTalk = True, checkSameMsg = True):
if checkGMForbidenTalk and GetGMToolForbidTalk(curPlayer):
#GeRen_chenxin_921745 对不起，您已被GM禁言，发送信息失败
- PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_921745")
+ #PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_921745")
return False
#间隔时间
@@ -365,8 +365,6 @@
vipLv = objTalk.GetVIPLv() # 玩家vip等级
GMLevel = objTalk.GetGMLevel()
job = objTalk.GetJob()
- #mergeWarRank = PlayerControl.GetMergeWarRank(objTalk)
- #freshmanGuiderDay = PlayerFreshmanGuide.GetFreshmanGuiderDay(objTalk)
extraValueStr = ""
# vip等级
@@ -375,9 +373,9 @@
extraValueStr += GetTalkExtraValueStar(ShareDefine.Def_TalkExtraValue_Bit_GM)% (GMLevel > 0)
# job
extraValueStr += GetTalkExtraValueStar(ShareDefine.Def_TalkExtraValue_Bit_JOB)% job
+ # 气泡框
+ extraValueStr += GetTalkExtraValueStar(ShareDefine.Def_TalkExtraValue_Bit_BubbleBox) % PlayerControl.GetChatBubbleBox(objTalk)
- # 跨服预选赛排位(称呼)
- #extraValueStr += GetTalkExtraValueStar(ShareDefine.Def_TalkExtraValue_Bit_MergeWarRank)%mergeWarRank
# 新手指导员
#extraValueStr += GetTalkExtraValueStar(ShareDefine.Def_TalkExtraValue_Bit_NewGuider)% (freshmanGuiderDay > 0)
# QQ会员
--
Gitblit v1.8.0