diff --git a/blueberryPeak/Assets/Scenes/Beach.unity b/blueberryPeak/Assets/Scenes/Beach.unity index 9d6d4ca..5e3d8e6 100644 --- a/blueberryPeak/Assets/Scenes/Beach.unity +++ b/blueberryPeak/Assets/Scenes/Beach.unity @@ -2273,6 +2273,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3740866600301396226, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} + propertyPath: footstepEvent + value: + objectReference: {fileID: 0} - target: {fileID: 3740866600301396226, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} propertyPath: cameraTransform value: diff --git a/blueberryPeak/Assets/Scripts/PlayerMovement.cs b/blueberryPeak/Assets/Scripts/PlayerMovement.cs index ac889cd..4097f44 100644 --- a/blueberryPeak/Assets/Scripts/PlayerMovement.cs +++ b/blueberryPeak/Assets/Scripts/PlayerMovement.cs @@ -4,6 +4,7 @@ using UnityEngine.InputSystem; [RequireComponent(typeof(CharacterController))] public class PlayerMovement : MonoBehaviour { + [Header("Movement Settings")] [SerializeField] private float movementSpeed = 5f; [SerializeField] private float rotationSpeed = 200f; [SerializeField] private InputActionReference movement; @@ -11,20 +12,14 @@ public class PlayerMovement : MonoBehaviour [SerializeField] private Vector3 cameraOffset = new Vector3(0, 10, -10); [SerializeField] private Animator _animator; + [Header("Footstep Sound Settings")] + [SerializeField] private AK.Wwise.Event footstepEvent; + [SerializeField] private float footstepInterval = 0.5f; // seconds between footsteps + private float footstepTimer = 0f; + private Vector3 inputDirection = Vector3.zero; - private CharacterController controller; - void LateUpdate() - { - if (cameraTransform != null) - { - cameraTransform.position = transform.position + cameraOffset; - cameraTransform.LookAt(transform.position); - } - } - - void Start() { controller = GetComponent(); @@ -34,7 +29,6 @@ public class PlayerMovement : MonoBehaviour movement.action.canceled += OnMovementStop; } - void OnMovement(InputAction.CallbackContext context) { Vector2 inputVector = context.ReadValue(); @@ -46,7 +40,6 @@ public class PlayerMovement : MonoBehaviour inputDirection = Vector3.zero; } - void Update() { Cursor.lockState = CursorLockMode.Locked; @@ -62,13 +55,33 @@ public class PlayerMovement : MonoBehaviour Vector3 move = (cameraForward * inputDirection.z + cameraRight * inputDirection.x).normalized * movementSpeed; controller.SimpleMove(move); - print("ttesto"); _animator.SetFloat("Speed", move.magnitude); - if (move.magnitude > 0.01f) + if (move.magnitude > 0.01f) { Quaternion toRotation = Quaternion.LookRotation(move, Vector3.up); transform.rotation = Quaternion.RotateTowards(transform.rotation, toRotation, rotationSpeed * Time.deltaTime); + + // Footstep logic + footstepTimer -= Time.deltaTime; + if (footstepTimer <= 0f && footstepEvent != null) + { + footstepEvent.Post(gameObject); + footstepTimer = footstepInterval; + } + } + else + { + footstepTimer = 0f; // Reset when not moving } } -} \ No newline at end of file + + void LateUpdate() + { + if (cameraTransform != null) + { + cameraTransform.position = transform.position + cameraOffset; + cameraTransform.LookAt(transform.position); + } + } +} diff --git a/blueberryPeak/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset b/blueberryPeak/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset index b68b5d3..4dd2cef 100644 --- a/blueberryPeak/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset +++ b/blueberryPeak/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: AkWwiseProjectData m_EditorClassIdentifier: AcousticTextureWwu: - - PhysicalPath: Virtual Acoustics/Default Work Unit.wwu + - PhysicalPath: Virtual Acoustics\Default Work Unit.wwu PathAndIcons: - ElementName: Virtual Acoustics ObjectType: 5 @@ -21,13 +21,13 @@ MonoBehaviour: - ElementName: Default Work Unit ObjectType: 12 guid: 7473811295cd724597a015fdd1da0da3 - ParentPath: Virtual Acoustics/Default Work Unit + ParentPath: Virtual Acoustics\Default Work Unit guid: 7473811295cd724597a015fdd1da0da3 GuidInternal: - m_lastTime: -8584518736503360064 + m_lastTime: -8584520486833053230 List: [] AuxBusWwu: - - PhysicalPath: Master-Mixer Hierarchy/Default Work Unit.wwu + - PhysicalPath: Master-Mixer Hierarchy\Default Work Unit.wwu PathAndIcons: - ElementName: Master-Mixer Hierarchy ObjectType: 5 @@ -35,10 +35,10 @@ MonoBehaviour: - ElementName: Default Work Unit ObjectType: 12 guid: e4ff27caecdb4b47a4f455153b6ff5c5 - ParentPath: Master-Mixer Hierarchy/Default Work Unit + ParentPath: Master-Mixer Hierarchy\Default Work Unit guid: e4ff27caecdb4b47a4f455153b6ff5c5 GuidInternal: - m_lastTime: -8584518571940370018 + m_lastTime: -8584518741991267210 List: - name: Master Audio Bus guid: d8a41415a61d2a41a17e75ca0c2149f3 @@ -53,9 +53,9 @@ MonoBehaviour: - ElementName: Master Audio Bus ObjectType: 2 guid: d8a41415a61d2a41a17e75ca0c2149f3 - Path: Master-Mixer Hierarchy/Default Work Unit/Master Audio Bus + Path: Master-Mixer Hierarchy\Default Work Unit\Master Audio Bus BankWwu: - - PhysicalPath: SoundBanks/Default Work Unit.wwu + - PhysicalPath: SoundBanks\Default Work Unit.wwu PathAndIcons: - ElementName: SoundBanks ObjectType: 5 @@ -63,10 +63,10 @@ MonoBehaviour: - ElementName: Default Work Unit ObjectType: 12 guid: 6dbe1735fe9da64689dc0e3d33d7b30f - ParentPath: SoundBanks/Default Work Unit + ParentPath: SoundBanks\Default Work Unit guid: 6dbe1735fe9da64689dc0e3d33d7b30f GuidInternal: - m_lastTime: -8584518571940313550 + m_lastTime: -8584518662585569824 List: - name: DefaultSoundBank guid: 478b900634195a4da87a85e27e5ad6f8 @@ -81,9 +81,9 @@ MonoBehaviour: - ElementName: DefaultSoundBank ObjectType: 7 guid: 478b900634195a4da87a85e27e5ad6f8 - Path: SoundBanks/Default Work Unit/DefaultSoundBank + Path: SoundBanks\Default Work Unit\DefaultSoundBank EventWwu: - - PhysicalPath: Events/Default Work Unit.wwu + - PhysicalPath: Events\Default Work Unit.wwu PathAndIcons: - ElementName: Events ObjectType: 5 @@ -91,10 +91,10 @@ MonoBehaviour: - ElementName: Default Work Unit ObjectType: 12 guid: d503ca4bc28c0b4384cf91e122dea841 - ParentPath: Events/Default Work Unit + ParentPath: Events\Default Work Unit guid: d503ca4bc28c0b4384cf91e122dea841 GuidInternal: - m_lastTime: -8584518571942724591 + m_lastTime: -8584518662585715618 List: - name: Play_BackgroundMusic guid: e73cae149756cc4ca4877c502decb508 @@ -109,7 +109,7 @@ MonoBehaviour: - ElementName: Play_BackgroundMusic ObjectType: 3 guid: e73cae149756cc4ca4877c502decb508 - Path: Events/Default Work Unit/Play_BackgroundMusic + Path: Events\Default Work Unit\Play_BackgroundMusic maxAttenuation: 0 maxDuration: 0 minDuration: 0 @@ -126,7 +126,7 @@ MonoBehaviour: - ElementName: Play_Bird1 ObjectType: 3 guid: af0be0110e6529478a0a70aa791ecf7c - Path: Events/Default Work Unit/Play_Bird1 + Path: Events\Default Work Unit\Play_Bird1 maxAttenuation: 20 maxDuration: 47.736008 minDuration: 47.736008 @@ -143,7 +143,7 @@ MonoBehaviour: - ElementName: Play_Bird2 ObjectType: 3 guid: e769787ca03c484e8eb680ea43e4c501 - Path: Events/Default Work Unit/Play_Bird2 + Path: Events\Default Work Unit\Play_Bird2 maxAttenuation: 20 maxDuration: 18.86399 minDuration: 18.86399 @@ -160,8 +160,8 @@ MonoBehaviour: - ElementName: Play_Bird3 ObjectType: 3 guid: 55d4602c47e30a4087f9d076c64fcb60 - Path: Events/Default Work Unit/Play_Bird3 - maxAttenuation: 20 + Path: Events\Default Work Unit\Play_Bird3 + maxAttenuation: 30 maxDuration: 19.536009 minDuration: 19.536009 - name: Play_Bird4 @@ -177,7 +177,7 @@ MonoBehaviour: - ElementName: Play_Bird4 ObjectType: 3 guid: 196be13cf650d74fba8b7b48c7329607 - Path: Events/Default Work Unit/Play_Bird4 + Path: Events\Default Work Unit\Play_Bird4 maxAttenuation: 20 maxDuration: 21.408005 minDuration: 21.408005 @@ -194,7 +194,7 @@ MonoBehaviour: - ElementName: Play_click1 ObjectType: 3 guid: 602a369d2628574d9d0a9602a2539d8e - Path: Events/Default Work Unit/Play_click1 + Path: Events\Default Work Unit\Play_click1 maxAttenuation: 0 maxDuration: 0.08852608 minDuration: 0.08852608 @@ -211,7 +211,7 @@ MonoBehaviour: - ElementName: Play_click2 ObjectType: 3 guid: 09afc604064f5345a410f6fddaff0121 - Path: Events/Default Work Unit/Play_click2 + Path: Events\Default Work Unit\Play_click2 maxAttenuation: 0 maxDuration: 0.10303855 minDuration: 0.10303855 @@ -228,7 +228,7 @@ MonoBehaviour: - ElementName: Play_DialogText ObjectType: 3 guid: eae17392be238542b04e111fb8ac5e19 - Path: Events/Default Work Unit/Play_DialogText + Path: Events\Default Work Unit\Play_DialogText maxAttenuation: 0 maxDuration: 0.07159184 minDuration: 0.06378107 @@ -245,7 +245,7 @@ MonoBehaviour: - ElementName: Play_Digging ObjectType: 3 guid: f34993dcf10dc84b90bfd101add5e039 - Path: Events/Default Work Unit/Play_Digging + Path: Events\Default Work Unit\Play_Digging maxAttenuation: 15 maxDuration: 3.0626078 minDuration: 3.0626078 @@ -262,7 +262,7 @@ MonoBehaviour: - ElementName: Play_Footsteps ObjectType: 3 guid: 3cb9f89bed87bc4dbc71e306be2127f3 - Path: Events/Default Work Unit/Play_Footsteps + Path: Events\Default Work Unit\Play_Footsteps maxAttenuation: 0 maxDuration: 0.49522915 minDuration: 0.22827664 @@ -279,7 +279,7 @@ MonoBehaviour: - ElementName: Play_GrassFootsteps ObjectType: 3 guid: 5489ead757eb4a429fcd5cb66d6ffb6e - Path: Events/Default Work Unit/Play_GrassFootsteps + Path: Events\Default Work Unit\Play_GrassFootsteps maxAttenuation: 0 maxDuration: 0.3559637 minDuration: 0.22827664 @@ -296,7 +296,7 @@ MonoBehaviour: - ElementName: Play_GravelFootsteps ObjectType: 3 guid: 8c9dc3a085290a4180b466ac1bc07016 - Path: Events/Default Work Unit/Play_GravelFootsteps + Path: Events\Default Work Unit\Play_GravelFootsteps maxAttenuation: 0 maxDuration: 0.345235 minDuration: 0.30057737 @@ -313,7 +313,7 @@ MonoBehaviour: - ElementName: Play_ItemPickUp ObjectType: 3 guid: ba02578a919bfe46a7b01c95c2d8b936 - Path: Events/Default Work Unit/Play_ItemPickUp + Path: Events\Default Work Unit\Play_ItemPickUp maxAttenuation: 0 maxDuration: 0.5201354 minDuration: 0.5201354 @@ -330,7 +330,7 @@ MonoBehaviour: - ElementName: Play_Ocean ObjectType: 3 guid: 71a8eb3c14d2db4ca3b54b43832fee29 - Path: Events/Default Work Unit/Play_Ocean + Path: Events\Default Work Unit\Play_Ocean maxAttenuation: 15 maxDuration: 0 minDuration: 0 @@ -347,7 +347,7 @@ MonoBehaviour: - ElementName: Play_Pause ObjectType: 3 guid: 8ec9c7de4649024792c777faa9d5e136 - Path: Events/Default Work Unit/Play_Pause + Path: Events\Default Work Unit\Play_Pause maxAttenuation: 0 maxDuration: 0.129161 minDuration: 0.129161 @@ -364,7 +364,7 @@ MonoBehaviour: - ElementName: Play_QuestComplete ObjectType: 3 guid: 0608a645786f034d9c7d3946fc8a2591 - Path: Events/Default Work Unit/Play_QuestComplete + Path: Events\Default Work Unit\Play_QuestComplete maxAttenuation: 0 maxDuration: 6 minDuration: 6 @@ -381,7 +381,7 @@ MonoBehaviour: - ElementName: Play_Resume ObjectType: 3 guid: 6b34d81a5330ad46b18f49a821a43915 - Path: Events/Default Work Unit/Play_Resume + Path: Events\Default Work Unit\Play_Resume maxAttenuation: 0 maxDuration: 0.1756009 minDuration: 0.1756009 @@ -398,7 +398,7 @@ MonoBehaviour: - ElementName: Play_River ObjectType: 3 guid: f45904934e42cd4ba070f99a52ea6670 - Path: Events/Default Work Unit/Play_River + Path: Events\Default Work Unit\Play_River maxAttenuation: 15 maxDuration: 0 minDuration: 0 @@ -415,7 +415,7 @@ MonoBehaviour: - ElementName: Play_SandFootsteps ObjectType: 3 guid: ea20a55f8cb9a047a4beb1236644799f - Path: Events/Default Work Unit/Play_SandFootsteps + Path: Events\Default Work Unit\Play_SandFootsteps maxAttenuation: 0 maxDuration: 0.49522915 minDuration: 0.3056916 @@ -432,7 +432,7 @@ MonoBehaviour: - ElementName: Play_WateringCan ObjectType: 3 guid: e310aed0004d1943b82d4f188e31246d - Path: Events/Default Work Unit/Play_WateringCan + Path: Events\Default Work Unit\Play_WateringCan maxAttenuation: 15 maxDuration: 9.114081 minDuration: 9.114081 @@ -449,12 +449,12 @@ MonoBehaviour: - ElementName: Play_Wind ObjectType: 3 guid: 7090832dab006940a95aa933923cc7d4 - Path: Events/Default Work Unit/Play_Wind + Path: Events\Default Work Unit\Play_Wind maxAttenuation: 0 maxDuration: 0 minDuration: 0 RtpcWwu: - - PhysicalPath: Game Parameters/Default Work Unit.wwu + - PhysicalPath: Game Parameters\Default Work Unit.wwu PathAndIcons: - ElementName: Game Parameters ObjectType: 5 @@ -462,13 +462,13 @@ MonoBehaviour: - ElementName: Default Work Unit ObjectType: 12 guid: 1937a7f7d0ed474eb600155fd13eda73 - ParentPath: Game Parameters/Default Work Unit + ParentPath: Game Parameters\Default Work Unit guid: 1937a7f7d0ed474eb600155fd13eda73 GuidInternal: - m_lastTime: -8584518736504732142 + m_lastTime: -8584520486833697649 List: [] StateWwu: - - PhysicalPath: States/Default Work Unit.wwu + - PhysicalPath: States\Default Work Unit.wwu PathAndIcons: - ElementName: States ObjectType: 5 @@ -476,10 +476,10 @@ MonoBehaviour: - ElementName: Default Work Unit ObjectType: 12 guid: ccedf87717c82b48b00425eee111735a - ParentPath: States/Default Work Unit + ParentPath: States\Default Work Unit guid: ccedf87717c82b48b00425eee111735a GuidInternal: - m_lastTime: -8584518736503362537 + m_lastTime: -8584518741990987001 List: - name: WindState guid: 45bb338ca5416c42b7130926a7851f58 @@ -494,7 +494,7 @@ MonoBehaviour: - ElementName: WindState ObjectType: 9 guid: 45bb338ca5416c42b7130926a7851f58 - Path: States/Default Work Unit/WindState + Path: States\Default Work Unit\WindState values: - name: fast guid: ba3a6736ef012c47856caeba38273fe7 @@ -564,7 +564,7 @@ MonoBehaviour: ValueIcons: [] valuesInternal: [] SwitchWwu: - - PhysicalPath: Switches/Default Work Unit.wwu + - PhysicalPath: Switches\Default Work Unit.wwu PathAndIcons: - ElementName: Switches ObjectType: 5 @@ -572,10 +572,10 @@ MonoBehaviour: - ElementName: Default Work Unit ObjectType: 12 guid: f08a7878e320d64dbef9b4b1e7db47fb - ParentPath: Switches/Default Work Unit + ParentPath: Switches\Default Work Unit guid: f08a7878e320d64dbef9b4b1e7db47fb GuidInternal: - m_lastTime: -8584518571940310814 + m_lastTime: -8584518741991720402 List: - name: Footsteps guid: b329a8285e5b094cb6a88fd03040a940 @@ -590,7 +590,7 @@ MonoBehaviour: - ElementName: Footsteps ObjectType: 11 guid: b329a8285e5b094cb6a88fd03040a940 - Path: Switches/Default Work Unit/Footsteps + Path: Switches\Default Work Unit\Footsteps values: - name: grass guid: d0b4ddb7db1adf44baba88b5f3d3d872 @@ -644,7 +644,7 @@ MonoBehaviour: ValueIcons: [] valuesInternal: [] TriggerWwu: - - PhysicalPath: Triggers/Default Work Unit.wwu + - PhysicalPath: Triggers\Default Work Unit.wwu PathAndIcons: - ElementName: Triggers ObjectType: 5 @@ -652,13 +652,13 @@ MonoBehaviour: - ElementName: Default Work Unit ObjectType: 12 guid: cdb5c3a4e21b2c47bc3151725b9cf378 - ParentPath: Triggers/Default Work Unit + ParentPath: Triggers\Default Work Unit guid: cdb5c3a4e21b2c47bc3151725b9cf378 GuidInternal: - m_lastTime: -8584518736503360884 + m_lastTime: -8584520486832050207 List: [] ExpandedFileSystemItemIds: - ExpandedWaapiItemIds: 0500000006000000070000000e0000000f0000001f00000020000000 + ExpandedWaapiItemIds: 0500000006000000070000000e0000000f0000001f00000020000000230000002400000025000000 AutoSyncSelection: 0 autoPopulateEnabled: 1 currentDataSource: 0 diff --git a/blueberryPeak/Assets/Wwise/ScriptableObjects/Event/9BF8B93C-87ED-4DBC-BC71-E306BE2127F3.asset b/blueberryPeak/Assets/Wwise/ScriptableObjects/Event/9BF8B93C-87ED-4DBC-BC71-E306BE2127F3.asset new file mode 100644 index 0000000..b383cda --- /dev/null +++ b/blueberryPeak/Assets/Wwise/ScriptableObjects/Event/9BF8B93C-87ED-4DBC-BC71-E306BE2127F3.asset @@ -0,0 +1,18 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +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: 641a4bfe018bd0e40a983621326b538c, type: 3} + m_Name: 9BF8B93C-87ED-4DBC-BC71-E306BE2127F3 + m_EditorClassIdentifier: + objectName: Play_Footsteps + id: 3854155799 + guid: 9BF8B93C-87ED-4DBC-BC71-E306BE2127F3 + IsInUserDefinedSoundBank: 1 diff --git a/blueberryPeak/Assets/Wwise/ScriptableObjects/Event/9BF8B93C-87ED-4DBC-BC71-E306BE2127F3.asset.meta b/blueberryPeak/Assets/Wwise/ScriptableObjects/Event/9BF8B93C-87ED-4DBC-BC71-E306BE2127F3.asset.meta new file mode 100644 index 0000000..85a2dfb --- /dev/null +++ b/blueberryPeak/Assets/Wwise/ScriptableObjects/Event/9BF8B93C-87ED-4DBC-BC71-E306BE2127F3.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0a40e999cf3ad3349893f6e7878d1798 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/blueberryPeak/Assets/Wwise/ScriptableObjects/Event/D7EA8954-EB57-424A-9FCD-5CB66D6FFB6E.asset b/blueberryPeak/Assets/Wwise/ScriptableObjects/Event/D7EA8954-EB57-424A-9FCD-5CB66D6FFB6E.asset new file mode 100644 index 0000000..4d9cfec --- /dev/null +++ b/blueberryPeak/Assets/Wwise/ScriptableObjects/Event/D7EA8954-EB57-424A-9FCD-5CB66D6FFB6E.asset @@ -0,0 +1,18 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +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: 641a4bfe018bd0e40a983621326b538c, type: 3} + m_Name: D7EA8954-EB57-424A-9FCD-5CB66D6FFB6E + m_EditorClassIdentifier: + objectName: Play_GrassFootsteps + id: 2348137961 + guid: D7EA8954-EB57-424A-9FCD-5CB66D6FFB6E + IsInUserDefinedSoundBank: 1 diff --git a/blueberryPeak/Assets/Wwise/ScriptableObjects/Event/D7EA8954-EB57-424A-9FCD-5CB66D6FFB6E.asset.meta b/blueberryPeak/Assets/Wwise/ScriptableObjects/Event/D7EA8954-EB57-424A-9FCD-5CB66D6FFB6E.asset.meta new file mode 100644 index 0000000..0fbf21c --- /dev/null +++ b/blueberryPeak/Assets/Wwise/ScriptableObjects/Event/D7EA8954-EB57-424A-9FCD-5CB66D6FFB6E.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bf6c779bffbee664987db86497f303ea +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/blueberryPeak/Assets/Wwise/ScriptableObjects/Switch.meta b/blueberryPeak/Assets/Wwise/ScriptableObjects/Switch.meta new file mode 100644 index 0000000..08d4586 --- /dev/null +++ b/blueberryPeak/Assets/Wwise/ScriptableObjects/Switch.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d95e6a7660ade364fa31a746556fbbe2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/blueberryPeak/Assets/Wwise/ScriptableObjects/Switch/3C8A2610-1AA1-49F1-9F37-794C9F123C35.asset b/blueberryPeak/Assets/Wwise/ScriptableObjects/Switch/3C8A2610-1AA1-49F1-9F37-794C9F123C35.asset new file mode 100644 index 0000000..4d07b01 --- /dev/null +++ b/blueberryPeak/Assets/Wwise/ScriptableObjects/Switch/3C8A2610-1AA1-49F1-9F37-794C9F123C35.asset @@ -0,0 +1,18 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +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: e1c76fa0d0141864aa84b4e58218517c, type: 3} + m_Name: 3C8A2610-1AA1-49F1-9F37-794C9F123C35 + m_EditorClassIdentifier: + objectName: sand + id: 803837735 + guid: 3C8A2610-1AA1-49F1-9F37-794C9F123C35 + WwiseSwitchGroupReference: {fileID: 11400000, guid: fa917db249567fd429723f330d02ea79, type: 2} diff --git a/blueberryPeak/Assets/Wwise/ScriptableObjects/Switch/3C8A2610-1AA1-49F1-9F37-794C9F123C35.asset.meta b/blueberryPeak/Assets/Wwise/ScriptableObjects/Switch/3C8A2610-1AA1-49F1-9F37-794C9F123C35.asset.meta new file mode 100644 index 0000000..8c22ea3 --- /dev/null +++ b/blueberryPeak/Assets/Wwise/ScriptableObjects/Switch/3C8A2610-1AA1-49F1-9F37-794C9F123C35.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 025cc95946034ec4486d72f885a56166 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/blueberryPeak/Assets/Wwise/ScriptableObjects/SwitchGroup.meta b/blueberryPeak/Assets/Wwise/ScriptableObjects/SwitchGroup.meta new file mode 100644 index 0000000..e7d490e --- /dev/null +++ b/blueberryPeak/Assets/Wwise/ScriptableObjects/SwitchGroup.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 07248d56e575d5b4a84413b7fc4ec9cd +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/blueberryPeak/Assets/Wwise/ScriptableObjects/SwitchGroup/28A829B3-5B5E-4C09-B6A8-8FD03040A940.asset b/blueberryPeak/Assets/Wwise/ScriptableObjects/SwitchGroup/28A829B3-5B5E-4C09-B6A8-8FD03040A940.asset new file mode 100644 index 0000000..044ab77 --- /dev/null +++ b/blueberryPeak/Assets/Wwise/ScriptableObjects/SwitchGroup/28A829B3-5B5E-4C09-B6A8-8FD03040A940.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +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: 9b800147b998def4da7b7728b7433963, type: 3} + m_Name: 28A829B3-5B5E-4C09-B6A8-8FD03040A940 + m_EditorClassIdentifier: + objectName: Footsteps + id: 2385628198 + guid: 28A829B3-5B5E-4C09-B6A8-8FD03040A940 diff --git a/blueberryPeak/Assets/Wwise/ScriptableObjects/SwitchGroup/28A829B3-5B5E-4C09-B6A8-8FD03040A940.asset.meta b/blueberryPeak/Assets/Wwise/ScriptableObjects/SwitchGroup/28A829B3-5B5E-4C09-B6A8-8FD03040A940.asset.meta new file mode 100644 index 0000000..c4b3a29 --- /dev/null +++ b/blueberryPeak/Assets/Wwise/ScriptableObjects/SwitchGroup/28A829B3-5B5E-4C09-B6A8-8FD03040A940.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fa917db249567fd429723f330d02ea79 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/blueberryPeak/blueberryPeak_WwiseProject/Actor-Mixer Hierarchy/Default Work Unit.wwu b/blueberryPeak/blueberryPeak_WwiseProject/Actor-Mixer Hierarchy/Default Work Unit.wwu index 2885c7d..d65bb54 100644 --- a/blueberryPeak/blueberryPeak_WwiseProject/Actor-Mixer Hierarchy/Default Work Unit.wwu +++ b/blueberryPeak/blueberryPeak_WwiseProject/Actor-Mixer Hierarchy/Default Work Unit.wwu @@ -177,6 +177,13 @@ + + + + -7 + + + @@ -299,6 +306,13 @@ + + + + -7 + + + @@ -443,6 +457,13 @@ + + + + -7 + + + @@ -964,7 +985,7 @@ - + @@ -981,13 +1002,13 @@ Exp2 - 15.07625 + 22.614375 -11.99964 0 Log2 - 20 + 30 -200 37 diff --git a/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Mac/DefaultSoundBank.bnk b/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Mac/DefaultSoundBank.bnk index 00a3ee7..41faedb 100644 Binary files a/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Mac/DefaultSoundBank.bnk and b/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Mac/DefaultSoundBank.bnk differ diff --git a/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Mac/DefaultSoundBank.json b/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Mac/DefaultSoundBank.json index 97b4367..f820e09 100644 --- a/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Mac/DefaultSoundBank.json +++ b/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Mac/DefaultSoundBank.json @@ -10,7 +10,7 @@ "Type": "User", "GUID": "{06908B47-1934-4D5A-A87A-85E27E5AD6F8}", "Language": "SFX", - "Hash": "{6FD2D4DB-7E85-6CC1-14BB-37EE2A515DDB}", + "Hash": "{C4292B6D-D670-5AA7-0909-BD5473315E96}", "ObjectPath": "\\SoundBanks\\Default Work Unit\\DefaultSoundBank", "ShortName": "DefaultSoundBank", "Path": "DefaultSoundBank.bnk", @@ -312,7 +312,7 @@ "Name": "Play_Bird3", "ObjectPath": "\\Events\\Default Work Unit\\Play_Bird3", "GUID": "{2C60D455-E347-400A-87F9-D076C64FCB60}", - "MaxAttenuation": "20", + "MaxAttenuation": "30", "DurationType": "OneShot", "DurationMin": "19.536009", "DurationMax": "19.536009", @@ -694,6 +694,6 @@ ] } ], - "FileHash": "{E64D2FC8-6A4B-08C7-00E0-6FC60FCD09D5}" + "FileHash": "{E233970D-F751-F5ED-2370-225C5582A074}" } } \ No newline at end of file diff --git a/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Windows/DefaultSoundBank.bnk b/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Windows/DefaultSoundBank.bnk index 00a3ee7..41faedb 100644 Binary files a/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Windows/DefaultSoundBank.bnk and b/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Windows/DefaultSoundBank.bnk differ diff --git a/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Windows/DefaultSoundBank.json b/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Windows/DefaultSoundBank.json index cc0ded9..2cddeaf 100644 --- a/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Windows/DefaultSoundBank.json +++ b/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Windows/DefaultSoundBank.json @@ -10,7 +10,7 @@ "Type": "User", "GUID": "{06908B47-1934-4D5A-A87A-85E27E5AD6F8}", "Language": "SFX", - "Hash": "{6FD2D4DB-7E85-6CC1-14BB-37EE2A515DDB}", + "Hash": "{C4292B6D-D670-5AA7-0909-BD5473315E96}", "ObjectPath": "\\SoundBanks\\Default Work Unit\\DefaultSoundBank", "ShortName": "DefaultSoundBank", "Path": "DefaultSoundBank.bnk", @@ -312,7 +312,7 @@ "Name": "Play_Bird3", "ObjectPath": "\\Events\\Default Work Unit\\Play_Bird3", "GUID": "{2C60D455-E347-400A-87F9-D076C64FCB60}", - "MaxAttenuation": "20", + "MaxAttenuation": "30", "DurationType": "OneShot", "DurationMin": "19.536009", "DurationMax": "19.536009", @@ -694,6 +694,6 @@ ] } ], - "FileHash": "{5A927EC5-BEDD-6994-87C9-0D7A43D70419}" + "FileHash": "{1A65C763-72C1-1696-33B2-1761356C3407}" } } \ No newline at end of file diff --git a/blueberryPeak/blueberryPeak_WwiseProject/Mixing Sessions/Default Work Unit.wwu b/blueberryPeak/blueberryPeak_WwiseProject/Mixing Sessions/Default Work Unit.wwu index 22f9fff..0d40b31 100644 --- a/blueberryPeak/blueberryPeak_WwiseProject/Mixing Sessions/Default Work Unit.wwu +++ b/blueberryPeak/blueberryPeak_WwiseProject/Mixing Sessions/Default Work Unit.wwu @@ -7,6 +7,9 @@ + + +