diff --git a/server/gameserver/matchmgr.h b/server/gameserver/matchmgr.h
index 13997f5..dc46ca4 100644
--- a/server/gameserver/matchmgr.h
+++ b/server/gameserver/matchmgr.h
@@ -13,7 +13,7 @@ class MatchTeam;
 class MatchMgr : public a8::Singleton<MatchMgr>
 {
  public:
-    enum { HID = HID_RoomMgr };
+    enum { HID = HID_MatchMgr };
 
  private:
     MatchMgr() {};
diff --git a/server/gameserver/matchteam.cc b/server/gameserver/matchteam.cc
index 7abe171..49d138d 100644
--- a/server/gameserver/matchteam.cc
+++ b/server/gameserver/matchteam.cc
@@ -12,10 +12,14 @@ void RawTeamMember::FillMFMatchTeamMember(cs::MFMatchTeamMember* p)
     p->set_account_id(msg.account_id());
     p->set_name(msg.name());
     p->set_avatar_url(msg.avatar_url());
-    p->set_hero_id(msg.hero_id());
-    *p->mutable_weapons() = msg.weapons();
-    *p->mutable_skins() = msg.skins();
-    *p->mutable_skill_list() = msg.skill_list();
+    if (state == kMatchReadying) {
+        p->set_hero_id(0);
+    } else {
+        p->set_hero_id(msg.hero_id());
+        *p->mutable_weapons() = msg.weapons();
+        *p->mutable_skins() = msg.skins();
+        *p->mutable_skill_list() = msg.skill_list();
+    }
     p->set_is_leader(is_leader);
     p->set_state(state);
     p->set_head(msg.head());
@@ -369,6 +373,7 @@ void MatchTeam::ShuaRobot()
 
 void MatchTeam::StartGame()
 {
+    #if 0
     for (auto& member : curr_member_hash_) {
         if (member->socket_handle != 0) {
             MatchMgr::Instance()->RemoveSocket(member->socket_handle);
@@ -378,6 +383,7 @@ void MatchTeam::StartGame()
         MatchMgr::Instance()->RemoveTeam(pair.first);
     }
     MatchMgr::Instance()->RemoveTeam(GetTeamUUid());
+    #endif
 }
 
 void MatchTeam::ChooseLeader()
diff --git a/server/gameserver/metamgr.cc b/server/gameserver/metamgr.cc
index 2161bf4..3d8377e 100644
--- a/server/gameserver/metamgr.cc
+++ b/server/gameserver/metamgr.cc
@@ -348,7 +348,7 @@ public:
 #ifdef DEBUG
             MetaMgr::Instance()->match_team_time = 10;
             MetaMgr::Instance()->match_robot_time = 5;
-            MetaMgr::Instance()->match_choose_time = 30;
+            MetaMgr::Instance()->match_choose_time = 60;
             MetaMgr::Instance()->match_lock_time = 10;
 #endif
             {