diff --git a/MuseumGame/Assets/Scenes/DemoLevels/BossRoom.unity b/MuseumGame/Assets/Scenes/DemoLevels/BossRoom.unity index 7bd3efb..2daf059 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/BossRoom.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/BossRoom.unity @@ -1491,7 +1491,7 @@ Camera: far clip plane: 1000 field of view: 60 orthographic: 1 - orthographic size: 21.196718 + orthographic size: 8 m_Depth: -1 m_CullingMask: serializedVersion: 2 diff --git a/MuseumGame/Assets/Scenes/DemoLevels/RouteToTower.unity b/MuseumGame/Assets/Scenes/DemoLevels/RouteToTower.unity index 11e7677..9ce3aba 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/RouteToTower.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/RouteToTower.unity @@ -1859,63 +1859,6 @@ Tilemap: e31: 0 e32: 0 e33: 1 ---- !u!1001 &361353698 -PrefabInstance: - 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: 1 - objectReference: {fileID: 0} - - target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} - propertyPath: m_LocalPosition.x - value: -20.92358 - objectReference: {fileID: 0} - - target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} - propertyPath: m_LocalPosition.y - value: -2.124038 - 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} --- !u!1 &378298693 GameObject: m_ObjectHideFlags: 0 @@ -3196,7 +3139,7 @@ Transform: - {fileID: 1794558368} - {fileID: 1547214669} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1547214668 GameObject: diff --git a/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity b/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity index b0ed5e7..e94cc87 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity @@ -2077,7 +2077,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &516074240 GameObject: @@ -2202,7 +2202,7 @@ PrefabInstance: objectReference: {fileID: -3808752148845781986, guid: e03e538db736cbf4fba0318fc079a9e8, type: 3} - target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 374150667840124767, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} propertyPath: m_LocalPosition.x @@ -2337,7 +2337,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &637676179 AudioSource: @@ -2574,7 +2574,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1063858059 GameObject: @@ -2758,7 +2758,7 @@ Transform: - {fileID: 273288223} - {fileID: 1728623976} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!19719996 &1173694643 TilemapCollider2D: @@ -3285,7 +3285,7 @@ RectTransform: - {fileID: 355907460} - {fileID: 430284683} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4877,63 +4877,6 @@ TilemapCollider2D: m_Offset: {x: 0, y: 0} m_MaximumTileChangeCount: 1000 m_ExtrusionFactor: 0.00001 ---- !u!1001 &1869991958 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3406909610842081608, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3406909610842081608, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} - propertyPath: m_LocalPosition.x - value: 8.957203 - objectReference: {fileID: 0} - - target: {fileID: 3406909610842081608, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} - propertyPath: m_LocalPosition.y - value: -1.2 - objectReference: {fileID: 0} - - target: {fileID: 3406909610842081608, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3406909610842081608, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3406909610842081608, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3406909610842081608, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3406909610842081608, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3406909610842081608, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3406909610842081608, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3406909610842081608, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3406909610842081614, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} - propertyPath: m_Name - value: Glider Powerup placeholder - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} --- !u!1 &2018902676 GameObject: m_ObjectHideFlags: 0 diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset index b8698af..1511cd8 100644 --- a/MuseumGame/UserSettings/EditorUserSettings.asset +++ b/MuseumGame/UserSettings/EditorUserSettings.asset @@ -9,10 +9,10 @@ EditorUserSettings: value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820 flags: 0 RecentlyUsedScenePath-3: value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d