diff --git a/Assets/Art/Animations/Characters/Annelise_Camera/Annelise_Camera.controller b/Assets/Art/Animations/Characters/Annelise_Camera/AC_AnneLise_Camera.controller similarity index 99% rename from Assets/Art/Animations/Characters/Annelise_Camera/Annelise_Camera.controller rename to Assets/Art/Animations/Characters/Annelise_Camera/AC_AnneLise_Camera.controller index 4586d3d9..88041983 100644 --- a/Assets/Art/Animations/Characters/Annelise_Camera/Annelise_Camera.controller +++ b/Assets/Art/Animations/Characters/Annelise_Camera/AC_AnneLise_Camera.controller @@ -144,7 +144,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Annelise_Camera + m_Name: AC_AnneLise_Camera serializedVersion: 5 m_AnimatorParameters: - m_Name: TakePhoto diff --git a/Assets/Art/Animations/Characters/Annelise_Camera/Annelise_Camera.controller.meta b/Assets/Art/Animations/Characters/Annelise_Camera/AC_AnneLise_Camera.controller.meta similarity index 100% rename from Assets/Art/Animations/Characters/Annelise_Camera/Annelise_Camera.controller.meta rename to Assets/Art/Animations/Characters/Annelise_Camera/AC_AnneLise_Camera.controller.meta diff --git a/Assets/Art/Animations/Characters/Annelise_Camera/AC_Bush.controller b/Assets/Art/Animations/Characters/Annelise_Camera/AC_Bush.controller new file mode 100644 index 00000000..373b0e9c --- /dev/null +++ b/Assets/Art/Animations/Characters/Annelise_Camera/AC_Bush.controller @@ -0,0 +1,133 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-3311016262160910353 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 184491603596489594} + m_Position: {x: 30, y: 320, z: 0} + - serializedVersion: 1 + m_State: {fileID: -1896783260395007287} + m_Position: {x: 30, y: 520, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 184491603596489594} +--- !u!1102 &-1896783260395007287 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ANIM_AnneLiseBush_PhotoFlash + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: a35833956a43afa4bb037f67324dfe50, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: AC_Bush + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: TakePhoto + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -3311016262160910353} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &184491603596489594 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ANIM_AnneLiseBush_PeakUp + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 7562831074132107716} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: fa1471f4c3501694a835bb22179820de, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &7562831074132107716 +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: TakePhoto + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -1896783260395007287} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75409836 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Assets/Art/Animations/Characters/Annelise_Camera/Peaking.controller.meta b/Assets/Art/Animations/Characters/Annelise_Camera/AC_Bush.controller.meta similarity index 100% rename from Assets/Art/Animations/Characters/Annelise_Camera/Peaking.controller.meta rename to Assets/Art/Animations/Characters/Annelise_Camera/AC_Bush.controller.meta diff --git a/Assets/Art/Animations/Characters/Annelise_Camera/ANIM_AnneLiseBush_Hide.anim b/Assets/Art/Animations/Characters/Annelise_Camera/ANIM_AnneLiseBush_Hide.anim new file mode 100644 index 00000000..d4f5c6a6 --- /dev/null +++ b/Assets/Art/Animations/Characters/Annelise_Camera/ANIM_AnneLiseBush_Hide.anim @@ -0,0 +1,422 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ANIM_AnneLiseBush_Hide + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: CameraFlash + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1.02911, y: -1.4418983, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1.0166667 + value: {x: 1.02911, y: 1, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: AnneLiseBody + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1, y: 1, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: CameraFlash + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: CameraFlash + classID: 1 + script: {fileID: 0} + flags: 16 + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 3989656240 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 1063121799 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 1063121799 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 1063121799 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1.0166667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.02911 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: AnneLiseBody + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -1.4418983 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.0166667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: AnneLiseBody + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: AnneLiseBody + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: CameraFlash + classID: 1 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: CameraFlash + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: CameraFlash + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: CameraFlash + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: CameraFlash + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: CameraFlash + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: CameraFlash + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: CameraFlash + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: CameraFlash + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: CameraFlash + classID: 4 + script: {fileID: 0} + flags: 0 + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Art/Animations/Characters/Annelise_Camera/ANIM_AnneLiseBush_Hide.anim.meta b/Assets/Art/Animations/Characters/Annelise_Camera/ANIM_AnneLiseBush_Hide.anim.meta new file mode 100644 index 00000000..421989fe --- /dev/null +++ b/Assets/Art/Animations/Characters/Annelise_Camera/ANIM_AnneLiseBush_Hide.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c53050e4a0f8b9842a2afaef92cadf27 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Animations/Characters/Annelise_Camera/ANIM_AnneLiseBush_PeakUp.anim b/Assets/Art/Animations/Characters/Annelise_Camera/ANIM_AnneLiseBush_PeakUp.anim new file mode 100644 index 00000000..a20c918a --- /dev/null +++ b/Assets/Art/Animations/Characters/Annelise_Camera/ANIM_AnneLiseBush_PeakUp.anim @@ -0,0 +1,422 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ANIM_AnneLiseBush_PeakUp + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: CameraFlash + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1.02911, y: -1.4418983, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1.0166667 + value: {x: 1.02911, y: 1, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: AnneLiseBody + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1, y: 1, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: CameraFlash + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: CameraFlash + classID: 1 + script: {fileID: 0} + flags: 16 + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 3989656240 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 1063121799 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 1063121799 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 1063121799 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1.0166667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.02911 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: AnneLiseBody + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -1.4418983 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.0166667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: AnneLiseBody + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: AnneLiseBody + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: CameraFlash + classID: 1 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: CameraFlash + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: CameraFlash + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: CameraFlash + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: CameraFlash + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: CameraFlash + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: CameraFlash + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: CameraFlash + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: CameraFlash + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: CameraFlash + classID: 4 + script: {fileID: 0} + flags: 0 + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Art/Animations/Characters/Annelise_Camera/ANIM_AnneLiseBush_TakePhoto.anim.meta b/Assets/Art/Animations/Characters/Annelise_Camera/ANIM_AnneLiseBush_PeakUp.anim.meta similarity index 100% rename from Assets/Art/Animations/Characters/Annelise_Camera/ANIM_AnneLiseBush_TakePhoto.anim.meta rename to Assets/Art/Animations/Characters/Annelise_Camera/ANIM_AnneLiseBush_PeakUp.anim.meta diff --git a/Assets/Art/Animations/Characters/Annelise_Camera/ANIM_AnneLiseBush_TakePhoto.anim b/Assets/Art/Animations/Characters/Annelise_Camera/ANIM_AnneLiseBush_PhotoFlash.anim similarity index 86% rename from Assets/Art/Animations/Characters/Annelise_Camera/ANIM_AnneLiseBush_TakePhoto.anim rename to Assets/Art/Animations/Characters/Annelise_Camera/ANIM_AnneLiseBush_PhotoFlash.anim index 8f2e3dbd..ca01865d 100644 --- a/Assets/Art/Animations/Characters/Annelise_Camera/ANIM_AnneLiseBush_TakePhoto.anim +++ b/Assets/Art/Animations/Characters/Annelise_Camera/ANIM_AnneLiseBush_PhotoFlash.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ANIM_AnneLiseBush_TakePhoto + m_Name: ANIM_AnneLiseBush_PhotoFlash serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 @@ -19,24 +19,6 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 1.25 - value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 1.5 value: {x: 0, y: 0, z: 379} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -45,7 +27,25 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 3.0333333 + time: 0.33333334 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5833333 + value: {x: 0, y: 0, z: 379} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1.7833333 value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -62,16 +62,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 - value: {x: 1.02911, y: -1.4418983, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 1.0166667 + time: 1.4333333 value: {x: 1.02911, y: 1, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -80,16 +71,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 2.6833334 - value: {x: 1.02911, y: 1, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 3.0333333 + time: 1.7833333 value: {x: 1.02911, y: -1.4418983, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -107,24 +89,6 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 1, y: 1, z: 1} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 1.25 - value: {x: 1, y: 1, z: 1} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 1.5 value: {x: 12, y: 12, z: 12} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -133,7 +97,25 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 3.0333333 + time: 0.33333334 + value: {x: 1, y: 1, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5833333 + value: {x: 12, y: 12, z: 12} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1.7833333 value: {x: 1, y: 1, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -160,7 +142,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.25 + time: 0.33333334 value: 1 inSlope: Infinity outSlope: Infinity @@ -169,7 +151,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.5 + time: 0.5833333 value: 0 inSlope: Infinity outSlope: Infinity @@ -178,7 +160,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 3.0333333 + time: 1.7833333 value: 1 inSlope: Infinity outSlope: Infinity @@ -244,12 +226,12 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 3.0333333 + m_StopTime: 1.7833333 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 @@ -265,16 +247,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 - value: 1.02911 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 3.0333333 + time: 1.7833333 value: 1.02911 inSlope: 0 outSlope: 0 @@ -295,16 +268,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 - value: -1.4418983 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.0166667 + time: 1.4333333 value: 1 inSlope: 0 outSlope: 0 @@ -313,16 +277,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.6833334 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 3.0333333 + time: 1.7833333 value: -1.4418983 inSlope: 0 outSlope: 0 @@ -343,16 +298,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 3.0333333 + time: 1.7833333 value: 0 inSlope: 0 outSlope: 0 @@ -375,53 +321,14 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + inSlope: 0 + outSlope: 0 + tangentMode: 136 weightedMode: 0 - inWeight: 0 - outWeight: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 - time: 1.25 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1.5 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 3.0333333 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: CameraFlash - classID: 1 - script: {fileID: 0} - flags: 16 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 + time: 0.33333334 value: 0 inSlope: 0 outSlope: 0 @@ -430,7 +337,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.25 + time: 0.5833333 value: 0 inSlope: 0 outSlope: 0 @@ -439,16 +346,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 3.0333333 + time: 1.7833333 value: 0 inSlope: 0 outSlope: 0 @@ -478,7 +376,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.25 + time: 0.33333334 value: 0 inSlope: 0 outSlope: 0 @@ -487,7 +385,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.5 + time: 0.5833333 value: 0 inSlope: 0 outSlope: 0 @@ -496,7 +394,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.0333333 + time: 1.7833333 value: 0 inSlope: 0 outSlope: 0 @@ -518,24 +416,6 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.25 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.5 value: 379 inSlope: 0 outSlope: 0 @@ -544,7 +424,25 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.0333333 + time: 0.33333334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5833333 + value: 379 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.7833333 value: 0 inSlope: 0 outSlope: 0 @@ -566,24 +464,6 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.25 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.5 value: 12 inSlope: 0 outSlope: 0 @@ -592,7 +472,25 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.0333333 + time: 0.33333334 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5833333 + value: 12 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.7833333 value: 1 inSlope: 0 outSlope: 0 @@ -614,24 +512,6 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.25 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.5 value: 12 inSlope: 0 outSlope: 0 @@ -640,7 +520,25 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.0333333 + time: 0.33333334 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5833333 + value: 12 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.7833333 value: 1 inSlope: 0 outSlope: 0 @@ -662,24 +560,6 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.25 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.5 value: 12 inSlope: 0 outSlope: 0 @@ -688,7 +568,25 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.0333333 + time: 0.33333334 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5833333 + value: 12 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.7833333 value: 1 inSlope: 0 outSlope: 0 @@ -704,6 +602,54 @@ AnimationClip: classID: 4 script: {fileID: 0} flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.33333334 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5833333 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1.7833333 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: CameraFlash + classID: 1 + script: {fileID: 0} + flags: 16 m_EulerEditorCurves: - serializedVersion: 2 curve: @@ -743,4 +689,11 @@ AnimationClip: flags: 0 m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 1.7833333 + functionName: PhotoTaken + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Art/Animations/Characters/Annelise_Camera/ANIM_AnneLiseBush_PhotoFlash.anim.meta b/Assets/Art/Animations/Characters/Annelise_Camera/ANIM_AnneLiseBush_PhotoFlash.anim.meta new file mode 100644 index 00000000..cd5ee4c5 --- /dev/null +++ b/Assets/Art/Animations/Characters/Annelise_Camera/ANIM_AnneLiseBush_PhotoFlash.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a35833956a43afa4bb037f67324dfe50 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Animations/Characters/Annelise_Camera/Annelise_Camera_Idle.anim b/Assets/Art/Animations/Characters/Annelise_Camera/ANIM_Annelise_CameraIdle.anim similarity index 98% rename from Assets/Art/Animations/Characters/Annelise_Camera/Annelise_Camera_Idle.anim rename to Assets/Art/Animations/Characters/Annelise_Camera/ANIM_Annelise_CameraIdle.anim index b0ea777d..f4b7abca 100644 --- a/Assets/Art/Animations/Characters/Annelise_Camera/Annelise_Camera_Idle.anim +++ b/Assets/Art/Animations/Characters/Annelise_Camera/ANIM_Annelise_CameraIdle.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Annelise_Camera_Idle + m_Name: ANIM_Annelise_CameraIdle serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/Art/Animations/Characters/Annelise_Camera/Annelise_Camera_Idle.anim.meta b/Assets/Art/Animations/Characters/Annelise_Camera/ANIM_Annelise_CameraIdle.anim.meta similarity index 100% rename from Assets/Art/Animations/Characters/Annelise_Camera/Annelise_Camera_Idle.anim.meta rename to Assets/Art/Animations/Characters/Annelise_Camera/ANIM_Annelise_CameraIdle.anim.meta diff --git a/Assets/Art/Animations/Characters/Annelise_Camera/Peaking.controller b/Assets/Art/Animations/Characters/Annelise_Camera/Peaking.controller deleted file mode 100644 index a856012a..00000000 --- a/Assets/Art/Animations/Characters/Annelise_Camera/Peaking.controller +++ /dev/null @@ -1,72 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1107 &-3311016262160910353 -AnimatorStateMachine: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: -1289652922449611728} - m_Position: {x: 200, y: 0, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: -1289652922449611728} ---- !u!1102 &-1289652922449611728 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: ANIM_AnneLiseBush_TakePhoto - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: fa1471f4c3501694a835bb22179820de, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Peaking - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: -3311016262160910353} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 0 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} diff --git a/Assets/Prefabs/Puzzles/AnneLiseBush.prefab b/Assets/Prefabs/Puzzles/AnneLiseBush.prefab index 722dc7a9..2bb5da07 100644 --- a/Assets/Prefabs/Puzzles/AnneLiseBush.prefab +++ b/Assets/Prefabs/Puzzles/AnneLiseBush.prefab @@ -25,7 +25,7 @@ Transform: m_GameObject: {fileID: 256075229215225614} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.93, y: -2.59, z: 0} + m_LocalPosition: {x: -4.62, y: -1.77, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: diff --git a/Assets/Scenes/Levels/Quarry.unity b/Assets/Scenes/Levels/Quarry.unity index 407d3507..d0553cab 100644 --- a/Assets/Scenes/Levels/Quarry.unity +++ b/Assets/Scenes/Levels/Quarry.unity @@ -2329,6 +2329,17 @@ Transform: m_CorrespondingSourceObject: {fileID: 9162571094694503926, guid: 4694d95ffaa4a4343ae04db32b13cbcc, type: 3} m_PrefabInstance: {fileID: 152724146} m_PrefabAsset: {fileID: 0} +--- !u!114 &159432895 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 578146208477020881, guid: 9b2926886934b554f9a1727331d34787, type: 3} + m_PrefabInstance: {fileID: 661675797} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 603ecc4a6ab6bb84c8cb9773fa310b69, type: 3} + m_Name: + m_EditorClassIdentifier: '::' --- !u!1001 &163010779 PrefabInstance: m_ObjectHideFlags: 0 @@ -437459,20 +437470,6 @@ 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!1001 &570413063 PrefabInstance: m_ObjectHideFlags: 0 @@ -437828,11 +437825,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} m_PrefabInstance: {fileID: 28205340} m_PrefabAsset: {fileID: 0} ---- !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 @@ -440255,25 +440247,6 @@ Transform: m_Children: [] m_Father: {fileID: 1230441488} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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!4 &733706664 stripped Transform: m_CorrespondingSourceObject: {fileID: 6078012632802010276, guid: 3346526f3046f424196615241a307104, type: 3} @@ -448602,11 +448575,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 7465517589433942351, guid: 0b255c6ea64a74240a8db4d9e8f820be, type: 3} m_PrefabInstance: {fileID: 2024588806} m_PrefabAsset: {fileID: 0} ---- !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 @@ -448840,6 +448808,17 @@ Transform: - {fileID: 874984581} m_Father: {fileID: 143210813} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1249289160 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 578146208477020881, guid: 9b2926886934b554f9a1727331d34787, type: 3} + m_PrefabInstance: {fileID: 841182293} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 603ecc4a6ab6bb84c8cb9773fa310b69, type: 3} + m_Name: + m_EditorClassIdentifier: '::' --- !u!1 &1252594308 GameObject: m_ObjectHideFlags: 0 @@ -448926,11 +448905,6 @@ MonoBehaviour: SoundBirdObject: {fileID: 277331775} flightDuration: 3 flightDelay: 0.46 ---- !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 @@ -452504,11 +452478,6 @@ 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 @@ -453156,6 +453125,17 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 1507935577} m_PrefabAsset: {fileID: 0} +--- !u!114 &1516406291 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 578146208477020881, guid: 9b2926886934b554f9a1727331d34787, type: 3} + m_PrefabInstance: {fileID: 1070397503} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 603ecc4a6ab6bb84c8cb9773fa310b69, type: 3} + m_Name: + m_EditorClassIdentifier: '::' --- !u!1001 &1524271510 PrefabInstance: m_ObjectHideFlags: 0 @@ -463535,6 +463515,17 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 2125265433} m_PrefabAsset: {fileID: 0} +--- !u!114 &2126981195 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 578146208477020881, guid: 9b2926886934b554f9a1727331d34787, type: 3} + m_PrefabInstance: {fileID: 1548124686061025687} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 603ecc4a6ab6bb84c8cb9773fa310b69, type: 3} + m_Name: + m_EditorClassIdentifier: '::' --- !u!1001 &2127196911 PrefabInstance: m_ObjectHideFlags: 0 @@ -464045,7 +464036,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2433130051631076285, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_Mode - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2433130051631076285, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_Target @@ -464054,7 +464045,7 @@ PrefabInstance: - target: {fileID: 2433130051631076285, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_Target value: - objectReference: {fileID: 538228069} + objectReference: {fileID: 1249289160} - target: {fileID: 2433130051631076285, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_CallState value: 2 @@ -464065,7 +464056,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2433130051631076285, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName - value: GotoSpot + value: TakePhoto objectReference: {fileID: 0} - target: {fileID: 2433130051631076285, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName @@ -464073,7 +464064,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2433130051631076285, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName - value: AnneLiseBehaviour, AppleHillsScripts + value: AnneLiseBushBehaviour, AppleHillsScripts objectReference: {fileID: 0} - target: {fileID: 2433130051631076285, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument @@ -464086,14 +464077,14 @@ PrefabInstance: - target: {fileID: 2433130051631076285, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgument value: - objectReference: {fileID: 2022162745} + objectReference: {fileID: 0} - target: {fileID: 2433130051631076285, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} - target: {fileID: 2433130051631076285, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.GameObject, UnityEngine + value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} - target: {fileID: 2523333015159032981, guid: 9ad58c5e86338824db8a6daebdb432b5, type: 3} propertyPath: m_LocalScale.x @@ -464234,31 +464225,31 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_Mode - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_Target value: - objectReference: {fileID: 538228069} + objectReference: {fileID: 2126981195} - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_CallState value: 2 objectReference: {fileID: 0} - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName - value: GotoSpot + value: TakePhoto objectReference: {fileID: 0} - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName - value: AnneLiseBehaviour, AppleHillsScripts + value: AnneLiseBushBehaviour, AppleHillsScripts objectReference: {fileID: 0} - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgument value: - objectReference: {fileID: 733706650} + objectReference: {fileID: 0} - target: {fileID: 3093816592344978065, guid: 3346526f3046f424196615241a307104, type: 3} propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.GameObject, UnityEngine + value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} - target: {fileID: 4005709218855855001, guid: 3346526f3046f424196615241a307104, type: 3} propertyPath: m_LocalScale.x @@ -464286,7 +464277,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4085610931707720375, guid: 3346526f3046f424196615241a307104, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4289780218821574471, guid: 3346526f3046f424196615241a307104, type: 3} propertyPath: isOneTime @@ -464382,7 +464373,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6865758097422051095, guid: 3346526f3046f424196615241a307104, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7042345690456335656, guid: 3346526f3046f424196615241a307104, type: 3} propertyPath: m_Size.x @@ -464419,9 +464410,6 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 941275210} 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} @@ -464447,6 +464435,34 @@ PrefabInstance: propertyPath: iconRenderer value: objectReference: {fileID: 1000921321} + - target: {fileID: 106497079666291966, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 106497079666291966, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 106497079666291966, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 1516406291} + - target: {fileID: 106497079666291966, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 106497079666291966, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: TakePhoto + objectReference: {fileID: 0} + - target: {fileID: 106497079666291966, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: AnneLiseBushBehaviour, AppleHillsScripts + objectReference: {fileID: 0} + - target: {fileID: 106497079666291966, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 519585874127847016, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} propertyPath: isOneTime value: 1 @@ -465998,6 +466014,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2277261512137882881, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2706936531024020228, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} propertyPath: characterToInteract value: 2 @@ -466034,6 +466054,10 @@ PrefabInstance: 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: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3487003259787903584, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} propertyPath: playerToPlaceDistance value: 30 @@ -466094,6 +466118,34 @@ PrefabInstance: propertyPath: m_Name value: LureSpotA objectReference: {fileID: 0} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 159432895} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: TakePhoto + objectReference: {fileID: 0} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: AnneLiseBushBehaviour, AppleHillsScripts + objectReference: {fileID: 0} + - target: {fileID: 8578055200319571631, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} + propertyPath: onCorrectItemSlotted.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 8818689886719637838, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} propertyPath: isOneTime value: 1 @@ -466106,9 +466158,6 @@ PrefabInstance: m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 7249528695393012044, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} - insertIndex: -1 - addedObject: {fileID: 568523019} - targetCorrespondingSourceObject: {fileID: 3134003919645739551, guid: 3144c6bbac26fbd49a1608152821cc5f, type: 3} insertIndex: -1 addedObject: {fileID: 1398916133} diff --git a/Assets/Scripts/Animation/BirdEyesBehavior.cs b/Assets/Scripts/Animation/BirdEyesBehavior.cs index 7864da2e..dc1689b0 100644 --- a/Assets/Scripts/Animation/BirdEyesBehavior.cs +++ b/Assets/Scripts/Animation/BirdEyesBehavior.cs @@ -24,6 +24,7 @@ public class BirdEyesBehavior : MonoBehaviour { correctItemIsIn = true; animator.SetTrigger("RightGuess"); + BirdReveal(); } public void IncorrectItem() @@ -40,6 +41,7 @@ public class BirdEyesBehavior : MonoBehaviour if (bushAnimator != null) { bushAnimator.SetTrigger("wolterisout"); + statemachine.ChangeState("BirdSpawned"); return; } statemachine.ChangeState ("BirdSpawned"); diff --git a/Assets/Scripts/StateMachines/Quarry/AnneLise/AnneLiseBushBehaviour.cs b/Assets/Scripts/StateMachines/Quarry/AnneLise/AnneLiseBushBehaviour.cs index 348f859c..c672d66b 100644 --- a/Assets/Scripts/StateMachines/Quarry/AnneLise/AnneLiseBushBehaviour.cs +++ b/Assets/Scripts/StateMachines/Quarry/AnneLise/AnneLiseBushBehaviour.cs @@ -17,7 +17,7 @@ public class AnneLiseBushBehaviour : MonoBehaviour } - void TakePhoto() + public void TakePhoto() { anneLiseBushStateMachine.ChangeState("TakePhoto"); } diff --git a/Assets/Scripts/StateMachines/Quarry/AnneLise/TakePhotoState.cs b/Assets/Scripts/StateMachines/Quarry/AnneLise/TakePhotoState.cs index e6873f16..520c1919 100644 --- a/Assets/Scripts/StateMachines/Quarry/AnneLise/TakePhotoState.cs +++ b/Assets/Scripts/StateMachines/Quarry/AnneLise/TakePhotoState.cs @@ -1,7 +1,9 @@ -using UnityEngine; -using System.Collections; -using Pixelplacement; using Input; +using Pixelplacement; +using System.Collections; +using UnityEngine; +using UnityEngine.Events; +using static Input.PlayerTouchController; public class TakePhotoState : State @@ -9,7 +11,9 @@ public class TakePhotoState : State public Transform playerTargetObject; private GameObject playerCharacter; private PlayerTouchController playerTouchController; - private Vector2 newPlayerPosition; + private Vector3 newPlayerPosition; + + private // Start is called once before the first execution of Update after the MonoBehaviour is created void Start() @@ -27,7 +31,25 @@ public class TakePhotoState : State { playerCharacter = GameObject.FindWithTag("Player"); playerTouchController = playerCharacter.GetComponent(); - newPlayerPosition = new Vector2(playerCharacter.transform.position.x, playerCharacter.transform.position.y); - playerTouchController.MoveDirectlyTo(newPlayerPosition); + playerTouchController.OnArrivedAtTarget += PlayerHasArrived; + + newPlayerPosition = new Vector3(playerTargetObject.transform.position.x, playerTargetObject.transform.position.y, playerTargetObject.transform.position.z); + //playerTouchController.InterruptMoveTo(); + playerTouchController.MoveToAndNotify(newPlayerPosition); + InputManager.Instance.SetInputMode(InputMode.InputDisabled); + } + + // When the player has arrived at the bush do Animator.SetTrigger(Takephoto) and whatevs + + public void PhotoTaken() + { + ChangeState("Hidden"); + InputManager.Instance.SetInputMode(InputMode.Game); + } + + void PlayerHasArrived() + { + GetComponent().SetTrigger("TakePhoto"); + playerTouchController.OnArrivedAtTarget += null; } }