From b6d025ff5a57a9a0bda52a8c7ce9ef3c6f2cfd58 Mon Sep 17 00:00:00 2001 From: BuyMyMojo Date: Wed, 1 Mar 2023 04:35:32 +1100 Subject: [PATCH] Finish 55% of the course --- .erp | 2 +- UserSettings/Layouts/default-2022.dwlt | 151 ++++++++++++++----------- 2 files changed, 85 insertions(+), 68 deletions(-) diff --git a/.erp b/.erp index d9792bb..b7d6a72 100644 --- a/.erp +++ b/.erp @@ -5,7 +5,7 @@ false false true - 1677629650 + 1677629976 8006271043655199372 false \ No newline at end of file diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index fca385d..a1261e3 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 2560 height: 1349 m_ShowMode: 4 - m_Title: Scene + m_Title: Game m_RootView: {fileID: 7} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -42,9 +42,9 @@ MonoBehaviour: x: 0 y: 0 width: 403 - height: 327 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + height: 328 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 17} m_Panes: - {fileID: 17} @@ -68,13 +68,13 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 972 + y: 971 width: 1829 - height: 327 + height: 328 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 124 + controlID: 30 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -99,7 +99,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 168 + controlID: 19 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -119,8 +119,8 @@ MonoBehaviour: y: 0 width: 731 height: 1299 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 16} m_Panes: - {fileID: 16} @@ -145,7 +145,7 @@ MonoBehaviour: x: 403 y: 0 width: 1426 - height: 327 + height: 328 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} m_ActualView: {fileID: 15} @@ -250,7 +250,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 77 + controlID: 20 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -269,7 +269,7 @@ MonoBehaviour: x: 0 y: 0 width: 1829 - height: 972 + height: 971 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 18} @@ -316,7 +316,7 @@ MonoBehaviour: m_OverlaysVisible: 1 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: -12914 + m_LastSelectedObjectID: -684312 --- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 @@ -355,6 +355,7 @@ MonoBehaviour: m_ViewTransforms: m_KeySerializationHelper: - {fileID: 3341265433047602877, guid: 68eaadb9ce37beb4dada3e6649f7ae47, type: 2} + - {fileID: 3733528916098049310, guid: 159fdf44081dc31468b5d2cf94ed008e, type: 2} m_ValueSerializationHelper: - e00: 1.3573047 e01: 0 @@ -372,11 +373,27 @@ MonoBehaviour: e31: 0 e32: 0 e33: 1 + - 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_PreviewAnimator: {fileID: 0} - m_AnimatorController: {fileID: 9100000, guid: 68eaadb9ce37beb4dada3e6649f7ae47, + m_AnimatorController: {fileID: 9100000, guid: 159fdf44081dc31468b5d2cf94ed008e, type: 2} m_BreadCrumbs: - - m_Target: {fileID: 3341265433047602877, guid: 68eaadb9ce37beb4dada3e6649f7ae47, + - m_Target: {fileID: 3733528916098049310, guid: 159fdf44081dc31468b5d2cf94ed008e, type: 2} m_ScrollPosition: {x: 0, y: 0} stateMachineGraph: {fileID: 0} @@ -1249,10 +1266,10 @@ MonoBehaviour: workTreeStatus: 3 changedFilesText: 10 changed files lastCurrentBranchChangedEvent: - updatedTimeString: 2023-02-26T02:56:41.802+11:00 + updatedTimeString: 2023-03-01T03:26:04.217+11:00 cacheType: 1 lastStatusEntriesChangedEvent: - updatedTimeString: 2023-02-26T03:14:55.147+11:00 + updatedTimeString: 2023-03-01T04:34:20.707+11:00 cacheType: 6 lastLocksChangedEvent: updatedTimeString: 0001-01-01T00:00:00.000+00:00 @@ -2230,9 +2247,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 403 - y: 1045 + y: 1044 width: 1424 - height: 306 + height: 307 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -2256,23 +2273,23 @@ MonoBehaviour: m_SkipHidden: 1 m_SearchArea: 1 m_Folders: - - Assets + - Assets/Scripts/Counters m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 - m_ViewMode: 1 + m_ViewMode: 0 m_StartGridSize: 64 m_LastFolders: - - Assets + - Assets/ScriptableObjects/KitchenObjectSO m_LastFoldersGridSize: -1 m_LastProjectPath: D:\Nextcloud\Projects\Unity\MojosKitchenChaos m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 606e0000 - m_LastClickedID: 28256 - m_ExpandedIDs: 00000000606e0000 + scrollPos: {x: 0, y: 118} + m_SelectedIDs: 3c6f0000 + m_LastClickedID: 28476 + m_ExpandedIDs: 00000000306f0000326f0000366f00003a6f0000de700000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -2297,10 +2314,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 0} + scrollPos: {x: 0, y: 639} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000606e0000 + m_ExpandedIDs: ffffffff00000000306f0000326f0000346f0000366f00003a6f00003c6f0000de700000ec700000e4820000e68200009ecd0000ee3a0100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -2316,7 +2333,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 6} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -2327,7 +2344,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000ea050000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -2426,9 +2443,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 1045 + y: 1044 width: 402 - height: 306 + height: 307 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -2441,10 +2458,10 @@ MonoBehaviour: m_OverlaysVisible: 1 m_SceneHierarchy: m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 0cfbffff + scrollPos: {x: 0, y: 144} + m_SelectedIDs: 0cdefaff + m_LastClickedID: -336372 + m_ExpandedIDs: ca75f5ff62ddfaff3e9afbff4a9afbffeec4fbff1035ffff2635ffffeafaffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -2460,7 +2477,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 11} + m_ClientGUIView: {fileID: 2} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -2492,7 +2509,7 @@ MonoBehaviour: x: 0 y: 73 width: 1828 - height: 951 + height: 950 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -2533,7 +2550,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 0} + snapOffset: {x: 0, y: 25} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: unity-scene-view-toolbar @@ -2559,7 +2576,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 0} + snapOffset: {x: 0, y: 25} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: unity-transform-toolbar @@ -2812,9 +2829,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -1.3747481, y: 2.1898932, z: 2.278783} + m_Target: {x: -17.232008, y: 6.5548573, z: -1.9366741} speed: 2 - m_Value: {x: -1.3747481, y: 2.1898932, z: 2.278783} + m_Value: {x: -17.232008, y: 6.5548573, z: -1.9366741} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -2860,20 +2877,20 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.34970486, y: -0.14475375, z: 0.05480269, w: -0.9240004} + m_Target: {x: 0.26117197, y: -0.48953223, z: 0.15642005, w: 0.81722915} speed: 2 - m_Value: {x: -0.34970012, y: -0.14475179, z: 0.054801945, w: -0.9239878} + m_Value: {x: 0.26114804, y: -0.48948735, z: 0.15640572, w: 0.8171542} m_Size: - m_Target: 5.887631 + m_Target: 4.3206353 speed: 2 - m_Value: 5.887631 + m_Value: 4.3206353 m_Ortho: m_Target: 0 speed: 2 m_Value: 0 m_CameraSettings: - m_Speed: 1.1204399 - m_SpeedNormalized: 0.55999994 + m_Speed: 1.1804098 + m_SpeedNormalized: 0.5899999 m_SpeedMin: 0.001 m_SpeedMax: 2 m_EasingEnabled: 1 @@ -2915,7 +2932,7 @@ MonoBehaviour: x: 0 y: 73 width: 1828 - height: 951 + height: 950 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -2932,7 +2949,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 2560, y: 1440} + m_TargetSize: {x: 1828, y: 929} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -2941,16 +2958,16 @@ MonoBehaviour: m_VSyncEnabled: 1 m_Gizmos: 0 m_Stats: 0 - m_SelectedSizes: 05000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 m_ZoomArea: m_HRangeLocked: 0 m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -1280 - m_HBaseRangeMax: 1280 - m_VBaseRangeMin: -720 - m_VBaseRangeMax: 720 + m_HBaseRangeMin: -914 + m_HBaseRangeMax: 914 + m_VBaseRangeMin: -464.5 + m_VBaseRangeMax: 464.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -2969,22 +2986,22 @@ MonoBehaviour: x: 0 y: 21 width: 1828 - height: 930 - m_Scale: {x: 0.6458333, y: 0.6458333} - m_Translation: {x: 914, y: 465} + height: 929 + m_Scale: {x: 1, y: 1} + m_Translation: {x: 914, y: 464.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1415.2258 - y: -720 - width: 2830.4517 - height: 1440 + x: -914 + y: -464.5 + width: 1828 + height: 929 m_MinimalGUI: 1 - m_defaultScale: 0.6458333 - m_LastWindowPixelSize: {x: 1828, y: 951} + m_defaultScale: 1 + m_LastWindowPixelSize: {x: 1828, y: 950} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -3012,9 +3029,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 403 - y: 1045 + y: 968 width: 1424 - height: 306 + height: 383 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0