From 8d99bb66f458b36ac08ec87e16c4d4e46f11711c Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 30 Oct 2023 15:57:34 +0800 Subject: [PATCH] 1 --- server/gameserver/player.cc | 2 +- server/gameserver/room.cc | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc index 541005ff..eab2e906 100644 --- a/server/gameserver/player.cc +++ b/server/gameserver/player.cc @@ -1465,7 +1465,7 @@ void Player::PushJoinRoomMsg() notifymsg.set_side(side); GGListener::Instance()->SendToClient(socket_handle, 0, notifymsg); #ifdef DEBUG - a8::XPrintf("PushJoinRooMmsg %d\n", {GetUniId()}); + a8::XPrintf("PushJoinRooMmsg %d side:%d\n", {GetUniId(), side}); #endif } } diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index e5d892b9..78961691 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -345,6 +345,9 @@ void Room::AddPlayer(Player* hum, std::shared_ptr init_born_point, bo if (!no_matchteam) { MatchTeam(hum); } +#ifdef DEBUG + hum->side = a8::RandEx(1, 2); +#endif hum->PushJoinRoomMsg(); ++alive_count_; alive_count_chged_frameno_ = GetFrameNo(); @@ -375,7 +378,6 @@ void Room::AddPlayer(Player* hum, std::shared_ptr init_born_point, bo if (humans.size() != 7) { abort(); } - hum->side = a8::RandEx(1, 2); Human* leader = hum; moba_team_a_ = leader->GetTeam(); leader->born_point->wo_meta = std::get<0>(GetMapMeta()->moba_born_points.at(leader->side - 1));