This commit is contained in:
aozhiwei 2022-08-31 11:28:30 +08:00
parent 89113f0132
commit 60be8befe7
2 changed files with 7 additions and 2 deletions

View File

@ -252,6 +252,9 @@ void Incubator::ActiveAndroid(Human* hum, Human* android)
void Incubator::OnEnterNewWave(int wave) void Incubator::OnEnterNewWave(int wave)
{ {
#ifdef DEBUG
a8::XPrintf("OnEnterNewWave2 wave:%d \n", {wave});
#endif
if (room->IsGameOver()) { if (room->IsGameOver()) {
return; return;
} }
@ -275,9 +278,11 @@ void Incubator::OnEnterNewWave(int wave)
timeout_ = true; timeout_ = true;
return; return;
} }
#if 0
if (wave > 0 && room->IsSurvivalRoom()) { if (wave > 0 && room->IsSurvivalRoom()) {
return; return;
} }
#endif
if (wave + 1 < room->pve_mode_meta->waves.size()) { if (wave + 1 < room->pve_mode_meta->waves.size()) {
SpawnWaveMon(wave + 1); SpawnWaveMon(wave + 1);
} }

View File

@ -4129,9 +4129,9 @@ void Room::OnEnterNewWave(int wave)
gas_data_.rad_old = gas_data_.old_area_meta->i->rad(); gas_data_.rad_old = gas_data_.old_area_meta->i->rad();
gas_data_.rad_new = gas_data_.new_area_meta->i->rad(); gas_data_.rad_new = gas_data_.new_area_meta->i->rad();
gas_data_.gas_progress = 0; gas_data_.gas_progress = 0;
}
NotifyUiUpdate();
#ifdef DEBUG #ifdef DEBUG
a8::XPrintf("OnEnternerWave:%d\n", {wave}); a8::XPrintf("OnEnternerWave:%d\n", {wave});
#endif #endif
NotifyUiUpdate();
}
} }