From c178bae0f8aad51b485b122f02558835bc5820c2 Mon Sep 17 00:00:00 2001 From: Ruben W Date: Sat, 18 Apr 2020 16:04:47 +0200 Subject: [PATCH] Virtualized grid view (#9) * Added VirtualGridLayoutGroup * Display app version --- Assets/Scenes/MainScene.unity | 955 +++++++++++------- Assets/Scripts/Config/ApplicationSettings.cs | 7 +- Assets/Scripts/Config/ImportFolderConfig.cs | 1 - Assets/Scripts/Config/PreviewInfo.cs | 4 - .../Services/AppDataPreviewImageStore.cs | 1 - Assets/Scripts/Services/IKnownItemStore.cs | 5 +- Assets/Scripts/Services/ILibrary.cs | 3 - Assets/Scripts/Services/IPreviewBuilder.cs | 3 +- Assets/Scripts/Services/IPreviewImageStore.cs | 3 +- Assets/Scripts/Services/IPreviewList.cs | 1 - Assets/Scripts/Services/ITagIndex.cs | 1 - Assets/Scripts/Services/PreviewList.cs | 2 - .../Collections/IReadOnlyObservableList.cs | 1 - .../Util/Collections/ObservableList.cs | 1 - .../Util/Collections/TrackingCollection.cs | 1 - Assets/Scripts/Util/Stl/BinaryStl.cs | 20 +- Assets/Scripts/Util/Stl/StlImporter.cs | 32 +- .../Scripts/Util/Unity/AdaptiveTopPadding.cs | 7 +- .../Scripts/Util/Unity/AppVersionDisplay.cs | 17 + .../Util/Unity/AppVersionDisplay.cs.meta | 3 + Assets/Scripts/Util/Unity/GridItemScaler.cs | 34 - .../Scripts/Util/Unity/GridItemScaler.cs.meta | 11 - Assets/Scripts/Util/Unity/GuiCallbackQueue.cs | 2 - .../Unity/LibraryView.cs} | 17 +- Assets/Scripts/Util/Unity/LibraryView.cs.meta | 3 + .../Util/Unity/VirtualGridLayoutGroup.cs | 153 +++ .../Util/Unity/VirtualGridLayoutGroup.cs.meta | 3 + Assets/Scripts/ViewModels/ApplicationModel.cs | 1 - Assets/Scripts/ViewModels/CollectionModel.cs | 1 - Assets/Scripts/ViewModels/CollectionsModel.cs | 1 - Assets/Scripts/ViewModels/DetailMenuModel.cs | 1 - Assets/Scripts/ViewModels/DialogModelBase.cs | 1 - Assets/Scripts/ViewModels/EditMenuModel.cs | 1 - Assets/Scripts/ViewModels/FileSourceModel.cs | 1 - Assets/Scripts/ViewModels/IDialogModel.cs | 1 - Assets/Scripts/ViewModels/ItemsModel.cs | 3 - Assets/Scripts/ViewModels/SavedSearchModel.cs | 1 - .../Scripts/ViewModels/SavedSearchesModel.cs | 1 - Assets/Scripts/ViewModels/StatsModel.cs | 5 +- Assets/Scripts/ViewModels/SuggestionModel.cs | 1 - .../Scripts/ViewModels/TagInputModelBase.cs | 3 +- Assets/Scripts/ViewModels/TagModel.cs | 1 - .../Scripts/ViewModels/UserFeedbackModel.cs | 1 - Assets/Scripts/Views/ApplicationView.cs | 3 +- Assets/Scripts/Views/EditScreen.cs | 3 +- Assets/Scripts/Views/ItemView.cs | 5 - Assets/Scripts/Views/ItemViewBase.cs | 3 +- Assets/Scripts/Views/ItemsView.cs.meta | 11 - Assets/Scripts/Views/PreviewCam.cs | 16 +- Assets/Scripts/Views/TagView.cs | 1 - Assets/Scripts/Views/ViewInitializer.cs | 5 +- Assets/Scripts/Views/ViewPort.cs | 3 +- Assets/UiPrefabs/ItemView.prefab | 8 +- Assets/UiPrefabs/ItemsView.prefab | 571 +++++------ ProjectSettings/ProjectSettings.asset | 4 +- 55 files changed, 1106 insertions(+), 842 deletions(-) create mode 100644 Assets/Scripts/Util/Unity/AppVersionDisplay.cs create mode 100644 Assets/Scripts/Util/Unity/AppVersionDisplay.cs.meta delete mode 100644 Assets/Scripts/Util/Unity/GridItemScaler.cs delete mode 100644 Assets/Scripts/Util/Unity/GridItemScaler.cs.meta rename Assets/Scripts/{Views/ItemsView.cs => Util/Unity/LibraryView.cs} (62%) create mode 100644 Assets/Scripts/Util/Unity/LibraryView.cs.meta create mode 100644 Assets/Scripts/Util/Unity/VirtualGridLayoutGroup.cs create mode 100644 Assets/Scripts/Util/Unity/VirtualGridLayoutGroup.cs.meta delete mode 100644 Assets/Scripts/Views/ItemsView.cs.meta diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 2270912..0ae0726 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -235,6 +235,190 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 0 +--- !u!1 &108376662 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 108376663} + - component: {fileID: 108376667} + - component: {fileID: 108376664} + - component: {fileID: 108376666} + - component: {fileID: 108376665} + m_Layer: 5 + m_Name: VersionText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &108376663 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 108376662} + 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_Children: + - {fileID: 250584203} + m_Father: {fileID: 1213719373} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -35, y: 0} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 1, y: 0.5} +--- !u!114 &108376664 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 108376662} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: v0.0.0 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 4bd810f1cbcb0f446a8f5a31453e243f, type: 2} + m_sharedMaterial: {fileID: 21539420542967178, guid: 4bd810f1cbcb0f446a8f5a31453e243f, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4292207068 + m_fontColor: {r: 0.8627451, g: 0.88235295, b: 0.8352941, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_outlineColor: + serializedVersion: 2 + rgba: 4278190080 + m_fontSize: 22 + m_fontSizeBase: 22 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 12 + m_fontSizeMax: 48 + m_fontStyle: 1 + m_textAlignment: 516 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_firstOverflowCharacterIndex: -1 + m_linkedTextComponent: {fileID: 0} + m_isLinkedTextComponent: 0 + m_isTextTruncated: 0 + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 0 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_ignoreRectMaskCulling: 0 + m_ignoreCulling: 1 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_VertexBufferAutoSizeReduction: 1 + m_firstVisibleCharacter: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_textInfo: + textComponent: {fileID: 108376664} + characterCount: 6 + spriteCount: 0 + spaceCount: 0 + wordCount: 3 + linkCount: 0 + lineCount: 1 + pageCount: 1 + materialCount: 2 + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_spriteAnimator: {fileID: 0} + m_hasFontAssetChanged: 0 + m_subTextObjects: + - {fileID: 0} + - {fileID: 250584204} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &108376665 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 108376662} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fee1cc903be34d449fae7b73f14365fc, type: 3} + m_Name: + m_EditorClassIdentifier: + _text: {fileID: 108376664} +--- !u!114 &108376666 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 108376662} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e08c3832e4dc4ebcbe7390cc302e67bd, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!222 &108376667 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 108376662} + m_CullTransparentMesh: 0 --- !u!114 &144671248 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 5218521954831912084, guid: 166cdfcadd0eeb348aa51dd493f0e5d0, @@ -410,6 +594,78 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 244538890} m_CullTransparentMesh: 0 +--- !u!1 &250584202 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 250584203} + - component: {fileID: 250584205} + - component: {fileID: 250584204} + m_Layer: 5 + m_Name: TMP SubMeshUI [OpenSans-Regular SDF Material + OpenSans-Bold SDF Atlas] + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &250584203 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 250584202} + 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_Children: [] + m_Father: {fileID: 108376663} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 1, y: 0.5} +--- !u!114 &250584204 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 250584202} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 058cba836c1846c3aa1c5fd2e28aea77, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_fontAsset: {fileID: 11400000, guid: fa328c1ae3ffb6b4583cf371153b0be6, type: 2} + m_spriteAsset: {fileID: 0} + m_material: {fileID: 0} + m_sharedMaterial: {fileID: 0} + m_isDefaultMaterial: 0 + m_padding: 1.25 + m_canvasRenderer: {fileID: 250584205} + m_TextComponent: {fileID: 108376664} + m_materialReferenceIndex: 1 +--- !u!222 &250584205 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 250584202} + m_CullTransparentMesh: 0 --- !u!114 &277885426 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 5262509987541646767, guid: 14f39dfcea6e48e4bb4263f0b519d823, @@ -1172,18 +1428,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 663765185} m_CullTransparentMesh: 0 ---- !u!114 &698302324 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 823541967356794172, guid: b0d40be13caed10489d299b95944c835, - type: 3} - m_PrefabInstance: {fileID: 823541968003050056} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8fbbe1377b804da4bc5626f84e384f26, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &739520521 GameObject: m_ObjectHideFlags: 0 @@ -1262,9 +1506,9 @@ RectTransform: m_PrefabAsset: {fileID: 0} --- !u!224 &838010560 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 823541967356794169, guid: b0d40be13caed10489d299b95944c835, + m_CorrespondingSourceObject: {fileID: 8800045600062422996, guid: b0d40be13caed10489d299b95944c835, type: 3} - m_PrefabInstance: {fileID: 823541968003050056} + m_PrefabInstance: {fileID: 8800045599258229012} m_PrefabAsset: {fileID: 0} --- !u!1 &866144445 stripped GameObject: @@ -1840,7 +2084,7 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 + m_AdditionalShaderChannelsFlag: 25 m_SortingLayerID: 0 m_SortingOrder: 2 m_TargetDisplay: 0 @@ -2007,6 +2251,7 @@ GameObject: m_Component: - component: {fileID: 1333474829} - component: {fileID: 1333474828} + - component: {fileID: 1333474830} m_Layer: 0 m_Name: MainUI m_TagString: Untagged @@ -2045,6 +2290,21 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1333474830 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1333474827} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d09d8b1f3e054dcaa00f36c69b9e8b15, type: 3} + m_Name: + m_EditorClassIdentifier: + _showSettingsButton: {fileID: 2046134469} + _showFeedbackButton: {fileID: 2120123780} + _showHelpButton: {fileID: 966286126} --- !u!1001 &1336515440 PrefabInstance: m_ObjectHideFlags: 0 @@ -2936,7 +3196,6 @@ GameObject: - component: {fileID: 1796149719} - component: {fileID: 1796149718} - component: {fileID: 1796149717} - - component: {fileID: 1796149721} m_Layer: 5 m_Name: ItemsViewCanvas m_TagString: Untagged @@ -3024,21 +3283,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!114 &1796149721 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1796149716} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d09d8b1f3e054dcaa00f36c69b9e8b15, type: 3} - m_Name: - m_EditorClassIdentifier: - _showSettingsButton: {fileID: 2046134469} - _showFeedbackButton: {fileID: 2120123780} - _showHelpButton: {fileID: 966286126} --- !u!1 &1830392487 GameObject: m_ObjectHideFlags: 0 @@ -3458,8 +3702,8 @@ MonoBehaviour: _collectionsView: {fileID: 1070209375} _detailMenu: {fileID: 739520524} _searchView: {fileID: 1082732921} - _itemsView: {fileID: 698302324} _mainGroup: {fileID: 1333474828} + _libraryView: {fileID: 1989005637} _addSavedSearchDialog: {fileID: 1064647097} _addImportFolderDialog: {fileID: 2113215018} _applicationSettingsDialog: {fileID: 2044103896} @@ -3467,7 +3711,7 @@ MonoBehaviour: _exitingDialog: {fileID: 1964454000410272971} _editScreen: {fileID: 1475777468} _previewBuilder: {fileID: 1722423627} - _applicationView: {fileID: 1796149721} + _applicationView: {fileID: 1333474830} _progressView: {fileID: 657614411} --- !u!114 &1923759258 MonoBehaviour: @@ -3505,6 +3749,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 90c484913265461a967662dec59996c1, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1939502415 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8275590331501317616, guid: bf36136cf2e3c364b934c8b9f1a24175, + type: 3} + m_PrefabInstance: {fileID: 8275590331407009098} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1951243211 GameObject: m_ObjectHideFlags: 0 @@ -3624,9 +3880,21 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1951243211} m_CullTransparentMesh: 0 ---- !u!114 &2044103896 stripped +--- !u!114 &1989005637 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5391038552106172412, guid: 43ccd829e4bc4b245a22f5cb7f14c1a0, + m_CorrespondingSourceObject: {fileID: 8800045601045309521, guid: b0d40be13caed10489d299b95944c835, + type: 3} + m_PrefabInstance: {fileID: 8800045599258229012} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 900e1e8ccb2f4f6cb0f1b0b144995844, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &2044103896 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5391038552106172412, guid: 43ccd829e4bc4b245a22f5cb7f14c1a0, type: 3} m_PrefabInstance: {fileID: 5391038553862959908} m_PrefabAsset: {fileID: 0} @@ -3744,477 +4012,242 @@ PrefabInstance: --- !u!1001 &637378296817893061 PrefabInstance: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1425334173} - m_Modifications: - - target: {fileID: 637378296547016620, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 637378296547016620, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 637378296547016620, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 637378296547016620, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 637378296567101285, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 637378296567101285, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 637378296567101285, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 637378296567101285, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -70 - objectReference: {fileID: 0} - - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_SizeDelta.x - value: -30 - objectReference: {fileID: 0} - - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_SizeDelta.y - value: 80 - objectReference: {fileID: 0} - - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 637378297002456494, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_Name - value: Rotate Actions - objectReference: {fileID: 0} - - target: {fileID: 637378297046456757, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 637378297046456757, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 637378297046456757, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 637378297046456757, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 637378297063204817, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 637378297063204817, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 637378297063204817, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 637378297063204817, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 637378297624571513, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 637378297624571513, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 637378297624571513, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 637378297624571513, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 637378298349418239, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 637378298349418239, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 637378298349418239, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 637378298349418239, guid: 06faad93b18003241b392c7366390254, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 06faad93b18003241b392c7366390254, type: 3} ---- !u!1001 &823541968003050056 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1796149720} - m_Modifications: - - target: {fileID: 823541966299068204, guid: b0d40be13caed10489d299b95944c835, - type: 3} - propertyPath: m_Value - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 823541966299068204, guid: b0d40be13caed10489d299b95944c835, - type: 3} - propertyPath: m_Size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 823541966469537299, guid: b0d40be13caed10489d299b95944c835, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 823541966469537299, guid: b0d40be13caed10489d299b95944c835, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 823541966469537299, guid: b0d40be13caed10489d299b95944c835, + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1425334173} + m_Modifications: + - target: {fileID: 637378296547016620, guid: 06faad93b18003241b392c7366390254, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 823541966469537300, guid: b0d40be13caed10489d299b95944c835, + - target: {fileID: 637378296547016620, guid: 06faad93b18003241b392c7366390254, type: 3} - propertyPath: m_Sprite - value: + propertyPath: m_AnchorMax.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 823541966584804517, guid: b0d40be13caed10489d299b95944c835, + - target: {fileID: 637378296547016620, guid: 06faad93b18003241b392c7366390254, type: 3} - propertyPath: m_SizeDelta.y + propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 823541966584804517, guid: b0d40be13caed10489d299b95944c835, + - target: {fileID: 637378296547016620, guid: 06faad93b18003241b392c7366390254, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 823541966584804518, guid: b0d40be13caed10489d299b95944c835, + - target: {fileID: 637378296567101285, guid: 06faad93b18003241b392c7366390254, type: 3} - propertyPath: m_Padding.m_Right - value: 60 + propertyPath: m_AnchorMin.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 823541966584804537, guid: b0d40be13caed10489d299b95944c835, - type: 3} - propertyPath: _slider - value: - objectReference: {fileID: 6984308346806227103, guid: f2d2e13eb39b39d43a57e9a5245c9d3f, - type: 3} - - target: {fileID: 823541966584804538, guid: b0d40be13caed10489d299b95944c835, - type: 3} - propertyPath: _paddingDriver - value: - objectReference: {fileID: 1425554206} - - target: {fileID: 823541966679344144, guid: b0d40be13caed10489d299b95944c835, + - target: {fileID: 637378296567101285, guid: 06faad93b18003241b392c7366390254, type: 3} - propertyPath: m_Color.g - value: 0.76470596 + propertyPath: m_AnchorMax.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 823541966679344157, guid: b0d40be13caed10489d299b95944c835, + - target: {fileID: 637378296567101285, guid: 06faad93b18003241b392c7366390254, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 823541966679344157, guid: b0d40be13caed10489d299b95944c835, + - target: {fileID: 637378296567101285, guid: 06faad93b18003241b392c7366390254, type: 3} - propertyPath: m_SizeDelta.x + propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 823541967356794168, guid: b0d40be13caed10489d299b95944c835, - type: 3} - propertyPath: m_Name - value: ItemsView - objectReference: {fileID: 0} - - target: {fileID: 823541967356794169, guid: b0d40be13caed10489d299b95944c835, + - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 823541967356794169, guid: b0d40be13caed10489d299b95944c835, + - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 823541967356794169, guid: b0d40be13caed10489d299b95944c835, + - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 823541967356794169, guid: b0d40be13caed10489d299b95944c835, + - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 823541967356794169, guid: b0d40be13caed10489d299b95944c835, + - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 823541967356794169, guid: b0d40be13caed10489d299b95944c835, + - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 823541967356794169, guid: b0d40be13caed10489d299b95944c835, + - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 823541967356794169, guid: b0d40be13caed10489d299b95944c835, + - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 823541967356794169, guid: b0d40be13caed10489d299b95944c835, + - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 823541967356794169, guid: b0d40be13caed10489d299b95944c835, + - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 823541967356794169, guid: b0d40be13caed10489d299b95944c835, + - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 823541967356794169, guid: b0d40be13caed10489d299b95944c835, + - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, type: 3} propertyPath: m_AnchoredPosition.x - value: 50 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 823541967356794169, guid: b0d40be13caed10489d299b95944c835, + - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -70 objectReference: {fileID: 0} - - target: {fileID: 823541967356794169, guid: b0d40be13caed10489d299b95944c835, + - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, type: 3} propertyPath: m_SizeDelta.x - value: -1400 + value: -30 objectReference: {fileID: 0} - - target: {fileID: 823541967356794169, guid: b0d40be13caed10489d299b95944c835, + - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 80 objectReference: {fileID: 0} - - target: {fileID: 823541967356794169, guid: b0d40be13caed10489d299b95944c835, + - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 823541967356794169, guid: b0d40be13caed10489d299b95944c835, + - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 823541967356794169, guid: b0d40be13caed10489d299b95944c835, + - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, type: 3} propertyPath: m_AnchorMax.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 823541967356794169, guid: b0d40be13caed10489d299b95944c835, + - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 823541967356794169, guid: b0d40be13caed10489d299b95944c835, + - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 823541967356794169, guid: b0d40be13caed10489d299b95944c835, + - target: {fileID: 637378297002456489, guid: 06faad93b18003241b392c7366390254, type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 823541967356794170, guid: b0d40be13caed10489d299b95944c835, + - target: {fileID: 637378297002456494, guid: 06faad93b18003241b392c7366390254, type: 3} - propertyPath: m_Color.r - value: 0.7490196 + propertyPath: m_Name + value: Rotate Actions objectReference: {fileID: 0} - - target: {fileID: 823541967356794170, guid: b0d40be13caed10489d299b95944c835, + - target: {fileID: 637378297046456757, guid: 06faad93b18003241b392c7366390254, type: 3} - propertyPath: m_Color.g - value: 0.76470596 + propertyPath: m_AnchorMin.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 823541967356794170, guid: b0d40be13caed10489d299b95944c835, + - target: {fileID: 637378297046456757, guid: 06faad93b18003241b392c7366390254, type: 3} - propertyPath: m_Color.b - value: 0.7254902 + propertyPath: m_AnchorMax.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 823541967356794170, guid: b0d40be13caed10489d299b95944c835, + - target: {fileID: 637378297046456757, guid: 06faad93b18003241b392c7366390254, type: 3} - propertyPath: m_Color.a - value: 1 + propertyPath: m_AnchoredPosition.x + value: 0 objectReference: {fileID: 0} - - target: {fileID: 823541967822742502, guid: b0d40be13caed10489d299b95944c835, + - target: {fileID: 637378297046456757, guid: 06faad93b18003241b392c7366390254, type: 3} - propertyPath: m_Color.r - value: 0.7490196 + propertyPath: m_AnchoredPosition.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 823541967822742502, guid: b0d40be13caed10489d299b95944c835, + - target: {fileID: 637378297063204817, guid: 06faad93b18003241b392c7366390254, type: 3} - propertyPath: m_Color.g - value: 0.76470596 + propertyPath: m_AnchorMin.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 823541967822742502, guid: b0d40be13caed10489d299b95944c835, + - target: {fileID: 637378297063204817, guid: 06faad93b18003241b392c7366390254, type: 3} - propertyPath: m_Color.b - value: 0.7254902 + propertyPath: m_AnchorMax.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 823541967822742502, guid: b0d40be13caed10489d299b95944c835, + - target: {fileID: 637378297063204817, guid: 06faad93b18003241b392c7366390254, type: 3} - propertyPath: m_Color.a - value: 1 + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 637378297063204817, guid: 06faad93b18003241b392c7366390254, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 823541967822742502, guid: b0d40be13caed10489d299b95944c835, + - target: {fileID: 637378297624571513, guid: 06faad93b18003241b392c7366390254, type: 3} - propertyPath: m_Sprite - value: + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 637378297624571513, guid: 06faad93b18003241b392c7366390254, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 637378297624571513, guid: 06faad93b18003241b392c7366390254, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 637378297624571513, guid: 06faad93b18003241b392c7366390254, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 637378298349418239, guid: 06faad93b18003241b392c7366390254, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 637378298349418239, guid: 06faad93b18003241b392c7366390254, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 637378298349418239, guid: 06faad93b18003241b392c7366390254, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 637378298349418239, guid: 06faad93b18003241b392c7366390254, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b0d40be13caed10489d299b95944c835, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 06faad93b18003241b392c7366390254, type: 3} --- !u!1001 &1018558703886659688 PrefabInstance: m_ObjectHideFlags: 0 @@ -4914,7 +4947,7 @@ PrefabInstance: - target: {fileID: 5262509988746750589, guid: 14f39dfcea6e48e4bb4263f0b519d823, type: 3} propertyPath: m_NormalizedViewPortRect.x - value: 0.22195122 + value: 0.21231422 objectReference: {fileID: 0} - target: {fileID: 5262509988746750589, guid: 14f39dfcea6e48e4bb4263f0b519d823, type: 3} @@ -5606,7 +5639,7 @@ PrefabInstance: - target: {fileID: 2746333758154926288, guid: 7e33cda9a5d8c3e478c6888db2b484ea, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.000015258789 + value: 0.000030517578 objectReference: {fileID: 0} - target: {fileID: 2746333758154926288, guid: 7e33cda9a5d8c3e478c6888db2b484ea, type: 3} @@ -5616,7 +5649,7 @@ PrefabInstance: - target: {fileID: 2746333758174583497, guid: 7e33cda9a5d8c3e478c6888db2b484ea, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.000038146973 + value: -0.000045776367 objectReference: {fileID: 0} - target: {fileID: 2746333758174583497, guid: 7e33cda9a5d8c3e478c6888db2b484ea, type: 3} @@ -5756,7 +5789,7 @@ PrefabInstance: - target: {fileID: 2746333759616755060, guid: 7e33cda9a5d8c3e478c6888db2b484ea, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.000015258789 + value: 0.000045776367 objectReference: {fileID: 0} - target: {fileID: 2746333759616755060, guid: 7e33cda9a5d8c3e478c6888db2b484ea, type: 3} @@ -7675,6 +7708,150 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bf36136cf2e3c364b934c8b9f1a24175, type: 3} +--- !u!1001 &8800045599258229012 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1796149720} + m_Modifications: + - target: {fileID: 8800045599092497776, guid: b0d40be13caed10489d299b95944c835, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8800045599092497776, guid: b0d40be13caed10489d299b95944c835, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8800045600009872551, guid: b0d40be13caed10489d299b95944c835, + type: 3} + propertyPath: m_Name + value: ItemsView + objectReference: {fileID: 0} + - target: {fileID: 8800045600062422996, guid: b0d40be13caed10489d299b95944c835, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8800045600062422996, guid: b0d40be13caed10489d299b95944c835, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8800045600062422996, guid: b0d40be13caed10489d299b95944c835, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8800045600062422996, guid: b0d40be13caed10489d299b95944c835, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8800045600062422996, guid: b0d40be13caed10489d299b95944c835, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8800045600062422996, guid: b0d40be13caed10489d299b95944c835, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8800045600062422996, guid: b0d40be13caed10489d299b95944c835, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8800045600062422996, guid: b0d40be13caed10489d299b95944c835, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8800045600062422996, guid: b0d40be13caed10489d299b95944c835, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8800045600062422996, guid: b0d40be13caed10489d299b95944c835, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8800045600062422996, guid: b0d40be13caed10489d299b95944c835, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8800045600062422996, guid: b0d40be13caed10489d299b95944c835, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 8800045600062422996, guid: b0d40be13caed10489d299b95944c835, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8800045600062422996, guid: b0d40be13caed10489d299b95944c835, + type: 3} + propertyPath: m_SizeDelta.x + value: -1400 + objectReference: {fileID: 0} + - target: {fileID: 8800045600062422996, guid: b0d40be13caed10489d299b95944c835, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8800045600062422996, guid: b0d40be13caed10489d299b95944c835, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8800045600062422996, guid: b0d40be13caed10489d299b95944c835, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8800045600062422996, guid: b0d40be13caed10489d299b95944c835, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8800045600062422996, guid: b0d40be13caed10489d299b95944c835, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8800045600062422996, guid: b0d40be13caed10489d299b95944c835, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8800045600062422996, guid: b0d40be13caed10489d299b95944c835, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8800045601045309520, guid: b0d40be13caed10489d299b95944c835, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8800045601045309521, guid: b0d40be13caed10489d299b95944c835, + type: 3} + propertyPath: _slider + value: + objectReference: {fileID: 1939502415} + - target: {fileID: 8800045601045309532, guid: b0d40be13caed10489d299b95944c835, + type: 3} + propertyPath: _paddingDriver + value: + objectReference: {fileID: 1425554206} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b0d40be13caed10489d299b95944c835, type: 3} --- !u!1001 &8830943063223202624 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Config/ApplicationSettings.cs b/Assets/Scripts/Config/ApplicationSettings.cs index 7fd9a1e..67b3bfb 100644 --- a/Assets/Scripts/Config/ApplicationSettings.cs +++ b/Assets/Scripts/Config/ApplicationSettings.cs @@ -1,13 +1,12 @@ -using StlVault.Util; -using StlVault.Util.Logging; +using StlVault.Util.Logging; namespace StlVault.Config { internal class ApplicationSettings { public ushort UiScalePercent { get; set; } = 100; - public LogLevel LogLevel { get; set; } = LogLevel.Info; - public ushort ImportParallelism { get; set; } = 2; + public LogLevel LogLevel { get; set; } = LogLevel.Trace; + public ushort ImportParallelism { get; set; } = 1; public ushort PreviewJpegQuality { get; set; } = 70; public ushort PreviewResolution { get; set; } = 10; public ushort ScrollSensitivity { get; set; } = 150; diff --git a/Assets/Scripts/Config/ImportFolderConfig.cs b/Assets/Scripts/Config/ImportFolderConfig.cs index a3b90ff..fce3571 100644 --- a/Assets/Scripts/Config/ImportFolderConfig.cs +++ b/Assets/Scripts/Config/ImportFolderConfig.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using StlVault.Services; namespace StlVault.Config { diff --git a/Assets/Scripts/Config/PreviewInfo.cs b/Assets/Scripts/Config/PreviewInfo.cs index f5e87a9..c5d090d 100644 --- a/Assets/Scripts/Config/PreviewInfo.cs +++ b/Assets/Scripts/Config/PreviewInfo.cs @@ -1,11 +1,7 @@ -using System; using System.Collections.Generic; using System.ComponentModel; using System.Diagnostics; -using JetBrains.Annotations; -using Newtonsoft.Json; using StlVault.Services; -using UnityEngine.Scripting; namespace StlVault.Config { diff --git a/Assets/Scripts/Services/AppDataPreviewImageStore.cs b/Assets/Scripts/Services/AppDataPreviewImageStore.cs index 0108e77..2c4d57a 100644 --- a/Assets/Scripts/Services/AppDataPreviewImageStore.cs +++ b/Assets/Scripts/Services/AppDataPreviewImageStore.cs @@ -1,7 +1,6 @@ using System; using System.IO; using System.Threading.Tasks; -using StlVault.Config; using StlVault.Util.Logging; namespace StlVault.Services diff --git a/Assets/Scripts/Services/IKnownItemStore.cs b/Assets/Scripts/Services/IKnownItemStore.cs index 216c9a4..2a1a15c 100644 --- a/Assets/Scripts/Services/IKnownItemStore.cs +++ b/Assets/Scripts/Services/IKnownItemStore.cs @@ -1,7 +1,4 @@ -using System.Collections.Generic; -using System.Threading.Tasks; - -namespace StlVault.Services +namespace StlVault.Services { } \ No newline at end of file diff --git a/Assets/Scripts/Services/ILibrary.cs b/Assets/Scripts/Services/ILibrary.cs index 49e3a32..1b12d76 100644 --- a/Assets/Scripts/Services/ILibrary.cs +++ b/Assets/Scripts/Services/ILibrary.cs @@ -1,8 +1,5 @@ using System.Collections.Generic; using System.Threading.Tasks; -using StlVault.Config; -using StlVault.Util; -using StlVault.Util.Collections; using StlVault.ViewModels; using UnityEngine; diff --git a/Assets/Scripts/Services/IPreviewBuilder.cs b/Assets/Scripts/Services/IPreviewBuilder.cs index 2fb8b56..859f535 100644 --- a/Assets/Scripts/Services/IPreviewBuilder.cs +++ b/Assets/Scripts/Services/IPreviewBuilder.cs @@ -1,5 +1,4 @@ -using System.Collections.Generic; -using System.Threading.Tasks; +using System.Threading.Tasks; using UnityEngine; namespace StlVault.Services diff --git a/Assets/Scripts/Services/IPreviewImageStore.cs b/Assets/Scripts/Services/IPreviewImageStore.cs index 2610261..f2a2f7c 100644 --- a/Assets/Scripts/Services/IPreviewImageStore.cs +++ b/Assets/Scripts/Services/IPreviewImageStore.cs @@ -1,5 +1,4 @@ -using System; -using System.Threading.Tasks; +using System.Threading.Tasks; namespace StlVault.Services { diff --git a/Assets/Scripts/Services/IPreviewList.cs b/Assets/Scripts/Services/IPreviewList.cs index 5f55053..ea79b50 100644 --- a/Assets/Scripts/Services/IPreviewList.cs +++ b/Assets/Scripts/Services/IPreviewList.cs @@ -1,5 +1,4 @@ using System; -using StlVault.Config; using StlVault.Util.Collections; using StlVault.ViewModels; diff --git a/Assets/Scripts/Services/ITagIndex.cs b/Assets/Scripts/Services/ITagIndex.cs index 3e41628..12a3b6d 100644 --- a/Assets/Scripts/Services/ITagIndex.cs +++ b/Assets/Scripts/Services/ITagIndex.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using System.Linq; namespace StlVault.Services { diff --git a/Assets/Scripts/Services/PreviewList.cs b/Assets/Scripts/Services/PreviewList.cs index 3932b0e..11f96b6 100644 --- a/Assets/Scripts/Services/PreviewList.cs +++ b/Assets/Scripts/Services/PreviewList.cs @@ -1,8 +1,6 @@ using System; using System.Collections.Generic; -using System.Linq; using JetBrains.Annotations; -using StlVault.Config; using StlVault.Util.Collections; using StlVault.ViewModels; diff --git a/Assets/Scripts/Util/Collections/IReadOnlyObservableList.cs b/Assets/Scripts/Util/Collections/IReadOnlyObservableList.cs index 0dd9c6b..6197db5 100644 --- a/Assets/Scripts/Util/Collections/IReadOnlyObservableList.cs +++ b/Assets/Scripts/Util/Collections/IReadOnlyObservableList.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using StlVault.Config; namespace StlVault.Util.Collections { diff --git a/Assets/Scripts/Util/Collections/ObservableList.cs b/Assets/Scripts/Util/Collections/ObservableList.cs index 53b72fb..173dd00 100644 --- a/Assets/Scripts/Util/Collections/ObservableList.cs +++ b/Assets/Scripts/Util/Collections/ObservableList.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel; -using System.IO; using System.Linq; using static System.Collections.Specialized.NotifyCollectionChangedAction; using NotifyCollectionChangedAction = System.Collections.Specialized.NotifyCollectionChangedAction; diff --git a/Assets/Scripts/Util/Collections/TrackingCollection.cs b/Assets/Scripts/Util/Collections/TrackingCollection.cs index da907e4..9765ea0 100644 --- a/Assets/Scripts/Util/Collections/TrackingCollection.cs +++ b/Assets/Scripts/Util/Collections/TrackingCollection.cs @@ -1,7 +1,6 @@ using System; using System.Collections; using System.Collections.Generic; -using System.Collections.ObjectModel; using System.ComponentModel; using System.Linq; using JetBrains.Annotations; diff --git a/Assets/Scripts/Util/Stl/BinaryStl.cs b/Assets/Scripts/Util/Stl/BinaryStl.cs index 8095f78..acbd03d 100644 --- a/Assets/Scripts/Util/Stl/BinaryStl.cs +++ b/Assets/Scripts/Util/Stl/BinaryStl.cs @@ -1,11 +1,16 @@ using System; +using System.IO; using System.Runtime.CompilerServices; using System.Text; +using StlVault.Util.Logging; +using ILogger = StlVault.Util.Logging.ILogger; namespace StlVault.Util.Stl { internal static class BinaryStl { + private static readonly ILogger Logger = UnityLogger.Instance; + /// /// Determine whether this file is a binary stl format or not. /// @@ -49,16 +54,25 @@ public static bool IsBinary(byte[] fileBytes) public static Facet[] FromBytes(byte[] fileBytes) { // Discard header - var facetCount = BitConverter.ToUInt32(fileBytes, 80); - var facets = new Facet[facetCount]; + var dataFacetCount = BitConverter.ToUInt32(fileBytes, 80); + var calculatedCount = (uint) ((fileBytes.LongLength - 84) / 50); + if (dataFacetCount > calculatedCount) + throw new InvalidDataException("The facet count specified in the STL file is too big for the file!"); + + if (dataFacetCount != calculatedCount) + Logger.Warn("Calculated facet count and the one in STL file don't match up!"); + + var usedCount = Math.Min(dataFacetCount, calculatedCount); + var facets = new Facet[usedCount]; + unsafe { fixed (byte* fileStart = fileBytes) fixed (Facet* destination = facets) { var source = fileStart + 84; - Unsafe.CopyBlockUnaligned(destination, source, facetCount * 50); + Unsafe.CopyBlockUnaligned(destination, source, usedCount * 50); } } diff --git a/Assets/Scripts/Util/Stl/StlImporter.cs b/Assets/Scripts/Util/Stl/StlImporter.cs index 3142fc2..8d17a45 100644 --- a/Assets/Scripts/Util/Stl/StlImporter.cs +++ b/Assets/Scripts/Util/Stl/StlImporter.cs @@ -2,6 +2,7 @@ using System.Security.Cryptography; using System.Threading.Tasks; using StlVault.Util.Unity; +using Unity.Collections; using UnityEngine; using UnityEngine.Rendering; @@ -64,20 +65,34 @@ private static async Task CreateMeshFromFacetsAsync(Facet[] facets, bool c var mesh = new Mesh { name = fileName, - indexFormat = IndexFormat.UInt32, - vertices = vertices, - normals = normals, - triangles = triangles, hideFlags = HideFlags.HideAndDontSave }; + + var vertexCount = facets.Length * 3; + + mesh.SetVertexBufferParams( + vertexCount, + new VertexAttributeDescriptor(VertexAttribute.Position, stream: 0), + new VertexAttributeDescriptor(VertexAttribute.Normal, stream: 1) + ); + + mesh.SetVertexBufferData(vertices, 0, 0, vertexCount, stream:0); + mesh.SetVertexBufferData(normals, 0, 0, vertexCount, stream:1); + mesh.SetIndexBufferParams(vertexCount, IndexFormat.UInt32); + mesh.SetIndexBufferData(triangles, 0, 0, vertexCount); + + mesh.SetSubMesh(0, new SubMeshDescriptor(0, vertexCount)); + + mesh.RecalculateBounds(); + if (centerVertices) { var currentCenter = mesh.bounds.center; await Task.Run(() => CenterVertices(vertices, currentCenter)) .Timed("Centering vertices of {0}", fileName); - - mesh.vertices = vertices; + + mesh.SetVertexBufferData(vertices, 0, 0, vertexCount, stream:0); mesh.RecalculateBounds(); } @@ -105,11 +120,10 @@ private static void CenterVertices(Vector3[] vertices, Vector3 correction) private static (Vector3[] vertices, Vector3[] normals, int[] triangles) BuildMesh(Facet[] facets) { var meshSize = facets.Length * 3; - - var triangles = new int[meshSize]; var vertices = new Vector3[meshSize]; var normals = new Vector3[meshSize]; - + var triangles = new int[meshSize]; + void WriteFacet(int currentFacet) { var i = currentFacet * 3; diff --git a/Assets/Scripts/Util/Unity/AdaptiveTopPadding.cs b/Assets/Scripts/Util/Unity/AdaptiveTopPadding.cs index c567899..ca792d6 100644 --- a/Assets/Scripts/Util/Unity/AdaptiveTopPadding.cs +++ b/Assets/Scripts/Util/Unity/AdaptiveTopPadding.cs @@ -5,18 +5,18 @@ namespace StlVault.Util.Unity { - [RequireComponent(typeof(GridLayoutGroup))] [RequireComponent(typeof(RectTransform))] public class AdaptiveTopPadding : MonoBehaviour { [SerializeField] private int _basePadding; [SerializeField] private RectTransform _paddingDriver; - private GridLayoutGroup _layoutGroup; + + private LayoutGroup _layoutGroup; private RectTransform _rectTransform; private void Start() { - _layoutGroup = GetComponent(); + _layoutGroup = GetComponent(); _rectTransform = GetComponent(); } @@ -25,6 +25,7 @@ public void Update() var newValue = _basePadding + (int) _paddingDriver.rect.height; if (_layoutGroup.padding.top == newValue) return; _layoutGroup.padding.top = newValue; + LayoutRebuilder.MarkLayoutForRebuild(_rectTransform); } } diff --git a/Assets/Scripts/Util/Unity/AppVersionDisplay.cs b/Assets/Scripts/Util/Unity/AppVersionDisplay.cs new file mode 100644 index 0000000..68ef990 --- /dev/null +++ b/Assets/Scripts/Util/Unity/AppVersionDisplay.cs @@ -0,0 +1,17 @@ +using TMPro; +using UnityEngine; + +#pragma warning disable 0649 + +namespace StlVault.Util.Unity +{ + public class AppVersionDisplay : MonoBehaviour + { + [SerializeField] private TMP_Text _text; + + private void Start() + { + _text.text = "v" + Application.version; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Util/Unity/AppVersionDisplay.cs.meta b/Assets/Scripts/Util/Unity/AppVersionDisplay.cs.meta new file mode 100644 index 0000000..28fa472 --- /dev/null +++ b/Assets/Scripts/Util/Unity/AppVersionDisplay.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: fee1cc903be34d449fae7b73f14365fc +timeCreated: 1587218290 \ No newline at end of file diff --git a/Assets/Scripts/Util/Unity/GridItemScaler.cs b/Assets/Scripts/Util/Unity/GridItemScaler.cs deleted file mode 100644 index 5d6ac47..0000000 --- a/Assets/Scripts/Util/Unity/GridItemScaler.cs +++ /dev/null @@ -1,34 +0,0 @@ -using UnityEngine; -using UnityEngine.UI; - -#pragma warning disable 0649 - -namespace StlVault.Util.Unity -{ - [RequireComponent(typeof(GridLayoutGroup))] - public class GridItemScaler : MonoBehaviour - { - [SerializeField] private Slider _slider; - [SerializeField] private float _minSize = 100; - [SerializeField] private float _maxSize = 800; - [SerializeField] private float _startSize = 400; - - private GridLayoutGroup _gridLayout; - private float _currentVelocity; - - void Start() - { - _gridLayout = GetComponent(); - _slider.minValue = _minSize; - _slider.maxValue = _maxSize; - _slider.value = _startSize; - } - - // Update is called once per frame - private void Update() - { - var sliderValue = _slider.value; - _gridLayout.cellSize = new Vector2(sliderValue, sliderValue + 30); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Util/Unity/GridItemScaler.cs.meta b/Assets/Scripts/Util/Unity/GridItemScaler.cs.meta deleted file mode 100644 index b7fba27..0000000 --- a/Assets/Scripts/Util/Unity/GridItemScaler.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e9d84c00cbe657540848f339f981477d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Util/Unity/GuiCallbackQueue.cs b/Assets/Scripts/Util/Unity/GuiCallbackQueue.cs index 04d0301..29179bc 100644 --- a/Assets/Scripts/Util/Unity/GuiCallbackQueue.cs +++ b/Assets/Scripts/Util/Unity/GuiCallbackQueue.cs @@ -1,8 +1,6 @@ using System; using System.Collections.Generic; using System.Diagnostics; -using System.Linq; -using System.Threading.Tasks; using JetBrains.Annotations; using UnityEngine; diff --git a/Assets/Scripts/Views/ItemsView.cs b/Assets/Scripts/Util/Unity/LibraryView.cs similarity index 62% rename from Assets/Scripts/Views/ItemsView.cs rename to Assets/Scripts/Util/Unity/LibraryView.cs index 9756f73..02bac48 100644 --- a/Assets/Scripts/Views/ItemsView.cs +++ b/Assets/Scripts/Util/Unity/LibraryView.cs @@ -1,15 +1,18 @@ -using StlVault.Util.Collections; +using StlVault.Util.Collections; using StlVault.ViewModels; +using StlVault.Views; using UnityEngine; -namespace StlVault.Views +namespace StlVault.Util.Unity { - internal class ItemsView : ContainerView + internal class LibraryView : VirtualGridLayoutGroup { - protected override IReadOnlyObservableList ChildModels => ViewModel.Items; - - private void Update() + protected override IReadOnlyObservableList ChildModels => ViewModel?.Items; + + protected override void Update() { + if (ViewModel == null) return; + var ctrl = Input.GetKey(KeyCode.LeftControl) || Input.GetKey(KeyCode.RightControl); if (ctrl && Input.GetKeyDown(KeyCode.A)) { @@ -23,6 +26,8 @@ private void Update() var shift = Input.GetKey(KeyCode.LeftShift) || Input.GetKey(KeyCode.RightShift); ViewModel.SelectRange = shift; + + base.Update(); } } } \ No newline at end of file diff --git a/Assets/Scripts/Util/Unity/LibraryView.cs.meta b/Assets/Scripts/Util/Unity/LibraryView.cs.meta new file mode 100644 index 0000000..21d7929 --- /dev/null +++ b/Assets/Scripts/Util/Unity/LibraryView.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 900e1e8ccb2f4f6cb0f1b0b144995844 +timeCreated: 1587159708 \ No newline at end of file diff --git a/Assets/Scripts/Util/Unity/VirtualGridLayoutGroup.cs b/Assets/Scripts/Util/Unity/VirtualGridLayoutGroup.cs new file mode 100644 index 0000000..e41f9fb --- /dev/null +++ b/Assets/Scripts/Util/Unity/VirtualGridLayoutGroup.cs @@ -0,0 +1,153 @@ +using System.Collections.Generic; +using System.Collections.Specialized; +using System.Linq; +using StlVault.Util.Collections; +using StlVault.Views; +using UnityEngine; +using UnityEngine.UI; + +#pragma warning disable 0649 + +namespace StlVault.Util.Unity +{ + public abstract class VirtualGridLayoutGroup : LayoutGroup, IView + where TChildView : MonoBehaviour, IView + { + private static class Axis + { + public const int X = 0; + public const int Y = 1; + } + + [SerializeField] private Slider _slider; + [SerializeField] private float _minSize = 200; + [SerializeField] private float _maxSize = 1000; + [SerializeField] private Vector2 _childRatioOffset = new Vector2(0, 30); + [SerializeField] private TChildView _childViewPrefab; + [SerializeField] private RectTransform _viewPortRect; + [SerializeField] private float _spacing; + + private Vector2 _childSize = new Vector2(200, 230); + private bool _reposition; + + private readonly Dictionary _views = new Dictionary(); + + public TModel ViewModel { get; private set; } + protected abstract IReadOnlyObservableList ChildModels { get; } + public void BindTo(TModel viewModel) + { + ViewModel = viewModel; + ChildModels.OnMainThread().CollectionChanged += ChildModelsChanged; + } + + private void ChildModelsChanged(object sender, NotifyCollectionChangedEventArgs e) + { + if (e.Action != NotifyCollectionChangedAction.Add) + { + foreach (var view in _views.Values) Destroy(view.gameObject); + _views.Clear(); + } + + LayoutRebuilder.MarkLayoutForRebuild(rectTransform); + } + + private int ColumnCount => + Mathf.Max(1,Mathf.FloorToInt((rectTransform.rect.width - padding.horizontal + _spacing + 0.001f) / (_childSize.x + _spacing))); + + protected override void Start() + { + base.Start(); + _slider.minValue = _minSize; + _slider.maxValue = _maxSize; + _slider.onValueChanged.AddListener(OnSliderValueChanged); + _slider.value = (_maxSize - _minSize) / 2 + _minSize; + } + + private void OnSliderValueChanged(float value) + { + _childSize = new Vector2(value, value) + _childRatioOffset; + LayoutRebuilder.MarkLayoutForRebuild(rectTransform); + } + + public override void CalculateLayoutInputHorizontal() + { + var width = padding.horizontal + (_childSize.x + _spacing) * ColumnCount - _spacing; + + SetLayoutInputForAxis(width, width, -1, Axis.X); + } + + public override void CalculateLayoutInputVertical() + { + if (ChildModels == null) + { + SetLayoutInputForAxis(0, 0, -1, Axis.Y); + return; + } + + var minRows = Mathf.CeilToInt(ChildModels.Count / (float) ColumnCount); + var minSpace = padding.vertical + (_childSize.y + _spacing) * minRows - _spacing; + + SetLayoutInputForAxis(minSpace, minSpace, -1, Axis.Y); + } + + public override void SetLayoutHorizontal() => _reposition = true; + public override void SetLayoutVertical() => _reposition = true; + + protected virtual void Update() + { + if (ChildModels == null || !_reposition) return; + + var columnCount = ColumnCount; + var viewPortHeight = _viewPortRect.rect.height; + var yStart = rectTransform.anchoredPosition.y; + var yEnd = yStart + viewPortHeight; + + var itemSizeX = _childSize.x + _spacing; + var itemSizeY = _childSize.y + _spacing; + + var offset = padding; + var paddingTop = offset.top; + var paddingLeft = offset.left; + var paddingRight = offset.right; + + var firstRow = Mathf.Max(0, Mathf.FloorToInt((yStart - paddingTop) / itemSizeY)); + var lastRow = Mathf.Max(Mathf.CeilToInt((yEnd - paddingTop) / itemSizeY)); + + var firstIdx = columnCount * firstRow; + var lastIdx = Mathf.Min(columnCount * lastRow, ChildModels.Count); + var usedSpace = (columnCount * itemSizeX + paddingLeft + paddingRight - _spacing); + var emptySpace = rectTransform.rect.width - usedSpace; + var realPaddingLeft = paddingLeft + emptySpace / 2; + + for (var i = firstIdx; i < lastIdx; i++) + { + if (!_views.TryGetValue(i, out var view)) + { + view = Instantiate(_childViewPrefab, transform); + view.BindTo(ChildModels[i]); + _views.Add(i, view); + } + + if (_reposition) + { + var rect = view.GetComponent(); + rect.sizeDelta = _childSize; + + var viewPosY = itemSizeY * (int) (i / ColumnCount) + paddingTop; + var viewPosX = itemSizeX * (int) (i % ColumnCount) + realPaddingLeft; + view.transform.localPosition = new Vector2(viewPosX, - viewPosY); + } + } + + var dropped = _views.Keys.Where(idx => idx < firstIdx || idx >= lastIdx).ToList(); + foreach (var idx in dropped) + { + if (_views.TryGetValue(idx, out var view)) + { + Destroy(view.gameObject); + _views.Remove(idx); + } + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Util/Unity/VirtualGridLayoutGroup.cs.meta b/Assets/Scripts/Util/Unity/VirtualGridLayoutGroup.cs.meta new file mode 100644 index 0000000..a223562 --- /dev/null +++ b/Assets/Scripts/Util/Unity/VirtualGridLayoutGroup.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ed529df16f5b446792555db72c4a37b4 +timeCreated: 1587159702 \ No newline at end of file diff --git a/Assets/Scripts/ViewModels/ApplicationModel.cs b/Assets/Scripts/ViewModels/ApplicationModel.cs index 5516c5e..c89203e 100644 --- a/Assets/Scripts/ViewModels/ApplicationModel.cs +++ b/Assets/Scripts/ViewModels/ApplicationModel.cs @@ -1,5 +1,4 @@ using System; -using System.ComponentModel; using System.Windows.Input; using JetBrains.Annotations; using StlVault.Messages; diff --git a/Assets/Scripts/ViewModels/CollectionModel.cs b/Assets/Scripts/ViewModels/CollectionModel.cs index 00c676b..73fb74f 100644 --- a/Assets/Scripts/ViewModels/CollectionModel.cs +++ b/Assets/Scripts/ViewModels/CollectionModel.cs @@ -1,4 +1,3 @@ -using System.ComponentModel; using StlVault.Config; using StlVault.Util; diff --git a/Assets/Scripts/ViewModels/CollectionsModel.cs b/Assets/Scripts/ViewModels/CollectionsModel.cs index 7367ba9..fc8fbc7 100644 --- a/Assets/Scripts/ViewModels/CollectionsModel.cs +++ b/Assets/Scripts/ViewModels/CollectionsModel.cs @@ -1,5 +1,4 @@ using System; -using System.ComponentModel; using System.Threading.Tasks; using JetBrains.Annotations; using StlVault.Config; diff --git a/Assets/Scripts/ViewModels/DetailMenuModel.cs b/Assets/Scripts/ViewModels/DetailMenuModel.cs index ec5b071..1473636 100644 --- a/Assets/Scripts/ViewModels/DetailMenuModel.cs +++ b/Assets/Scripts/ViewModels/DetailMenuModel.cs @@ -8,7 +8,6 @@ using StlVault.Util.Collections; using StlVault.Util.Commands; using StlVault.Util.Messaging; -using UnityEditor; namespace StlVault.ViewModels { diff --git a/Assets/Scripts/ViewModels/DialogModelBase.cs b/Assets/Scripts/ViewModels/DialogModelBase.cs index bca1b69..7b117f8 100644 --- a/Assets/Scripts/ViewModels/DialogModelBase.cs +++ b/Assets/Scripts/ViewModels/DialogModelBase.cs @@ -1,4 +1,3 @@ -using System.ComponentModel; using System.Windows.Input; using StlVault.Util; using StlVault.Util.Commands; diff --git a/Assets/Scripts/ViewModels/EditMenuModel.cs b/Assets/Scripts/ViewModels/EditMenuModel.cs index 51c6bba..5d3c0fb 100644 --- a/Assets/Scripts/ViewModels/EditMenuModel.cs +++ b/Assets/Scripts/ViewModels/EditMenuModel.cs @@ -1,5 +1,4 @@ using System; -using System.Windows.Input; using JetBrains.Annotations; using StlVault.Services; diff --git a/Assets/Scripts/ViewModels/FileSourceModel.cs b/Assets/Scripts/ViewModels/FileSourceModel.cs index 56118ce..d6bd329 100644 --- a/Assets/Scripts/ViewModels/FileSourceModel.cs +++ b/Assets/Scripts/ViewModels/FileSourceModel.cs @@ -1,5 +1,4 @@ using System; -using System.ComponentModel; using System.Windows.Input; using JetBrains.Annotations; using StlVault.Services; diff --git a/Assets/Scripts/ViewModels/IDialogModel.cs b/Assets/Scripts/ViewModels/IDialogModel.cs index ae8d4bc..b67b59a 100644 --- a/Assets/Scripts/ViewModels/IDialogModel.cs +++ b/Assets/Scripts/ViewModels/IDialogModel.cs @@ -1,4 +1,3 @@ -using System.ComponentModel; using System.Windows.Input; using StlVault.Util; diff --git a/Assets/Scripts/ViewModels/ItemsModel.cs b/Assets/Scripts/ViewModels/ItemsModel.cs index 1e451e0..59a8aaf 100644 --- a/Assets/Scripts/ViewModels/ItemsModel.cs +++ b/Assets/Scripts/ViewModels/ItemsModel.cs @@ -1,14 +1,11 @@ using System; using System.Collections.Generic; -using System.ComponentModel; using System.Linq; using JetBrains.Annotations; -using StlVault.Config; using StlVault.Messages; using StlVault.Services; using StlVault.Util; using StlVault.Util.Collections; -using StlVault.Util.Commands; using StlVault.Util.Messaging; using UnityEngine; diff --git a/Assets/Scripts/ViewModels/SavedSearchModel.cs b/Assets/Scripts/ViewModels/SavedSearchModel.cs index 772ee0f..f069245 100644 --- a/Assets/Scripts/ViewModels/SavedSearchModel.cs +++ b/Assets/Scripts/ViewModels/SavedSearchModel.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.ComponentModel; using System.Windows.Input; using JetBrains.Annotations; using StlVault.Config; diff --git a/Assets/Scripts/ViewModels/SavedSearchesModel.cs b/Assets/Scripts/ViewModels/SavedSearchesModel.cs index 2964e8d..5ca9002 100644 --- a/Assets/Scripts/ViewModels/SavedSearchesModel.cs +++ b/Assets/Scripts/ViewModels/SavedSearchesModel.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.ComponentModel; using System.Linq; using System.Threading.Tasks; using System.Windows.Input; diff --git a/Assets/Scripts/ViewModels/StatsModel.cs b/Assets/Scripts/ViewModels/StatsModel.cs index 117df3a..187270e 100644 --- a/Assets/Scripts/ViewModels/StatsModel.cs +++ b/Assets/Scripts/ViewModels/StatsModel.cs @@ -1,10 +1,7 @@ -using System.ComponentModel; -using System.Linq; -using StlVault.Config; +using System.Linq; using StlVault.Services; using StlVault.Util; using UnityEngine; -using UnityEngine.PlayerLoop; using NotifyCollectionChangedEventArgs = System.Collections.Specialized.NotifyCollectionChangedEventArgs; namespace StlVault.ViewModels diff --git a/Assets/Scripts/ViewModels/SuggestionModel.cs b/Assets/Scripts/ViewModels/SuggestionModel.cs index f00c023..365f220 100644 --- a/Assets/Scripts/ViewModels/SuggestionModel.cs +++ b/Assets/Scripts/ViewModels/SuggestionModel.cs @@ -1,5 +1,4 @@ using System; -using System.ComponentModel; using System.Windows.Input; using StlVault.Util.Commands; diff --git a/Assets/Scripts/ViewModels/TagInputModelBase.cs b/Assets/Scripts/ViewModels/TagInputModelBase.cs index 3c72329..4286806 100644 --- a/Assets/Scripts/ViewModels/TagInputModelBase.cs +++ b/Assets/Scripts/ViewModels/TagInputModelBase.cs @@ -1,5 +1,4 @@ -using System.ComponentModel; -using System.Linq; +using System.Linq; using System.Windows.Input; using StlVault.Services; using StlVault.Util; diff --git a/Assets/Scripts/ViewModels/TagModel.cs b/Assets/Scripts/ViewModels/TagModel.cs index ad576e7..f61667a 100644 --- a/Assets/Scripts/ViewModels/TagModel.cs +++ b/Assets/Scripts/ViewModels/TagModel.cs @@ -1,5 +1,4 @@ using System; -using System.ComponentModel; using System.Windows.Input; using StlVault.Util.Commands; diff --git a/Assets/Scripts/ViewModels/UserFeedbackModel.cs b/Assets/Scripts/ViewModels/UserFeedbackModel.cs index 62a327f..0e700d6 100644 --- a/Assets/Scripts/ViewModels/UserFeedbackModel.cs +++ b/Assets/Scripts/ViewModels/UserFeedbackModel.cs @@ -1,5 +1,4 @@ using System; -using System.Diagnostics; using System.IO; using System.IO.Compression; using System.Linq; diff --git a/Assets/Scripts/Views/ApplicationView.cs b/Assets/Scripts/Views/ApplicationView.cs index 2e7297d..d85e00b 100644 --- a/Assets/Scripts/Views/ApplicationView.cs +++ b/Assets/Scripts/Views/ApplicationView.cs @@ -1,5 +1,4 @@ -using StlVault.Messages; -using StlVault.ViewModels; +using StlVault.ViewModels; using UnityEngine; using UnityEngine.UI; diff --git a/Assets/Scripts/Views/EditScreen.cs b/Assets/Scripts/Views/EditScreen.cs index d8d555f..ecd0a45 100644 --- a/Assets/Scripts/Views/EditScreen.cs +++ b/Assets/Scripts/Views/EditScreen.cs @@ -1,5 +1,4 @@ -using System; -using DG.Tweening; +using DG.Tweening; using StlVault.Util.Unity; using StlVault.ViewModels; using UnityEngine; diff --git a/Assets/Scripts/Views/ItemView.cs b/Assets/Scripts/Views/ItemView.cs index d87b571..14d064f 100644 --- a/Assets/Scripts/Views/ItemView.cs +++ b/Assets/Scripts/Views/ItemView.cs @@ -1,11 +1,6 @@ -using System.Threading; -using System.Threading.Tasks; -using DG.Tweening; -using StlVault.ViewModels; using TMPro; using UnityEngine; using UnityEngine.EventSystems; -using UnityEngine.UI; #pragma warning disable 0649 diff --git a/Assets/Scripts/Views/ItemViewBase.cs b/Assets/Scripts/Views/ItemViewBase.cs index f7b8603..6dfd2fe 100644 --- a/Assets/Scripts/Views/ItemViewBase.cs +++ b/Assets/Scripts/Views/ItemViewBase.cs @@ -2,11 +2,12 @@ using System.Threading.Tasks; using DG.Tweening; using StlVault.ViewModels; -using TMPro; using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; +#pragma warning disable 0649 + namespace StlVault.Views { internal abstract class ItemViewBase : ViewBase, IPointerEnterHandler, IPointerExitHandler diff --git a/Assets/Scripts/Views/ItemsView.cs.meta b/Assets/Scripts/Views/ItemsView.cs.meta deleted file mode 100644 index e93e59b..0000000 --- a/Assets/Scripts/Views/ItemsView.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 8fbbe1377b804da4bc5626f84e384f26 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Views/PreviewCam.cs b/Assets/Scripts/Views/PreviewCam.cs index 0f2a1a8..086fd88 100644 --- a/Assets/Scripts/Views/PreviewCam.cs +++ b/Assets/Scripts/Views/PreviewCam.cs @@ -1,8 +1,11 @@ +using System; using System.Threading.Tasks; using StlVault.Services; using StlVault.Util; +using StlVault.Util.Logging; using StlVault.Util.Unity; using UnityEngine; +using ILogger = StlVault.Util.Logging.ILogger; #pragma warning disable 0649 @@ -10,6 +13,7 @@ namespace StlVault.Views { internal class PreviewCam : MonoBehaviour, IPreviewBuilder { + private static readonly ILogger Logger = UnityLogger.Instance; public BindableProperty PreviewResolution { get; } = new BindableProperty(); public int Quality { get; set; } @@ -87,8 +91,16 @@ private static float Max(params float[] values) var tcs = new TaskCompletionSource<(byte[], int)>(TaskCreationOptions.RunContinuationsAsynchronously); GuiCallbackQueue.Enqueue(() => { - var data = GetSnapshot(mesh, objRotation); - tcs.SetResult((data, PreviewResolution.Value)); + try + { + var data = GetSnapshot(mesh, objRotation); + tcs.SetResult((data, PreviewResolution.Value)); + } + catch (Exception ex) + { + Logger.Error(ex, "Error while creating snapshot of {0}", mesh.name); + tcs.SetException(ex); + } }); return tcs.Task; diff --git a/Assets/Scripts/Views/TagView.cs b/Assets/Scripts/Views/TagView.cs index f7867e8..036790b 100644 --- a/Assets/Scripts/Views/TagView.cs +++ b/Assets/Scripts/Views/TagView.cs @@ -1,4 +1,3 @@ -using System; using System.Collections; using DG.Tweening; using StlVault.Util.Commands; diff --git a/Assets/Scripts/Views/ViewInitializer.cs b/Assets/Scripts/Views/ViewInitializer.cs index cf01f01..4f8961a 100644 --- a/Assets/Scripts/Views/ViewInitializer.cs +++ b/Assets/Scripts/Views/ViewInitializer.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -using System.Threading.Tasks; using StlVault.Messages; using StlVault.Services; using StlVault.Util.Logging; @@ -27,8 +26,8 @@ public class ViewInitializer : MonoBehaviour [Header("Main Area")] [SerializeField] private TagInputView _searchView; - [SerializeField] private ItemsView _itemsView; [SerializeField] private CanvasGroup _mainGroup; + [SerializeField] private LibraryView _libraryView; [Header("Dialogs")] [SerializeField] private AddSavedSearchDialog _addSavedSearchDialog; @@ -152,7 +151,7 @@ void BindViewModels() _progressView.BindTo(progressModel); _applicationView.BindTo(applicationModel); _searchView.BindTo(searchViewModel); - _itemsView.BindTo(itemsViewModel); + _libraryView.BindTo(itemsViewModel); // Main Menu _importFoldersView.BindTo(importFoldersViewModel); diff --git a/Assets/Scripts/Views/ViewPort.cs b/Assets/Scripts/Views/ViewPort.cs index 75dfbe4..b72c26a 100644 --- a/Assets/Scripts/Views/ViewPort.cs +++ b/Assets/Scripts/Views/ViewPort.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Collections.Specialized; using System.Linq; +using StlVault.Util.Stl; using StlVault.ViewModels; using UnityEngine; using UnityEngine.EventSystems; @@ -58,7 +59,7 @@ private void DestroyMesh(Mesh mesh) if (_lookup.TryGetValue(mesh, out var gameObj)) { Destroy(gameObj); - Destroy(mesh); + StlImporter.Destroy(mesh); _lookup.Remove(mesh); } } diff --git a/Assets/UiPrefabs/ItemView.prefab b/Assets/UiPrefabs/ItemView.prefab index b0599e4..fc5acc7 100644 --- a/Assets/UiPrefabs/ItemView.prefab +++ b/Assets/UiPrefabs/ItemView.prefab @@ -766,11 +766,11 @@ RectTransform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 1} --- !u!222 &5352335181552139009 CanvasRenderer: m_ObjectHideFlags: 0 @@ -820,5 +820,5 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _previewImage: {fileID: 1403248226394128343} - _itemName: {fileID: 5352335180558935276} _selectedColor: {r: 0.5647059, g: 0.6431373, b: 0.7294118, a: 1} + _itemName: {fileID: 5352335180558935276} diff --git a/Assets/UiPrefabs/ItemsView.prefab b/Assets/UiPrefabs/ItemsView.prefab index b2dc2f8..379c075 100644 --- a/Assets/UiPrefabs/ItemsView.prefab +++ b/Assets/UiPrefabs/ItemsView.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &823541966299068201 +--- !u!1 &8800045599092497783 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,104 +8,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 823541966299068202} - - component: {fileID: 823541966299068205} - - component: {fileID: 823541966299068204} - m_Layer: 5 - m_Name: Scrollbar - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &823541966299068202 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 823541966299068201} - 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_Children: - - {fileID: 823541967822742501} - - {fileID: 823541967764820753} - m_Father: {fileID: 823541966721862940} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 10} - m_Pivot: {x: 1, y: 0.5} ---- !u!222 &823541966299068205 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 823541966299068201} - m_CullTransparentMesh: 0 ---- !u!114 &823541966299068204 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 823541966299068201} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 0.78431374} - m_HighlightedColor: {r: 1, g: 1, b: 1, a: 0.9607843} - m_PressedColor: {r: 1, g: 1, b: 1, a: 1} - m_SelectedColor: {r: 1, g: 1, b: 1, a: 0.9607843} - m_DisabledColor: {r: 1, g: 1, b: 1, a: 0.39215687} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Highlighted - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 823541966469537300} - m_HandleRect: {fileID: 823541966469537299} - m_Direction: 2 - m_Value: 0 - m_Size: 1 - m_NumberOfSteps: 0 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &823541966469537298 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 823541966469537299} - - component: {fileID: 823541966469537301} - - component: {fileID: 823541966469537300} + - component: {fileID: 8800045599092497776} + - component: {fileID: 8800045599092497778} + - component: {fileID: 8800045599092497777} m_Layer: 5 m_Name: Handle m_TagString: Untagged @@ -113,18 +18,18 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &823541966469537299 +--- !u!224 &8800045599092497776 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 823541966469537298} + m_GameObject: {fileID: 8800045599092497783} 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_Children: [] - m_Father: {fileID: 823541967764820753} + m_Father: {fileID: 8800045599972126415} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -132,21 +37,21 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &823541966469537301 +--- !u!222 &8800045599092497778 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 823541966469537298} + m_GameObject: {fileID: 8800045599092497783} m_CullTransparentMesh: 0 ---- !u!114 &823541966469537300 +--- !u!114 &8800045599092497777 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 823541966469537298} + m_GameObject: {fileID: 8800045599092497783} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -158,7 +63,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f03f625cc7127f244a2f4da835b92720, type: 3} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -168,7 +73,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &823541966584804516 +--- !u!1 &8800045599972126414 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -176,115 +81,109 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 823541966584804517} - - component: {fileID: 823541966584804519} - - component: {fileID: 823541966584804518} - - component: {fileID: 823541966584804536} - - component: {fileID: 823541966584804537} - - component: {fileID: 823541966584804538} + - component: {fileID: 8800045599972126415} m_Layer: 5 - m_Name: List + m_Name: Sliding Area m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &823541966584804517 +--- !u!224 &8800045599972126415 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 823541966584804516} + m_GameObject: {fileID: 8800045599972126414} 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_Children: [] - m_Father: {fileID: 823541966679344157} - m_RootOrder: 0 + m_Children: + - {fileID: 8800045599092497776} + m_Father: {fileID: 8800045600676933239} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &823541966584804519 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 823541966584804516} - m_CullTransparentMesh: 0 ---- !u!114 &823541966584804518 -MonoBehaviour: + m_SizeDelta: {x: -10, y: -10} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &8800045600009872551 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 823541966584804516} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 60 - m_Right: 50 - m_Top: 200 - m_Bottom: 200 - m_ChildAlignment: 1 - m_StartCorner: 0 - m_StartAxis: 0 - m_CellSize: {x: 400, y: 430} - m_Spacing: {x: 20, y: 20} - m_Constraint: 0 - m_ConstraintCount: 2 ---- !u!114 &823541966584804536 -MonoBehaviour: + serializedVersion: 6 + m_Component: + - component: {fileID: 8800045600062422996} + - component: {fileID: 8800045600009872545} + - component: {fileID: 8800045600009872544} + m_Layer: 5 + m_Name: ItemsView + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8800045600062422996 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 823541966584804516} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 2 ---- !u!114 &823541966584804537 -MonoBehaviour: + m_GameObject: {fileID: 8800045600009872551} + 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_Children: + - {fileID: 8800045600586299755} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 50, y: 0} + m_SizeDelta: {x: -1400, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8800045600009872545 +CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 823541966584804516} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e9d84c00cbe657540848f339f981477d, type: 3} - m_Name: - m_EditorClassIdentifier: - _slider: {fileID: 0} - _minSize: 300 - _maxSize: 800 - _startSize: 400 ---- !u!114 &823541966584804538 + m_GameObject: {fileID: 8800045600009872551} + m_CullTransparentMesh: 0 +--- !u!114 &8800045600009872544 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 823541966584804516} + m_GameObject: {fileID: 8800045600009872551} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ff6af9727d1f4f2fbe6ee220f295c4c4, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - _basePadding: 60 - _paddingDriver: {fileID: 0} ---- !u!1 &823541966679344156 + m_Material: {fileID: 0} + m_Color: {r: 0.7490196, g: 0.76470596, b: 0.7254902, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8800045600491908748 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -292,11 +191,11 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 823541966679344157} - - component: {fileID: 823541966679344145} - - component: {fileID: 823541966679344144} - - component: {fileID: 823541966679344159} - - component: {fileID: 823541966679344158} + - component: {fileID: 8800045600491908749} + - component: {fileID: 8800045600491908745} + - component: {fileID: 8800045600491908744} + - component: {fileID: 8800045600491908751} + - component: {fileID: 8800045600491908750} m_Layer: 5 m_Name: Scroll Area m_TagString: Untagged @@ -304,48 +203,48 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &823541966679344157 +--- !u!224 &8800045600491908749 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 823541966679344156} + m_GameObject: {fileID: 8800045600491908748} 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_Children: - - {fileID: 823541966584804517} - m_Father: {fileID: 823541966721862940} + - {fileID: 8800045601045309520} + m_Father: {fileID: 8800045600586299755} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -13, y: 0} - m_SizeDelta: {x: -26, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &823541966679344145 +--- !u!222 &8800045600491908745 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 823541966679344156} + m_GameObject: {fileID: 8800045600491908748} m_CullTransparentMesh: 0 ---- !u!114 &823541966679344144 +--- !u!114 &8800045600491908744 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 823541966679344156} + m_GameObject: {fileID: 8800045600491908748} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.7490196, g: 0.7647059, b: 0.7254902, a: 1} + m_Color: {r: 0.7490196, g: 0.76470596, b: 0.7254902, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -360,19 +259,19 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &823541966679344159 +--- !u!114 &8800045600491908751 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 823541966679344156} + m_GameObject: {fileID: 8800045600491908748} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} m_Name: m_EditorClassIdentifier: - m_Content: {fileID: 823541966584804517} + m_Content: {fileID: 8800045601045309520} m_Horizontal: 0 m_Vertical: 1 m_MovementType: 1 @@ -382,7 +281,7 @@ MonoBehaviour: m_ScrollSensitivity: 130 m_Viewport: {fileID: 0} m_HorizontalScrollbar: {fileID: 0} - m_VerticalScrollbar: {fileID: 823541966299068204} + m_VerticalScrollbar: {fileID: 8800045600676933232} m_HorizontalScrollbarVisibility: 0 m_VerticalScrollbarVisibility: 1 m_HorizontalScrollbarSpacing: 0 @@ -390,20 +289,20 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] ---- !u!114 &823541966679344158 +--- !u!114 &8800045600491908750 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 823541966679344156} + m_GameObject: {fileID: 8800045600491908748} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 1 ---- !u!1 &823541966721862939 +--- !u!1 &8800045600586299754 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -411,8 +310,8 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 823541966721862940} - - component: {fileID: 823541966721862941} + - component: {fileID: 8800045600586299755} + - component: {fileID: 8800045600586299796} m_Layer: 5 m_Name: List View m_TagString: Untagged @@ -420,20 +319,20 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &823541966721862940 +--- !u!224 &8800045600586299755 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 823541966721862939} + m_GameObject: {fileID: 8800045600586299754} 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_Children: - - {fileID: 823541966679344157} - - {fileID: 823541966299068202} - m_Father: {fileID: 823541967356794169} + - {fileID: 8800045600491908749} + - {fileID: 8800045600676933239} + m_Father: {fileID: 8800045600062422996} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -441,15 +340,15 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &823541966721862941 +--- !u!222 &8800045600586299796 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 823541966721862939} + m_GameObject: {fileID: 8800045600586299754} m_CullTransparentMesh: 0 ---- !u!1 &823541967356794168 +--- !u!1 &8800045600676933238 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -457,89 +356,94 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 823541967356794169} - - component: {fileID: 823541967356794171} - - component: {fileID: 823541967356794170} - - component: {fileID: 823541967356794172} + - component: {fileID: 8800045600676933239} + - component: {fileID: 8800045600676933233} + - component: {fileID: 8800045600676933232} m_Layer: 5 - m_Name: ItemsView + m_Name: Scrollbar m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &823541967356794169 +--- !u!224 &8800045600676933239 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 823541967356794168} + m_GameObject: {fileID: 8800045600676933238} 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_Children: - - {fileID: 823541966721862940} - m_Father: {fileID: 0} - m_RootOrder: 0 + - {fileID: 8800045600752694462} + - {fileID: 8800045599972126415} + m_Father: {fileID: 8800045600586299755} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} + m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 50, y: 0} - m_SizeDelta: {x: -1400, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &823541967356794171 + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 10} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &8800045600676933233 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 823541967356794168} + m_GameObject: {fileID: 8800045600676933238} m_CullTransparentMesh: 0 ---- !u!114 &823541967356794170 +--- !u!114 &8800045600676933232 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 823541967356794168} + m_GameObject: {fileID: 8800045600676933238} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.392} - m_RaycastTarget: 1 - m_OnCullStateChanged: + m_Navigation: + m_Mode: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 0.78431374} + m_HighlightedColor: {r: 1, g: 1, b: 1, a: 0.9607843} + m_PressedColor: {r: 1, g: 1, b: 1, a: 1} + m_SelectedColor: {r: 1, g: 1, b: 1, a: 0.9607843} + m_DisabledColor: {r: 1, g: 1, b: 1, a: 0.39215687} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Highlighted + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 8800045599092497777} + m_HandleRect: {fileID: 8800045599092497776} + m_Direction: 2 + m_Value: 0 + m_Size: 1 + m_NumberOfSteps: 0 + m_OnValueChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &823541967356794172 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 823541967356794168} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8fbbe1377b804da4bc5626f84e384f26, type: 3} - m_Name: - m_EditorClassIdentifier: - _itemPrefab: {fileID: 5352335181552139012, guid: bfa86ee45e4414a40837cbbc778ef1cc, - type: 3} - _itemsContainer: {fileID: 823541966584804517} ---- !u!1 &823541967764820752 +--- !u!1 &8800045600752694461 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -547,35 +451,72 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 823541967764820753} + - component: {fileID: 8800045600752694462} + - component: {fileID: 8800045600752694456} + - component: {fileID: 8800045600752694463} m_Layer: 5 - m_Name: Sliding Area + m_Name: Background m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &823541967764820753 +--- !u!224 &8800045600752694462 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 823541967764820752} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 8800045600752694461} + 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_Children: - - {fileID: 823541966469537299} - m_Father: {fileID: 823541966299068202} - m_RootOrder: 1 + m_Children: [] + m_Father: {fileID: 8800045600676933239} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -10, y: -10} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &823541967822742500 +--- !u!222 &8800045600752694456 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8800045600752694461} + m_CullTransparentMesh: 0 +--- !u!114 &8800045600752694463 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8800045600752694461} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.7490196, g: 0.76470596, b: 0.7254902, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8800045601045309527 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -583,68 +524,96 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 823541967822742501} - - component: {fileID: 823541967822742503} - - component: {fileID: 823541967822742502} + - component: {fileID: 8800045601045309520} + - component: {fileID: 8800045601045309523} + - component: {fileID: 8800045601045309522} + - component: {fileID: 8800045601045309532} + - component: {fileID: 8800045601045309521} m_Layer: 5 - m_Name: Background + m_Name: List m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &823541967822742501 +--- !u!224 &8800045601045309520 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 823541967822742500} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 8800045601045309527} + 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_Children: [] - m_Father: {fileID: 823541966299068202} + m_Father: {fileID: 8800045600491908749} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -10, y: -10} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &823541967822742503 + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!222 &8800045601045309523 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 823541967822742500} + m_GameObject: {fileID: 8800045601045309527} m_CullTransparentMesh: 0 ---- !u!114 &823541967822742502 +--- !u!114 &8800045601045309522 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 823541967822742500} + m_GameObject: {fileID: 8800045601045309527} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.37254903, g: 0.40784314, b: 0.4509804, a: 0.19607843} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f38987b2f12030947bea58483e18ce1a, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!114 &8800045601045309532 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8800045601045309527} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ff6af9727d1f4f2fbe6ee220f295c4c4, type: 3} + m_Name: + m_EditorClassIdentifier: + _basePadding: 60 + _paddingDriver: {fileID: 0} +--- !u!114 &8800045601045309521 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8800045601045309527} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 900e1e8ccb2f4f6cb0f1b0b144995844, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 60 + m_Right: 60 + m_Top: 100 + m_Bottom: 50 + m_ChildAlignment: 0 + _slider: {fileID: 0} + _minSize: 200 + _maxSize: 1000 + _childRatioOffset: {x: 0, y: 30} + _childViewPrefab: {fileID: 5352335181552139012, guid: bfa86ee45e4414a40837cbbc778ef1cc, + type: 3} + _viewPortRect: {fileID: 8800045600491908749} + _spacing: 15 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index d5fdde7..0bfa4bb 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -51,7 +51,7 @@ PlayerSettings: m_StereoRenderingPath: 0 m_ActiveColorSpace: 1 m_MTRendering: 1 - m_StackTraceTypes: 010000000100000001000000000000000100000001000000 + m_StackTraceTypes: 020000000100000001000000000000000200000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 iosUseCustomAppBackgroundBehavior: 0 @@ -121,7 +121,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.1 + bundleVersion: 0.4.0 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0