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 | 52 +++++++++++++++++++++++++---------------------------
1 files changed, 25 insertions(+), 27 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index 3636caf..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,
]
@@ -757,36 +754,36 @@
# 自定义积分及通知字典 {货币类型:通知客户端刷新类型, ...} , 如果不通知的话刷新类型则配置 None
TYPE_Price_CurrencyDict = {
- TYPE_Price_Rune:CDBPlayerRefresh_Rune,
- TYPE_Price_RuneSplinters:CDBPlayerRefresh_RuneSplinters,
- TYPE_Price_TreasureScore:CDBPlayerRefresh_TreasureScore,
- TYPE_Price_BourseMoney:None,
- TYPE_Price_RealmPoint:CDBPlayerRefresh_RealmPoint,
- TYPE_Price_Ysog:CDBPlayerRefresh_Ysog,
TYPE_Price_FamilyCoin:CDBPlayerRefresh_FamilyCoin,
- TYPE_Price_Danjing:CDBPlayerRefresh_Danjing,
- TYPE_Price_SoulDust:CDBPlayerRefresh_SoulDust,
- TYPE_Price_SoulSplinters:CDBPlayerRefresh_SoulSplinters,
- TYPE_Price_SoulCore:CDBPlayerRefresh_SoulCore,
- TYPE_Price_Honor:CDBPlayerRefresh_Honor,
- TYPE_Price_BossActScore:CDBPlayerRefresh_BossActScore,
- TYPE_Price_FuncSysPrivilege:CDBPlayerRefresh_FuncSysPrivilege,
- TYPE_Price_Environment:CDBPlayerRefresh_Environment,
- TYPE_Price_BTGMPoint:CDBPlayerRefresh_BTGMPoint,
- TYPE_Price_GuShenMoney:CDBPlayerRefresh_GuShenMoney,
- TYPE_Price_GongdePoint:CDBPlayerRefresh_GongdePoint,
TYPE_Price_Xiantao:CDBPlayerRefresh_Xiantao,
TYPE_Price_Lingyu:CDBPlayerRefresh_Lingyu,
TYPE_Price_HeroSoul:CDBPlayerRefresh_HeroSoul,
- TYPE_Price_FamilyFlagWarPoint:CDBPlayerRefresh_FamilyFlagWarPoint,
- TYPE_Price_GatherSoul:CDBPlayerRefresh_GatherSoul,
- TYPE_Price_TiandaoFruit:CDBPlayerRefresh_TiandaoFruit,
- TYPE_Price_XianyuanScore:CDBPlayerRefresh_XianyuanScore,
- TYPE_Price_HuanjinggeScore:CDBPlayerRefresh_HuanjinggeScore,
TYPE_Price_HeroScore:CDBPlayerRefresh_HeroScore,
TYPE_Price_GoldRushEnergy:CDBPlayerRefresh_GoldRushEnergy,
TYPE_Price_ArenaTicket:CDBPlayerRefresh_ArenaTicket,
TYPE_Price_PayCoinDay:CDBPlayerRefresh_PayCoinDay,
+ #TYPE_Price_Rune:CDBPlayerRefresh_Rune,
+ #TYPE_Price_RuneSplinters:CDBPlayerRefresh_RuneSplinters,
+ #TYPE_Price_TreasureScore:CDBPlayerRefresh_TreasureScore,
+ #TYPE_Price_BourseMoney:None,
+ #TYPE_Price_RealmPoint:CDBPlayerRefresh_RealmPoint,
+ #TYPE_Price_Ysog:CDBPlayerRefresh_Ysog,
+ #TYPE_Price_Danjing:CDBPlayerRefresh_Danjing,
+ #TYPE_Price_SoulDust:CDBPlayerRefresh_SoulDust,
+ #TYPE_Price_SoulSplinters:CDBPlayerRefresh_SoulSplinters,
+ #TYPE_Price_SoulCore:CDBPlayerRefresh_SoulCore,
+ #TYPE_Price_Honor:CDBPlayerRefresh_Honor,
+ #TYPE_Price_BossActScore:CDBPlayerRefresh_BossActScore,
+ #TYPE_Price_FuncSysPrivilege:CDBPlayerRefresh_FuncSysPrivilege,
+ #TYPE_Price_Environment:CDBPlayerRefresh_Environment,
+ #TYPE_Price_BTGMPoint:CDBPlayerRefresh_BTGMPoint,
+ #TYPE_Price_GuShenMoney:CDBPlayerRefresh_GuShenMoney,
+ #TYPE_Price_GongdePoint:CDBPlayerRefresh_GongdePoint,
+ #TYPE_Price_FamilyFlagWarPoint:CDBPlayerRefresh_FamilyFlagWarPoint,
+ #TYPE_Price_GatherSoul:CDBPlayerRefresh_GatherSoul,
+ #TYPE_Price_TiandaoFruit:CDBPlayerRefresh_TiandaoFruit,
+ #TYPE_Price_XianyuanScore:CDBPlayerRefresh_XianyuanScore,
+ #TYPE_Price_HuanjinggeScore:CDBPlayerRefresh_HuanjinggeScore,
}
# 支持负值的货币及对应0418刷新类型
@@ -808,6 +805,7 @@
GameFuncID_Shop = 16 # 商城，坊市
GameFuncID_Arena = 27 # 竞技场
GameFuncID_Horse = 37 # 坐骑
+GameFuncID_Travel = 44 # 游历
# 以下为暂时无用的
GameFuncID_Pet = -1 # 宠物，灵宠 6
--
Gitblit v1.8.0