diff --git a/Assets/Unheimlich_POC/Animations.meta b/Assets/Unheimlich_POC/Animations.meta new file mode 100644 index 00000000..ba84f59f --- /dev/null +++ b/Assets/Unheimlich_POC/Animations.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8465ee6d61a7df4488cc0576de1129dc +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Unheimlich_POC/Animations/Diapason.meta b/Assets/Unheimlich_POC/Animations/Diapason.meta new file mode 100644 index 00000000..89dfc8e0 --- /dev/null +++ b/Assets/Unheimlich_POC/Animations/Diapason.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7f4075892d24e4449a24ff37f8e8b6ba +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Unheimlich_POC/Animations/Diapason/DiapasonAnimator.controller b/Assets/Unheimlich_POC/Animations/Diapason/DiapasonAnimator.controller new file mode 100644 index 00000000..b3fd9c77 --- /dev/null +++ b/Assets/Unheimlich_POC/Animations/Diapason/DiapasonAnimator.controller @@ -0,0 +1,162 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-8690948310595586279 +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: Tap + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -5520587529742516873} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.67540425 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-7151713981270395130 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + 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: 03563b8dec42e5640b342370f82e7a92, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-5520587529742516873 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Tap + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1636899995371703689} + 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: ba6902ec17641ad42b3775fa15667b30, 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: DiapasonAnimator + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: IsEquipped + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: Tap + 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: 3213078161273425791} + 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!1101 &1636899995371703689 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7151713981270395130} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.9 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1107 &3213078161273425791 +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: -7151713981270395130} + m_Position: {x: 30, y: 200, z: 0} + - serializedVersion: 1 + m_State: {fileID: -5520587529742516873} + m_Position: {x: 30, y: 310, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: + - {fileID: -8690948310595586279} + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 400, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 320, y: 50, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -7151713981270395130} diff --git a/Assets/Unheimlich_POC/Animations/Diapason/DiapasonAnimator.controller.meta b/Assets/Unheimlich_POC/Animations/Diapason/DiapasonAnimator.controller.meta new file mode 100644 index 00000000..0e9f9dcf --- /dev/null +++ b/Assets/Unheimlich_POC/Animations/Diapason/DiapasonAnimator.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 05ab6d80633357e49bba08715d0df3c6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Unheimlich_POC/Animations/Diapason/DiapasonIdle.anim b/Assets/Unheimlich_POC/Animations/Diapason/DiapasonIdle.anim new file mode 100644 index 00000000..720b3875 --- /dev/null +++ b/Assets/Unheimlich_POC/Animations/Diapason/DiapasonIdle.anim @@ -0,0 +1,53 @@ +%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: DiapasonIdle + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + 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: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + 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: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Unheimlich_POC/Animations/Diapason/DiapasonIdle.anim.meta b/Assets/Unheimlich_POC/Animations/Diapason/DiapasonIdle.anim.meta new file mode 100644 index 00000000..c6528956 --- /dev/null +++ b/Assets/Unheimlich_POC/Animations/Diapason/DiapasonIdle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 03563b8dec42e5640b342370f82e7a92 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Unheimlich_POC/Animations/Diapason/DiapasonTap.anim b/Assets/Unheimlich_POC/Animations/Diapason/DiapasonTap.anim new file mode 100644 index 00000000..f35908c5 --- /dev/null +++ b/Assets/Unheimlich_POC/Animations/Diapason/DiapasonTap.anim @@ -0,0 +1,949 @@ +%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: DiapasonTap + 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: -90, 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.43333334 + value: {x: -62.351, y: 89.774, z: -89.911} + 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.78333336 + value: {x: -90, 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.8333333 + value: {x: -84.81, 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.8833333 + value: {x: -97.774, 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.93333334 + value: {x: -86.641, 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 + value: {x: -97.651, 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.0666667 + value: {x: -87.797, 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.15 + value: {x: -99.184, 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.2666667 + value: {x: -90, 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: Render/Diapason + m_PositionCurves: + - 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} + - serializedVersion: 3 + time: 0.23333333 + value: {x: 0, y: 0.055, z: 0} + inSlope: {x: 0, y: 0.23769715, z: 0} + outSlope: {x: 0, y: 0.23769715, 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.43333334 + value: {x: 0.053, y: 0.1030021, 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.78333336 + 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.8333333 + value: {x: 0, y: 0.0016489029, z: -0.037730962} + inSlope: {x: 0, y: 0.03924848, z: 0} + outSlope: {x: 0, y: 0.03924848, 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.8833333 + value: {x: 0, y: 0.0039248466, z: 0.056405194} + 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.93333334 + value: {x: 0, y: 0.0006771982, z: -0.024436368} + 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 + value: {x: 0, y: 0.0038035214, z: 0.05552265} + 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.0666667 + value: {x: 0, y: 0.00028309226, z: -0.016032133} + 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.15 + value: {x: 0, y: 0.005455792, z: 0.06655883} + 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.2666667 + 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: Render/Diapason + m_ScaleCurves: [] + m_FloatCurves: [] + 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: 3158675581 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 3158675581 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1.2666667 + 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: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.43333334 + value: 0.053 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.78333336 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8833333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.93333334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.0666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.15 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.2666667 + 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.x + path: Render/Diapason + 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 + - serializedVersion: 3 + time: 0.23333333 + value: 0.055 + inSlope: 0.23769715 + outSlope: 0.23769715 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.43333334 + value: 0.1030021 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.78333336 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 0.0016489029 + inSlope: 0.03924848 + outSlope: 0.03924848 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8833333 + value: 0.0039248466 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.93333334 + value: 0.0006771982 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.0038035214 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.0666667 + value: 0.00028309226 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.15 + value: 0.005455792 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.2666667 + 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.y + path: Render/Diapason + 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 + - serializedVersion: 3 + time: 0.23333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.43333334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.78333336 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: -0.037730962 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8833333 + value: 0.056405194 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.93333334 + value: -0.024436368 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.05552265 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.0666667 + value: -0.016032133 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.15 + value: 0.06655883 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.2666667 + 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: Render/Diapason + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -90 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.43333334 + value: -62.351 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.78333336 + value: -90 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: -84.81 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8833333 + value: -97.774 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.93333334 + value: -86.641 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: -97.651 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.0666667 + value: -87.797 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.15 + value: -99.184 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.2666667 + value: -90 + 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: Render/Diapason + classID: 4 + 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 + - serializedVersion: 3 + time: 0.43333334 + value: 89.774 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.78333336 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8833333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.93333334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.0666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.15 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.2666667 + 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: Render/Diapason + classID: 4 + 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 + - serializedVersion: 3 + time: 0.43333334 + value: -89.911 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.78333336 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8833333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.93333334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.0666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.15 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.2666667 + 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: Render/Diapason + classID: 4 + script: {fileID: 0} + flags: 16 + m_EulerEditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Render/Diapason + 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: Render/Diapason + 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: Render/Diapason + classID: 4 + script: {fileID: 0} + flags: 0 + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Unheimlich_POC/Animations/Diapason/DiapasonTap.anim.meta b/Assets/Unheimlich_POC/Animations/Diapason/DiapasonTap.anim.meta new file mode 100644 index 00000000..c986176d --- /dev/null +++ b/Assets/Unheimlich_POC/Animations/Diapason/DiapasonTap.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ba6902ec17641ad42b3775fa15667b30 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Unheimlich_POC/Audio/Players/23607654_lounge-house-dance-chill-beach_by_sweetmusicproduction_preview.wav b/Assets/Unheimlich_POC/Audio/Players/23607654_lounge-house-dance-chill-beach_by_sweetmusicproduction_preview.wav deleted file mode 100644 index 86333cc4..00000000 Binary files a/Assets/Unheimlich_POC/Audio/Players/23607654_lounge-house-dance-chill-beach_by_sweetmusicproduction_preview.wav and /dev/null differ diff --git a/Assets/Unheimlich_POC/Audio/Players/Diapason.meta b/Assets/Unheimlich_POC/Audio/Players/Diapason.meta new file mode 100644 index 00000000..774b68c9 --- /dev/null +++ b/Assets/Unheimlich_POC/Audio/Players/Diapason.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2063797d6d19f5e4cbba68e5373c9b6a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Unheimlich_POC/Audio/Players/Diapason/BreatheInDiapason.wav b/Assets/Unheimlich_POC/Audio/Players/Diapason/BreatheInDiapason.wav new file mode 100644 index 00000000..4cabc9ae Binary files /dev/null and b/Assets/Unheimlich_POC/Audio/Players/Diapason/BreatheInDiapason.wav differ diff --git a/Assets/Unheimlich_POC/Audio/Players/23607654_lounge-house-dance-chill-beach_by_sweetmusicproduction_preview.wav.meta b/Assets/Unheimlich_POC/Audio/Players/Diapason/BreatheInDiapason.wav.meta similarity index 91% rename from Assets/Unheimlich_POC/Audio/Players/23607654_lounge-house-dance-chill-beach_by_sweetmusicproduction_preview.wav.meta rename to Assets/Unheimlich_POC/Audio/Players/Diapason/BreatheInDiapason.wav.meta index ec1c66d8..67081df4 100644 --- a/Assets/Unheimlich_POC/Audio/Players/23607654_lounge-house-dance-chill-beach_by_sweetmusicproduction_preview.wav.meta +++ b/Assets/Unheimlich_POC/Audio/Players/Diapason/BreatheInDiapason.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 971abf0515b06a64ea35513e371304c0 +guid: 091b6df1c99cbd647bce921a5ba7c1af AudioImporter: externalObjects: {} serializedVersion: 8 diff --git a/Assets/Unheimlich_POC/Audio/Players/Diapason/TapDiapason.wav b/Assets/Unheimlich_POC/Audio/Players/Diapason/TapDiapason.wav new file mode 100644 index 00000000..fbceeb72 Binary files /dev/null and b/Assets/Unheimlich_POC/Audio/Players/Diapason/TapDiapason.wav differ diff --git a/Assets/Unheimlich_POC/Audio/Players/Diapason/TapDiapason.wav.meta b/Assets/Unheimlich_POC/Audio/Players/Diapason/TapDiapason.wav.meta new file mode 100644 index 00000000..1a4e8a7f --- /dev/null +++ b/Assets/Unheimlich_POC/Audio/Players/Diapason/TapDiapason.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 99100d62c8b5d264f8694516673a9eeb +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Unheimlich_POC/Audio/Players/ObjectsTest.meta b/Assets/Unheimlich_POC/Audio/Players/ObjectsTest.meta new file mode 100644 index 00000000..20aba030 --- /dev/null +++ b/Assets/Unheimlich_POC/Audio/Players/ObjectsTest.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d8f2bf6e481aafa4e9477e7acd6e7e75 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Unheimlich_POC/Audio/Players/RadioSoundTest.wav b/Assets/Unheimlich_POC/Audio/Players/ObjectsTest/RadioSoundTest.wav similarity index 100% rename from Assets/Unheimlich_POC/Audio/Players/RadioSoundTest.wav rename to Assets/Unheimlich_POC/Audio/Players/ObjectsTest/RadioSoundTest.wav diff --git a/Assets/Unheimlich_POC/Audio/Players/RadioSoundTest.wav.meta b/Assets/Unheimlich_POC/Audio/Players/ObjectsTest/RadioSoundTest.wav.meta similarity index 91% rename from Assets/Unheimlich_POC/Audio/Players/RadioSoundTest.wav.meta rename to Assets/Unheimlich_POC/Audio/Players/ObjectsTest/RadioSoundTest.wav.meta index 20afab57..8a23fb4f 100644 --- a/Assets/Unheimlich_POC/Audio/Players/RadioSoundTest.wav.meta +++ b/Assets/Unheimlich_POC/Audio/Players/ObjectsTest/RadioSoundTest.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a5cbaa7c4d5aaf64eb2368dd09c508a8 +guid: 4a457e773284f3340970241732ede6dd AudioImporter: externalObjects: {} serializedVersion: 8 diff --git a/Assets/Unheimlich_POC/Audio/Players/Slipknot-Danger-Keep-Away-_Audio_.wav b/Assets/Unheimlich_POC/Audio/Players/ObjectsTest/Slipknot-Danger-Keep-Away-_Audio_.wav similarity index 100% rename from Assets/Unheimlich_POC/Audio/Players/Slipknot-Danger-Keep-Away-_Audio_.wav rename to Assets/Unheimlich_POC/Audio/Players/ObjectsTest/Slipknot-Danger-Keep-Away-_Audio_.wav diff --git a/Assets/Unheimlich_POC/Audio/Players/Slipknot-Danger-Keep-Away-_Audio_.wav.meta b/Assets/Unheimlich_POC/Audio/Players/ObjectsTest/Slipknot-Danger-Keep-Away-_Audio_.wav.meta similarity index 91% rename from Assets/Unheimlich_POC/Audio/Players/Slipknot-Danger-Keep-Away-_Audio_.wav.meta rename to Assets/Unheimlich_POC/Audio/Players/ObjectsTest/Slipknot-Danger-Keep-Away-_Audio_.wav.meta index 21331a97..03481daa 100644 --- a/Assets/Unheimlich_POC/Audio/Players/Slipknot-Danger-Keep-Away-_Audio_.wav.meta +++ b/Assets/Unheimlich_POC/Audio/Players/ObjectsTest/Slipknot-Danger-Keep-Away-_Audio_.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e6579f8a931d2f445906aabd0395ed50 +guid: 6843ca48adc228442947da83edc3270e AudioImporter: externalObjects: {} serializedVersion: 8 diff --git a/Assets/Unheimlich_POC/Inputs/PlayerController.inputactions b/Assets/Unheimlich_POC/Inputs/PlayerController.inputactions index 4918419d..f17dfc82 100644 --- a/Assets/Unheimlich_POC/Inputs/PlayerController.inputactions +++ b/Assets/Unheimlich_POC/Inputs/PlayerController.inputactions @@ -28,7 +28,7 @@ "name": "Attack", "type": "Button", "id": "6c2ab1b8-8984-453a-af3d-a3c78ae1679a", - "expectedControlType": "Button", + "expectedControlType": "", "processors": "", "interactions": "", "initialStateCheck": false @@ -86,6 +86,24 @@ "processors": "", "interactions": "", "initialStateCheck": false + }, + { + "name": "Diapason", + "type": "Button", + "id": "02f096f9-cab3-45f3-906c-5d551c7fca4f", + "expectedControlType": "", + "processors": "", + "interactions": "Press", + "initialStateCheck": false + }, + { + "name": "Fire", + "type": "Button", + "id": "a3ec6166-3b8f-4545-9fa4-40583be0fc66", + "expectedControlType": "", + "processors": "", + "interactions": "Press", + "initialStateCheck": false } ], "bindings": [ @@ -444,7 +462,7 @@ { "name": "", "id": "b3f66d0b-7751-423f-908b-a11c5bd95930", - "path": "/buttonNorth", + "path": "/buttonSouth", "interactions": "", "processors": "", "groups": "Gamepad", @@ -484,6 +502,39 @@ "action": "Crouch", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "c9e20dfa-226a-4fd9-ba3d-d933d9c41052", + "path": "/buttonNorth", + "interactions": "", + "processors": "", + "groups": "", + "action": "Diapason", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "f1df4afa-9318-434d-9dfe-72c47427a3af", + "path": "/tab", + "interactions": "", + "processors": "", + "groups": "", + "action": "Diapason", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "b2acf56f-47c9-448d-88cf-204122b2df92", + "path": "/rightTrigger", + "interactions": "", + "processors": "", + "groups": "", + "action": "Fire", + "isComposite": false, + "isPartOfComposite": false } ] }, diff --git a/Assets/Unheimlich_POC/Prefabs/Items/SoundEmitter.prefab b/Assets/Unheimlich_POC/Prefabs/Items/SoundEmitter.prefab index 44204124..327ca5c7 100644 --- a/Assets/Unheimlich_POC/Prefabs/Items/SoundEmitter.prefab +++ b/Assets/Unheimlich_POC/Prefabs/Items/SoundEmitter.prefab @@ -11,7 +11,6 @@ GameObject: - component: {fileID: 3279932207826154136} - component: {fileID: 1111284075867638658} - component: {fileID: 6070160908100218527} - - component: {fileID: 5262275440216225989} m_Layer: 0 m_Name: Cube m_TagString: Untagged @@ -91,27 +90,6 @@ MeshRenderer: m_SortingOrder: 0 m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &5262275440216225989 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1472533880154226824} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1996348199229998323 GameObject: m_ObjectHideFlags: 0 @@ -153,6 +131,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5755410889840572423} + - component: {fileID: 196559139152754184} + - component: {fileID: 7881895566796712951} m_Layer: 0 m_Name: SoundEmitter m_TagString: Untagged @@ -177,6 +157,78 @@ Transform: - {fileID: 4721786510254652090} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &196559139152754184 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2822448012032697683} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e15490f7adacb594cb114f535e71d6b6, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Unheimlich.Audio.AudioListenable + _emitterType: 3 + _useProceduralAudio: 1 + _staticAudioClip: {fileID: 0} + _loopStaticAudio: 1 + _baseFrequency: 440 + _frequencyVariation: 50 + _volumeMin: 0.3 + _volumeMax: 0.7 + _durationMin: 0.5 + _durationMax: 1.5 + _maxDistance: 10 + _distanceAttenuation: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: -2 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -2 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + _enableVibration: 1 + _vibrationIntensityMin: 0.1 + _vibrationIntensityMax: 0.3 + _vibrationFrequency: 10 +--- !u!65 &7881895566796712951 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2822448012032697683} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 8, y: 5, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1001 &7448775950719106884 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Unheimlich_POC/Prefabs/Player/Diapason.prefab b/Assets/Unheimlich_POC/Prefabs/Player/Diapason.prefab index 9429ce83..72b3e1a2 100644 --- a/Assets/Unheimlich_POC/Prefabs/Player/Diapason.prefab +++ b/Assets/Unheimlich_POC/Prefabs/Player/Diapason.prefab @@ -1,5 +1,69 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2703125195149021214 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6223649513262997670} + m_Layer: 0 + m_Name: VFX + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6223649513262997670 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2703125195149021214} + serializedVersion: 2 + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.16666667, y: 0.16666663, z: 0.16666663} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6349416298506944754} + m_Father: {fileID: 6952011244025097897} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2804686510863457871 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2315210776226997430} + m_Layer: 0 + m_Name: Render + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2315210776226997430 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2804686510863457871} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6952011244025097897} + m_Father: {fileID: 5629947512209565818} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5030950371277861040 GameObject: m_ObjectHideFlags: 0 @@ -30,8 +94,9 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 6, y: 6, z: 6} m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 5629947512209565818} + m_Children: + - {fileID: 6223649513262997670} + m_Father: {fileID: 2315210776226997430} m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!33 &7714367536335993543 MeshFilter: @@ -99,6 +164,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5629947512209565818} + - component: {fileID: 7173446854330675591} m_Layer: 0 m_Name: Diapason m_TagString: Untagged @@ -119,17 +185,38 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6952011244025097897} - - {fileID: 6349416298506944754} + - {fileID: 2315210776226997430} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &7173446854330675591 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8689584738786529861} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 05ab6d80633357e49bba08715d0df3c6, type: 2} + 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!1001 &6314884808766083715 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 5629947512209565818} + m_TransformParent: {fileID: 6223649513262997670} m_Modifications: - target: {fileID: 1124780566057055841, guid: 8bb34a961d0969644bdd7a29960b46c9, type: 3} propertyPath: m_Name @@ -153,15 +240,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1134716054066844273, guid: 8bb34a961d0969644bdd7a29960b46c9, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1134716054066844273, guid: 8bb34a961d0969644bdd7a29960b46c9, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1134716054066844273, guid: 8bb34a961d0969644bdd7a29960b46c9, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1134716054066844273, guid: 8bb34a961d0969644bdd7a29960b46c9, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/Unheimlich_POC/Prefabs/Player/Player.prefab b/Assets/Unheimlich_POC/Prefabs/Player/Player.prefab index 2d1314a1..d68e73ff 100644 --- a/Assets/Unheimlich_POC/Prefabs/Player/Player.prefab +++ b/Assets/Unheimlich_POC/Prefabs/Player/Player.prefab @@ -176,8 +176,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8240327778457960307} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1.8097343e-11, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -383,6 +383,10 @@ MonoBehaviour: m_Calls: [] m_ActionId: 9caa3d8a-6b2f-4e8e-8bad-6ede561bd9be m_ActionName: UI/TrackedDeviceOrientation + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 02f096f9-cab3-45f3-906c-5d551c7fca4f + m_ActionName: 'Player/Diapason[/Keyboard/tab]' m_NeverAutoSwitchControlSchemes: 0 m_DefaultControlScheme: m_DefaultActionMap: @@ -493,23 +497,50 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::Unheimlich.Gameplay.Player.DiapasonListeningHandler _diapasonObject: {fileID: 3833126793998633073} - _diapasonAnimator: {fileID: 0} + _diapasonAnimator: {fileID: 3326093237010115507} _playerCamera: {fileID: 4106604842127079875} _cursorTransform: {fileID: 0} _listeningRange: 5 _listenableLayers: serializedVersion: 2 - m_Bits: 0 + m_Bits: 1 _concentrationDuration: 1 _breathInDuration: 0.5 + _diapasonTweenDuration: 0.3 + _diapasonHideOffset: -2 + _diapasonTweenCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 _cameraPanSpeed: 2 _cameraPanBorderSize: 0.1 _maxCameraPanAngle: 15 _vignetteIntensity: 0.5 - _vignetteEffect: {fileID: 0} + _vignetteEffect: {fileID: 3919526576499794210} _breathInClip: {fileID: 0} _diapasonTapClip: {fileID: 0} _ambientAttenuationAmount: 0.3 + _audioFadeDuration: 0.5 _diapasonAction: {fileID: 0} --- !u!114 &3919526576499794210 MonoBehaviour: @@ -523,7 +554,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 878ebc270c13e5c49a3813b1848f6ea5, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::Unheimlich.Gameplay.Player.ListeningVignetteEffect - _globalVolume: {fileID: 0} + _listeningVolume: {fileID: 0} _targetIntensity: 0.5 _transitionSpeed: 2 --- !u!65 &3942456782017280985 @@ -629,43 +660,43 @@ PrefabInstance: m_Modifications: - target: {fileID: 5629947512209565818, guid: 2812cddb6de789b46ac9d640bb9ce410, type: 3} propertyPath: m_LocalPosition.x - value: 0.401 + value: 0.572 objectReference: {fileID: 0} - target: {fileID: 5629947512209565818, guid: 2812cddb6de789b46ac9d640bb9ce410, type: 3} propertyPath: m_LocalPosition.y - value: -0.163 + value: -0.16753393 objectReference: {fileID: 0} - target: {fileID: 5629947512209565818, guid: 2812cddb6de789b46ac9d640bb9ce410, type: 3} propertyPath: m_LocalPosition.z - value: 1.148 + value: 1.1529833 objectReference: {fileID: 0} - target: {fileID: 5629947512209565818, guid: 2812cddb6de789b46ac9d640bb9ce410, type: 3} propertyPath: m_LocalRotation.w - value: 0.70672613 + value: 0.7519007 objectReference: {fileID: 0} - target: {fileID: 5629947512209565818, guid: 2812cddb6de789b46ac9d640bb9ce410, type: 3} propertyPath: m_LocalRotation.x - value: 0.14218356 + value: -0.13395253 objectReference: {fileID: 0} - target: {fileID: 5629947512209565818, guid: 2812cddb6de789b46ac9d640bb9ce410, type: 3} propertyPath: m_LocalRotation.y - value: 0.6926643 + value: -0.6397152 objectReference: {fileID: 0} - target: {fileID: 5629947512209565818, guid: 2812cddb6de789b46ac9d640bb9ce410, type: 3} propertyPath: m_LocalRotation.z - value: 0.023197526 + value: -0.08640981 objectReference: {fileID: 0} - target: {fileID: 5629947512209565818, guid: 2812cddb6de789b46ac9d640bb9ce410, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 9.72 + value: -18.179 objectReference: {fileID: 0} - target: {fileID: 5629947512209565818, guid: 2812cddb6de789b46ac9d640bb9ce410, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 90 + value: -81.182 objectReference: {fileID: 0} - target: {fileID: 5629947512209565818, guid: 2812cddb6de789b46ac9d640bb9ce410, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 13.48 + value: 2.5 objectReference: {fileID: 0} - target: {fileID: 8689584738786529861, guid: 2812cddb6de789b46ac9d640bb9ce410, type: 3} propertyPath: m_Name @@ -681,6 +712,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 5629947512209565818, guid: 2812cddb6de789b46ac9d640bb9ce410, type: 3} m_PrefabInstance: {fileID: 5595049384473844276} m_PrefabAsset: {fileID: 0} +--- !u!95 &3326093237010115507 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 7173446854330675591, guid: 2812cddb6de789b46ac9d640bb9ce410, type: 3} + m_PrefabInstance: {fileID: 5595049384473844276} + m_PrefabAsset: {fileID: 0} --- !u!1 &3833126793998633073 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8689584738786529861, guid: 2812cddb6de789b46ac9d640bb9ce410, type: 3} diff --git a/Assets/Unheimlich_POC/Prefabs/Rooms/RoomToLoadFour.prefab b/Assets/Unheimlich_POC/Prefabs/Rooms/RoomToLoadFour.prefab index 80cdf539..473128a4 100644 --- a/Assets/Unheimlich_POC/Prefabs/Rooms/RoomToLoadFour.prefab +++ b/Assets/Unheimlich_POC/Prefabs/Rooms/RoomToLoadFour.prefab @@ -1342,8 +1342,67 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2822448012032697683, guid: 01f9cdfc376629a4c813a82a095c3b3a, type: 3} + insertIndex: -1 + addedObject: {fileID: 5385940087340611163} m_SourcePrefab: {fileID: 100100000, guid: 01f9cdfc376629a4c813a82a095c3b3a, type: 3} +--- !u!1 &2794013674881297554 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2822448012032697683, guid: 01f9cdfc376629a4c813a82a095c3b3a, type: 3} + m_PrefabInstance: {fileID: 138781599420729793} + m_PrefabAsset: {fileID: 0} +--- !u!114 &5385940087340611163 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2794013674881297554} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e15490f7adacb594cb114f535e71d6b6, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Unheimlich.Audio.AudioListenable + _emitterType: 1 + _useProceduralAudio: 1 + _staticAudioClip: {fileID: 0} + _loopStaticAudio: 1 + _baseFrequency: 200 + _frequencyVariation: 20 + _volumeMin: 0.2 + _volumeMax: 0.4 + _durationMin: 0.5 + _durationMax: 2 + _maxDistance: 10 + _distanceAttenuation: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + _enableVibration: 1 + _vibrationIntensityMin: 0.1 + _vibrationIntensityMax: 0.5 + _vibrationFrequency: 10 --- !u!4 &5634670077426659782 stripped Transform: m_CorrespondingSourceObject: {fileID: 5755410889840572423, guid: 01f9cdfc376629a4c813a82a095c3b3a, type: 3} diff --git a/Assets/Unheimlich_POC/Prefabs/Rooms/RoomToLoadOne.prefab b/Assets/Unheimlich_POC/Prefabs/Rooms/RoomToLoadOne.prefab index 5b23a540..c36d804c 100644 --- a/Assets/Unheimlich_POC/Prefabs/Rooms/RoomToLoadOne.prefab +++ b/Assets/Unheimlich_POC/Prefabs/Rooms/RoomToLoadOne.prefab @@ -125,15 +125,15 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f399329860533c14fba15187d7e340db, type: 3} m_Name: m_EditorClassIdentifier: - _clip: {fileID: 8300000, guid: e6579f8a931d2f445906aabd0395ed50, type: 3} + _clip: {fileID: 8300000, guid: 6843ca48adc228442947da83edc3270e, type: 3} _playOnStart: 1 _loop: 1 _volume: 1 _sourceMinDistance: 1 - _sourceMaxDistance: 20 + _sourceMaxDistance: 30 _enableDistanceCulling: 1 _cullingDistance: 20 - _fadeStartDistance: 10 + _fadeStartDistance: 5 --- !u!1 &3133098078222641205 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Unheimlich_POC/Prefabs/VFX.meta b/Assets/Unheimlich_POC/Prefabs/VFX.meta new file mode 100644 index 00000000..3afdd330 --- /dev/null +++ b/Assets/Unheimlich_POC/Prefabs/VFX.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 290f47cd17f0b1e428b9fcafae25028e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Unheimlich_POC/Prefabs/Particles.meta b/Assets/Unheimlich_POC/Prefabs/VFX/Particles.meta similarity index 100% rename from Assets/Unheimlich_POC/Prefabs/Particles.meta rename to Assets/Unheimlich_POC/Prefabs/VFX/Particles.meta diff --git a/Assets/Unheimlich_POC/Prefabs/Particles/DiapasonParticles.prefab b/Assets/Unheimlich_POC/Prefabs/VFX/Particles/DiapasonParticles.prefab similarity index 99% rename from Assets/Unheimlich_POC/Prefabs/Particles/DiapasonParticles.prefab rename to Assets/Unheimlich_POC/Prefabs/VFX/Particles/DiapasonParticles.prefab index a5c4a2ec..46b8b610 100644 --- a/Assets/Unheimlich_POC/Prefabs/Particles/DiapasonParticles.prefab +++ b/Assets/Unheimlich_POC/Prefabs/VFX/Particles/DiapasonParticles.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 1134716054066844273} - component: {fileID: 7195447085232448540} - component: {fileID: 8767648373964295896} - m_Layer: 0 + m_Layer: 2 m_Name: DiapasonParticles m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/Unheimlich_POC/Prefabs/Particles/DiapasonParticles.prefab.meta b/Assets/Unheimlich_POC/Prefabs/VFX/Particles/DiapasonParticles.prefab.meta similarity index 100% rename from Assets/Unheimlich_POC/Prefabs/Particles/DiapasonParticles.prefab.meta rename to Assets/Unheimlich_POC/Prefabs/VFX/Particles/DiapasonParticles.prefab.meta diff --git a/Assets/Unheimlich_POC/Scenes/MainScene/Global Volume Profile.asset b/Assets/Unheimlich_POC/Scenes/MainScene/Global Volume Profile.asset index f7e50842..3e41c0b3 100644 --- a/Assets/Unheimlich_POC/Scenes/MainScene/Global Volume Profile.asset +++ b/Assets/Unheimlich_POC/Scenes/MainScene/Global Volume Profile.asset @@ -74,7 +74,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 899c54efeace73346a0a16faa3afe726, type: 3} m_Name: Vignette m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.Vignette - active: 1 + active: 0 color: m_OverrideState: 0 m_Value: {r: 0, g: 0, b: 0, a: 1} @@ -83,10 +83,10 @@ MonoBehaviour: m_Value: {x: 0.5, y: 0.5} intensity: m_OverrideState: 1 - m_Value: 0 + m_Value: 0.444 smoothness: - m_OverrideState: 0 - m_Value: 0.2 + m_OverrideState: 1 + m_Value: 1 rounded: m_OverrideState: 0 m_Value: 0 diff --git a/Assets/Unheimlich_POC/Scenes/MainScene/MainScene.unity b/Assets/Unheimlich_POC/Scenes/MainScene/MainScene.unity index cc848a65..5af62ce2 100644 --- a/Assets/Unheimlich_POC/Scenes/MainScene/MainScene.unity +++ b/Assets/Unheimlich_POC/Scenes/MainScene/MainScene.unity @@ -152,6 +152,20 @@ Transform: - {fileID: 1475986548} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &37800871 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3} + m_Name: Player/Fire + m_EditorClassIdentifier: Unity.InputSystem::UnityEngine.InputSystem.InputActionReference + m_Asset: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3} + m_ActionId: a3ec6166-3b8f-4545-9fa4-40583be0fc66 --- !u!43 &183470776 Mesh: m_ObjectHideFlags: 0 @@ -330,6 +344,184 @@ Mesh: - serializedVersion: 1 m_IndexStart: 0 m_IndexCount: 0 +--- !u!43 &304991524 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: pb_Mesh-312764 + serializedVersion: 12 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 84 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 39 + localAABB: + m_Center: {x: 0.033644676, y: 7.270544, z: 0} + m_Extent: {x: 14.425397, y: 7.270544, z: 13.130945} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 00000100020001000300020001000400030004000500030002000300060003000700060003000500070005000800070009000a000b0009000c000a000d000b000e000d0009000b000f00100011000f001200100013001100140013000f001100150016001700150018001600190017001a001900150017001b001c001d001b001e001c001f001d0020001f001b001d00210022002300210024002200240025002200240026002500 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 39 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 48 + format: 0 + dimension: 4 + - stream: 0 + offset: 64 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 3120 + _typelessdata: 9e4466c1000000005a1852c1000000000000803f000000000000803f0000000000000000000080bf9e4466c15a1852c100000000000000000000000000000000000000000000000000000000000000009e4466c10000000000000000000000000000803f000000000000803f0000000000000000000080bf9e4466c100000000000000000000000000000000000000000000000000000000000000000000000000000000000000005a1852c1000000000000803f000000000000803f0000000000000000000080bf000000005a1852c10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000803f000000000000803f0000000000000000000080bf000000000000000000000000000000000000000000000000000000000000000000000000000000009e4466c1000000005a185241000000000000803f000000000000803f0000000000000000000080bf9e4466c15a185241000000000000000000000000000000000000000000000000000000000000000000000000000000005a185241000000000000803f000000000000803f0000000000000000000080bf000000005a18524100000000000000000000000000000000000000000000000000000000000000009e446641000000005a1852c1000000000000803f000000000000803f0000000000000000000080bf9e4466415a1852c100000000000000000000000000000000000000000000000000000000000000009e4466410000000000000000000000000000803f000000000000803f0000000000000000000080bf9e4466410000000000000000000000000000000000000000000000000000000000000000000000009e446641000000005a185241000000000000803f000000000000803f0000000000000000000080bf9e4466415a18524100000000000000000000000000000000000000000000000000000000000000009e4466414ca8684100000000000080bf00000000000000000000000000000000000080bf000080bf000000004ca8684100000000000000000000000000000000000000000000000000000000000000009e446641000000005a1852c1000080bf00000000000000000000000000000000000080bf000080bf5a1852410000000000000000000000000000000000000000000000000000000000000000000000009e4466410000000000000000000080bf00000000000000000000000000000000000080bf000080bf000000000000000000000000000000000000000000000000000000000000000000000000000000009e4466414ca86841581852c1000080bf00000000000000000000000000000000000080bf000080bf581852414ca8684100000000000000000000000000000000000000000000000000000000000000009e4466414ca8684158185241000080bf00000000000000000000000000000000000080bf000080bf581852c14ca8684100000000000000000000000000000000000000000000000000000000000000009e446641000000005a185241000080bf00000000000000000000000000000000000080bf000080bf5a1852c1000000000000000000000000000000000000000000000000000000000000000000000000000000004ca8684158185241000000009fd70cb4000080bf0000803f0000000000000000000080bf000000004aa8684100000000000000000000000000000000000000000000000000000000000000009e446641000000005a185241000000009fd70cb4000080bf0000803f0000000000000000000080bf9e4466418c2ce7b5000000000000000000000000000000000000000000000000000000000000000000000000000000005a185241000000009fd70cb4000080bf0000803f0000000000000000000080bf000000008c2ce7b500000000000000000000000000000000000000000000000000000000000000009e4466414ca8684158185241000000009fd70cb4000080bf0000803f0000000000000000000080bf9e4466414aa8684100000000000000000000000000000000000000000000000000000000000000009e4466c14ca8684158185241000000009fd70cb4000080bf0000803f0000000000000000000080bf9e4466c14aa8684100000000000000000000000000000000000000000000000000000000000000009e4466c1000000005a185241000000009fd70cb4000080bf0000803f0000000000000000000080bf9e4466c18c2ce7b500000000000000000000000000000000000000000000000000000000000000009e4466c14ca86841000000000000803f000000000000000000000000000000000000803f000080bf000000004ca8684100000000000000000000000000000000000000000000000000000000000000009e4466c1000000005a1852410000803f000000000000000000000000000000000000803f000080bf5a1852410000000000000000000000000000000000000000000000000000000000000000000000009e4466c100000000000000000000803f000000000000000000000000000000000000803f000080bf000000000000000000000000000000000000000000000000000000000000000000000000000000009e4466c14ca86841581852410000803f000000000000000000000000000000000000803f000080bf581852414ca8684100000000000000000000000000000000000000000000000000000000000000009e4466c14ca86841581852c10000803f000000000000000000000000000000000000803f000080bf581852c14ca8684100000000000000000000000000000000000000000000000000000000000000009e4466c1000000005a1852c10000803f000000000000000000000000000000000000803f000080bf5a1852c1000000000000000000000000000000000000000000000000000000000000000000000000000000004ca86841581852c1000000009fd70cb40000803f000080bf0000000000000000000080bf000000004aa8684100000000000000000000000000000000000000000000000000000000000000009e4466c1000000005a1852c1000000009fd70cb40000803f000080bf0000000000000000000080bf9e4466418c2ce7b5000000000000000000000000000000000000000000000000000000000000000000000000000000005a1852c1000000009fd70cb40000803f000080bf0000000000000000000080bf000000008c2ce7b500000000000000000000000000000000000000000000000000000000000000009e4466c14ca86841581852c1000000009fd70cb40000803f000080bf0000000000000000000080bf9e4466414aa8684100000000000000000000000000000000000000000000000000000000000000009e4466414ca86841581852c1000000009fd70cb40000803f000080bf0000000000000000000080bf9e4466c14aa8684100000000000000000000000000000000000000000000000000000000000000009e446641000000005a1852c1000000009fd70cb40000803f000080bf0000000000000000000080bf9e4466c18c2ce7b500000000000000000000000000000000000000000000000000000000000000003c5867414ca86841581852c100000000000080bf00000000000080bf0000000000000000000080bf3c5867c1581852c100000000000000000000000000000000000000000000000000000000000000009e4466c14ca868410000000000000000000080bf00000000000080bf0000000000000000000080bf9e4466410000000000000000000000000000000000000000000000000000000000000000000000009e4466c14ca86841581852c100000000000080bf00000000000080bf0000000000000000000080bf9e446641581852c100000000000000000000000000000000000000000000000000000000000000003c5867414ca868410000000000000000000080bf00000000000080bf0000000000000000000080bf3c5867c10000000000000000000000000000000000000000000000000000000000000000000000009e4466c14ca868415818524100000000000080bf00000000000080bf0000000000000000000080bf9e4466415818524100000000000000000000000000000000000000000000000000000000000000003c5867414ca868415818524100000000000080bf00000000000080bf0000000000000000000080bf3c5867c1581852410000000000000000000000000000000000000000000000000000000000000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0.033644676, y: 7.270544, z: 0} + m_Extent: {x: 14.425397, y: 7.270544, z: 13.130945} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + 'm_MeshMetrics[0]': 1 + 'm_MeshMetrics[1]': 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: + m_MeshLodInfo: + serializedVersion: 2 + m_LodSelectionCurve: + serializedVersion: 1 + m_LodSlope: 0 + m_LodBias: 0 + m_NumLevels: 1 + m_SubMeshes: + - serializedVersion: 2 + m_Levels: + - serializedVersion: 1 + m_IndexStart: 0 + m_IndexCount: 0 --- !u!1 &410087039 GameObject: m_ObjectHideFlags: 0 @@ -553,6 +745,11 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 96 _autoCreateDialogueCamera: 1 +--- !u!95 &451500111 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 3326093237010115507, guid: 92d3cde0c88c75f48a98d082c573338b, type: 3} + m_PrefabInstance: {fileID: 5090177222934034458} + m_PrefabAsset: {fileID: 0} --- !u!1 &543806957 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2911834610010628020, guid: 92d3cde0c88c75f48a98d082c573338b, type: 3} @@ -589,6 +786,20 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &777851618 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3} + m_Name: Player/Look + m_EditorClassIdentifier: Unity.InputSystem::UnityEngine.InputSystem.InputActionReference + m_Asset: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3} + m_ActionId: 6b444451-8a00-4d00-a97e-f47457f736a8 --- !u!1 &832575517 GameObject: m_ObjectHideFlags: 0 @@ -670,6 +881,20 @@ Transform: - {fileID: 1296540339} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1121804270 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3} + m_Name: Player/Diapason + m_EditorClassIdentifier: Unity.InputSystem::UnityEngine.InputSystem.InputActionReference + m_Asset: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3} + m_ActionId: 02f096f9-cab3-45f3-906c-5d551c7fca4f --- !u!4 &1128970472 stripped Transform: m_CorrespondingSourceObject: {fileID: 5383576672370031505, guid: 92d3cde0c88c75f48a98d082c573338b, type: 3} @@ -854,6 +1079,11 @@ Transform: - {fileID: 1254363909} m_Father: {fileID: 1976498063} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1321496847 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8240327778457960307, guid: 92d3cde0c88c75f48a98d082c573338b, type: 3} + m_PrefabInstance: {fileID: 5090177222934034458} + m_PrefabAsset: {fileID: 0} --- !u!1 &1355570441 GameObject: m_ObjectHideFlags: 0 @@ -1138,11 +1368,126 @@ MonoBehaviour: _recoveryDuration: 0.5 _focusRetentionTime: 0.1 _fallbackShakeIntensity: 30 +--- !u!1001 &1801866815 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 240762672413097929, guid: 20e4ea3ceee86dd4ba3881425b65790d, type: 3} + propertyPath: _emitterType + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1308658098883283559, guid: 20e4ea3ceee86dd4ba3881425b65790d, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 304991524} + - target: {fileID: 1450394912075574427, guid: 20e4ea3ceee86dd4ba3881425b65790d, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 2135157598} + - target: {fileID: 2146349534604163061, guid: 20e4ea3ceee86dd4ba3881425b65790d, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 2135157598} + - target: {fileID: 2146349534604163061, guid: 20e4ea3ceee86dd4ba3881425b65790d, type: 3} + propertyPath: m_VersionIndex + value: 3841 + objectReference: {fileID: 0} + - target: {fileID: 3965737018690194595, guid: 20e4ea3ceee86dd4ba3881425b65790d, type: 3} + propertyPath: m_LocalPosition.x + value: 24.37 + objectReference: {fileID: 0} + - target: {fileID: 3965737018690194595, guid: 20e4ea3ceee86dd4ba3881425b65790d, type: 3} + propertyPath: m_LocalPosition.y + value: -0.00000043723333 + objectReference: {fileID: 0} + - target: {fileID: 3965737018690194595, guid: 20e4ea3ceee86dd4ba3881425b65790d, type: 3} + propertyPath: m_LocalPosition.z + value: 19.231745 + objectReference: {fileID: 0} + - target: {fileID: 3965737018690194595, guid: 20e4ea3ceee86dd4ba3881425b65790d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3965737018690194595, guid: 20e4ea3ceee86dd4ba3881425b65790d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3965737018690194595, guid: 20e4ea3ceee86dd4ba3881425b65790d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3965737018690194595, guid: 20e4ea3ceee86dd4ba3881425b65790d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3965737018690194595, guid: 20e4ea3ceee86dd4ba3881425b65790d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3965737018690194595, guid: 20e4ea3ceee86dd4ba3881425b65790d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3965737018690194595, guid: 20e4ea3ceee86dd4ba3881425b65790d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5856947998729604413, guid: 20e4ea3ceee86dd4ba3881425b65790d, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 2135157598} + - target: {fileID: 6433754577218517818, guid: 20e4ea3ceee86dd4ba3881425b65790d, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 304991524} + - target: {fileID: 7423402686373121341, guid: 20e4ea3ceee86dd4ba3881425b65790d, type: 3} + propertyPath: _emitterType + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 7904602484025268702, guid: 20e4ea3ceee86dd4ba3881425b65790d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7994283466214186746, guid: 20e4ea3ceee86dd4ba3881425b65790d, type: 3} + propertyPath: m_Name + value: RoomToLoadFour + objectReference: {fileID: 0} + - target: {fileID: 8209576767969738346, guid: 20e4ea3ceee86dd4ba3881425b65790d, type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 304991524} + - target: {fileID: 8209576767969738346, guid: 20e4ea3ceee86dd4ba3881425b65790d, type: 3} + propertyPath: m_VersionIndex + value: 5839 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 20e4ea3ceee86dd4ba3881425b65790d, type: 3} --- !u!4 &1804390687 stripped Transform: m_CorrespondingSourceObject: {fileID: 8057303164503007523, guid: 204c7983537bb6c44a8ecafa782fca99, type: 3} m_PrefabInstance: {fileID: 1685269849889909290} m_PrefabAsset: {fileID: 0} +--- !u!114 &1811682114 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3} + m_Name: Player/Diapason + m_EditorClassIdentifier: Unity.InputSystem::UnityEngine.InputSystem.InputActionReference + m_Asset: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3} + m_ActionId: 02f096f9-cab3-45f3-906c-5d551c7fca4f --- !u!1 &1842095239 GameObject: m_ObjectHideFlags: 0 @@ -1651,6 +1996,184 @@ Transform: m_CorrespondingSourceObject: {fileID: 2089706605371115838, guid: 0048fed3be8aeb8449285faf2cc63a15, type: 3} m_PrefabInstance: {fileID: 3614017092883427690} m_PrefabAsset: {fileID: 0} +--- !u!43 &2135157598 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: pb_Mesh-312704 + serializedVersion: 12 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 120 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 56 + localAABB: + m_Center: {x: 1.5878825, y: 2.0809317, z: -0.43092784} + m_Extent: {x: 1.5878825, y: 2.0809317, z: 0.43092784} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 0000010002000000020003000400050006000400060007000800090000000800000003000a00050004000a0004000b0009000b0004000900040000000c000d000e000c000e000f001000110012001000120013000e00140015000e0015000f00120011001600120016001700120017001400120014000e00180019001a0018001a001b001c001d001e001c001e001f002000210022002000220023002400250026002400270025002800260029002800240026002a002b002c002a002d002b002e002c002f002e002a002c0030002f00310030002e002f00320033003400320035003300360034003700360032003400 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 56 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 48 + format: 0 + dimension: 4 + - stream: 0 + offset: 64 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 4480 + _typelessdata: feff3f3ff85b6a4080be58bf0000000000000000000080bf0000803f0000000000000000000080bffeff3f3ff85b6a400000000000000000000000000000000000000000000000000000000000000000feff3f3f0000000080be58bf0000000000000000000080bf0000803f0000000000000000000080bffeff3f3f000000000000000000000000000000000000000000000000000000000000000000000000000000b40000000080be58bf0000000000000000000080bf0000803f0000000000000000000080bf000000b4000000000000000000000000000000000000000000000000000000000000000000000000000000b4f85b6a4080be58bf0000000000000000000080bf0000803f0000000000000000000080bf000000b4f85b6a400000000000000000000000000000000000000000000000000000000000000000bc3f1b40f85b6a4080be58bf0000000000000000000080bf0000803f0000000000000000000080bfbc3f1b40f85b6a400000000000000000000000000000000000000000000000000000000000000000bc3f4b40f85b6a4080be58bf0000000000000000000080bf0000803f0000000000000000000080bfbc3f4b40f85b6a400000000000000000000000000000000000000000000000000000000000000000bc3f4b400000000080be58bf0000000000000000000080bf0000803f0000000000000000000080bfbc3f4b40000000000000000000000000000000000000000000000000000000000000000000000000bc3f1b400000000080be58bf0000000000000000000080bf0000803f0000000000000000000080bfbc3f1b40000000000000000000000000000000000000000000000000000000000000000000000000000000b4fc2d854080be58bf0000000000000000000080bf0000803f0000000000000000000080bf000000b4fc2d85400000000000000000000000000000000000000000000000000000000000000000feff3f3ffc2d854080be58bf0000000000000000000080bf0000803f0000000000000000000080bffeff3f3ffc2d85400000000000000000000000000000000000000000000000000000000000000000bc3f4b40fc2d854080be58bf0000000000000000000080bf0000803f0000000000000000000080bfbc3f4b40fc2d85400000000000000000000000000000000000000000000000000000000000000000bc3f1b40fc2d854080be58bf0000000000000000000080bf0000803f0000000000000000000080bfbc3f1b40fc2d85400000000000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000803f000080bf0000000000000000000080bf00000034000000000000000000000000000000000000000000000000000000000000000000000000feff3f3f000000000000000000000000000000000000803f000080bf0000000000000000000080bffeff3fbf000000000000000000000000000000000000000000000000000000000000000000000000feff3f3ff85b6a400000000000000000000000000000803f000080bf0000000000000000000080bffeff3fbff85b6a400000000000000000000000000000000000000000000000000000000000000000000000b4f85b6a400000000000000000000000000000803f000080bf0000000000000000000080bf00000034f85b6a400000000000000000000000000000000000000000000000000000000000000000bc3f4b40000000000000000000000000000000000000803f000080bf0000000000000000000080bfbc3f4bc0000000000000000000000000000000000000000000000000000000000000000000000000bc3f4b40f85b6a400000000000000000000000000000803f000080bf0000000000000000000080bfbc3f4bc0f85b6a400000000000000000000000000000000000000000000000000000000000000000bc3f1b40f85b6a400000000000000000000000000000803f000080bf0000000000000000000080bfbc3f1bc0f85b6a400000000000000000000000000000000000000000000000000000000000000000bc3f1b40000000000000000000000000000000000000803f000080bf0000000000000000000080bfbc3f1bc0000000000000000000000000000000000000000000000000000000000000000000000000feff3f3ffc2d85400000000000000000000000000000803f000080bf0000000000000000000080bffeff3fbffc2d85400000000000000000000000000000000000000000000000000000000000000000000000b4fc2d85400000000000000000000000000000803f000080bf0000000000000000000080bf00000034fc2d85400000000000000000000000000000000000000000000000000000000000000000bc3f4b40fc2d85400000000000000000000000000000803f000080bf0000000000000000000080bfbc3f4bc0fc2d85400000000000000000000000000000000000000000000000000000000000000000bc3f1b40fc2d85400000000000000000000000000000803f000080bf0000000000000000000080bfbc3f1bc0fc2d85400000000000000000000000000000000000000000000000000000000000000000bc3f1b40f85b6a400000000000000000000080bf00000000000080bf0000000000000000000080bfbc3f1bc0000000000000000000000000000000000000000000000000000000000000000000000000feff3f3ff85b6a400000000000000000000080bf00000000000080bf0000000000000000000080bffeff3fbf000000000000000000000000000000000000000000000000000000000000000000000000feff3f3ff85b6a4080be58bf00000000000080bf00000000000080bf0000000000000000000080bffeff3fbf80be58bf0000000000000000000000000000000000000000000000000000000000000000bc3f1b40f85b6a4080be58bf00000000000080bf00000000000080bf0000000000000000000080bfbc3f1bc080be58bf0000000000000000000000000000000000000000000000000000000000000000bc3f1b40f85b6a4000000000000080bf00000000000000000000000000000000000080bf000080bf00000000f85b6a400000000000000000000000000000000000000000000000000000000000000000bc3f1b40f85b6a4080be58bf000080bf00000000000000000000000000000000000080bf000080bf80be583ff85b6a400000000000000000000000000000000000000000000000000000000000000000bc3f1b400000000080be58bf000080bf00000000000000000000000000000000000080bf000080bf80be583f000000000000000000000000000000000000000000000000000000000000000000000000bc3f1b400000000000000000000080bf00000000000000000000000000000000000080bf000080bf00000000000000000000000000000000000000000000000000000000000000000000000000000000feff3f3ff85b6a4080be58bf0000803f000000000000000000000000000000000000803f000080bf80be58bff85b6a400000000000000000000000000000000000000000000000000000000000000000feff3f3ff85b6a40000000000000803f000000000000000000000000000000000000803f000080bf00000000f85b6a400000000000000000000000000000000000000000000000000000000000000000feff3f3f00000000000000000000803f000000000000000000000000000000000000803f000080bf00000000000000000000000000000000000000000000000000000000000000000000000000000000feff3f3f0000000080be58bf0000803f000000000000000000000000000000000000803f000080bf80be58bf000000000000000000000000000000000000000000000000000000000000000000000000000000b4f85b6a4093a25cbf000080bf00000000000000000000000000000000000080bf000080bf93a25c3ff85b6a400000000000000000000000000000000000000000000000000000000000000000000000b40000000000000000000080bf00000000000000000000000000000000000080bf000080bf00000000000000000000000000000000000000000000000000000000000000000000000000000000000000b4f85b6a4000000000000080bf00000000000000000000000000000000000080bf000080bf00000000f85b6a400000000000000000000000000000000000000000000000000000000000000000000000b40000000093a25cbf000080bf00000000000000000000000000000000000080bf000080bf93a25c3f000000000000000000000000000000000000000000000000000000000000000000000000000000b4fc2d854093a25cbf000080bf00000000000000000000000000000000000080bf000080bf93a25c3ffc2d85400000000000000000000000000000000000000000000000000000000000000000000000b4fc2d854000000000000080bf00000000000000000000000000000000000080bf000080bf00000000fc2d85400000000000000000000000000000000000000000000000000000000000000000feff3f3ffc2d854093a25cbf000000000000803f000000000000803f0000000000000000000080bffeff3f3f93a25cbf0000000000000000000000000000000000000000000000000000000000000000000000b4fc2d854000000000000000000000803f000000000000803f0000000000000000000080bf000000b4000000000000000000000000000000000000000000000000000000000000000000000000feff3f3ffc2d854000000000000000000000803f000000000000803f0000000000000000000080bffeff3f3f000000000000000000000000000000000000000000000000000000000000000000000000000000b4fc2d854093a25cbf000000000000803f000000000000803f0000000000000000000080bf000000b493a25cbf0000000000000000000000000000000000000000000000000000000000000000bc3f1b40fc2d854093a25cbf000000000000803f000000000000803f0000000000000000000080bfbc3f1b4093a25cbf0000000000000000000000000000000000000000000000000000000000000000bc3f1b40fc2d854000000000000000000000803f000000000000803f0000000000000000000080bfbc3f1b40000000000000000000000000000000000000000000000000000000000000000000000000bc3f4b40fc2d854093a25cbf000000000000803f000000000000803f0000000000000000000080bfbc3f4b4093a25cbf0000000000000000000000000000000000000000000000000000000000000000bc3f4b40fc2d854000000000000000000000803f000000000000803f0000000000000000000080bfbc3f4b40000000000000000000000000000000000000000000000000000000000000000000000000bc3f4b40f85b6a4093a25cbf0000803f000000000000000000000000000000000000803f000080bf93a25cbff85b6a400000000000000000000000000000000000000000000000000000000000000000bc3f4b40fc2d8540000000000000803f000000000000000000000000000000000000803f000080bf00000000fc2d85400000000000000000000000000000000000000000000000000000000000000000bc3f4b40f85b6a40000000000000803f000000000000000000000000000000000000803f000080bf00000000f85b6a400000000000000000000000000000000000000000000000000000000000000000bc3f4b40fc2d854093a25cbf0000803f000000000000000000000000000000000000803f000080bf93a25cbffc2d85400000000000000000000000000000000000000000000000000000000000000000bc3f4b400000000093a25cbf0000803f000000000000000000000000000000000000803f000080bf93a25cbf000000000000000000000000000000000000000000000000000000000000000000000000bc3f4b4000000000000000000000803f000000000000000000000000000000000000803f000080bf00000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 1.5878825, y: 2.0809317, z: -0.43092784} + m_Extent: {x: 1.5878825, y: 2.0809317, z: 0.43092784} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + 'm_MeshMetrics[0]': 1 + 'm_MeshMetrics[1]': 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: + m_MeshLodInfo: + serializedVersion: 2 + m_LodSelectionCurve: + serializedVersion: 1 + m_LodSlope: 0 + m_LodBias: 0 + m_NumLevels: 1 + m_SubMeshes: + - serializedVersion: 2 + m_Levels: + - serializedVersion: 1 + m_IndexStart: 0 + m_IndexCount: 0 --- !u!43 &2145275082 Mesh: m_ObjectHideFlags: 0 @@ -2285,10 +2808,62 @@ PrefabInstance: propertyPath: _frameRate value: 120 objectReference: {fileID: 0} + - target: {fileID: 2901065101600708916, guid: 92d3cde0c88c75f48a98d082c573338b, type: 3} + propertyPath: DiapasonAction + value: + objectReference: {fileID: 1121804270} + - target: {fileID: 3142789394009655648, guid: 92d3cde0c88c75f48a98d082c573338b, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3142789394009655648, guid: 92d3cde0c88c75f48a98d082c573338b, type: 3} + propertyPath: _fireAction + value: + objectReference: {fileID: 37800871} + - target: {fileID: 3142789394009655648, guid: 92d3cde0c88c75f48a98d082c573338b, type: 3} + propertyPath: _lookAction + value: + objectReference: {fileID: 777851618} + - target: {fileID: 3142789394009655648, guid: 92d3cde0c88c75f48a98d082c573338b, type: 3} + propertyPath: _breathInClip + value: + objectReference: {fileID: 8300000, guid: 091b6df1c99cbd647bce921a5ba7c1af, type: 3} + - target: {fileID: 3142789394009655648, guid: 92d3cde0c88c75f48a98d082c573338b, type: 3} + propertyPath: _cameraPanSpeed + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3142789394009655648, guid: 92d3cde0c88c75f48a98d082c573338b, type: 3} + propertyPath: _diapasonAction + value: + objectReference: {fileID: 1811682114} - target: {fileID: 3142789394009655648, guid: 92d3cde0c88c75f48a98d082c573338b, type: 3} propertyPath: _vignetteEffect value: objectReference: {fileID: 5090177222934034459} + - target: {fileID: 3142789394009655648, guid: 92d3cde0c88c75f48a98d082c573338b, type: 3} + propertyPath: _diapasonTapClip + value: + objectReference: {fileID: 8300000, guid: 99100d62c8b5d264f8694516673a9eeb, type: 3} + - target: {fileID: 3142789394009655648, guid: 92d3cde0c88c75f48a98d082c573338b, type: 3} + propertyPath: _diapasonAnimator + value: + objectReference: {fileID: 451500111} + - target: {fileID: 3142789394009655648, guid: 92d3cde0c88c75f48a98d082c573338b, type: 3} + propertyPath: _maxCameraPanAngle + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 3142789394009655648, guid: 92d3cde0c88c75f48a98d082c573338b, type: 3} + propertyPath: _vignetteIntensity + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 3142789394009655648, guid: 92d3cde0c88c75f48a98d082c573338b, type: 3} + propertyPath: _listenableLayers.m_Bits + value: 4294967295 + objectReference: {fileID: 0} + - target: {fileID: 3919526576499794210, guid: 92d3cde0c88c75f48a98d082c573338b, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3919526576499794210, guid: 92d3cde0c88c75f48a98d082c573338b, type: 3} propertyPath: _globalVolume value: @@ -2299,7 +2874,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5383576672370031505, guid: 92d3cde0c88c75f48a98d082c573338b, type: 3} propertyPath: m_LocalPosition.x - value: -4.95 + value: 21.15 objectReference: {fileID: 0} - target: {fileID: 5383576672370031505, guid: 92d3cde0c88c75f48a98d082c573338b, type: 3} propertyPath: m_LocalPosition.y @@ -2382,6 +2957,9 @@ PrefabInstance: m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8240327778457960307, guid: 92d3cde0c88c75f48a98d082c573338b, type: 3} + insertIndex: 12 + addedObject: {fileID: 5090177222934034461} - targetCorrespondingSourceObject: {fileID: 8565038221404453269, guid: 92d3cde0c88c75f48a98d082c573338b, type: 3} insertIndex: -1 addedObject: {fileID: 436513840} @@ -2394,12 +2972,28 @@ MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3919526576499794210, guid: 92d3cde0c88c75f48a98d082c573338b, type: 3} m_PrefabInstance: {fileID: 5090177222934034458} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + m_GameObject: {fileID: 1321496847} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 878ebc270c13e5c49a3813b1848f6ea5, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::Unheimlich.Gameplay.Player.ListeningVignetteEffect +--- !u!114 &5090177222934034461 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1321496847} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7093688fd39800645bbe00b6d9a3f27b, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Unheimlich.Audio.DiapasonDebugger + _showDebugInfo: 1 + _showGizmos: 1 + _listeningRangeColor: {r: 0, g: 1, b: 1, a: 1} + _activeTargetColor: {r: 0, g: 1, b: 0, a: 1} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -2410,3 +3004,4 @@ SceneRoots: - {fileID: 837458842} - {fileID: 1287162436} - {fileID: 673917528} + - {fileID: 1801866815} diff --git a/Assets/Unheimlich_POC/Scripts/Audio/IMPLEMENTATION_CHECKLIST.md.meta b/Assets/Unheimlich_POC/Scripts/Audio/IMPLEMENTATION_CHECKLIST.md.meta new file mode 100644 index 00000000..076aea80 --- /dev/null +++ b/Assets/Unheimlich_POC/Scripts/Audio/IMPLEMENTATION_CHECKLIST.md.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cd7d5d5d18db5a3458126a3a50a037b2 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Unheimlich_POC/Scripts/Audio/README.md.meta b/Assets/Unheimlich_POC/Scripts/Audio/README.md.meta new file mode 100644 index 00000000..0862cd7e --- /dev/null +++ b/Assets/Unheimlich_POC/Scripts/Audio/README.md.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 277628261bc57bc4098a8069501666f9 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Unheimlich_POC/Scripts/Gameplay/GameObjects/Player/DiapasonListeningHandler.cs b/Assets/Unheimlich_POC/Scripts/Gameplay/GameObjects/Player/DiapasonListeningHandler.cs index 54a7a1a1..f50181c7 100644 --- a/Assets/Unheimlich_POC/Scripts/Gameplay/GameObjects/Player/DiapasonListeningHandler.cs +++ b/Assets/Unheimlich_POC/Scripts/Gameplay/GameObjects/Player/DiapasonListeningHandler.cs @@ -22,6 +22,11 @@ namespace Unheimlich.Gameplay.Player [SerializeField] private float _concentrationDuration = 1f; [SerializeField] private float _breathInDuration = 0.5f; + [Header("Diapason Animation")] + [SerializeField] private float _diapasonTweenDuration = 0.3f; + [SerializeField] private float _diapasonHideOffset = -0.5f; + [SerializeField] private AnimationCurve _diapasonTweenCurve = AnimationCurve.EaseInOut(0, 0, 1, 1); + [Header("Camera Settings")] [SerializeField] private float _cameraPanSpeed = 2f; [SerializeField] private float _cameraPanBorderSize = 0.1f; @@ -35,9 +40,12 @@ namespace Unheimlich.Gameplay.Player [SerializeField] private AudioClip _breathInClip; [SerializeField] private AudioClip _diapasonTapClip; [SerializeField] private float _ambientAttenuationAmount = 0.3f; + [SerializeField] private float _audioFadeDuration = 0.5f; [Header("Input Action")] [SerializeField] private InputActionReference _diapasonAction; + [SerializeField] private InputActionReference _lookAction; + [SerializeField] private InputActionReference _fireAction; public bool IsListening { get; private set; } public bool IsConcentrating { get; private set; } @@ -45,8 +53,13 @@ namespace Unheimlich.Gameplay.Player private AudioListenable _currentTargetEmitter; private AudioSource _playerAudioSource; private Coroutine _listeningCoroutine; + private Coroutine _tweenCoroutine; + private Coroutine _audioFadeCoroutine; private Vector2 _originalCameraRotation; private float _originalAmbientVolume; + private Vector3 _diapasonEquippedPosition; + private Vector3 _diapasonHiddenPosition; + private bool _movementDisabled; private const string ANIM_TRIGGER_TAP = "Tap"; private const string ANIM_BOOL_EQUIPPED = "IsEquipped"; @@ -65,19 +78,31 @@ namespace Unheimlich.Gameplay.Player _playerAudioSource = gameObject.AddComponent(); if (_diapasonObject != null) + { + _diapasonEquippedPosition = _diapasonObject.transform.localPosition; + _diapasonHiddenPosition = _diapasonEquippedPosition + Vector3.up * _diapasonHideOffset; + _diapasonObject.transform.localPosition = _diapasonHiddenPosition; _diapasonObject.SetActive(false); + } + + if (_diapasonAction == null) + { + Debug.LogError("[Diapason] _diapasonAction is NOT assigned! Please assign it in the Inspector."); + } + else + { + Debug.Log($"[Diapason] _diapasonAction assigned: {_diapasonAction.action.name}"); + } } private void Update() { - if (!InputManager.IsInputEnabled) - return; - if (_diapasonAction != null && _diapasonAction.action.WasPressedThisFrame()) { + Debug.Log($"[Diapason] Action pressed! IsListening={IsListening}, IsConcentrating={IsConcentrating}"); if (!IsListening && !IsConcentrating) StartListeningMode(); - else if (IsListening) + else if (IsListening || IsConcentrating) StopListeningMode(); } @@ -85,6 +110,7 @@ namespace Unheimlich.Gameplay.Player { UpdateCursorAndCameraPan(); CheckForListenableObject(); + Debug.Log("Listening"); } } @@ -98,30 +124,43 @@ namespace Unheimlich.Gameplay.Player private IEnumerator ListeningSequence() { + Debug.Log("[Diapason] ListeningSequence START"); IsConcentrating = true; - InputManager.ToggleInput(false); + DisablePlayerMovement(true); if (_diapasonObject != null) { _diapasonObject.SetActive(true); if (_diapasonAnimator != null) _diapasonAnimator.SetBool(ANIM_BOOL_EQUIPPED, true); + + if (_tweenCoroutine != null) + StopCoroutine(_tweenCoroutine); + _tweenCoroutine = StartCoroutine(TweenDiapasonPosition(_diapasonEquippedPosition, _diapasonTweenDuration)); } + Debug.Log($"[Diapason] Playing breath in, waiting {_breathInDuration}s"); PlayBreathIn(); yield return new WaitForSeconds(_breathInDuration); + Debug.Log($"[Diapason] Concentrating, waiting {_concentrationDuration - _breathInDuration}s"); yield return new WaitForSeconds(_concentrationDuration - _breathInDuration); + Debug.Log("[Diapason] Setting IsListening = TRUE"); IsConcentrating = false; IsListening = true; - _originalCameraRotation = new Vector2(transform.eulerAngles.y, _playerCamera.transform.eulerAngles.x); + float currentPitch = _playerCamera.transform.localEulerAngles.x; + if (currentPitch > 180f) + currentPitch -= 360f; + + _originalCameraRotation = new Vector2(transform.eulerAngles.y, currentPitch); AttenuateAmbientSound(true); EnableVignette(true); Cursor.lockState = CursorLockMode.Confined; - Cursor.visible = true; + Cursor.visible = false; + Debug.Log("[Diapason] ListeningSequence COMPLETE"); } private void StopListeningMode() @@ -135,11 +174,21 @@ namespace Unheimlich.Gameplay.Player IsListening = false; IsConcentrating = false; + if (_playerAudioSource != null && _playerAudioSource.isPlaying) + { + if (_audioFadeCoroutine != null) + StopCoroutine(_audioFadeCoroutine); + _audioFadeCoroutine = StartCoroutine(FadeOutAudio(_playerAudioSource, _audioFadeDuration)); + } + if (_diapasonObject != null) { if (_diapasonAnimator != null) _diapasonAnimator.SetBool(ANIM_BOOL_EQUIPPED, false); - _diapasonObject.SetActive(false); + + if (_tweenCoroutine != null) + StopCoroutine(_tweenCoroutine); + _tweenCoroutine = StartCoroutine(TweenDiapasonPosition(_diapasonHiddenPosition, _diapasonTweenDuration, () => _diapasonObject.SetActive(false))); } AttenuateAmbientSound(false); @@ -148,7 +197,7 @@ namespace Unheimlich.Gameplay.Player Cursor.lockState = CursorLockMode.Locked; Cursor.visible = false; - InputManager.ToggleInput(true); + DisablePlayerMovement(false); if (_currentTargetEmitter != null) { @@ -162,34 +211,49 @@ namespace Unheimlich.Gameplay.Player if (_playerCamera == null) return; - Vector2 viewportPos = _playerCamera.ScreenToViewportPoint(Mouse.current.position.ReadValue()); - float panX = 0f; float panY = 0f; - if (viewportPos.x < _cameraPanBorderSize) - panX = -1f; - else if (viewportPos.x > 1f - _cameraPanBorderSize) - panX = 1f; + if (_lookAction != null && _lookAction.action != null) + { + Vector2 lookInput = _lookAction.action.ReadValue(); + if (lookInput.sqrMagnitude > 0.01f) + { + panX = lookInput.x; + panY = lookInput.y; + } + } - if (viewportPos.y < _cameraPanBorderSize) - panY = -1f; - else if (viewportPos.y > 1f - _cameraPanBorderSize) - panY = 1f; + if (panX == 0f && panY == 0f && Mouse.current != null) + { + Vector2 viewportPos = _playerCamera.ScreenToViewportPoint(Mouse.current.position.ReadValue()); + + if (viewportPos.x < _cameraPanBorderSize) + panX = -1f; + else if (viewportPos.x > 1f - _cameraPanBorderSize) + panX = 1f; + + if (viewportPos.y < _cameraPanBorderSize) + panY = -1f; + else if (viewportPos.y > 1f - _cameraPanBorderSize) + panY = 1f; + } float targetYaw = _originalCameraRotation.x + (panX * _maxCameraPanAngle); float targetPitch = _originalCameraRotation.y - (panY * _maxCameraPanAngle); + targetYaw = Mathf.Clamp(targetYaw, _originalCameraRotation.x - _maxCameraPanAngle, _originalCameraRotation.x + _maxCameraPanAngle); targetPitch = Mathf.Clamp(targetPitch, _originalCameraRotation.y - _maxCameraPanAngle, _originalCameraRotation.y + _maxCameraPanAngle); + targetPitch = Mathf.Clamp(targetPitch, -89f, 89f); Vector3 currentRotation = transform.eulerAngles; - currentRotation.y = Mathf.Lerp(currentRotation.y, targetYaw, Time.deltaTime * _cameraPanSpeed); + currentRotation.y = Mathf.LerpAngle(currentRotation.y, targetYaw, Time.deltaTime * _cameraPanSpeed); transform.eulerAngles = currentRotation; Vector3 cameraRotation = _playerCamera.transform.localEulerAngles; if (cameraRotation.x > 180f) cameraRotation.x -= 360f; - cameraRotation.x = Mathf.Lerp(cameraRotation.x, targetPitch, Time.deltaTime * _cameraPanSpeed); + cameraRotation.x = Mathf.LerpAngle(cameraRotation.x, targetPitch, Time.deltaTime * _cameraPanSpeed); _playerCamera.transform.localEulerAngles = cameraRotation; } @@ -198,23 +262,47 @@ namespace Unheimlich.Gameplay.Player if (_playerCamera == null) return; - Ray ray = _playerCamera.ScreenPointToRay(Mouse.current.position.ReadValue()); + Ray ray = _playerCamera.ViewportPointToRay(new Vector3(0.5f, 0.5f, 0f)); if (Physics.Raycast(ray, out RaycastHit hit, _listeningRange, _listenableLayers)) { + Debug.Log($"Raycast hit: {hit.collider.gameObject.name}"); AudioListenable listenable = hit.collider.GetComponent(); - if (listenable != null && listenable != _currentTargetEmitter) + if (listenable != null) { - if (_currentTargetEmitter != null) - _currentTargetEmitter.StopListening(); + Debug.Log($"AudioListenable found on {hit.collider.gameObject.name}!"); + if (listenable != _currentTargetEmitter) + { + if (_currentTargetEmitter != null) + _currentTargetEmitter.StopListening(); - _currentTargetEmitter = listenable; + _currentTargetEmitter = listenable; + Debug.Log($"_currentTargetEmitter set to {hit.collider.gameObject.name}"); + } + } + else + { + Debug.LogWarning($"Raycast hit {hit.collider.gameObject.name} but NO AudioListenable found!"); } - if (Mouse.current.leftButton.wasPressedThisFrame && _currentTargetEmitter != null) + bool firePressed = false; + if (_fireAction != null && _fireAction.action != null && _fireAction.action.WasPressedThisFrame()) { - TriggerDiapasonTap(); + firePressed = true; + } + else if (Mouse.current != null && Mouse.current.leftButton.wasPressedThisFrame) + { + firePressed = true; + } + + if (firePressed) + { + Debug.Log($"Fire/Click detected! _currentTargetEmitter = {(_currentTargetEmitter != null ? _currentTargetEmitter.gameObject.name : "NULL")}"); + if (_currentTargetEmitter != null) + { + TriggerDiapasonTap(); + } } } else @@ -229,6 +317,8 @@ namespace Unheimlich.Gameplay.Player private void TriggerDiapasonTap() { + Debug.Log("[Diapason] TriggerDiapasonTap called!"); + if (_diapasonAnimator != null) _diapasonAnimator.SetTrigger(ANIM_TRIGGER_TAP); @@ -236,7 +326,14 @@ namespace Unheimlich.Gameplay.Player _playerAudioSource.PlayOneShot(_diapasonTapClip); if (_currentTargetEmitter != null) + { + Debug.Log($"[Diapason] Starting listening on {_currentTargetEmitter.gameObject.name}"); _currentTargetEmitter.StartListening(transform.position); + } + else + { + Debug.LogWarning("[Diapason] TriggerDiapasonTap called but _currentTargetEmitter is NULL!"); + } } private void PlayBreathIn() @@ -246,20 +343,54 @@ namespace Unheimlich.Gameplay.Player } private void AttenuateAmbientSound(bool enable) + { + if (_audioFadeCoroutine != null) + StopCoroutine(_audioFadeCoroutine); + + _audioFadeCoroutine = StartCoroutine(FadeAmbientSound(enable)); + } + + private IEnumerator FadeAmbientSound(bool fadeOut) { AudioListener listener = FindFirstObjectByType(); - if (listener != null) + if (listener == null) + yield break; + + float startVolume = AudioListener.volume; + float targetVolume = fadeOut ? _ambientAttenuationAmount : _originalAmbientVolume; + + if (!fadeOut) + _originalAmbientVolume = startVolume; + else + _originalAmbientVolume = AudioListener.volume; + + float elapsed = 0f; + while (elapsed < _audioFadeDuration) { - if (enable) - { - _originalAmbientVolume = AudioListener.volume; - AudioListener.volume = _ambientAttenuationAmount; - } - else - { - AudioListener.volume = _originalAmbientVolume; - } + elapsed += Time.deltaTime; + float t = elapsed / _audioFadeDuration; + AudioListener.volume = Mathf.Lerp(startVolume, targetVolume, t); + yield return null; } + + AudioListener.volume = targetVolume; + } + + private IEnumerator FadeOutAudio(AudioSource source, float duration) + { + float startVolume = source.volume; + float elapsed = 0f; + + while (elapsed < duration) + { + elapsed += Time.deltaTime; + float t = elapsed / duration; + source.volume = Mathf.Lerp(startVolume, 0f, t); + yield return null; + } + + source.Stop(); + source.volume = startVolume; } private void EnableVignette(bool enable) @@ -271,12 +402,49 @@ namespace Unheimlich.Gameplay.Player } } + private IEnumerator TweenDiapasonPosition(Vector3 targetPosition, float duration, System.Action onComplete = null) + { + Vector3 startPosition = _diapasonObject.transform.localPosition; + float elapsed = 0f; + + while (elapsed < duration) + { + elapsed += Time.deltaTime; + float t = _diapasonTweenCurve.Evaluate(elapsed / duration); + _diapasonObject.transform.localPosition = Vector3.Lerp(startPosition, targetPosition, t); + yield return null; + } + + _diapasonObject.transform.localPosition = targetPosition; + onComplete?.Invoke(); + } + + private void DisablePlayerMovement(bool disable) + { + if (_movementDisabled == disable) + return; + + _movementDisabled = disable; + + PlayerMovement playerMovement = GetComponent(); + if (playerMovement != null) + playerMovement.enabled = !disable; + + PlayerLook playerLook = GetComponent(); + if (playerLook != null) + playerLook.enabled = !disable; + + CameraHeadBob headBob = GetComponentInChildren(); + if (headBob != null) + headBob.enabled = !disable; + } + private void OnDrawGizmosSelected() { if (_playerCamera != null && IsListening) { Gizmos.color = _currentTargetEmitter != null ? Color.green : Color.yellow; - Ray ray = _playerCamera.ScreenPointToRay(Mouse.current != null ? Mouse.current.position.ReadValue() : Vector2.zero); + Ray ray = _playerCamera.ViewportPointToRay(new Vector3(0.5f, 0.5f, 0f)); Gizmos.DrawRay(ray.origin, ray.direction * _listeningRange); } } diff --git a/Assets/Unheimlich_POC/Scripts/Gameplay/GameObjects/Player/ListeningVignetteEffect.cs b/Assets/Unheimlich_POC/Scripts/Gameplay/GameObjects/Player/ListeningVignetteEffect.cs index c3862a86..a8e99d3e 100644 --- a/Assets/Unheimlich_POC/Scripts/Gameplay/GameObjects/Player/ListeningVignetteEffect.cs +++ b/Assets/Unheimlich_POC/Scripts/Gameplay/GameObjects/Player/ListeningVignetteEffect.cs @@ -7,41 +7,65 @@ namespace Unheimlich.Gameplay.Player public class ListeningVignetteEffect : MonoBehaviour { [Header("References")] - [SerializeField] private Volume _globalVolume; + [Tooltip("Dedicated Volume for listening mode (not shared with dialogue system)")] + [SerializeField] private Volume _listeningVolume; [Header("Settings")] [SerializeField] private float _targetIntensity = 0.5f; [SerializeField] private float _transitionSpeed = 2f; private Vignette _vignette; - private float _originalIntensity; private bool _isEnabled; + private VolumeProfile _volumeProfile; private void Awake() { - if (_globalVolume == null) - _globalVolume = FindFirstObjectByType(); - - if (_globalVolume != null && _globalVolume.profile != null) + if (_listeningVolume == null) { - if (_globalVolume.profile.TryGet(out Vignette vignette)) + GameObject volumeObject = new GameObject("Listening Mode Volume"); + volumeObject.transform.SetParent(transform); + _listeningVolume = volumeObject.AddComponent(); + _listeningVolume.isGlobal = true; + _listeningVolume.priority = 1; + _listeningVolume.weight = 0f; + } + + if (_listeningVolume.profile == null) + { + _volumeProfile = ScriptableObject.CreateInstance(); + _listeningVolume.profile = _volumeProfile; + + _vignette = _volumeProfile.Add(); + _vignette.active = true; + _vignette.intensity.Override(0f); + _vignette.smoothness.Override(0.4f); + _vignette.rounded.Override(true); + } + else + { + if (!_listeningVolume.profile.TryGet(out _vignette)) { - _vignette = vignette; - _originalIntensity = _vignette.intensity.value; + _vignette = _listeningVolume.profile.Add(); + _vignette.active = true; + _vignette.intensity.Override(0f); + _vignette.smoothness.Override(0.4f); + _vignette.rounded.Override(true); } } + + _listeningVolume.weight = 0f; } private void Update() { - if (_vignette == null) + if (_vignette == null || _listeningVolume == null) return; - float targetValue = _isEnabled ? _targetIntensity : _originalIntensity; - float currentValue = _vignette.intensity.value; - float newValue = Mathf.Lerp(currentValue, targetValue, Time.deltaTime * _transitionSpeed); - - _vignette.intensity.value = newValue; + float targetWeight = _isEnabled ? 1f : 0f; + _listeningVolume.weight = Mathf.Lerp(_listeningVolume.weight, targetWeight, Time.deltaTime * _transitionSpeed); + + if (_isEnabled) + _vignette.intensity.value = _targetIntensity; } public void EnableVignette(bool enable) @@ -52,6 +76,14 @@ namespace Unheimlich.Gameplay.Player public void SetIntensity(float intensity) { _targetIntensity = Mathf.Clamp01(intensity); + if (_vignette != null) + _vignette.intensity.value = _targetIntensity; + } + + private void OnDestroy() + { + if (_volumeProfile != null) + Destroy(_volumeProfile); } } }