From 9fd0f759cd29922b542794bba07fcd9a39cdb2d2 Mon Sep 17 00:00:00 2001 From: jmaniuvc Date: Mon, 26 May 2025 11:47:47 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EB=9D=BC=EC=9D=B8=20=EB=A0=8C=EB=8D=94?= =?UTF-8?q?=EB=9F=AC=EA=B0=80=20=EC=A0=95=EC=83=81=EC=A0=81=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=82=AC=EB=9D=BC=EC=A7=80=EC=A7=80=20=EC=95=8A?= =?UTF-8?q?=EB=8A=94=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs | 1 + Assets/Scripts/Studio/UI/Panel/Panel_ObjectDistance.cs | 8 -------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs b/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs index efd0cf52..9eefde22 100644 --- a/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs +++ b/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs @@ -209,6 +209,7 @@ namespace Studio.AssetTool var canvas_Popup = EventConnector.instance.GetCanvas(); canvas_Popup.panel_objectinfo.gameObject.SetActive(false); componentScrollView.DeselectAll(); + canvas_Popup.panel_objectdistance.SetSelecetedObjectToNull(); } public void OrderByHierarchy(List objectsToOrder) diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_ObjectDistance.cs b/Assets/Scripts/Studio/UI/Panel/Panel_ObjectDistance.cs index 795261dd..e4104e46 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_ObjectDistance.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_ObjectDistance.cs @@ -101,7 +101,6 @@ namespace Studio.UI distanceUI.SetText(distance); distanceUI.SetPos(distanceCenterPoint); - //SetLineLength(distanceLines[distanceUI], distanceCenterPoint, direction, distance); distanceLines[distanceUI].SetPosition(0, hitPoint); distanceLines[distanceUI].SetPosition(1, hitPoint - (direction * distance)); distanceLines[distanceUI].enabled = true; @@ -113,12 +112,5 @@ namespace Studio.UI return; } } - - void SetLineLength(GameObject line, Vector3 centerPoint, Vector3 direction, float length) - { - line.transform.position = centerPoint; - line.transform.rotation = Quaternion.LookRotation(direction) * Quaternion.Euler(new Vector3(90, 0, 0)); - line.transform.localScale = new Vector3(lineThickness, length / 2, lineThickness); - } } } From b2cd3621fca854cb16ca7dfebdba9c581a2773a3 Mon Sep 17 00:00:00 2001 From: jmaniuvc Date: Mon, 26 May 2025 12:06:08 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EA=B1=B0=EB=A6=AC=EC=B8=A1=EC=A0=95=20?= =?UTF-8?q?=EB=9D=BC=EC=9D=B8=20=EB=91=90=EA=BB=98=20=EC=A1=B0=EC=A0=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Prefabs/AAA/Panel_ObjectDistance.prefab | 2 +- Assets/Scripts/Studio/UI/Panel/Panel_ObjectDistance.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/Prefabs/AAA/Panel_ObjectDistance.prefab b/Assets/Prefabs/AAA/Panel_ObjectDistance.prefab index e0e6c4f8..4a035d5d 100644 --- a/Assets/Prefabs/AAA/Panel_ObjectDistance.prefab +++ b/Assets/Prefabs/AAA/Panel_ObjectDistance.prefab @@ -63,7 +63,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ba071beb1c8293e49a8b25d46f91a7bf, type: 3} m_Name: m_EditorClassIdentifier: - lineThickness: 1 + lineThickness: 0.1 --- !u!1 &1667491123066525069 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Studio/UI/Panel/Panel_ObjectDistance.cs b/Assets/Scripts/Studio/UI/Panel/Panel_ObjectDistance.cs index e4104e46..f6200578 100644 --- a/Assets/Scripts/Studio/UI/Panel/Panel_ObjectDistance.cs +++ b/Assets/Scripts/Studio/UI/Panel/Panel_ObjectDistance.cs @@ -16,7 +16,7 @@ namespace Studio.UI Dictionary distanceLines = new(); [SerializeField] - float lineThickness = 1; + float lineThickness = 0.1f; CustomAssetRenderObject selectedObject;