diff --git a/server/gameserver/metamgr.h b/server/gameserver/metamgr.h index 03d8bf8..cbb7ce9 100755 --- a/server/gameserver/metamgr.h +++ b/server/gameserver/metamgr.h @@ -2,6 +2,8 @@ #include "metadata.h" +#define TEXT(textid, def_text) MetaMgr::Instance()->GetText(#textid, #def_text) + class MetaDataLoader; class MetaMgr : public a8::Singleton { diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc index 72fbf98..e53e73e 100644 --- a/server/gameserver/roommgr.cc +++ b/server/gameserver/roommgr.cc @@ -204,7 +204,8 @@ 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, + TEXT("battle_server_reconnect_failreason_room_destoryed", "房间已销毁")); a8::UdpLog::Instance()->Debug ("房间已销毁 %s", { @@ -213,12 +214,14 @@ void RoomMgr::_CMReconnect(f8::MsgHdr& hdr, const cs::CMReconnect& msg) return; } if (room->GetRoomMode() != kChiJiMode) { - send_reconnect_failed(hdr.socket_handle, 1, "只有吃鸡模式支持重连"); + send_reconnect_failed(hdr.socket_handle, 1, + TEXT("battle_server_reconnect_failreason_only_chiji", "只有吃鸡模式支持重连")); return; } Player* hum = room->GetPlayerByAccountId(msg.account_id()); if (!hum) { - send_reconnect_failed(hdr.socket_handle, 1, "accountid未在房间列表"); + send_reconnect_failed(hdr.socket_handle, 1, + TEXT("battle_server_reconnect_failreason_notfound_accountid", "accountid未在房间列表")); return; } hum->_CMReconnect(hdr, msg);