From 99b9997dd0f175ee96d2a86be0f9ab31f0725354 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 3 Apr 2024 19:26:06 +0800 Subject: [PATCH] 1 --- server/gameserver/pbutils.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/gameserver/pbutils.cc b/server/gameserver/pbutils.cc index 04062d24..ec6065a4 100644 --- a/server/gameserver/pbutils.cc +++ b/server/gameserver/pbutils.cc @@ -348,12 +348,12 @@ void KillMgr::BoradcastRollMsgCb(Human* dead_hum, auto element = pb_msg->mutable_elements(i); if (element->element_type() == kTextElement) { int color = element->mutable_union_obj_1()->color(); - if (info->killer_id == hum->GetUniId()){ + if (dead_hum == hum) { + color = mt::Param::s().self_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 == hum) { - color = mt::Param::s().self_bekill_color; } else if (dead_hum->team_id == hum->team_id) { color = mt::Param::s().teammate_bekill_color; }