diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index 08ad3ae..1ebfdbe 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -776,9 +776,9 @@ void Human::UpdatePoisoning() bool need_notify = poisoning_time > 1000; while (poisoning_time > 1000) { if (room->GetGasData().is_last_gas) { - DecHP(room->GetGasData().new_area_meta->i->hurt(), VP_SafeArea, "毒圈", VW_SafeArea); + DecHP(room->GetGasData().new_area_meta->i->hurt(), VP_SafeArea, TEXT("battle_server_killer_gas", "毒圈"), VW_SafeArea); } else { - DecHP(room->GetGasData().old_area_meta->i->hurt(), VP_SafeArea, "毒圈", VW_SafeArea); + DecHP(room->GetGasData().old_area_meta->i->hurt(), VP_SafeArea, TEXT("battle_server_killer_gas", "毒圈"), VW_SafeArea); } if (dead) { poisoning_time = 0; @@ -1023,7 +1023,7 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id) Entity* hum = room->GetEntityByUniId(killer_id); if (hum && hum->IsEntityType(ET_Player)) { if (killer_id == GetEntityUniId()) { - std::string msg = a8::Format("%s 自杀", + std::string msg = a8::Format(TEXT("battle_server_dead_specate", "%s 自杀").c_str(), { killer_name, }); @@ -1067,7 +1067,7 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id) break; case VW_Spectate: { - std::string msg = a8::Format("%s 自杀", + std::string msg = a8::Format(TEXT("battle_server_dead_specate", "%s 自杀").c_str(), { name }); diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index 5fb54c3..9883efe 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -2359,7 +2359,7 @@ void Room::ProcDieAndroid(int die_time, int die_num) if (alive_humans.size() == 1) { Human* hum = alive_humans[0]; hum->BeKill(VP_SafeArea, - "毒圈", + TEXT("battle_server_killer_gas", "毒圈"), VW_SafeArea); a8::UnSetBitFlag(hum->status, HS_Disable); return; @@ -2387,7 +2387,7 @@ void Room::ProcDieAndroid(int die_time, int die_num) a8::UnSetBitFlag(hum->status, HS_Disable); } else { hum->BeKill(VP_SafeArea, - "毒圈", + TEXT("battle_server_killer_gas", "毒圈"), VW_SafeArea); if (!alive_humans.empty()) { alive_humans.erase(alive_humans.begin() + i); @@ -2453,7 +2453,7 @@ void Room::CheckAutoDie(Human* target, } else { a8::UnSetBitFlag(target->status, HS_Disable); target->BeKill(VP_SafeArea, - "毒圈", + TEXT("battle_server_killer_gas", "毒圈"), VW_SafeArea); } }