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 2023-03-24 13:10:23 +08:00
parent 2432919f8f
commit 4feaeec930
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/gameserver/incubator.cc
View File

@ -322,14 +322,12 @@ void Incubator::SpawnWaveMon(int wave)
int enemy_id = content->_enemys[monIdx]; int enemy_id = content->_enemys[monIdx];
const mt::Hero* hero_meta = mt::Hero::GetById(enemy_id); const mt::Hero* hero_meta = mt::Hero::GetById(enemy_id);
if (hero_meta) { if (hero_meta) {
// 999
#if 1
Position hero_pos; Position hero_pos;
hero_pos.FromGlmVec3(content->_spawn_point);
#if 0
hero_pos.SetX(5801.422); hero_pos.SetX(5801.422);
hero_pos.SetY(6.000006); hero_pos.SetY(6.000006);
hero_pos.SetZ(5607.3); hero_pos.SetZ(5607.3);
#else
Position hero_pos = content->spawn_point;
#endif #endif
int team_id = 666; int team_id = 666;

30
server/gameserver/mt/PveGeminiContent.cc
View File

@ -10,18 +10,28 @@ namespace mt
void PveGeminiContent::Init1() void PveGeminiContent::Init1()
{ {
std::vector<std::string> strings; {
a8::Split(enemy_id(), strings, '|'); std::vector<std::string> strings;
for (auto& str : strings) { a8::Split(enemy_id(), strings, '|');
_enemys.push_back(a8::XValue(str)); 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<const mt::PveGeminiContent*>({this});
}
}
} }
{ {
auto itr = mode_hash_.find(mode_id()); std::vector<std::string> strings;
if (itr != mode_hash_.end()) { a8::Split(spawn_point(), strings, ',');
itr->second.push_back(this); _spawn_point = glm::vec3(
} else { (float)a8::XValue(strings[0]).GetDouble(),
mode_hash_[mode_id()] = std::vector<const mt::PveGeminiContent*>({this}); 6.0f,
} (float)a8::XValue(strings[1]).GetDouble());
} }
} }