From 4208e1e715de35da1cd7264fc7f23a5fe8bc18c1 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 23 Mar 2023 15:12:59 +0800
Subject: [PATCH] 1

---
 server/gameserver/human.cc | 2 +-
 server/gameserver/team.cc  | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index 26a4e825..8a2424f2 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -3306,7 +3306,7 @@ void Human::CalcStats()
         }
         stats->alive_time = alive_time;
     }
-    #if 0
+    #if 1
     GetTeam()->team_rank = 1;
     #endif
     if (GetTeam()->team_rank) {
diff --git a/server/gameserver/team.cc b/server/gameserver/team.cc
index 96821819..d3dfec61 100644
--- a/server/gameserver/team.cc
+++ b/server/gameserver/team.cc
@@ -271,9 +271,10 @@ void Team::GenBattleReportData(a8::MutableXObject* params)
     }
 
     {
+        auto teams_pb = a8::MutableXObject::CreateArray();
         room->TraverseTeams
             (
-             [params] (Team* team)
+             [teams_pb] (Team* team)
              {
                  auto members_pb = a8::MutableXObject::CreateArray();
                  team->TraverseMembers
@@ -288,8 +289,10 @@ void Team::GenBattleReportData(a8::MutableXObject* params)
                  auto team_pb = a8::MutableXObject::CreateObject();
                  team_pb->SetVal("team_id", team->GetTeamId());
                  team_pb->SetVal("members", *members_pb);
+                 teams_pb->Push(*team_pb);
                  return true;
              });
+        params->SetVal("team_list", *teams_pb);
     }
 
     {
@@ -416,6 +419,7 @@ void Team::GenBattleReportData(a8::MutableXObject* params)
             }
             members_pb->Push(*member_pb);
         };
+        params->SetVal("members", *members_pb);
 
         params->SetVal("pvp_team_kills", pvp_team_kills);
     }