diff --git a/Assets/Art/Animations/Characters/Wolter/wolter_AnimController.controller b/Assets/Art/Animations/Characters/Wolter/wolter_AnimController.controller index af4cc1ed..a776304b 100644 --- a/Assets/Art/Animations/Characters/Wolter/wolter_AnimController.controller +++ b/Assets/Art/Animations/Characters/Wolter/wolter_AnimController.controller @@ -75,7 +75,7 @@ AnimatorStateTransition: m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0.75 - m_HasExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 diff --git a/Assets/Art/Animations/Characters/Wolter/wolter_Idle.anim b/Assets/Art/Animations/Characters/Wolter/wolter_Idle.anim index b805e9d2..f4f47ed0 100644 --- a/Assets/Art/Animations/Characters/Wolter/wolter_Idle.anim +++ b/Assets/Art/Animations/Characters/Wolter/wolter_Idle.anim @@ -21,30 +21,28 @@ AnimationClip: - serializedVersion: 2 curve: - time: 0 - value: {fileID: 553349555, guid: b215bf5a0a0f5db4da48c686489d8cab, type: 3} - - time: 0.11666667 value: {fileID: 949643404, guid: b215bf5a0a0f5db4da48c686489d8cab, type: 3} - - time: 0.21666667 + - time: 0.083333336 value: {fileID: 779209807, guid: b215bf5a0a0f5db4da48c686489d8cab, type: 3} - - time: 0.33333334 + - time: 0.2 value: {fileID: -765294982, guid: b215bf5a0a0f5db4da48c686489d8cab, type: 3} - - time: 0.45 + - time: 0.31666666 value: {fileID: -1692258928, guid: b215bf5a0a0f5db4da48c686489d8cab, type: 3} - - time: 0.55 + - time: 0.41666666 value: {fileID: 1433633040, guid: b215bf5a0a0f5db4da48c686489d8cab, type: 3} - - time: 0.6666667 + - time: 0.53333336 value: {fileID: -1134214680, guid: b215bf5a0a0f5db4da48c686489d8cab, type: 3} - - time: 0.78333336 + - time: 0.65 value: {fileID: -122394679, guid: b215bf5a0a0f5db4da48c686489d8cab, type: 3} - - time: 0.8833333 + - time: 0.75 value: {fileID: -707060961, guid: b215bf5a0a0f5db4da48c686489d8cab, type: 3} - - time: 1 + - time: 0.8666667 value: {fileID: 253252098, guid: b215bf5a0a0f5db4da48c686489d8cab, type: 3} - - time: 1.1166667 + - time: 0.98333335 value: {fileID: 162215666, guid: b215bf5a0a0f5db4da48c686489d8cab, type: 3} - - time: 1.2166667 + - time: 1.0833334 value: {fileID: -1175693358, guid: b215bf5a0a0f5db4da48c686489d8cab, type: 3} - - time: 1.3333334 + - time: 1.2 value: {fileID: -176178923, guid: b215bf5a0a0f5db4da48c686489d8cab, type: 3} attribute: m_Sprite path: @@ -68,7 +66,6 @@ AnimationClip: isIntCurve: 0 isSerializeReferenceCurve: 0 pptrCurveMapping: - - {fileID: 553349555, guid: b215bf5a0a0f5db4da48c686489d8cab, type: 3} - {fileID: 949643404, guid: b215bf5a0a0f5db4da48c686489d8cab, type: 3} - {fileID: 779209807, guid: b215bf5a0a0f5db4da48c686489d8cab, type: 3} - {fileID: -765294982, guid: b215bf5a0a0f5db4da48c686489d8cab, type: 3} @@ -86,7 +83,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.35 + m_StopTime: 1.2166667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Prefabs/Sound.meta b/Assets/Prefabs/Sound.meta new file mode 100644 index 00000000..e3318876 --- /dev/null +++ b/Assets/Prefabs/Sound.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a045951bdac06694c937f100364d592a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Sound/CharacterProximityReaction.prefab b/Assets/Prefabs/Sound/CharacterProximityReaction.prefab new file mode 100644 index 00000000..62b6e7e7 --- /dev/null +++ b/Assets/Prefabs/Sound/CharacterProximityReaction.prefab @@ -0,0 +1,181 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6839833354488820687 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3050388831687762960} + - component: {fileID: 6839125449334549607} + - component: {fileID: 4147385003481625458} + - component: {fileID: 5959589055827423059} + m_Layer: 0 + m_Name: CharacterProximityReaction + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3050388831687762960 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6839833354488820687} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 8.8890505, y: -3.6588502, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &6839125449334549607 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6839833354488820687} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 3533147658878909314, guid: 727a7e4b6df4b0d47897f7d8ee7fa323, type: 2} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!58 &4147385003481625458 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6839833354488820687} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: -4.1956253, y: 0} + m_Radius: 15.438425 +--- !u!114 &5959589055827423059 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6839833354488820687} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ae25a005dc7176f4daddbb82ec00adcd, type: 3} + m_Name: + m_EditorClassIdentifier: '::' diff --git a/Assets/Prefabs/Sound/CharacterProximityReaction.prefab.meta b/Assets/Prefabs/Sound/CharacterProximityReaction.prefab.meta new file mode 100644 index 00000000..cd555d31 --- /dev/null +++ b/Assets/Prefabs/Sound/CharacterProximityReaction.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0f7f355cb2008824087dfb944622a2e8 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Levels/Quarry.unity b/Assets/Scenes/Levels/Quarry.unity index 1de6552f..5a8444a2 100644 --- a/Assets/Scenes/Levels/Quarry.unity +++ b/Assets/Scenes/Levels/Quarry.unity @@ -468941,7 +468941,7 @@ PrefabInstance: - target: {fileID: 1193493154550576580, guid: 9b2926886934b554f9a1727331d34787, type: 3} propertyPath: reactionClipToPlay value: - objectReference: {fileID: 8300000, guid: 2419f718f73907749a2940ac09d65238, type: 3} + objectReference: {fileID: 8300000, guid: c93e30cff440756438f94085f31c03c3, type: 3} - target: {fileID: 1494215563975893862, guid: 9b2926886934b554f9a1727331d34787, type: 3} propertyPath: clipToPlay value: diff --git a/Assets/Scripts/Sound/ProximitySoundReaction.cs b/Assets/Scripts/Sound/ProximitySoundReaction.cs new file mode 100644 index 00000000..613a5aa3 --- /dev/null +++ b/Assets/Scripts/Sound/ProximitySoundReaction.cs @@ -0,0 +1,25 @@ +using UnityEngine; + +public class ProximitySoundReaction : MonoBehaviour +{ + private Collider2D _collider; + + // Start is called once before the first execution of Update after the MonoBehaviour is created + void Start() + { + _collider = GetComponent(); + } + + private void OnCollisionEnter2D(Collision2D collision) + { + Debug.Log("overlap!"); + + } + + private void OnTriggerEnter2D(Collider2D collision) + { + Debug.Log("Wolter triggered!"); + } + + +} diff --git a/Assets/Scripts/Sound/ProximitySoundReaction.cs.meta b/Assets/Scripts/Sound/ProximitySoundReaction.cs.meta new file mode 100644 index 00000000..1faabe4e --- /dev/null +++ b/Assets/Scripts/Sound/ProximitySoundReaction.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: ae25a005dc7176f4daddbb82ec00adcd \ No newline at end of file diff --git a/Assets/Sound/Quarry/Voices/wolt_react1.wav b/Assets/Sound/Quarry/Voices/wolt_react1.wav new file mode 100644 index 00000000..291ff2b2 Binary files /dev/null and b/Assets/Sound/Quarry/Voices/wolt_react1.wav differ diff --git a/Assets/Sound/Quarry/Voices/wolt_react1.wav.meta b/Assets/Sound/Quarry/Voices/wolt_react1.wav.meta new file mode 100644 index 00000000..af3827d5 --- /dev/null +++ b/Assets/Sound/Quarry/Voices/wolt_react1.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: a3d8d5bc85b14924dbd016577e1b3192 +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/Sound/Quarry/Voices/wolt_react2.wav b/Assets/Sound/Quarry/Voices/wolt_react2.wav new file mode 100644 index 00000000..70214163 Binary files /dev/null and b/Assets/Sound/Quarry/Voices/wolt_react2.wav differ diff --git a/Assets/Sound/Quarry/Voices/wolt_react2.wav.meta b/Assets/Sound/Quarry/Voices/wolt_react2.wav.meta new file mode 100644 index 00000000..21884f31 --- /dev/null +++ b/Assets/Sound/Quarry/Voices/wolt_react2.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 9d57c580e85380742a943b9ced874a55 +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/Sound/Quarry/Voices/wolt_react3.wav b/Assets/Sound/Quarry/Voices/wolt_react3.wav new file mode 100644 index 00000000..447aedd0 Binary files /dev/null and b/Assets/Sound/Quarry/Voices/wolt_react3.wav differ diff --git a/Assets/Sound/Quarry/Voices/wolt_react3.wav.meta b/Assets/Sound/Quarry/Voices/wolt_react3.wav.meta new file mode 100644 index 00000000..3c5eaeb7 --- /dev/null +++ b/Assets/Sound/Quarry/Voices/wolt_react3.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 5629eb92a74c0b54590947e58e866412 +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/Sound/Quarry/Voices/wolterYes_combined.wav b/Assets/Sound/Quarry/Voices/wolterYes_combined.wav new file mode 100644 index 00000000..ac52a797 Binary files /dev/null and b/Assets/Sound/Quarry/Voices/wolterYes_combined.wav differ diff --git a/Assets/Sound/Quarry/Voices/wolterYes_combined.wav.meta b/Assets/Sound/Quarry/Voices/wolterYes_combined.wav.meta new file mode 100644 index 00000000..8678f4f6 --- /dev/null +++ b/Assets/Sound/Quarry/Voices/wolterYes_combined.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: c93e30cff440756438f94085f31c03c3 +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: