From fbae6ea4530c282fc55c473b7077c9d07963b449 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 2 Jun 2021 14:09:52 +0800 Subject: [PATCH] 1 --- server/gameserver/human.cc | 50 ++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index 7301d05..9ea82c3 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -766,7 +766,7 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id) info.killer_team_id = killer->team_id; SendRollMsgEx (info, - TEXT("battle_server_dead_weapon", "%s 使用 ${weapon_id} 干掉了 %s").c_str(), + TEXT("battle_server_dead_weapon", "%s 使用 ${weapon_text_icon} 干掉了 %s").c_str(), { killer_name, #if 0 @@ -782,38 +782,46 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id) switch (weapon_id) { case VW_SafeArea: { - std::string msg = a8::Format(TEXT("battle_server_dead_gas", "%s 被毒圈干掉").c_str(), - { - name - }); - SendRollMsg(msg, 0, 0); + SendRollMsgEx + (info, + TEXT("battle_server_dead_gas", "%s 被${weapon_text_icon}干掉").c_str(), + { + name + }); } break; case VW_Spectate: { - std::string msg = a8::Format(TEXT("battle_server_dead_specate", "%s 自杀").c_str(), - { - name - }); - SendRollMsg(msg, 0, 0); + SendRollMsgEx + (info, + TEXT("battle_server_dead_specate", "%s ${weapon_text_icon}").c_str(), + { + name + }); } break; case VW_SelfDetonate: { - std::string msg = a8::Format(TEXT("battle_server_dead_self_detonate", "%s 被炸死").c_str(), - { - name - }); - SendRollMsg(msg, 0, 0); + SendRollMsgEx + (info, + TEXT("battle_server_dead_self_detonate", "%s ${weapon_text_icon}").c_str(), + { + name + }); } break; case VW_Mine: { - std::string msg = a8::Format(TEXT("battle_server_dead_mine", "%s 被地雷炸死").c_str(), - { - name - }); - SendRollMsg(msg, 0, 0); + SendRollMsgEx + (info, + TEXT("battle_server_dead_mine", "%s ${weapon_text_icon}").c_str(), + { + name + }); + } + break; + default: + { } break; }