server/game2004
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2020-05-29 13:04:03 +08:00
parent 572f39d848
commit 1d5737cb12
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/room.h
View File

@ -46,12 +46,10 @@ public:
GasData gas_data; GasData gas_data;
bool game_over = false; bool game_over = false;
long long game_over_frameno = 0; long long game_over_frameno = 0;
long long game_over_tick = 0;
a8::XTimer xtimer; a8::XTimer xtimer;
GridService* grid_service = nullptr; GridService* grid_service = nullptr;
MapService* map_service = nullptr; MapService* map_service = nullptr;
long long battle_start_frameno_ = 0; long long battle_start_frameno_ = 0;
long long pending_request = 0;
long long last_debugout_tick = 0; long long last_debugout_tick = 0;
bool waiting_start = false; bool waiting_start = false;
RoomType_e room_type = RT_NewBrid; RoomType_e room_type = RT_NewBrid;

12
server/gameserver/roommgr.cc
View File

@ -163,21 +163,17 @@ void RoomMgr::AddOverRoom(long long room_uuid)
{ {
Room* room = RoomMgr::Instance()->GetRoomByUuid(param.sender); Room* room = RoomMgr::Instance()->GetRoomByUuid(param.sender);
if (room) { if (room) {
if ((room->pending_request <= 0) || RoomMgr::Instance()->room_hash_.erase(room->room_uuid);
(a8::XGetTickCount() - room->game_over_tick > 1000 * 8)) { RoomMgr::Instance()->over_room_hash_[room->room_uuid] = room;
RoomMgr::Instance()->room_hash_.erase(room->room_uuid); RoomMgr::Instance()->FreeOverRoom(param.sender);
RoomMgr::Instance()->over_room_hash_[room->room_uuid] = room;
RoomMgr::Instance()->FreeOverRoom(param.sender);
}
} }
}; };
inactive_room_hash_.erase(room_uuid); inactive_room_hash_.erase(room_uuid);
Room* room = GetRoomByUuid(room_uuid); Room* room = GetRoomByUuid(room_uuid);
if (room) { if (room) {
room->game_over_tick = a8::XGetTickCount();
a8::Timer::Instance()->AddRepeatTimerAndAttach a8::Timer::Instance()->AddRepeatTimerAndAttach
(500, (1000 * 5,
a8::XParams() a8::XParams()
.SetSender(room_uuid), .SetSender(room_uuid),
callback, callback,