From 6a24330ea0557b70bdae8865c830aa37689a27cc Mon Sep 17 00:00:00 2001 From: DamianCorazza <79833283+DamianCorazza@users.noreply.github.com> Date: Tue, 16 Sep 2025 23:52:28 +0200 Subject: [PATCH] Trying to make Anna Lise face the Bird before taking the picture to no avail Can't make her look at the bird, got pissed off, gonna try tomorrow. --- .../Placeholders/LuringSpotB.prefab | 401 +++++++++++++++++- Assets/Scenes/Levels/Quarry.unity | 72 +--- .../DamianExperiments/AnneLiseBehaviour.cs | 56 ++- 3 files changed, 459 insertions(+), 70 deletions(-) diff --git a/Assets/Prefabs/Environment/Placeholders/LuringSpotB.prefab b/Assets/Prefabs/Environment/Placeholders/LuringSpotB.prefab index a781dd58..68ed1f4e 100644 --- a/Assets/Prefabs/Environment/Placeholders/LuringSpotB.prefab +++ b/Assets/Prefabs/Environment/Placeholders/LuringSpotB.prefab @@ -26,7 +26,7 @@ Transform: m_GameObject: {fileID: 1985797937494910982} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.279, y: -0.097, z: 0} + m_LocalPosition: {x: 1.22, y: 0.62, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 0 m_Children: [] @@ -87,6 +87,93 @@ SpriteRenderer: m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &5236930998804014616 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5654042452373662053} + - component: {fileID: 5493660251969001565} + m_Layer: 6 + m_Name: Wolter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5654042452373662053 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5236930998804014616} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 3.8, y: -3.97, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1612320017392831473} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5493660251969001565 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5236930998804014616} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 1 + m_Sprite: {fileID: 7178426778054925818, guid: 28ba121120cdf5348aac373d9088c0de, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2.82, y: 4.43} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &5835735262203788332 GameObject: m_ObjectHideFlags: 0 @@ -101,6 +188,7 @@ GameObject: - component: {fileID: 4289780218821574471} - component: {fileID: 3093816592344978065} - component: {fileID: 8758136668472096799} + - component: {fileID: 488333850132012697} m_Layer: 10 m_Name: LureSpotB m_TagString: Untagged @@ -122,6 +210,8 @@ Transform: m_ConstrainProportionsScale: 1 m_Children: - {fileID: 779234943217098985} + - {fileID: 6009911529133800530} + - {fileID: 3022736757165821944} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &6583028881099676536 @@ -271,13 +361,49 @@ MonoBehaviour: m_Calls: [] onItemSlotRemoved: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 786704689256514639} + m_TargetAssemblyTypeName: BirdEyesBehavior, AppleHillsScripts + m_MethodName: NoItem + 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 onCorrectItemSlotted: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 786704689256514639} + m_TargetAssemblyTypeName: BirdEyesBehavior, AppleHillsScripts + m_MethodName: CorrectItem + 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 onIncorrectItemSlotted: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 786704689256514639} + m_TargetAssemblyTypeName: BirdEyesBehavior, AppleHillsScripts + m_MethodName: IncorrectItem + 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 onForbiddenItemSlotted: m_PersistentCalls: m_Calls: [] @@ -295,3 +421,270 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: stepData: {fileID: 11400000, guid: d0851a7610551104fa285c0748549d90, type: 2} +--- !u!114 &488333850132012697 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5835735262203788332} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2226aecbed4b1f143a5a5c5be4236957, type: 3} + m_Name: + m_EditorClassIdentifier: + playerToPlaceDistance: 25 + birdEyes: {fileID: 786704689256514639} +--- !u!1 &6865758097422051095 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1612320017392831473} + - component: {fileID: 8300318837081889711} + m_Layer: 6 + m_Name: BirdSpawned + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1612320017392831473 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6865758097422051095} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -6.6462555, y: 2.6127002, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5654042452373662053} + - {fileID: 5990546859970263031} + m_Father: {fileID: 3022736757165821944} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8300318837081889711 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6865758097422051095} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eaefd3d5a2a864ca5b5d9ec5f2a7040f, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &8791175698629293423 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6009911529133800530} + m_Layer: 10 + m_Name: AnneLisePositionB + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6009911529133800530 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8791175698629293423} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -6.41, y: 0.44, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6078012632802010276} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &699465474415911208 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6078012632802010276} + m_Modifications: + - target: {fileID: 1370564349707122423, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_Name + value: BirdEyesB + objectReference: {fileID: 0} + - target: {fileID: 2326086342663433936, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_LocalPosition.x + value: 2.9062557 + objectReference: {fileID: 0} + - target: {fileID: 2326086342663433936, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_LocalPosition.y + value: 2.8123 + objectReference: {fileID: 0} + - target: {fileID: 2326086342663433936, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2326086342663433936, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2326086342663433936, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2326086342663433936, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2326086342663433936, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2326086342663433936, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2326086342663433936, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2326086342663433936, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3532512445619884959, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4477179922705334961, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_LocalPosition.x + value: -6.52 + objectReference: {fileID: 0} + - target: {fileID: 4477179922705334961, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_LocalPosition.y + value: 3.72 + objectReference: {fileID: 0} + - target: {fileID: 4477179922705334961, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9540502 + objectReference: {fileID: 0} + - target: {fileID: 4477179922705334961, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_LocalRotation.z + value: -0.299647 + objectReference: {fileID: 0} + - target: {fileID: 4477179922705334961, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -34.873 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: + - {fileID: 8828658103663197825, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 2326086342663433936, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + insertIndex: -1 + addedObject: {fileID: 1612320017392831473} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} +--- !u!114 &786704689256514639 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 243176356944356711, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + m_PrefabInstance: {fileID: 699465474415911208} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 13d59d3c42170824b8f92557822d9bf0, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &3022736757165821944 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2326086342663433936, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + m_PrefabInstance: {fileID: 699465474415911208} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &4445337424770836952 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1612320017392831473} + m_Modifications: + - target: {fileID: 1282228733406082151, guid: fde0c702b7c4ea3439502cfb575ac77a, type: 3} + propertyPath: m_Name + value: Headband + objectReference: {fileID: 0} + - target: {fileID: 7967906181784854063, guid: fde0c702b7c4ea3439502cfb575ac77a, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7967906181784854063, guid: fde0c702b7c4ea3439502cfb575ac77a, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7967906181784854063, guid: fde0c702b7c4ea3439502cfb575ac77a, type: 3} + propertyPath: m_LocalScale.z + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 7967906181784854063, guid: fde0c702b7c4ea3439502cfb575ac77a, type: 3} + propertyPath: m_LocalPosition.x + value: 7.29 + objectReference: {fileID: 0} + - target: {fileID: 7967906181784854063, guid: fde0c702b7c4ea3439502cfb575ac77a, type: 3} + propertyPath: m_LocalPosition.y + value: -6.27 + objectReference: {fileID: 0} + - target: {fileID: 7967906181784854063, guid: fde0c702b7c4ea3439502cfb575ac77a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7967906181784854063, guid: fde0c702b7c4ea3439502cfb575ac77a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7967906181784854063, guid: fde0c702b7c4ea3439502cfb575ac77a, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7967906181784854063, guid: fde0c702b7c4ea3439502cfb575ac77a, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7967906181784854063, guid: fde0c702b7c4ea3439502cfb575ac77a, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7967906181784854063, guid: fde0c702b7c4ea3439502cfb575ac77a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7967906181784854063, guid: fde0c702b7c4ea3439502cfb575ac77a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7967906181784854063, guid: fde0c702b7c4ea3439502cfb575ac77a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 5935055277585311711, guid: fde0c702b7c4ea3439502cfb575ac77a, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fde0c702b7c4ea3439502cfb575ac77a, type: 3} +--- !u!4 &5990546859970263031 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7967906181784854063, guid: fde0c702b7c4ea3439502cfb575ac77a, type: 3} + m_PrefabInstance: {fileID: 4445337424770836952} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scenes/Levels/Quarry.unity b/Assets/Scenes/Levels/Quarry.unity index cac98b09..58991965 100644 --- a/Assets/Scenes/Levels/Quarry.unity +++ b/Assets/Scenes/Levels/Quarry.unity @@ -429479,64 +429479,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 451686079} m_PrefabAsset: {fileID: 0} ---- !u!1001 &457500957 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1282228733406082151, guid: fde0c702b7c4ea3439502cfb575ac77a, type: 3} - propertyPath: m_Name - value: Headband - objectReference: {fileID: 0} - - target: {fileID: 7967906181784854063, guid: fde0c702b7c4ea3439502cfb575ac77a, type: 3} - propertyPath: m_LocalPosition.x - value: -36.34 - objectReference: {fileID: 0} - - target: {fileID: 7967906181784854063, guid: fde0c702b7c4ea3439502cfb575ac77a, type: 3} - propertyPath: m_LocalPosition.y - value: 8.09 - objectReference: {fileID: 0} - - target: {fileID: 7967906181784854063, guid: fde0c702b7c4ea3439502cfb575ac77a, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7967906181784854063, guid: fde0c702b7c4ea3439502cfb575ac77a, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7967906181784854063, guid: fde0c702b7c4ea3439502cfb575ac77a, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7967906181784854063, guid: fde0c702b7c4ea3439502cfb575ac77a, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7967906181784854063, guid: fde0c702b7c4ea3439502cfb575ac77a, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7967906181784854063, guid: fde0c702b7c4ea3439502cfb575ac77a, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7967906181784854063, guid: fde0c702b7c4ea3439502cfb575ac77a, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7967906181784854063, guid: fde0c702b7c4ea3439502cfb575ac77a, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 5935055277585311711, guid: fde0c702b7c4ea3439502cfb575ac77a, type: 3} - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: fde0c702b7c4ea3439502cfb575ac77a, type: 3} --- !u!1001 &459948550 PrefabInstance: m_ObjectHideFlags: 0 @@ -434230,11 +434172,11 @@ PrefabInstance: objectReference: {fileID: 3182619} - target: {fileID: 5409891338185859165, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} propertyPath: m_LocalPosition.x - value: -0.22846493 + value: -0.22846495 objectReference: {fileID: 0} - target: {fileID: 5409891338185859165, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3} propertyPath: m_LocalPosition.y - value: -3.364711 + value: -3.3647113 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -441426,11 +441368,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8523100300591212744, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3} propertyPath: m_LocalPosition.x - value: -18.090492 + value: 65.9 objectReference: {fileID: 0} - target: {fileID: 8523100300591212744, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3} propertyPath: m_LocalPosition.y - value: 9.1027 + value: 5.4 objectReference: {fileID: 0} - target: {fileID: 8523100300591212744, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3} propertyPath: m_LocalPosition.z @@ -441470,6 +441412,7 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 7870441803139401704, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3} + - {fileID: 4102529980491997365, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: @@ -442164,6 +442107,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6865758097422051095, guid: 3346526f3046f424196615241a307104, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -442916,7 +442863,6 @@ SceneRoots: - {fileID: 1032520927} - {fileID: 5541405231515088532} - {fileID: 2024588806} - - {fileID: 457500957} - {fileID: 1295249126} - {fileID: 520186664} - {fileID: 1328912324} diff --git a/Assets/Scripts/DamianExperiments/AnneLiseBehaviour.cs b/Assets/Scripts/DamianExperiments/AnneLiseBehaviour.cs index c20550f8..956ae9cb 100644 --- a/Assets/Scripts/DamianExperiments/AnneLiseBehaviour.cs +++ b/Assets/Scripts/DamianExperiments/AnneLiseBehaviour.cs @@ -7,12 +7,16 @@ public class AnneLiseBehaviour : MonoBehaviour [SerializeField] public float moveSpeed; private Animator animator; private AIPath aiPath; - private bool hasArrived = false; // Flag to prevent repeated triggering + private bool hasArrived = false; + private GameObject currentLureSpot; + private SpriteRenderer spriteRenderer; // Cached reference + private bool allowFacingByVelocity = true; // New flag private void Awake() { animator = GetComponentInChildren(); aiPath = GetComponent(); + spriteRenderer = GetComponentInChildren(); // Cache the reference if (aiPath != null) { aiPath.maxSpeed = moveSpeed; @@ -26,7 +30,9 @@ public class AnneLiseBehaviour : MonoBehaviour aiPath.destination = lurespot.transform.position; aiPath.canMove = true; aiPath.SearchPath(); - hasArrived = false; // Reset flag when a new destination is set + hasArrived = false; + allowFacingByVelocity = true; // Enable facing by velocity when moving + currentLureSpot = lurespot; } private void Update() @@ -36,10 +42,22 @@ public class AnneLiseBehaviour : MonoBehaviour float currentSpeed = aiPath.velocity.magnitude; animator.SetFloat("speed", currentSpeed); - // Only trigger arrival logic once + // Only allow facing by velocity if not arrived + if (allowFacingByVelocity && currentSpeed > 0.01f && spriteRenderer != null) + { + Vector3 velocity = aiPath.velocity; + if (velocity.x != 0) + { + Vector3 scale = spriteRenderer.transform.localScale; + scale.x = Mathf.Abs(scale.x) * (velocity.x > 0 ? 1 : -1); + spriteRenderer.transform.localScale = scale; + } + } + if (!hasArrived && aiPath.reachedDestination && currentSpeed < 0.01f) { hasArrived = true; + allowFacingByVelocity = false; // Disable facing by velocity after arrival OnArriveAtSpot(); aiPath.canMove = false; } @@ -47,7 +65,39 @@ public class AnneLiseBehaviour : MonoBehaviour private void OnArriveAtSpot() { + // Face the "BirdSpawned" child of the current lurespot, if available + if (currentLureSpot != null) + { + GameObject birdSpawned = null; + foreach (Transform child in currentLureSpot.GetComponentsInChildren(true)) + { + if (child.name == "BirdSpawned") + { + birdSpawned = child.gameObject; + break; + } + } + if (birdSpawned != null) + { + FaceTarget(birdSpawned); + } + } + if (animator != null) animator.SetTrigger("TakePhoto"); } + + public void FaceTarget(GameObject target) + { + if (target == null || spriteRenderer == null) return; + + // Compare X positions to determine facing direction + float direction = target.transform.position.x - transform.position.x; + if (Mathf.Abs(direction) > 0.01f) // Avoid flipping if almost aligned + { + Vector3 scale = spriteRenderer.transform.localScale; + scale.x = Mathf.Abs(scale.x) * (direction > 0 ? 1 : -1); + spriteRenderer.transform.localScale = scale; + } + } }