This commit is contained in:
aozhiwei 2019-09-09 13:45:34 +08:00
parent bd46740c94
commit d71c620ff4

View File

@ -15,6 +15,7 @@
#include "playermgr.h" #include "playermgr.h"
#include "framework/cpp/httpclientpool.h" #include "framework/cpp/httpclientpool.h"
#include "framework/cpp/utils.h"
const int ROOM_NUM_DOWN_LIMIT = 20; const int ROOM_NUM_DOWN_LIMIT = 20;
const int ROOM_NUM_UP_LIMIT = 40; const int ROOM_NUM_UP_LIMIT = 40;
@ -85,7 +86,11 @@ void RoomMgr::_CMJoin(f8::MsgHdr& hdr, const cs::CMJoin& msg)
if (GetRoomByUuid(room->room_uuid)) { if (GetRoomByUuid(room->room_uuid)) {
abort(); abort();
} }
room->map_meta = MetaMgr::Instance()->GetMap(1001); if (f8::IsOnlineEnv()) {
room->map_meta = MetaMgr::Instance()->GetMap(1001);
} else {
room->map_meta = MetaMgr::Instance()->GetMap(2001);
}
room->Init(); room->Init();
inactive_room_hash_[room->room_uuid] = room; inactive_room_hash_[room->room_uuid] = room;
room_hash_[room->room_uuid] = room; room_hash_[room->room_uuid] = room;