From 94c9b0759bfa49e66bfce3f790c40f15d362ba1a Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 10 一月 2019 15:17:26 +0800
Subject: [PATCH] 5722 【后端】【1.5】跨服BOSS开发(支持跨服复活)

---
 ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
index 7412440..417935e 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChConfig.py
@@ -371,7 +371,7 @@
 Def_WorldKey_BossIsGeTui = "BossGeTui%s"                     #当前复活通知
 Def_WorldKey_OperationActionState = "OperationActState_%s"   #运营活动状态,参数为运营活动名
 Def_WorldKey_BossRebornNeedPoint = "BossRebornNeedPoint"     #boss复活需要总点数
-Def_WorldKey_BossIsAlive = 'BossIsAlive_%s'                  #boss是否活着
+Def_WorldKey_CrossBossIsAlive = 'CrossBossIsAlive_%s_%s'     #跨服boss是否活着,参数(zoneID, bossID)
 Def_WorldKey_IsGameWorldInit = 'IsGameWorldInit'             #GameWold是否初始化完成
 Def_WorldKey_CrossPKZoneSeasonID = "CrossPKZoneSeasonID_%s"  #跨服PK赛区对应赛季,跨服服务器控制,参数(zoneID)
 Def_WorldKey_CrossPKZoneSeasonState = "CrossPKZoneSeasonState_%s" #跨服PK赛区赛季状态,跨服服务器控制,参数(zoneID)0-未开启,1-开启中,2-已结束
@@ -636,9 +636,10 @@
 Def_PlayerKey_IsStopSendDBCommand = "StopSendDBCom"  #是否停止发送数据库操作命令
 Def_PlayerKey_SendDBComTick = "SendDBComTick"  #发送DB命令时间
 
-Def_PlayerKey_MergeRegisterType = "MergeRegisterType"  #当前上传数据的活动类型
+Def_PlayerKey_CrossRegisterMap = "CrossRegisterMap"  #跨服注册活动地图, dataMapID
 Def_PlayerKey_MergeRegisterRoomID = "MergeRegisterRoomID"  #当前上传数据的roomID
 Def_PlayerKey_IsLoginToMergeServer = "IsLoginToMergeServer"  #是否要登陆跨服服务器
+Def_PlayerKey_IsCrossPKMatching = "IsCrossPKMatching"  #是否跨服匹配中
 
 Def_PlayerKey_FreshmanGuiderDay = "FreshmanGuiderDay"  #新手指导员天数
 
@@ -679,6 +680,16 @@
 Def_FBMapID_ChaosDemon = 31180
 #娲皇遗迹
 Def_FBMapID_QueenRelics = 51010
+#跨服竞技场
+Def_FBMapID_CrossRealmPK = 32010
+#跨服蓬莱仙境
+Def_FBMapID_CrossPenglai = 32020
+
+#跨服地图
+Def_CrossMapIDList = [Def_FBMapID_CrossRealmPK, Def_FBMapID_CrossPenglai]
+#跨服对应分区配置表名
+Def_CrossZoneTableName = {Def_FBMapID_CrossPenglai:"CrossPenglaiZone",
+                          }
 
 #同系职业枚举
 JOB_TYPY_COUNT = 5

--
Gitblit v1.8.0