Ver código fonte

Adds background music to the new starbase level

Signed-off-by: kberg-amzn <[email protected]>
kberg-amzn 2 anos atrás
pai
commit
f1a620ea2d

+ 98 - 0
Gem/Code/Source/Components/BackgroundMusicComponent.cpp

@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include <Source/Components/BackgroundMusicComponent.h>
+#include <AzCore/Serialization/EditContext.h>
+#include <AzCore/Serialization/SerializeContext.h>
+#include <LmbrCentral/Audio/AudioProxyComponentBus.h>
+#include <AzCore/Console/ILogger.h>
+
+namespace MultiplayerSample
+{
+    void BackgroundMusicComponent::Reflect(AZ::ReflectContext* context)
+    {
+        AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
+        if (serializeContext)
+        {
+            serializeContext->Class<BackgroundMusicComponent, AZ::Component>()
+                ->Field("Playlist", &BackgroundMusicComponent::m_playlist)
+                ->Version(1);
+
+            AZ::EditContext* editContext = serializeContext->GetEditContext();
+            if (editContext)
+            {
+                editContext->Class<BackgroundMusicComponent>("BackgroundMusicComponent", "Plays a sequence of background music tracks in sequence")
+                    ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+                    ->Attribute(AZ::Edit::Attributes::Category, "MultiplayerSample")
+                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"))
+                    ->DataElement(AZ::Edit::UIHandlers::Default, &BackgroundMusicComponent::m_playlist, "Playlist", "The set of background music audio triggers to play");
+            }
+        }
+    }
+
+    void BackgroundMusicComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& services)
+    {
+        services.push_back(AZ_CRC_CE("BackgroundMusicComponent"));
+    }
+
+    void BackgroundMusicComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
+    {
+        required.push_back(AZ_CRC("AudioProxyService", 0x7da4c79c));
+    }
+
+    void BackgroundMusicComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& services)
+    {
+        services.push_back(AZ_CRC_CE("BackgroundMusicComponent"));
+    }
+
+    void BackgroundMusicComponent::Activate()
+    {
+#if AZ_TRAIT_CLIENT
+        m_audioSystem = AZ::Interface<Audio::IAudioSystem>::Get();
+
+        if (m_audioSystem != nullptr)
+        {
+            m_trackIndex = size_t(-1);
+            ReportTriggerFinished(INVALID_AUDIO_CONTROL_ID);
+        }
+#endif
+
+        Audio::AudioTriggerNotificationBus::Handler::BusConnect(Audio::TriggerNotificationIdType{ GetEntityId() });
+    }
+
+    void BackgroundMusicComponent::Deactivate()
+    {
+        Audio::AudioTriggerNotificationBus::Handler::BusDisconnect(Audio::TriggerNotificationIdType{ GetEntityId() });
+    }
+
+    void BackgroundMusicComponent::ReportTriggerFinished([[maybe_unused]] Audio::TAudioControlID triggerId)
+    {
+        if (m_playlist.empty())
+        {
+            return;
+        }
+
+#if AZ_TRAIT_CLIENT
+        m_trackIndex = ++m_trackIndex % m_playlist.size();
+
+        if (m_audioSystem != nullptr)
+        {
+            const AZStd::string& trackName = m_playlist[m_trackIndex];
+            m_currentTrackTriggerId = m_audioSystem->GetAudioTriggerID(trackName.c_str());
+
+            if (m_currentTrackTriggerId != INVALID_AUDIO_CONTROL_ID)
+            {
+                LmbrCentral::AudioProxyComponentRequestBus::Event(
+                    GetEntityId(),
+                    &LmbrCentral::AudioProxyComponentRequests::ExecuteTrigger,
+                    m_currentTrackTriggerId);
+            }
+        }
+#endif
+    }
+}

+ 41 - 0
Gem/Code/Source/Components/BackgroundMusicComponent.h

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include <AzCore/Component/Component.h>
+#include <IAudioSystem.h>
+
+namespace MultiplayerSample
+{
+    class BackgroundMusicComponent
+        : public AZ::Component
+        , protected Audio::AudioTriggerNotificationBus::Handler
+    {
+    public:
+        AZ_COMPONENT(MultiplayerSample::BackgroundMusicComponent, "{FA774915-3CDD-4370-B7C9-8F891A006973}");
+
+        static void Reflect(AZ::ReflectContext* context);
+
+        static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& services);
+        static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required);
+        static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& services);
+
+        void Activate() override;
+        void Deactivate() override;
+
+    protected:
+        void ReportTriggerFinished(Audio::TAudioControlID triggerId) override;
+
+    private:
+        size_t m_trackIndex = 0;
+        AZStd::vector<AZStd::string> m_playlist;
+        Audio::IAudioSystem* m_audioSystem = nullptr;
+        Audio::TATLIDType m_currentTrackTriggerId = INVALID_AUDIO_CONTROL_ID;
+    };
+}

+ 10 - 9
Gem/Code/Source/MultiplayerSampleModule.cpp

@@ -15,19 +15,19 @@
 #include <Components/UI/UiCoinCountComponent.h>
 #include <Components/UI/UiGameOverComponent.h>
 #include <Components/UI/UiPlayerArmorComponent.h>
+#include <Components/BackgroundMusicComponent.h>
 #include <Components/ScriptableDecalComponent.h>
-#if AZ_TRAIT_CLIENT
-    #include <Components/UI/HUDComponent.h>
-    #include <Components/UI/UiMatchPlayerCoinCountsComponent.h>
-    #include <Components/UI/UiRestBetweenRoundsComponent.h>
-    #include <Components/UI/UiSettingsComponent.h>
-    #include <Components/UI/UiStartMenuComponent.h>
-#endif
-
 #include <Source/AutoGen/AutoComponentTypes.h>
-
 #include "MultiplayerSampleSystemComponent.h"
 
+#if AZ_TRAIT_CLIENT
+#   include <Components/UI/HUDComponent.h>
+#   include <Components/UI/UiMatchPlayerCoinCountsComponent.h>
+#   include <Components/UI/UiRestBetweenRoundsComponent.h>
+#   include <Components/UI/UiSettingsComponent.h>
+#   include <Components/UI/UiStartMenuComponent.h>
+#endif
+
 namespace MultiplayerSample
 {
     class MultiplayerSampleModule
@@ -47,6 +47,7 @@ namespace MultiplayerSample
                 ExampleFilteredEntityComponent::CreateDescriptor(),
                 NetworkPrefabSpawnerComponent::CreateDescriptor(),
                 UiCoinCountComponent::CreateDescriptor(),
+                BackgroundMusicComponent::CreateDescriptor(),
                 ScriptableDecalComponent::CreateDescriptor(),
                 #if AZ_TRAIT_CLIENT
                     HUDComponent::CreateDescriptor(),

+ 3 - 0
Gem/Code/multiplayersample_files.cmake

@@ -73,6 +73,9 @@ set(FILES
     Source/Components/Multiplayer/EnergyCannonComponent.cpp
     Source/Components/Multiplayer/EnergyCannonComponent.h
 
+    Source/Components/BackgroundMusicComponent.cpp
+    Source/Components/BackgroundMusicComponent.h
+
     Source/Components/RpcTesterComponent.cpp
     Source/Components/RpcTesterComponent.h
     

+ 20 - 8
Levels/NewStarbase/NewStarbase.prefab

@@ -11577,6 +11577,18 @@
                     "$type": "EditorEntitySortComponent",
                     "Id": 14774980749977237053
                 },
+                "Component_[14919200452665967980]": {
+                    "$type": "GenericComponentWrapper",
+                    "Id": 14919200452665967980,
+                    "m_template": {
+                        "$type": "MultiplayerSample::BackgroundMusicComponent",
+                        "Playlist": [
+                            "rocket",
+                            "beauty_flow",
+                            "rocket"
+                        ]
+                    }
+                },
                 "Component_[17049943556665966323]": {
                     "$type": "EditorEntityIconComponent",
                     "Id": 17049943556665966323
@@ -30814,7 +30826,7 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[2563122736071885678]/Transform Data/Rotate/1",
-                    "value": 1.2738307587564779e-12
+                    "value": 1.273830758756478e-12
                 },
                 {
                     "op": "replace",
@@ -30854,7 +30866,7 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[2563122736071885678]/Transform Data/Rotate/1",
-                    "value": 1.2738307587564779e-12
+                    "value": 1.273830758756478e-12
                 },
                 {
                     "op": "replace",
@@ -30894,7 +30906,7 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[2563122736071885678]/Transform Data/Rotate/1",
-                    "value": 1.2738307587564779e-12
+                    "value": 1.273830758756478e-12
                 },
                 {
                     "op": "replace",
@@ -30934,7 +30946,7 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[2563122736071885678]/Transform Data/Rotate/1",
-                    "value": 1.2738307587564779e-12
+                    "value": 1.273830758756478e-12
                 },
                 {
                     "op": "replace",
@@ -30974,7 +30986,7 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[2563122736071885678]/Transform Data/Rotate/1",
-                    "value": 1.2738307587564779e-12
+                    "value": 1.273830758756478e-12
                 },
                 {
                     "op": "replace",
@@ -31014,7 +31026,7 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[2563122736071885678]/Transform Data/Rotate/1",
-                    "value": 1.2738307587564779e-12
+                    "value": 1.273830758756478e-12
                 },
                 {
                     "op": "replace",
@@ -31054,7 +31066,7 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[2563122736071885678]/Transform Data/Rotate/1",
-                    "value": 1.2738307587564779e-12
+                    "value": 1.273830758756478e-12
                 },
                 {
                     "op": "replace",
@@ -31094,7 +31106,7 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[2563122736071885678]/Transform Data/Rotate/1",
-                    "value": 1.2738307587564779e-12
+                    "value": 1.273830758756478e-12
                 },
                 {
                     "op": "replace",

+ 3 - 0
Sounds/wwise/1070395499.wem

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:45a644501a6762f30e5b7cef444f41bcc312d09f91398301dbd9e08d8671e87d
+size 66539584

+ 3 - 0
Sounds/wwise/1073420800.wem

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b1deeee7019c3eff5673cac9920dedef11f0feadf1553392a51628d5c1045ae0
+size 38283328

+ 3 - 0
Sounds/wwise/115250578.wem

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:708537b00f9a619c957a89d9c038512d169fe5301ebfe124515c1b14354b360b
+size 25924672

+ 3 - 0
Sounds/wwise/655023540.wem

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a1c4fe8e4e9c51054324c524ad049baa94774d56f9a9a1d5faf10bbcaa91417e
+size 76451392

+ 2 - 2
Sounds/wwise/MultiplayerSample_SoundBank.bnk

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e26efb95f47ba277d16fec0b7ce36c9b04ebcd836ace81782c64a13b9419f7de
-size 63086512
+oid sha256:21b03265f9118a1ea525635bf2663d100a947f5cb2795d0982d2ab9fbab73c47
+size 63087131

+ 192 - 0
Sounds/wwise_project/Actor-Mixer Hierarchy/AMPS/LVL.wwu

@@ -82,6 +82,198 @@
 									</ChildrenList>
 									<ObjectLists/>
 								</BlendContainer>
+								<ActorMixer Name="beauty_flow" ID="{9EC966BE-D68B-4A2D-A56C-4892CE97A77D}" ShortID="215290428">
+									<PropertyList>
+										<Property Name="3DSpatialization" Type="int16" Value="2"/>
+										<Property Name="BelowThresholdBehavior" Type="int16" Value="3"/>
+										<Property Name="PriorityDistanceFactor" Type="bool" Value="True"/>
+										<Property Name="UserAuxSendVolume0" Type="Real64">
+											<ValueList>
+												<Value>-3</Value>
+											</ValueList>
+										</Property>
+									</PropertyList>
+									<ReferenceList>
+										<Reference Name="Attenuation">
+											<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+										</Reference>
+										<Reference Name="Conversion">
+											<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
+										</Reference>
+										<Reference Name="OutputBus">
+											<ObjectRef Name="SX" ID="{9BAD8B54-940E-473A-9DE7-E613A4F0BB4B}" WorkUnitID="{8B26C89C-CDEC-42FD-AE82-2A0A21AD7AAE}"/>
+										</Reference>
+										<Reference Name="UserAuxSend0">
+											<ObjectRef Name="RVB_EXT_Main" ID="{F8DF5907-D7A9-43AF-B130-2AB20EED85E3}" WorkUnitID="{8B26C89C-CDEC-42FD-AE82-2A0A21AD7AAE}"/>
+										</Reference>
+									</ReferenceList>
+									<ChildrenList>
+										<Sound Name="Beauty Flow" ID="{ECDF9185-197D-4EAD-BF3B-F3EAE8040A1E}" ShortID="1058521084">
+											<PropertyList>
+												<Property Name="IsStreamingEnabled" Type="bool">
+													<ValueList>
+														<Value>True</Value>
+													</ValueList>
+												</Property>
+												<Property Name="Volume" Type="Real64">
+													<ValueList>
+														<Value>-6</Value>
+													</ValueList>
+												</Property>
+											</PropertyList>
+											<ReferenceList>
+												<Reference Name="Conversion">
+													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
+												</Reference>
+												<Reference Name="OutputBus">
+													<ObjectRef Name="Master Audio Bus" ID="{1514A4D8-1DA6-412A-A17E-75CA0C2149F3}" WorkUnitID="{F62C277B-2C60-43BB-A8B2-F1E94C3F98EC}"/>
+												</Reference>
+											</ReferenceList>
+											<ChildrenList>
+												<AudioFileSource Name="Beauty Flow" ID="{A46E9731-E1EB-42EE-BE7F-F6437FDF809C}">
+													<Language>SFX</Language>
+													<AudioFile>Beauty Flow.wav</AudioFile>
+													<MediaIDList>
+														<MediaID ID="655023540"/>
+													</MediaIDList>
+												</AudioFileSource>
+											</ChildrenList>
+											<ObjectLists/>
+											<ActiveSourceList>
+												<ActiveSource Name="Beauty Flow" ID="{A46E9731-E1EB-42EE-BE7F-F6437FDF809C}" Platform="Linked"/>
+											</ActiveSourceList>
+										</Sound>
+									</ChildrenList>
+									<ObjectLists/>
+								</ActorMixer>
+								<ActorMixer Name="future_gladiator" ID="{AAAFDCA3-E9CD-4C2A-8E30-8538B7B78B31}" ShortID="48597">
+									<PropertyList>
+										<Property Name="3DSpatialization" Type="int16" Value="2"/>
+										<Property Name="BelowThresholdBehavior" Type="int16" Value="3"/>
+										<Property Name="PriorityDistanceFactor" Type="bool" Value="True"/>
+										<Property Name="UserAuxSendVolume0" Type="Real64">
+											<ValueList>
+												<Value>-3</Value>
+											</ValueList>
+										</Property>
+									</PropertyList>
+									<ReferenceList>
+										<Reference Name="Attenuation">
+											<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+										</Reference>
+										<Reference Name="Conversion">
+											<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
+										</Reference>
+										<Reference Name="OutputBus">
+											<ObjectRef Name="SX" ID="{9BAD8B54-940E-473A-9DE7-E613A4F0BB4B}" WorkUnitID="{8B26C89C-CDEC-42FD-AE82-2A0A21AD7AAE}"/>
+										</Reference>
+										<Reference Name="UserAuxSend0">
+											<ObjectRef Name="RVB_EXT_Main" ID="{F8DF5907-D7A9-43AF-B130-2AB20EED85E3}" WorkUnitID="{8B26C89C-CDEC-42FD-AE82-2A0A21AD7AAE}"/>
+										</Reference>
+									</ReferenceList>
+									<ChildrenList>
+										<Sound Name="Future Gladiator" ID="{2C0BD4CA-76EC-4714-9C88-C5364FD4361D}" ShortID="722579746">
+											<PropertyList>
+												<Property Name="IsStreamingEnabled" Type="bool">
+													<ValueList>
+														<Value>True</Value>
+													</ValueList>
+												</Property>
+												<Property Name="Volume" Type="Real64">
+													<ValueList>
+														<Value>-8</Value>
+													</ValueList>
+												</Property>
+											</PropertyList>
+											<ReferenceList>
+												<Reference Name="Conversion">
+													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
+												</Reference>
+												<Reference Name="OutputBus">
+													<ObjectRef Name="Master Audio Bus" ID="{1514A4D8-1DA6-412A-A17E-75CA0C2149F3}" WorkUnitID="{F62C277B-2C60-43BB-A8B2-F1E94C3F98EC}"/>
+												</Reference>
+											</ReferenceList>
+											<ChildrenList>
+												<AudioFileSource Name="Future Gladiator" ID="{4FD3E458-FA8C-4F43-9523-66364BF7511F}">
+													<Language>SFX</Language>
+													<AudioFile>Future Gladiator.wav</AudioFile>
+													<MediaIDList>
+														<MediaID ID="1073420800"/>
+													</MediaIDList>
+												</AudioFileSource>
+											</ChildrenList>
+											<ObjectLists/>
+											<ActiveSourceList>
+												<ActiveSource Name="Future Gladiator" ID="{4FD3E458-FA8C-4F43-9523-66364BF7511F}" Platform="Linked"/>
+											</ActiveSourceList>
+										</Sound>
+									</ChildrenList>
+									<ObjectLists/>
+								</ActorMixer>
+								<ActorMixer Name="rocket" ID="{4D1305BD-E28A-49F1-8E91-D75EB6EA59FB}" ShortID="143389107">
+									<PropertyList>
+										<Property Name="3DSpatialization" Type="int16" Value="2"/>
+										<Property Name="BelowThresholdBehavior" Type="int16" Value="3"/>
+										<Property Name="PriorityDistanceFactor" Type="bool" Value="True"/>
+										<Property Name="UserAuxSendVolume0" Type="Real64">
+											<ValueList>
+												<Value>-3</Value>
+											</ValueList>
+										</Property>
+									</PropertyList>
+									<ReferenceList>
+										<Reference Name="Attenuation">
+											<ObjectRef Name="ATN_Default_20" ID="{9A356296-FB49-4226-8845-131AFAB59884}" WorkUnitID="{FF701137-ABB4-4FD9-800E-7C2F77E85689}"/>
+										</Reference>
+										<Reference Name="Conversion">
+											<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
+										</Reference>
+										<Reference Name="OutputBus">
+											<ObjectRef Name="SX" ID="{9BAD8B54-940E-473A-9DE7-E613A4F0BB4B}" WorkUnitID="{8B26C89C-CDEC-42FD-AE82-2A0A21AD7AAE}"/>
+										</Reference>
+										<Reference Name="UserAuxSend0">
+											<ObjectRef Name="RVB_EXT_Main" ID="{F8DF5907-D7A9-43AF-B130-2AB20EED85E3}" WorkUnitID="{8B26C89C-CDEC-42FD-AE82-2A0A21AD7AAE}"/>
+										</Reference>
+									</ReferenceList>
+									<ChildrenList>
+										<Sound Name="Rocket" ID="{E8258E1E-BB45-4281-9C81-3174071BEEB0}" ShortID="758395372">
+											<PropertyList>
+												<Property Name="IsStreamingEnabled" Type="bool">
+													<ValueList>
+														<Value>True</Value>
+													</ValueList>
+												</Property>
+												<Property Name="Volume" Type="Real64">
+													<ValueList>
+														<Value>-8</Value>
+													</ValueList>
+												</Property>
+											</PropertyList>
+											<ReferenceList>
+												<Reference Name="Conversion">
+													<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{0119FCBC-B171-4B2F-BB85-593A23CC9CD0}"/>
+												</Reference>
+												<Reference Name="OutputBus">
+													<ObjectRef Name="Master Audio Bus" ID="{1514A4D8-1DA6-412A-A17E-75CA0C2149F3}" WorkUnitID="{F62C277B-2C60-43BB-A8B2-F1E94C3F98EC}"/>
+												</Reference>
+											</ReferenceList>
+											<ChildrenList>
+												<AudioFileSource Name="Rocket" ID="{3057E892-DA3F-4CB0-8A81-73AF30B052BD}">
+													<Language>SFX</Language>
+													<AudioFile>Rocket.wav</AudioFile>
+													<MediaIDList>
+														<MediaID ID="115250578"/>
+													</MediaIDList>
+												</AudioFileSource>
+											</ChildrenList>
+											<ObjectLists/>
+											<ActiveSourceList>
+												<ActiveSource Name="Rocket" ID="{3057E892-DA3F-4CB0-8A81-73AF30B052BD}" Platform="Linked"/>
+											</ActiveSourceList>
+										</Sound>
+									</ChildrenList>
+									<ObjectLists/>
+								</ActorMixer>
 							</ChildrenList>
 							<ObjectLists/>
 						</ActorMixer>

+ 14 - 0
Sounds/wwise_project/Actor-Mixer Hierarchy/AMPS/MX.wwu

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WwiseDocument Type="WorkUnit" ID="{AA20B5BC-06AE-4EC5-A248-109D9EE35897}" SchemaVersion="103">
+	<AudioObjects>
+		<WorkUnit Name="MX" ID="{AA20B5BC-06AE-4EC5-A248-109D9EE35897}" PersistMode="Standalone">
+			<PropertyList>
+				<Property Name="Inclusion" Type="bool">
+					<ValueList>
+						<Value>False</Value>
+					</ValueList>
+				</Property>
+			</PropertyList>
+		</WorkUnit>
+	</AudioObjects>
+</WwiseDocument>

+ 63 - 3
Sounds/wwise_project/Events/AMPS/AMB.wwu

@@ -6,9 +6,6 @@
 				<Event Name="play_sx_amb_ext_general" ID="{118E75AA-7412-45A0-AAA9-52CD47DB9E41}">
 					<ChildrenList>
 						<Action Name="" ID="{E12EFB24-AB65-4232-BD67-8F6925C157F0}" ShortID="745775555">
-							<PropertyList>
-								<Property Name="FadeTime" Type="Real64" Value="0.3"/>
-							</PropertyList>
 							<ReferenceList>
 								<Reference Name="Target">
 									<ObjectRef Name="sx_amb_ext_generalWindLoop" ID="{F55CE3A4-96C3-4E54-8267-FBB6A47AAAE1}" WorkUnitID="{FF882DA0-D34E-47CD-9819-576540D5FB1C}"/>
@@ -56,6 +53,69 @@
 						</Action>
 					</ChildrenList>
 				</Event>
+				<Event Name="rocket" ID="{4060BEF8-E908-4BDE-AFD2-6E0FA057CD6B}">
+					<ChildrenList>
+						<Action Name="" ID="{13665353-3628-4162-B258-14BA5D07D49B}" ShortID="800090568">
+							<ReferenceList>
+								<Reference Name="Target">
+									<ObjectRef Name="Rocket" ID="{E8258E1E-BB45-4281-9C81-3174071BEEB0}" WorkUnitID="{FF882DA0-D34E-47CD-9819-576540D5FB1C}"/>
+								</Reference>
+							</ReferenceList>
+						</Action>
+						<Action Name="" ID="{6606CDFB-B3CA-40FA-B69C-FBFB4A2DBAFA}" ShortID="608537304">
+							<PropertyList>
+								<Property Name="ActionType" Type="int16" Value="36"/>
+							</PropertyList>
+							<ReferenceList>
+								<Reference Name="Target">
+									<ObjectRef Name="Rocket" ID="{E8258E1E-BB45-4281-9C81-3174071BEEB0}" WorkUnitID="{FF882DA0-D34E-47CD-9819-576540D5FB1C}"/>
+								</Reference>
+							</ReferenceList>
+						</Action>
+					</ChildrenList>
+				</Event>
+				<Event Name="future_gladiator" ID="{A437974A-51F1-4F3C-B623-6D17741CE162}">
+					<ChildrenList>
+						<Action Name="" ID="{54954584-C040-4E0F-A066-CF784DD6C169}" ShortID="1070131939">
+							<ReferenceList>
+								<Reference Name="Target">
+									<ObjectRef Name="Future Gladiator" ID="{2C0BD4CA-76EC-4714-9C88-C5364FD4361D}" WorkUnitID="{FF882DA0-D34E-47CD-9819-576540D5FB1C}"/>
+								</Reference>
+							</ReferenceList>
+						</Action>
+						<Action Name="" ID="{DB91EEB9-C99B-4004-9B5E-8BA71D82F265}" ShortID="285746269">
+							<PropertyList>
+								<Property Name="ActionType" Type="int16" Value="36"/>
+							</PropertyList>
+							<ReferenceList>
+								<Reference Name="Target">
+									<ObjectRef Name="Future Gladiator" ID="{2C0BD4CA-76EC-4714-9C88-C5364FD4361D}" WorkUnitID="{FF882DA0-D34E-47CD-9819-576540D5FB1C}"/>
+								</Reference>
+							</ReferenceList>
+						</Action>
+					</ChildrenList>
+				</Event>
+				<Event Name="beauty_flow" ID="{E24D72A5-1DCD-4C84-BA05-4D6ACA979ABC}">
+					<ChildrenList>
+						<Action Name="" ID="{67ECBB5C-B496-4BEF-80DC-C0BEDF31792E}" ShortID="780551046">
+							<ReferenceList>
+								<Reference Name="Target">
+									<ObjectRef Name="Beauty Flow" ID="{ECDF9185-197D-4EAD-BF3B-F3EAE8040A1E}" WorkUnitID="{FF882DA0-D34E-47CD-9819-576540D5FB1C}"/>
+								</Reference>
+							</ReferenceList>
+						</Action>
+						<Action Name="" ID="{2861746A-0B52-4070-87C9-45AE8E611975}" ShortID="163506992">
+							<PropertyList>
+								<Property Name="ActionType" Type="int16" Value="36"/>
+							</PropertyList>
+							<ReferenceList>
+								<Reference Name="Target">
+									<ObjectRef Name="Beauty Flow" ID="{ECDF9185-197D-4EAD-BF3B-F3EAE8040A1E}" WorkUnitID="{FF882DA0-D34E-47CD-9819-576540D5FB1C}"/>
+								</Reference>
+							</ReferenceList>
+						</Action>
+					</ChildrenList>
+				</Event>
 			</ChildrenList>
 		</WorkUnit>
 	</Events>

+ 11 - 1
Sounds/wwise_project/Events/Default O3DE Work Unit.wwu

@@ -67,7 +67,17 @@
 						</Action>
 					</ChildrenList>
 				</Event>
-				<Event Name="do_nothing" ID="{59644E92-2831-425C-ACD3-BF068AAE1F77}"/>
+				<Event Name="do_nothing" ID="{59644E92-2831-425C-ACD3-BF068AAE1F77}">
+					<ChildrenList>
+						<Action Name="" ID="{4599C36D-7735-41D4-B8C6-07C717506577}" ShortID="473161540"/>
+						<Action Name="" ID="{EA54B31A-9789-475C-B3D1-6BC334158C87}" ShortID="599963739">
+							<PropertyList>
+								<Property Name="ActionType" Type="int16" Value="36"/>
+							</PropertyList>
+							<ReferenceList/>
+						</Action>
+					</ChildrenList>
+				</Event>
 			</ChildrenList>
 		</WorkUnit>
 	</Events>

+ 3 - 0
Sounds/wwise_project/Originals/SFX/Beauty Flow.wav

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d62776f0e41ac60ad50bd82ac85c3c67b2eec5acc39cfdcdb0025a736c88c2d3
+size 76451506

+ 3 - 0
Sounds/wwise_project/Originals/SFX/Future Gladiator.wav

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:108c7168890b9bbd8b9fdac8fa66e5d85104f3b282d55c64babcaf07f2257890
+size 38283466

+ 3 - 0
Sounds/wwise_project/Originals/SFX/Rocket.wav

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:40c9d5fe79bfc3fdf40e98993b0a981c6dcad3a955af5af761a7f79c95a1fe25
+size 25924766

+ 3 - 0
Sounds/wwise_project/Originals/SFX/incompetech/Dream Catcher.wav

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3b48ae6dfc6ba1f35f5ca0fe3ffcdd2fbd768cb53bb4c3c6ec289a4bf65c4686
+size 66539678

+ 12 - 0
Sounds/wwise_project/Soundcaster Sessions/Default Work Unit.wwu

@@ -17,6 +17,10 @@
 							<ObjectRef Name="play_sx_int_defenseturret_projectile" ID="{445FBCD9-FCA2-41BE-B2E0-FF4E640AAC7B}" WorkUnitID="{CF19DCBF-DBAF-47EA-BB92-20770380FC6C}"/>
 							<Position X="0" Y="4"/>
 						</Module>
+						<Module>
+							<ObjectRef Name="beauty_flow" ID="{E24D72A5-1DCD-4C84-BA05-4D6ACA979ABC}" WorkUnitID="{DE9FC369-2076-4F07-9C00-6203DBF0184F}"/>
+							<Position X="0" Y="5"/>
+						</Module>
 						<Module>
 							<ObjectRef Name="play_sx_int_malfunctioningshieldgenerator_explo" ID="{A910A681-E6E6-47EF-9061-B9753C009A61}" WorkUnitID="{D49A7F17-5E56-4DE2-816D-4286ED6A3BE2}"/>
 							<Position X="1" Y="0"/>
@@ -29,6 +33,10 @@
 							<ObjectRef Name="stop_sx_int_defenseturret_projectile" ID="{ADF03BF2-DAFD-4FA1-BAC6-6CEC22FD0EFD}" WorkUnitID="{CF19DCBF-DBAF-47EA-BB92-20770380FC6C}"/>
 							<Position X="1" Y="4"/>
 						</Module>
+						<Module>
+							<ObjectRef Name="future_gladiator" ID="{A437974A-51F1-4F3C-B623-6D17741CE162}" WorkUnitID="{DE9FC369-2076-4F07-9C00-6203DBF0184F}"/>
+							<Position X="1" Y="5"/>
+						</Module>
 						<Module>
 							<ObjectRef Name="play_sx_player_footstep" ID="{1FFADD80-2B41-4080-BCCC-C50E8E9F54A4}" WorkUnitID="{6146481B-5849-48AD-9DBA-B2D263C55E44}"/>
 							<Position X="2" Y="1"/>
@@ -41,6 +49,10 @@
 							<ObjectRef Name="play_sx_wpn_laserpistol_fire" ID="{FA50B607-E2A8-4E18-B8FC-632C1F353C41}" WorkUnitID="{127FA651-B259-4F86-BC4D-A900F3A4CCA2}"/>
 							<Position X="2" Y="3"/>
 						</Module>
+						<Module>
+							<ObjectRef Name="rocket" ID="{4060BEF8-E908-4BDE-AFD2-6E0FA057CD6B}" WorkUnitID="{DE9FC369-2076-4F07-9C00-6203DBF0184F}"/>
+							<Position X="2" Y="5"/>
+						</Module>
 						<Module>
 							<ObjectRef Name="play_sx_player_pain" ID="{C4E4C612-D934-451D-873B-D9B4AE45A646}" WorkUnitID="{6146481B-5849-48AD-9DBA-B2D263C55E44}"/>
 							<Position X="3" Y="1"/>

+ 9 - 0
libs/gameaudio/wwise/multiplayersample_controls.xml

@@ -30,6 +30,15 @@
 		<ATLTrigger atl_name="Play_Sound_Gun_Firing" path="z_placeholders">
 			<WwiseEvent wwise_name="Play_Sound_Gun_Firing"/>
 		</ATLTrigger>
+		<ATLTrigger atl_name="rocket" path="Events/MUS">
+			<WwiseEvent wwise_name="rocket"/>
+		</ATLTrigger>
+		<ATLTrigger atl_name="future_gladiator" path="Events/MUS">
+			<WwiseEvent wwise_name="future_gladiator"/>
+		</ATLTrigger>
+		<ATLTrigger atl_name="beauty_flow" path="Events/MUS">
+			<WwiseEvent wwise_name="beauty_flow"/>
+		</ATLTrigger>
 		<ATLTrigger atl_name="set_state_game_none" path="Events/_Globals/States/Game">
 			<WwiseEvent wwise_name="set_state_game_none"/>
 		</ATLTrigger>