From 015bda0f16e211353534cbdcc95df92590dba881 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 24 十二月 2018 10:14:48 +0800
Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发(封包、赛区赛季表)

---
 ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 196d5c2..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活动状态
@@ -1204,7 +1209,6 @@
 CrossServerMsg_PKOverInfo = "PKOverInfo"                # 跨服PK结果
 CrossServerMsg_PKSeasonInfo = "PKSeasonInfo"            # 跨服PK赛季信息
 CrossServerMsg_PKSyncBillboard = "PKSyncBillboard"      # 跨服PK同步排行榜 
-CrossServerMsg_PKActionState = "PKActionState"          # 跨服PK活动状态变更
 
 # 子服发送跨服信息定义
 ClientServerMsg_ServerInitOK = "ServerInitOK"           # 子服启动成功
@@ -1212,6 +1216,7 @@
 ClientServerMsg_PKMatch = "PKMatch"                     # 跨服PK匹配
 ClientServerMsg_PKCancel = "PKCancel"                   # 跨服PK取消匹配
 ClientServerMsg_PKPrepareOK = "PKPrepareOK"             # 跨服PK准备完毕
+ClientServerMsg_PKBillboard = "PKBillboard"             # 跨服PK排行榜
 
 #跨服匹配PK奖励类型
 Def_MergePKAwardTypeList = (
@@ -1537,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