diff --git a/server/gameserver/incubator.cc b/server/gameserver/incubator.cc index 5ab499bc..285bf2b3 100644 --- a/server/gameserver/incubator.cc +++ b/server/gameserver/incubator.cc @@ -322,14 +322,12 @@ void Incubator::SpawnWaveMon(int wave) int enemy_id = content->_enemys[monIdx]; const mt::Hero* hero_meta = mt::Hero::GetById(enemy_id); if (hero_meta) { - // 999 -#if 1 Position hero_pos; + hero_pos.FromGlmVec3(content->_spawn_point); +#if 0 hero_pos.SetX(5801.422); hero_pos.SetY(6.000006); hero_pos.SetZ(5607.3); -#else - Position hero_pos = content->spawn_point; #endif int team_id = 666; diff --git a/server/gameserver/mt/PveGeminiContent.cc b/server/gameserver/mt/PveGeminiContent.cc index b112257d..f924ff01 100644 --- a/server/gameserver/mt/PveGeminiContent.cc +++ b/server/gameserver/mt/PveGeminiContent.cc @@ -10,18 +10,28 @@ namespace mt void PveGeminiContent::Init1() { - std::vector strings; - a8::Split(enemy_id(), strings, '|'); - for (auto& str : strings) { - _enemys.push_back(a8::XValue(str)); + { + std::vector strings; + a8::Split(enemy_id(), strings, '|'); + for (auto& str : strings) { + _enemys.push_back(a8::XValue(str)); + } + { + auto itr = mode_hash_.find(mode_id()); + if (itr != mode_hash_.end()) { + itr->second.push_back(this); + } else { + mode_hash_[mode_id()] = std::vector({this}); + } + } } { - auto itr = mode_hash_.find(mode_id()); - if (itr != mode_hash_.end()) { - itr->second.push_back(this); - } else { - mode_hash_[mode_id()] = std::vector({this}); - } + std::vector strings; + a8::Split(spawn_point(), strings, ','); + _spawn_point = glm::vec3( + (float)a8::XValue(strings[0]).GetDouble(), + 6.0f, + (float)a8::XValue(strings[1]).GetDouble()); } }