From e587ae1455b8d6547900e546a81f9c03f84b03c8 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 3 Apr 2024 19:27:58 +0800 Subject: [PATCH] 1 --- server/gameserver/pbutils.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/gameserver/pbutils.cc b/server/gameserver/pbutils.cc index ec6065a4..6c5886e1 100644 --- a/server/gameserver/pbutils.cc +++ b/server/gameserver/pbutils.cc @@ -350,12 +350,12 @@ void KillMgr::BoradcastRollMsgCb(Human* dead_hum, int color = element->mutable_union_obj_1()->color(); if (dead_hum == hum) { color = mt::Param::s().self_bekill_color; + } else if (dead_hum->team_id == hum->team_id) { + color = mt::Param::s().teammate_bekill_color; } else if (info->killer_id == hum->GetUniId()){ color = mt::Param::s().self_kill_color; } else if (killer_team_id == hum->team_id) { color = mt::Param::s().teammate_kill_color; - } else if (dead_hum->team_id == hum->team_id) { - color = mt::Param::s().teammate_bekill_color; } if (element->mutable_union_obj_1()->color() != color) { element->mutable_union_obj_1()->set_color(color);