1

server/gameserver/handlermgr.cc

@@ -110,15 +110,6 @@ void HandlerMgr::RegisterNetMsgHandlers()
 
     RegisterNetMsgHandler(&ggmsghandler, &CustomMember::_CMBattlePreSetReady);
 
-    #if 0
-    RegisterNetMsgHandler(&ggmsghandler, &MatchTeam::_CMMatchCancel);
-    RegisterNetMsgHandler(&ggmsghandler, &MatchTeam::_CMMatchChoose);
-    RegisterNetMsgHandler(&ggmsghandler, &MatchTeam::_CMMatchStartGame);
-    RegisterNetMsgHandler(&ggmsghandler, &MatchTeam::_CMMatchCancelStartGame);
-    RegisterNetMsgHandler(&ggmsghandler, &MatchTeam::_CMMatchSendMsg);
-    RegisterNetMsgHandler(&ggmsghandler, &MatchTeam::_CMMatchBroadcastMsg);
-    #endif
-
     RegisterNetMsgHandler(&ggmsghandler, &Player::_CMMove);
     RegisterNetMsgHandler(&ggmsghandler, &Player::_CMImmediateMsg);
     RegisterNetMsgHandler(&ggmsghandler, &Player::_CMExecCommand);

server/tools/protobuild/cs_msgid.proto

@@ -17,12 +17,6 @@ enum CMMessageId_e
     _CMRevive = 210;
     _CMCancelRevive = 211;
     _CMExecCommand = 217;
-    _CMMatchCancel = 218;
-    _CMMatchChoose = 219;
-    _CMMatchStartGame = 220;
-    _CMMatchCancelStartGame = 221;
-    _CMMatchSendMsg = 222;
-    _CMMatchBroadcastMsg = 223;
     _CMRequestBulletDmg = 230;
     _CMStowShield = 231;
     _CMImmediateMsg = 232;
@@ -47,7 +41,6 @@ enum SMMessageId_e
 
     _SMWatchWar = 208;
     _SMLeave = 209;
-    _SMMatchCancel = 218;
     _SMGetSettlementTeamList = 238;
     _SMWatchTarget = 241;
     _SMTeamComamnd = 242;
@@ -66,9 +59,7 @@ enum SMMessageId_e
     _SMSysPiaoMsg = 1014;
     _SMShowCountdown = 1015;
     _SMShowTeamUI = 1016;
-    _SMUpdateMatchInfo = 1017;
     _SMGetItemNotify = 1018;
-    _SMMatchMemberMsgNotify = 1019;
     _SMPvePassWave = 1020;
     _SMTeamMarkTargetPosList = 1021;
     _SMDebugCmd = 1022;

server/tools/protobuild/cs_proto.proto

@@ -1137,27 +1137,6 @@ message MFRichTextElement
     optional MFHeroHeadElement union_obj_3 = 4; //英雄头像元素
 }
 
-message MFMatchTeamMember
-{
-    optional string account_id = 1; //账号id account_id
-    optional string name = 2; //角色名
-    optional string avatar_url = 3; //头像
-    optional int32 hero_id = 4; //英雄id
-    repeated MFWeapon weapons = 5; //武器列表
-    optional bool is_leader = 8; //是否队长
-    optional int32 state = 9; //0:准备 1:已准备
-    optional int32 head_frame = 10; //头像框
-}
-
-//该消息每秒同步
-message MFMatchInfo
-{
-    repeated MFMatchTeamMember members = 1; //成员列表
-    optional int32 phase = 2; //阶段 1:合并队伍(匹配中) 2：选择角色 3:锁定（已准备）
-    optional int32 countdown = 3; //倒计时(单位秒)
-    optional int32 predict_time = 4; //预计时间(单位秒)
-}
-
 //结算奖励项
 message MFOverRewardItem
 {
@@ -1745,46 +1724,6 @@ message CMCancelRevive
 {
 }
 
-//组队匹配-取消
-message CMMatchCancel
-{
-}
-
-//组队匹配-选取英雄
-message CMMatchChoose
-{
-    optional int32 hero_id = 1; //英雄id
-    repeated MFWeapon weapons = 2; //武器列表
-    repeated MFPair skill_list = 4; //技能列表 key:技能id value:预留给之后扩展,目前传0就行
-    optional string hero_uniid = 7; //英雄唯一id
-}
-
-//组队匹配-出击
-message CMMatchStartGame
-{
-}
-
-//组队匹配-出击
-message CMMatchCancelStartGame
-{
-}
-
-//组队匹配-指定成员发送消息
-message CMMatchSendMsg
-{
-    //成员将收到SMMatchMemberMsgNotify消息
-    repeated string target_list = 1; //目标列表,目标收到SMMatchMemberMsgNotify消息
-    optional string content = 2; //消息内容
-}
-
-//组队匹配-队伍内广播消息
-message CMMatchBroadcastMsg
-{
-    //成员将收到SMMatchMemberMsgNotify消息
-    optional int32 exclude_self = 1; //include_self!=0时排除自己
-    optional string content = 2; //消息内容
-}
-
 /*
   请求子弹伤害(追踪型子弹、上报型子弹)
 */
@@ -2046,11 +1985,6 @@ message SMLeave
 {
 }
 
-//取消匹配
-message SMMatchCancel
-{
-}
-
 //断线通知
 message SMDisconnectNotify
 {
@@ -2120,19 +2054,6 @@ message SMShowTeamUI
 {
 }
 
-//更新匹配信息
-message SMUpdateMatchInfo
-{
-    optional MFMatchInfo info = 1; //匹配信息
-}
-
-//匹配-队伍成员消息
-message SMMatchMemberMsgNotify
-{
-    optional string sender = 1; //消息发送者
-    optional string content = 2; //消息内容
-}
-
 //获得物品
 message SMGetItemNotify
 {