From 3b71c90a4da1420fdc48f323617874fe783c93f2 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 23 九月 2022 14:34:47 +0800
Subject: [PATCH] 9701 【后端】【越南】【BT7】【主干】跨服竞技64位排位赛（冲突）
---
ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py | 69 +++++++++++++++++++++++++++++++---
1 files changed, 63 insertions(+), 6 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index be85ba3..c1324ff 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -187,6 +187,46 @@
Def_Notify_WorldKey_CrossBattlefieldCallTeamInfo = "CrossBattlefieldCallTeamInfo" # 跨服战场召集队伍信息
+CrossChampionshipState_Guess8 = 80 #8强竞猜
+CrossChampionshipState_Group64 = 641 #64强分组
+CrossChampionshipState_Enter64 = 642 #64强进场
+CrossChampionshipState_Fight64 = 643 #64强战斗
+CrossChampionshipState_Group32 = 321 #32强分组
+CrossChampionshipState_Enter32 = 322 #32强进场
+CrossChampionshipState_Fight32 = 323 #32强战斗
+CrossChampionshipState_Group16 = 161 #16强分组
+CrossChampionshipState_Enter16 = 162 #16强进场
+CrossChampionshipState_Fight16 = 163 #16强战斗
+CrossChampionshipState_Guess4 = 40 #4强竞猜
+CrossChampionshipState_Group8 = 81 #8强分组
+CrossChampionshipState_Enter8 = 82 #8强进场
+CrossChampionshipState_Fight8 = 83 #8强战斗
+CrossChampionshipState_GroupSemi = 41 #半决赛分组
+CrossChampionshipState_EnterSemi = 42 #半决赛进场
+CrossChampionshipState_FightSemi = 43 #半决赛战斗
+CrossChampionshipState_GroupFinal = 21 #决赛分组
+CrossChampionshipState_EnterFinal = 22 #决赛进场
+CrossChampionshipState_FightFinal = 23 #决赛战斗
+#跨服排位争霸赛状态流程列表，必须按顺序，中间不可跳过步骤
+CrossChampionshipStateList = [CrossChampionshipState_Guess8,
+ CrossChampionshipState_Group64, CrossChampionshipState_Enter64, CrossChampionshipState_Fight64,
+ CrossChampionshipState_Group32, CrossChampionshipState_Enter32, CrossChampionshipState_Fight32,
+ CrossChampionshipState_Group16, CrossChampionshipState_Enter16, CrossChampionshipState_Fight16,
+ CrossChampionshipState_Guess4,
+ CrossChampionshipState_Group8, CrossChampionshipState_Enter8, CrossChampionshipState_Fight8,
+ CrossChampionshipState_GroupSemi, CrossChampionshipState_EnterSemi, CrossChampionshipState_FightSemi,
+ CrossChampionshipState_GroupFinal, CrossChampionshipState_EnterFinal, CrossChampionshipState_FightFinal
+ ]
+
+#跨服排位可进入战斗的状态信息 {状态:对应分组标识, ...}
+CrossChampionshipEnterStateInfo = {CrossChampionshipState_Enter64:64,
+ CrossChampionshipState_Enter32:32,
+ CrossChampionshipState_Enter16:16,
+ CrossChampionshipState_Enter8:8,
+ CrossChampionshipState_EnterSemi:4,
+ CrossChampionshipState_EnterFinal:2,
+ }
+
Def_Notify_WorldKey_GameWorldBossRebornCross = 'BossRebornCross_%s_%s' # 跨服世界boss重生, 参数为（zoneID, bossID）
Def_Notify_WorldKey_GameWorldBossReborn = 'BossReborn_%s' # 世界boss重生, 参数为（bossID）
Def_Notify_WorldKey_BossKilledCnt = 'BossKilledCnt_%s' # boss击杀次数, 参数为NPCID
@@ -997,7 +1037,8 @@
CDBPlayerRefresh_CharmLV, # 魅力等级 239
CDBPlayerRefresh_BTGMPoint, # BT版GM令 240
CDBPlayerRefresh_GuShenMoney, # 古神币 241
-) = range(146, 242)
+CDBPlayerRefresh_GongdePoint, # 功德点 242
+) = range(146, 243)
TYPE_Price_Gold_Paper_Money = 5 # 金钱类型，（先用礼券，再用金子）
TYPE_Price_Family_Contribution = 6 # 战盟贡献度（活跃度转换得来）
@@ -1020,6 +1061,7 @@
TYPE_Price_Environment = 32 # 环保值
TYPE_Price_BTGMPoint = 33 # BT版GM令
TYPE_Price_GuShenMoney = 34 # 古神币
+TYPE_Price_GongdePoint = 35 # 功德点
#以下是旧的金钱类型
TYPE_Price_Magic_Integral = 101 # 魔方寻宝积分
@@ -1047,6 +1089,7 @@
TYPE_Price_Environment:CDBPlayerRefresh_Environment,
TYPE_Price_BTGMPoint:CDBPlayerRefresh_BTGMPoint,
TYPE_Price_GuShenMoney:CDBPlayerRefresh_GuShenMoney,
+ TYPE_Price_GongdePoint:CDBPlayerRefresh_GongdePoint,
}
# 支持负值的货币及对应0418刷新类型
@@ -1201,11 +1244,11 @@
Def_UniversalGameRecType_BossInfo, # boss信息29
Def_UniversalGameRecType_CrossBossInfo, # 跨服boss信息 30
Def_UniversalGameRecType_BossFirstKill, # boss首杀 31
- Def_UniversalGameRecType_32,
- Def_UniversalGameRecType_33,
- Def_UniversalGameRecType_34,
- Def_UniversalGameRecType_35,
- Def_UniversalGameRecType_36,
+ Def_UniversalGameRecType_CrossCollect, # 跨服采集记录信息 32
+ Def_UniversalGameRecType_CrossChampionshipGroup, # 跨服排位争霸赛分组信息 33
+ Def_UniversalGameRecType_CrossChampionshipGuess, # 跨服排位争霸赛竞猜记录信息 34
+ Def_UniversalGameRecType_CrossChampionshipOfficial, # 跨服排位争霸赛最终排名官职信息 35
+ Def_UniversalGameRecType_CrossChampionshipOffChallenge, # 跨服排位争霸赛官职挑战信息 36
Def_UniversalGameRecType_37,
Def_UniversalGameRecType_38,
Def_UniversalGameRecType_39,
@@ -1381,6 +1424,7 @@
CrossServerMsg_NPCInfoRet = "NPCInfoRet" # 跨服地图NPC信息
CrossServerMsg_CollectNPCOK = "CollectNPCOK" # 采集NPC完成
CrossServerMsg_EnterFBRet = "EnterFBRet" # 请求进入跨服副本返回信息
+CrossServerMsg_EnterVSRoomRet = "EnterVSRoomRet" # 请求进入跨服PK房间副本返回信息
CrossServerMsg_FBEnd = "FBEnd" # 完成跨服副本
CrossServerMsg_NPCAttackCount = "NPCAttackCount" # 攻击NPC次数记录
CrossServerMsg_SendMail = "SendMail" # 发送邮件，已知玩家目标服务器，主动发送
@@ -1397,6 +1441,12 @@
CrossServerMsg_DebugAnswer = "DebugAnswer" # DebugAnswer
CrossServerMsg_ActDropSpecItem = "ActDropSpecItem" # 特殊掉落验证返回
CrossServerMsg_CrossAssist = "CrossAssist" # 跨服协助
+CrossServerMsg_ChampionshipState = "ChampionshipState" # 跨服排位争霸赛状态信息
+CrossServerMsg_ChampionshipPlayer = "ChampionshipPlayer"# 跨服排位争霸赛参赛玩家信息
+CrossServerMsg_ChampionshipGroup = "ChampionshipGroup" # 跨服排位争霸赛分组信息
+CrossServerMsg_ChampionshipGuess = "ChampionshipGuess" # 跨服排位争霸赛竞猜信息
+CrossServerMsg_ChampionshipOfficial = "ChampionshipOfficial" # 跨服排位争霸赛官职信息
+CrossServerMsg_ChampionshipDailyOfficial = "ChampionshipDailyOfficial" # 跨服排位争霸赛每日官职信息
# 子服发送跨服信息定义
ClientServerMsg_ServerInitOK = "ServerInitOK" # 子服启动成功
@@ -1424,6 +1474,13 @@
ClientServerMsg_BattlefieldCallKick = "BattlefieldCallKick" # 跨服战场召集 - 踢出
ClientServerMsg_ActDropSpecItem = "ActDropSpecItem" # 活动特殊掉落
ClientServerMsg_CrossAssist = "CrossAssist" # 跨服协助
+ClientServerMsg_ChampionshipOfficialApply = "ChampionshipOfficialApply" # 跨服排位申请官职
+ClientServerMsg_ChampionshipOfficialApplyReply = "ChampionshipOfficialApplyReply" # 跨服排位官职申请回应
+ClientServerMsg_ChampionshipOfficialKick = "ChampionshipOfficialKick" # 跨服排位辞退下级仙官
+ClientServerMsg_ChampionshipOfficialLeave = "ChampionshipOfficialLeave" # 跨服排位主动离任仙官
+ClientServerMsg_ChampionshipOfficialChallenge = "ChampionshipOfficialChallenge" # 跨服排位挑战仙官
+ClientServerMsg_ChampionshipGuess = "ChampionshipGuess" # 跨服排位竞猜
+ClientServerMsg_ChampionshipWorship = "ChampionshipWorship" # 跨服排位膜拜
#跨服广播类型定义
CrossNotify_CrossAct = "CrossAct"
--
Gitblit v1.8.0