From b40d54c1ff443213cca3abac8219d8da5ed43a2b Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 10 Oct 2023 19:27:30 +0800
Subject: [PATCH] 1

---
 server/gameserver/pbutils.cc | 9 ++++++++-
 server/gameserver/room.h     | 1 +
 server/gameserver/team.cc    | 5 +++++
 server/gameserver/team.h     | 2 ++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/server/gameserver/pbutils.cc b/server/gameserver/pbutils.cc
index 64f08357..cc7025c0 100644
--- a/server/gameserver/pbutils.cc
+++ b/server/gameserver/pbutils.cc
@@ -1599,7 +1599,14 @@ void Human::SendUIUpdate()
         notifymsg.set_boss_state(room->pve_data.boss_state);
     }
     if (room->IsMobaModeRoom()) {
-
+        if (room->GetMobaTeamA()) {
+            notifymsg.set_a_team_id(room->GetMobaTeamA()->GetTeamId());
+            notifymsg.set_a_kill_count(room->GetMobaTeamA()->GetKillCount());
+        }
+        if (room->GetMobaTeamB()) {
+            notifymsg.set_b_team_id(room->GetMobaTeamB()->GetTeamId());
+            notifymsg.set_b_kill_count(room->GetMobaTeamB()->GetKillCount());
+        }
     }
     SendNotifyMsg(notifymsg);
 }
diff --git a/server/gameserver/room.h b/server/gameserver/room.h
index 305a3416..4f91d1a1 100644
--- a/server/gameserver/room.h
+++ b/server/gameserver/room.h
@@ -94,6 +94,7 @@ public:
     //target_uniid, frameno
     std::map<int, long long> report_bullet_hash;
     a8::XTimerWp game_over_timer;
+    a8::XTimerWp moba_over_timer;
 #ifdef DEBUG
     std::map<int, int> debug_params;
 #endif
diff --git a/server/gameserver/team.cc b/server/gameserver/team.cc
index 2760529d..769d933e 100644
--- a/server/gameserver/team.cc
+++ b/server/gameserver/team.cc
@@ -494,3 +494,8 @@ bool Team::AllIsRunAway()
     }
     return true;
 }
+
+int Team::GetKillCount()
+{
+    return kill_count_;
+}
diff --git a/server/gameserver/team.h b/server/gameserver/team.h
index 6c029598..aacc2e42 100644
--- a/server/gameserver/team.h
+++ b/server/gameserver/team.h
@@ -52,6 +52,7 @@ class Team
     void RunAway(Human* hum);
     bool AllIsRunAway();
     bool IsViewTeam() { return is_view_; }
+    int GetKillCount();
 
  private:
     int team_id_ = 0;
@@ -61,4 +62,5 @@ class Team
     std::set<Human*> members_;
     Human* first_member_ = nullptr;
     bool auto_fill_ = false;
+    int kill_count_ = 0;
 };