diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index 3c3c104c..208822a3 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -1075,7 +1075,7 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id) break; case VW_SelfDetonate: { - std::string msg = a8::Format("%s 被炸死", + std::string msg = a8::Format(TEXT("battle_server_dead_self_detonate", "%s 被炸死").c_str(), { name }); @@ -1084,7 +1084,7 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id) break; case VW_Mine: { - std::string msg = a8::Format("%s 被地雷炸死", + std::string msg = a8::Format(TEXT("battle_server_dead_mine", "%s 被地雷炸死").c_str(), { name }); @@ -3223,7 +3223,7 @@ void Human::ProcBuffEffect(Human* caster, Buff* buff) MetaMgr::Instance()->terminator_meta && meta != MetaMgr::Instance()->terminator_meta) { WinExp(this, MetaMgr::Instance()->terminator_meta->i->exp() + 1); - room->NotifySysPiao("终结者出现", a8::MkRgb(255, 0, 0), 3); + room->NotifySysPiao(TEXT("battle_server_terminator_appear", "终结者出现"), a8::MkRgb(255, 0, 0), 3); OnChgToTerminator(); } } diff --git a/server/gameserver/obstacle.cc b/server/gameserver/obstacle.cc index 54395f4f..2050b000 100644 --- a/server/gameserver/obstacle.cc +++ b/server/gameserver/obstacle.cc @@ -294,7 +294,7 @@ void Obstacle::Explosion(Bullet* bullet) float dmg = meta->i->damage(); float def = hum->ability.def; float finaly_dmg = dmg * (1 - def/MetaMgr::Instance()->K); - hum->DecHP(finaly_dmg, VP_Mine, "地雷", VW_Mine); + hum->DecHP(finaly_dmg, VP_Mine, TEXT("battle_server_killer_mine", "地雷"), VW_Mine); } } break; diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc index f6781a9a..5c3fc0e0 100644 --- a/server/gameserver/player.cc +++ b/server/gameserver/player.cc @@ -941,7 +941,7 @@ void Player::_CMReconnect(f8::MsgHdr& hdr, const cs::CMReconnect& msg) need_sync_active_player = true; cs::SMReconnect respmsg; respmsg.set_errcode(0); - respmsg.set_errmsg("战斗重连成功"); + respmsg.set_errmsg(TEXT("battle_server_reconnect_ok", "战斗重连成功")); SendNotifyMsg(respmsg); PlayerMgr::Instance()->ReBindSocket(this); a8::UdpLog::Instance()->Debug @@ -1381,7 +1381,7 @@ void Player::_CMOpenBox(f8::MsgHdr& hdr, const cs::CMOpenBox& msg) receved_box_hash_.insert(msg.box_id()); } else { respmsg.set_errcode(1); - respmsg.set_errmsg("不能重复领取"); + respmsg.set_errmsg(TEXT("battle_server_received", "不能重复领取")); } } SendNotifyMsg(respmsg); diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index 9883efe2..4457d232 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -1422,7 +1422,7 @@ void Room::AirDrop(int appear_time, int box_id, int airdrop_id) } if (GetRoomMode() == kZombieMode) { if (airdrop_id != map_meta_->i->terminator_airdrop()) { - NotifyCountdown("距离物资箱抵达还有%d秒", appear_time / 1000); + NotifyCountdown(TEXT("battle_server_box_countdown", "距离物资箱抵达还有%d秒"), appear_time / 1000); } } if (thing_meta && thing_meta->i->type() == 2) { @@ -1491,7 +1491,7 @@ void Room::AirDrop(int appear_time, int box_id, int airdrop_id) if (obstacle->is_terminator_airdrop_box) { room->NotifySysPiao ( - "终结者补给箱已送达", + TEXT("battle_server_box_serviced", "终结者补给箱已送达"), a8::MkRgb(0, 255, 0), 3 ); @@ -3304,7 +3304,8 @@ void Room::OnZombieAppear(Human* hum) .SetParam1(hum->meta->i->name()), [] (Player* hum, a8::XParams& param) { - hum->SendSysPiaoMsg(a8::Format("%s出现了", {param.param1.GetString()}), + hum->SendSysPiaoMsg(a8::Format(TEXT("battle_server_appear", "%s出现了").c_str(), + {param.param1.GetString()}), a8::MkRgb(255, 0, 0), 3); }