diff --git a/Assets/Art/Animations/Characters/Annelise_Camera/Annelise_Camera.controller b/Assets/Art/Animations/Characters/Annelise_Camera/Annelise_Camera.controller index 7feaf9a0..0d7696b8 100644 --- a/Assets/Art/Animations/Characters/Annelise_Camera/Annelise_Camera.controller +++ b/Assets/Art/Animations/Characters/Annelise_Camera/Annelise_Camera.controller @@ -267,13 +267,13 @@ AnimatorStateMachine: m_Position: {x: 40, y: 270, z: 0} - serializedVersion: 1 m_State: {fileID: -209390523250253645} - m_Position: {x: 50, y: 420, z: 0} + m_Position: {x: 40, y: 540, z: 0} - serializedVersion: 1 m_State: {fileID: -4318263607971929773} - m_Position: {x: 330, y: 340, z: 0} + m_Position: {x: 190, y: 410, z: 0} - serializedVersion: 1 m_State: {fileID: 8246786244015671829} - m_Position: {x: -240, y: 390, z: 0} + m_Position: {x: -100, y: 410, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/Art/Animations/Characters/Gardener/GardenerController.controller b/Assets/Art/Animations/Characters/Gardener/GardenerController.controller index 2e127921..dcbefc23 100644 --- a/Assets/Art/Animations/Characters/Gardener/GardenerController.controller +++ b/Assets/Art/Animations/Characters/Gardener/GardenerController.controller @@ -45,7 +45,7 @@ AnimatorStateMachine: m_Position: {x: -120, y: 440, z: 0} - serializedVersion: 1 m_State: {fileID: -4345756845471828943} - m_Position: {x: 200, y: 420, z: 0} + m_Position: {x: 230, y: 440, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -68,6 +68,7 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: 2668893367386582248} + - {fileID: 5345143784295595667} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -95,6 +96,7 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: -2076711753281386268} + - {fileID: 3331597516917425559} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -250,3 +252,53 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &3331597516917425559 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: IsScared? + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -4517652540075123250} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.16666669 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &5345143784295595667 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: IsScared? + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -4345756845471828943} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.16666669 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Assets/Prefabs/Environment/Placeholders/LureSpotA.prefab b/Assets/Prefabs/Environment/Placeholders/LureSpotA.prefab index b7942450..84203e72 100644 --- a/Assets/Prefabs/Environment/Placeholders/LureSpotA.prefab +++ b/Assets/Prefabs/Environment/Placeholders/LureSpotA.prefab @@ -232,6 +232,7 @@ Transform: m_ConstrainProportionsScale: 1 m_Children: - {fileID: 7442421452951837692} + - {fileID: 2784061204862661225} - {fileID: 5375394469162727687} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -443,6 +444,37 @@ MonoBehaviour: m_EditorClassIdentifier: playerToPlaceDistance: 40 birdEyes: {fileID: 7602419655779381936} +--- !u!1 &7675352645851726746 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2784061204862661225} + m_Layer: 0 + m_Name: AnneLisePositionA + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2784061204862661225 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7675352645851726746} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -7.88, y: 0.78, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2045549771447434109} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &7700829900874995671 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Levels/Quarry.unity b/Assets/Scenes/Levels/Quarry.unity index 5016ac9e..983435f8 100644 --- a/Assets/Scenes/Levels/Quarry.unity +++ b/Assets/Scenes/Levels/Quarry.unity @@ -430467,6 +430467,142 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} +--- !u!1 &538228064 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5172497182660285677, 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_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: 1 + gravity: {x: 0, y: 0, z: 0} + groundMask: + serializedVersion: 2 + m_Bits: 4294967295 + centerOffsetCompatibility: NaN + repathRateCompatibility: NaN + canSearchCompability: 0 + orientation: 0 + enableRotation: 1 + autoRepath: + mode: 2 + interval: 0.5 + sensitivity: 10 + maximumInterval: 2 + visualizeSensitivity: 0 + targetCompatibility: {fileID: 0} + maxAcceleration: -2.5 + 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 &538228072 +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: 9e0b24e2f2ad54cc09940c320ed3cf4b, type: 3} + m_Name: + m_EditorClassIdentifier: + defaultState: {fileID: 1334290364} + 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 &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!1 &544198592 GameObject: m_ObjectHideFlags: 0 @@ -434273,11 +434409,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: [] @@ -436571,13 +436707,25 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 3843529282689729675, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} + propertyPath: m_LocalScale.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3843529282689729675, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} + propertyPath: m_LocalScale.y + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3843529282689729675, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} + propertyPath: m_LocalScale.z + value: 0.75 + objectReference: {fileID: 0} - target: {fileID: 3843529282689729675, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} propertyPath: m_LocalPosition.x - value: -12.53 + value: -8.17 objectReference: {fileID: 0} - target: {fileID: 3843529282689729675, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} propertyPath: m_LocalPosition.y - value: -22.63 + value: -20.82 objectReference: {fileID: 0} - target: {fileID: 3843529282689729675, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} propertyPath: m_LocalPosition.z @@ -436621,6 +436769,11 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ae9b91dd59f66a348a8c888106aa0815, type: 3} +--- !u!1 &1334290364 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1501762630858354458, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3} + m_PrefabInstance: {fileID: 2117822310} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1347210919 PrefabInstance: m_ObjectHideFlags: 0 @@ -436821,6 +436974,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7852204877518954380, guid: 8ac0210dbf9d7754e9526d6d5c214f49, type: 3} + propertyPath: maxSpeed + value: 30 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -440765,6 +440922,38 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 183513579} m_Modifications: + - target: {fileID: 1597866798502552092, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} + propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1597866798502552092, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} + propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1597866798502552092, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} + propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 538228069} + - target: {fileID: 1597866798502552092, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} + propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1597866798502552092, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} + propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: GotoSpot + objectReference: {fileID: 0} + - target: {fileID: 1597866798502552092, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} + propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: AnneLiseBehaviour, AppleHillsScripts + objectReference: {fileID: 0} + - target: {fileID: 1597866798502552092, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} + propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgument + value: + objectReference: {fileID: 8013274907828598644} + - target: {fileID: 1597866798502552092, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} + propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.GameObject, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 1784002662241348359, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} propertyPath: m_Name value: FootballBird @@ -441605,6 +441794,18 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1501762630858354458, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3933955841584214629, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3} + propertyPath: m_Enabled + value: 0 + 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 @@ -441661,10 +441862,26 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 7870441803139401704, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + 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: 538228072} m_SourcePrefab: {fileID: 100100000, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3} --- !u!1001 &2125265433 PrefabInstance: @@ -442929,6 +443146,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3487003259787903584, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: playerToPlaceDistance + value: 35 + objectReference: {fileID: 0} - target: {fileID: 7249528695393012044, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} propertyPath: m_Name value: LureSpotA @@ -442945,6 +443166,11 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 885908789} m_SourcePrefab: {fileID: 100100000, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} +--- !u!1 &8013274907828598644 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7675352645851726746, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + m_PrefabInstance: {fileID: 8013274907828598643} + m_PrefabAsset: {fileID: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/DamianExperiments/AnneLiseBehaviour.cs b/Assets/Scripts/DamianExperiments/AnneLiseBehaviour.cs index 1538a7cc..0593d008 100644 --- a/Assets/Scripts/DamianExperiments/AnneLiseBehaviour.cs +++ b/Assets/Scripts/DamianExperiments/AnneLiseBehaviour.cs @@ -1,16 +1,39 @@ using UnityEngine; +using System.Collections; +using System; public class AnneLiseBehaviour : MonoBehaviour { - // Start is called once before the first execution of Update after the MonoBehaviour is created - void Start() - { - - } + // Movement speed of AnneLise + [SerializeField] public float moveSpeed; + // Coroutine reference to manage movement + private Coroutine moveCoroutine; + // Event triggered when AnneLise arrives at the target spot + public event Action OnArrivedAtSpot; - // Update is called once per frame - void Update() + // Method to initiate movement to the specified lure spot + public void GotoSpot(GameObject lurespot) { - + if (moveCoroutine != null) + StopCoroutine(moveCoroutine); + + moveCoroutine = StartCoroutine(MoveToPosition(lurespot.transform.position)); + } + // Coroutine to move AnneLise to the target position + private IEnumerator MoveToPosition(Vector3 targetPosition) + { + while (Vector3.Distance(transform.position, targetPosition) > 0.05f) + { + transform.position = Vector3.MoveTowards( + transform.position, + targetPosition, + moveSpeed * Time.deltaTime + ); + yield return null; + } + transform.position = targetPosition; // Snap to exact position at the end + moveCoroutine = null; + // Trigger the arrival event + OnArrivedAtSpot?.Invoke(); } }