From 012d287cf80a28a20063af150afa02aede3bd3ff Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 7 Feb 2024 14:20:26 +0800 Subject: [PATCH] 1 --- server/gameserver/pbutils.cc | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/server/gameserver/pbutils.cc b/server/gameserver/pbutils.cc index 5a9b27d3..f72ac931 100644 --- a/server/gameserver/pbutils.cc +++ b/server/gameserver/pbutils.cc @@ -1675,7 +1675,11 @@ void Human::SendGameOver() abort(); } #endif - SendMsgSelfAndOb(msg); + if (room->IsGameOver()) { + SendMsgSelfAndOb(msg); + } else { + SendNotifyMsg(msg); + } #ifdef MYDEBUG if (IsPlayer()) { a8::XPrintf("SMGameOver:%s\n", {f8::PbToJson(&msg)}); @@ -1687,7 +1691,7 @@ void Human::SendGameOver() SendPersonalBattleReport(); sent_personal_report_ = true; } - if (GetTeam()->team_rank && GetTeam()->HasPlayer()) { + if (GetTeam()->team_rank && GetTeam()->HasPlayer() && !GetTeam()->IsViewTeam()) { if (!GetTeam()->sending_battlereport) { GetTeam()->sending_battlereport = true; GetTeam()->SendTeamBattleReport(this); @@ -1700,7 +1704,11 @@ void Human::SendGameOver() abort(); } #endif - SendMsgSelfAndOb(msg); + if (room->IsGameOver()) { + SendMsgSelfAndOb(msg); + } else { + SendNotifyMsg(msg); + } #ifdef MYDEBUG if (IsPlayer()) { a8::XPrintf("SMGameOver:%s\n", {f8::PbToJson(&msg)});