diff --git a/MuseumGame/Assets/Scenes/DemoLevels/Blank Level.unity b/MuseumGame/Assets/Scenes/DemoLevels/Blank Level.unity index 6aa48c7..ebdf279 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/Blank Level.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/Blank Level.unity @@ -818,6 +818,7 @@ Transform: - {fileID: 1935037036} - {fileID: 612235267} - {fileID: 145706357} + - {fileID: 1899158036} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -878,6 +879,208 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} +--- !u!1 &1899158035 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1899158036} + - component: {fileID: 1899158042} + - component: {fileID: 1899158041} + - component: {fileID: 1899158040} + - component: {fileID: 1899158039} + - component: {fileID: 1899158038} + - component: {fileID: 1899158037} + m_Layer: 0 + m_Name: OneWay + m_TagString: OneWay + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1899158036 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1899158035} + 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: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!66 &1899158037 +CompositeCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1899158035} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 1 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_GeometryType: 0 + m_GenerationType: 0 + m_EdgeRadius: 0 + m_ColliderPaths: + - m_Collider: {fileID: 1899158039} + m_ColliderPaths: [] + m_CompositePaths: + m_Paths: [] + m_VertexDistance: 0.0005 + m_OffsetDistance: 0.00005 +--- !u!50 &1899158038 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1899158035} + m_BodyType: 2 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!19719996 &1899158039 +TilemapCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1899158035} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 1 + m_Offset: {x: 0, y: 0} + m_MaximumTileChangeCount: 1000 + m_ExtrusionFactor: 0.00001 +--- !u!251 &1899158040 +PlatformEffector2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1899158035} + m_Enabled: 1 + m_UseColliderMask: 1 + m_ColliderMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RotationalOffset: 0 + m_UseOneWay: 1 + m_UseOneWayGrouping: 0 + m_SurfaceArc: 180 + m_UseSideFriction: 0 + m_UseSideBounce: 0 + m_SideArc: 1 +--- !u!483693784 &1899158041 +TilemapRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1899158035} + 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 &1899158042 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1899158035} + 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 &1935037035 GameObject: m_ObjectHideFlags: 0 @@ -1031,6 +1234,9 @@ GameObject: - component: {fileID: 2054795116} - component: {fileID: 2054795118} - component: {fileID: 2054795117} + - component: {fileID: 2054795121} + - component: {fileID: 2054795120} + - component: {fileID: 2054795119} m_Layer: 0 m_Name: Ceiling m_TagString: Untagged @@ -1170,6 +1376,67 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!66 &2054795119 +CompositeCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2054795115} + 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_GeometryType: 0 + m_GenerationType: 0 + m_EdgeRadius: 0 + m_ColliderPaths: + - m_Collider: {fileID: 2054795121} + m_ColliderPaths: [] + m_CompositePaths: + m_Paths: [] + m_VertexDistance: 0.0005 + m_OffsetDistance: 0.00005 +--- !u!50 &2054795120 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2054795115} + m_BodyType: 2 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!19719996 &2054795121 +TilemapCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2054795115} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 1 + m_Offset: {x: 0, y: 0} + m_MaximumTileChangeCount: 1000 + m_ExtrusionFactor: 0.00001 --- !u!1 &2075568037 GameObject: m_ObjectHideFlags: 0 diff --git a/MuseumGame/Assets/Scenes/DemoLevels/EnemyTunnel.unity b/MuseumGame/Assets/Scenes/DemoLevels/EnemyTunnel.unity index d3f8926..8d3256a 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/EnemyTunnel.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/EnemyTunnel.unity @@ -590,56 +590,42 @@ CompositeCollider2D: Y: -40000000 - X: 250000000 Y: -40000000 - - - X: -159999900 - Y: -60000041 - - X: -159999900 - Y: -49999959 - - X: -159999959 - Y: -49999900 - - X: -200000041 - Y: -49999900 - - X: -200000100 - Y: -49999959 - - X: -200000100 - Y: -60000041 - - X: -200000041 - Y: -60000100 - - X: -159999959 - Y: -60000100 - - - X: -59999900 - Y: -60000041 - - X: -59999900 - Y: -49999959 - - X: -59999959 - Y: -49999900 - - X: -100000041 - Y: -49999900 - - X: -100000100 - Y: -49999959 - - X: -100000100 - Y: -60000041 - - X: -100000041 - Y: -60000100 - - X: -59999959 - Y: -60000100 - - - X: 30000100 - Y: -60000041 - - X: 30000100 - Y: -49999959 - - X: 30000041 - Y: -49999900 - - X: -10000041 - Y: -49999900 - - X: -10000100 - Y: -49999959 - - X: -10000100 - Y: -60000041 - - X: -10000041 - Y: -60000100 - - X: 30000041 - Y: -60000100 m_CompositePaths: m_Paths: + - - {x: 23.999971, y: -1} + - {x: 24.000029, y: 0} + - {x: 25, y: 0.000029300001} + - {x: 24.999971, y: 1} + - {x: 24, y: 1.0000294} + - {x: 24.000029, y: 4} + - {x: 25, y: 4.000029} + - {x: 24.999971, y: 5} + - {x: 24, y: 5.0000296} + - {x: 24.000029, y: 8} + - {x: 25, y: 8.00003} + - {x: 24.999971, y: 9} + - {x: 24, y: 9.00003} + - {x: 24.000029, y: 12} + - {x: 25, y: 12.00003} + - {x: 24.999971, y: 13} + - {x: 24, y: 13.00003} + - {x: 24.000029, y: 16} + - {x: 25, y: 16.000029} + - {x: 24.999971, y: 17} + - {x: 23, y: 16.999971} + - {x: 22.999971, y: 0} + - {x: 9, y: 0.0000294} + - {x: 8.99997, y: 1} + - {x: 7, y: 1.0000294} + - {x: 6.9999704, y: 2} + - {x: -26, y: 2.0000293} + - {x: -26.000029, y: 4} + - {x: -27, y: 3.999971} + - {x: -26.999971, y: 1} + - {x: 6, y: 0.9999706} + - {x: 6.000029, y: 0} + - {x: 8, y: -0.0000294} + - {x: 8.00003, y: -1} - - {x: 21.999971, y: -13} - {x: 22.000029, y: -11} - {x: 23, y: -10.99997} @@ -708,56 +694,10 @@ CompositeCollider2D: - {x: 6.000029, y: -11} - {x: 7, y: -11.00003} - {x: 7.0000296, y: -13} - - - {x: 23.999971, y: -1} - - {x: 24.000029, y: 0} - - {x: 25, y: 0.000029300001} - - {x: 24.999971, y: 1} - - {x: 24, y: 1.0000294} - - {x: 24.000029, y: 4} - - {x: 25, y: 4.000029} - - {x: 24.999971, y: 5} - - {x: 24, y: 5.0000296} - - {x: 24.000029, y: 8} - - {x: 25, y: 8.00003} - - {x: 24.999971, y: 9} - - {x: 24, y: 9.00003} - - {x: 24.000029, y: 12} - - {x: 25, y: 12.00003} - - {x: 24.999971, y: 13} - - {x: 24, y: 13.00003} - - {x: 24.000029, y: 16} - - {x: 25, y: 16.000029} - - {x: 24.999971, y: 17} - - {x: 23, y: 16.999971} - - {x: 22.999971, y: 0} - - {x: 9, y: 0.0000294} - - {x: 8.99997, y: 1} - - {x: 7, y: 1.0000294} - - {x: 6.9999704, y: 2} - - {x: -26, y: 2.0000293} - - {x: -26.000029, y: 4} - - {x: -27, y: 3.999971} - - {x: -26.999971, y: 1} - - {x: 6, y: 0.9999706} - - {x: 6.000029, y: 0} - - {x: 8, y: -0.0000294} - - {x: 8.00003, y: -1} - - {x: 24.999971, y: -4} - {x: 24.999971, y: -3} - {x: 24, y: -3.0000293} - {x: 24.000029, y: -4} - - - {x: 2.9999747, y: -6.00001} - - {x: 2.9999747, y: -4.99999} - - {x: -1.00001, y: -5.0000253} - - {x: -0.9999748, y: -6.00001} - - - {x: -6.0000253, y: -6.00001} - - {x: -6.0000253, y: -4.99999} - - {x: -10.00001, y: -5.0000253} - - {x: -9.999974, y: -6.00001} - - - {x: -16.000027, y: -6.00001} - - {x: -16.000027, y: -4.99999} - - {x: -20.00001, y: -5.0000253} - - {x: -19.999975, y: -6.00001} m_VertexDistance: 0.0005 m_OffsetDistance: 0.00005 --- !u!50 &73552638 @@ -1678,126 +1618,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -20, y: -6, 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: -19, y: -6, 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: -18, y: -6, 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: -17, y: -6, 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: -6, 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: -9, y: -6, 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: -8, y: -6, 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: -7, y: -6, 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: -1, y: -6, 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: 0, y: -6, 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: 1, y: -6, 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: 2, y: -6, 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: 27, y: -6, z: 0} second: serializedVersion: 2 @@ -3000,7 +2820,7 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 4 m_Data: {fileID: 11400000, guid: 16aefe7c98f3c4a1781f09174d9599f7, type: 2} - - m_RefCount: 210 + - m_RefCount: 198 m_Data: {fileID: 11400000, guid: 684fa0616c60549079f2fbbc29584b04, type: 2} m_TileSpriteArray: - m_RefCount: 0 @@ -3023,10 +2843,10 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 4 m_Data: {fileID: 4798128000316562087, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} - - m_RefCount: 210 + - m_RefCount: 198 m_Data: {fileID: -7708644975649761358, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} m_TileMatrixArray: - - m_RefCount: 214 + - m_RefCount: 202 m_Data: e00: 1 e01: 0 @@ -3045,7 +2865,7 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 214 + - m_RefCount: 202 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 @@ -3577,9 +3397,429 @@ Transform: - {fileID: 2075568038} - {fileID: 1935037036} - {fileID: 1067141781} + - {fileID: 1041502024} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1041502023 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1041502024} + - component: {fileID: 1041502030} + - component: {fileID: 1041502029} + - component: {fileID: 1041502028} + - component: {fileID: 1041502027} + - component: {fileID: 1041502026} + - component: {fileID: 1041502025} + - component: {fileID: 1041502031} + m_Layer: 0 + m_Name: OneWay + m_TagString: OneWay + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1041502024 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1041502023} + 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!251 &1041502025 +PlatformEffector2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1041502023} + m_Enabled: 1 + m_UseColliderMask: 1 + m_ColliderMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RotationalOffset: 0 + m_UseOneWay: 1 + m_UseOneWayGrouping: 0 + m_SurfaceArc: 180 + m_UseSideFriction: 0 + m_UseSideBounce: 0 + m_SideArc: 1 +--- !u!66 &1041502026 +CompositeCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1041502023} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 1 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_GeometryType: 0 + m_GenerationType: 0 + m_EdgeRadius: 0 + m_ColliderPaths: + - m_Collider: {fileID: 1041502028} + m_ColliderPaths: + - - X: -159999900 + Y: -60000041 + - X: -159999900 + Y: -49999959 + - X: -159999959 + Y: -49999900 + - X: -200000041 + Y: -49999900 + - X: -200000100 + Y: -49999959 + - X: -200000100 + Y: -60000041 + - X: -200000041 + Y: -60000100 + - X: -159999959 + Y: -60000100 + - - X: -59999900 + Y: -60000041 + - X: -59999900 + Y: -49999959 + - X: -59999959 + Y: -49999900 + - X: -100000041 + Y: -49999900 + - X: -100000100 + Y: -49999959 + - X: -100000100 + Y: -60000041 + - X: -100000041 + Y: -60000100 + - X: -59999959 + Y: -60000100 + - - X: 30000100 + Y: -60000041 + - X: 30000100 + Y: -49999959 + - X: 30000041 + Y: -49999900 + - X: -10000041 + Y: -49999900 + - X: -10000100 + Y: -49999959 + - X: -10000100 + Y: -60000041 + - X: -10000041 + Y: -60000100 + - X: 30000041 + Y: -60000100 + m_CompositePaths: + m_Paths: + - - {x: -16.000027, y: -6.00001} + - {x: -16.000027, y: -4.99999} + - {x: -20.00001, y: -5.0000253} + - {x: -19.999975, y: -6.00001} + - - {x: -6.0000253, y: -6.00001} + - {x: -6.0000253, y: -4.99999} + - {x: -10.00001, y: -5.0000253} + - {x: -9.999974, y: -6.00001} + - - {x: 2.9999747, y: -6.00001} + - {x: 2.9999747, y: -4.99999} + - {x: -1.00001, y: -5.0000253} + - {x: -0.9999748, y: -6.00001} + m_VertexDistance: 0.0005 + m_OffsetDistance: 0.00005 +--- !u!50 &1041502027 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1041502023} + m_BodyType: 2 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!19719996 &1041502028 +TilemapCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1041502023} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 1 + m_UsedByComposite: 1 + m_Offset: {x: 0, y: 0} + m_MaximumTileChangeCount: 1000 + m_ExtrusionFactor: 0.00001 +--- !u!483693784 &1041502029 +TilemapRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1041502023} + 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 &1041502030 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1041502023} + m_Enabled: 1 + m_Tiles: + - first: {x: -20, y: -6, 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: -19, y: -6, 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: -18, y: -6, 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: -17, y: -6, 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: -10, y: -6, 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: -9, y: -6, 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: -8, y: -6, 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: -7, y: -6, 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: -1, y: -6, 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: 0, y: -6, 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: 1, y: -6, 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: 2, y: -6, 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: 12 + m_Data: {fileID: 11400000, guid: 684fa0616c60549079f2fbbc29584b04, type: 2} + m_TileSpriteArray: + - m_RefCount: 12 + m_Data: {fileID: -7708644975649761358, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} + m_TileMatrixArray: + - m_RefCount: 12 + 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: 12 + 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: -20, y: -6, z: 0} + m_Size: {x: 23, y: 6, 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!114 &1041502031 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1041502023} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 35c500ab519134c20a1a12500b0c969b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1067141780 GameObject: m_ObjectHideFlags: 0 diff --git a/MuseumGame/Assets/Scenes/DemoLevels/Tower.unity b/MuseumGame/Assets/Scenes/DemoLevels/Tower.unity index 777f562..be54a01 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/Tower.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/Tower.unity @@ -3768,6 +3768,7 @@ GameObject: - component: {fileID: 1716577443} - component: {fileID: 1716577442} - component: {fileID: 1716577441} + - component: {fileID: 1716577445} m_Layer: 0 m_Name: Oneway m_TagString: OneWay @@ -3931,6 +3932,16 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -2, y: -24, 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: -7, y: -22, z: 0} second: serializedVersion: 2 @@ -4033,21 +4044,21 @@ Tilemap: m_AllTileFlags: 1073741825 m_AnimatedTiles: {} m_TileAssetArray: - - m_RefCount: 11 + - m_RefCount: 12 m_Data: {fileID: 11400000, guid: a4ae24b1b4e2b4e53961aa8f07ef9164, type: 2} - m_RefCount: 3 m_Data: {fileID: 11400000, guid: dd39fa09419e1479b8fa3cf7628c4a33, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 462c8271aeecb4e6b8b50996982dd328, type: 2} m_TileSpriteArray: - - m_RefCount: 11 + - m_RefCount: 12 m_Data: {fileID: 2870286397712609369, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} - m_RefCount: 3 m_Data: {fileID: 3556915880641124632, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} - m_RefCount: 1 m_Data: {fileID: 2147015527136506264, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} m_TileMatrixArray: - - m_RefCount: 15 + - m_RefCount: 16 m_Data: e00: 1 e01: 0 @@ -4066,7 +4077,7 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 15 + - m_RefCount: 16 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 @@ -4092,6 +4103,18 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!114 &1716577445 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1716577439} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 35c500ab519134c20a1a12500b0c969b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1746136367 GameObject: m_ObjectHideFlags: 0 diff --git a/MuseumGame/Assets/Scenes/MainMenu.unity b/MuseumGame/Assets/Scenes/MainMenu.unity index f948170..cbc2672 100644 --- a/MuseumGame/Assets/Scenes/MainMenu.unity +++ b/MuseumGame/Assets/Scenes/MainMenu.unity @@ -2331,7 +2331,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4469907059167699923, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} propertyPath: m_Enabled - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} diff --git a/MuseumGame/Assets/Scripts/DropThroughPlatform.cs b/MuseumGame/Assets/Scripts/DropThroughPlatform.cs new file mode 100644 index 0000000..1209e94 --- /dev/null +++ b/MuseumGame/Assets/Scripts/DropThroughPlatform.cs @@ -0,0 +1,32 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class DropThroughPlatform : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + //Debug.Log(Input.GetAxisRaw("Vertical")); + } + + //https://forum.unity.com/threads/jumping-down-through-a-platform.414902/ + void OnCollisionStay2D(Collision2D other) + { + if (other.gameObject.tag == "Player" && (Input.GetAxisRaw("Vertical") < 0)){ + TogglePlatform(); + Invoke("TogglePlatform", 0.5f); + } + } + public void TogglePlatform() + { + gameObject.GetComponent().enabled = !gameObject.GetComponent().enabled; + } +} + diff --git a/MuseumGame/Assets/Scripts/DropThroughPlatform.cs.meta b/MuseumGame/Assets/Scripts/DropThroughPlatform.cs.meta new file mode 100644 index 0000000..2a2481e --- /dev/null +++ b/MuseumGame/Assets/Scripts/DropThroughPlatform.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 35c500ab519134c20a1a12500b0c969b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset index c1209b1..4950cec 100644 --- a/MuseumGame/UserSettings/EditorUserSettings.asset +++ b/MuseumGame/UserSettings/EditorUserSettings.asset @@ -15,22 +15,22 @@ EditorUserSettings: value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 flags: 0 RecentlyUsedScenePath-9: value: 22424703114646680e0b0227036c72111f19352f223d68252320092a