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

优化断线重连

Browse Source
This commit is contained in:
aozhiwei 2020-08-11 15:56:44 +08:00
parent 74bd5e36f5
commit 475e739edb
5 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/gameserver/player.cc
View File

@ -909,6 +909,10 @@ void Player::ProcPrepareItems2(const ::google::protobuf::RepeatedPtrField< cs::M
void Player::_CMReconnect(f8::MsgHdr& hdr, const cs::CMReconnect& msg)
{
int old_socket_handle = socket_handle;
if (socket_handle != 0) {
PlayerMgr::Instance()->RemovePlayerBySocket(socket_handle);
}
socket_handle = hdr.socket_handle;
TouchAllLayerHumanList
(
@ -923,6 +927,13 @@ void Player::_CMReconnect(f8::MsgHdr& hdr, const cs::CMReconnect& msg)
respmsg.set_errmsg("战斗重连成功");
SendNotifyMsg(respmsg);
PlayerMgr::Instance()->ReBindSocket(this);
a8::UdpLog::Instance()->Debug
("战斗服重连成功 %s %d %d",
{
account_id,
hdr.socket_handle,
old_socket_handle
});
}
void Player::_CMMove(f8::MsgHdr& hdr, const cs::CMMove& msg)

1
server/gameserver/playermgr.cc
View File

@ -198,5 +198,4 @@ void PlayerMgr::DecAccountNum(const std::string& account_id)
void PlayerMgr::ReBindSocket(Player* hum)
{
socket_hash_[hum->socket_handle] = hum;
IncAccountNum(hum->account_id);
}

7
server/gameserver/room.cc
View File

@ -769,7 +769,7 @@ bool Room::CanJoin(const std::string& accountid,
void Room::OnPlayerOffline(Player* hum)
{
if (GetOnlinePlayerNum() <= 0) {
xtimer.AddDeadLineTimer
xtimer.AddDeadLineTimerAndAttach
(
SERVER_FRAME_RATE * 40,
a8::XParams()
@ -777,11 +777,12 @@ void Room::OnPlayerOffline(Player* hum)
[] (const a8::XParams& param)
{
Room* room = (Room*)param.sender.GetUserData();
if (room->GetOnlinePlayerNum() <= 0) {
if (room->GetOnlinePlayerNum() <= 0 && !room->added_to_over_room) {
GameLog::Instance()->ForceOver(room);
RoomMgr::Instance()->AddOverRoom(room->room_uuid_);
}
});
},
&timer_attacher.timer_list_);
}
}

1
server/gameserver/room.h
View File

@ -43,6 +43,7 @@ public:
GridService* grid_service = nullptr;
MapService* map_service = nullptr;
bool debug_trace = false;
bool added_to_over_room = false;
~Room();
void InitData(RoomInitInfo& init_info);

1
server/gameserver/roommgr.cc
View File

@ -288,6 +288,7 @@ void RoomMgr::AddOverRoom(long long room_uuid)
inactive_room_hash_.erase(room_uuid);
Room* room = GetRoomByUuid(room_uuid);
if (room) {
room->added_to_over_room = true;
a8::Timer::Instance()->AddRepeatTimerAndAttach
(1000 * 5,
a8::XParams()