diff --git a/MuseumGame/Assets/Scenes/DemoLevels/Blank Level.unity b/MuseumGame/Assets/Scenes/DemoLevels/Blank Level.unity index 5ac3f72..ace3e6a 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/Blank Level.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/Blank Level.unity @@ -389,6 +389,156 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!1 &145706356 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 145706357} + - component: {fileID: 145706361} + - component: {fileID: 145706360} + - component: {fileID: 145706359} + - component: {fileID: 145706358} + m_Layer: 0 + m_Name: Exit + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &145706357 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 145706356} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 680522172} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &145706358 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 145706356} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 40bd09e5b49bf4584bee75d619e80b0b, type: 3} + m_Name: + m_EditorClassIdentifier: + LevelName: + whereTo: {x: 0, y: 0, z: 0} +--- !u!19719996 &145706359 +TilemapCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 145706356} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_MaximumTileChangeCount: 1000 + m_ExtrusionFactor: 0.00001 +--- !u!483693784 &145706360 +TilemapRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 145706356} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_ChunkSize: {x: 32, y: 32, z: 32} + m_ChunkCullingBounds: {x: 0, y: 0, z: 0} + m_MaxChunkCount: 16 + m_MaxFrameAge: 16 + m_SortOrder: 0 + m_Mode: 0 + m_DetectChunkCullingBounds: 0 + m_MaskInteraction: 0 +--- !u!1839735485 &145706361 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 145706356} + m_Enabled: 1 + m_Tiles: {} + m_AnimatedTiles: {} + m_TileAssetArray: [] + m_TileSpriteArray: [] + m_TileMatrixArray: [] + m_TileColorArray: [] + m_TileObjectToInstantiateArray: [] + m_AnimationFrameRate: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Origin: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0, z: 1} + m_TileAnchor: {x: 0.5, y: 0.5, z: 0} + m_TileOrientation: 0 + m_TileOrientationMatrix: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 --- !u!1 &563510750 GameObject: m_ObjectHideFlags: 0 @@ -472,6 +622,156 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &612235266 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 612235267} + - component: {fileID: 612235271} + - component: {fileID: 612235270} + - component: {fileID: 612235269} + - component: {fileID: 612235268} + m_Layer: 0 + m_Name: Entrance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &612235267 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 612235266} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 680522172} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &612235268 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 612235266} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 40bd09e5b49bf4584bee75d619e80b0b, type: 3} + m_Name: + m_EditorClassIdentifier: + LevelName: + whereTo: {x: 0, y: 0, z: 0} +--- !u!19719996 &612235269 +TilemapCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 612235266} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_MaximumTileChangeCount: 1000 + m_ExtrusionFactor: 0.00001 +--- !u!483693784 &612235270 +TilemapRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 612235266} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_ChunkSize: {x: 32, y: 32, z: 32} + m_ChunkCullingBounds: {x: 0, y: 0, z: 0} + m_MaxChunkCount: 16 + m_MaxFrameAge: 16 + m_SortOrder: 0 + m_Mode: 0 + m_DetectChunkCullingBounds: 0 + m_MaskInteraction: 0 +--- !u!1839735485 &612235271 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 612235266} + m_Enabled: 1 + m_Tiles: {} + m_AnimatedTiles: {} + m_TileAssetArray: [] + m_TileSpriteArray: [] + m_TileMatrixArray: [] + m_TileColorArray: [] + m_TileObjectToInstantiateArray: [] + m_AnimationFrameRate: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Origin: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0, z: 1} + m_TileAnchor: {x: 0.5, y: 0.5, z: 0} + m_TileOrientation: 0 + m_TileOrientationMatrix: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 --- !u!1 &680522170 GameObject: m_ObjectHideFlags: 0 @@ -497,9 +797,9 @@ Grid: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 680522170} m_Enabled: 1 - m_CellSize: {x: 1, y: 1, z: 0} + m_CellSize: {x: 0.8659766, y: 1, z: 1} m_CellGap: {x: 0, y: 0, z: 0} - m_CellLayout: 0 + m_CellLayout: 1 m_CellSwizzle: 0 --- !u!4 &680522172 Transform: @@ -516,6 +816,8 @@ Transform: - {fileID: 2054795116} - {fileID: 2075568038} - {fileID: 1935037036} + - {fileID: 612235267} + - {fileID: 145706357} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/MuseumGame/Assets/Scenes/DemoLevels/BossRoom.unity b/MuseumGame/Assets/Scenes/DemoLevels/BossRoom.unity index 3b2c717..1ee243b 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/BossRoom.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/BossRoom.unity @@ -214,19 +214,35 @@ CompositeCollider2D: m_ColliderPaths: - m_Collider: {fileID: 73552635} m_ColliderPaths: - - - X: -89999959 - Y: -30000100 + - - X: 170000100 + Y: 210000041 + - X: 170000041 + Y: 210000100 - X: -100000041 - Y: -30000100 + Y: 210000100 - X: -100000100 - Y: -30000041 + Y: 210000041 - X: -100000100 - Y: -40000041 + Y: -9999959 - X: -100000041 - Y: -40000100 - - X: 40000041 - Y: -40000100 - - X: 40000100 + Y: -9999900 + - X: -89999959 + Y: -9999900 + - X: -89999900 + Y: -9999959 + - X: -89999900 + Y: 199999900 + - X: 159999900 + Y: 199999900 + - X: 159999900 + Y: -9999959 + - X: 159999959 + Y: -9999900 + - X: 170000041 + Y: -9999900 + - X: 170000100 + Y: -9999959 + - - X: 40000100 Y: -40000041 - X: 40000100 Y: -40000000 @@ -241,25 +257,13 @@ CompositeCollider2D: - X: 170000100 Y: -40000041 - X: 170000100 - Y: 210000041 + Y: -30000041 - X: 170000041 - Y: 210000100 - - X: -100000041 - Y: 210000100 - - X: -100000100 - Y: 210000041 - - X: -100000100 - Y: -9999959 - - X: -100000041 - Y: -9999900 - - X: -89999959 - Y: -9999900 - - X: -89999900 - Y: -9999959 - - X: -89999900 - Y: 199999900 + Y: -30000100 + - X: 159999959 + Y: -30000100 - X: 159999900 - Y: 199999900 + Y: -30000041 - X: 159999900 Y: -30000000 - X: 40000100 @@ -272,16 +276,30 @@ CompositeCollider2D: Y: -29999900 - X: -89999900 Y: -30000041 + - X: -89999959 + Y: -30000100 + - X: -100000041 + Y: -30000100 + - X: -100000100 + Y: -30000041 + - X: -100000100 + Y: -40000041 + - X: -100000041 + Y: -40000100 + - X: 40000041 + Y: -40000100 m_CompositePaths: m_Paths: - - - {x: 16.99998, y: -4.000004} + - - {x: -9.000019, y: -0.9999959} + - {x: -8.999961, y: 19.99999} + - {x: 15.99999, y: 19.99996} + - {x: 16.000027, y: -0.99999} + - {x: 17.000006, y: -0.9999607} - {x: 16.999975, y: 21.00001} - {x: -10.00001, y: 20.999975} - {x: -9.999974, y: -0.99999} - - {x: -8.99999, y: -0.9999666} - - {x: -8.999961, y: 19.99999} - - {x: 15.99999, y: 19.99996} - - {x: 15.99996, y: -3} + - - {x: 16.99998, y: -4.000004} + - {x: 16.999975, y: -3.00001} - {x: -10.00001, y: -3.0000334} - {x: -9.999981, y: -4.000004} m_VertexDistance: 0.0005 @@ -634,26 +652,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 16, y: -3, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: 16, y: -2, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - first: {x: -10, y: -1, z: 0} second: serializedVersion: 2 @@ -1366,7 +1364,7 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 25 m_Data: {fileID: 11400000, guid: a9e61ac9b92cc4d7ca4efb63365c4ffe, type: 2} - - m_RefCount: 73 + - m_RefCount: 71 m_Data: {fileID: 11400000, guid: 2f55fc4daf0da424aa282004fc862d0a, type: 2} m_TileSpriteArray: - m_RefCount: 0 @@ -1389,10 +1387,10 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 25 m_Data: {fileID: 8984585068276349725, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} - - m_RefCount: 73 + - m_RefCount: 71 m_Data: {fileID: -2348927809873174427, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} m_TileMatrixArray: - - m_RefCount: 98 + - m_RefCount: 96 m_Data: e00: 1 e01: 0 @@ -1411,7 +1409,7 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 98 + - m_RefCount: 96 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 @@ -1745,9 +1743,204 @@ Transform: - {fileID: 2075568038} - {fileID: 1935037036} - {fileID: 1787950111} + - {fileID: 1115280553} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1115280552 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1115280553} + - component: {fileID: 1115280557} + - component: {fileID: 1115280556} + - component: {fileID: 1115280555} + - component: {fileID: 1115280554} + m_Layer: 0 + m_Name: ToMuseum (TEMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1115280553 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1115280552} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 680522172} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!19719996 &1115280554 +TilemapCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1115280552} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_MaximumTileChangeCount: 1000 + m_ExtrusionFactor: 0.00001 +--- !u!114 &1115280555 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1115280552} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 40bd09e5b49bf4584bee75d619e80b0b, type: 3} + m_Name: + m_EditorClassIdentifier: + LevelName: Museum + whereTo: {x: -1.16, y: -3.15, z: 0} +--- !u!483693784 &1115280556 +TilemapRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1115280552} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_ChunkSize: {x: 32, y: 32, z: 32} + m_ChunkCullingBounds: {x: 0, y: 0, z: 0} + m_MaxChunkCount: 16 + m_MaxFrameAge: 16 + m_SortOrder: 0 + m_Mode: 0 + m_DetectChunkCullingBounds: 0 + m_MaskInteraction: 0 +--- !u!1839735485 &1115280557 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1115280552} + m_Enabled: 1 + m_Tiles: + - first: {x: 16, y: -3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 16, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + m_AnimatedTiles: {} + m_TileAssetArray: + - m_RefCount: 2 + m_Data: {fileID: 11400000, guid: a1394616918504c598b3b0e6205c158a, type: 2} + m_TileSpriteArray: + - m_RefCount: 2 + m_Data: {fileID: -6913125122176552986, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} + m_TileMatrixArray: + - m_RefCount: 2 + m_Data: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_TileColorArray: + - m_RefCount: 2 + m_Data: {r: 1, g: 1, b: 1, a: 1} + m_TileObjectToInstantiateArray: [] + m_AnimationFrameRate: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Origin: {x: 0, y: -3, z: 0} + m_Size: {x: 17, y: 3, z: 1} + m_TileAnchor: {x: 0.5, y: 0.5, z: 0} + m_TileOrientation: 0 + m_TileOrientationMatrix: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 --- !u!1 &1787950110 GameObject: m_ObjectHideFlags: 0 @@ -1762,7 +1955,7 @@ GameObject: - component: {fileID: 1787950113} - component: {fileID: 1787950112} m_Layer: 0 - m_Name: Exit + m_Name: RouteToBoss m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity b/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity index f9b124c..598ac92 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity @@ -155,14 +155,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 37e947767f230cb45b7cca13e4b4dbb3, type: 3} m_Name: m_EditorClassIdentifier: - canUnShrink: 1 - canShrink: 0 + canUnShrink: 0 + canShrink: 1 isShrunk: 0 minRbSize: {x: 0, y: 0, z: 0} minColSize: {x: 0, y: 0} defaultRbSize: {x: 0, y: 0, z: 0} defaultColSize: {x: 0, y: 0} - minSize: 0.5 --- !u!70 &13055935 CapsuleCollider2D: m_ObjectHideFlags: 0 @@ -259,7 +258,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 13055933} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.71, y: -0.97, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -2943,7 +2942,7 @@ MonoBehaviour: artImage: {fileID: 430284682} obtainedPowerups: powerupStatus: - sceneToLoad: + sceneToLoad: Museum music: - {fileID: 8300000, guid: f29919963390ff24fa1ae468277b309e, type: 3} --- !u!4 &637676178 diff --git a/MuseumGame/Assets/Scenes/Museum/Museum.unity b/MuseumGame/Assets/Scenes/Museum/Museum.unity index 00c9dec..417324e 100644 --- a/MuseumGame/Assets/Scenes/Museum/Museum.unity +++ b/MuseumGame/Assets/Scenes/Museum/Museum.unity @@ -254,14 +254,14 @@ CompositeCollider2D: Y: -39999959 - X: 450000041 Y: -39999900 - - X: -20000041 + - X: -19999900 Y: -39999900 - - X: -20000100 - Y: -39999959 - - X: -20000100 - Y: -40000000 + - X: -19999900 + Y: -40000041 + - X: -19999959 + Y: -40000100 - X: -30000000 - Y: -40000000 + Y: -40000100 - X: -30000000 Y: -43437500 - X: -28750000 @@ -285,7 +285,7 @@ CompositeCollider2D: - - {x: 44.81248, y: -5.00001} - {x: 45.00001, y: -4.1249976} - {x: 44.999973, y: -3.99999} - - {x: -3, y: -4.000029} + - {x: -3, y: -4.000039} - {x: -2.9999995, y: -4.343753} - {x: -2.8749766, y: -5} m_VertexDistance: 0.0005 @@ -1411,6 +1411,200 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!1 &277851817 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 277851818} + - component: {fileID: 277851822} + - component: {fileID: 277851821} + - component: {fileID: 277851820} + - component: {fileID: 277851819} + m_Layer: 0 + m_Name: Entrance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &277851818 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 277851817} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 680522172} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &277851819 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 277851817} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 40bd09e5b49bf4584bee75d619e80b0b, type: 3} + m_Name: + m_EditorClassIdentifier: + LevelName: BossRoom + whereTo: {x: 15.28, y: -1.97, z: 0} +--- !u!19719996 &277851820 +TilemapCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 277851817} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_MaximumTileChangeCount: 1000 + m_ExtrusionFactor: 0.00001 +--- !u!483693784 &277851821 +TilemapRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 277851817} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_ChunkSize: {x: 32, y: 32, z: 32} + m_ChunkCullingBounds: {x: 0, y: 0, z: 0} + m_MaxChunkCount: 16 + m_MaxFrameAge: 16 + m_SortOrder: 0 + m_Mode: 0 + m_DetectChunkCullingBounds: 0 + m_MaskInteraction: 0 +--- !u!1839735485 &277851822 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 277851817} + m_Enabled: 1 + m_Tiles: + - first: {x: -3, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -3, y: -3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + m_AnimatedTiles: {} + m_TileAssetArray: + - m_RefCount: 2 + m_Data: {fileID: 11400000, guid: a1394616918504c598b3b0e6205c158a, type: 2} + m_TileSpriteArray: + - m_RefCount: 2 + m_Data: {fileID: -6913125122176552986, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} + m_TileMatrixArray: + - m_RefCount: 2 + m_Data: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_TileColorArray: + - m_RefCount: 2 + m_Data: {r: 1, g: 1, b: 1, a: 1} + m_TileObjectToInstantiateArray: [] + m_AnimationFrameRate: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Origin: {x: -3, y: -4, z: 0} + m_Size: {x: 3, y: 4, z: 1} + m_TileAnchor: {x: 0.5, y: 0.5, z: 0} + m_TileOrientation: 0 + m_TileOrientationMatrix: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 --- !u!1 &563510750 GameObject: m_ObjectHideFlags: 0 @@ -1553,9 +1747,205 @@ Transform: - {fileID: 2054795116} - {fileID: 2075568038} - {fileID: 1935037036} + - {fileID: 277851818} + - {fileID: 993848333} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &993848332 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 993848333} + - component: {fileID: 993848337} + - component: {fileID: 993848336} + - component: {fileID: 993848335} + - component: {fileID: 993848334} + m_Layer: 0 + m_Name: Exit + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &993848333 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 993848332} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 680522172} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &993848334 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 993848332} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 40bd09e5b49bf4584bee75d619e80b0b, type: 3} + m_Name: + m_EditorClassIdentifier: + LevelName: + whereTo: {x: 0, y: 0, z: 0} +--- !u!19719996 &993848335 +TilemapCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 993848332} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_MaximumTileChangeCount: 1000 + m_ExtrusionFactor: 0.00001 +--- !u!483693784 &993848336 +TilemapRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 993848332} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_ChunkSize: {x: 32, y: 32, z: 32} + m_ChunkCullingBounds: {x: 0, y: 0, z: 0} + m_MaxChunkCount: 16 + m_MaxFrameAge: 16 + m_SortOrder: 0 + m_Mode: 0 + m_DetectChunkCullingBounds: 0 + m_MaskInteraction: 0 +--- !u!1839735485 &993848337 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 993848332} + m_Enabled: 1 + m_Tiles: + - first: {x: 44, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 44, y: -3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + m_AnimatedTiles: {} + m_TileAssetArray: + - m_RefCount: 2 + m_Data: {fileID: 11400000, guid: a1394616918504c598b3b0e6205c158a, type: 2} + m_TileSpriteArray: + - m_RefCount: 2 + m_Data: {fileID: -6913125122176552986, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} + m_TileMatrixArray: + - m_RefCount: 2 + m_Data: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_TileColorArray: + - m_RefCount: 2 + m_Data: {r: 1, g: 1, b: 1, a: 1} + m_TileObjectToInstantiateArray: [] + m_AnimationFrameRate: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Origin: {x: 0, y: -4, z: 0} + m_Size: {x: 45, y: 4, z: 1} + m_TileAnchor: {x: 0.5, y: 0.5, z: 0} + m_TileOrientation: 0 + m_TileOrientationMatrix: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 --- !u!1 &1935037035 GameObject: m_ObjectHideFlags: 0 diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset index b71ed7d..48fe9c4 100644 --- a/MuseumGame/UserSettings/EditorUserSettings.asset +++ b/MuseumGame/UserSettings/EditorUserSettings.asset @@ -6,34 +6,34 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 + value: 22424703114646680e0b0227036c6b1505032b292926237e38271427fb flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c6b1505032b292926237e38271427fb + value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d + value: 22424703114646680e0b0227036c72110203102f3b1c2323391a1e36ece57a2decee22f0 flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c72110203102f3b1c2323391a1e36ece57a2decee22f0 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820 flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 + value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb flags: 0 vcSharedLogLevel: value: 0d5e400f0650