From db96d024726ef2089384290eea9200a5c5548be9 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 02 八月 2022 14:35:09 +0800
Subject: [PATCH] 9387 【主干】【越南】【bt7】【后端】支持跨服协助(ShareDefine.py冲突)

---
 ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 026ac03..be85ba3 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -1090,6 +1090,7 @@
 GameFuncID_LittleHelper = 146   # 小助手
 GameFuncID_TJG = 147            # 脱机挂
 GameFuncID_SuperGift = 150      # 超值礼包
+GameFuncID_PenglaiBoss = 162    # 蓬莱仙境
 GameFuncID_ZhuXianBoss = 163    # 诛仙BOSS
 GameFuncID_Arena = 195          # 竞技场
 GameFuncID_FaQi = 199           # 法器
@@ -1394,6 +1395,8 @@
 CrossServerMsg_BattlefieldState = "BattlefieldState"    # 跨服战场状态信息
 CrossServerMsg_BattlefieldOver = "BattlefieldOver"      # 跨服战场结算信息
 CrossServerMsg_DebugAnswer = "DebugAnswer"              # DebugAnswer
+CrossServerMsg_ActDropSpecItem = "ActDropSpecItem"      # 特殊掉落验证返回
+CrossServerMsg_CrossAssist = "CrossAssist"              # 跨服协助
 
 # 子服发送跨服信息定义
 ClientServerMsg_ServerInitOK = "ServerInitOK"           # 子服启动成功
@@ -1419,6 +1422,8 @@
 ClientServerMsg_BattlefieldCallChange = "BattlefieldCallChange"  # 跨服战场召集 - 修改
 ClientServerMsg_BattlefieldCallJoin = "BattlefieldCallJoin"   # 跨服战场召集 - 加入
 ClientServerMsg_BattlefieldCallKick = "BattlefieldCallKick"   # 跨服战场召集 - 踢出
+ClientServerMsg_ActDropSpecItem = "ActDropSpecItem"     # 活动特殊掉落
+ClientServerMsg_CrossAssist = "CrossAssist"             # 跨服协助
 
 #跨服广播类型定义
 CrossNotify_CrossAct = "CrossAct"

--
Gitblit v1.8.0