This commit is contained in:
aozhiwei 2023-03-23 21:58:02 +08:00
parent feb3b248e9
commit 4c0219e3e0
2 changed files with 22 additions and 18 deletions

View File

@ -16,9 +16,9 @@ void MapMgr::Init()
( (
[this] (const mt::Map* map_meta, bool& stop) [this] (const mt::Map* map_meta, bool& stop)
{ {
if (map_meta->map_id() != 2001) { if (map_meta->map_id() == 2001 ||
return; map_meta->map_id() == 1003
} ) {
auto map_instance = std::make_shared<MapInstance>(); auto map_instance = std::make_shared<MapInstance>();
map_instance->map_id = map_meta->map_id(); map_instance->map_id = map_meta->map_id();
map_instance->Init(); map_instance->Init();
@ -33,6 +33,7 @@ void MapMgr::Init()
std::vector<std::shared_ptr<MapInstance>>({map_instance}); std::vector<std::shared_ptr<MapInstance>>({map_instance});
} }
} }
}
}); });
#if 0 #if 0
if (mode_hash_.find(kZombieMode) == mode_hash_.end()) { if (mode_hash_.find(kZombieMode) == mode_hash_.end()) {
@ -84,9 +85,11 @@ void MapMgr::AttachRoom(Room* room, RoomInitInfo& init_info)
}); });
#endif #endif
} }
#ifdef MAP3D #if 1
init_info.init_map_id = 2001;
auto map_instance = GetMapInstance(init_info.init_map_id); auto map_instance = GetMapInstance(init_info.init_map_id);
if (!map_instance) {
map_instance = GetMapInstance(2001);
}
#else #else
MapInstance* map_instance = init_info.init_map_id == 0 ? MapInstance* map_instance = init_info.init_map_id == 0 ?
RandMapInstance(init_info.room_mode) : GetMapInstance(init_info.init_map_id); RandMapInstance(init_info.room_mode) : GetMapInstance(init_info.init_map_id);

View File

@ -11,7 +11,6 @@ namespace mt
void PveGeminiMode::Init1() void PveGeminiMode::Init1()
{ {
return;
{ {
std::vector<std::string> strings; std::vector<std::string> strings;
a8::Split(mode_time(), strings, '|'); a8::Split(mode_time(), strings, '|');
@ -68,6 +67,7 @@ namespace mt
abort(); abort();
} }
} }
#if 0
{ {
std::vector<std::string> strings; std::vector<std::string> strings;
a8::Split(round_score(), strings, '|'); a8::Split(round_score(), strings, '|');
@ -99,6 +99,7 @@ namespace mt
} }
} }
} }
#endif
} }
int PveGeminiMode::CalcStar(int score) const int PveGeminiMode::CalcStar(int score) const