From 1ea73e1885835466265ce788d93556b7030ee0e8 Mon Sep 17 00:00:00 2001 From: hxp <ale99527@vip.qq.com> Date: 星期日, 30 十二月 2018 18:42:00 +0800 Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发(GM工具增加子服服务器维护,文字翻译版) --- ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py | 112 ++++++++++++++++++------------------------------------- 1 files changed, 37 insertions(+), 75 deletions(-) diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py index 39eebb9..ab8a4c2 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 @@ -166,20 +167,12 @@ Def_Notify_WorldKey_FamilyPartyInfo = "FamilyPartyInfo" # 仙盟宴会数据 -Def_Notify_WorldKey_MergeBoss = "Merge_Boss" # 跨服boss +Def_Notify_WorldKey_CrossServerConnState = "CrossServerConnState" # 跨服服务器链接状态 +Def_Notify_WorldKey_CrossServerOpen = "CrossServerOpen" # 跨服服务器是否开启中 -Def_Notify_WorldKey_Merge_PK = "Merge_PK" # 跨服PK, 仅跨服服务器有用,做为触发PKState用 -Def_Notify_WorldKey_MergePKState = "MergePK_State" # 由跨服服务器控制的跨服PK活动状态 -Def_Notify_WorldKey_MergePKDayID = "MergePK_DayID" # 跨服PK活动日ID -Def_Notify_WorldKey_MergePKWeekID = "MergePK_WeekID" # 跨服PK活动周ID -Def_Notify_WorldKey_MergePKSeasonID = "MergePK_SeasonID" # 跨服PK活动赛季ID -Def_Notify_WorldKey_MergePKSeasonStartTime = "MergePK_SeasonStartTime" # 跨服PK活动当前赛季开始时间 -Def_Notify_WorldKey_IsSeasonEnd = "MergePK_IsSeasonEnd" # 跨服PK活动当前赛季是否结束 - -Def_Notify_WorldKey_Merge_King = "Merge_King" # 由跨服服务器控制的跨服王者争霸活动状态 -Def_Notify_WorldKey_Merge_KingStartID = "Merge_KingStartID" # 王者争霸开始活动ID, 用于奖励状态重置 -Def_Notify_WorldKey_Merge_KingOverID = "Merge_KingOverID" # 王者争霸结束活动ID, 用于奖励状态重置 -Def_Notify_WorldKey_Merge_KingServerHonour = "Merge_KingServerHonour" # 王者争霸本服荣耀排位 +Def_Notify_WorldKey_CrossPKZoneID = "CrossPKZoneID" # 本服跨服PK所属赛区 +Def_Notify_WorldKey_CrossPKSeasonID = "CrossPKSeasonID" # 本服跨服PK当前赛季 +Def_Notify_WorldKey_CrossPKSeasonState = "CrossPKSeasonState" # 本服跨服PK赛季状态 0-关闭,1-开启中 Def_Notify_WorldKey_MixServerCampaignSaveData = "MixServerCampaignSaveData_%s" # 合服活动记录数据时机0-否 1-是 Def_Notify_WorldKey_MixServerCampaignGetAward = "MixServerCampaignGetAward_%s" # 合服活动可领奖时机0-否 1-是 @@ -585,11 +578,9 @@ Def_BT_CostTeHui, #消费特惠排行榜 Def_BT_CostTeHuiLast, #消费特惠排行榜上一期 - Def_BT_MergePKDay, #跨服PK日积分榜 - Def_BT_MergePKWeek, #跨服PK周积分榜 Def_BT_Max, #排行榜最大类型 -) = range(0, 34 + 2) +) = range(0, 32 + 2) #职业对应战力排行榜类型 JobFightPowerBillboardDict = { @@ -791,7 +782,8 @@ CDBPlayerRefresh_SoulDust, # 魂尘 196 CDBPlayerRefresh_SoulSplinters, # 聚魂碎片 197 CDBPlayerRefresh_SoulCore, # 核心环 198 -) = range(146, 199) +CDBPlayerRefresh_Honor, # 荣誉 199 +) = range(146, 200) TYPE_Price_Gold_Paper_Money = 5 # 金钱类型,(先用礼券,再用金子) TYPE_Price_Family_Contribution = 6 # 战盟贡献度(活跃度转换得来) @@ -801,6 +793,7 @@ TYPE_Price_FamilyActivity = 15 # 仙盟活跃令 TYPE_Price_FBHelpPoint = 16 # 副本助战积分, 废弃 TYPE_Price_XianyuanCoin = 17 # 仙缘币 +TYPE_Price_Honor = 18 # 荣誉 TYPE_Price_Rune = 23 # 符印精华点 TYPE_Price_RuneSplinters = 24 # 符印碎片 TYPE_Price_TreasureScore = 25 # 寻宝积分 @@ -816,7 +809,6 @@ TYPE_Price_HighLadder_Currency = 102 # 天梯竞技场积分 TYPE_Price_HighLadder_Signet = 103 # 物品兑换(圣光晶石) TYPE_Price_GongXun = 105 # 功勋点 -TYPE_Price_Honor = 108 # 荣誉商店积分 TYPE_Price_ArrestPoint = 110 # 悬赏积分 # 物品兑换 @@ -839,6 +831,7 @@ TYPE_Price_SoulDust:CDBPlayerRefresh_SoulDust, TYPE_Price_SoulSplinters:CDBPlayerRefresh_SoulSplinters, TYPE_Price_SoulCore:CDBPlayerRefresh_SoulCore, + TYPE_Price_Honor:CDBPlayerRefresh_Honor, } # 高效战斗状态 @@ -962,7 +955,7 @@ Def_UniversalGameRecType_FBHelpBattleCheckInPlayer, #助战玩家登记记录9 Def_UniversalGameRecType_FBHelpBattleRecord, #助战未同步记录10 Def_UniversalGameRecType_11, - Def_UniversalGameRecType_MergeRegister, # 上传数据报名信息12 + Def_UniversalGameRecType_12, Def_UniversalGameRecType_13, Def_UniversalGameRecType_Reward, # 通用奖励表(TopBar)14 Def_UniversalGameRecType_15, @@ -993,15 +986,15 @@ Def_UniversalGameRecType_40, Def_UniversalGameRecType_RedPacketRecord, # 红包产出结果记录41 Def_UniversalGameRecType_42, - Def_UniversalGameRecType_MergeEvent, # 跨服玩家数据变更事件信息43 - Def_UniversalGameRecType_MergePKAwardRecord, # 跨服PK奖励领取记录44 - Def_UniversalGameRecType_MergePKTopPlayerEquip, # 跨服PK赛高手玩家装备预览信息45 - Def_UniversalGameRecType_MergePKScoreAward, # 跨服PK积分领奖记录46 - Def_UniversalGameRecType_MergeKingBattleRecord, # 跨服王者争霸对战信息47 - Def_UniversalGameRecType_MergeKingBattleRecordLast, # 跨服王者争霸上一期对战信息48 - Def_UniversalGameRecType_MergeKingSupportRecord, # 跨服王者争霸支持押注信息49 - Def_UniversalGameRecType_MergeKingTopPlayerEquip, # 跨服王者争霸高手玩家装备预览信息50 - Def_UniversalGameRecType_MergePKUnNotifyOver, # 跨服PK未同步的PK结果51 + Def_UniversalGameRecType_43, + Def_UniversalGameRecType_44, + Def_UniversalGameRecType_45, + Def_UniversalGameRecType_46, + Def_UniversalGameRecType_47, + Def_UniversalGameRecType_48, + Def_UniversalGameRecType_49, + Def_UniversalGameRecType_50, + Def_UniversalGameRecType_51, Def_UniversalGameRecType_52, Def_UniversalGameRecType_53, Def_UniversalGameRecType_54, @@ -1028,13 +1021,10 @@ # 客户端不可查看的自定义表类型 Def_Confidential_UniversalRecList = ( - Def_UniversalGameRecType_MergeRegister, # 上传数据报名信息12 Def_UniversalGameRecType_FamilyWarMember, # 盟联赛参赛人员记录70 ) # 只同步自身数据的类型 {类型:自身数据最大条数, ...} , 自身数据最大条数-1时代表自身全部数据; 这里的数据Value1固定为playerID Def_Sync_UniversalRecSelfDict = { - Def_UniversalGameRecType_MergePKAwardRecord:1, - Def_UniversalGameRecType_MergeKingSupportRecord:-1, } #家族行为类型 在GameServer.ChConfig.ActionTypeSaveCnt 中配置最高存储条数 @@ -1195,60 +1185,31 @@ ] = range(3) # 跨服服务器发送子服信息定义 +CrossServerMsg_CrossServerState = "CrossServerState" # 跨服服务器状态变更 CrossServerMsg_ExitCrossServer = "ExitCrossServer" # 退出跨服服务器 CrossServerMsg_Notify = "Notify" # 提示信息 +CrossServerMsg_ViewPlayerCacheRet = "ViewPlayerCacheRet"# 查看跨服玩家信息结果 CrossServerMsg_PKMatchReqRet = "PKMatchReqRet" # 跨服PK匹配请求结果 CrossServerMsg_PKMatchResult = "PKMatchResult" # 跨服PK匹配结果 -CrossServerMsg_PKReadyOKRoomList = "PKMatchResult" # 跨服PK已准备好的房间列表 +CrossServerMsg_PKReadyOKRoomList = "PKReadyOKRoomList" # 跨服PK已准备好的房间列表 CrossServerMsg_PKTimeoutRoomList = "PKTimeoutRoomList" # 跨服PK已超时的房间列表 CrossServerMsg_PKOverInfo = "PKOverInfo" # 跨服PK结果 CrossServerMsg_PKSeasonInfo = "PKSeasonInfo" # 跨服PK赛季信息 CrossServerMsg_PKSyncBillboard = "PKSyncBillboard" # 跨服PK同步排行榜 -CrossServerMsg_PKActionState = "PKActionState" # 跨服PK活动状态变更 # 子服发送跨服信息定义 ClientServerMsg_ServerInitOK = "ServerInitOK" # 子服启动成功 ClientServerMsg_GMCMD = "GMCMD" # GM命令 +ClientServerMsg_ViewPlayerCache = "ViewPlayerCache" # 查看跨服玩家信息 ClientServerMsg_PKMatch = "PKMatch" # 跨服PK匹配 ClientServerMsg_PKCancel = "PKCancel" # 跨服PK取消匹配 ClientServerMsg_PKPrepareOK = "PKPrepareOK" # 跨服PK准备完毕 - -#跨服匹配PK奖励类型 -Def_MergePKAwardTypeList = ( -Def_MergePKAward_DayPKCnt, # 0 每日挑战次数奖励 -Def_MergePKAward_DayWinCnt, # 1 每日胜利次数奖励 -Def_MergePKAward_SeasonGrade, # 2 赛季晋级奖励 -Def_MergePKAward_SeasonRank, # 3 赛季排名奖励 -Def_MergePKAward_FirstWinCnt, # 4 首次胜利次数奖励 -) = range(5) - -#跨服战战斗状态 -( -Def_NotBegin, #还没开始 -Def_ID1Win, #第一个玩家胜利(与CampType_Justice一致) -Def_ID2Win, #第二个玩家胜利(与CampType_Evil一致) -Def_Battling, #正在战斗中 -Def_BattleReady, #押注中 -) = range(5) - -# 跨服赛(跨服服务器)上传数据状态 -( -Def_MergeRegisterState_None, #空闲 -Def_MergeRegisterState_Start, #开始上传 -Def_MergeRegisterState_Err, # 上传出错 -Def_MergeRegisterState_Success, #上传成功 -Def_MergeRegisterState_Request, #请求跨服, 比开始上传还早的一步,先通过请求,才开始上传 -) = range(5) +ClientServerMsg_PKBillboard = "PKBillboard" # 跨服PK排行榜 # 跨服活动类型 ( -Def_MergeAction_MergeWar, # 万国战 -Def_MergeAction_WarOfHonour, # 荣耀之战(跨服混战) -Def_MergeAction_Boss, # 跨服boss -Def_MergeAction_MergePK, # 跨服匹配PK -Def_MergeAction_MergeKing, # 跨服王者争霸 -Def_MergeAction_TypeMax, # 类型数 -) = range(6) +Def_CrossAction_PK, # 跨服匹配PK +) = range(1) #角色改名结果 ( @@ -1340,9 +1301,7 @@ ScoreType_NewGuySuperShow, # 击杀怪物统计 ScoreType_GetItem, # 获得物品奖励统计 ScoreType_RedFortReward, # 打开客户端frmRedFortReward -ScoreType_MergeBoss, # 跨服boss界面 -ScoreType_MergePK, # 跨服匹配PK结算 -)=range(7) +)=range(5) ScoreTypeName = "TScore" @@ -1361,7 +1320,7 @@ )=range(5) # 战斗力模块类型 -Def_MFPType_Max = 26 +Def_MFPType_Max = 27 ModuleFightPowerTypeList = ( Def_MFPType_Role, # 角色 0 Def_MFPType_Equip, # 装备(基本装备位) 1 @@ -1386,6 +1345,7 @@ Def_MFPType_MagicWeaponSoul, # 法宝之魂 20 Def_MFPType_Dogz, # 神兽 21 Def_MFPType_GatherSoul, # 聚魂 22 +Def_MFPType_MagicWeapon4, # 王者法宝 23 Def_MFPType_Other, # 其他 #以下暂时没用到,改时再处理 @@ -1537,7 +1497,8 @@ DailyActionID_KillNPC, # 野外怪物 DailyActionID_IceLode, # 冰晶矿脉 DailyActionID_HelpBattleCheckIn, # 助战登记 20 -) = range(1, 20 + 1) +DailyActionID_CrossReamPK, # 跨服PK 21 +) = range(1, 21 + 1) @@ -1675,8 +1636,8 @@ SuccType_DogzBattle, #x神兽出战129 SuccType_DogzEquipPlus, #出战神兽装备总强化X级130 SuccType_Collect, #采集X物品X次131 -SuccType_InlayGatherSoul, #镶嵌X枚X品质聚魂(不包含核心)44 -SuccType_GatherSoulLvUp, #累计聚魂总等级XX(不包含核心)45 +SuccType_InlayGatherSoul, #镶嵌X枚X品质聚魂(不包含核心)132 +SuccType_GatherSoulLvUp, #累计聚魂总等级XX(不包含核心)133 ) = range(1, 134) @@ -1771,9 +1732,10 @@ EntFBAskRet_InFB, # 11 副本中 EntFBAskRet_TJG, # 12 脱机挂中 EntFBAskRet_Sit, # 13 打坐中 + EntFBAskRet_CrossPKMatching,# 14 跨服匹配中 EntFBAskRet_Other, # xx 其他限制 EntFBAskRet_Max, -) = range(16) +) = range(17) #增加仙盟活跃的活动类型 -- Gitblit v1.8.0