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 2022-08-23 11:43:36 +08:00
parent df9eac9267
commit 7fc119e652
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/gameserver/incubator.cc
View File

@ -243,6 +243,10 @@ void Incubator::ActiveAndroid(Human* hum, Human* android)
void Incubator::SpawnWaveMon(int wave) void Incubator::SpawnWaveMon(int wave)
{ {
if (room->IsGameOver()) {
return;
}
room->OnEnterNewWave(wave);
if (wave < 0) { if (wave < 0) {
abort(); abort();
} }
@ -257,9 +261,6 @@ void Incubator::SpawnWaveMon(int wave)
if (wave > 0 && room->IsDestoryRoom()) { if (wave > 0 && room->IsDestoryRoom()) {
return; return;
} }
if (room->IsGameOver()) {
return;
}
auto& mons = room->pve_mode_meta->waves[wave]; auto& mons = room->pve_mode_meta->waves[wave];
for (MetaData::PveGeminiContent* content : mons) { for (MetaData::PveGeminiContent* content : mons) {
room->xtimer.AddDeadLineTimerAndAttach room->xtimer.AddDeadLineTimerAndAttach

7
server/gameserver/room.cc
View File

@ -1311,7 +1311,7 @@ void Room::UpdateGasInactivePvp()
void Room::UpdateGasInactivePve() void Room::UpdateGasInactivePve()
{ {
{ {
first_safearea = pve_mode_meta->area[0]; auto first_safearea = pve_mode_meta->area[0];
gas_data_.gas_mode = GasWaiting; gas_data_.gas_mode = GasWaiting;
gas_data_.gas_start_frameno = GetFrameNo(); gas_data_.gas_start_frameno = GetFrameNo();
battle_start_frameno_ = GetFrameNo(); battle_start_frameno_ = GetFrameNo();
@ -4101,3 +4101,8 @@ bool Room::IsSurvivalRoom()
{ {
return GetMapMeta()->i->map_id() == 1003; return GetMapMeta()->i->map_id() == 1003;
} }
void Room::OnEnterNewWave(int wave)
{
}

1
server/gameserver/room.h
View File

@ -141,6 +141,7 @@ public:
Entity* GetEntityByUniId(int uniid); Entity* GetEntityByUniId(int uniid);
Human* GetHumanByUniId(int uniid); Human* GetHumanByUniId(int uniid);
int GetRealPlayerNum() { return accountid_hash_.size();} int GetRealPlayerNum() { return accountid_hash_.size();}
void OnEnterNewWave(int wave);
Player* NewPlayer(); Player* NewPlayer();
void AddPlayer(Player* hum, BornPoint* init_born_point = nullptr, bool no_matchteam = false); void AddPlayer(Player* hum, BornPoint* init_born_point = nullptr, bool no_matchteam = false);