diff --git a/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab b/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab index d46918be32052d1850dd5431f381855637b54ca6..fc01bdb4317a1b3082749782f79c2d801ad2d46f 100644 --- a/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab +++ b/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab @@ -2351,7 +2351,7 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 8004702057798297438} m_TargetAssemblyTypeName: ScrollDetails, Assembly-CSharp - m_MethodName: MagicButtonTrigger + m_MethodName: MagicButtonClicked m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} diff --git a/Assets/Scenes/Worlds/RiverWorld.unity b/Assets/Scenes/Worlds/RiverWorld.unity index 86592f5a4eef7b1200d4fa4abe918e488bfd798d..34fd0aa8da04c7c008385b60f7607ee2a6756021 100644 --- a/Assets/Scenes/Worlds/RiverWorld.unity +++ b/Assets/Scenes/Worlds/RiverWorld.unity @@ -61506,13 +61506,8 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3231672576010862975, guid: b07552db700124a4680401e6fb94c186, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: MagicButtonTrigger - objectReference: {fileID: 0} - - target: {fileID: 3231672576010862975, guid: b07552db700124a4680401e6fb94c186, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: ScrollDetails, Assembly-CSharp + propertyPath: m_AnimationTriggers.m_SelectedTrigger + value: Selected objectReference: {fileID: 0} - target: {fileID: 3256699174731649202, guid: b07552db700124a4680401e6fb94c186, type: 3} diff --git a/Assets/Scripts/UI/InGame/ScrollDetails.cs b/Assets/Scripts/UI/InGame/ScrollDetails.cs index 0ff048e7ede4f73f4ce5a498980fd295a013edf3..29b9a97e0d5a435f0948c261d5cd7a9fac75ec25 100644 --- a/Assets/Scripts/UI/InGame/ScrollDetails.cs +++ b/Assets/Scripts/UI/InGame/ScrollDetails.cs @@ -107,9 +107,9 @@ private void OnFactAssignmentUpdated(string slotUri, ActiveScroll.SlotAssignment { RenderedScrollFact changed = ParameterDisplays.Find(RSF => RSF.ScrollFactURI == slotUri); - // check if the RenderedScrollFact already contains the assigend fact + // check if the RenderedScrollFact already contains the assigned fact // this is to prevent an endless loop because updating the Fact property will trigger the NewAssignmentEvent - // TODO: BE: find an other solution beacause this results in requesting the scroll dynamic update twice from the server + // TODO: BE: find an other solution because this results in requesting the scroll dynamic update twice from the server if (changed != null && ( (!slotAssignment.IsSet && changed.IsSet) || (slotAssignment.IsSet && changed.URI != slotAssignment.fact?.Id) @@ -118,4 +118,10 @@ private void OnFactAssignmentUpdated(string slotUri, ActiveScroll.SlotAssignment changed.Fact = slotAssignment.fact; } } + + [ContextMenu("MagicButtonClicked")] + public void MagicButtonClicked() + { + SwitchScrollUI.activeScrollData.ButtonClicked(new MagicScrollButton()); + } }