diff --git a/.DS_Store b/.DS_Store index b19adc1..ab453b1 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Assets/Scenes/FinalScreen.unity b/Assets/Scenes/FinalScreen.unity index 279a073..24ede95 100644 --- a/Assets/Scenes/FinalScreen.unity +++ b/Assets/Scenes/FinalScreen.unity @@ -542,7 +542,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 m_ReferenceResolution: {x: 800, y: 600} @@ -623,7 +623,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 863985710} m_LocalRotation: {x: 0.044965174, y: -0.037528902, z: -0.998282, w: -0.0016725431} - m_LocalPosition: {x: 0, y: 0, z: 46} + m_LocalPosition: {x: 0, y: 0, z: 44} m_LocalScale: {x: -0.9553669, y: -2.2720146, z: 0.999909} m_ConstrainProportionsScale: 0 m_Children: @@ -633,7 +633,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: 142, y: -215} + m_AnchoredPosition: {x: 142, y: -195} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &863985712 @@ -768,7 +768,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1645207758} m_LocalRotation: {x: 0, y: 0, z: -2.910383e-11, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.3851806, y: 2.5368025, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -777,7 +777,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: 159, y: 224} + m_AnchoredPosition: {x: 145, y: 217} m_SizeDelta: {x: 194.6954, y: 20.4064} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1645207760 @@ -1260,7 +1260,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1902839219} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 1.385124, y: 2.9866, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1269,7 +1269,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: -215, y: -220} + m_AnchoredPosition: {x: -215, y: -195} m_SizeDelta: {x: 181.4377, y: 20.3655} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1902839221 @@ -1398,7 +1398,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1981773881} m_LocalRotation: {x: 0.044965174, y: -0.037528902, z: -0.998282, w: -0.0016725431} - m_LocalPosition: {x: 0, y: 0, z: 27} + m_LocalPosition: {x: 0, y: 0, z: 26} m_LocalScale: {x: -0.7206685, y: -2.5755382, z: 0.9999091} m_ConstrainProportionsScale: 0 m_Children: @@ -1408,7 +1408,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: -14, y: -216} + m_AnchoredPosition: {x: -14, y: -199} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1981773883 diff --git a/Assets/Scenes/GameOverScreen.unity b/Assets/Scenes/GameOverScreen.unity index ea671fb..f6c3b5c 100644 --- a/Assets/Scenes/GameOverScreen.unity +++ b/Assets/Scenes/GameOverScreen.unity @@ -249,7 +249,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 m_ReferenceResolution: {x: 800, y: 600} @@ -557,7 +557,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: -132, y: -211} + m_AnchoredPosition: {x: -112, y: -180} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1159002870 @@ -764,7 +764,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: 281, y: -213} + m_AnchoredPosition: {x: 242, y: -187} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2039857700 diff --git a/Assets/Scenes/Start Screen.unity b/Assets/Scenes/Start Screen.unity index 63ffdf0..92f31d1 100644 --- a/Assets/Scenes/Start Screen.unity +++ b/Assets/Scenes/Start Screen.unity @@ -152,7 +152,7 @@ RectTransform: m_GameObject: {fileID: 181226289} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.2625, y: 1.65, z: 1} + m_LocalScale: {x: 1.6410565, y: 2.8149214, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1996856649} @@ -161,7 +161,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: -238, y: -81} + m_AnchoredPosition: {x: -184, y: -70} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &181226291 @@ -318,7 +318,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 m_ReferenceResolution: {x: 800, y: 600} @@ -628,7 +628,7 @@ RectTransform: m_GameObject: {fileID: 1996856648} 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_LocalScale: {x: 0.81438, y: 0.81438, z: 0.81438} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 181226290} @@ -764,7 +764,7 @@ RectTransform: m_GameObject: {fileID: 2085878278} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2.8, y: 1, z: 1} + m_LocalScale: {x: 2.555, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1265792221} @@ -772,7 +772,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: -240, y: 99} + m_AnchoredPosition: {x: -193, y: 69} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2085878280 @@ -823,8 +823,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 40 - m_fontSizeBase: 40 + m_fontSize: 45 + m_fontSizeBase: 45 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -859,7 +859,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 41.486603, y: -132.18193, z: -102.40041, w: 40.737305} + m_margin: {x: 37.903873, y: -132.18193, z: -141.53189, w: -11.783813} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index eb8c804..adfedb7 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -9,16 +9,16 @@ EditorUserSettings: value: 5a09005053500f080c5c0a2142745c441215482e292d77342b7d4f6bb2b86d6a flags: 0 RecentlyUsedSceneGuid-1: - value: 520301025c535d095d5d5b7041770e441216487d287a7e322c7d4b36bbb3606c + value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661 flags: 0 RecentlyUsedSceneGuid-2: - value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661 + value: 500406545d02085d5c5a087711770a14424f4c2c287b25342c7a1f31b7b7676a flags: 0 RecentlyUsedSceneGuid-3: - value: 5b52560352005f03555b547a4577084214161a7f7a7071617d7a186bb2e3673a + value: 520301025c535d095d5d5b7041770e441216487d287a7e322c7d4b36bbb3606c flags: 0 RecentlyUsedSceneGuid-4: - value: 500406545d02085d5c5a087711770a14424f4c2c287b25342c7a1f31b7b7676a + value: 5b52560352005f03555b547a4577084214161a7f7a7071617d7a186bb2e3673a flags: 0 vcSharedLogLevel: value: 0d5e400f0650 diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 3ce19be..8a69419 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -19,12 +19,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1508 - height: 923 + width: 1440 + height: 850 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 81 + controlID: 77 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -46,10 +46,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 436.5 - y: 83 - width: 904 - height: 636 + x: 252.5 + y: 30 + width: 863.5 + height: 584 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -306,9 +306,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 1.7950163, y: 20.621357, z: 0.019228913} + m_Target: {x: 602.16595, y: 467.47037, z: -9.325111} speed: 2 - m_Value: {x: 1.7950163, y: 20.621357, z: 0.019228913} + m_Value: {x: 602.16595, y: 467.47037, z: -9.325111} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -359,9 +359,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 11.572753 + m_Target: 761.69775 speed: 2 - m_Value: 11.572753 + m_Value: 761.69775 m_Ortho: m_Target: 1 speed: 2 @@ -405,12 +405,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1170.5 - height: 923 + width: 1118 + height: 850 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 21 + controlID: 78 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -430,12 +430,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1170.5 - height: 657 + width: 1118 + height: 605 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 22 + controlID: 79 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -453,8 +453,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 264.5 - height: 657 + width: 252.5 + height: 605 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 6} @@ -483,10 +483,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 172 - y: 83 - width: 263.5 - height: 636 + x: 0 + y: 30 + width: 251.5 + height: 584 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -494,20 +494,20 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 48890000 - m_LastClickedID: 35144 - m_ExpandedIDs: 86f1ffffd4f1ffff96f3ffffa0f3ffff58f6ffff62f6ffff22fbffff888b0000908b0000568c0000 + m_SelectedIDs: 44da0000 + m_LastClickedID: 55876 + m_ExpandedIDs: 4299ffff8a99ffffba99ffffc299ffff8e9cffff969cffff549dffffa09dffffd09dffffd89dffffa4a0ffffaca0ffffa4a4ffffdca4ffff98a6ffffa6a6ffffa6a9ffffb2a9ffff66adffff1aafffffa2b0ffff60bdffffc2bdfffffcbeffff64c4000076c40000e0c40000f2c400007ecf00008acf00009ccf000050da000062da0000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: LockPickGuy - m_OriginalName: LockPickGuy + m_Name: PlayButton + m_OriginalName: PlayButton m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 35344 + m_UserData: 53118 m_IsWaitingForDelay: 0 m_IsRenaming: 0 m_OriginalEventType: 0 @@ -535,10 +535,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 264.5 + x: 252.5 y: 0 - width: 906 - height: 657 + width: 865.5 + height: 605 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 2} @@ -568,10 +568,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 436.5 - y: 83 - width: 904 - height: 636 + x: 252.5 + y: 30 + width: 863.5 + height: 584 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -584,7 +584,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 904, y: 615} + m_TargetSize: {x: 863.5, y: 563} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -599,10 +599,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -226 - m_HBaseRangeMax: 226 - m_VBaseRangeMin: -153.75 - m_VBaseRangeMax: 153.75 + m_HBaseRangeMin: -215.875 + m_HBaseRangeMax: 215.875 + m_VBaseRangeMin: -140.75 + m_VBaseRangeMax: 140.75 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -620,23 +620,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 904 - height: 615 + width: 863.5 + height: 563 m_Scale: {x: 2, y: 2} - m_Translation: {x: 452, y: 307.5} + m_Translation: {x: 431.75, y: 281.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -226 - y: -153.75 - width: 452 - height: 307.5 + x: -215.875 + y: -140.75 + width: 431.75 + height: 281.5 m_MinimalGUI: 1 m_defaultScale: 2 - m_LastWindowPixelSize: {x: 1808, y: 1272} + m_LastWindowPixelSize: {x: 1727, y: 1168} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -652,24 +652,24 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 657 - width: 1170.5 - height: 266 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 11} + y: 605 + width: 1118 + height: 245 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 10} m_Panes: - {fileID: 10} - {fileID: 11} - {fileID: 12} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -691,10 +691,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 172 - y: 740 - width: 1169.5 - height: 245 + x: 0 + y: 635 + width: 1117 + height: 224 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -712,22 +712,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets + - Assets/Scenes m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets + - Assets/Scenes m_LastFoldersGridSize: -1 - m_LastProjectPath: /Users/uditc/Desktop/Unity Game.nosync/289G_Project + m_LastProjectPath: /Users/payalkulkarni/Documents/GitHub/289G_Project m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 90640000 - m_LastClickedID: 25744 - m_ExpandedIDs: 0000000090640000926400009464000096640000986400009a6400009c6400009e640000a0640000a2640000a464000000ca9a3b + scrollPos: {x: 0, y: 79} + m_SelectedIDs: 449e0000 + m_LastClickedID: 40516 + m_ExpandedIDs: 00000000369e000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -755,7 +755,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000090640000926400009464000096640000986400009a6400009c6400009e640000a0640000a2640000a4640000 + m_ExpandedIDs: m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -780,10 +780,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 568c0000 - m_LastClickedInstanceID: 35926 - m_HadKeyboardFocusLastEvent: 0 - m_ExpandedInstanceIDs: c6230000ac92000032840000000000008a6100001a62000024620000b6610000 + m_SelectedInstanceIDs: 44da0000 + m_LastClickedInstanceID: 55876 + m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: c6230000ac92000032840000000000008a6100001a62000024620000b6610000d262000098630000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -807,7 +807,7 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 102} + m_ScrollPosition: {x: 0, y: 0} m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 231 @@ -832,10 +832,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 172 - y: 740 - width: 1169.5 - height: 245 + x: 0 + y: 635 + width: 1117 + height: 224 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -871,7 +871,7 @@ MonoBehaviour: m_SaveData: [] m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: 24600 + m_LastSelectedObjectID: 24720 --- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 @@ -887,10 +887,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1170.5 + x: 1118 y: 0 - width: 337.5 - height: 923 + width: 322 + height: 850 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 14} @@ -919,10 +919,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1342.5 - y: 83 - width: 336.5 - height: 902 + x: 1118 + y: 30 + width: 321 + height: 829 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default