diff --git a/bin/adminserver/config/game_switch.json b/bin/adminserver/config/game_switch.json index 9cd3b08d..681c83c7 100644 --- a/bin/adminserver/config/game_switch.json +++ b/bin/adminserver/config/game_switch.json @@ -103,6 +103,10 @@ "switch_name": "ui.activationCode", "switch_desc": "26-激活码是否显示" }, + { + "switch_name": "circuitMatch", + "switch_desc": "27-巡回赛" + }, { "switch_name": "only.allowed.superWhiteList", "switch_desc": "100-只允许至尊白名单用户登录登录" diff --git a/server/matchserver/proto/cs_msgid.proto b/server/matchserver/proto/cs_msgid.proto index 076d9e08..52249874 100644 --- a/server/matchserver/proto/cs_msgid.proto +++ b/server/matchserver/proto/cs_msgid.proto @@ -46,4 +46,5 @@ enum SMMessageId_e _SMTeamStateNotify = 1002; _SMTeamDisbandNotify = 1003; _SMTeamKickoutNotify = 1004; + _SMPushLastBattleInfo = 1005; } diff --git a/server/matchserver/proto/cs_proto.proto b/server/matchserver/proto/cs_proto.proto index d1840a87..e8077e24 100644 --- a/server/matchserver/proto/cs_proto.proto +++ b/server/matchserver/proto/cs_proto.proto @@ -151,6 +151,15 @@ message MFTeam optional int32 mode_id = 5; //地图mapMode表.id } +//最后一次战斗信息 +message MFLastBattleInfo +{ + optional int32 map_id = 1; //地图id + optional int32 mode_id = 2; //地图mapMode表.id + optional int32 start_time = 3; //开始时间 + optional int32 interval_time = 6; //间隔时间(单位秒,<=0无间隔) +} + //登录 message CMLogin { @@ -359,3 +368,9 @@ message SMTeamKickoutNotify { optional string account_id = 1; //账号id } + +//最后一次战斗信息 +message SMPushLastBattleInfo +{ + repeated MFLastBattleInfo battle_list = 1; //战斗信息 +} diff --git a/third_party/contracts-imtbl b/third_party/contracts-imtbl index be8947b3..c1e8c549 160000 --- a/third_party/contracts-imtbl +++ b/third_party/contracts-imtbl @@ -1 +1 @@ -Subproject commit be8947b33a3299b0bf1f666693a0c62ea82fcd31 +Subproject commit c1e8c549e2fe844e6c0306696ef1c8696ce76c50 diff --git a/third_party/f5 b/third_party/f5 index e6b6ca73..fe1b7e21 160000 --- a/third_party/f5 +++ b/third_party/f5 @@ -1 +1 @@ -Subproject commit e6b6ca73a1ad43c8950d037e9ac5de08d8e05f5c +Subproject commit fe1b7e21eb37d5494ccf32347ff368a1f011ac02