server/game2006
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2024-05-27 18:08:18 +08:00
parent bd78ed0f4c
commit 48e8e3cb8f
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/gameserver/mt/Param.h
View File

@ -78,8 +78,11 @@ namespace mt
int self_kill_color = 0xFFFF00; int self_kill_color = 0xFFFF00;
int self_bekill_color = 0xFF0000; int self_bekill_color = 0xFF0000;
int other_bekill_color = 0xFFFFFF; int teammate_kill_color1 = 0xff0000;
int other_kill_color = 0xFFFFFF; int teammate_kill_color2 = 0x0F0FFF;
int other_kill_color1 = 0xFFFFFF;
int other_kill_color2 = 0xFFFFFF;
int map_cell_width = 64 * 8; int map_cell_width = 64 * 8;
int bullet_planck_step_length = 15; int bullet_planck_step_length = 15;

18
server/gameserver/pbutils.cc
View File

@ -350,28 +350,28 @@ void KillMgr::BoradcastRollMsgCb(Human* dead_hum,
auto proc_dead = auto proc_dead =
[dead_hum, info, killer_team_id] (cs::MFRichTextElement* element, Human* hum) [dead_hum, info, killer_team_id] (cs::MFRichTextElement* element, Human* hum)
{ {
if (dead_hum == hum) { if (killer_team_id == hum->team_id) {
auto color = mt::Param::s().self_bekill_color; auto color = mt::Param::s().teammate_kill_color2;
element->mutable_union_obj_1()->set_color(color); element->mutable_union_obj_1()->set_color(color);
} else if (dead_hum->team_id == hum->team_id) { } else if (dead_hum->team_id == hum->team_id) {
auto color = mt::Param::s().teammate_bekill_color; auto color = mt::Param::s().teammate_kill_color1;
element->mutable_union_obj_1()->set_color(color); element->mutable_union_obj_1()->set_color(color);
} else { } else {
auto color = mt::Param::s().other_bekill_color; auto color = mt::Param::s().other_kill_color2;
element->mutable_union_obj_1()->set_color(color); element->mutable_union_obj_1()->set_color(color);
} }
}; };
auto proc_killer = auto proc_killer =
[dead_hum, info, killer_team_id] (cs::MFRichTextElement* element, Human* hum) [dead_hum, info, killer_team_id] (cs::MFRichTextElement* element, Human* hum)
{ {
if (info->killer_id == hum->GetUniId()) { if (killer_team_id == hum->team_id) {
auto color = mt::Param::s().self_kill_color; auto color = mt::Param::s().teammate_kill_color1;
element->mutable_union_obj_1()->set_color(color); element->mutable_union_obj_1()->set_color(color);
} else if (killer_team_id == hum->team_id) { } else if (dead_hum->team_id == hum->team_id) {
auto color = mt::Param::s().teammate_kill_color; auto color = mt::Param::s().teammate_kill_color2;
element->mutable_union_obj_1()->set_color(color); element->mutable_union_obj_1()->set_color(color);
} else { } else {
auto color = mt::Param::s().other_kill_color; auto color = mt::Param::s().other_kill_color1;
element->mutable_union_obj_1()->set_color(color); element->mutable_union_obj_1()->set_color(color);
} }
}; };