diff --git a/server/gameserver/roommgr.cc b/server/gameserver/roommgr.cc index 5b212d7..606f491 100644 --- a/server/gameserver/roommgr.cc +++ b/server/gameserver/roommgr.cc @@ -86,28 +86,10 @@ void RoomMgr::_CMJoin(f8::MsgHdr& hdr, const cs::CMJoin& msg) if (GetRoomByUuid(room->room_uuid)) { abort(); } - #if 1 room->map_meta = MetaMgr::Instance()->GetMap(2001); - #else - if (f8::IsOnlineEnv()) { - room->map_meta = MetaMgr::Instance()->GetMap(1001); - } else { - room->map_meta = MetaMgr::Instance()->GetMap(2001); - } - #endif room->Init(); inactive_room_hash_[room->room_uuid] = room; room_hash_[room->room_uuid] = room; - a8::UdpLog::Instance()->Info("createroom:%d masterid:%s max_mainloop_rundelay:%d " - "room_num:%d player_num:%d online_num:%d", - { - room->room_uuid, - msg.account_id(), - App::Instance()->perf.max_run_delay_time, - RoomMgr::Instance()->RoomNum(), - App::Instance()->perf.entity_num[ET_Player], - PlayerMgr::Instance()->OnlineNum(), - }); } Player* hum = PlayerMgr::Instance()->CreatePlayerByCMJoin(hdr.ip_saddr, hdr.socket_handle, msg); hum->meta = hum_meta;