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

1

Browse Source
This commit is contained in:
aozhiwei 2020-09-14 16:33:45 +08:00
parent 0a632684a0
commit f209166cca
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/gameserver/human.cc
View File

@ -738,7 +738,7 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id)
Entity* hum = room->GetEntityByUniId(killer_id); Entity* hum = room->GetEntityByUniId(killer_id);
if (hum && hum->entity_type == ET_Player) { if (hum && hum->entity_type == ET_Player) {
if (killer_id == entity_uniid) { if (killer_id == entity_uniid) {
std::string msg = a8::Format(MetaMgr::Instance()->GetText("battle_server_dead_specate"), //"%s 自杀" std::string msg = a8::Format(MetaMgr::Instance()->GetText("battle_server_dead_specate").c_str(), //"%s 自杀"
{ {
killer_name, killer_name,
}); });
@ -748,7 +748,7 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id)
((Human*)hum)->kill_humans.insert(this); ((Human*)hum)->kill_humans.insert(this);
((Human*)hum)->SyncAroundPlayers(__FILE__, __LINE__, __func__); ((Human*)hum)->SyncAroundPlayers(__FILE__, __LINE__, __func__);
if (weapon_id == VW_Tank) { if (weapon_id == VW_Tank) {
std::string msg = a8::Format(MetaMgr::Instance()->GetText("battle_server_dead_car"), //"%s 使用 %s 干掉了 %s" std::string msg = a8::Format(MetaMgr::Instance()->GetText("battle_server_dead_car").c_str(), //"%s 使用 %s 干掉了 %s"
{ {
killer_name, killer_name,
name name
@ -758,7 +758,7 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id)
MetaData::Equip* equip_meta = MetaMgr::Instance()->GetEquip(weapon_id); MetaData::Equip* equip_meta = MetaMgr::Instance()->GetEquip(weapon_id);
if (equip_meta) { if (equip_meta) {
//"%s 使用 %s 干掉了 %s" //"%s 使用 %s 干掉了 %s"
std::string msg = a8::Format(MetaMgr::Instance()->GetText("battle_server_dead_weapon"), std::string msg = a8::Format(MetaMgr::Instance()->GetText("battle_server_dead_weapon").c_str(),
{ {
killer_name, killer_name,
equip_meta->i->name(), equip_meta->i->name(),
@ -773,7 +773,7 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id)
case VW_SafeArea: case VW_SafeArea:
{ {
//"%s 被毒圈干掉" //"%s 被毒圈干掉"
std::string msg = a8::Format(MetaMgr::Instance()->GetText("battle_server_dead_gas"), std::string msg = a8::Format(MetaMgr::Instance()->GetText("battle_server_dead_gas").c_str(),
{ {
name name
}); });
@ -783,7 +783,7 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id)
case VW_Spectate: case VW_Spectate:
{ {
//"%s 自杀" //"%s 自杀"
std::string msg = a8::Format(MetaMgr::Instance()->GetText("battle_server_dead_specate"), std::string msg = a8::Format(MetaMgr::Instance()->GetText("battle_server_dead_specate").c_str(),
{ {
name name
}); });
@ -793,7 +793,7 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id)
case VW_SelfDetonate: case VW_SelfDetonate:
{ {
//"%s 被炸死" //"%s 被炸死"
std::string msg = a8::Format(MetaMgr::Instance()->GetText("battle_server_dead_self_detonate"), std::string msg = a8::Format(MetaMgr::Instance()->GetText("battle_server_dead_self_detonate").c_str(),
{ {
name name
}); });
@ -803,7 +803,7 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id)
case VW_Mine: case VW_Mine:
{ {
//"%s 被地雷炸死" //"%s 被地雷炸死"
std::string msg = a8::Format(MetaMgr::Instance()->GetText("battle_server_dead_mine"), std::string msg = a8::Format(MetaMgr::Instance()->GetText("battle_server_dead_mine").c_str(),
{ {
name name
}); });