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-23 21:58:02 +08:00
parent feb3b248e9
commit 4c0219e3e0
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
server/gameserver/mapmgr.cc
View File

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

3
server/gameserver/mt/PveGeminiMode.cc
View File

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