UVCXR/Studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'Splash Image 선택 안되는 오류 및 페이지 변경 시에도 에셋 상세 정보가 닫히지 않는 오류 수정' (#190) from jym/250630_00 into main

Browse Source 
Reviewed-on: http://220.90.135.190:3000/UVCXR/Studio/pulls/190
This commit was merged in pull request #190.
This commit is contained in:
UVCXR
2025-06-30 15:56:36 +09:00
parent 58abe8cb1f ee2b11d19c
commit ef25aa75c2
4 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Assets/Scripts/Studio/Managers/PopupCanvasHandler.cs
View File

@@ -35,6 +35,7 @@ namespace Studio.Manage
canvas_popup.panel_datafiltersetting.onSaveAPIFilterData += canvas_popup.panel_apiconnectmodal.SetFilterData; 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.onClickServerAssets += canvas_popup.panel_serverassets.Active;
canvas_popup.panel_assetsetting.onClickLocalAssets += canvas_popup.panel_localassets.Active; canvas_popup.panel_assetsetting.onClickLocalAssets += canvas_popup.panel_localassets.Active;
canvas_popup.panel_assetsetting.onClickAssetHierarchy += canvas_popup.panel_assethierarchy.Active; canvas_popup.panel_assetsetting.onClickAssetHierarchy += canvas_popup.panel_assethierarchy.Active;

2
Assets/Scripts/Studio/UI/Panel/Panel_AppSetting.cs
View File

@@ -142,6 +142,7 @@ namespace Studio.UI
Texture2D texture = new Texture2D(2, 2); Texture2D texture = new Texture2D(2, 2);
if (texture.LoadImage(imageData)) 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)); Sprite sprite = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), new Vector2(0.5f, 0.5f));
Image_Selected.sprite = sprite; Image_Selected.sprite = sprite;
@@ -149,6 +150,7 @@ namespace Studio.UI
} }
else else
{ {
Image_Selected.enabled = false;
Debug.LogError("이미지 로드 실패"); Debug.LogError("이미지 로드 실패");
} }
} }

2
Assets/Scripts/Studio/UI/Panel/Panel_AssetInfo.cs
View File

@@ -48,7 +48,7 @@ namespace Studio
rectTransform.localPosition = localPos; rectTransform.localPosition = localPos;
} }
private void Close() public void Close()
{ {
SetActive(false); SetActive(false);
} }

3
Assets/Scripts/Studio/UI/Panel/Panel_AssetSetting.cs
View File

@@ -19,6 +19,8 @@ namespace Studio.UI
private RectTransform TabToggles; private RectTransform TabToggles;
private Button Button_Close; private Button Button_Close;
public Action onClose;
public Action<bool> onClickServerAssets; public Action<bool> onClickServerAssets;
public Action<bool> onClickLocalAssets; public Action<bool> onClickLocalAssets;
public Action<bool> onClickAssetHierarchy; public Action<bool> onClickAssetHierarchy;
@@ -44,6 +46,7 @@ namespace Studio.UI
public void Close() public void Close()
{ {
SetActive(false); SetActive(false);
onClose?.Invoke();
} }
private void OnServerAssetsValueChanged(bool isOn) private void OnServerAssetsValueChanged(bool isOn)
{ {