diff --git a/Assets/Resources/Prefabs/WorldObjects.meta b/Assets/Resources/Prefabs/WorldObjects.meta index f9b6ada..40df4ec 100644 --- a/Assets/Resources/Prefabs/WorldObjects.meta +++ b/Assets/Resources/Prefabs/WorldObjects.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 <<<<<<<< HEAD:Assets/Resources/Textures.meta -guid: ecce4db6af60044069923c10009f1f24 +guid: fc6f1bf56af074c7192922564ebb4e92 ======== guid: 45f19baf5179cf745ba619186f664b9e >>>>>>>> master:Assets/Resources/Prefabs/WorldObjects.meta diff --git a/Assets/Resources/Prefabs/WorldObjects/World1/haz1.prefab.meta b/Assets/Resources/Prefabs/WorldObjects/World1/haz1.prefab.meta index 60d66bf..2559cb7 100644 --- a/Assets/Resources/Prefabs/WorldObjects/World1/haz1.prefab.meta +++ b/Assets/Resources/Prefabs/WorldObjects/World1/haz1.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 <<<<<<<< HEAD:Assets/Resources/Prefabs/WorldObjects/World1/haz2.prefab.meta -guid: 8500f6075c56d47809b2a1e2dfb10d39 +guid: 86d24be1a09e14f6f9497f99c2f74656 ======== guid: 801674bb4f54353d3966591ac2876a92 >>>>>>>> master:Assets/Resources/Prefabs/WorldObjects/World1/haz1.prefab.meta diff --git a/Assets/Resources/Textures.meta b/Assets/Resources/Textures.meta index f9b6ada..d1583c4 100644 --- a/Assets/Resources/Textures.meta +++ b/Assets/Resources/Textures.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 <<<<<<<< HEAD:Assets/Resources/Textures.meta -guid: ecce4db6af60044069923c10009f1f24 +guid: 245f6ec294f624ab499ad594b52a3614 ======== guid: 45f19baf5179cf745ba619186f664b9e >>>>>>>> master:Assets/Resources/Prefabs/WorldObjects.meta diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 83d8692..4355503 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1470 height: 811 m_ShowMode: 4 - m_Title: Simulator + m_Title: Project m_RootView: {fileID: 6} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -48,7 +48,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 16 + controlID: 18 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -68,8 +68,8 @@ MonoBehaviour: y: 0 width: 347.5 height: 761 - 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: 14} m_Panes: - {fileID: 14} @@ -111,7 +111,7 @@ 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: @@ -120,14 +120,14 @@ MonoBehaviour: y: 451 width: 1122.5 height: 310 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 17} + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} - {fileID: 17} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -223,7 +223,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 17 + controlID: 19 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -248,7 +248,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 18 + controlID: 20 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -268,8 +268,8 @@ MonoBehaviour: y: 0 width: 844.5 height: 451 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 12} m_Panes: - {fileID: 16} @@ -292,7 +292,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Simulator - m_Image: {fileID: 3038311277492192215, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 8720083202187608617, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 @@ -351,7 +351,7 @@ MonoBehaviour: m_MaxSize: {x: 10000, y: 10000} m_TitleContent: m_Text: Project - m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 @@ -376,22 +376,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Resources/Materials + - Assets/Resources/Prefabs/Modulok m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Resources/Materials + - Assets/Resources/Prefabs/Modulok m_LastFoldersGridSize: -1 m_LastProjectPath: /Users/bance/Documents/GitHub/PuzzleColorBall m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 94.000305} - m_SelectedIDs: e25f0000 - m_LastClickedID: 24546 - m_ExpandedIDs: 00000000c85f0000ca5f0000cc5f0000ce5f0000d05f0000d25f000000ca9a3bffffff7f + m_SelectedIDs: 0a630000 + m_LastClickedID: 25354 + m_ExpandedIDs: 00000000e6620000e8620000ea620000ec620000ee620000f062000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -419,7 +419,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000c85f0000ca5f0000cc5f0000ce5f0000d05f0000d25f0000 + m_ExpandedIDs: 00000000e6620000e8620000ea620000ec620000ee620000f0620000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -444,9 +444,9 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: fc4f0000 - m_LastClickedInstanceID: 20476 - m_HadKeyboardFocusLastEvent: 1 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c623000038a70000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -532,7 +532,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Hierarchy - m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 @@ -547,9 +547,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: fc4f0000 - m_LastClickedID: 20476 - m_ExpandedIDs: 1afbffff + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 7efaffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -589,7 +589,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Scene - m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 @@ -831,7 +831,7 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -274.5244, y: -38.133194, z: -64.5328} + m_Target: {x: 0, y: 0, z: 0} speed: 2 m_Value: {x: -274.5244, y: -38.133194, z: -64.5328} m_RenderMode: 0 @@ -880,11 +880,11 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.04655205, y: 0.7627115, z: -0.05524802, w: -0.64268506} + m_Target: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} speed: 2 - m_Value: {x: -0.04655223, y: 0.76271445, z: -0.05524823, w: -0.6426875} + m_Value: {x: -0.04655205, y: 0.76271147, z: -0.05524802, w: -0.64268506} m_Size: - m_Target: 142.08177 + m_Target: 10 speed: 2 m_Value: 142.08177 m_Ortho: @@ -927,7 +927,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Console - m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2