diff --git a/Assets/Prefabs/UI/Panel_AssetProperties.prefab b/Assets/Prefabs/UI/Panel_AssetProperties.prefab index 08a000c5..3c5f241c 100644 --- a/Assets/Prefabs/UI/Panel_AssetProperties.prefab +++ b/Assets/Prefabs/UI/Panel_AssetProperties.prefab @@ -376,6 +376,7 @@ MonoBehaviour: Text_UploadDate: {fileID: 0} Text_Creator: {fileID: 0} Text_Manager: {fileID: 0} + Button_Close: {fileID: 0} --- !u!1 &1123577870573476958 GameObject: m_ObjectHideFlags: 0 @@ -643,7 +644,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1907737900833583700} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_ConstrainProportionsScale: 0 @@ -1942,7 +1943,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5544921215061364206} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_ConstrainProportionsScale: 0 @@ -1951,7 +1952,7 @@ RectTransform: 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: 0, y: 0} + m_AnchoredPosition: {x: 15.99999, y: 0} m_SizeDelta: {x: 17.89, y: 19} m_Pivot: {x: 0, y: 0.5} --- !u!222 &5880221431716930588 @@ -2585,12 +2586,13 @@ RectTransform: m_Children: - {fileID: 2248029100861702724} - {fileID: 8742157097043978909} + - {fileID: 2637460838460320172} m_Father: {fileID: 7724524012160675479} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 176, y: -24} - m_SizeDelta: {x: 320, y: 24} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 228} + m_SizeDelta: {x: 0, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &248810562213438913 CanvasRenderer: @@ -2872,6 +2874,126 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &8894586282057837127 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2637460838460320172} + - component: {fileID: 2728453204465595349} + - component: {fileID: 3690823967138470933} + - component: {fileID: 3429316459185607450} + m_Layer: 5 + m_Name: Button_Close + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2637460838460320172 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8894586282057837127} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6998202401820620409} + 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: -12, y: 0} + m_SizeDelta: {x: 18, y: 18} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &2728453204465595349 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8894586282057837127} + m_CullTransparentMesh: 1 +--- !u!114 &3690823967138470933 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8894586282057837127} + 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, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 0179547eff27daf4e8f258c40b1a47b5, type: 3} + m_Type: 0 + 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 &3429316459185607450 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8894586282057837127} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 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: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + 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: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 3690823967138470933} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &9156972321083674129 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_AssetProperties.cs b/Assets/Scripts/Studio/UI/Panel/Panel_AssetProperties.cs index 2a5b4ce1..27554899 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_AssetProperties.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_AssetProperties.cs @@ -20,6 +20,7 @@ namespace XED.UI public TextMeshProUGUI Text_UploadDate; public TextMeshProUGUI Text_Creator; public TextMeshProUGUI Text_Manager; + public Button Button_Close; // public Button Button_Preview; public Action onClickPreview; @@ -28,6 +29,7 @@ namespace XED.UI public override void AfterAwake() { //Button_Preview.onClick.AddListener(OnClickPreview); + Button_Close.onClick.AddListener(() => gameObject.SetActive(false)); SetActive(false); } @@ -47,9 +49,10 @@ namespace XED.UI public void Open(List selectedItems) { + Init(); + if (selectedItems.Count > 1 || selectedItems.Count == 0) { - SetActive(false); return; } @@ -69,7 +72,19 @@ namespace XED.UI Text_UploadDate.text = assetData.UploadDate; Text_Creator.text = assetData.Creator; Text_Manager.text = assetData.Manager; + Image_Thumbnail.gameObject.SetActive(true); Image_Thumbnail.texture = assetData.thumbnail; } + + private void Init() + { + Text_Name.text = string.Empty; + Text_CreateDate.text = string.Empty; + Text_LastRevisionDate.text = string.Empty; + Text_UploadDate.text = string.Empty; + Text_Creator.text = string.Empty; + Text_Manager.text = string.Empty; + Image_Thumbnail.gameObject.SetActive(false); + } } } diff --git a/Assets/Scripts/Studio/UI/TreeView/PooledScrollView.cs b/Assets/Scripts/Studio/UI/TreeView/PooledScrollView.cs index 652776b6..77a502a0 100644 --- a/Assets/Scripts/Studio/UI/TreeView/PooledScrollView.cs +++ b/Assets/Scripts/Studio/UI/TreeView/PooledScrollView.cs @@ -269,7 +269,6 @@ namespace XED.Hierarchy } public void OnSelectAnother(HierarchyItem item) { - print("OnSelectAnother"); if (selectedItems.Count == 1 && selectedItems[0] == item) { selectedItems.Clear(); @@ -322,6 +321,7 @@ namespace XED.Hierarchy itemUI.SetSelected(false); } selectedItems.Clear(); + onSelect?.Invoke(selectedItems); lastSelectedItem = null; } public void OnToggleExpand()