From cbcd7f8264ea6015f50e98d433569f2b3bffe9b6 Mon Sep 17 00:00:00 2001 From: Ivy Date: Wed, 14 Apr 2021 21:32:30 -0500 Subject: [PATCH] Added transitions to boss room --- .../Assets/Scenes/DemoLevels/BossRoom.unity | 324 +++++++++++++----- .../Assets/Scenes/DemoLevels/PathToBoss.unity | 4 +- .../Assets/Scenes/DemoLevels/Spawn.unity | 2 +- .../ProjectSettings/EditorBuildSettings.asset | 3 + .../UserSettings/EditorUserSettings.asset | 8 +- 5 files changed, 240 insertions(+), 101 deletions(-) diff --git a/MuseumGame/Assets/Scenes/DemoLevels/BossRoom.unity b/MuseumGame/Assets/Scenes/DemoLevels/BossRoom.unity index 74a1733..09d082c 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/BossRoom.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/BossRoom.unity @@ -214,7 +214,19 @@ CompositeCollider2D: m_ColliderPaths: - m_Collider: {fileID: 73552635} m_ColliderPaths: - - - X: 40000100 + - - X: -89999959 + Y: -30000100 + - X: -100000041 + Y: -30000100 + - X: -100000100 + Y: -30000041 + - X: -100000100 + Y: -40000041 + - X: -100000041 + Y: -40000100 + - X: 40000041 + Y: -40000100 + - X: 40000100 Y: -40000041 - X: 40000100 Y: -40000000 @@ -237,12 +249,20 @@ CompositeCollider2D: - X: -100000100 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: -30000000 + - X: 40000100 Y: -30000000 - X: 40000100 Y: -29999959 @@ -251,21 +271,19 @@ CompositeCollider2D: - X: -89999900 Y: -29999900 - X: -89999900 - Y: 199999900 - - X: 159999900 - Y: 199999900 - - X: 159999900 - Y: -30000000 + Y: -30000041 m_CompositePaths: m_Paths: - - {x: 16.99998, y: -4.000004} - {x: 16.999975, y: 21.00001} - {x: -10.00001, y: 20.999975} - - {x: -9.999981, y: -4.000004} - - - {x: 15.99999, y: -2.9999707} - - {x: -8.99999, y: -2.9999607} + - {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: -10.00001, y: -3.0000334} + - {x: -9.999981, y: -4.000004} m_VertexDistance: 0.0005 m_OffsetDistance: 0.00005 --- !u!50 &73552638 @@ -616,16 +634,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -10, 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: -3, z: 0} second: serializedVersion: 2 @@ -636,16 +644,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -10, 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: 16, y: -2, z: 0} second: serializedVersion: 2 @@ -1368,7 +1366,7 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 25 m_Data: {fileID: 11400000, guid: a9e61ac9b92cc4d7ca4efb63365c4ffe, type: 2} - - m_RefCount: 75 + - m_RefCount: 73 m_Data: {fileID: 11400000, guid: 2f55fc4daf0da424aa282004fc862d0a, type: 2} m_TileSpriteArray: - m_RefCount: 0 @@ -1391,10 +1389,10 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 25 m_Data: {fileID: 8984585068276349725, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} - - m_RefCount: 75 + - m_RefCount: 73 m_Data: {fileID: -2348927809873174427, guid: 33f7d659c72ba459ba2a9485c9501630, type: 3} m_TileMatrixArray: - - m_RefCount: 100 + - m_RefCount: 98 m_Data: e00: 1 e01: 0 @@ -1413,7 +1411,7 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 100 + - m_RefCount: 98 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 @@ -1566,66 +1564,204 @@ Transform: - {fileID: 2054795116} - {fileID: 2075568038} - {fileID: 1935037036} + - {fileID: 1787950111} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1015361709 -PrefabInstance: +--- !u!1 &1787950110 +GameObject: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 374150667840124763, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} - propertyPath: m_Name - value: Player - objectReference: {fileID: 0} - - target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} - propertyPath: m_LocalPosition.x - value: -6.22 - objectReference: {fileID: 0} - - target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} - propertyPath: m_LocalPosition.y - value: -2.1 - objectReference: {fileID: 0} - - target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1787950111} + - component: {fileID: 1787950115} + - component: {fileID: 1787950114} + - component: {fileID: 1787950113} + - component: {fileID: 1787950112} + m_Layer: 0 + m_Name: Exit + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1787950111 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1787950110} + 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 &1787950112 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1787950110} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 40bd09e5b49bf4584bee75d619e80b0b, type: 3} + m_Name: + m_EditorClassIdentifier: + LevelName: PathToBoss + whereTo: {x: 41.03, y: -1.15, z: 0} +--- !u!19719996 &1787950113 +TilemapCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1787950110} + 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 &1787950114 +TilemapRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1787950110} + 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 &1787950115 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1787950110} + m_Enabled: 1 + m_Tiles: + - first: {x: -10, 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: -10, 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: dd39fa09419e1479b8fa3cf7628c4a33, type: 2} + m_TileSpriteArray: + - m_RefCount: 2 + m_Data: {fileID: 3556915880641124632, 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: -10, y: -3, z: 0} + m_Size: {x: 10, 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 &1935037035 GameObject: m_ObjectHideFlags: 0 diff --git a/MuseumGame/Assets/Scenes/DemoLevels/PathToBoss.unity b/MuseumGame/Assets/Scenes/DemoLevels/PathToBoss.unity index dfb7f31..072b4e3 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/PathToBoss.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/PathToBoss.unity @@ -8185,8 +8185,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 40bd09e5b49bf4584bee75d619e80b0b, type: 3} m_Name: m_EditorClassIdentifier: - LevelName: Tower - whereTo: {x: 3.19, y: -11.17, z: 0} + LevelName: BossRoom + whereTo: {x: -8.24, y: -2.1, z: 0} --- !u!19719996 &389448434 TilemapCollider2D: m_ObjectHideFlags: 0 diff --git a/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity b/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity index aef8942..63a27e2 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity @@ -1980,7 +1980,7 @@ MonoBehaviour: player: {fileID: 1370635947} obtainedPowerups: powerupStatus: - sceneToLoad: + sceneToLoad: BossRoom --- !u!4 &637676178 Transform: m_ObjectHideFlags: 0 diff --git a/MuseumGame/ProjectSettings/EditorBuildSettings.asset b/MuseumGame/ProjectSettings/EditorBuildSettings.asset index c65fb86..93c6b18 100644 --- a/MuseumGame/ProjectSettings/EditorBuildSettings.asset +++ b/MuseumGame/ProjectSettings/EditorBuildSettings.asset @@ -23,4 +23,7 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/DemoLevels/PathToBoss.unity guid: 2acb96c6953284d3f96eb5e26ea0e27f + - enabled: 1 + path: Assets/Scenes/DemoLevels/BossRoom.unity + guid: 503aec0bbe3ef4d1aa545a65ccf69365 m_configObjects: {} diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset index 0848e8d..a4133f7 100644 --- a/MuseumGame/UserSettings/EditorUserSettings.asset +++ b/MuseumGame/UserSettings/EditorUserSettings.asset @@ -18,16 +18,16 @@ EditorUserSettings: value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1a00637edea78fce9332b25 flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1a00637edea78fce9332b25 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820 flags: 0 RecentlyUsedScenePath-8: value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26