From 0a632684a0cf8710e3af6f460beb5f5143a18eea Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 14 Sep 2020 15:08:43 +0800 Subject: [PATCH] 1 --- server/gameserver/human.cc | 30 ++++++++++++++++++++---------- server/gameserver/metamgr.h | 2 +- server/gameserver/obstacle.cc | 5 ++++- server/gameserver/player.cc | 2 +- server/gameserver/roommgr.cc | 8 ++++++-- 5 files changed, 32 insertions(+), 15 deletions(-) diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index f673259..d7c1e34 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -575,9 +575,15 @@ void Human::UpdatePoisoning() bool need_notify = poisoning_time > 1000; while (poisoning_time > 1000) { if (room->gas_data.is_last_gas) { - DecHP(room->gas_data.new_area_meta->i->hurt(), VP_SafeArea, "毒圈", VW_SafeArea); + DecHP(room->gas_data.new_area_meta->i->hurt(), + VP_SafeArea, + MetaMgr::Instance()->GetText("battle_server_killer_gas"), + VW_SafeArea); } else { - DecHP(room->gas_data.old_area_meta->i->hurt(), VP_SafeArea, "毒圈", VW_SafeArea); + DecHP(room->gas_data.old_area_meta->i->hurt(), + VP_SafeArea, + MetaMgr::Instance()->GetText("battle_server_killer_gas"), + VW_SafeArea); } if (dead) { poisoning_time = 0; @@ -732,7 +738,7 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id) Entity* hum = room->GetEntityByUniId(killer_id); if (hum && hum->entity_type == ET_Player) { if (killer_id == entity_uniid) { - std::string msg = a8::Format("%s 自杀", + std::string msg = a8::Format(MetaMgr::Instance()->GetText("battle_server_dead_specate"), //"%s 自杀" { killer_name, }); @@ -742,17 +748,17 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id) ((Human*)hum)->kill_humans.insert(this); ((Human*)hum)->SyncAroundPlayers(__FILE__, __LINE__, __func__); if (weapon_id == VW_Tank) { - std::string msg = a8::Format("%s 使用 %s 干掉了 %s", + std::string msg = a8::Format(MetaMgr::Instance()->GetText("battle_server_dead_car"), //"%s 使用 %s 干掉了 %s" { killer_name, - "载具", name }); SendRollMsg(msg); } else { MetaData::Equip* equip_meta = MetaMgr::Instance()->GetEquip(weapon_id); if (equip_meta) { - std::string msg = a8::Format("%s 使用 %s 干掉了 %s", + //"%s 使用 %s 干掉了 %s" + std::string msg = a8::Format(MetaMgr::Instance()->GetText("battle_server_dead_weapon"), { killer_name, equip_meta->i->name(), @@ -766,7 +772,8 @@ 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("%s 被毒圈干掉", + //"%s 被毒圈干掉" + std::string msg = a8::Format(MetaMgr::Instance()->GetText("battle_server_dead_gas"), { name }); @@ -775,7 +782,8 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id) break; case VW_Spectate: { - std::string msg = a8::Format("%s 自杀", + //"%s 自杀" + std::string msg = a8::Format(MetaMgr::Instance()->GetText("battle_server_dead_specate"), { name }); @@ -784,7 +792,8 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id) break; case VW_SelfDetonate: { - std::string msg = a8::Format("%s 被炸死", + //"%s 被炸死" + std::string msg = a8::Format(MetaMgr::Instance()->GetText("battle_server_dead_self_detonate"), { name }); @@ -793,7 +802,8 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id) break; case VW_Mine: { - std::string msg = a8::Format("%s 被地雷炸死", + //"%s 被地雷炸死" + std::string msg = a8::Format(MetaMgr::Instance()->GetText("battle_server_dead_mine"), { name }); diff --git a/server/gameserver/metamgr.h b/server/gameserver/metamgr.h index 20a6057..1b293da 100755 --- a/server/gameserver/metamgr.h +++ b/server/gameserver/metamgr.h @@ -42,7 +42,7 @@ class MetaMgr : public a8::Singleton int GetKillPointParam2(int kill_num); std::vector* GetRobotList(); MetaData::Robot* GetRobot(int robot_id); - std::string GetText(const std::string& textid, const std::string& def_text); + std::string GetText(const std::string& textid, const std::string& def_text=""); int gas_inactive_time = 10; int jump_time = 10; diff --git a/server/gameserver/obstacle.cc b/server/gameserver/obstacle.cc index a5d5f9d..059732d 100644 --- a/server/gameserver/obstacle.cc +++ b/server/gameserver/obstacle.cc @@ -206,7 +206,10 @@ void Obstacle::Explosion(Bullet* bullet) float dmg = meta->i->damage(); float def = hum->def + hum->buff.def_add; float finaly_dmg = dmg * (1 - def/MetaMgr::Instance()->K); - hum->DecHP(finaly_dmg, VP_Mine, "地雷", VW_Mine); + hum->DecHP(finaly_dmg, + VP_Mine, + MetaMgr::Instance()->GetText("battle_server_killer_mine"), //"地雷" + VW_Mine); } } break; diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc index 7b408df..9cfd4e8 100644 --- a/server/gameserver/player.cc +++ b/server/gameserver/player.cc @@ -932,7 +932,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(MetaMgr::Instance()->GetText("battle_server_reconnect_ok")); //"战斗重连成功" SendNotifyMsg(respmsg); PlayerMgr::Instance()->ReBindSocket(this); a8::UdpLog::Instance()->Debug diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc index d5f471c..0663446 100644 --- a/server/gameserver/roommgr.cc +++ b/server/gameserver/roommgr.cc @@ -135,7 +135,9 @@ void RoomMgr::_CMReconnect(f8::MsgHdr& hdr, const cs::CMReconnect& msg) Room* room = GetRoomByUuid(a8::XValue(msg.room_uuid())); if (!room) { - send_reconnect_failed(hdr.socket_handle, 1, "房间已销毁"); + send_reconnect_failed(hdr.socket_handle, + 1, + MetaMgr::Instance()->GetText("battle_server_reconnect_failreason_room_destoryed")); //"房间已销毁" a8::UdpLog::Instance()->Debug ("房间已销毁 %s", { @@ -145,7 +147,9 @@ void RoomMgr::_CMReconnect(f8::MsgHdr& hdr, const cs::CMReconnect& msg) } Player* hum = room->GetPlayerByAccountId(msg.account_id()); if (!hum) { - send_reconnect_failed(hdr.socket_handle, 1, "accountid未在房间列表"); + send_reconnect_failed(hdr.socket_handle, + 1, + MetaMgr::Instance()->GetText("battle_server_reconnect_failreason_notfound_accountid")); //"accountid未在房间列表" return; } hum->_CMReconnect(hdr, msg);