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

1

Browse Source
This commit is contained in:
aozhiwei 2020-08-11 16:25:36 +08:00
parent c2eb1b4e40
commit f07f400287
4 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/gameserver/player.cc
View File

@ -914,6 +914,11 @@ void Player::_CMMove(f8::MsgHdr& hdr, const cs::CMMove& msg)
void Player::_CMReconnect(f8::MsgHdr& hdr, const cs::CMReconnect& msg) void Player::_CMReconnect(f8::MsgHdr& hdr, const cs::CMReconnect& msg)
{ {
int old_socket_handle = socket_handle;
if (socket_handle != 0) {
GGListener::Instance()->ForceCloseChildSocket(socket_handle);
PlayerMgr::Instance()->RemovePlayerBySocket(socket_handle);
}
socket_handle = hdr.socket_handle; socket_handle = hdr.socket_handle;
#if 0 #if 0
TouchAllLayerHumanList TouchAllLayerHumanList
@ -930,6 +935,13 @@ void Player::_CMReconnect(f8::MsgHdr& hdr, const cs::CMReconnect& msg)
respmsg.set_errmsg("战斗重连成功"); respmsg.set_errmsg("战斗重连成功");
SendNotifyMsg(respmsg); SendNotifyMsg(respmsg);
PlayerMgr::Instance()->ReBindSocket(this); PlayerMgr::Instance()->ReBindSocket(this);
a8::UdpLog::Instance()->Debug
("战斗服重连成功 %s %d %d",
{
account_id,
hdr.socket_handle,
old_socket_handle
});
} }
void Player::UpdateDropWeapon() void Player::UpdateDropWeapon()

9
server/gameserver/room.cc
View File

@ -747,18 +747,19 @@ bool Room::CanJoin(const std::string& accountid)
void Room::OnPlayerOffline(Player* hum) void Room::OnPlayerOffline(Player* hum)
{ {
if (GetOnlinePlayerNum() <= 0) { if (GetOnlinePlayerNum() <= 0) {
xtimer.AddDeadLineTimer xtimer.AddDeadLineTimerAndAttach
( (
SERVER_FRAME_RATE * 40, SERVER_FRAME_RATE * 15,
a8::XParams() a8::XParams()
.SetSender(this), .SetSender(this),
[] (const a8::XParams& param) [] (const a8::XParams& param)
{ {
Room* room = (Room*)param.sender.GetUserData(); Room* room = (Room*)param.sender.GetUserData();
if (room->GetOnlinePlayerNum() <= 0) { if (room->GetOnlinePlayerNum() <= 0 && !room->added_to_over_room) {
RoomMgr::Instance()->AddOverRoom(room->room_uuid); RoomMgr::Instance()->AddOverRoom(room->room_uuid);
} }
}); },
&xtimer_attacher.timer_list_);
} }
} }

1
server/gameserver/room.h
View File

@ -49,6 +49,7 @@ public:
long long pending_request = 0; long long pending_request = 0;
long long last_debugout_tick = 0; long long last_debugout_tick = 0;
a8::Vec2 last_player_jump_pos; a8::Vec2 last_player_jump_pos;
bool added_to_over_room = false;
~Room(); ~Room();
void Init(); void Init();

8
server/gameserver/roommgr.cc
View File

@ -128,7 +128,7 @@ void RoomMgr::_CMReconnect(f8::MsgHdr& hdr, const cs::CMReconnect& msg)
.SetSender(socket_handle), .SetSender(socket_handle),
[] (const a8::XParams& param) [] (const a8::XParams& param)
{ {
GGListener::Instance()->ForceCloseClient(param.sender); GGListener::Instance()->ForceCloseChildSocket(param.sender);
} }
); );
}; };
@ -136,6 +136,11 @@ 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, "房间已销毁");
a8::UdpLog::Instance()->Debug
("房间已销毁 %s",
{
msg.room_uuid()
});
return; return;
} }
Player* hum = room->GetPlayerByAccountId(msg.account_id()); Player* hum = room->GetPlayerByAccountId(msg.account_id());
@ -190,6 +195,7 @@ void RoomMgr::AddOverRoom(long long room_uuid)
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->added_to_over_room = true;
room->game_over_tick = a8::XGetTickCount(); room->game_over_tick = a8::XGetTickCount();
room->game_over_timer = a8::Timer::Instance()->AddRepeatTimer(500, room->game_over_timer = a8::Timer::Instance()->AddRepeatTimer(500,
a8::XParams() a8::XParams()