From 17ff59f42af059fce00ddef208050e3bef71262a Mon Sep 17 00:00:00 2001 From: Kapim Date: Thu, 5 Nov 2020 13:13:48 +0100 Subject: [PATCH] fixed buttons and sliders froma ction object menu scene editor --- .../Menus/ActionObjectMenuSceneEditor.prefab | 164 ++++++++---------- .../Assets/TABLET/Scenes/TabletGUI.unity | 6 +- 2 files changed, 79 insertions(+), 91 deletions(-) diff --git a/arcor2_AREditor/Assets/2D_EDITOR/Prefabs/Menus/ActionObjectMenuSceneEditor.prefab b/arcor2_AREditor/Assets/2D_EDITOR/Prefabs/Menus/ActionObjectMenuSceneEditor.prefab index 4a21b719b..032068eac 100644 --- a/arcor2_AREditor/Assets/2D_EDITOR/Prefabs/Menus/ActionObjectMenuSceneEditor.prefab +++ b/arcor2_AREditor/Assets/2D_EDITOR/Prefabs/Menus/ActionObjectMenuSceneEditor.prefab @@ -612,7 +612,7 @@ MonoBehaviour: onStateChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} + - m_Target: {fileID: 4455020661743965345} m_MethodName: OnMenuStateChanged m_Mode: 1 m_Arguments: @@ -623,18 +623,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 0} - m_MethodName: OnMenuStateChanged - m_Mode: 2 - m_Arguments: - m_ObjectArgument: {fileID: 2219791083400178696} - m_ObjectArgumentAssemblyTypeName: DanielLochner.Assets.SimpleSideMenu.SimpleSideMenu, - Assembly-CSharp - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 onStateSelected: m_PersistentCalls: m_Calls: [] @@ -1746,7 +1734,7 @@ PrefabInstance: type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 0} + objectReference: {fileID: 4455020661743965345} - target: {fileID: 1282326451552802060, guid: c77917a7826c62e419cc9a2867495b1f, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName @@ -2502,62 +2490,62 @@ PrefabInstance: - target: {fileID: 1373695492280390740, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1373695492280390740, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1373695492280390740, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_AnchoredPosition.x - value: 60 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1373695492280390740, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_AnchoredPosition.y - value: -45 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1373695492280390740, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_SizeDelta.x - value: 90 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1373695492280390740, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_SizeDelta.y - value: 80 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1373847741167113960, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1373847741167113960, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1373847741167113960, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_AnchoredPosition.x - value: 335 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1373847741167113960, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_AnchoredPosition.y - value: -45 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1373847741167113960, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_SizeDelta.x - value: 432 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1373847741167113960, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_SizeDelta.y - value: 80 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1374393705757052392, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} @@ -2607,32 +2595,32 @@ PrefabInstance: - target: {fileID: 1374583931420629440, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1374583931420629440, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1374583931420629440, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_AnchoredPosition.x - value: 580 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1374583931420629440, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_AnchoredPosition.y - value: -45 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1374583931420629440, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_SizeDelta.x - value: 30 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1374583931420629440, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_SizeDelta.y - value: 80 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1404771546583750591, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} @@ -3026,62 +3014,62 @@ PrefabInstance: - target: {fileID: 1373695492280390740, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1373695492280390740, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1373695492280390740, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_AnchoredPosition.x - value: 60 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1373695492280390740, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_AnchoredPosition.y - value: -45 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1373695492280390740, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_SizeDelta.x - value: 90 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1373695492280390740, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_SizeDelta.y - value: 80 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1373847741167113960, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1373847741167113960, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1373847741167113960, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_AnchoredPosition.x - value: 340 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1373847741167113960, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_AnchoredPosition.y - value: -45 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1373847741167113960, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_SizeDelta.x - value: 442 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1373847741167113960, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_SizeDelta.y - value: 80 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1374393705757052392, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} @@ -3131,32 +3119,32 @@ PrefabInstance: - target: {fileID: 1374583931420629440, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1374583931420629440, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1374583931420629440, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_AnchoredPosition.x - value: 590 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1374583931420629440, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_AnchoredPosition.y - value: -45 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1374583931420629440, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_SizeDelta.x - value: 30 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1374583931420629440, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_SizeDelta.y - value: 80 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2259668868574300244, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} @@ -3329,7 +3317,7 @@ PrefabInstance: type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 0} + objectReference: {fileID: 4455020661743965345} - target: {fileID: 1282326451552802060, guid: c77917a7826c62e419cc9a2867495b1f, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName @@ -3636,62 +3624,62 @@ PrefabInstance: - target: {fileID: 1373695492280390740, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1373695492280390740, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1373695492280390740, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_AnchoredPosition.x - value: 60 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1373695492280390740, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_AnchoredPosition.y - value: -45 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1373695492280390740, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_SizeDelta.x - value: 90 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1373695492280390740, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_SizeDelta.y - value: 80 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1373847741167113960, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1373847741167113960, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1373847741167113960, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_AnchoredPosition.x - value: 335 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1373847741167113960, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_AnchoredPosition.y - value: -45 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1373847741167113960, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_SizeDelta.x - value: 432 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1373847741167113960, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_SizeDelta.y - value: 80 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1374393705757052392, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} @@ -3741,32 +3729,32 @@ PrefabInstance: - target: {fileID: 1374583931420629440, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1374583931420629440, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1374583931420629440, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_AnchoredPosition.x - value: 580 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1374583931420629440, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_AnchoredPosition.y - value: -45 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1374583931420629440, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_SizeDelta.x - value: 30 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1374583931420629440, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} propertyPath: m_SizeDelta.y - value: 80 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1404771546583750591, guid: 19da6447a37ef7f429a554a2fd22d345, type: 3} @@ -4070,7 +4058,7 @@ PrefabInstance: type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 0} + objectReference: {fileID: 4455020661743965345} - target: {fileID: 1282326451552802060, guid: c77917a7826c62e419cc9a2867495b1f, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName @@ -4257,7 +4245,7 @@ PrefabInstance: type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 0} + objectReference: {fileID: 4455020661743965345} - target: {fileID: 1282326451552802060, guid: c77917a7826c62e419cc9a2867495b1f, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName @@ -4714,11 +4702,6 @@ PrefabInstance: propertyPath: OnEvents.m_PersistentCalls.m_Calls.Array.data[0].m_Mode value: 1 objectReference: {fileID: 0} - - target: {fileID: 2990318297726141335, guid: 842e373db2ba5004082e835ac120c8a1, - type: 3} - propertyPath: OnEvents.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - target: {fileID: 2990318297726141335, guid: 842e373db2ba5004082e835ac120c8a1, type: 3} propertyPath: OffEvents.m_PersistentCalls.m_Calls.Array.data[0].m_Mode @@ -4729,16 +4712,6 @@ PrefabInstance: propertyPath: OffEvents.m_PersistentCalls.m_Calls.Array.data[0].m_CallState value: 2 objectReference: {fileID: 0} - - target: {fileID: 2990318297726141335, guid: 842e373db2ba5004082e835ac120c8a1, - type: 3} - propertyPath: OffEvents.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 2990318297726141335, guid: 842e373db2ba5004082e835ac120c8a1, - type: 3} - propertyPath: OnEvents.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - target: {fileID: 2990318297726141335, guid: 842e373db2ba5004082e835ac120c8a1, type: 3} propertyPath: OnEvents.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName @@ -4759,6 +4732,21 @@ PrefabInstance: propertyPath: OffEvents.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} + - target: {fileID: 2990318297726141335, guid: 842e373db2ba5004082e835ac120c8a1, + type: 3} + propertyPath: OnEvents.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2990318297726141335, guid: 842e373db2ba5004082e835ac120c8a1, + type: 3} + propertyPath: OnEvents.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 4455020661743965345} + - target: {fileID: 2990318297726141335, guid: 842e373db2ba5004082e835ac120c8a1, + type: 3} + propertyPath: OffEvents.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 4455020661743965345} - target: {fileID: 5371841985900859675, guid: 842e373db2ba5004082e835ac120c8a1, type: 3} propertyPath: m_Name @@ -5100,7 +5088,7 @@ PrefabInstance: type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 0} + objectReference: {fileID: 4455020661743965345} - target: {fileID: 1282326451552802060, guid: c77917a7826c62e419cc9a2867495b1f, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName @@ -5446,7 +5434,7 @@ PrefabInstance: type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 0} + objectReference: {fileID: 4455020661743965345} - target: {fileID: 1282326451552802060, guid: c77917a7826c62e419cc9a2867495b1f, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName diff --git a/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity b/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity index 69abacc33..73d1c1984 100644 --- a/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity +++ b/arcor2_AREditor/Assets/TABLET/Scenes/TabletGUI.unity @@ -3854,12 +3854,12 @@ PrefabInstance: - target: {fileID: 224685037686054822, guid: 4d8c6c9fba0e46f489b21fd7d92d739d, type: 3} propertyPath: m_AnchoredPosition.y - value: -17587908 + value: -17579718 objectReference: {fileID: 0} - target: {fileID: 224685037686054822, guid: 4d8c6c9fba0e46f489b21fd7d92d739d, type: 3} propertyPath: m_AnchoredPosition.x - value: -85344600 + value: -85460950 objectReference: {fileID: 0} - target: {fileID: 224818740107539070, guid: 4d8c6c9fba0e46f489b21fd7d92d739d, type: 3} @@ -34715,7 +34715,7 @@ PrefabInstance: - target: {fileID: 224841020572500472, guid: d39ad26c554f1a04d870956f7fac6fd8, type: 3} propertyPath: m_AnchoredPosition.y - value: 9083209 + value: 9094609 objectReference: {fileID: 0} - target: {fileID: 224880000733725854, guid: d39ad26c554f1a04d870956f7fac6fd8, type: 3}