From c238e45c6695d627bcc776b34f8ff46823c57e71 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 24 十二月 2018 20:40:19 +0800
Subject: [PATCH] 860312 修改数据库账号后缀工具
---
ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index a3cd5d6..af51dfc 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -146,6 +146,7 @@
Def_Notify_WorldKey_InitGameWorldTime = "InitGameWorldTime" #启动服务器时间
Def_Notify_WorldKey_OperationActionInfo = "OperationActionInfo_%s" # 运营活动信息，参数为运营活动名
Def_Notify_WorldKey_DailyActionState = "DailyActionState_%s" # 日常活动状态，参数为日常活动ID
+Def_Notify_WorldKey_CrossDailyActionState = "CrossDailyActionState_%s" # 跨服日常活动状态，参数为日常活动ID
Def_Notify_WorldKey_FBEnterTimeLimiitMapID = "FBEnterTimeLimiitMapID" # 进入副本有时间限制的地图ID列表
Def_Notify_WorldKey_FBCanEnter = "FBCanEnter_%s" # 副本是否可进入，参数为副本DataMapID
Def_Notify_WorldKey_FBFuncState = "FBFuncState_%s" # 副本状态，参数为副本DataMapID
@@ -167,6 +168,10 @@
Def_Notify_WorldKey_FamilyPartyInfo = "FamilyPartyInfo" # 仙盟宴会数据
Def_Notify_WorldKey_MergeBoss = "Merge_Boss" # 跨服boss
+
+Def_Notify_WorldKey_CrossPKZoneID = "CrossPKZoneID" # 本服跨服PK所属赛区
+Def_Notify_WorldKey_CrossPKSeasonID = "CrossPKSeasonID" # 本服跨服PK当前赛季
+Def_Notify_WorldKey_CrossPKSeasonState = "CrossPKSeasonState" # 本服跨服PK赛季状态 0-关闭，1-开启中
Def_Notify_WorldKey_Merge_PK = "Merge_PK" # 跨服PK, 仅跨服服务器有用，做为触发PKState用
Def_Notify_WorldKey_MergePKState = "MergePK_State" # 由跨服服务器控制的跨服PK活动状态
@@ -313,7 +318,8 @@
Def_mitDogzEquipPlus, # 神兽装备强化
Def_mitRuneCompound, # 符印合成
Def_mitGatherSoulCompound,# 聚魂合成
-) = range(1, 24)
+ Def_mitGatherSoulDecompose,# 聚魂分解
+) = range(1, 25)
#---写死的技能ID---
Def_SkillID_AutoTruck = 62220 # 自动运镖buff
@@ -1193,6 +1199,25 @@
CampType_Evil, #邪恶(与 Def_ID2Win 一致)
] = range(3)
+# 跨服服务器发送子服信息定义
+CrossServerMsg_ExitCrossServer = "ExitCrossServer" # 退出跨服服务器
+CrossServerMsg_Notify = "Notify" # 提示信息
+CrossServerMsg_PKMatchReqRet = "PKMatchReqRet" # 跨服PK匹配请求结果
+CrossServerMsg_PKMatchResult = "PKMatchResult" # 跨服PK匹配结果
+CrossServerMsg_PKReadyOKRoomList = "PKReadyOKRoomList" # 跨服PK已准备好的房间列表
+CrossServerMsg_PKTimeoutRoomList = "PKTimeoutRoomList" # 跨服PK已超时的房间列表
+CrossServerMsg_PKOverInfo = "PKOverInfo" # 跨服PK结果
+CrossServerMsg_PKSeasonInfo = "PKSeasonInfo" # 跨服PK赛季信息
+CrossServerMsg_PKSyncBillboard = "PKSyncBillboard" # 跨服PK同步排行榜
+
+# 子服发送跨服信息定义
+ClientServerMsg_ServerInitOK = "ServerInitOK" # 子服启动成功
+ClientServerMsg_GMCMD = "GMCMD" # GM命令
+ClientServerMsg_PKMatch = "PKMatch" # 跨服PK匹配
+ClientServerMsg_PKCancel = "PKCancel" # 跨服PK取消匹配
+ClientServerMsg_PKPrepareOK = "PKPrepareOK" # 跨服PK准备完毕
+ClientServerMsg_PKBillboard = "PKBillboard" # 跨服PK排行榜
+
#跨服匹配PK奖励类型
Def_MergePKAwardTypeList = (
Def_MergePKAward_DayPKCnt, # 0 每日挑战次数奖励
@@ -1517,7 +1542,8 @@
DailyActionID_KillNPC, # 野外怪物
DailyActionID_IceLode, # 冰晶矿脉
DailyActionID_HelpBattleCheckIn, # 助战登记 20
-) = range(1, 20 + 1)
+DailyActionID_CrossReamPK, # 跨服PK 21
+) = range(1, 21 + 1)
--
Gitblit v1.8.0