From 6973bf987f2ea7e31e2efc85508bb05dce67d1b3 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 29 Aug 2022 14:33:38 +0800 Subject: [PATCH] 1 --- server/gameserver/incubator.cc | 2 +- server/gameserver/metadata.cc | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/server/gameserver/incubator.cc b/server/gameserver/incubator.cc index 1abf0f09..bd1acff5 100644 --- a/server/gameserver/incubator.cc +++ b/server/gameserver/incubator.cc @@ -291,7 +291,7 @@ void Incubator::SpawnWaveMon(int wave) for (int i = 0; i < content->enemys.size(); ++i) { room->xtimer.AddDeadLineTimerAndAttach ( - room->IsDestoryRoom() ? 0 : SERVER_FRAME_RATE * 2, + i == 0 ? 0 : 1000 / FRAME_RATE_MS, a8::XParams() .SetSender(this) .SetParam1(content) diff --git a/server/gameserver/metadata.cc b/server/gameserver/metadata.cc index e4e651ab..baee1e73 100644 --- a/server/gameserver/metadata.cc +++ b/server/gameserver/metadata.cc @@ -1659,7 +1659,13 @@ namespace MetaData void PveGeminiContent::Init() { - + { + std::vector strings; + a8::Split(pb->enemy_id(), strings, '|'); + for (auto& str : strings) { + enemys.push_back(a8::XValue(str)); + } + } } void PveGeminiMode::Init()