diff --git a/Assets/Scripts/Studio/Managers/PopupCanvasHandler.cs b/Assets/Scripts/Studio/Managers/PopupCanvasHandler.cs index 9dd0e935..c6415f69 100644 --- a/Assets/Scripts/Studio/Managers/PopupCanvasHandler.cs +++ b/Assets/Scripts/Studio/Managers/PopupCanvasHandler.cs @@ -35,6 +35,7 @@ namespace Studio.Manage canvas_popup.panel_datafiltersetting.onSaveAPIFilterData += canvas_popup.panel_apiconnectmodal.SetFilterData; + canvas_popup.panel_assetsetting.onClose += canvas_popup.panel_assetinfo.Close; canvas_popup.panel_assetsetting.onClickServerAssets += canvas_popup.panel_serverassets.Active; canvas_popup.panel_assetsetting.onClickLocalAssets += canvas_popup.panel_localassets.Active; canvas_popup.panel_assetsetting.onClickAssetHierarchy += canvas_popup.panel_assethierarchy.Active; diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_AppSetting.cs b/Assets/Scripts/Studio/UI/Panel/Panel_AppSetting.cs index 33ba96a1..766e8572 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_AppSetting.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_AppSetting.cs @@ -142,6 +142,7 @@ namespace Studio.UI Texture2D texture = new Texture2D(2, 2); if (texture.LoadImage(imageData)) { + Image_Selected.enabled = true; Sprite sprite = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), new Vector2(0.5f, 0.5f)); Image_Selected.sprite = sprite; @@ -149,6 +150,7 @@ namespace Studio.UI } else { + Image_Selected.enabled = false; Debug.LogError("À̹ÌÁö ·Îµå ½ÇÆÐ"); } } diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_AssetInfo.cs b/Assets/Scripts/Studio/UI/Panel/Panel_AssetInfo.cs index 6a6a0b5c..3fe1a546 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_AssetInfo.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_AssetInfo.cs @@ -48,7 +48,7 @@ namespace Studio rectTransform.localPosition = localPos; } - private void Close() + public void Close() { SetActive(false); } diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_AssetSetting.cs b/Assets/Scripts/Studio/UI/Panel/Panel_AssetSetting.cs index 43a251ee..d9429a2b 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_AssetSetting.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_AssetSetting.cs @@ -19,6 +19,8 @@ namespace Studio.UI private RectTransform TabToggles; private Button Button_Close; + public Action onClose; + public Action onClickServerAssets; public Action onClickLocalAssets; public Action onClickAssetHierarchy; @@ -44,6 +46,7 @@ namespace Studio.UI public void Close() { SetActive(false); + onClose?.Invoke(); } private void OnServerAssetsValueChanged(bool isOn) {