From 83430199d3b4813779865acfeab81a8e7781c757 Mon Sep 17 00:00:00 2001 From: Vova <3emaster@gmail.com> Date: Tue, 21 May 2024 18:00:37 +0300 Subject: [PATCH] Fix hold point, radial menu UI need to be fixed --- Assets/Prefabs/Characters/Sophie.prefab | 14 ++++++++++++++ Assets/Scripts/UIElements/RadialMenuItem.cs | 12 +++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/Assets/Prefabs/Characters/Sophie.prefab b/Assets/Prefabs/Characters/Sophie.prefab index fcedccd2..71af5067 100644 --- a/Assets/Prefabs/Characters/Sophie.prefab +++ b/Assets/Prefabs/Characters/Sophie.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3340653082405403250} + - component: {fileID: 2527699429244340186} m_Layer: 0 m_Name: HoldPoint m_TagString: Untagged @@ -31,6 +32,18 @@ Transform: m_Children: [] m_Father: {fileID: 4028978448423354571} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2527699429244340186 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3340653082405403251} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 99527458161e16442b3fb76c8f585ec8, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &3340653081230671619 PrefabInstance: m_ObjectHideFlags: 0 @@ -951,6 +964,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cf9ddd6d77ff9a7479edaeb2c8ae1078, type: 3} m_Name: m_EditorClassIdentifier: + Sex: 0 --- !u!4 &4028978448423354571 stripped Transform: m_CorrespondingSourceObject: {fileID: 1852576806548013000, guid: 32790d47acc86814982f18993097a759, diff --git a/Assets/Scripts/UIElements/RadialMenuItem.cs b/Assets/Scripts/UIElements/RadialMenuItem.cs index 6e4a0247..8ef56afb 100644 --- a/Assets/Scripts/UIElements/RadialMenuItem.cs +++ b/Assets/Scripts/UIElements/RadialMenuItem.cs @@ -10,8 +10,13 @@ public class RadialMenuItem : MonoBehaviour [SerializeField] private Button _radialMenuItemPrefab; private Dictionary _actions; - UniTaskCompletionSource tcs = new UniTaskCompletionSource(); + private UniTaskCompletionSource tcs = new UniTaskCompletionSource(); + private float _buttonWidth; + private void Start() + { + _buttonWidth = _radialMenuItemPrefab.GetComponent().rect.width; + } public UniTask ShowButtons(Dictionary actions) { @@ -25,14 +30,15 @@ public class RadialMenuItem : MonoBehaviour float posX = Mathf.Sin(theta); float posY = Mathf.Cos(theta); - button.transform.localPosition = new Vector3(posX, posY, 0) * 100f; + button.transform.localPosition = new Vector3(posX, posY, 0) * 150f; + var textMeshPro = button.GetComponentInChildren(); if (textMeshPro != null) { textMeshPro.text = actions.ElementAt(buttonsCount).Value.Description; } AddEvent(button, buttonsCount); - + } return tcs.Task; }