From 7b9266e078ebcb0459ff2840ab92dda4b7500098 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 17 一月 2019 00:04:11 +0800
Subject: [PATCH] 5722 【后端】【1.5】跨服BOSS开发（修复跨服区域频道能看到不同跨服分区的聊天信息bug）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index 8d8c4a1..e675306 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -900,7 +900,9 @@
Def_TalkExtraValue_Bit_GM, #GM
Def_TalkExtraValue_Bit_JOB, #job
Def_TalkExtraValue_Bit_BubbleBox, #气泡框
-) = range(0, 4)
+Def_TalkExtraValue_Bit_ServerGroupID, #服务器组ID
+Def_TalkExtraValue_Bit_LV, #等级
+) = range(0, 6)
#聊天信息附加值中某信息数据所占位置
#{聊天信息附加值类型:[起始位置(从左往右), 结束位置(不包含)]}
@@ -909,6 +911,8 @@
Def_TalkExtraValue_Bit_GM:[2, 3], # GM
Def_TalkExtraValue_Bit_JOB:[3, 4], # job
Def_TalkExtraValue_Bit_BubbleBox:[4, 6], # 气泡框
+ Def_TalkExtraValue_Bit_ServerGroupID:[6, 13], # 服务器组ID
+ Def_TalkExtraValue_Bit_LV:[13, 17], # 等级
}
# 聊天频道 暂用语音
@@ -1191,6 +1195,7 @@
CrossServerMsg_CrossServerState = "CrossServerState" # 跨服服务器状态变更
CrossServerMsg_ExitCrossServer = "ExitCrossServer" # 退出跨服服务器
CrossServerMsg_Notify = "Notify" # 提示信息
+CrossServerMsg_ChatCrossWorld = "ChatCrossWorld" # 跨服世界聊天
CrossServerMsg_ViewPlayerCacheRet = "ViewPlayerCacheRet"# 查看跨服玩家信息结果
CrossServerMsg_PKMatchReqRet = "PKMatchReqRet" # 跨服PK匹配请求结果
CrossServerMsg_PKMatchResult = "PKMatchResult" # 跨服PK匹配结果
@@ -1201,15 +1206,30 @@
CrossServerMsg_PKSyncBillboard = "PKSyncBillboard" # 跨服PK同步排行榜
CrossServerMsg_CrossBossInfo = "CrossBossInfo" # 跨服Boss信息
CrossServerMsg_CrossBossState = "CrossBossState" # 跨服Boss状态
+CrossServerMsg_PutInItem = "PutInItem" # 获得物品
+CrossServerMsg_GiveMoney = "GiveMoney" # 获得货币
+CrossServerMsg_DropGoodItem = "DropGoodItem" # 掉落好物品
+CrossServerMsg_RebornRet = "RebornRet" # 复活结果
+CrossServerMsg_NPCInfoRet = "NPCInfoRet" # 跨服地图NPC信息
+CrossServerMsg_CollectNPCOK = "CollectNPCOK" # 采集NPC完成
# 子服发送跨服信息定义
ClientServerMsg_ServerInitOK = "ServerInitOK" # 子服启动成功
+ClientServerMsg_ChatCrossWorld = "ChatCrossWorld" # 跨服世界聊天
ClientServerMsg_GMCMD = "GMCMD" # GM命令
ClientServerMsg_ViewPlayerCache = "ViewPlayerCache" # 查看跨服玩家信息
ClientServerMsg_PKMatch = "PKMatch" # 跨服PK匹配
ClientServerMsg_PKCancel = "PKCancel" # 跨服PK取消匹配
ClientServerMsg_PKPrepareOK = "PKPrepareOK" # 跨服PK准备完毕
ClientServerMsg_PKBillboard = "PKBillboard" # 跨服PK排行榜
+ClientServerMsg_Reborn = "Reborn" # 复活
+ClientServerMsg_QueryNPCInfo = "QueryNPCInfo" # 查询跨服地图NPC信息
+ClientServerMsg_SetPlayerAttrValue = "SetPlayerAttrValue" # 玩家属性数值更新
+ClientServerMsg_CollectNPC = "CollectNPC" # 采集NPC
+
+#跨服广播类型定义
+CrossNotify_World = "World"
+CrossNotify_Family = "Family"
#角色改名结果
(
@@ -1738,9 +1758,10 @@
EntFBAskRet_TJG, # 12 脱机挂中
EntFBAskRet_Sit, # 13 打坐中
EntFBAskRet_CrossPKMatching,# 14 跨服匹配中
+ EntFBAskRet_InCrossMap, # 15 跨服地图中
EntFBAskRet_Other, # xx 其他限制
EntFBAskRet_Max,
-) = range(17)
+) = range(18)
#增加仙盟活跃的活动类型
--
Gitblit v1.8.0