From 56b0bb4356e2bae9b5525cd28b7190365c0d001c Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 31 Aug 2022 07:10:53 +0800 Subject: [PATCH] 1 --- server/gameserver/incubator.cc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/server/gameserver/incubator.cc b/server/gameserver/incubator.cc index 3252fec9..e8a59656 100644 --- a/server/gameserver/incubator.cc +++ b/server/gameserver/incubator.cc @@ -275,8 +275,7 @@ void Incubator::OnEnterNewWave(int wave) timeout_ = true; return; } - - if (wave > 0 && room->IsDestoryRoom()) { + if (wave > 0 && room->IsSurvivalRoom()) { return; } if (wave + 1 < room->pve_mode_meta->waves.size()) { @@ -286,6 +285,9 @@ void Incubator::OnEnterNewWave(int wave) void Incubator::SpawnWaveMon(int wave) { +#ifdef DEBUG + a8::XPrintf("SpawnWaveMon wave:%d \n", {wave}); +#endif auto& mons = room->pve_mode_meta->waves[wave]; for (MetaData::PveGeminiContent* content : mons) { for (int i = 0; i < content->enemys.size(); ++i) { @@ -301,6 +303,10 @@ void Incubator::SpawnWaveMon(int wave) { MetaData::PveGeminiContent* content = (MetaData::PveGeminiContent*)param.param1.GetUserData(); Room* room = (Room*)param.param2.GetUserData(); + int wave = param.param3.GetInt(); +#ifdef DEBUG + a8::XPrintf("wave i:%d enemys_size:%d\n", {wave, content->enemys.size()}); +#endif if (param.param3.GetInt() < content->enemys.size()) { int enemy_id = content->enemys[param.param3.GetInt()]; MetaData::Player* hero_meta = MetaMgr::Instance()->GetPlayer(enemy_id);