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

1

Browse Source
This commit is contained in:
aozhiwei 2020-12-23 16:34:10 +08:00
parent 3f49670a1a
commit c3406bdeda
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/gameserver/human.cc
View File

@ -776,9 +776,9 @@ void Human::UpdatePoisoning()
bool need_notify = poisoning_time > 1000; bool need_notify = poisoning_time > 1000;
while (poisoning_time > 1000) { while (poisoning_time > 1000) {
if (room->GetGasData().is_last_gas) { 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 { } 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) { if (dead) {
poisoning_time = 0; 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); Entity* hum = room->GetEntityByUniId(killer_id);
if (hum && hum->IsEntityType(ET_Player)) { if (hum && hum->IsEntityType(ET_Player)) {
if (killer_id == GetEntityUniId()) { 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, killer_name,
}); });
@ -1067,7 +1067,7 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id)
break; break;
case VW_Spectate: case VW_Spectate:
{ {
std::string msg = a8::Format("%s 自杀", std::string msg = a8::Format(TEXT("battle_server_dead_specate", "%s 自杀").c_str(),
{ {
name name
}); });

6
server/gameserver/room.cc
View File

@ -2359,7 +2359,7 @@ void Room::ProcDieAndroid(int die_time, int die_num)
if (alive_humans.size() == 1) { if (alive_humans.size() == 1) {
Human* hum = alive_humans[0]; Human* hum = alive_humans[0];
hum->BeKill(VP_SafeArea, hum->BeKill(VP_SafeArea,
"毒圈", TEXT("battle_server_killer_gas", "毒圈"),
VW_SafeArea); VW_SafeArea);
a8::UnSetBitFlag(hum->status, HS_Disable); a8::UnSetBitFlag(hum->status, HS_Disable);
return; return;
@ -2387,7 +2387,7 @@ void Room::ProcDieAndroid(int die_time, int die_num)
a8::UnSetBitFlag(hum->status, HS_Disable); a8::UnSetBitFlag(hum->status, HS_Disable);
} else { } else {
hum->BeKill(VP_SafeArea, hum->BeKill(VP_SafeArea,
"毒圈", TEXT("battle_server_killer_gas", "毒圈"),
VW_SafeArea); VW_SafeArea);
if (!alive_humans.empty()) { if (!alive_humans.empty()) {
alive_humans.erase(alive_humans.begin() + i); alive_humans.erase(alive_humans.begin() + i);
@ -2453,7 +2453,7 @@ void Room::CheckAutoDie(Human* target,
} else { } else {
a8::UnSetBitFlag(target->status, HS_Disable); a8::UnSetBitFlag(target->status, HS_Disable);
target->BeKill(VP_SafeArea, target->BeKill(VP_SafeArea,
"毒圈", TEXT("battle_server_killer_gas", "毒圈"),
VW_SafeArea); VW_SafeArea);
} }
} }