From af7e081c9a457ab62b4e17548459de776f855d34 Mon Sep 17 00:00:00 2001 From: Damian Date: Mon, 10 Nov 2025 11:37:45 +0100 Subject: [PATCH] Fixed Chocolate Puzzle, but does not work well on load (the destroyed chocolate appears again) --- Assets/Prefabs/Puzzles/Picnic.prefab | 169 ++++++++++++++++++++++++++- 1 file changed, 168 insertions(+), 1 deletion(-) diff --git a/Assets/Prefabs/Puzzles/Picnic.prefab b/Assets/Prefabs/Puzzles/Picnic.prefab index 3ea61fb8..9edb087b 100644 --- a/Assets/Prefabs/Puzzles/Picnic.prefab +++ b/Assets/Prefabs/Puzzles/Picnic.prefab @@ -614,6 +614,7 @@ GameObject: - component: {fileID: 768265498311662326} - component: {fileID: 6338084184716153992} - component: {fileID: 253472492358066383} + - component: {fileID: 7628818949793551399} m_Layer: 10 m_Name: FakeChoco m_TagString: Untagged @@ -633,7 +634,8 @@ Transform: m_LocalPosition: {x: -6.784, y: -2.901, z: 0} m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} m_ConstrainProportionsScale: 1 - m_Children: [] + m_Children: + - {fileID: 2205893234949555645} m_Father: {fileID: 1509867968154593713} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &6338084184716153992 @@ -740,6 +742,45 @@ BoxCollider2D: m_AutoTiling: 0 m_Size: {x: 6, y: 6} m_EdgeRadius: 0 +--- !u!114 &7628818949793551399 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2391935521422290070} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 833a4ccef651449e973e623d9107bef5, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::Interactions.OneClickInteraction + isOneTime: 0 + cooldown: -1 + characterToInteract: 2 + interactionStarted: + m_PersistentCalls: + m_Calls: [] + interactionInterrupted: + m_PersistentCalls: + m_Calls: [] + characterArrived: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 5762733430166618195} + m_TargetAssemblyTypeName: PicnicBehaviour, AppleHillsScripts + m_MethodName: triedToStealChocolate + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + interactionComplete: + m_PersistentCalls: + m_Calls: [] --- !u!1 &2728537141134591410 GameObject: m_ObjectHideFlags: 0 @@ -1322,6 +1363,104 @@ GameObject: m_CorrespondingSourceObject: {fileID: 5383276844808284485, guid: afbb486e5456a20479aee4cf8bc949b6, type: 3} m_PrefabInstance: {fileID: 3750141998400252915} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7365721869475958115 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 768265498311662326} + m_Modifications: + - target: {fileID: 2991221189157356317, guid: f21581740b83b624cac5e6a8fa4d0f47, type: 3} + propertyPath: m_LocalScale.x + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 2991221189157356317, guid: f21581740b83b624cac5e6a8fa4d0f47, type: 3} + propertyPath: m_LocalScale.y + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 2991221189157356317, guid: f21581740b83b624cac5e6a8fa4d0f47, type: 3} + propertyPath: m_LocalScale.z + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 8506461915049351794, guid: f21581740b83b624cac5e6a8fa4d0f47, type: 3} + propertyPath: m_Name + value: HighlightEffect + objectReference: {fileID: 0} + - target: {fileID: 8506461915049351794, guid: f21581740b83b624cac5e6a8fa4d0f47, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8693254833721559262, guid: f21581740b83b624cac5e6a8fa4d0f47, type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8693254833721559262, guid: f21581740b83b624cac5e6a8fa4d0f47, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8693254833721559262, guid: f21581740b83b624cac5e6a8fa4d0f47, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8693254833721559262, guid: f21581740b83b624cac5e6a8fa4d0f47, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8693254833721559262, guid: f21581740b83b624cac5e6a8fa4d0f47, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8693254833721559262, guid: f21581740b83b624cac5e6a8fa4d0f47, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8693254833721559262, guid: f21581740b83b624cac5e6a8fa4d0f47, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8693254833721559262, guid: f21581740b83b624cac5e6a8fa4d0f47, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8693254833721559262, guid: f21581740b83b624cac5e6a8fa4d0f47, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8693254833721559262, guid: f21581740b83b624cac5e6a8fa4d0f47, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8693254833721559262, guid: f21581740b83b624cac5e6a8fa4d0f47, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8693254833721559262, guid: f21581740b83b624cac5e6a8fa4d0f47, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8693254833721559262, guid: f21581740b83b624cac5e6a8fa4d0f47, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8693254833721559262, guid: f21581740b83b624cac5e6a8fa4d0f47, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8998003315986923927, guid: f21581740b83b624cac5e6a8fa4d0f47, type: 3} + propertyPath: m_SortingOrder + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f21581740b83b624cac5e6a8fa4d0f47, type: 3} +--- !u!4 &2205893234949555645 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8693254833721559262, guid: f21581740b83b624cac5e6a8fa4d0f47, type: 3} + m_PrefabInstance: {fileID: 7365721869475958115} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7995402114015427944 PrefabInstance: m_ObjectHideFlags: 0 @@ -1362,6 +1501,34 @@ PrefabInstance: propertyPath: m_SortingOrder value: 1 objectReference: {fileID: 0} + - target: {fileID: 2846246689251721816, guid: b3fc964bec385174f85a143f2fcff121, type: 3} + propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2846246689251721816, guid: b3fc964bec385174f85a143f2fcff121, type: 3} + propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2846246689251721816, guid: b3fc964bec385174f85a143f2fcff121, type: 3} + propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 5762733430166618195} + - target: {fileID: 2846246689251721816, guid: b3fc964bec385174f85a143f2fcff121, type: 3} + propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2846246689251721816, guid: b3fc964bec385174f85a143f2fcff121, type: 3} + propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: destroyFakeChocolate + objectReference: {fileID: 0} + - target: {fileID: 2846246689251721816, guid: b3fc964bec385174f85a143f2fcff121, type: 3} + propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: PicnicBehaviour, AppleHillsScripts + objectReference: {fileID: 0} + - target: {fileID: 2846246689251721816, guid: b3fc964bec385174f85a143f2fcff121, type: 3} + propertyPath: interactionComplete.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 3984039030829909690, guid: b3fc964bec385174f85a143f2fcff121, type: 3} propertyPath: m_LocalScale.x value: 0.7