From a5dae0df10ecc09d11b0f3a87a9cd48b766b07d8 Mon Sep 17 00:00:00 2001 From: Mike Nisbet Date: Tue, 22 Aug 2023 18:37:48 +0100 Subject: [PATCH] fix selection tray collider --- .../Prefabs/UIComponents/SelectionTray.prefab | 158 ++++++++++++++---- 1 file changed, 121 insertions(+), 37 deletions(-) diff --git a/Assets/Prefabs/UIComponents/SelectionTray.prefab b/Assets/Prefabs/UIComponents/SelectionTray.prefab index a5cd8328e7..c635fd055b 100644 --- a/Assets/Prefabs/UIComponents/SelectionTray.prefab +++ b/Assets/Prefabs/UIComponents/SelectionTray.prefab @@ -51,14 +51,23 @@ MonoBehaviour: m_DescriptionText: m_LocalizedDescription: m_TableReference: - m_TableCollectionName: + m_TableCollectionName: m_TableEntryReference: m_KeyId: 0 - m_Key: + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] - m_DescriptionTextExtra: m_DescriptionActivateSpeed: 12 m_DescriptionZScale: 1 m_Mesh: {fileID: 1596481825594902} @@ -106,7 +115,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1596481825594902} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -0.000000014901161, y: 0, z: 0} m_LocalScale: {x: 0.75, y: 0.75, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -145,10 +154,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1895032314352020} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -0.177, z: 0} - m_LocalScale: {x: 0.4, y: 1.68, z: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: [] m_Father: {fileID: 4144920620344815534} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -163,8 +172,8 @@ BoxCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 0.2} - m_Center: {x: 0, y: 0, z: 0} + m_Size: {x: 0.4, y: 1.7, z: 0.2} + m_Center: {x: 0, y: -0.18, z: 0} --- !u!1 &527762663584930946 GameObject: m_ObjectHideFlags: 0 @@ -449,11 +458,20 @@ MonoBehaviour: m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 m_TableEntryReference: m_KeyId: 5145130421690368 - m_Key: + m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] m_DescriptionActivateSpeed: 12 m_DescriptionZScale: 1 m_ButtonTexture: {fileID: 2800000, guid: 6fac6fbfc7872e445ad562d8585098ff, type: 3} @@ -475,20 +493,20 @@ MonoBehaviour: m_PopupText: m_LocalizedPopup: m_TableReference: - m_TableCollectionName: + m_TableCollectionName: m_TableEntryReference: m_KeyId: 0 - m_Key: + m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] - m_ToggleOnDescription: + m_ToggleOnDescription: m_LocalizedToggleOnDescription: m_TableReference: - m_TableCollectionName: + m_TableCollectionName: m_TableEntryReference: m_KeyId: 0 - m_Key: + m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] @@ -616,11 +634,20 @@ MonoBehaviour: m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 m_TableEntryReference: m_KeyId: 5144771179552768 - m_Key: + m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] m_DescriptionActivateSpeed: 12 m_DescriptionZScale: 1 m_ButtonTexture: {fileID: 2800000, guid: 342cbde45e0e65b418f9323d0dfdf3b3, type: 3} @@ -642,10 +669,10 @@ MonoBehaviour: m_PopupText: m_LocalizedPopup: m_TableReference: - m_TableCollectionName: + m_TableCollectionName: m_TableEntryReference: m_KeyId: 0 - m_Key: + m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] @@ -655,7 +682,7 @@ MonoBehaviour: m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 m_TableEntryReference: m_KeyId: 5145968804339712 - m_Key: + m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] @@ -783,11 +810,20 @@ MonoBehaviour: m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 m_TableEntryReference: m_KeyId: 5145342544420864 - m_Key: + m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] m_DescriptionActivateSpeed: 12 m_DescriptionZScale: 1 m_ButtonTexture: {fileID: 2800000, guid: 82c4045b61e406342beabf4cd6b325a3, type: 3} @@ -809,20 +845,20 @@ MonoBehaviour: m_PopupText: m_LocalizedPopup: m_TableReference: - m_TableCollectionName: + m_TableCollectionName: m_TableEntryReference: m_KeyId: 0 - m_Key: + m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] - m_ToggleOnDescription: + m_ToggleOnDescription: m_LocalizedToggleOnDescription: m_TableReference: - m_TableCollectionName: + m_TableCollectionName: m_TableEntryReference: m_KeyId: 0 - m_Key: + m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] @@ -950,11 +986,20 @@ MonoBehaviour: m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86 m_TableEntryReference: m_KeyId: 5145273980133376 - m_Key: + m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] m_DescriptionActivateSpeed: 12 m_DescriptionZScale: 1 m_ButtonTexture: {fileID: 2800000, guid: ca71eaeea4cfdfa4ba16e0f859494f3f, type: 3} @@ -976,20 +1021,20 @@ MonoBehaviour: m_PopupText: m_LocalizedPopup: m_TableReference: - m_TableCollectionName: + m_TableCollectionName: m_TableEntryReference: m_KeyId: 0 - m_Key: + m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] - m_ToggleOnDescription: + m_ToggleOnDescription: m_LocalizedToggleOnDescription: m_TableReference: - m_TableCollectionName: + m_TableCollectionName: m_TableEntryReference: m_KeyId: 0 - m_Key: + m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 m_LocalVariables: [] @@ -1107,12 +1152,30 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: d1eea6a2cc004b83af9aebb729e1df80, type: 3} - m_Name: - m_EditorClassIdentifier: + m_Name: + m_EditorClassIdentifier: m_DescriptionType: 0 m_DescriptionYOffset: 0 m_DescriptionText: Repaint Selected - m_DescriptionTextExtra: + m_LocalizedDescription: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_DescriptionTextExtra: + m_LocalizedDescriptionExtra: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] m_DescriptionActivateSpeed: 12 m_DescriptionZScale: 1 m_ButtonTexture: {fileID: 2800000, guid: e19c558a83b463843bb1f2f37c9c5d52, type: 3} @@ -1131,8 +1194,26 @@ MonoBehaviour: m_RequiresPopup: 1 m_CenterPopupOnButton: 0 m_PopupOffset: {x: 0, y: 0, z: 0} - m_PopupText: - m_ToggleOnDescription: + m_PopupText: + m_LocalizedPopup: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] + m_ToggleOnDescription: + m_LocalizedToggleOnDescription: + m_TableReference: + m_TableCollectionName: + m_TableEntryReference: + m_KeyId: 0 + m_Key: + m_FallbackState: 0 + m_WaitForCompletion: 0 + m_LocalVariables: [] m_ToggleOnTexture: {fileID: 0} m_AllowUnavailable: 0 m_LinkedUIObject: {fileID: 0} @@ -1149,9 +1230,12 @@ MonoBehaviour: m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 - m_StringArgument: + m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + references: + version: 2 + RefIds: [] --- !u!1 &4746940080256643886 GameObject: m_ObjectHideFlags: 0