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-28 14:06:19 +08:00
parent 2ae6a19c74
commit fc558fafe5
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/gameserver/pbutils.cc
View File

@ -2313,6 +2313,12 @@ int Room::InitWithMobaBattle(long ip_saddr, int socket_handle, std::shared_ptr<c
return true;
});
};
for (size_t i = 0; i < 2; ++i) {
auto team = room_teams.at(i);
for (size_t ii = team->GetMemberNum(); ii < MAX_TEAM_NUM; ++ii) {
}
}
return 0;
}

8
server/gameserver/room.cc
View File

@ -462,7 +462,7 @@ void Room::ShowAndroid(Human* target, int num)
}
}
void Room::CreateAndroid(int robot_num)
void Room::CreateAndroid(int robot_num, std::shared_ptr<Team> team)
{
for (int i = 0; i < robot_num; ++i) {
if (human_hash_.size() >= GetRoomMaxPlayerNum()) {
@ -499,7 +499,11 @@ void Room::CreateAndroid(int robot_num)
hum->Initialize();
AddToEntityHash(hum);
AddToHumanHash(hum);
MatchTeam(hum);
if (team) {
team->AddMember(hum);
} else {
MatchTeam(hum);
}
++alive_count_;
alive_count_chged_frameno_ = GetFrameNo();
++PerfMonitor::Instance()->alive_count;

2
server/gameserver/room.h
View File

@ -283,11 +283,11 @@ public:
int GenShotUniid() { return ++current_shot_uniid_; }
int InitWithMobaBattle(long ip_saddr, int socket_handle, std::shared_ptr<cs::CMJoin> msg,
std::shared_ptr<MobaBattle> p);
void CreateAndroid(int android_num, std::shared_ptr<Team> team = nullptr);
private:
void ShuaAndroid();
void ShowAndroid(Human* target, int num);
void CreateAndroid(int android_num);
void UpdateGas();
void UpdateGasInactive();
void UpdateGasInactivePvp();