From 6f58fdc956550949af2e691eb7aa9933bcb8149c Mon Sep 17 00:00:00 2001 From: njh Date: Mon, 9 Feb 2026 22:25:05 +0900 Subject: [PATCH] fix bottomleft --- .../Scripts/UVC/UI/ToolBar/SideTabBar.cs | 7 + .../UVC/UI/ToolBar/View/ToolbarView.cs | 8 +- .../Scripts/UVC/UI/Window/AccordionWindow.cs | 18 + Assets/Scenes/SystemScene.unity | 503 +++++++++++------- Assets/Scripts/ChunilENG/UI/LeftSidePanel.cs | 1 + Assets/Scripts/UI/BottomLeftToolbar.cs | 1 + 6 files changed, 350 insertions(+), 188 deletions(-) diff --git a/Assets/DownloadAssets/XRLib/Scripts/UVC/UI/ToolBar/SideTabBar.cs b/Assets/DownloadAssets/XRLib/Scripts/UVC/UI/ToolBar/SideTabBar.cs index 74f3268c..145d2eb0 100644 --- a/Assets/DownloadAssets/XRLib/Scripts/UVC/UI/ToolBar/SideTabBar.cs +++ b/Assets/DownloadAssets/XRLib/Scripts/UVC/UI/ToolBar/SideTabBar.cs @@ -1,3 +1,6 @@ +using ChunilENG; +using ChunilENG.Management; +using ChunilENG.UI; using OCTOPUS_TWIN; using OCTOPUS_TWIN.Command; using System; @@ -35,6 +38,10 @@ namespace UVC.UI.Toolbar { tabController.OnTabChanged += (index) => { + if(index == 0) + { + ChunilENGSceneMain.Instance.GetManager().GetCanvas().GetPanel().HideItem(); + } Debug.Log($" Ǿϴ: {index}"); }; } diff --git a/Assets/DownloadAssets/XRLib/Scripts/UVC/UI/ToolBar/View/ToolbarView.cs b/Assets/DownloadAssets/XRLib/Scripts/UVC/UI/ToolBar/View/ToolbarView.cs index 02301390..2c23e3ea 100644 --- a/Assets/DownloadAssets/XRLib/Scripts/UVC/UI/ToolBar/View/ToolbarView.cs +++ b/Assets/DownloadAssets/XRLib/Scripts/UVC/UI/ToolBar/View/ToolbarView.cs @@ -450,7 +450,13 @@ namespace UVC.UI.Toolbar.View { selectableComponent.interactable = model.IsEnabled; } - SelectButton = model; + if (model is CameraRadioButton cameraRadio) + { + if (cameraRadio.IsSelected) + SelectButton = model; + else + SelectButton = null; + } } /// diff --git a/Assets/DownloadAssets/XRLib/Scripts/UVC/UI/Window/AccordionWindow.cs b/Assets/DownloadAssets/XRLib/Scripts/UVC/UI/Window/AccordionWindow.cs index 4cbcf43e..85f82f56 100644 --- a/Assets/DownloadAssets/XRLib/Scripts/UVC/UI/Window/AccordionWindow.cs +++ b/Assets/DownloadAssets/XRLib/Scripts/UVC/UI/Window/AccordionWindow.cs @@ -1,6 +1,12 @@ #nullable enable +using ChunilENG; +using ChunilENG.Management; +using ChunilENG.UI; +using System; using UnityEngine; +using UnityEngine.UI; using UVC.UI.List.Accordion; +using UVC.UI.Toolbar; namespace UVC.UI.Window { @@ -17,6 +23,7 @@ namespace UVC.UI.Window [SerializeField] private bool dragImageFollowCursor = true; + private Button closeButton; /// /// 내부 에 대한 접근자. /// 이벤트 구독 등 외부에서 리스트에 직접 접근할 때 사용합니다. @@ -33,6 +40,17 @@ namespace UVC.UI.Window { list.dragImageFollowCursor = dragImageFollowCursor; } + + closeButton = GetComponentInChildren