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/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py |   19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index df25ba9..f7e8220 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -2855,14 +2855,12 @@
 Def_RebornPos_Area_Range = 3
 
 #复活类型(需要和C++统一)
-RebornTypeCount = 8
+RebornTypeCount = 6
 Def_RebornTypeList = [ 
-rebornType_City,          #回城虚弱复活
-rebornType_Skill,         #技能复活
-rebornType_Health,        #原地健康复活
-rebornType_UseItem,       #使用还阳咒复活
-rebornType_FBGold,        #副本元宝复活
-rebornType_FBUseItem,     #副本使用道具复活
+rebornType_City,          #回城虚弱复活 0
+rebornType_Skill,         #技能复活 1
+rebornType_Health,        #原地健康复活 2
+rebornType_UseItem,       #使用道具复活 3
 rebornType_MainCity,      #回主城复活
 rebornType_System,        #系统复活
 ] = range(0, RebornTypeCount)
@@ -3228,9 +3226,6 @@
 Def_PlayerKey_CalcAddAttrType = "CalcAType_%s_%s_%s"   # 刷属性类型, 参数[funcIndex, attrIndex, 缓存编号]
 Def_PlayerKey_CalcAddAttrValue = "CalcAValue_%s_%s_%s"   # 刷属性值, 参数[funcIndex, attrIndex, 缓存编号]
 
-Def_PlayerKey_CrossRegisterType = "CrossRegisterType"  #跨服注册活动类型
-Def_PlayerKey_IsCrossPKMatching = "IsCrossPKMatching"  #是否跨服匹配中
-
 Def_PDict_QueryTechLVUPState = "QueryTechLVUPState"  # 查询科技等级提升状态
 
 Def_PDict_PKStateTick = "PKStateTick"  # PK状态tick,只要有一方发起攻击,双方均进入PK状态
@@ -3332,6 +3327,9 @@
 Def_Player_Dict_FromPosY = 'FromPosY'    # 最后一次离开的非中立常规地图,坐标X
 Def_Player_Dict_FromLineID = 'FromLineID'    # 最后一次离开的非中立常规地图,线路ID
 
+Def_PlayerKey_CrossRegisterMap = "CrossRegisterMap"  #跨服注册活动地图, dataMapID
+Def_PlayerKey_CrossMapID = "CrossMapID"  #玩家所在跨服地图ID
+Def_PlayerKey_IsCrossPKMatching = "IsCrossPKMatching"  #是否跨服匹配中
 
 Def_Player_Dict_FamilyTechLV = "FamilyTechLV_%s"    #家族科技等级, 参数(科技ID)
 Def_Player_Dict_RouteServerInitOK = "RouteServerInitOK_33"     #RouteServer初始化成功(仅登陆一次)
@@ -3405,7 +3403,6 @@
 Def_Player_Dict_SignDayCnt = "SignDayCnt_151"  # 签到次数
 Def_Player_Dict_ForbidFamilyAction = 'ForbidFamilyAction_168'  # 玩家是否能参加家族活动
 Def_Player_Dict_ForbidFamilyAward = "ForbidFamilyAward" # 当日家族相关活动是否领奖受限, 按位存储
-Def_Player_Dict_RoomID = 'RoomID_184'  # 房间ID
 Def_Player_Dict_HasApplyVIPClub = 'HasApplyVIPClub_185'  # 是否申请过贵宾俱乐部
 Def_Player_Dict_HasVIPClubNote = 'HasVIPClubNote_186'  # 是否提示过vip升级可加入贵宾俱乐部信息
 Def_Player_Dict_PyPlayerAction = 'PyPlayerAction_187'  # py自定义玩家状态

--
Gitblit v1.8.0