diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index f5bd95d..1b2b386 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -25,8 +25,13 @@ MonoBehaviour: height: 809 >>>>>>> Stashed changes m_ShowMode: 4 +<<<<<<< Updated upstream m_Title: Simulator m_RootView: {fileID: 7} +======= + m_Title: Project + m_RootView: {fileID: 6} +>>>>>>> Stashed changes m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 @@ -115,6 +120,7 @@ MonoBehaviour: <<<<<<< Updated upstream x: 984 y: 0 +<<<<<<< Updated upstream width: 382 height: 623 ======= @@ -125,6 +131,12 @@ MonoBehaviour: >>>>>>> Stashed changes m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} +======= + width: 278 + height: 451 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} +>>>>>>> Stashed changes m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} @@ -140,12 +152,17 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} +<<<<<<< Updated upstream m_Name: +======= + m_Name: ProjectBrowser +>>>>>>> Stashed changes m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 +<<<<<<< Updated upstream y: 0 <<<<<<< Updated upstream width: 161 @@ -161,6 +178,19 @@ MonoBehaviour: - {fileID: 16} m_Selected: 0 m_LastSelected: 0 +======= + y: 451 + width: 1122.5 + height: 310 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 13} + m_Panes: + - {fileID: 13} + - {fileID: 17} + m_Selected: 0 + m_LastSelected: 1 +>>>>>>> Stashed changes --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -498,12 +528,17 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: +<<<<<<< Updated upstream - Assets +======= + - Assets/Resources/Prefabs/Modulok +>>>>>>> Stashed changes m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 53 m_LastFolders: +<<<<<<< Updated upstream <<<<<<< Updated upstream - Assets m_LastFoldersGridSize: 53 @@ -518,14 +553,25 @@ MonoBehaviour: ======= - Assets/Scripts m_LastFoldersGridSize: 78 +======= + - Assets/Resources/Prefabs/Modulok + m_LastFoldersGridSize: -1 +>>>>>>> Stashed changes m_LastProjectPath: /Users/bance/Documents/GitHub/PuzzleColorBall m_LockTracker: m_IsLocked: 0 m_FolderTreeState: +<<<<<<< Updated upstream scrollPos: {x: 0, y: 117.5} m_SelectedIDs: 766c0000 m_LastClickedID: 27766 m_ExpandedIDs: 000000005e6c0000606c0000626c0000646c0000666c000000ca9a3bffffff7f +>>>>>>> Stashed changes +======= + scrollPos: {x: 0, y: 94.000305} + m_SelectedIDs: 96600000 + m_LastClickedID: 24726 + m_ExpandedIDs: 0000000070600000726000007460000076600000786000007a60000000ca9a3bffffff7f >>>>>>> Stashed changes m_RenameOverlay: m_UserAcceptedRename: 0 @@ -554,10 +600,14 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 +<<<<<<< Updated upstream <<<<<<< Updated upstream m_ExpandedIDs: 00000000b05f0000 ======= m_ExpandedIDs: 000000005e6c0000606c0000626c0000646c0000666c0000 +>>>>>>> Stashed changes +======= + m_ExpandedIDs: 0000000070600000726000007460000076600000786000007a600000 >>>>>>> Stashed changes m_RenameOverlay: m_UserAcceptedRename: 0 @@ -586,7 +636,11 @@ MonoBehaviour: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 0 +<<<<<<< Updated upstream m_ExpandedInstanceIDs: c6230000 +======= + m_ExpandedInstanceIDs: c623000038a70000 +>>>>>>> Stashed changes m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -701,10 +755,14 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 +<<<<<<< Updated upstream <<<<<<< Updated upstream m_ExpandedIDs: 06fbffff ======= m_ExpandedIDs: 18fbffff +>>>>>>> Stashed changes +======= + m_ExpandedIDs: 88faffff >>>>>>> Stashed changes m_RenameOverlay: m_UserAcceptedRename: 0 @@ -994,6 +1052,7 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: +<<<<<<< Updated upstream <<<<<<< Updated upstream m_Target: {x: 18.005922, y: 25.929068, z: 27.950302} speed: 2 @@ -1002,6 +1061,11 @@ MonoBehaviour: m_Target: {x: 1.0256333, y: -3.2673082, z: 28.326492} speed: 2 m_Value: {x: 1.0256333, y: -3.2673082, z: 28.326492} +>>>>>>> Stashed changes +======= + m_Target: {x: -0.7559868, y: 1.1926037, z: -7.725317} + speed: 2 + m_Value: {x: -0.7559868, y: 1.1926037, z: -7.725317} >>>>>>> Stashed changes m_RenderMode: 0 m_CameraMode: @@ -1049,6 +1113,7 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: +<<<<<<< Updated upstream <<<<<<< Updated upstream m_Target: {x: -0.20447084, y: 0.33339912, z: -0.07431277, w: -0.91734326} speed: 2 @@ -1065,6 +1130,15 @@ MonoBehaviour: m_Target: 5.786533 speed: 2 m_Value: 5.786533 +>>>>>>> Stashed changes +======= + m_Target: {x: -0.0053617693, y: 0.98640805, z: -0.03286904, w: -0.16090606} + speed: 2 + m_Value: {x: -0.0053617675, y: 0.9864077, z: -0.03286903, w: -0.160906} + m_Size: + m_Target: 2.1756105 + speed: 2 + m_Value: 2.1756105 >>>>>>> Stashed changes m_Ortho: m_Target: 0