diff --git a/Assets/Prefabs/Characters/AnneLise_Camera.prefab b/Assets/Prefabs/Characters/AnneLise_Camera.prefab index a1deb8cc..903ed93c 100644 --- a/Assets/Prefabs/Characters/AnneLise_Camera.prefab +++ b/Assets/Prefabs/Characters/AnneLise_Camera.prefab @@ -550,7 +550,7 @@ MonoBehaviour: m_EditorClassIdentifier: AppleHillsScripts::Interactions.OneClickInteraction isOneTime: 0 cooldown: -1 - characterToInteract: 2 + characterToInteract: 0 interactionStarted: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Prefabs/Characters/Gardener.prefab b/Assets/Prefabs/Characters/Gardener.prefab index d58f0123..e203497d 100644 --- a/Assets/Prefabs/Characters/Gardener.prefab +++ b/Assets/Prefabs/Characters/Gardener.prefab @@ -11,7 +11,6 @@ GameObject: - component: {fileID: 2269489375423604720} - component: {fileID: 9074453772172382270} - component: {fileID: 8996538767324381723} - - component: {fileID: 5836635533533271833} m_Layer: 10 m_Name: GardenerRunning m_TagString: Untagged @@ -52,8 +51,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: abefccb95d18f534f81d5158b8fc721f, type: 3} m_Name: m_EditorClassIdentifier: - chaseSpline: {fileID: 0} - runningGardenerTransform: {fileID: 0} + chaseSpline: {fileID: 8996538767324381723} + runningGardenerTransform: {fileID: 8361739881193827101} chaseDuration: 2 chaseDelay: 0 animator: {fileID: 3886598470756828970} @@ -81,18 +80,6 @@ MonoBehaviour: - target: {fileID: 8361739881193827101} percentage: 0 faceDirection: 0 ---- !u!114 &5836635533533271833 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 693541493531991836} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: eaefd3d5a2a864ca5b5d9ec5f2a7040f, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &897227581344122481 GameObject: m_ObjectHideFlags: 0 @@ -222,7 +209,6 @@ GameObject: m_Component: - component: {fileID: 2264394306674147778} - component: {fileID: 7540245671263622866} - - component: {fileID: 4324904235553461363} - component: {fileID: 6510906053583315767} - component: {fileID: 3660460661744729199} m_Layer: 10 @@ -261,42 +247,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 55938fb1577dd4ad3af7e994048c86f6, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &4324904235553461363 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1102400833121127473} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9e0b24e2f2ad54cc09940c320ed3cf4b, type: 3} - m_Name: - m_EditorClassIdentifier: - defaultState: {fileID: 780600094299918916} - currentState: {fileID: 0} - _unityEventsFolded: 0 - verbose: 0 - allowReentry: 0 - returnToDefaultOnDisable: 1 - OnStateExited: - m_PersistentCalls: - m_Calls: [] - OnStateEntered: - m_PersistentCalls: - m_Calls: [] - OnFirstStateEntered: - m_PersistentCalls: - m_Calls: [] - OnFirstStateExited: - m_PersistentCalls: - m_Calls: [] - OnLastStateEntered: - m_PersistentCalls: - m_Calls: [] - OnLastStateExited: - m_PersistentCalls: - m_Calls: [] --- !u!114 &6510906053583315767 MonoBehaviour: m_ObjectHideFlags: 0 @@ -329,7 +279,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4ad080e6ca3114e4e96ccc33655d3dff, type: 3} m_Name: m_EditorClassIdentifier: - defaultState: {fileID: 0} + defaultState: {fileID: 780600094299918916} currentState: {fileID: 0} _unityEventsFolded: 0 verbose: 0 @@ -993,11 +943,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7465517589433942351, guid: 0b255c6ea64a74240a8db4d9e8f820be, type: 3} propertyPath: m_LocalPosition.x - value: 5.74 + value: 5.7399993 objectReference: {fileID: 0} - target: {fileID: 7465517589433942351, guid: 0b255c6ea64a74240a8db4d9e8f820be, type: 3} propertyPath: m_LocalPosition.y - value: 12.13 + value: 12.129999 objectReference: {fileID: 0} - target: {fileID: 7465517589433942351, guid: 0b255c6ea64a74240a8db4d9e8f820be, type: 3} propertyPath: m_LocalPosition.z @@ -1574,9 +1524,6 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 6219924000464616021} m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 5034469437909578894, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3} - insertIndex: -1 - addedObject: {fileID: 8255968868352608137} - targetCorrespondingSourceObject: {fileID: 5034469437909578894, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3} insertIndex: -1 addedObject: {fileID: 1140155583957155418} @@ -1589,24 +1536,18 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 5034469437909578894, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3} insertIndex: -1 addedObject: {fileID: 930192467906675628} + - targetCorrespondingSourceObject: {fileID: 5034469437909578894, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 3470728088836196467} + - targetCorrespondingSourceObject: {fileID: 5034469437909578894, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 6830600382841233720} m_SourcePrefab: {fileID: 100100000, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3} --- !u!1 &780600094299918916 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5034469437909578894, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3} m_PrefabInstance: {fileID: 5695708696169621194} m_PrefabAsset: {fileID: 0} ---- !u!114 &8255968868352608137 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 780600094299918916} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: eaefd3d5a2a864ca5b5d9ec5f2a7040f, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!61 &1140155583957155418 BoxCollider2D: m_ObjectHideFlags: 0 @@ -1779,6 +1720,45 @@ MonoBehaviour: audioSource: {fileID: 0} clipPriority: 0 sourcePriority: 1 +--- !u!114 &3470728088836196467 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 780600094299918916} + 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: 0 + interactionStarted: + m_PersistentCalls: + m_Calls: [] + interactionInterrupted: + m_PersistentCalls: + m_Calls: [] + characterArrived: + m_PersistentCalls: + m_Calls: [] + interactionComplete: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &6830600382841233720 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 780600094299918916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 95e46aacea5b42888ee7881894193c11, type: 3} + m_Name: + m_EditorClassIdentifier: AppleHillsScripts::Core.SaveLoad.SaveableState --- !u!4 &6418503932309983819 stripped Transform: m_CorrespondingSourceObject: {fileID: 1592061707390547073, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3} diff --git a/Assets/Scripts/DamianExperiments/LawnMowerPuzzle/LawnmowerStateMachine.prefab b/Assets/Scripts/DamianExperiments/LawnMowerPuzzle/LawnmowerStateMachine.prefab index 13edf961..bcd177b4 100644 --- a/Assets/Scripts/DamianExperiments/LawnMowerPuzzle/LawnmowerStateMachine.prefab +++ b/Assets/Scripts/DamianExperiments/LawnMowerPuzzle/LawnmowerStateMachine.prefab @@ -9,7 +9,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 68470730839161369} - - component: {fileID: 7566253248842427861} - component: {fileID: 7134386036058471687} - component: {fileID: 3850626409469703279} - component: {fileID: 3760357185483736385} @@ -20,7 +19,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &68470730839161369 Transform: m_ObjectHideFlags: 0 @@ -39,18 +38,6 @@ Transform: - {fileID: 6861958251714623620} m_Father: {fileID: 7402687028936857164} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &7566253248842427861 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2114204102434534} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: eaefd3d5a2a864ca5b5d9ec5f2a7040f, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &7134386036058471687 MonoBehaviour: m_ObjectHideFlags: 0 @@ -463,6 +450,37 @@ MonoBehaviour: audioSource: {fileID: 0} clipPriority: 0 sourcePriority: 0 +--- !u!1 &796617052355940849 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4531071461365424648} + m_Layer: 0 + m_Name: MowerGardernerAnchor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4531071461365424648 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 796617052355940849} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 17.07, y: 13.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6004009293778554413} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1417937103223012543 GameObject: m_ObjectHideFlags: 0 @@ -490,12 +508,13 @@ Transform: m_GameObject: {fileID: 1417937103223012543} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: -0.21643952, w: 0.97629607} - m_LocalPosition: {x: 86.3, y: 0, z: 0} + m_LocalPosition: {x: 72, y: 0, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 1 m_Children: - {fileID: 7888692262144907179} - {fileID: 5349365911890205052} + - {fileID: 4531071461365424648} m_Father: {fileID: 68470730839161369} m_LocalEulerAnglesHint: {x: 0, y: 0, z: -25} --- !u!95 &2355624881651424564 @@ -752,7 +771,6 @@ GameObject: m_Component: - component: {fileID: 7402687028936857164} - component: {fileID: 7806230666607331392} - - component: {fileID: 2801535793207353683} - component: {fileID: 3878369439964005511} - component: {fileID: 2341456216084136881} - component: {fileID: 1126777572448403549} @@ -793,7 +811,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 55938fb1577dd4ad3af7e994048c86f6, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &2801535793207353683 +--- !u!114 &3878369439964005511 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -802,13 +820,13 @@ MonoBehaviour: m_GameObject: {fileID: 3485064730924644412} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9e0b24e2f2ad54cc09940c320ed3cf4b, type: 3} + m_Script: {fileID: 11500000, guid: 9fba2c868971b20439aaea06a939d8e7, type: 3} m_Name: m_EditorClassIdentifier: defaultState: {fileID: 3045303213881461051} currentState: {fileID: 0} _unityEventsFolded: 0 - verbose: 1 + verbose: 0 allowReentry: 0 returnToDefaultOnDisable: 1 OnStateExited: @@ -829,18 +847,7 @@ MonoBehaviour: OnLastStateExited: m_PersistentCalls: m_Calls: [] ---- !u!114 &3878369439964005511 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3485064730924644412} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9fba2c868971b20439aaea06a939d8e7, type: 3} - m_Name: - m_EditorClassIdentifier: + customSaveId: --- !u!114 &2341456216084136881 MonoBehaviour: m_ObjectHideFlags: 0 @@ -870,7 +877,7 @@ MonoBehaviour: m_EditorClassIdentifier: isOneTime: 0 cooldown: -1 - characterToInteract: 2 + characterToInteract: 1 interactionStarted: m_PersistentCalls: m_Calls: [] @@ -879,7 +886,31 @@ MonoBehaviour: m_Calls: [] characterArrived: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: GardenerBehaviour, AppleHillsScripts + m_MethodName: stateSwitch + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: GardenerRunning + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 3878369439964005511} + m_TargetAssemblyTypeName: LawnMowerBehaviour, AppleHillsScripts + m_MethodName: stateSwitch + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: LawnmowerMoving + m_BoolArgument: 0 + m_CallState: 2 interactionComplete: m_PersistentCalls: m_Calls: [] @@ -1685,7 +1716,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4940025602237181209, guid: 60fd8777c3180dd40be2d9e3ff56dd2c, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4972892989515032591, guid: 60fd8777c3180dd40be2d9e3ff56dd2c, type: 3} propertyPath: m_Sprite @@ -1756,7 +1787,7 @@ PrefabInstance: m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 4940025602237181209, guid: 60fd8777c3180dd40be2d9e3ff56dd2c, type: 3} insertIndex: -1 - addedObject: {fileID: 8303949474549176097} + addedObject: {fileID: 956755811869223305} m_SourcePrefab: {fileID: 100100000, guid: 60fd8777c3180dd40be2d9e3ff56dd2c, type: 3} --- !u!4 &106062057957134378 stripped Transform: @@ -1768,7 +1799,7 @@ GameObject: m_CorrespondingSourceObject: {fileID: 4940025602237181209, guid: 60fd8777c3180dd40be2d9e3ff56dd2c, type: 3} m_PrefabInstance: {fileID: 7984152337586070562} m_PrefabAsset: {fileID: 0} ---- !u!114 &8303949474549176097 +--- !u!114 &956755811869223305 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1777,9 +1808,9 @@ MonoBehaviour: m_GameObject: {fileID: 3045303213881461051} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: eaefd3d5a2a864ca5b5d9ec5f2a7040f, type: 3} + m_Script: {fileID: 11500000, guid: 95e46aacea5b42888ee7881894193c11, type: 3} m_Name: - m_EditorClassIdentifier: + m_EditorClassIdentifier: AppleHillsScripts::Core.SaveLoad.SaveableState --- !u!1001 &8911052060583241195 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/docs/puzzle_save_load_proposal.md b/docs/puzzle_save_load_proposal.md new file mode 100644 index 00000000..5f282702 --- /dev/null +++ b/docs/puzzle_save_load_proposal.md @@ -0,0 +1 @@ + \ No newline at end of file