From 457ff9c39db8a10fd3b2d6b190828adfecc596ce Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 30 May 2024 17:38:42 +0800 Subject: [PATCH] 1 --- server/gameserver/pbutils.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/gameserver/pbutils.cc b/server/gameserver/pbutils.cc index 523ecbbd..786f684a 100644 --- a/server/gameserver/pbutils.cc +++ b/server/gameserver/pbutils.cc @@ -2338,7 +2338,7 @@ void Team::FillMFSettlementNew(cs::MFSettlementNew* p) p->set_battle_uuid(GetBattleUuid()); if (room->IsPveRoom()) { - //p->set_pve_settlement_color(stats->settlement_color); + p->set_pve_settlement_color(settlement_color); p->set_pve_wave(room->pve_data.GetPassedWave()); p->set_pve_max_wave(room->pve_data.max_wave); p->set_pve_instance_id(room->pve_instance->gemini_id()); @@ -2351,7 +2351,7 @@ void Team::FillMFSettlementNew(cs::MFSettlementNew* p) } } else { //p->set_pvp_settlement_type(stats->pvp_settlement_type); - //p->set_pvp_settlement_color(stats->settlement_color); + p->set_pvp_settlement_color(settlement_color); p->set_pvp_team_rank(team_rank); p->set_pvp_total_human_num(room->GetHumanNum()); p->set_pvp_alive_human_num(room->AliveCount()); @@ -2393,7 +2393,7 @@ void Team::FillMFSettlementNew(cs::MFSettlementNew* p) p->set_battle_uuid(GetBattleUuid()); if (room->IsPveRoom()) { - //p->set_pve_settlement_color(stats->settlement_color); + p->set_pve_settlement_color(settlement_color); p->set_pve_wave(room->pve_data.GetPassedWave()); p->set_pve_max_wave(room->pve_data.max_wave); p->set_pve_instance_id(room->pve_instance->gemini_id()); @@ -2406,7 +2406,7 @@ void Team::FillMFSettlementNew(cs::MFSettlementNew* p) } } else { //p->set_pvp_settlement_type(stats->pvp_settlement_type); - //p->set_pvp_settlement_color(stats->settlement_color); + p->set_pvp_settlement_color(settlement_color); p->set_pvp_team_rank(team_rank); p->set_pvp_total_human_num(room->GetHumanNum()); p->set_pvp_alive_human_num(room->AliveCount());