From ac36bdcfa7db1557790a5b912c3248b22625841f Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 26 十一月 2025 18:49:17 +0800
Subject: [PATCH] Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_SG_ServerCode

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index 010aabd..3ec5a8f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -239,8 +239,6 @@
 
 Def_Notify_WorldKey_HurtLog = 'HurtLog'  # 战斗伤害日志
 
-Def_Notify_WorldKey_AssistBoss = "AssistBoss"  # 协助boss
-
 Def_Notify_WorldKey_CoupleInfo = "CoupleInfo"  # 伴侣信息
 
 #活动类型定义
@@ -273,7 +271,6 @@
 OperationActionName_GrowupBuy = "ActGrowupBuy" # 成长必买活动
 OperationActionName_FeastLogin = "ActFeastLogin" # 节日登录活动
 OperationActionName_FeastWish = "ActFeastWish" # 节日祝福活动
-OperationActionName_FeastTravel = "ActFeastTravel" # 节日游历活动
 OperationActionName_ManyDayRecharge = "ActManyDayRecharge" # 多日连充活动
 OperationActionName_SingleRecharge = "ActSingleRecharge" # 单笔累充活动
 OperationActionName_Turntable = "ActTurntable" # 转盘活动
@@ -289,7 +286,7 @@
 FeastOperationActionNameList = [OperationActionName_FeastWeekParty,
                                 OperationActionName_RechargeRebateGold, OperationActionName_GrowupBuy,
                                 OperationActionName_FeastLogin,
-                                OperationActionName_FeastWish, OperationActionName_FeastTravel,
+                                OperationActionName_FeastWish,
                                 OperationActionName_RechargePrize,
                                 ]
 #所有的运营活动列表,含节日活动
@@ -320,7 +317,7 @@
                                    OperationActionName_WeekParty, OperationActionName_Turntable,
                                    OperationActionName_CollectWords,
                                    OperationActionName_FeastLogin,
-                                   OperationActionName_FeastWish, OperationActionName_FeastTravel,
+                                   OperationActionName_FeastWish,
                                    OperationActionName_ManyDayRecharge, OperationActionName_SingleRecharge,
                                    OperationActionName_GodGift,
                                    ]
@@ -808,6 +805,7 @@
 GameFuncID_Shop = 16            # 商城,坊市
 GameFuncID_Arena = 27           # 竞技场
 GameFuncID_Horse = 37           # 坐骑
+GameFuncID_Travel = 44          # 游历
 
 # 以下为暂时无用的
 GameFuncID_Pet = -1             # 宠物,灵宠 6

--
Gitblit v1.8.0