This commit is contained in:
aozhiwei 2023-03-21 20:23:58 +08:00
parent 0c5927d3a0
commit 5146211e4e

View File

@ -856,6 +856,10 @@ void Human::FillMFTeamData(Human* hum, cs::MFTeamData* team_data, bool is_game_o
void Human::FillSMGameOver(cs::SMGameOver& msg) void Human::FillSMGameOver(cs::SMGameOver& msg)
{ {
if (GetTeam()->already_report_battle) {
msg.mutable_settlement_new()->set_settlement_status(1);
return;
}
int alive_team_num = room->GetAliveTeamNum(); int alive_team_num = room->GetAliveTeamNum();
if (stats.victory) { if (stats.victory) {
@ -1338,8 +1342,14 @@ void Human::SendGameOver()
{ {
#if 1 #if 1
if (GetTeam()->HasPlayer()) { if (GetTeam()->HasPlayer()) {
if (GetTeam()->already_report_battle) {
cs::SMGameOver msg;
FillSMGameOver(msg);
SendNotifyMsg(msg);
} else {
SendTeamBattleReport(); SendTeamBattleReport();
} }
}
if (IsEntitySubType(EST_Player)) { if (IsEntitySubType(EST_Player)) {
if (!is_game_end_) { if (!is_game_end_) {
GameLog::Instance()->GameEnd((Player*)this); GameLog::Instance()->GameEnd((Player*)this);