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

1

Browse Source
This commit is contained in:
aozhiwei 2023-12-29 10:42:18 +08:00
parent b5fc67b67c
commit 0719cb89c7
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
server/gameserver/pbutils.cc
View File

@ -2346,6 +2346,8 @@ int Room::InitWithMobaBattle(long ip_saddr, int socket_handle, std::shared_ptr<c
[ip_saddr, socket_handle, join_msg, p, new_team] (std::shared_ptr<MobaMember> m) mutable -> bool [ip_saddr, socket_handle, join_msg, p, new_team] (std::shared_ptr<MobaMember> m) mutable -> bool
{ {
Player* hum = p->GetRoom()->NewPlayer(); Player* hum = p->GetRoom()->NewPlayer();
//hum->ip_saddr = ip_saddr;
//hum->socket_handle = socket_handle;
hum->room = p->GetRoom(); hum->room = p->GetRoom();
hum->proto_version = join_msg.proto_version(); hum->proto_version = join_msg.proto_version();
#if 0 #if 0
@ -2389,6 +2391,14 @@ int Room::InitWithMobaBattle(long ip_saddr, int socket_handle, std::shared_ptr<c
PlayerMgr::Instance()->IncAccountNum(join_msg.account_id()); PlayerMgr::Instance()->IncAccountNum(join_msg.account_id());
RoomMgr::Instance()->OnJoinRoomOk(join_msg, hum); RoomMgr::Instance()->OnJoinRoomOk(join_msg, hum);
new_team->AddMember(hum); new_team->AddMember(hum);
#ifdef MYDEBUG
a8::XPrintf("moba init1 uniid:%d team_id:%d side:%d\n",
{
hum->GetUniId(),
hum->GetTeam()->GetTeamId(),
hum->side
});
#endif
return true; return true;
}); });
}; };
@ -2405,6 +2415,15 @@ int Room::InitWithMobaBattle(long ip_saddr, int socket_handle, std::shared_ptr<c
hum->side = side; hum->side = side;
hum->born_point->wo_meta = std::get<0>(GetMapMeta()->moba_born_points.at(side - 1)); hum->born_point->wo_meta = std::get<0>(GetMapMeta()->moba_born_points.at(side - 1));
hum->InitMobaRoad(); hum->InitMobaRoad();
#ifdef MYDEBUG
a8::XPrintf("moba init uniid:%d team_id:%d side:%d\n",
{
hum->GetUniId(),
hum->GetTeam()->GetTeamId(),
hum->side
});
#endif
return true;
}); });
if (side == 1) { if (side == 1) {
side = 2; side = 2;
@ -2412,12 +2431,14 @@ int Room::InitWithMobaBattle(long ip_saddr, int socket_handle, std::shared_ptr<c
side = 1; side = 1;
} }
} }
#if 1
{ {
auto hum = GetPlayerByAccountId(msg->account_id()); auto hum = GetPlayerByAccountId(msg->account_id());
if (hum) { if (hum) {
hum->ReJoin(ip_saddr, socket_handle, msg, p); hum->ReJoin(ip_saddr, socket_handle, msg, p);
} }
} }
#endif
#ifdef MYDEBUG #ifdef MYDEBUG
a8::XPrintf("InitWithMobaBattle\n", {}); a8::XPrintf("InitWithMobaBattle\n", {});
#endif #endif

3
server/gameserver/room.cc
View File

@ -419,6 +419,9 @@ void Room::ShuaAndroid()
if (GetGasData().GetGasMode() != GasInactive) { if (GetGasData().GetGasMode() != GasInactive) {
return; return;
} }
if (IsMobaModeRoom()) {
return;
}
int robot_num = a8::RandEx(map_meta_->refresh_robot_min_num, int robot_num = a8::RandEx(map_meta_->refresh_robot_min_num,
map_meta_->refresh_robot_max_num); map_meta_->refresh_robot_max_num);
int refresh_time = a8::RandEx(map_meta_->refresh_robot_min_time, int refresh_time = a8::RandEx(map_meta_->refresh_robot_min_time,