From 596e68311376f38e91d4644b06626cf786b3eb39 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 16 Mar 2021 17:46:55 +0800 Subject: [PATCH] 1 --- server/gameserver/constant.h | 3 ++- server/gameserver/mapinstance.cc | 2 ++ server/gameserver/mapinstance.h | 2 ++ server/gameserver/room.h | 2 ++ server/gameserver/types.h | 2 ++ 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/server/gameserver/constant.h b/server/gameserver/constant.h index 17145103..0b5e6806 100755 --- a/server/gameserver/constant.h +++ b/server/gameserver/constant.h @@ -292,7 +292,8 @@ enum PropertyType_e enum MapObjectType_e { kMOT_Object = 1, - kMOT_SpawnPoint = 2 + kMOT_SpawnPoint = 2, + kMOT_MonsterSpawnPoint = 3 }; enum SkinSlot_e diff --git a/server/gameserver/mapinstance.cc b/server/gameserver/mapinstance.cc index ed46cc4a..9c628c9a 100644 --- a/server/gameserver/mapinstance.cc +++ b/server/gameserver/mapinstance.cc @@ -71,6 +71,8 @@ void MapInstance::AttachRoom(Room* room, RoomInitInfo& init_info) init_info.map_service = map_service_; init_info.mini_room_spawn_points = &mini_room_spawn_points_; init_info.normal_room_spawn_points = &normal_room_spawn_points_; + init_info.mini_room_monster_spawn_points = &mini_room_monster_spawn_points_; + init_info.normal_room_monster_spawn_points = &normal_room_monster_spawn_points_; init_info.level0room_born_point_meta = level0room_born_point_; init_info.level1room_born_point_meta = level1room_born_point_; init_info.loots = &loots_; diff --git a/server/gameserver/mapinstance.h b/server/gameserver/mapinstance.h index ad56f376..278dd634 100644 --- a/server/gameserver/mapinstance.h +++ b/server/gameserver/mapinstance.h @@ -43,6 +43,8 @@ class MapInstance GridService* grid_service_ = nullptr; std::vector mini_room_spawn_points_; std::vector normal_room_spawn_points_; + std::vector mini_room_monster_spawn_points_; + std::vector normal_room_monster_spawn_points_; MetaData::MapTplThing* level0room_born_point_ = nullptr; MetaData::MapTplThing* level1room_born_point_ = nullptr; std::vector loots_; diff --git a/server/gameserver/room.h b/server/gameserver/room.h index d716c5d4..42f06169 100644 --- a/server/gameserver/room.h +++ b/server/gameserver/room.h @@ -259,6 +259,8 @@ private: RoomType_e room_type_ = RT_NewBrid; const std::vector* mini_room_spawn_points_ = nullptr; const std::vector* normal_room_spawn_points_ = nullptr; + const std::vector* mini_room_monster_spawn_points_ = nullptr; + const std::vector* normal_room_monster_spawn_points_ = nullptr; const MetaData::MapTplThing* level0room_born_point_meta_ = nullptr; const MetaData::MapTplThing* level1room_born_point_meta_ = nullptr; const std::vector* loots_ = nullptr; diff --git a/server/gameserver/types.h b/server/gameserver/types.h index 891d4e00..9754e3f0 100755 --- a/server/gameserver/types.h +++ b/server/gameserver/types.h @@ -172,6 +172,8 @@ struct RoomInitInfo MapService* map_service = nullptr; const std::vector* mini_room_spawn_points = nullptr; const std::vector* normal_room_spawn_points = nullptr; + const std::vector* mini_room_monster_spawn_points = nullptr; + const std::vector* normal_room_monster_spawn_points = nullptr; const MetaData::MapTplThing* level0room_born_point_meta = nullptr; const MetaData::MapTplThing* level1room_born_point_meta = nullptr; const std::vector* loots = nullptr;