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-31 07:10:53 +08:00
parent d61a046d29
commit 56b0bb4356
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/gameserver/incubator.cc
View File

@ -275,8 +275,7 @@ void Incubator::OnEnterNewWave(int wave)
timeout_ = true; timeout_ = true;
return; return;
} }
if (wave > 0 && room->IsSurvivalRoom()) {
if (wave > 0 && room->IsDestoryRoom()) {
return; return;
} }
if (wave + 1 < room->pve_mode_meta->waves.size()) { if (wave + 1 < room->pve_mode_meta->waves.size()) {
@ -286,6 +285,9 @@ void Incubator::OnEnterNewWave(int wave)
void Incubator::SpawnWaveMon(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]; auto& mons = room->pve_mode_meta->waves[wave];
for (MetaData::PveGeminiContent* content : mons) { for (MetaData::PveGeminiContent* content : mons) {
for (int i = 0; i < content->enemys.size(); ++i) { 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(); MetaData::PveGeminiContent* content = (MetaData::PveGeminiContent*)param.param1.GetUserData();
Room* room = (Room*)param.param2.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()) { if (param.param3.GetInt() < content->enemys.size()) {
int enemy_id = content->enemys[param.param3.GetInt()]; int enemy_id = content->enemys[param.param3.GetInt()];
MetaData::Player* hero_meta = MetaMgr::Instance()->GetPlayer(enemy_id); MetaData::Player* hero_meta = MetaMgr::Instance()->GetPlayer(enemy_id);