This commit is contained in:
aozhiwei 2020-12-23 16:26:47 +08:00
parent dc0e3a521c
commit 3f49670a1a
2 changed files with 8 additions and 3 deletions

View File

@ -2,6 +2,8 @@
#include "metadata.h" #include "metadata.h"
#define TEXT(textid, def_text) MetaMgr::Instance()->GetText(#textid, #def_text)
class MetaDataLoader; class MetaDataLoader;
class MetaMgr : public a8::Singleton<MetaMgr> class MetaMgr : public a8::Singleton<MetaMgr>
{ {

View File

@ -204,7 +204,8 @@ void RoomMgr::_CMReconnect(f8::MsgHdr& hdr, const cs::CMReconnect& msg)
Room* room = GetRoomByUuid(a8::XValue(msg.room_uuid())); Room* room = GetRoomByUuid(a8::XValue(msg.room_uuid()));
if (!room) { 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 a8::UdpLog::Instance()->Debug
("房间已销毁 %s", ("房间已销毁 %s",
{ {
@ -213,12 +214,14 @@ void RoomMgr::_CMReconnect(f8::MsgHdr& hdr, const cs::CMReconnect& msg)
return; return;
} }
if (room->GetRoomMode() != kChiJiMode) { 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; return;
} }
Player* hum = room->GetPlayerByAccountId(msg.account_id()); Player* hum = room->GetPlayerByAccountId(msg.account_id());
if (!hum) { 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; return;
} }
hum->_CMReconnect(hdr, msg); hum->_CMReconnect(hdr, msg);