-
18손재민 authored# Conflicts: # Assets/Prefabs/MapManager.prefab # Assets/Prefabs/Rooms/NormalRoom/Room 1.prefab # Assets/Prefabs/Rooms/NormalRoom/Room 10.prefab # Assets/Prefabs/Rooms/NormalRoom/Room 11.prefab # Assets/Prefabs/Rooms/NormalRoom/Room 12.prefab # Assets/Prefabs/Rooms/NormalRoom/Room 13.prefab # Assets/Prefabs/Rooms/NormalRoom/Room 14.prefab # Assets/Prefabs/Rooms/NormalRoom/Room 15.prefab # Assets/Prefabs/Rooms/NormalRoom/Room 16.prefab # Assets/Prefabs/Rooms/NormalRoom/Room 17.prefab # Assets/Prefabs/Rooms/NormalRoom/Room 18.prefab # Assets/Prefabs/Rooms/NormalRoom/Room 19.prefab # Assets/Prefabs/Rooms/NormalRoom/Room 2.prefab # Assets/Prefabs/Rooms/NormalRoom/Room 20.prefab # Assets/Prefabs/Rooms/NormalRoom/Room 3.prefab # Assets/Prefabs/Rooms/NormalRoom/Room 4.prefab # Assets/Prefabs/Rooms/NormalRoom/Room 5.prefab # Assets/Prefabs/Rooms/NormalRoom/Room 6.prefab # Assets/Prefabs/Rooms/NormalRoom/Room 7.prefab # Assets/Prefabs/Rooms/NormalRoom/Room 8.prefab # Assets/Prefabs/Rooms/NormalRoom/Room 9.prefab # Assets/Prefabs/Rooms/SpecialRoom/Room Amethyst.prefab # Assets/Prefabs/Rooms/SpecialRoom/Room Boss 1-1.prefab # Assets/Prefabs/Rooms/SpecialRoom/Room Boss 1-2.prefab # Assets/Prefabs/Rooms/SpecialRoom/Room Boss 1-3.prefab # Assets/Prefabs/Rooms/SpecialRoom/Room Start.prefab # Assets/Scripts/CameraController.cs
f3ccf6ed