diff --git a/Assets/External/AstarPathfindingProject/Core/AI/AIPath.cs b/Assets/External/AstarPathfindingProject/Core/AI/AIPath.cs
index 997f9f5e..0be0ca85 100644
--- a/Assets/External/AstarPathfindingProject/Core/AI/AIPath.cs
+++ b/Assets/External/AstarPathfindingProject/Core/AI/AIPath.cs
@@ -1,6 +1,7 @@
using UnityEngine;
using System.Collections;
using System.Collections.Generic;
+using System;
namespace Pathfinding {
using Pathfinding.RVO;
@@ -260,6 +261,12 @@ namespace Pathfinding {
reachedEndOfPath = false;
}
+ ///
+ /// Event triggered when the AI has reached its target.
+ /// Subscribe to this to get notified when the agent reaches its destination.
+ ///
+ public event Action OnTargetReachedEvent;
+
///
/// The end of the path has been reached.
/// If you want custom logic for when the AI has reached it's destination add it here. You can
@@ -269,6 +276,7 @@ namespace Pathfinding {
/// So when the agent is close to the destination this method will typically be called every seconds.
///
public virtual void OnTargetReached () {
+ OnTargetReachedEvent?.Invoke();
}
///
diff --git a/Assets/Prefabs/Characters/AnneLise_Camera.prefab b/Assets/Prefabs/Characters/AnneLise_Camera.prefab
index 1b077ef8..93c250ba 100644
--- a/Assets/Prefabs/Characters/AnneLise_Camera.prefab
+++ b/Assets/Prefabs/Characters/AnneLise_Camera.prefab
@@ -10,9 +10,8 @@ GameObject:
m_Component:
- component: {fileID: 7204028979372864050}
- component: {fileID: 428866831124527047}
- - component: {fileID: 9146368976740011109}
- component: {fileID: 2495203636023808437}
- m_Layer: 0
+ m_Layer: 10
m_Name: annelise_sprite
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -78,7 +77,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 0
+ m_SortingOrder: 1
m_Sprite: {fileID: -1179960714, guid: 99d4c3083e9c24142bc20deaeaf95720, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -90,43 +89,6 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
---- !u!70 &9146368976740011109
-CapsuleCollider2D:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1501762630858354458}
- m_Enabled: 1
- serializedVersion: 3
- m_Density: 1
- m_Material: {fileID: 0}
- m_IncludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_ExcludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_LayerOverridePriority: 0
- m_ForceSendLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_ForceReceiveLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_ContactCaptureLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_CallbackLayers:
- serializedVersion: 2
- m_Bits: 4294967295
- m_IsTrigger: 0
- m_UsedByEffector: 0
- m_CompositeOperation: 0
- m_CompositeOrder: 0
- m_Offset: {x: 0, y: 1.687}
- m_Size: {x: 2.59, y: 4.82}
- m_Direction: 0
--- !u!95 &2495203636023808437
Animator:
serializedVersion: 7
@@ -159,7 +121,7 @@ GameObject:
m_Component:
- component: {fileID: 163349679637932333}
- component: {fileID: 3933955841584214629}
- m_Layer: 0
+ m_Layer: 10
m_Name: Flash
m_TagString: Untagged
m_Icon: {fileID: 0}
@@ -224,7 +186,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
- m_SortingOrder: 0
+ m_SortingOrder: 2
m_Sprite: {fileID: 3625043607559282579, guid: 19fb86013d8c24d6cb8410c0aadf30fa, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -236,6 +198,84 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
+--- !u!1 &2067418934294973060
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1685551316860627076}
+ - component: {fileID: 6018414269269671285}
+ m_Layer: 6
+ m_Name: AnnaLiseCollider
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1685551316860627076
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2067418934294973060}
+ serializedVersion: 2
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1.2000002}
+ m_ConstrainProportionsScale: 1
+ m_Children: []
+ m_Father: {fileID: 8523100300591212744}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!61 &6018414269269671285
+BoxCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2067418934294973060}
+ m_Enabled: 1
+ serializedVersion: 3
+ m_Density: 1
+ m_Material: {fileID: 0}
+ m_IncludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ExcludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_LayerOverridePriority: 0
+ m_ForceSendLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_ForceReceiveLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_ContactCaptureLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_CallbackLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_IsTrigger: 0
+ m_UsedByEffector: 0
+ m_CompositeOperation: 0
+ m_CompositeOrder: 0
+ m_Offset: {x: 0, y: 0}
+ m_SpriteTilingProperty:
+ border: {x: 0, y: 0, z: 0, w: 0}
+ pivot: {x: 0, y: 0}
+ oldSize: {x: 0, y: 0}
+ newSize: {x: 0, y: 0}
+ adaptiveTilingThreshold: 0
+ drawMode: 0
+ adaptiveTiling: 0
+ m_AutoTiling: 0
+ m_Size: {x: 1, y: 1}
+ m_EdgeRadius: 0
--- !u!1 &5172497182660285677
GameObject:
m_ObjectHideFlags: 0
@@ -245,9 +285,13 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8523100300591212744}
- - component: {fileID: 7870441803139401704}
- - component: {fileID: 7703867214257508887}
- - component: {fileID: 4102529980491997365}
+ - component: {fileID: 7273455074532059757}
+ - component: {fileID: 63711523903468834}
+ - component: {fileID: 9136625393187827797}
+ - component: {fileID: 935652268781177375}
+ - component: {fileID: 6455089331794006644}
+ - component: {fileID: 5043618791380611472}
+ - component: {fileID: 4538351495758615844}
m_Layer: 10
m_Name: AnneLise_Camera
m_TagString: Untagged
@@ -265,13 +309,131 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
+ m_LocalScale: {x: 1.2, y: 1.2, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7204028979372864050}
+ - {fileID: 1685551316860627076}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &7870441803139401704
+--- !u!114 &7273455074532059757
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5172497182660285677}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: d0d1761ee6769c243b110122f5e17b73, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ moveSpeed: 30
+--- !u!114 &63711523903468834
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5172497182660285677}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 373b52eb9bf8c40f785bb6947a1aee66, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ version: 1
+ drawGizmos: 1
+ detailedGizmos: 0
+ startEndModifier:
+ addPoints: 0
+ exactStartPoint: 3
+ exactEndPoint: 3
+ useRaycasting: 0
+ mask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ useGraphRaycasting: 0
+ traversableTags: -1
+ tagPenalties: 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+ graphMask:
+ value: -1
+--- !u!114 &9136625393187827797
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5172497182660285677}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f6eb1402c17e84a9282a7f0f62eb584f, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ version: 5
+ radius: 0.5
+ height: 2
+ canMove: 1
+ maxSpeed: 30
+ gravity: {x: 0, y: 0, z: 0}
+ groundMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ centerOffsetCompatibility: NaN
+ repathRateCompatibility: NaN
+ canSearchCompability: 0
+ orientation: 1
+ enableRotation: 0
+ autoRepath:
+ mode: 2
+ interval: 0.5
+ sensitivity: 10
+ maximumInterval: 2
+ visualizeSensitivity: 0
+ targetCompatibility: {fileID: 0}
+ maxAcceleration: 1000
+ rotationSpeed: 360
+ slowdownDistance: 0.6
+ pickNextWaypointDist: 2
+ endReachedDistance: 0.2
+ alwaysDrawGizmos: 0
+ slowWhenNotFacingTarget: 1
+ whenCloseToDestination: 0
+ constrainInsideGraph: 0
+--- !u!114 &935652268781177375
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5172497182660285677}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 55938fb1577dd4ad3af7e994048c86f6, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!114 &6455089331794006644
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5172497182660285677}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: cb6a34d769a1e4ac7b0b30e433aa443c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ version: 1
+ smoothType: 0
+ subdivisions: 2
+ iterations: 2
+ strength: 0.5
+ uniformLength: 1
+ maxSegmentLength: 2
+ bezierTangentLength: 0.4
+ offset: 0.2
+ factor: 0.1
+--- !u!114 &5043618791380611472
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -283,13 +445,43 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 73d6494a73174ffabc6a7d3089d51e73, type: 3}
m_Name:
m_EditorClassIdentifier:
---- !u!65 &7703867214257508887
-BoxCollider:
+ isOneTime: 0
+ cooldown: -1
+ characterToInteract: 0
+ interactionStarted:
+ m_PersistentCalls:
+ m_Calls: []
+ interactionInterrupted:
+ m_PersistentCalls:
+ m_Calls: []
+ characterArrived:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 7273455074532059757}
+ m_TargetAssemblyTypeName: AnneLiseBehaviour, AppleHillsScripts
+ m_MethodName: TrafalgarTouchedAnnaLise
+ 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!61 &4538351495758615844
+BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5172497182660285677}
+ m_Enabled: 1
+ serializedVersion: 3
+ m_Density: 1
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
@@ -298,64 +490,31 @@ BoxCollider:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
+ m_ForceSendLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_ForceReceiveLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_ContactCaptureLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_CallbackLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
m_IsTrigger: 0
- m_ProvidesContacts: 0
- m_Enabled: 1
- serializedVersion: 3
- m_Size: {x: 1, y: 1, z: 1}
- m_Center: {x: 0, y: 0, z: 0}
---- !u!212 &4102529980491997365
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5172497182660285677}
- 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: 0
- m_Sprite: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_FlipX: 0
- m_FlipY: 0
- m_DrawMode: 0
- m_Size: {x: 1, y: 1}
- m_AdaptiveModeThreshold: 0.5
- m_SpriteTileMode: 0
- m_WasSpriteAssigned: 0
- m_MaskInteraction: 0
- m_SpriteSortPoint: 0
+ m_UsedByEffector: 0
+ m_CompositeOperation: 0
+ m_CompositeOrder: 0
+ m_Offset: {x: 0, y: 1.6}
+ m_SpriteTilingProperty:
+ border: {x: 0, y: 0, z: 0, w: 0}
+ pivot: {x: 0, y: 0}
+ oldSize: {x: 0, y: 0}
+ newSize: {x: 0, y: 0}
+ adaptiveTilingThreshold: 0
+ drawMode: 0
+ adaptiveTiling: 0
+ m_AutoTiling: 0
+ m_Size: {x: 4, y: 5}
+ m_EdgeRadius: 0
diff --git a/Assets/Prefabs/Environment/Placeholders/LuringSpotC.prefab b/Assets/Prefabs/Environment/Placeholders/LuringSpotC.prefab
index 2348e046..ec8356e1 100644
--- a/Assets/Prefabs/Environment/Placeholders/LuringSpotC.prefab
+++ b/Assets/Prefabs/Environment/Placeholders/LuringSpotC.prefab
@@ -185,6 +185,7 @@ GameObject:
- component: {fileID: 106497079666291966}
- component: {fileID: 6535246856440349519}
- component: {fileID: 3169137887822749614}
+ - component: {fileID: 8370367816617117734}
m_Layer: 10
m_Name: LureSpotC
m_TagString: Untagged
@@ -431,7 +432,21 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1101f6c4eb04423b89dc78dc7c9f1aae, type: 3}
m_Name:
m_EditorClassIdentifier:
- stepData: {fileID: 11400000, guid: 0fb0ab2b55d93a24685e9f6651adcf30, type: 2}
+ stepData: {fileID: 11400000, guid: 28848561ff31fe24ea9f8590dee0bf8f, type: 2}
+--- !u!114 &8370367816617117734
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7145022056631397938}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 78f015ca3cba1d54382afba790601471, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ luredBird: {fileID: 0}
+ annaLiseSpot: {fileID: 0}
--- !u!1 &7627197106378853261
GameObject:
m_ObjectHideFlags: 0
@@ -471,10 +486,26 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 666692440329091063}
m_Modifications:
+ - target: {fileID: 1597866798502552092, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3}
+ propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1597866798502552092, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3}
+ propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 1597866798502552092, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3}
+ propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
+ value:
+ objectReference: {fileID: 0}
- target: {fileID: 1597866798502552092, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3}
propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgument
value:
- objectReference: {fileID: 7627197106378853261}
+ objectReference: {fileID: 0}
+ - target: {fileID: 1597866798502552092, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3}
+ propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
+ value:
+ objectReference: {fileID: 0}
- target: {fileID: 1784002662241348359, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3}
propertyPath: m_Name
value: HammerBird
@@ -643,11 +674,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7698905571408300091, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3}
propertyPath: m_LocalPosition.x
- value: -6.89
+ value: -6.86
objectReference: {fileID: 0}
- target: {fileID: 7698905571408300091, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3}
propertyPath: m_LocalPosition.y
- value: -7.05
+ value: -6.98
objectReference: {fileID: 0}
- target: {fileID: 7698905571408300091, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3}
propertyPath: m_ConstrainProportionsScale
diff --git a/Assets/Scenes/Levels/Quarry.unity b/Assets/Scenes/Levels/Quarry.unity
index 58991965..4334ae0c 100644
--- a/Assets/Scenes/Levels/Quarry.unity
+++ b/Assets/Scenes/Levels/Quarry.unity
@@ -571,6 +571,96 @@ Transform:
m_CorrespondingSourceObject: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3}
m_PrefabInstance: {fileID: 63234684}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &90258300 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 5236930998804014616, guid: 3346526f3046f424196615241a307104, type: 3}
+ m_PrefabInstance: {fileID: 3708074769586677211}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &90258303
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 90258300}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 73d6494a73174ffabc6a7d3089d51e73, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ isOneTime: 0
+ cooldown: -1
+ characterToInteract: 1
+ interactionStarted:
+ m_PersistentCalls:
+ m_Calls: []
+ interactionInterrupted:
+ m_PersistentCalls:
+ m_Calls: []
+ characterArrived:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 538228069}
+ m_TargetAssemblyTypeName: AnneLiseBehaviour, AppleHillsScripts
+ m_MethodName: GotoSpot
+ m_Mode: 2
+ m_Arguments:
+ m_ObjectArgument: {fileID: 733706650}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+ interactionComplete:
+ m_PersistentCalls:
+ m_Calls: []
+--- !u!61 &90258304
+BoxCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 90258300}
+ m_Enabled: 1
+ serializedVersion: 3
+ m_Density: 1
+ m_Material: {fileID: 0}
+ m_IncludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ExcludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_LayerOverridePriority: 0
+ m_ForceSendLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_ForceReceiveLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_ContactCaptureLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_CallbackLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_IsTrigger: 0
+ m_UsedByEffector: 0
+ m_CompositeOperation: 0
+ m_CompositeOrder: 0
+ m_Offset: {x: 0, y: 0}
+ m_SpriteTilingProperty:
+ border: {x: 0, y: 0, z: 0, w: 0}
+ pivot: {x: 0.5, y: 0.5}
+ oldSize: {x: 2.82, y: 4.43}
+ newSize: {x: 2.82, y: 4.43}
+ adaptiveTilingThreshold: 0.5
+ drawMode: 0
+ adaptiveTiling: 0
+ m_AutoTiling: 0
+ m_Size: {x: 3.42, y: 5.58}
+ m_EdgeRadius: 0
--- !u!1001 &94790232
PrefabInstance:
m_ObjectHideFlags: 0
@@ -427877,6 +427967,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3}
m_PrefabInstance: {fileID: 241380432}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &260961018 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 7627197106378853261, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
+ m_PrefabInstance: {fileID: 3978117984697153445}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &264885659
PrefabInstance:
m_ObjectHideFlags: 0
@@ -428112,6 +428207,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3}
m_PrefabInstance: {fileID: 272973495}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &278791374 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 1809639087387590989, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
+ m_PrefabInstance: {fileID: 3978117984697153445}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &282954629
PrefabInstance:
m_ObjectHideFlags: 0
@@ -428948,7 +429048,7 @@ Transform:
m_GameObject: {fileID: 384793595}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -4.99, y: -1.04, z: 0}
+ m_LocalPosition: {x: 6.32, y: -0.85, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -430262,128 +430362,22 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3}
---- !u!1 &538228064 stripped
+--- !u!1 &532496500 stripped
GameObject:
- m_CorrespondingSourceObject: {fileID: 5172497182660285677, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3}
+ m_CorrespondingSourceObject: {fileID: 4624889622840393752, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3}
+ m_PrefabInstance: {fileID: 3485393201986366005}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &538228069 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 7273455074532059757, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3}
m_PrefabInstance: {fileID: 2117822310}
m_PrefabAsset: {fileID: 0}
---- !u!114 &538228069
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 538228064}
+ m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0d1761ee6769c243b110122f5e17b73, type: 3}
m_Name:
m_EditorClassIdentifier:
- moveSpeed: 30
---- !u!114 &538228070
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 538228064}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: f6eb1402c17e84a9282a7f0f62eb584f, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- version: 5
- radius: 0.5
- height: 2
- canMove: 1
- maxSpeed: 30
- gravity: {x: 0, y: 0, z: 0}
- groundMask:
- serializedVersion: 2
- m_Bits: 4294967295
- centerOffsetCompatibility: NaN
- repathRateCompatibility: NaN
- canSearchCompability: 0
- orientation: 1
- enableRotation: 0
- autoRepath:
- mode: 2
- interval: 0.5
- sensitivity: 10
- maximumInterval: 2
- visualizeSensitivity: 0
- targetCompatibility: {fileID: 0}
- maxAcceleration: 1000
- rotationSpeed: 360
- slowdownDistance: 0.6
- pickNextWaypointDist: 2
- endReachedDistance: 0.2
- alwaysDrawGizmos: 0
- slowWhenNotFacingTarget: 1
- whenCloseToDestination: 0
- constrainInsideGraph: 0
---- !u!114 &538228071
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 538228064}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 373b52eb9bf8c40f785bb6947a1aee66, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- version: 1
- drawGizmos: 1
- detailedGizmos: 0
- startEndModifier:
- addPoints: 0
- exactStartPoint: 3
- exactEndPoint: 3
- useRaycasting: 0
- mask:
- serializedVersion: 2
- m_Bits: 4294967295
- useGraphRaycasting: 0
- traversableTags: -1
- tagPenalties: 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
- graphMask:
- value: -1
---- !u!114 &538228073
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 538228064}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 55938fb1577dd4ad3af7e994048c86f6, type: 3}
- m_Name:
- m_EditorClassIdentifier:
---- !u!114 &538228074
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 538228064}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: cb6a34d769a1e4ac7b0b30e433aa443c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- version: 1
- smoothType: 0
- subdivisions: 2
- iterations: 2
- strength: 0.5
- uniformLength: 1
- maxSegmentLength: 2
- bezierTangentLength: 0.4
- offset: 0.2
- factor: 0.1
--- !u!1 &544198592
GameObject:
m_ObjectHideFlags: 0
@@ -430547,6 +430541,30 @@ Transform:
m_CorrespondingSourceObject: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3}
m_PrefabInstance: {fileID: 937132183}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &568523011 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 7249528695393012044, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3}
+ m_PrefabInstance: {fileID: 8013274907828598643}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &568523019
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 568523011}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 78f015ca3cba1d54382afba790601471, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ luredBird: {fileID: 1212556098}
+ annaLiseSpot: {fileID: 1482721234}
+--- !u!1 &589217856 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 6865758097422051095, guid: 3346526f3046f424196615241a307104, type: 3}
+ m_PrefabInstance: {fileID: 3708074769586677211}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &592172021
PrefabInstance:
m_ObjectHideFlags: 0
@@ -431524,6 +431542,25 @@ Transform:
m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3}
m_PrefabInstance: {fileID: 697303079}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &733706650 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 5835735262203788332, guid: 3346526f3046f424196615241a307104, type: 3}
+ m_PrefabInstance: {fileID: 3708074769586677211}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &733706658
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 733706650}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 78f015ca3cba1d54382afba790601471, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ luredBird: {fileID: 589217856}
+ annaLiseSpot: {fileID: 1252931343}
--- !u!1001 &752930749
PrefabInstance:
m_ObjectHideFlags: 0
@@ -434172,11 +434209,11 @@ PrefabInstance:
objectReference: {fileID: 3182619}
- target: {fileID: 5409891338185859165, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3}
propertyPath: m_LocalPosition.x
- value: -0.22846495
+ value: -0.22846493
objectReference: {fileID: 0}
- target: {fileID: 5409891338185859165, guid: 4b7426bc1f8736749b68973653f4dbfb, type: 3}
propertyPath: m_LocalPosition.y
- value: -3.3647113
+ value: -3.364711
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
@@ -434987,6 +435024,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3}
m_PrefabInstance: {fileID: 1175135178}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &1175998461 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 7145022056631397938, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
+ m_PrefabInstance: {fileID: 3978117984697153445}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &1182494929 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7379304988657006554, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3}
@@ -435440,6 +435482,11 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3}
+--- !u!1 &1212556098 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 1178648129422731606, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3}
+ m_PrefabInstance: {fileID: 8013274907828598643}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &1217164923
PrefabInstance:
m_ObjectHideFlags: 0
@@ -435601,6 +435648,11 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 7.957}
+--- !u!1 &1252931343 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 8791175698629293423, guid: 3346526f3046f424196615241a307104, type: 3}
+ m_PrefabInstance: {fileID: 3708074769586677211}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &1256486233
PrefabInstance:
m_ObjectHideFlags: 0
@@ -437319,6 +437371,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3}
m_PrefabInstance: {fileID: 1482575303}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &1482721234 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 7675352645851726746, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3}
+ m_PrefabInstance: {fileID: 8013274907828598643}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &1484810512
PrefabInstance:
m_ObjectHideFlags: 0
@@ -440802,6 +440859,25 @@ Transform:
m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3}
m_PrefabInstance: {fileID: 2021396584}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &2022162745 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 588897581313790951, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3}
+ m_PrefabInstance: {fileID: 3485393201986366005}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &2022162750
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2022162745}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 78f015ca3cba1d54382afba790601471, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ luredBird: {fileID: 532496500}
+ annaLiseSpot: {fileID: 384793595}
--- !u!1001 &2024588806
PrefabInstance:
m_ObjectHideFlags: 0
@@ -441306,66 +441382,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- - target: {fileID: 428866831124527047, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3}
- propertyPath: m_SortingOrder
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 1501762630858354458, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3}
- propertyPath: m_Layer
- value: 10
- objectReference: {fileID: 0}
- - target: {fileID: 1501762630858354458, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3}
- propertyPath: m_IsActive
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 1982774673867376101, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3}
- propertyPath: m_Layer
- value: 10
- objectReference: {fileID: 0}
- - target: {fileID: 3933955841584214629, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3}
- propertyPath: m_Enabled
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3933955841584214629, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3}
- propertyPath: m_SortingOrder
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 4102529980491997365, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3}
- propertyPath: m_Enabled
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 4102529980491997365, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3}
- propertyPath: m_SortingOrder
- value: 1
- objectReference: {fileID: 0}
- target: {fileID: 5172497182660285677, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3}
propertyPath: m_Name
value: AnneLise_Camera
objectReference: {fileID: 0}
- - target: {fileID: 5172497182660285677, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3}
- propertyPath: m_Layer
- value: 10
- objectReference: {fileID: 0}
- - target: {fileID: 7703867214257508887, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3}
- propertyPath: m_Size.x
- value: 3
- objectReference: {fileID: 0}
- - target: {fileID: 7703867214257508887, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3}
- propertyPath: m_Size.y
- value: 5
- objectReference: {fileID: 0}
- - target: {fileID: 7703867214257508887, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3}
- propertyPath: m_Center.y
- value: 1.7
- objectReference: {fileID: 0}
- - target: {fileID: 8523100300591212744, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3}
- propertyPath: m_LocalScale.x
- value: 1.2
- objectReference: {fileID: 0}
- - target: {fileID: 8523100300591212744, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3}
- propertyPath: m_LocalScale.y
- value: 1.2
- objectReference: {fileID: 0}
- target: {fileID: 8523100300591212744, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3}
propertyPath: m_LocalPosition.x
value: 65.9
@@ -441406,31 +441426,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 9146368976740011109, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3}
- propertyPath: m_Enabled
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents:
- - {fileID: 7870441803139401704, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3}
- - {fileID: 4102529980491997365, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3}
- m_RemovedGameObjects: []
+ m_RemovedComponents: []
+ m_RemovedGameObjects:
+ - {fileID: 2067418934294973060, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3}
m_AddedGameObjects: []
- m_AddedComponents:
- - targetCorrespondingSourceObject: {fileID: 5172497182660285677, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3}
- insertIndex: -1
- addedObject: {fileID: 538228069}
- - targetCorrespondingSourceObject: {fileID: 5172497182660285677, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3}
- insertIndex: -1
- addedObject: {fileID: 538228071}
- - targetCorrespondingSourceObject: {fileID: 5172497182660285677, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3}
- insertIndex: -1
- addedObject: {fileID: 538228070}
- - targetCorrespondingSourceObject: {fileID: 5172497182660285677, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3}
- insertIndex: -1
- addedObject: {fileID: 538228073}
- - targetCorrespondingSourceObject: {fileID: 5172497182660285677, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3}
- insertIndex: -1
- addedObject: {fileID: 538228074}
+ m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3}
--- !u!1001 &2125265433
PrefabInstance:
@@ -441703,67 +441703,6 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 31cedf522ec19fc4bb332c31c9e09807, type: 3}
---- !u!1001 &815620523195828801
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 6583016841553003224, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
- propertyPath: m_LocalPosition.x
- value: 13.14
- objectReference: {fileID: 0}
- - target: {fileID: 6583016841553003224, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
- propertyPath: m_LocalPosition.y
- value: 26.67
- objectReference: {fileID: 0}
- - target: {fileID: 6583016841553003224, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 6583016841553003224, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 6583016841553003224, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 6583016841553003224, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 6583016841553003224, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 6583016841553003224, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 6583016841553003224, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 6583016841553003224, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 7145022056631397938, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
- propertyPath: m_Name
- value: LureSpotC
- objectReference: {fileID: 0}
- - target: {fileID: 7145022056631397938, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
--- !u!1001 &2428672463423402429
PrefabInstance:
m_ObjectHideFlags: 0
@@ -442002,7 +441941,7 @@ PrefabInstance:
- target: {fileID: 2433130051631076285, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3}
propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgument
value:
- objectReference: {fileID: 384793595}
+ objectReference: {fileID: 2022162745}
- target: {fileID: 2433130051631076285, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3}
propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.GameObject, UnityEngine
@@ -442047,13 +441986,20 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 5387498764853775290, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3}
+ propertyPath: isOneTime
+ value: 1
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 2523333015159032981, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3}
insertIndex: -1
addedObject: {fileID: 384793596}
- m_AddedComponents: []
+ m_AddedComponents:
+ - targetCorrespondingSourceObject: {fileID: 588897581313790951, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 2022162750}
m_SourcePrefab: {fileID: 100100000, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3}
--- !u!1001 &3708074769586677211
PrefabInstance:
@@ -442063,17 +442009,41 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
+ - target: {fileID: 4005709218855855001, guid: 3346526f3046f424196615241a307104, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -9.54
+ objectReference: {fileID: 0}
+ - target: {fileID: 4005709218855855001, guid: 3346526f3046f424196615241a307104, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 1.66
+ objectReference: {fileID: 0}
+ - target: {fileID: 4289780218821574471, guid: 3346526f3046f424196615241a307104, type: 3}
+ propertyPath: isOneTime
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5236930998804014616, guid: 3346526f3046f424196615241a307104, type: 3}
+ propertyPath: m_Layer
+ value: 10
+ objectReference: {fileID: 0}
- target: {fileID: 5835735262203788332, guid: 3346526f3046f424196615241a307104, type: 3}
propertyPath: m_Name
value: LureSpotB
objectReference: {fileID: 0}
+ - target: {fileID: 6009911529133800530, guid: 3346526f3046f424196615241a307104, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 5.33
+ objectReference: {fileID: 0}
+ - target: {fileID: 6009911529133800530, guid: 3346526f3046f424196615241a307104, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.31
+ objectReference: {fileID: 0}
- target: {fileID: 6078012632802010276, guid: 3346526f3046f424196615241a307104, type: 3}
propertyPath: m_LocalPosition.x
- value: -40.32
+ value: -34.03
objectReference: {fileID: 0}
- target: {fileID: 6078012632802010276, guid: 3346526f3046f424196615241a307104, type: 3}
propertyPath: m_LocalPosition.y
- value: -3.06
+ value: 1.17
objectReference: {fileID: 0}
- target: {fileID: 6078012632802010276, guid: 3346526f3046f424196615241a307104, type: 3}
propertyPath: m_LocalPosition.z
@@ -442111,10 +442081,23 @@ PrefabInstance:
propertyPath: m_Layer
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 6865758097422051095, guid: 3346526f3046f424196615241a307104, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
- m_AddedComponents: []
+ m_AddedComponents:
+ - targetCorrespondingSourceObject: {fileID: 5835735262203788332, guid: 3346526f3046f424196615241a307104, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 733706658}
+ - targetCorrespondingSourceObject: {fileID: 5236930998804014616, guid: 3346526f3046f424196615241a307104, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 90258304}
+ - targetCorrespondingSourceObject: {fileID: 5236930998804014616, guid: 3346526f3046f424196615241a307104, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 90258303}
m_SourcePrefab: {fileID: 100100000, guid: 3346526f3046f424196615241a307104, type: 3}
--- !u!1001 &3978117984697153445
PrefabInstance:
@@ -442124,33 +442107,49 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- - target: {fileID: 666692440329091063, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
- propertyPath: m_LocalPosition.x
- value: -6.86
+ - target: {fileID: 519585874127847016, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
+ propertyPath: isOneTime
+ value: 1
objectReference: {fileID: 0}
- - target: {fileID: 666692440329091063, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
- propertyPath: m_LocalPosition.y
- value: -6.98
+ - target: {fileID: 1638886621542193701, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
+ propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+ value: 2
objectReference: {fileID: 0}
- target: {fileID: 1638886621542193701, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 538228069}
- - target: {fileID: 1809639087387590989, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
- propertyPath: m_IsActive
- value: 0
+ - target: {fileID: 1638886621542193701, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
+ propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+ value: GotoSpot
objectReference: {fileID: 0}
- - target: {fileID: 3169137887822749614, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
- propertyPath: stepData
+ - target: {fileID: 1638886621542193701, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
+ propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
+ value: AnneLiseBehaviour, AppleHillsScripts
+ objectReference: {fileID: 0}
+ - target: {fileID: 1638886621542193701, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
+ propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgument
value:
- objectReference: {fileID: 11400000, guid: 28848561ff31fe24ea9f8590dee0bf8f, type: 2}
+ objectReference: {fileID: 1175998461}
+ - target: {fileID: 1638886621542193701, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
+ propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
+ value: UnityEngine.GameObject, UnityEngine
+ objectReference: {fileID: 0}
+ - target: {fileID: 6458149385295467297, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 6.86
+ objectReference: {fileID: 0}
+ - target: {fileID: 6458149385295467297, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 1.01
+ objectReference: {fileID: 0}
- target: {fileID: 6583016841553003224, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
propertyPath: m_LocalPosition.x
- value: 13.17
+ value: 10.58
objectReference: {fileID: 0}
- target: {fileID: 6583016841553003224, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
propertyPath: m_LocalPosition.y
- value: 26.6
+ value: 27.82
objectReference: {fileID: 0}
- target: {fileID: 6583016841553003224, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
propertyPath: m_LocalPosition.z
@@ -442184,10 +442183,26 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 6753907982373584253, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -14.05
+ objectReference: {fileID: 0}
+ - target: {fileID: 6753907982373584253, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -3.74
+ objectReference: {fileID: 0}
- target: {fileID: 7145022056631397938, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
propertyPath: m_Name
value: LureSpotC
objectReference: {fileID: 0}
+ - target: {fileID: 8370367816617117734, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
+ propertyPath: luredBird
+ value:
+ objectReference: {fileID: 278791374}
+ - target: {fileID: 8370367816617117734, guid: df01157608cce6447b7ccde0bfa290e1, type: 3}
+ propertyPath: annaLiseSpot
+ value:
+ objectReference: {fileID: 260961018}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -442260,11 +442275,11 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 3238893659345357084, guid: 65ec1c071829bf649a3393368237ad7f, type: 3}
propertyPath: m_LocalPosition.x
- value: 3.4
+ value: -5.08
objectReference: {fileID: 0}
- target: {fileID: 3238893659345357084, guid: 65ec1c071829bf649a3393368237ad7f, type: 3}
propertyPath: m_LocalPosition.y
- value: 34.02
+ value: 30.519999
objectReference: {fileID: 0}
- target: {fileID: 3238893659345357084, guid: 65ec1c071829bf649a3393368237ad7f, type: 3}
propertyPath: m_LocalPosition.z
@@ -442795,22 +442810,61 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 2706936531024020228, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3}
+ propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.size
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2706936531024020228, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3}
+ propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+ value: 2
+ objectReference: {fileID: 0}
- target: {fileID: 2706936531024020228, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3}
propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 538228069}
+ - target: {fileID: 2706936531024020228, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3}
+ propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 2706936531024020228, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3}
+ propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+ value: GotoSpot
+ objectReference: {fileID: 0}
+ - target: {fileID: 2706936531024020228, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3}
+ propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
+ value: AnneLiseBehaviour, AppleHillsScripts
+ objectReference: {fileID: 0}
+ - target: {fileID: 2706936531024020228, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3}
+ propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgument
+ value:
+ objectReference: {fileID: 568523011}
+ - target: {fileID: 2706936531024020228, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3}
+ propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
+ value: UnityEngine.GameObject, UnityEngine
+ objectReference: {fileID: 0}
- target: {fileID: 3487003259787903584, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3}
propertyPath: playerToPlaceDistance
value: 30
objectReference: {fileID: 0}
+ - target: {fileID: 5475802662781903683, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3}
+ propertyPath: m_IsTrigger
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 7249528695393012044, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3}
propertyPath: m_Name
value: LureSpotA
objectReference: {fileID: 0}
+ - target: {fileID: 8818689886719637838, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3}
+ propertyPath: isOneTime
+ value: 1
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
- m_AddedComponents: []
+ m_AddedComponents:
+ - targetCorrespondingSourceObject: {fileID: 7249528695393012044, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 568523019}
m_SourcePrefab: {fileID: 100100000, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3}
--- !u!1660057539 &9223372036854775807
SceneRoots:
@@ -442851,7 +442905,6 @@ SceneRoots:
- {fileID: 8013274907828598643}
- {fileID: 3978117984697153445}
- {fileID: 3708074769586677211}
- - {fileID: 815620523195828801}
- {fileID: 5061531048637107478}
- {fileID: 322941695315393326}
- {fileID: 28205340}
diff --git a/Assets/Scripts/DamianExperiments/AnneLiseBehaviour.cs b/Assets/Scripts/DamianExperiments/AnneLiseBehaviour.cs
index 956ae9cb..6aefb784 100644
--- a/Assets/Scripts/DamianExperiments/AnneLiseBehaviour.cs
+++ b/Assets/Scripts/DamianExperiments/AnneLiseBehaviour.cs
@@ -1,5 +1,6 @@
using UnityEngine;
using System;
+using System.Collections;
using Pathfinding;
public class AnneLiseBehaviour : MonoBehaviour
@@ -8,9 +9,11 @@ public class AnneLiseBehaviour : MonoBehaviour
private Animator animator;
private AIPath aiPath;
private bool hasArrived = false;
- private GameObject currentLureSpot;
+ private LureSpot currentLureSpot;
private SpriteRenderer spriteRenderer; // Cached reference
private bool allowFacingByVelocity = true; // New flag
+ private Coroutine walkingCoroutine;
+ private bool annaLiseIsReady = false; // Flag to know if Anna Lise is ready to take the picture
private void Awake()
{
@@ -20,71 +23,118 @@ public class AnneLiseBehaviour : MonoBehaviour
if (aiPath != null)
{
aiPath.maxSpeed = moveSpeed;
+ aiPath.OnTargetReachedEvent += HandleArriveAtSpot;
}
}
+ private void OnDestroy()
+ {
+ if (aiPath != null)
+ {
+ aiPath.OnTargetReachedEvent -= HandleArriveAtSpot;
+ }
+ }
+
+ public void TeleportJustOutOfView(Camera cam, float offset = 2f)
+ {
+ if (aiPath == null || cam == null || currentLureSpot == null || currentLureSpot.annaLiseSpot == null) return;
+
+ // Calculate direction from the target spot to Anna Lise's current position
+ Vector3 from = currentLureSpot.annaLiseSpot.transform.position;
+ Vector3 to = transform.position;
+ Vector3 direction = (to - from).normalized;
+
+ // Project the target spot to screen space
+ Vector3 targetScreen = cam.WorldToScreenPoint(from);
+
+ // Find the screen edge in the direction
+ Vector2 dir2D = new Vector2(direction.x, direction.y);
+ if (dir2D == Vector2.zero) dir2D = Vector2.right; // fallback
+ dir2D.Normalize();
+
+ // Calculate intersection with screen bounds
+ float tX = dir2D.x > 0 ? (Screen.width - targetScreen.x) / dir2D.x : (0 - targetScreen.x) / dir2D.x;
+ float tY = dir2D.y > 0 ? (Screen.height - targetScreen.y) / dir2D.y : (0 - targetScreen.y) / dir2D.y;
+ float t = Mathf.Min(Mathf.Abs(tX), Mathf.Abs(tY));
+ Vector2 edgeScreen = new Vector2(targetScreen.x, targetScreen.y) + dir2D * t;
+ edgeScreen += dir2D * offset; // Move outside the screen by offset
+
+ // Convert back to world position
+ Vector3 teleportWorld = cam.ScreenToWorldPoint(new Vector3(edgeScreen.x, edgeScreen.y, cam.WorldToScreenPoint(from).z));
+ teleportWorld.z = transform.position.z; // Keep original Z
+
+ aiPath.Teleport(teleportWorld, true);
+ }
+
public void GotoSpot(GameObject lurespot)
{
+ currentLureSpot = lurespot.GetComponent();
+ // Teleport Anna Lise just out of view before moving
+ TeleportJustOutOfView(Camera.main, 2f);
+
if (aiPath == null) return;
- aiPath.destination = lurespot.transform.position;
+ aiPath.destination = currentLureSpot.annaLiseSpot.transform.position;
aiPath.canMove = true;
aiPath.SearchPath();
hasArrived = false;
- allowFacingByVelocity = true; // Enable facing by velocity when moving
- currentLureSpot = lurespot;
+ allowFacingByVelocity = true;
+ if (walkingCoroutine != null)
+ {
+ StopCoroutine(walkingCoroutine);
+ }
+ walkingCoroutine = StartCoroutine(UpdateSpeedWhenWalking());
}
- private void Update()
+ private IEnumerator UpdateSpeedWhenWalking()
{
- if (aiPath == null || animator == null) return;
-
- float currentSpeed = aiPath.velocity.magnitude;
- animator.SetFloat("speed", currentSpeed);
-
- // Only allow facing by velocity if not arrived
- if (allowFacingByVelocity && currentSpeed > 0.01f && spriteRenderer != null)
+ while (!hasArrived && aiPath != null && animator != null)
{
- Vector3 velocity = aiPath.velocity;
- if (velocity.x != 0)
+ float currentSpeed = aiPath.velocity.magnitude;
+ animator.SetFloat("speed", currentSpeed);
+
+ // Only allow facing by velocity if not arrived
+ if (allowFacingByVelocity && currentSpeed > 0.01f && spriteRenderer != null)
{
- 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;
- }
- }
-
- 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")
+ Vector3 velocity = aiPath.velocity;
+ if (velocity.x != 0)
{
- birdSpawned = child.gameObject;
- break;
+ Vector3 scale = spriteRenderer.transform.localScale;
+ scale.x = Mathf.Abs(scale.x) * (velocity.x > 0 ? 1 : -1);
+ spriteRenderer.transform.localScale = scale;
}
}
- if (birdSpawned != null)
+ yield return null;
+ }
+ }
+
+ private void HandleArriveAtSpot()
+ {
+ if (hasArrived) return;
+ hasArrived = true;
+ allowFacingByVelocity = false; // Disable facing by velocity after arrival
+ aiPath.canMove = false;
+ if (walkingCoroutine != null)
+ {
+ StopCoroutine(walkingCoroutine);
+ walkingCoroutine = null;
+ }
+ // Face the "luredBird" of the current lurespot, if available
+ if (currentLureSpot != null)
+ {
+ if (currentLureSpot.luredBird != null)
{
- FaceTarget(birdSpawned);
+ FaceTarget(currentLureSpot.luredBird);
+ annaLiseIsReady = true; // Now Anna Lise is ready to take the picture
}
}
- if (animator != null)
+ if (animator != null && currentLureSpot.name != "LureSpotB")// Horrible way to not take the photo if its Wolter
+ {
animator.SetTrigger("TakePhoto");
+ annaLiseIsReady = false; // Reset the flag after taking the photo
+ }
+ animator.SetFloat("speed", 0);
}
public void FaceTarget(GameObject target)
@@ -100,4 +150,18 @@ public class AnneLiseBehaviour : MonoBehaviour
spriteRenderer.transform.localScale = scale;
}
}
+ public void TrafalgarTouchedAnnaLise()
+ {
+ if (annaLiseIsReady == true && currentLureSpot.name == "LureSpotB") // Only allow if Anna Lise is ready and it's the correct lure spot
+ {
+ // Trigger the photo taken animation
+ if (animator != null)
+ {
+ currentLureSpot.GetComponentInChildren().BirdReveal();
+ animator.SetTrigger("TakePhoto");
+ }
+ annaLiseIsReady = false; // Reset the flag after taking the photo
+ }
+ Debug.Log("Trafalgar touched Anna Lise");
+ }
}
diff --git a/Assets/Scripts/DamianExperiments/LureSpot.cs b/Assets/Scripts/DamianExperiments/LureSpot.cs
new file mode 100644
index 00000000..4e305601
--- /dev/null
+++ b/Assets/Scripts/DamianExperiments/LureSpot.cs
@@ -0,0 +1,18 @@
+using UnityEngine;
+
+public class LureSpot : MonoBehaviour
+{
+ [SerializeField] public GameObject luredBird;
+ [SerializeField] public GameObject annaLiseSpot;
+ // Start is called once before the first execution of Update after the MonoBehaviour is created
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+}
diff --git a/Assets/Scripts/DamianExperiments/LureSpot.cs.meta b/Assets/Scripts/DamianExperiments/LureSpot.cs.meta
new file mode 100644
index 00000000..4e7577ae
--- /dev/null
+++ b/Assets/Scripts/DamianExperiments/LureSpot.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 78f015ca3cba1d54382afba790601471
\ No newline at end of file