diff --git a/Assets/Art/Animations/Characters/Annelise_Camera/Annelise_Camera.controller b/Assets/Art/Animations/Characters/Annelise_Camera/Annelise_Camera.controller index 0d7696b8..4586d3d9 100644 --- a/Assets/Art/Animations/Characters/Annelise_Camera/Annelise_Camera.controller +++ b/Assets/Art/Animations/Characters/Annelise_Camera/Annelise_Camera.controller @@ -11,6 +11,9 @@ AnimatorStateTransition: - m_ConditionMode: 1 m_ConditionEvent: IsTalking m_EventTreshold: 0 + - m_ConditionMode: 4 + m_ConditionEvent: speed + m_EventTreshold: 0.1 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 8246786244015671829} m_Solo: 0 @@ -58,7 +61,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: ANIM_Annelise_Camera_TakePhoto - m_Speed: 1 + m_Speed: 5 m_CycleOffset: 0 m_Transitions: - {fileID: 72347323649537359} @@ -74,7 +77,7 @@ AnimatorState: m_TimeParameterActive: 0 m_Motion: {fileID: 7400000, guid: 10efbd38167aad04298e975a0f5a5b03, type: 2} m_Tag: - m_SpeedParameter: + m_SpeedParameter: speed m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: @@ -90,8 +93,8 @@ AnimatorStateTransition: m_ConditionEvent: IsTalking m_EventTreshold: 0 - m_ConditionMode: 3 - m_ConditionEvent: Speed - m_EventTreshold: 0 + m_ConditionEvent: speed + m_EventTreshold: 0.01 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -209390523250253645} m_Solo: 0 @@ -144,12 +147,6 @@ AnimatorController: m_Name: Annelise_Camera serializedVersion: 5 m_AnimatorParameters: - - m_Name: Speed - m_Type: 1 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 9100000} - m_Name: TakePhoto m_Type: 9 m_DefaultFloat: 0 @@ -162,6 +159,12 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} + - m_Name: speed + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -184,8 +187,8 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 3 - m_ConditionEvent: Speed - m_EventTreshold: 0 + m_ConditionEvent: speed + m_EventTreshold: 0.1 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -209390523250253645} m_Solo: 0 @@ -212,8 +215,8 @@ AnimatorStateTransition: m_ConditionEvent: IsTalking m_EventTreshold: 0 - m_ConditionMode: 4 - m_ConditionEvent: Speed - m_EventTreshold: 0.1 + m_ConditionEvent: speed + m_EventTreshold: 0.01 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 6759965249582913303} m_Solo: 0 @@ -293,8 +296,8 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 3 - m_ConditionEvent: Speed - m_EventTreshold: 0 + m_ConditionEvent: speed + m_EventTreshold: 0.1 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -209390523250253645} m_Solo: 0 @@ -318,8 +321,8 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 4 - m_ConditionEvent: Speed - m_EventTreshold: 0.1 + m_ConditionEvent: speed + m_EventTreshold: 0.01 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 6759965249582913303} m_Solo: 0 @@ -425,8 +428,8 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 4 - m_ConditionEvent: Speed - m_EventTreshold: 0.1 + m_ConditionEvent: speed + m_EventTreshold: 0.01 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 6759965249582913303} m_Solo: 0 diff --git a/Assets/Prefabs/Environment/Placeholders/LureSpotA.prefab b/Assets/Prefabs/Environment/Placeholders/LureSpotA.prefab index 84203e72..cdebed80 100644 --- a/Assets/Prefabs/Environment/Placeholders/LureSpotA.prefab +++ b/Assets/Prefabs/Environment/Placeholders/LureSpotA.prefab @@ -87,116 +87,6 @@ SpriteRenderer: m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &3617455498829757156 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4388395494483065101} - - component: {fileID: 4237100461469772044} - - component: {fileID: 2472695135799577718} - m_Layer: 0 - m_Name: FootballBird - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4388395494483065101 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3617455498829757156} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.8479085, y: -0.13594438, z: 0} - m_LocalScale: {x: 0.5, y: 0.50000006, z: 0.50000006} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1924342418841580} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &4237100461469772044 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3617455498829757156} - 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 ---- !u!95 &2472695135799577718 -Animator: - serializedVersion: 7 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3617455498829757156} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 0} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_AnimatePhysics: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 --- !u!1 &7249528695393012044 GameObject: m_ObjectHideFlags: 0 @@ -211,6 +101,7 @@ GameObject: - component: {fileID: 8818689886719637838} - component: {fileID: 8578055200319571631} - component: {fileID: 3487003259787903584} + - component: {fileID: 2277261512137882881} m_Layer: 10 m_Name: LureSpotA m_TagString: Untagged @@ -442,8 +333,21 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2226aecbed4b1f143a5a5c5be4236957, type: 3} m_Name: m_EditorClassIdentifier: - playerToPlaceDistance: 40 + playerToPlaceDistance: 35 birdEyes: {fileID: 7602419655779381936} +--- !u!114 &2277261512137882881 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7249528695393012044} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1101f6c4eb04423b89dc78dc7c9f1aae, type: 3} + m_Name: + m_EditorClassIdentifier: + stepData: {fileID: 11400000, guid: 0fb0ab2b55d93a24685e9f6651adcf30, type: 2} --- !u!1 &7675352645851726746 GameObject: m_ObjectHideFlags: 0 @@ -475,6 +379,96 @@ Transform: m_Children: [] m_Father: {fileID: 2045549771447434109} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &3727919522638045464 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1924342418841580} + 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_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: 7675352645851726746} + - 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 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} + propertyPath: m_LocalPosition.x + value: 0.15 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} + propertyPath: m_LocalPosition.y + value: -0.4 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} +--- !u!4 &6063784346986324055 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7465517589433942351, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} + m_PrefabInstance: {fileID: 3727919522638045464} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7700829900874995671 PrefabInstance: m_ObjectHideFlags: 0 @@ -561,11 +555,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7698905571408300091, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} propertyPath: m_LocalScale.y - value: 0.99999994 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7698905571408300091, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} propertyPath: m_LocalScale.z - value: 0.99999994 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7698905571408300091, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} propertyPath: m_LocalPosition.x @@ -581,7 +575,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8828658103663197825, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 5210033153524231666, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} @@ -590,7 +584,7 @@ PrefabInstance: m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 7698905571408300091, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} insertIndex: -1 - addedObject: {fileID: 4388395494483065101} + addedObject: {fileID: 6063784346986324055} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} --- !u!4 &1924342418841580 stripped diff --git a/Assets/Prefabs/Environment/Placeholders/LuringSpotC.prefab b/Assets/Prefabs/Environment/Placeholders/LuringSpotC.prefab index b375f50d..2348e046 100644 --- a/Assets/Prefabs/Environment/Placeholders/LuringSpotC.prefab +++ b/Assets/Prefabs/Environment/Placeholders/LuringSpotC.prefab @@ -25,8 +25,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 725521450222831012} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.667, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.09, y: 0.54, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -109,7 +109,7 @@ Transform: m_GameObject: {fileID: 4316370833098727305} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.468, y: 1.315, z: 0} + m_LocalPosition: {x: 0.53, y: 1.22, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 0 m_Children: [] @@ -183,6 +183,7 @@ GameObject: - component: {fileID: 1857323601952658682} - component: {fileID: 519585874127847016} - component: {fileID: 106497079666291966} + - component: {fileID: 6535246856440349519} - component: {fileID: 3169137887822749614} m_Layer: 10 m_Name: LureSpotC @@ -200,12 +201,14 @@ Transform: m_GameObject: {fileID: 7145022056631397938} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 13.14, y: 26.67, z: 0} + m_LocalPosition: {x: 13.17, y: 26.6, z: 0} m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 1 m_Children: - {fileID: 7964773102256504836} - {fileID: 1828079450404796388} + - {fileID: 6458149385295467297} + - {fileID: 4890763895574548764} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &5015123355472106337 @@ -257,12 +260,12 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 5.75, y: 3.38} + m_Size: {x: 5.75, y: 2.78} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 - m_SpriteSortPoint: 1 + m_SpriteSortPoint: 0 --- !u!61 &1857323601952658682 BoxCollider2D: m_ObjectHideFlags: 0 @@ -297,17 +300,17 @@ BoxCollider2D: m_UsedByEffector: 0 m_CompositeOperation: 0 m_CompositeOrder: 0 - m_Offset: {x: 0, y: 0.18595695} + 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: 5.75, y: 3.38} - newSize: {x: 5.75, y: 3.38} + newSize: {x: 5.75, y: 2.78} adaptiveTilingThreshold: 0.5 drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 - m_Size: {x: 5.75, y: 2.8364315} + m_Size: {x: 5.75, y: 2.78} m_EdgeRadius: 0 --- !u!114 &519585874127847016 MonoBehaviour: @@ -355,17 +358,67 @@ MonoBehaviour: m_Calls: [] onItemSlotRemoved: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 6973682693496150699} + m_TargetAssemblyTypeName: BirdEyesBehavior, Assembly-CSharp + 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: 6973682693496150699} + m_TargetAssemblyTypeName: BirdEyesBehavior, Assembly-CSharp + 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: 6973682693496150699} + m_TargetAssemblyTypeName: BirdEyesBehavior, Assembly-CSharp + 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: [] slottedItemRenderer: {fileID: 3806274462998212361} +--- !u!114 &6535246856440349519 +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: 2226aecbed4b1f143a5a5c5be4236957, type: 3} + m_Name: + m_EditorClassIdentifier: + playerToPlaceDistance: 30 + birdEyes: {fileID: 6973682693496150699} --- !u!114 &3169137887822749614 MonoBehaviour: m_ObjectHideFlags: 0 @@ -378,4 +431,260 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1101f6c4eb04423b89dc78dc7c9f1aae, type: 3} m_Name: m_EditorClassIdentifier: - stepData: {fileID: 11400000, guid: 28848561ff31fe24ea9f8590dee0bf8f, type: 2} + stepData: {fileID: 11400000, guid: 0fb0ab2b55d93a24685e9f6651adcf30, type: 2} +--- !u!1 &7627197106378853261 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6458149385295467297} + m_Layer: 0 + m_Name: AnneLisePositionC + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6458149385295467297 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7627197106378853261} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -5.44, y: 0.96, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6583016841553003224} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &41304055486298169 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + 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_Arguments.m_ObjectArgument + value: + objectReference: {fileID: 7627197106378853261} + - target: {fileID: 1784002662241348359, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} + propertyPath: m_Name + value: HammerBird + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} + propertyPath: m_LocalPosition.x + value: 1.25 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} + propertyPath: m_LocalPosition.y + value: 0.57 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} +--- !u!4 &7424295450283293046 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} + m_PrefabInstance: {fileID: 41304055486298169} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7176645356469469132 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6583016841553003224} + m_Modifications: + - target: {fileID: 1370564349707122423, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_Name + value: BirdEyesC + objectReference: {fileID: 0} + - target: {fileID: 2326086342663433936, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2326086342663433936, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2326086342663433936, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2326086342663433936, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_LocalPosition.x + value: 6.25 + objectReference: {fileID: 0} + - target: {fileID: 2326086342663433936, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_LocalPosition.y + value: 8.87 + 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: 2326086342663433936, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3013218424693156287, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_FlipX + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3013218424693156287, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_SortingOrder + value: 2 + 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: -11.08 + objectReference: {fileID: 0} + - target: {fileID: 4477179922705334961, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_LocalPosition.y + value: -1.33 + objectReference: {fileID: 0} + - target: {fileID: 4477179922705334961, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_LocalRotation.w + value: 0.925592 + objectReference: {fileID: 0} + - target: {fileID: 4477179922705334961, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_LocalRotation.z + value: -0.3785226 + objectReference: {fileID: 0} + - target: {fileID: 4477179922705334961, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -44.484 + objectReference: {fileID: 0} + - target: {fileID: 7698905571408300091, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7698905571408300091, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7698905571408300091, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7698905571408300091, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_LocalPosition.x + value: -6.89 + objectReference: {fileID: 0} + - target: {fileID: 7698905571408300091, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_LocalPosition.y + value: -7.05 + objectReference: {fileID: 0} + - target: {fileID: 7698905571408300091, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8828658103663197825, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 5210033153524231666, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + - {fileID: 4408373410605328204, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7698905571408300091, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + insertIndex: -1 + addedObject: {fileID: 7424295450283293046} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} +--- !u!4 &666692440329091063 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7698905571408300091, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + m_PrefabInstance: {fileID: 7176645356469469132} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4890763895574548764 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2326086342663433936, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + m_PrefabInstance: {fileID: 7176645356469469132} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6973682693496150699 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 243176356944356711, guid: 185f4e1548ec9754893c0a17f2207c44, type: 3} + m_PrefabInstance: {fileID: 7176645356469469132} + 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: diff --git a/Assets/Prefabs/Items/PrefabsPLACEHOLDER/HammerBird.prefab b/Assets/Prefabs/Items/PrefabsPLACEHOLDER/HammerBird.prefab index 9de7b161..d8459eaf 100644 --- a/Assets/Prefabs/Items/PrefabsPLACEHOLDER/HammerBird.prefab +++ b/Assets/Prefabs/Items/PrefabsPLACEHOLDER/HammerBird.prefab @@ -14,23 +14,23 @@ PrefabInstance: objectReference: {fileID: 11400000, guid: ab57c8237aac144439a18d69f56d36c6, type: 2} - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} propertyPath: m_LocalScale.x - value: 1.5 + value: 0.8000001 objectReference: {fileID: 0} - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} propertyPath: m_LocalScale.y - value: 1.5 + value: 0.8000001 objectReference: {fileID: 0} - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} propertyPath: m_LocalScale.z - value: 0.5 + value: 0.26666668 objectReference: {fileID: 0} - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} propertyPath: m_LocalPosition.x - value: 54.83 + value: 1.25 objectReference: {fileID: 0} - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} propertyPath: m_LocalPosition.y - value: -35.53 + value: 0.57 objectReference: {fileID: 0} - target: {fileID: 1730119453103664125, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} propertyPath: m_LocalPosition.z @@ -124,10 +124,38 @@ PrefabInstance: propertyPath: m_WasSpriteAssigned value: 1 objectReference: {fileID: 0} + - target: {fileID: 7616859841301711022, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: isOneTime + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7616859841301711022, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} propertyPath: characterToInteract value: 0 objectReference: {fileID: 0} + - target: {fileID: 7616859841301711022, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7616859841301711022, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7616859841301711022, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7616859841301711022, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: GotoSpot + objectReference: {fileID: 0} + - target: {fileID: 7616859841301711022, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: AnneLiseBehaviour, AppleHillsScripts + objectReference: {fileID: 0} + - target: {fileID: 7616859841301711022, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} + propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.GameObject, UnityEngine + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 592045584872845087, guid: bf4b9d7045397f946b2125b1ad4a3fbd, type: 3} m_RemovedGameObjects: [] diff --git a/Assets/Scenes/Levels/Quarry.unity b/Assets/Scenes/Levels/Quarry.unity index 983435f8..cac98b09 100644 --- a/Assets/Scenes/Levels/Quarry.unity +++ b/Assets/Scenes/Levels/Quarry.unity @@ -1271,11 +1271,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 166674237} m_PrefabAsset: {fileID: 0} ---- !u!4 &183513579 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1924342418841580, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - m_PrefabInstance: {fileID: 8013274907828598643} - m_PrefabAsset: {fileID: 0} --- !u!1001 &196802142 PrefabInstance: m_ObjectHideFlags: 0 @@ -428544,6 +428539,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 317696669} m_PrefabAsset: {fileID: 0} +--- !u!4 &332724605 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2523333015159032981, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} + m_PrefabInstance: {fileID: 3485393201986366005} + m_PrefabAsset: {fileID: 0} --- !u!1001 &357509430 PrefabInstance: m_ObjectHideFlags: 0 @@ -428614,11 +428614,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} m_PrefabInstance: {fileID: 357509430} m_PrefabAsset: {fileID: 0} ---- !u!4 &364850365 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7465517589433942351, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} - m_PrefabInstance: {fileID: 1985009703} - m_PrefabAsset: {fileID: 0} --- !u!1001 &365273989 PrefabInstance: m_ObjectHideFlags: 0 @@ -428928,6 +428923,37 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &384793595 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 384793596} + m_Layer: 10 + m_Name: AnnaLiseSpotSong + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &384793596 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + 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_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 332724605} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &404856605 PrefabInstance: m_ObjectHideFlags: 0 @@ -430020,179 +430046,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 498313310} m_PrefabAsset: {fileID: 0} ---- !u!1001 &498726572 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1924342418841580, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1924342418841580, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1924342418841580, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1020445172872290040, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_Name - value: SlottedItemC - objectReference: {fileID: 0} - - target: {fileID: 1178648129422731606, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2045549771447434109, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_LocalPosition.x - value: 13.17 - objectReference: {fileID: 0} - - target: {fileID: 2045549771447434109, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_LocalPosition.y - value: 26.6 - objectReference: {fileID: 0} - - target: {fileID: 2045549771447434109, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2045549771447434109, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2045549771447434109, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2045549771447434109, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2045549771447434109, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2045549771447434109, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2045549771447434109, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2045549771447434109, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4832307215058812520, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_FlipX - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4832307215058812520, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_SortingOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 5475802662781903683, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_SpriteTilingProperty.oldSize.y - value: 3.38 - objectReference: {fileID: 0} - - target: {fileID: 6124038515530437990, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_LocalPosition.x - value: -11.08 - objectReference: {fileID: 0} - - target: {fileID: 6124038515530437990, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_LocalPosition.y - value: -1.33 - objectReference: {fileID: 0} - - target: {fileID: 6124038515530437990, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_LocalRotation.w - value: 0.925592 - objectReference: {fileID: 0} - - target: {fileID: 6124038515530437990, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_LocalRotation.z - value: -0.3785226 - objectReference: {fileID: 0} - - target: {fileID: 6124038515530437990, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -44.484 - objectReference: {fileID: 0} - - target: {fileID: 6258593095132504700, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 3009302558630513478, guid: 3aefb78ee1b7f6e4685d0fff00e24e3d, type: 3} - - target: {fileID: 7249528695393012044, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_Name - value: LureSpotC - objectReference: {fileID: 0} - - target: {fileID: 7442421452951837692, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_LocalPosition.x - value: 0.53 - objectReference: {fileID: 0} - - target: {fileID: 7442421452951837692, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_LocalPosition.y - value: 1.22 - objectReference: {fileID: 0} - - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: itemData - value: - objectReference: {fileID: 11400000, guid: c68dea945fecbf44094359769db04f31, type: 2} - - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: onItemSlotRemoved.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 498726573} - - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 498726573} - - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: onItemSlotRemoved.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: NoItem - objectReference: {fileID: 0} - - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: CorrectItem - objectReference: {fileID: 0} - - target: {fileID: 8780874672293486880, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_Name - value: BirdEyesC - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: - - {fileID: 3617455498829757156, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 2045549771447434109, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - insertIndex: 0 - addedObject: {fileID: 1422870261} - - targetCorrespondingSourceObject: {fileID: 1924342418841580, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - insertIndex: -1 - addedObject: {fileID: 1810769815} - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} ---- !u!114 &498726573 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7602419655779381936, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - m_PrefabInstance: {fileID: 498726572} - 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 &498726574 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1924342418841580, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - m_PrefabInstance: {fileID: 498726572} - m_PrefabAsset: {fileID: 0} ---- !u!4 &498726575 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2045549771447434109, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - m_PrefabInstance: {fileID: 498726572} - m_PrefabAsset: {fileID: 0} --- !u!1001 &501860764 PrefabInstance: m_ObjectHideFlags: 0 @@ -430501,7 +430354,7 @@ MonoBehaviour: radius: 0.5 height: 2 canMove: 1 - maxSpeed: 1 + maxSpeed: 30 gravity: {x: 0, y: 0, z: 0} groundMask: serializedVersion: 2 @@ -430509,8 +430362,8 @@ MonoBehaviour: centerOffsetCompatibility: NaN repathRateCompatibility: NaN canSearchCompability: 0 - orientation: 0 - enableRotation: 1 + orientation: 1 + enableRotation: 0 autoRepath: mode: 2 interval: 0.5 @@ -430518,7 +430371,7 @@ MonoBehaviour: maximumInterval: 2 visualizeSensitivity: 0 targetCompatibility: {fileID: 0} - maxAcceleration: -2.5 + maxAcceleration: 1000 rotationSpeed: 360 slowdownDistance: 0.6 pickNextWaypointDist: 2 @@ -430555,42 +430408,6 @@ MonoBehaviour: 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 @@ -430603,6 +430420,28 @@ MonoBehaviour: 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 @@ -432478,24 +432317,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} m_PrefabInstance: {fileID: 862735499} m_PrefabAsset: {fileID: 0} ---- !u!1 &885908782 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7249528695393012044, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - m_PrefabInstance: {fileID: 8013274907828598643} - m_PrefabAsset: {fileID: 0} ---- !u!114 &885908789 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 885908782} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1101f6c4eb04423b89dc78dc7c9f1aae, type: 3} - m_Name: - m_EditorClassIdentifier: - stepData: {fileID: 11400000, guid: 0fb0ab2b55d93a24685e9f6651adcf30, type: 2} --- !u!1001 &886935940 PrefabInstance: m_ObjectHideFlags: 0 @@ -436769,11 +436590,6 @@ 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 @@ -437211,89 +437027,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} m_PrefabInstance: {fileID: 1718039814} m_PrefabAsset: {fileID: 0} ---- !u!1 &1422870260 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1422870261} - - component: {fileID: 1422870262} - m_Layer: 6 - m_Name: CollisionWithWorld - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1422870261 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1422870260} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.09, y: 0.54, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 498726575} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!60 &1422870262 -PolygonCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1422870260} - 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_Points: - m_Paths: - - - {x: 1.1843929, y: 1.2762203} - - {x: -0.08161932, y: 1.3230627} - - {x: -0.17280048, y: 0.4588033} - - {x: 1.0673996, y: 0.40602326} - m_UseDelaunayMesh: 0 --- !u!1001 &1430501396 PrefabInstance: m_ObjectHideFlags: 0 @@ -439798,80 +439531,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 1802938374} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1810769814 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 498726574} - m_Modifications: - - target: {fileID: 1784002662241348359, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} - propertyPath: m_Name - value: HammerBird - objectReference: {fileID: 0} - - target: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} - propertyPath: m_LocalScale.x - value: 0.8000001 - objectReference: {fileID: 0} - - target: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} - propertyPath: m_LocalScale.y - value: 0.8000001 - objectReference: {fileID: 0} - - target: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} - propertyPath: m_LocalScale.z - value: 0.26666668 - objectReference: {fileID: 0} - - target: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} - propertyPath: m_LocalPosition.x - value: 1.25 - objectReference: {fileID: 0} - - target: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} - propertyPath: m_LocalPosition.y - value: 0.57 - objectReference: {fileID: 0} - - target: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} ---- !u!4 &1810769815 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7465517589433942351, guid: e3d6494020df3a34f88a89f0ee9a3527, type: 3} - m_PrefabInstance: {fileID: 1810769814} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1821647537 PrefabInstance: m_ObjectHideFlags: 0 @@ -440914,95 +440573,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} m_PrefabInstance: {fileID: 1855590167} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1985009703 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - 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 - objectReference: {fileID: 0} - - target: {fileID: 7465517589433942351, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} - propertyPath: m_LocalPosition.x - value: 0.15 - objectReference: {fileID: 0} - - target: {fileID: 7465517589433942351, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} - propertyPath: m_LocalPosition.y - value: -0.4 - objectReference: {fileID: 0} - - target: {fileID: 7465517589433942351, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7465517589433942351, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7465517589433942351, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7465517589433942351, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7465517589433942351, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7465517589433942351, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7465517589433942351, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7465517589433942351, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 9b2d5618c8cc81743b982c6cc8d95871, type: 3} --- !u!1001 &1990424113 PrefabInstance: m_ObjectHideFlags: 0 @@ -441794,14 +441364,30 @@ 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 @@ -441814,6 +441400,22 @@ PrefabInstance: 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 @@ -441862,6 +441464,10 @@ 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} m_RemovedGameObjects: [] @@ -441881,7 +441487,7 @@ PrefabInstance: addedObject: {fileID: 538228073} - targetCorrespondingSourceObject: {fileID: 5172497182660285677, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3} insertIndex: -1 - addedObject: {fileID: 538228072} + addedObject: {fileID: 538228074} m_SourcePrefab: {fileID: 100100000, guid: 0c2275f0a1451a142b686a049a2ebcec, type: 3} --- !u!1001 &2125265433 PrefabInstance: @@ -442426,6 +442032,38 @@ PrefabInstance: propertyPath: m_Name value: SoundBird objectReference: {fileID: 0} + - target: {fileID: 2433130051631076285, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2433130051631076285, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2433130051631076285, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 538228069} + - target: {fileID: 2433130051631076285, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2433130051631076285, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: GotoSpot + objectReference: {fileID: 0} + - target: {fileID: 2433130051631076285, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: AnneLiseBehaviour, AppleHillsScripts + objectReference: {fileID: 0} + - target: {fileID: 2433130051631076285, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgument + value: + objectReference: {fileID: 384793595} + - target: {fileID: 2433130051631076285, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.GameObject, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 2523333015159032981, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} propertyPath: m_LocalPosition.x value: -62.02 @@ -442468,7 +442106,10 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 2523333015159032981, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} + insertIndex: -1 + addedObject: {fileID: 384793596} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} --- !u!1001 &3708074769586677211 @@ -442528,6 +442169,83 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3346526f3046f424196615241a307104, type: 3} +--- !u!1001 &3978117984697153445 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 666692440329091063, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + propertyPath: m_LocalPosition.x + value: -6.86 + objectReference: {fileID: 0} + - target: {fileID: 666692440329091063, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + propertyPath: m_LocalPosition.y + value: -6.98 + 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 + objectReference: {fileID: 0} + - target: {fileID: 3169137887822749614, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + propertyPath: stepData + value: + objectReference: {fileID: 11400000, guid: 28848561ff31fe24ea9f8590dee0bf8f, type: 2} + - target: {fileID: 6583016841553003224, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + propertyPath: m_LocalPosition.x + value: 13.17 + objectReference: {fileID: 0} + - target: {fileID: 6583016841553003224, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + propertyPath: m_LocalPosition.y + value: 26.6 + 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} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} --- !u!1001 &4596770314561390347 PrefabInstance: m_ObjectHideFlags: 0 @@ -443090,22 +442808,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1924342418841580, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1924342418841580, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1924342418841580, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1178648129422731606, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2045549771447434109, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} propertyPath: m_LocalPosition.x value: 66.69 @@ -443146,31 +442848,23 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 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: 3487003259787903584, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} propertyPath: playerToPlaceDistance - value: 35 + value: 30 objectReference: {fileID: 0} - target: {fileID: 7249528695393012044, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} propertyPath: m_Name value: LureSpotA objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: - - {fileID: 3617455498829757156, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 1924342418841580, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - insertIndex: -1 - addedObject: {fileID: 364850365} - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 7249528695393012044, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - insertIndex: -1 - addedObject: {fileID: 885908789} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] 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 @@ -443208,7 +442902,7 @@ SceneRoots: - {fileID: 1670940125} - {fileID: 7530821580781571560} - {fileID: 8013274907828598643} - - {fileID: 498726572} + - {fileID: 3978117984697153445} - {fileID: 3708074769586677211} - {fileID: 815620523195828801} - {fileID: 5061531048637107478} diff --git a/Assets/Scripts/DamianExperiments/AnneLiseBehaviour.cs b/Assets/Scripts/DamianExperiments/AnneLiseBehaviour.cs index 0593d008..c20550f8 100644 --- a/Assets/Scripts/DamianExperiments/AnneLiseBehaviour.cs +++ b/Assets/Scripts/DamianExperiments/AnneLiseBehaviour.cs @@ -1,39 +1,53 @@ using UnityEngine; -using System.Collections; using System; +using Pathfinding; public class AnneLiseBehaviour : MonoBehaviour { - // 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; + private Animator animator; + private AIPath aiPath; + private bool hasArrived = false; // Flag to prevent repeated triggering + + private void Awake() + { + animator = GetComponentInChildren(); + aiPath = GetComponent(); + if (aiPath != null) + { + aiPath.maxSpeed = moveSpeed; + } + } - // Method to initiate movement to the specified lure spot public void GotoSpot(GameObject lurespot) { - if (moveCoroutine != null) - StopCoroutine(moveCoroutine); + if (aiPath == null) return; - moveCoroutine = StartCoroutine(MoveToPosition(lurespot.transform.position)); + aiPath.destination = lurespot.transform.position; + aiPath.canMove = true; + aiPath.SearchPath(); + hasArrived = false; // Reset flag when a new destination is set } - // Coroutine to move AnneLise to the target position - private IEnumerator MoveToPosition(Vector3 targetPosition) + + private void Update() { - while (Vector3.Distance(transform.position, targetPosition) > 0.05f) + if (aiPath == null || animator == null) return; + + float currentSpeed = aiPath.velocity.magnitude; + animator.SetFloat("speed", currentSpeed); + + // Only trigger arrival logic once + if (!hasArrived && aiPath.reachedDestination && currentSpeed < 0.01f) { - transform.position = Vector3.MoveTowards( - transform.position, - targetPosition, - moveSpeed * Time.deltaTime - ); - yield return null; + hasArrived = true; + OnArriveAtSpot(); + aiPath.canMove = false; } - transform.position = targetPosition; // Snap to exact position at the end - moveCoroutine = null; - // Trigger the arrival event - OnArrivedAtSpot?.Invoke(); + } + + private void OnArriveAtSpot() + { + if (animator != null) + animator.SetTrigger("TakePhoto"); } }