多人Ok
This commit is contained in:
parent
047b93a50e
commit
521c1e25f6
@ -13,9 +13,14 @@
|
||||
#include "building.h"
|
||||
#include "loot.h"
|
||||
#include "collision.h"
|
||||
#include "roommgr.h"
|
||||
|
||||
const int ROOM_MAX_PLAYER_NUM = 50;
|
||||
#if 1
|
||||
const int ANDROID_NUM = 0;
|
||||
#else
|
||||
const int ANDROID_NUM = 10;
|
||||
#endif
|
||||
|
||||
void Room::Update(int delta_time)
|
||||
{
|
||||
@ -558,6 +563,7 @@ void Room::UpdateGas()
|
||||
}
|
||||
gas_data.rad_old = gas_data.old_area_meta->i->rad();
|
||||
gas_data.rad_new = gas_data.new_area_meta->i->rad();
|
||||
RoomMgr::Instance()->RemoveFromInactiveRoomHash(room_uuid);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
@ -44,6 +44,7 @@ void RoomMgr::_CMJoin(f8::MsgHdr& hdr, const cs::CMJoin& msg)
|
||||
}
|
||||
room->map_meta = MetaMgr::Instance()->GetMap(1001);
|
||||
room->ShuaAndroid();
|
||||
inactive_room_hash_[room->room_uuid] = room;
|
||||
room_hash_[room->room_uuid] = room;
|
||||
}
|
||||
unsigned short new_uniid = room->AllocUniid();
|
||||
@ -88,3 +89,8 @@ Room* RoomMgr::GetRoomByUuid(long long uuid)
|
||||
auto itr = room_hash_.find(uuid);
|
||||
return itr != room_hash_.end() ? itr->second : nullptr;
|
||||
}
|
||||
|
||||
void RoomMgr::RemoveFromInactiveRoomHash(long long room_uuid)
|
||||
{
|
||||
inactive_room_hash_.erase(room_uuid);
|
||||
}
|
||||
|
@ -21,6 +21,7 @@ class RoomMgr : public a8::Singleton<RoomMgr>
|
||||
void Update(int delta_time);
|
||||
|
||||
void _CMJoin(f8::MsgHdr& hdr, const cs::CMJoin& msg);
|
||||
void RemoveFromInactiveRoomHash(long long room_uuid);
|
||||
|
||||
private:
|
||||
Room* GetJoinableRoom(const std::string& account_id);
|
||||
|
Loading…
x
Reference in New Issue
Block a user