diff --git a/Packages/unity-world-storage-package b/Packages/unity-world-storage-package index c8406f18a9f789d4cc0eb2ef995d274797ea4051..688bf209c3e6d27d10782b2583b0e9c8edea15c7 160000 --- a/Packages/unity-world-storage-package +++ b/Packages/unity-world-storage-package @@ -1 +1 @@ -Subproject commit c8406f18a9f789d4cc0eb2ef995d274797ea4051 +Subproject commit 688bf209c3e6d27d10782b2583b0e9c8edea15c7 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index db25c22e7a3030a569462bb864fd244411d141b5..6907351018363e86654211cac90a32e8c0faacb0 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -1,30 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: --- !u!114 &1 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_PixelRect: - serializedVersion: 2 - x: 464 - y: 157.33333 - width: 696.44446 - height: 876.8889 - m_ShowMode: 0 - m_Title: ETSI ARF - Authoring Editor - m_RootView: {fileID: 4} - m_MinSize: {x: 100, y: 121} - m_MaxSize: {x: 4000, y: 4021} - m_Maximized: 0 ---- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -43,62 +19,12 @@ MonoBehaviour: width: 1365.3334 height: 935.11115 m_ShowMode: 4 - m_Title: Console - m_RootView: {fileID: 11} + m_Title: Inspector + m_RootView: {fileID: 8} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 0 ---- !u!114 &3 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: WorldStorageWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 696.44446 - height: 876.8889 - m_MinSize: {x: 100, y: 121} - m_MaxSize: {x: 4000, y: 4021} - m_ActualView: {fileID: 17} - m_Panes: - - {fileID: 17} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &4 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 3} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 696.44446 - height: 876.8889 - m_MinSize: {x: 100, y: 121} - m_MaxSize: {x: 4000, y: 4021} - vertical: 0 - controlID: 1081 ---- !u!114 &5 +--- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -116,15 +42,15 @@ MonoBehaviour: x: 469.33334 y: 0 width: 534.22217 - height: 350.00006 + height: 350 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 24} + m_ActualView: {fileID: 20} m_Panes: - - {fileID: 24} + - {fileID: 20} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &6 +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -137,19 +63,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 10} - - {fileID: 5} + - {fileID: 7} + - {fileID: 2} m_Position: serializedVersion: 2 x: 0 y: 535.1111 width: 1003.55554 - height: 350.00006 + height: 350 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 17 ---- !u!114 &7 + controlID: 73 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -162,19 +88,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 14} - - {fileID: 8} + - {fileID: 11} + - {fileID: 5} m_Position: serializedVersion: 2 x: 0 y: 30 width: 1365.3334 - height: 885.11115 + height: 885.1111 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 15 ---- !u!114 &8 + controlID: 156 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -192,15 +118,15 @@ MonoBehaviour: x: 1003.55554 y: 0 width: 361.77783 - height: 885.11115 + height: 885.1111 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 20} + m_ActualView: {fileID: 16} m_Panes: - - {fileID: 20} + - {fileID: 16} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &9 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -221,12 +147,12 @@ MonoBehaviour: height: 535.1111 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 21} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 21} + - {fileID: 17} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &10 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -244,15 +170,15 @@ MonoBehaviour: x: 0 y: 0 width: 469.33334 - height: 350.00006 + height: 350 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 19} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 19} + - {fileID: 15} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &11 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -265,22 +191,22 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 12} - - {fileID: 7} - - {fileID: 13} + - {fileID: 9} + - {fileID: 4} + - {fileID: 10} m_Position: serializedVersion: 2 x: 0 y: 0 width: 1365.3334 - height: 935.11115 + height: 935.1111 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 m_TopViewHeight: 30 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &12 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -302,7 +228,7 @@ MonoBehaviour: m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &13 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -318,12 +244,12 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 915.11115 + y: 915.1111 width: 1365.3334 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &14 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -336,19 +262,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 15} - - {fileID: 6} + - {fileID: 12} + - {fileID: 3} m_Position: serializedVersion: 2 x: 0 y: 0 width: 1003.55554 - height: 885.11115 + height: 885.1111 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 16 ---- !u!114 &15 + controlID: 72 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -361,8 +287,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 9} - - {fileID: 16} + - {fileID: 6} + - {fileID: 13} m_Position: serializedVersion: 2 x: 0 @@ -372,8 +298,8 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 102 ---- !u!114 &16 + controlID: 184 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -394,49 +320,14 @@ MonoBehaviour: height: 535.1111 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 22} + m_ActualView: {fileID: 18} m_Panes: - - {fileID: 22} - - {fileID: 23} - {fileID: 18} + - {fileID: 19} + - {fileID: 14} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &17 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a1647df9b48bf4f49a664a929fff57ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: ETSI ARF - Authoring Editor - m_Image: {fileID: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 464 - y: 157.33333 - width: 696.44446 - height: 855.8889 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - worldStorageServer: {fileID: 11400000, guid: 4f997253243de534dad12937f1284975, type: 2} - worldStorageUser: {fileID: 11400000, guid: ce0f40be06008b14283766424922b729, type: 2} - creators: [] - trackables: [] - anchors: [] - links: - - c6998f4f-1b8d-460b-9de8-4793b92fae2a ---- !u!114 &18 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -464,7 +355,7 @@ MonoBehaviour: m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &19 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -487,7 +378,7 @@ MonoBehaviour: x: 12.888889 y: 637.3333 width: 468.33334 - height: 329.00006 + height: 329 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -518,9 +409,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 5e4b0000 - m_LastClickedID: 19294 - m_ExpandedIDs: 00000000424b0000444b0000464b0000484b00004a4b00004c4b00004e4b000000ca9a3bffffff7f + m_SelectedIDs: 684b0000 + m_LastClickedID: 19304 + m_ExpandedIDs: 000000004c4b00004e4b0000504b0000524b0000544b0000564b0000584b000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -536,7 +427,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 7} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -548,7 +439,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000424b0000444b0000464b0000484b00004a4b00004c4b00004e4b0000 + m_ExpandedIDs: 000000004c4b00004e4b0000504b0000524b0000544b0000564b0000584b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -592,7 +483,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 7} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -604,7 +495,7 @@ MonoBehaviour: m_GridSize: 16 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 248.11111 ---- !u!114 &20 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -627,7 +518,7 @@ MonoBehaviour: x: 1016.44446 y: 102.22222 width: 360.77783 - height: 864.11115 + height: 864.1111 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -645,7 +536,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &21 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -676,7 +567,7 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 844b0000 + m_SelectedIDs: 464b0000 m_LastClickedID: 0 m_ExpandedIDs: 34fbffff m_RenameOverlay: @@ -702,7 +593,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 26d3cc4a749ad3148bdaac8cbfc0727d ---- !u!114 &22 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1007,7 +898,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &23 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1058,8 +949,8 @@ MonoBehaviour: vZoomLockedByDefault: 0 m_HBaseRangeMin: -766 m_HBaseRangeMax: 766 - m_VBaseRangeMin: -384.5 - m_VBaseRangeMax: 384.5 + m_VBaseRangeMin: -395 + m_VBaseRangeMax: 395 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -1076,11 +967,11 @@ MonoBehaviour: m_DrawArea: serializedVersion: 2 x: 0 - y: 21 + y: 0 width: 1532 - height: 769 + height: 790 m_Scale: {x: 1, y: 1} - m_Translation: {x: 766, y: 384.5} + m_Translation: {x: 766, y: 395} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 @@ -1088,9 +979,9 @@ MonoBehaviour: m_LastShownAreaInsideMargins: serializedVersion: 2 x: -766 - y: -384.5 + y: -395 width: 1532 - height: 769 + height: 790 m_MinimalGUI: 1 m_defaultScale: 1 m_LastWindowPixelSize: {x: 3447, y: 1777.5} @@ -1099,7 +990,7 @@ MonoBehaviour: m_LowResolutionForAspectRatios: 00000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &24 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1122,7 +1013,7 @@ MonoBehaviour: x: 482.22223 y: 637.3333 width: 532.22217 - height: 329.00006 + height: 329 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default