From b5fc67b67c0d3176b43323fef5ab9c282ac00335 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 28 Dec 2023 18:10:08 +0800 Subject: [PATCH] 1 --- server/gameserver/pbutils.cc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/server/gameserver/pbutils.cc b/server/gameserver/pbutils.cc index ef34476b..3e33147c 100644 --- a/server/gameserver/pbutils.cc +++ b/server/gameserver/pbutils.cc @@ -2050,6 +2050,9 @@ void Human::ReJoin(long ip_saddr, int socket_handle, std::shared_ptr { this->ip_saddr = ip_saddr; this->socket_handle = socket_handle; + need_sync_active_player_ = true; + send_msg_times = 0; + last_sync_gas_frameno = 0; PushJoinRoomMsg(); RefreshView(); room->NotifyUiUpdate(); @@ -2325,12 +2328,14 @@ int Room::InitWithMobaBattle(long ip_saddr, int socket_handle, std::shared_ptrSetInitTeamMemberNum(0); new_team->SetAutoFill(true); room_teams.push_back(new_team); + moba_team_a_ = new_team.get(); } { auto new_team = NewTeam(); new_team->SetInitTeamMemberNum(0); new_team->SetAutoFill(true); room_teams.push_back(new_team); + moba_team_b_ = new_team.get(); } cs::CMJoin join_msg = *msg; for (size_t i = 0; i < moba_teams.size(); ++i) { @@ -2402,9 +2407,9 @@ int Room::InitWithMobaBattle(long ip_saddr, int socket_handle, std::shared_ptrInitMobaRoad(); }); if (side == 1) { - side == 2; + side = 2; } else { - side == 1; + side = 1; } } { @@ -2413,6 +2418,9 @@ int Room::InitWithMobaBattle(long ip_saddr, int socket_handle, std::shared_ptrReJoin(ip_saddr, socket_handle, msg, p); } } +#ifdef MYDEBUG + a8::XPrintf("InitWithMobaBattle\n", {}); +#endif return 0; }