diff --git a/Assets/Image/Icons/Toolbox/icon-park-solid_play-two.png b/Assets/Image/Icons/Toolbox/icon-park-solid_play-two.png index 59f6f631..baa6f052 100644 Binary files a/Assets/Image/Icons/Toolbox/icon-park-solid_play-two.png and b/Assets/Image/Icons/Toolbox/icon-park-solid_play-two.png differ diff --git a/Assets/Image/Icons/Toolbox/icon-park-solid_play-two.png.meta b/Assets/Image/Icons/Toolbox/icon-park-solid_play-two.png.meta index 2d882e91..6677a970 100644 --- a/Assets/Image/Icons/Toolbox/icon-park-solid_play-two.png.meta +++ b/Assets/Image/Icons/Toolbox/icon-park-solid_play-two.png.meta @@ -49,7 +49,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 4, y: 4, z: 4, w: 4} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -101,7 +101,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 1537655665 + internalID: 0 vertices: [] indices: edges: [] diff --git a/Assets/Image/Icons/Toolbox/stop-icon.png b/Assets/Image/Icons/Toolbox/stop-icon.png index b9690e67..3082ab3c 100644 Binary files a/Assets/Image/Icons/Toolbox/stop-icon.png and b/Assets/Image/Icons/Toolbox/stop-icon.png differ diff --git a/Assets/Resources/Prefabs/UI/PRF_AssetLibraryFolder.prefab b/Assets/Resources/Prefabs/UI/PRF_AssetLibraryFolder.prefab index 803607a8..a7c38b9d 100644 --- a/Assets/Resources/Prefabs/UI/PRF_AssetLibraryFolder.prefab +++ b/Assets/Resources/Prefabs/UI/PRF_AssetLibraryFolder.prefab @@ -38,9 +38,9 @@ RectTransform: m_Father: {fileID: 9151118461914384115} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: -20, y: 7} - m_SizeDelta: {x: 460, y: 28} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 35} m_Pivot: {x: 0, y: 0.5} --- !u!114 &8577872390119345382 MonoBehaviour: @@ -400,8 +400,8 @@ MonoBehaviour: m_Calls: [] m_text: New Text m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 69abd87f38225ed46aa612577c25f379, type: 2} - m_sharedMaterial: {fileID: -7290017371581542385, guid: 69abd87f38225ed46aa612577c25f379, type: 2} + m_fontAsset: {fileID: 11400000, guid: 9a2c7e704ad3e62438526dc8aecaeb56, type: 2} + m_sharedMaterial: {fileID: 682561501981441939, guid: 9a2c7e704ad3e62438526dc8aecaeb56, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1078,7 +1078,6 @@ GameObject: - component: {fileID: 8781087111399529913} - component: {fileID: 7596083260074090403} - component: {fileID: 3260751984552170403} - - component: {fileID: 1619343650484821890} m_Layer: 5 m_Name: Line m_TagString: Untagged @@ -1126,10 +1125,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 + m_Maskable: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -1143,21 +1142,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &1619343650484821890 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7706922996775437488} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EffectColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5} - m_EffectDistance: {x: 0, y: -1} - m_UseGraphicAlpha: 1 --- !u!1 &7801651291590131016 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/UI/PRF_AssetLibraryItem.prefab b/Assets/Resources/Prefabs/UI/PRF_AssetLibraryItem.prefab index 3ed25625..f0dd4eb8 100644 --- a/Assets/Resources/Prefabs/UI/PRF_AssetLibraryItem.prefab +++ b/Assets/Resources/Prefabs/UI/PRF_AssetLibraryItem.prefab @@ -734,7 +734,6 @@ MonoBehaviour: upperLine: {fileID: 2946232207523233411} lowerLine: {fileID: 4764771198905317747} lineColor: {r: 1, g: 0, b: 0, a: 0.47058824} - highLight: {fileID: 0} isSelected: 0 --- !u!1 &3809916293675722094 GameObject: @@ -989,8 +988,8 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 4f170a218dfffe4489dc7ddd54bc15cf, type: 2} - m_sharedMaterial: {fileID: 6975767319296004534, guid: 4f170a218dfffe4489dc7ddd54bc15cf, type: 2} + m_fontAsset: {fileID: 11400000, guid: 69abd87f38225ed46aa612577c25f379, type: 2} + m_sharedMaterial: {fileID: -7290017371581542385, guid: 69abd87f38225ed46aa612577c25f379, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1014,13 +1013,13 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 15 - m_fontSizeBase: 15 + m_fontSize: 14 + m_fontSizeBase: 14 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 1 + m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 diff --git a/Assets/Scenes/pre-0.24.0/GameObject Profile.asset b/Assets/Scenes/pre-0.24.0/GameObject Profile.asset new file mode 100644 index 00000000..03b03170 --- /dev/null +++ b/Assets/Scenes/pre-0.24.0/GameObject Profile.asset @@ -0,0 +1,85 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: GameObject Profile + m_EditorClassIdentifier: + components: + - {fileID: 7287459268429832391} + - {fileID: 1765677894710564828} +--- !u!114 &1765677894710564828 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 66f335fb1ffd8684294ad653bf1c7564, type: 3} + m_Name: ColorAdjustments + m_EditorClassIdentifier: + active: 1 + postExposure: + m_OverrideState: 0 + m_Value: 0 + contrast: + m_OverrideState: 0 + m_Value: 0 + colorFilter: + m_OverrideState: 0 + m_Value: {r: 1, g: 1, b: 1, a: 1} + hueShift: + m_OverrideState: 0 + m_Value: 0 + saturation: + m_OverrideState: 0 + m_Value: 0 +--- !u!114 &7287459268429832391 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 97c23e3b12dc18c42a140437e53d3951, type: 3} + m_Name: Tonemapping + m_EditorClassIdentifier: + active: 1 + mode: + m_OverrideState: 1 + m_Value: 1 + neutralHDRRangeReductionMode: + m_OverrideState: 0 + m_Value: 2 + acesPreset: + m_OverrideState: 0 + m_Value: 3 + hueShiftAmount: + m_OverrideState: 0 + m_Value: 0 + detectPaperWhite: + m_OverrideState: 0 + m_Value: 0 + paperWhite: + m_OverrideState: 0 + m_Value: 300 + detectBrightnessLimits: + m_OverrideState: 0 + m_Value: 1 + minNits: + m_OverrideState: 0 + m_Value: 0.005 + maxNits: + m_OverrideState: 0 + m_Value: 1000 diff --git a/Assets/Scenes/pre-0.24.0/GameObject Profile.asset.meta b/Assets/Scenes/pre-0.24.0/GameObject Profile.asset.meta new file mode 100644 index 00000000..ac316faf --- /dev/null +++ b/Assets/Scenes/pre-0.24.0/GameObject Profile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b79d68419016700429b8165b3ca9685b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Studio/Managers/FBXFileManager.cs b/Assets/Scripts/Studio/Managers/FBXFileManager.cs index 00d86cb9..03c3ec8c 100644 --- a/Assets/Scripts/Studio/Managers/FBXFileManager.cs +++ b/Assets/Scripts/Studio/Managers/FBXFileManager.cs @@ -67,7 +67,7 @@ namespace Studio.AssetTool newObject.transform.parent = fbxAnchor; CustomAssetData assetData = newObject.AddComponent(); assetData.assetName = assetName; - assetData.folderName = "Resouce"; + assetData.folderName = "Base Library"; assetData.isLoading = true; assetData.isLoadComplete = true; diff --git a/Assets/Scripts/Studio/UI/TreeView/AssetLibraryPooledScrollView.cs b/Assets/Scripts/Studio/UI/TreeView/AssetLibraryPooledScrollView.cs index ef1b3acb..43c0c027 100644 --- a/Assets/Scripts/Studio/UI/TreeView/AssetLibraryPooledScrollView.cs +++ b/Assets/Scripts/Studio/UI/TreeView/AssetLibraryPooledScrollView.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using UnityEngine; using UnityEngine.Pool; using UnityEngine.Events; @@ -216,9 +216,11 @@ namespace Studio.AssetLibraryTree RectTransform itemRt; + var width = 0f; if (item.type == AssetLibraryItemType.folder) { AssetLibraryScrollFolderUI itemUI = foldersPool.Get(); + width = scrollRect.content.sizeDelta.x; itemUI.SetItemData(item); itemUI.transform.SetParent(content, false); itemRt = itemUI.GetComponent(); @@ -228,6 +230,7 @@ namespace Studio.AssetLibraryTree else { AssetLibraryScrollItemUI itemUI = GetItemUI(); + width = itemWidth; itemUI.SetItemData(item); itemUI.SetSelected(selectedItems); itemUI.transform.SetParent(content, false); @@ -239,10 +242,10 @@ namespace Studio.AssetLibraryTree int row = i / rowItemCount; int col = i % rowItemCount; - float x = col * (itemWidth + spacingX) - ((rowItemCount - 1) * (itemWidth + spacingX)) / 2f; + float x = item.type == AssetLibraryItemType.folder? 0f:col * (width + spacingX) - ((rowItemCount - 1) * (width + spacingX)) / 2f; float y = -(row-folderCount) * ( itemHeight + spacingY) + (-folderCount * (folderHeight + spacingY)) - height / 2f; - itemRt.sizeDelta = new Vector2(itemWidth, height); + itemRt.sizeDelta = new Vector2(width, height); itemRt.anchoredPosition = new Vector2(x, y); if (item.type == AssetLibraryItemType.folder)