From 9c07d43b09ecb5a8fcb0de5e47768047c45dbabe Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 15 Aug 2024 16:14:15 +0800
Subject: [PATCH] 1

---
 server/robotserver/android_agent.cc |  6 ------
 server/robotserver/handlermgr.cc    |  3 ---
 server/robotserver/player.cc        | 15 ---------------
 server/robotserver/player.h         |  3 ---
 4 files changed, 27 deletions(-)

diff --git a/server/robotserver/android_agent.cc b/server/robotserver/android_agent.cc
index 864740eb..498e676f 100644
--- a/server/robotserver/android_agent.cc
+++ b/server/robotserver/android_agent.cc
@@ -198,13 +198,7 @@ behaviac::EBTStatus AndroidAgent::CoJoin()
     msg.set_server_id(6);
     msg.set_team_uuid("");
     msg.set_account_id(owner_->GetAccountId());
-    msg.set_team_mode(2);
     msg.set_proto_version(cs::ProtoVersion);
-    msg.set_auto_fill(1);
-    msg.set_name("");
-    msg.set_avatar_url("");
-    msg.set_mapid(2001);
-    msg.set_hero_id(30800);
     //weapons
     msg.set_session_id(owner_->GetSessionId());
     owner_->SendMsg(msg);
diff --git a/server/robotserver/handlermgr.cc b/server/robotserver/handlermgr.cc
index 4f04778d..424fb602 100644
--- a/server/robotserver/handlermgr.cc
+++ b/server/robotserver/handlermgr.cc
@@ -58,7 +58,6 @@ void HandlerMgr::RegisterNetMsgHandlers()
     RegisterNetMsgHandler(&gsmsghandler, &Player::_SMReconnect);
     RegisterNetMsgHandler(&gsmsghandler, &Player::_SMWatchWar);
     RegisterNetMsgHandler(&gsmsghandler, &Player::_SMLeave);
-    RegisterNetMsgHandler(&gsmsghandler, &Player::_SMMatchCancel);
     RegisterNetMsgHandler(&gsmsghandler, &Player::_SMJoinedNotify);
     RegisterNetMsgHandler(&gsmsghandler, &Player::_SMMapInfo);
     RegisterNetMsgHandler(&gsmsghandler, &Player::_SMUpdate);
@@ -72,9 +71,7 @@ void HandlerMgr::RegisterNetMsgHandlers()
     RegisterNetMsgHandler(&gsmsghandler, &Player::_SMSysPiaoMsg);
     RegisterNetMsgHandler(&gsmsghandler, &Player::_SMShowCountdown);
     RegisterNetMsgHandler(&gsmsghandler, &Player::_SMShowTeamUI);
-    RegisterNetMsgHandler(&gsmsghandler, &Player::_SMUpdateMatchInfo);
     RegisterNetMsgHandler(&gsmsghandler, &Player::_SMGetItemNotify);
-    RegisterNetMsgHandler(&gsmsghandler, &Player::_SMMatchMemberMsgNotify);
     RegisterNetMsgHandler(&gsmsghandler, &Player::_SMPvePassWave);
     RegisterNetMsgHandler(&gsmsghandler, &Player::_SMTeamMarkTargetPosList);
     RegisterNetMsgHandler(&gsmsghandler, &Player::_SMDebugCmd);
diff --git a/server/robotserver/player.cc b/server/robotserver/player.cc
index adbf60e3..97ecb275 100644
--- a/server/robotserver/player.cc
+++ b/server/robotserver/player.cc
@@ -134,11 +134,6 @@ void Player::_SMLeave(f8::MsgHdr* hdr, const cs::SMLeave& msg)
     f8::UdpLog::Instance()->Info("%s %s", {msg.GetTypeName(), f8::PbToJson(&msg)});
 }
 
-void Player::_SMMatchCancel(f8::MsgHdr* hdr, const cs::SMMatchCancel& msg)
-{
-    f8::UdpLog::Instance()->Info("%s %s", {msg.GetTypeName(), f8::PbToJson(&msg)});
-}
-
 void Player::_SMJoinedNotify(f8::MsgHdr* hdr, const cs::SMJoinedNotify& msg)
 {
     //f8::UdpLog::Instance()->Info("%s %s", {msg.GetTypeName(), f8::PbToJson(&msg)});
@@ -206,21 +201,11 @@ void Player::_SMShowTeamUI(f8::MsgHdr* hdr, const cs::SMShowTeamUI& msg)
     f8::UdpLog::Instance()->Info("%s %s", {msg.GetTypeName(), f8::PbToJson(&msg)});
 }
 
-void Player::_SMUpdateMatchInfo(f8::MsgHdr* hdr, const cs::SMUpdateMatchInfo& msg)
-{
-    f8::UdpLog::Instance()->Info("%s %s", {msg.GetTypeName(), f8::PbToJson(&msg)});
-}
-
 void Player::_SMGetItemNotify(f8::MsgHdr* hdr, const cs::SMGetItemNotify& msg)
 {
     f8::UdpLog::Instance()->Info("%s %s", {msg.GetTypeName(), f8::PbToJson(&msg)});
 }
 
-void Player::_SMMatchMemberMsgNotify(f8::MsgHdr* hdr, const cs::SMMatchMemberMsgNotify& msg)
-{
-    f8::UdpLog::Instance()->Info("%s %s", {msg.GetTypeName(), f8::PbToJson(&msg)});
-}
-
 void Player::_SMPvePassWave(f8::MsgHdr* hdr, const cs::SMPvePassWave& msg)
 {
     f8::UdpLog::Instance()->Info("%s %s", {msg.GetTypeName(), f8::PbToJson(&msg)});
diff --git a/server/robotserver/player.h b/server/robotserver/player.h
index b260058b..eab6897f 100644
--- a/server/robotserver/player.h
+++ b/server/robotserver/player.h
@@ -45,7 +45,6 @@ public:
     void _SMReconnect(f8::MsgHdr* hdr, const cs::SMReconnect& msg);
     void _SMWatchWar(f8::MsgHdr* hdr, const cs::SMWatchWar& msg);
     void _SMLeave(f8::MsgHdr* hdr, const cs::SMLeave& msg);
-    void _SMMatchCancel(f8::MsgHdr* hdr, const cs::SMMatchCancel& msg);
     void _SMJoinedNotify(f8::MsgHdr* hdr, const cs::SMJoinedNotify& msg);
     void _SMMapInfo(f8::MsgHdr* hdr, const cs::SMMapInfo& msg);
     void _SMUpdate(f8::MsgHdr* hdr, const cs::SMUpdate& msg);
@@ -59,9 +58,7 @@ public:
     void _SMSysPiaoMsg(f8::MsgHdr* hdr, const cs::SMSysPiaoMsg& msg);
     void _SMShowCountdown(f8::MsgHdr* hdr, const cs::SMShowCountdown& msg);
     void _SMShowTeamUI(f8::MsgHdr* hdr, const cs::SMShowTeamUI& msg);
-    void _SMUpdateMatchInfo(f8::MsgHdr* hdr, const cs::SMUpdateMatchInfo& msg);
     void _SMGetItemNotify(f8::MsgHdr* hdr, const cs::SMGetItemNotify& msg);
-    void _SMMatchMemberMsgNotify(f8::MsgHdr* hdr, const cs::SMMatchMemberMsgNotify& msg);
     void _SMPvePassWave(f8::MsgHdr* hdr, const cs::SMPvePassWave& msg);
     void _SMTeamMarkTargetPosList(f8::MsgHdr* hdr, const cs::SMTeamMarkTargetPosList& msg);
     void _SMDebugCmd(f8::MsgHdr* hdr, const cs::SMDebugCmd& msg);