From 218bfcbd711382439814a2067090e69cf5c4da55 Mon Sep 17 00:00:00 2001 From: milan Date: Wed, 12 Apr 2023 17:45:19 +0200 Subject: [PATCH] fix symbol button colliders --- .../Modules/Symbols/Symbol Button.prefab | 64 +++++++++++++------ .../Modules/Terminal/Terminal 3 Slots.prefab | 18 +++--- Assets/Test Assets/Test Theme.asset | 3 +- 3 files changed, 58 insertions(+), 27 deletions(-) diff --git a/Assets/Station46/Modules/Symbols/Symbol Button.prefab b/Assets/Station46/Modules/Symbols/Symbol Button.prefab index 31af25d..0b4388f 100644 --- a/Assets/Station46/Modules/Symbols/Symbol Button.prefab +++ b/Assets/Station46/Modules/Symbols/Symbol Button.prefab @@ -5,7 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 2 + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 2729712160695412300, guid: d448da7d4695ed54cbc3c951c4e78509, @@ -80,7 +80,21 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: d1f58490f6d04c64da01277723d63536, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3992741351158361944, guid: d448da7d4695ed54cbc3c951c4e78509, + type: 3} + insertIndex: -1 + addedObject: {fileID: 8232915369211415309} + - targetCorrespondingSourceObject: {fileID: 3992741351158361944, guid: d448da7d4695ed54cbc3c951c4e78509, + type: 3} + insertIndex: -1 + addedObject: {fileID: 441274444389109490} + - targetCorrespondingSourceObject: {fileID: 3992741351158361944, guid: d448da7d4695ed54cbc3c951c4e78509, + type: 3} + insertIndex: -1 + addedObject: {fileID: 5340615255241961189} m_SourcePrefab: {fileID: 100100000, guid: d448da7d4695ed54cbc3c951c4e78509, type: 3} --- !u!23 &3588071600122019806 stripped MeshRenderer: @@ -94,19 +108,22 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 7296276792083978233} m_PrefabAsset: {fileID: 0} ---- !u!135 &292531925237153382 -SphereCollider: +--- !u!114 &8232915369211415309 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5920126912232503457} - m_Material: {fileID: 0} - m_IsTrigger: 1 m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.025 - m_Center: {x: 0, y: 0, z: 0} + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d6620bee0f14224b11a19808d537cbd, type: 3} + m_Name: + m_EditorClassIdentifier: + hideWhenDisabled: 0 + startInactive: 0 + holoRenderer: {fileID: 3588071600122019806} + symbolNumber: 0 --- !u!114 &441274444389109490 MonoBehaviour: m_ObjectHideFlags: 0 @@ -121,12 +138,13 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: - - {fileID: 292531925237153382} + - {fileID: 5340615255241961189} m_InteractionLayerMask: serializedVersion: 2 m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 + m_DistanceCalculationMode: 1 m_SelectMode: 0 m_CustomReticle: {fileID: 0} m_FirstHoverEntered: @@ -183,6 +201,8 @@ MonoBehaviour: m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] m_OnFirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -210,18 +230,26 @@ MonoBehaviour: m_OnDeactivate: m_PersistentCalls: m_Calls: [] ---- !u!114 &8232915369211415309 -MonoBehaviour: +--- !u!136 &5340615255241961189 +CapsuleCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5920126912232503457} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3d6620bee0f14224b11a19808d537cbd, type: 3} - m_Name: - m_EditorClassIdentifier: - symbolNumber: 0 - theme: {fileID: 11400000, guid: 568d9a7d70f3edb4cb6db66a0010f105, type: 2} - holoRenderer: {fileID: 3588071600122019806} + serializedVersion: 2 + m_Radius: 0.025 + m_Height: 0.2 + m_Direction: 1 + m_Center: {x: 0, y: -0.075, z: 0} diff --git a/Assets/Station46/Modules/Terminal/Terminal 3 Slots.prefab b/Assets/Station46/Modules/Terminal/Terminal 3 Slots.prefab index 8cbb9a6..6ba5946 100644 --- a/Assets/Station46/Modules/Terminal/Terminal 3 Slots.prefab +++ b/Assets/Station46/Modules/Terminal/Terminal 3 Slots.prefab @@ -23,14 +23,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1506878834482086433} - m_LocalRotation: {x: -0.9820791, y: -0, z: -0, w: 0.18846948} + m_LocalRotation: {x: -0.00000049165845, y: -0.9820791, z: -0.1884695, w: 0.00000010058284} m_LocalPosition: {x: 0, y: 0.812958, z: -0.104633} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7756295983983028816} m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: -158.273, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: -158.273, y: 0, z: -180} --- !u!1 &4316323159942158443 GameObject: m_ObjectHideFlags: 0 @@ -54,14 +54,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4316323159942158443} - m_LocalRotation: {x: -0.9820791, y: -0, z: -0, w: 0.18846948} + m_LocalRotation: {x: -0.00000031292817, y: -0.9820791, z: -0.1884695, w: 0.00000006332994} m_LocalPosition: {x: 0, y: 0.886395, z: -0.288131} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7756295983983028816} m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: -158.273, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: -158.273, y: 0, z: -180} --- !u!1 &7612444233466593008 GameObject: m_ObjectHideFlags: 0 @@ -85,26 +85,26 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7612444233466593008} - m_LocalRotation: {x: -0.9820791, y: -0, z: -0, w: 0.18846948} + m_LocalRotation: {x: -0.00000007602428, y: -0.9820791, z: -0.1884695, w: 0.000000011175872} m_LocalPosition: {x: 0, y: 0.73952, z: 0.078867} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7756295983983028816} m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: -158.273, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: -158.273, y: 0, z: -180} --- !u!1001 &2384246425946067472 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 2 + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 5383329221585827904, guid: 02a72e7f56d97334c93a1449eedc9d91, type: 3} propertyPath: m_RootOrder - value: 7 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5383329221585827904, guid: 02a72e7f56d97334c93a1449eedc9d91, type: 3} @@ -192,6 +192,7 @@ PrefabInstance: value: Terminal 3 Slots objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 5383329221585827904, guid: 02a72e7f56d97334c93a1449eedc9d91, type: 3} @@ -205,6 +206,7 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 6165579071297624197} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 02a72e7f56d97334c93a1449eedc9d91, type: 3} --- !u!4 &7756295983983028816 stripped Transform: diff --git a/Assets/Test Assets/Test Theme.asset b/Assets/Test Assets/Test Theme.asset index a619c48..c3e097c 100644 --- a/Assets/Test Assets/Test Theme.asset +++ b/Assets/Test Assets/Test Theme.asset @@ -32,4 +32,5 @@ MonoBehaviour: - {fileID: 11400000, guid: 83d6800536b1df14287ff2cd8e0d58ce, type: 2} puzzleCount: {x: 1, y: 1} puzzleTypes: - - {fileID: 11400000, guid: ae16de9735d6541419214ac1699feed8, type: 2} + - {fileID: 11400000, guid: 8707242279bb6c541a12dc4491388c42, type: 2} + - {fileID: 11400000, guid: 3f79d37154e44ca47b54bb43bbe8d9aa, type: 2}