1

server/gameserver/human.cc

@@ -400,6 +400,7 @@ void Human::FillMFTeamData(cs::MFTeamData* team_data, bool is_game_over)
     {
         last_sync_teamdata_frameno_ = room->GetFrameNo();
 
+        team_data->set_team_id(team_id);
         team_data->set_player_id(GetUniId());
         if (is_game_over || !real_dead || room->GetFrameNo() - GetRealDeadFrameNo(room) < 4) {
             TypeConvert::ToPb(GetPos(), team_data->mutable_pos());
@@ -1313,7 +1314,9 @@ void Human::RecalcBaseAttr()
         def += helmet_meta->i->def();
     }
     SetDef(def);
+    #if 0
     SetMaxHP(std::max(GetHP(), GetMaxHP()));
+    #endif
 }
 
 int Human::GetVolume(int slot_id)

server/tools/protobuild/cs_proto.proto

@@ -612,6 +612,7 @@ message MFGasData
 //队伍数据
 message MFTeamData
 {
+    optional int32 team_id = 61; //队伍Id
     optional int32 player_id = 1; //玩家id
     optional MFVec2 pos = 2; //位置
     optional MFVec2 dir = 3; //方向