From a1a86016fc9e721fa54c22322757ccf37645e0a8 Mon Sep 17 00:00:00 2001 From: Ava Gaiety Wroten Date: Wed, 17 Jun 2020 15:34:25 -0500 Subject: [PATCH] Corrected resolution settings --- Assets/Scenes/Credits.unity | 8 +- Assets/Scenes/Level 1.unity | 20 +- Assets/Scenes/Level 2.unity | 166 +--------- Assets/Scenes/Level 3.unity | 387 ++-------------------- Assets/Scenes/Menu.unity | 133 +------- ProjectSettings/EditorBuildSettings.asset | 6 +- ProjectSettings/GraphicsSettings.asset | 3 + ProjectSettings/ProjectSettings.asset | 23 +- 8 files changed, 71 insertions(+), 675 deletions(-) diff --git a/Assets/Scenes/Credits.unity b/Assets/Scenes/Credits.unity index 8c261f0..e5240ba 100644 --- a/Assets/Scenes/Credits.unity +++ b/Assets/Scenes/Credits.unity @@ -159,7 +159,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -525.3, y: -224.4} + m_AnchoredPosition: {x: -375.2, y: -224.4} m_SizeDelta: {x: 203.4, y: 52.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &449727264 @@ -1166,7 +1166,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -6, y: 3.5} + m_AnchoredPosition: {x: -3.6, y: 3.5} m_SizeDelta: {x: 20.88459, y: 2.8145046} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1740473842 @@ -1203,7 +1203,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -313.5, y: -15.9} + m_AnchoredPosition: {x: -160.8, y: -15.9} m_SizeDelta: {x: 627, y: 333.74695} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1740473844 @@ -1371,7 +1371,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 313.5, y: -15.9} + m_AnchoredPosition: {x: 285.9, y: -15.9} m_SizeDelta: {x: 627, y: 333.74695} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1893969632 diff --git a/Assets/Scenes/Level 1.unity b/Assets/Scenes/Level 1.unity index ebe89cd..7def154 100644 --- a/Assets/Scenes/Level 1.unity +++ b/Assets/Scenes/Level 1.unity @@ -146,7 +146,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 282580749} m_LocalRotation: {x: 0, y: 0, z: -0.7071068, w: 0.7071068} - m_LocalPosition: {x: -3.66, y: 4.1, z: -4.091925} + m_LocalPosition: {x: -2.11, y: 4.1, z: -4.091925} m_LocalScale: {x: 0.75, y: 0.75, z: 1} m_Children: - {fileID: 478363580} @@ -192,7 +192,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 297843864} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.38488045, y: -0.25969952, z: -3.8998504} + m_LocalPosition: {x: 1.66, y: -0.25969952, z: -3.8998504} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2146985681} @@ -385,7 +385,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 444980955} m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} - m_LocalPosition: {x: -4.8099995, y: 4.1119995, z: -4.091925} + m_LocalPosition: {x: -3.17, y: 4.1, z: -4.091925} m_LocalScale: {x: 0.75, y: 0.75, z: 1} m_Children: - {fileID: 890947062} @@ -863,7 +863,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 754243051} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -10.17, y: -1.02, z: -4.091925} + m_LocalPosition: {x: -8.12, y: -1.02, z: -4.091925} m_LocalScale: {x: 0.75, y: 0.75, z: 1} m_Children: - {fileID: 434058324} @@ -1156,12 +1156,12 @@ PrefabInstance: - target: {fileID: 8850846325249551371, guid: d1b5f4cead016014d929e32b103ac98a, type: 3} propertyPath: m_LocalPosition.x - value: 6.73 + value: 4.67 objectReference: {fileID: 0} - target: {fileID: 8850846325249551371, guid: d1b5f4cead016014d929e32b103ac98a, type: 3} propertyPath: m_LocalPosition.y - value: 4.23 + value: 5.59 objectReference: {fileID: 0} - target: {fileID: 8850846325249551371, guid: d1b5f4cead016014d929e32b103ac98a, type: 3} @@ -1452,7 +1452,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1334157776} m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} - m_LocalPosition: {x: -10.17, y: -2.26, z: -4.091925} + m_LocalPosition: {x: -8.12, y: -2.26, z: -4.091925} m_LocalScale: {x: 0.75, y: 0.75, z: 1} m_Children: - {fileID: 2006296177} @@ -1516,7 +1516,7 @@ PrefabInstance: - target: {fileID: 6608704605082953974, guid: 3a846b0ac67e7be41a41756ed221d199, type: 3} propertyPath: m_LocalPosition.x - value: 10.3 + value: 7.26 objectReference: {fileID: 0} - target: {fileID: 6608704605082953974, guid: 3a846b0ac67e7be41a41756ed221d199, type: 3} @@ -1765,7 +1765,7 @@ PrefabInstance: - target: {fileID: 5684450136180659875, guid: da00628a4304de44590a8391bfe8382f, type: 3} propertyPath: m_LocalPosition.x - value: -8.05 + value: -6.33 objectReference: {fileID: 0} - target: {fileID: 5684450136180659875, guid: da00628a4304de44590a8391bfe8382f, type: 3} @@ -1843,7 +1843,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1679737207} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.13, y: -0.25969952, z: -3.8998504} + m_LocalPosition: {x: 2.82, y: -0.25969952, z: -3.8998504} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1513283173} diff --git a/Assets/Scenes/Level 2.unity b/Assets/Scenes/Level 2.unity index f16a818..b5bcfdb 100644 --- a/Assets/Scenes/Level 2.unity +++ b/Assets/Scenes/Level 2.unity @@ -131,7 +131,7 @@ PrefabInstance: - target: {fileID: 7149257932277192581, guid: 06ab2b4ada2f33647914fdc25abfe4e8, type: 3} propertyPath: m_LocalPosition.x - value: 3.46 + value: 1.63 objectReference: {fileID: 0} - target: {fileID: 7149257932277192581, guid: 06ab2b4ada2f33647914fdc25abfe4e8, type: 3} @@ -215,7 +215,7 @@ PrefabInstance: - target: {fileID: 6460630409594600935, guid: 32fa01a5337b60d44bdc2573fd3ebe3f, type: 3} propertyPath: m_LocalPosition.x - value: 4.68 + value: 2.97 objectReference: {fileID: 0} - target: {fileID: 6460630409594600935, guid: 32fa01a5337b60d44bdc2573fd3ebe3f, type: 3} @@ -354,7 +354,7 @@ PrefabInstance: - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} propertyPath: m_LocalPosition.x - value: 8.36 + value: 7.18 objectReference: {fileID: 0} - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} @@ -389,7 +389,7 @@ PrefabInstance: - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} propertyPath: m_RootOrder - value: 9 + value: 8 objectReference: {fileID: 0} - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} @@ -611,7 +611,7 @@ PrefabInstance: - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} propertyPath: m_LocalPosition.x - value: -8.92 + value: -7.03 objectReference: {fileID: 0} - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} @@ -646,7 +646,7 @@ PrefabInstance: - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} propertyPath: m_RootOrder - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} @@ -806,7 +806,7 @@ PrefabInstance: - target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8, type: 3} @@ -870,7 +870,7 @@ Transform: - {fileID: 1178508770} - {fileID: 1049886269} m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1113559007 GameObject: @@ -1082,7 +1082,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1180,7 +1180,7 @@ PrefabInstance: - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} propertyPath: m_LocalPosition.x - value: -8.95 + value: -7.06 objectReference: {fileID: 0} - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} @@ -1215,7 +1215,7 @@ PrefabInstance: - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} @@ -1353,154 +1353,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1679737207} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 11.67, y: -0.25969952, z: -3.8998504} + m_LocalPosition: {x: 9.8, y: 0.53, z: -3.8998504} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1513283173} - {fileID: 511029264} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1925040025 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1925040027} - - component: {fileID: 1925040026} - - component: {fileID: 1925040028} - m_Layer: 0 - m_Name: Music - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!82 &1925040026 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1925040025} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: cc47eb2acc072a44e8f9f61bbcbdca03, type: 3} - m_PlayOnAwake: 1 - m_Volume: 1 - m_Pitch: 1 - Loop: 1 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 ---- !u!4 &1925040027 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1925040025} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.48254675, y: -0.23101182, z: -0.10147177} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1925040028 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1925040025} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ce5793741daafbe45a02c213f0d6dbf4, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &4683683891847250626 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Level 3.unity b/Assets/Scenes/Level 3.unity index b859c00..de76909 100644 --- a/Assets/Scenes/Level 3.unity +++ b/Assets/Scenes/Level 3.unity @@ -136,12 +136,12 @@ PrefabInstance: - target: {fileID: 5684450136180659875, guid: da00628a4304de44590a8391bfe8382f, type: 3} propertyPath: m_LocalPosition.x - value: 1.2434182 + value: 1.8 objectReference: {fileID: 0} - target: {fileID: 5684450136180659875, guid: da00628a4304de44590a8391bfe8382f, type: 3} propertyPath: m_LocalPosition.y - value: -1.914057 + value: -0.29 objectReference: {fileID: 0} - target: {fileID: 5684450136180659875, guid: da00628a4304de44590a8391bfe8382f, type: 3} @@ -171,7 +171,7 @@ PrefabInstance: - target: {fileID: 5684450136180659875, guid: da00628a4304de44590a8391bfe8382f, type: 3} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5684450136180659875, guid: da00628a4304de44590a8391bfe8382f, type: 3} @@ -214,13 +214,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 297843864} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.38488045, y: -0.25969952, z: -3.8998504} + m_LocalPosition: {x: -3.27, y: -0.25969952, z: -3.8998504} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2146985681} - {fileID: 1923529196} m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &366015756 PrefabInstance: @@ -247,12 +247,12 @@ PrefabInstance: - target: {fileID: 6460630409594600935, guid: 32fa01a5337b60d44bdc2573fd3ebe3f, type: 3} propertyPath: m_LocalPosition.x - value: 0.08 + value: 0.98 objectReference: {fileID: 0} - target: {fileID: 6460630409594600935, guid: 32fa01a5337b60d44bdc2573fd3ebe3f, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -0.23 objectReference: {fileID: 0} - target: {fileID: 6460630409594600935, guid: 32fa01a5337b60d44bdc2573fd3ebe3f, type: 3} @@ -282,7 +282,7 @@ PrefabInstance: - target: {fileID: 6460630409594600935, guid: 32fa01a5337b60d44bdc2573fd3ebe3f, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 6460630409594600935, guid: 32fa01a5337b60d44bdc2573fd3ebe3f, type: 3} @@ -301,75 +301,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 32fa01a5337b60d44bdc2573fd3ebe3f, type: 3} ---- !u!1001 &373193185 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 8850846325249551370, guid: d1b5f4cead016014d929e32b103ac98a, - type: 3} - propertyPath: m_Name - value: Wall-Straight-Small-3 - objectReference: {fileID: 0} - - target: {fileID: 8850846325249551371, guid: d1b5f4cead016014d929e32b103ac98a, - type: 3} - propertyPath: m_LocalPosition.x - value: -0.89 - objectReference: {fileID: 0} - - target: {fileID: 8850846325249551371, guid: d1b5f4cead016014d929e32b103ac98a, - type: 3} - propertyPath: m_LocalPosition.y - value: 2.25 - objectReference: {fileID: 0} - - target: {fileID: 8850846325249551371, guid: d1b5f4cead016014d929e32b103ac98a, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8850846325249551371, guid: d1b5f4cead016014d929e32b103ac98a, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8850846325249551371, guid: d1b5f4cead016014d929e32b103ac98a, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8850846325249551371, guid: d1b5f4cead016014d929e32b103ac98a, - type: 3} - propertyPath: m_LocalRotation.z - value: 0.38268343 - objectReference: {fileID: 0} - - target: {fileID: 8850846325249551371, guid: d1b5f4cead016014d929e32b103ac98a, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.92387956 - objectReference: {fileID: 0} - - target: {fileID: 8850846325249551371, guid: d1b5f4cead016014d929e32b103ac98a, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8850846325249551371, guid: d1b5f4cead016014d929e32b103ac98a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8850846325249551371, guid: d1b5f4cead016014d929e32b103ac98a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8850846325249551371, guid: d1b5f4cead016014d929e32b103ac98a, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 45 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: d1b5f4cead016014d929e32b103ac98a, type: 3} --- !u!1001 &511029263 PrefabInstance: m_ObjectHideFlags: 0 @@ -445,75 +376,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 511029263} m_PrefabAsset: {fileID: 0} ---- !u!1001 &517180405 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_LocalPosition.x - value: 4.88 - objectReference: {fileID: 0} - - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_LocalPosition.y - value: -3.41 - objectReference: {fileID: 0} - - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_RootOrder - value: 13 - objectReference: {fileID: 0} - - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 75116796779505599, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_Name - value: Mirror (3) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} --- !u!1 &519420028 GameObject: m_ObjectHideFlags: 0 @@ -712,7 +574,7 @@ PrefabInstance: - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} propertyPath: m_LocalPosition.x - value: -5.4 + value: -6.41 objectReference: {fileID: 0} - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} @@ -747,7 +609,7 @@ PrefabInstance: - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} propertyPath: m_RootOrder - value: 10 + value: 8 objectReference: {fileID: 0} - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} @@ -907,7 +769,7 @@ PrefabInstance: - target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8, type: 3} propertyPath: m_RootOrder - value: 6 + value: 4 objectReference: {fileID: 0} - target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8, type: 3} @@ -971,7 +833,7 @@ Transform: - {fileID: 1178508770} - {fileID: 1049886269} m_Father: {fileID: 0} - m_RootOrder: 14 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1113559007 GameObject: @@ -1183,11 +1045,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 15 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -6.56, y: -3.01} + m_AnchoredPosition: {x: -4.73, y: -3.01} m_SizeDelta: {x: 11.894907, y: 2.1616306} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1178508769 @@ -1271,75 +1133,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1001 &1374691921 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_LocalPosition.x - value: 4.88 - objectReference: {fileID: 0} - - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_LocalPosition.y - value: -0.29 - objectReference: {fileID: 0} - - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_LocalRotation.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_LocalRotation.w - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_RootOrder - value: 12 - objectReference: {fileID: 0} - - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 180 - objectReference: {fileID: 0} - - target: {fileID: 75116796779505599, guid: ad1d9501af80f154eb9bc33d1b848b02, - type: 3} - propertyPath: m_Name - value: Mirror (2) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} --- !u!1001 &1513283172 PrefabInstance: m_ObjectHideFlags: 0 @@ -1454,13 +1247,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1679737207} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2, y: -0.25969952, z: -3.8998504} + m_LocalPosition: {x: 2.6, y: 0.81, z: -3.8998504} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1513283173} - {fileID: 511029264} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1837026017 PrefabInstance: @@ -1477,7 +1270,7 @@ PrefabInstance: - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} propertyPath: m_LocalPosition.y - value: -3.36 + value: -3.61 objectReference: {fileID: 0} - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} @@ -1507,7 +1300,7 @@ PrefabInstance: - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} propertyPath: m_RootOrder - value: 11 + value: 9 objectReference: {fileID: 0} - target: {fileID: 75116796779505597, guid: ad1d9501af80f154eb9bc33d1b848b02, type: 3} @@ -1606,146 +1399,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1923529195} m_PrefabAsset: {fileID: 0} ---- !u!1 &1925040025 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1925040027} - - component: {fileID: 1925040026} - - component: {fileID: 1925040028} - m_Layer: 0 - m_Name: Music - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!82 &1925040026 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1925040025} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: cc47eb2acc072a44e8f9f61bbcbdca03, type: 3} - m_PlayOnAwake: 1 - m_Volume: 1 - m_Pitch: 1 - Loop: 1 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 ---- !u!4 &1925040027 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1925040025} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.48254675, y: -0.23101182, z: -0.10147177} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1925040028 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1925040025} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ce5793741daafbe45a02c213f0d6dbf4, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &2146985680 PrefabInstance: m_ObjectHideFlags: 0 @@ -1946,7 +1599,7 @@ PrefabInstance: - target: {fileID: 4683683892600594511, guid: 85fd029068587db4d95be8b3b62285c8, type: 3} propertyPath: m_RootOrder - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 4683683892600594511, guid: 85fd029068587db4d95be8b3b62285c8, type: 3} @@ -2061,7 +1714,7 @@ PrefabInstance: - target: {fileID: 8928797943620973878, guid: 3db23c8a19a05e246a267c399c53aef1, type: 3} propertyPath: m_RootOrder - value: 8 + value: 6 objectReference: {fileID: 0} - target: {fileID: 8928797943620973878, guid: 3db23c8a19a05e246a267c399c53aef1, type: 3} diff --git a/Assets/Scenes/Menu.unity b/Assets/Scenes/Menu.unity index 0f73f8a..cf38002 100644 --- a/Assets/Scenes/Menu.unity +++ b/Assets/Scenes/Menu.unity @@ -373,7 +373,7 @@ RectTransform: - {fileID: 449727263} - {fileID: 1827190587} 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} @@ -930,7 +930,7 @@ PrefabInstance: - target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 3147621778718822447, guid: 93a04d811a6112d4a8f0fbf322926bc8, type: 3} @@ -1028,7 +1028,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 &1598451562 GameObject: @@ -1407,133 +1407,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1827190586} m_CullTransparentMesh: 0 ---- !u!1 &1925040025 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1925040027} - - component: {fileID: 1925040026} - m_Layer: 0 - m_Name: Music - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!82 &1925040026 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1925040025} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 70468d0f91cbb24408f26c930e0cfc35, type: 3} - m_PlayOnAwake: 1 - m_Volume: 1 - m_Pitch: 1 - Loop: 1 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 ---- !u!4 &1925040027 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1925040025} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.48254675, y: -0.23101182, z: -0.10147177} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2078602940 GameObject: m_ObjectHideFlags: 0 diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index b8afe9f..fee3485 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -5,12 +5,12 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - - enabled: 1 - path: Assets/Scenes/Credits.unity - guid: f2d02dcc0961264489966e0febc7e3a9 - enabled: 1 path: Assets/Scenes/Menu.unity guid: 2e9d8751531905e43b35c23c838c46d2 + - enabled: 1 + path: Assets/Scenes/Credits.unity + guid: f2d02dcc0961264489966e0febc7e3a9 - enabled: 1 path: Assets/Scenes/Level 1.unity guid: 2cda990e2423bbf4892e6590ba056729 diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index a4939e4..400cc8f 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -31,6 +31,9 @@ GraphicsSettings: m_AlwaysIncludedShaders: - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 055cd1e..15c5094 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -12,7 +12,7 @@ PlayerSettings: targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 - companyName: DefaultCompany + companyName: Gaiety productName: Puzzle Jam II defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} @@ -42,8 +42,8 @@ PlayerSettings: m_SplashScreenLogos: [] m_VirtualRealitySplashScreen: {fileID: 0} m_HolographicTrackingLossScreen: {fileID: 0} - defaultScreenWidth: 1024 - defaultScreenHeight: 768 + defaultScreenWidth: 1280 + defaultScreenHeight: 720 defaultScreenWidthWeb: 960 defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 @@ -68,7 +68,7 @@ PlayerSettings: androidBlitType: 0 defaultIsNativeResolution: 1 macRetinaSupport: 1 - runInBackground: 1 + runInBackground: 0 captureSingleScreen: 0 muteOtherAudioSources: 0 Prepare IOS For Recording: 0 @@ -91,7 +91,7 @@ PlayerSettings: xboxEnableFitness: 0 visibleInBackground: 1 allowFullscreenSwitch: 1 - fullscreenMode: 1 + fullscreenMode: 3 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 xboxEnableGuest: 0 @@ -116,8 +116,8 @@ PlayerSettings: vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 m_SupportedAspectRatios: - 4:3: 1 - 5:4: 1 + 4:3: 0 + 5:4: 0 16:10: 1 16:9: 1 Others: 1 @@ -259,7 +259,14 @@ PlayerSettings: androidGamepadSupportLevel: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 - m_BuildTargetIcons: [] + m_BuildTargetIcons: + - m_BuildTarget: + m_Icons: + - serializedVersion: 2 + m_Icon: {fileID: 2800000, guid: 3394ead316d5b5b449d75b6d5f7b15e3, type: 3} + m_Width: 128 + m_Height: 128 + m_Kind: 0 m_BuildTargetPlatformIcons: [] m_BuildTargetBatching: [] m_BuildTargetGraphicsJobs: