Merge remote-tracking branch 'origin/main'

UI sounds added to mainmenu scene
2025-06-18 11:56:38 +02:00 · 2025-06-18 11:56:26 +02:00
15 changed files with 359 additions and 3 deletions
--- a/blueberryPeak/Assets/Scenes/MainMenu.unity
+++ b/blueberryPeak/Assets/Scenes/MainMenu.unity
@ -257,6 +257,63 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 410587100}
  m_CullTransparentMesh: 1
+--- !u!1 &442429555
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 442429557}
+  - component: {fileID: 442429556}
+  m_Layer: 0
+  m_Name: SoundBank
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &442429556
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 442429555}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f49dc0281719c25428f2818a2ccd1618, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  triggerList: f7e1664c
+  useOtherObject: 0
+  data:
+    idInternal: 0
+    valueGuidInternal: 
+    WwiseObjectReference: {fileID: 11400000, guid: 8c328701b825e994db8b439f2fb266f2, type: 2}
+  decodeBank: 0
+  overrideLoadSetting: 0
+  loadAsynchronous: 0
+  saveDecodedBank: 0
+  unloadTriggerList: 958ca0ea
+  bankNameInternal: 
+  valueGuidInternal: 
+--- !u!4 &442429557
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 442429555}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 563.0269, y: 191.2536, z: -127.7843}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &476743627
 GameObject:
  m_ObjectHideFlags: 0
@ -461,6 +518,8 @@ GameObject:
  - component: {fileID: 663648606}
  - component: {fileID: 663648605}
  - component: {fileID: 663648608}
+  - component: {fileID: 663648610}
+  - component: {fileID: 663648609}
  m_Layer: 0
  m_Name: Main Camera
  m_TagString: MainCamera
@ -586,6 +645,46 @@ MonoBehaviour:
    m_MipBias: 0
    m_VarianceClampScale: 0.9
    m_ContrastAdaptiveSharpening: 0
+--- !u!114 &663648609
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 663648604}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e279c79f46ba866438afc957062b00ed, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isDefaultListener: 1
+  bOverrideScalingFactor: 0
+  scalingFactor: -1
+  listenerId: 0
+--- !u!114 &663648610
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 663648604}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c937869b929adf9479ee3544d8886f7f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_listeners:
+    initialListenerList: []
+    useDefaultListeners: 1
+  isEnvironmentAware: 1
+  isStaticObject: 0
+  usePositionOffsetData: 0
+  m_positionOffsetData:
+    KeepMe: 0
+    positionOffset: {x: 0, y: 0, z: 0}
+  scalingFactor: 1
+  m_posOffsetData: {fileID: 0}
+  listenerMask: 1
 --- !u!1 &1191866773
 GameObject:
  m_ObjectHideFlags: 0
@ -1029,6 +1128,14 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: bfd1564be9e1f46fc80749ae2e20f617, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  startGameEvent:
+    idInternal: 0
+    valueGuidInternal: 
+    WwiseObjectReference: {fileID: 11400000, guid: 9053a08b18dc2f04c89ddf2d65594c4a, type: 2}
+  quitGameEvent:
+    idInternal: 0
+    valueGuidInternal: 
+    WwiseObjectReference: {fileID: 11400000, guid: ab9db3ccf028b38419f4989c3b49dbcb, type: 2}
 --- !u!1 &1544930668
 GameObject:
  m_ObjectHideFlags: 0
@ -1555,3 +1662,4 @@ SceneRoots:
  - {fileID: 1524496912}
  - {fileID: 2099401583}
  - {fileID: 1544930674}
+  - {fileID: 442429557}
--- a/blueberryPeak/Assets/Scripts/Helper/MainMenu.cs
+++ b/blueberryPeak/Assets/Scripts/Helper/MainMenu.cs
@ -3,16 +3,33 @@ using UnityEngine.SceneManagement;

 public class MainMenu : MonoBehaviour
 {
+    [SerializeField] private AK.Wwise.Event startGameEvent;
+    [SerializeField] private AK.Wwise.Event quitGameEvent;
+
    public void StartGame()
    {
        Debug.Log("Start Game");
-        // Load the first scene (assuming it's named "GameScene")
+
+        // Post Wwise event for starting the game
+        if (startGameEvent != null)
+        {
+            startGameEvent.Post(gameObject);
+        }
+
+        // Load the first scene (assuming it's named "Beach")
        SceneManager.LoadScene("Beach");
    }

    public void QuitGame()
    {
        Debug.Log("Quit Game");
+
+        // Post Wwise event for quitting the game
+        if (quitGameEvent != null)
+        {
+            quitGameEvent.Post(gameObject);
+        }
+
        Application.Quit();
    }
 }
--- a/blueberryPeak/Assets/StreamingAssets/Audio/GeneratedSoundBanks/Wwise_IDs.h
+++ b/blueberryPeak/Assets/StreamingAssets/Audio/GeneratedSoundBanks/Wwise_IDs.h
@ -96,6 +96,7 @@ namespace AK
        static const AkUniqueID GARDENSOUNDBANK = 3056087313U;
        static const AkUniqueID MARKETSOUNDBANK = 3041575924U;
        static const AkUniqueID PEAKSOUNDBANK = 3891826351U;
+        static const AkUniqueID UISOUNDBANK = 3337922254U;
    } // namespace BANKS

    namespace BUSSES
--- a/blueberryPeak/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset
+++ b/blueberryPeak/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset
@ -66,7 +66,7 @@ MonoBehaviour:
    ParentPath: SoundBanks\Default Work Unit
    guid: 6dbe1735fe9da64689dc0e3d33d7b30f
    GuidInternal: 
-    m_lastTime: -8584513690332163790
+    m_lastTime: -8584513672351117367
    List:
    - name: BeachSoundBank
      guid: b821fdbb5f32f44990dd2c8c391bdb0d
@ -150,7 +150,7 @@ MonoBehaviour:
    ParentPath: Events\Default Work Unit
    guid: d503ca4bc28c0b4384cf91e122dea841
    GuidInternal: 
-    m_lastTime: -8584513754051715905
+    m_lastTime: -8584513672351284826
    List:
    - name: Play_BackgroundMusic
      guid: e73cae149756cc4ca4877c502decb508
@ -611,6 +611,23 @@ MonoBehaviour:
      maxAttenuation: 0
      maxDuration: 0.129161
      minDuration: 0.129161
+    - name: Play_PeakMusic
+      guid: fc73b680f955db448fe6c84622254bef
+      id: 1549799884
+      PathAndIcons:
+      - ElementName: Events
+        ObjectType: 5
+        guid: 00000000000000000000000000000000
+      - ElementName: Default Work Unit
+        ObjectType: 12
+        guid: d503ca4bc28c0b4384cf91e122dea841
+      - ElementName: Play_PeakMusic
+        ObjectType: 3
+        guid: fc73b680f955db448fe6c84622254bef
+      Path: Events\Default Work Unit\Play_PeakMusic
+      maxAttenuation: 0
+      maxDuration: 0
+      minDuration: 0
    - name: Play_QuestComplete
      guid: 0608a645786f034d9c7d3946fc8a2591
      id: 2060005325
--- a/blueberryPeak/Assets/Wwise/ScriptableObjects/Event/04C6AF09-4F06-4553-A410-F6FDDAFF0121.asset
+++ b/blueberryPeak/Assets/Wwise/ScriptableObjects/Event/04C6AF09-4F06-4553-A410-F6FDDAFF0121.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: 04C6AF09-4F06-4553-A410-F6FDDAFF0121
+  m_EditorClassIdentifier: 
+  objectName: Play_click2
+  id: 2790046324
+  guid: 04C6AF09-4F06-4553-A410-F6FDDAFF0121
+  IsInUserDefinedSoundBank: 1
--- a/blueberryPeak/Assets/Wwise/ScriptableObjects/Event/04C6AF09-4F06-4553-A410-F6FDDAFF0121.asset.meta
+++ b/blueberryPeak/Assets/Wwise/ScriptableObjects/Event/04C6AF09-4F06-4553-A410-F6FDDAFF0121.asset.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ab9db3ccf028b38419f4989c3b49dbcb
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/blueberryPeak/Assets/Wwise/ScriptableObjects/Soundbank/8B5663A3-D30E-4B46-8C03-4FE0ABEB9673.asset
+++ b/blueberryPeak/Assets/Wwise/ScriptableObjects/Soundbank/8B5663A3-D30E-4B46-8C03-4FE0ABEB9673.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: 1949b7a5925897b4da7aa5006694b26d, type: 3}
+  m_Name: 8B5663A3-D30E-4B46-8C03-4FE0ABEB9673
+  m_EditorClassIdentifier: 
+  objectName: UISoundBank
+  id: 3337922254
+  guid: 8B5663A3-D30E-4B46-8C03-4FE0ABEB9673
--- a/blueberryPeak/Assets/Wwise/ScriptableObjects/Soundbank/8B5663A3-D30E-4B46-8C03-4FE0ABEB9673.asset.meta
+++ b/blueberryPeak/Assets/Wwise/ScriptableObjects/Soundbank/8B5663A3-D30E-4B46-8C03-4FE0ABEB9673.asset.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8c328701b825e994db8b439f2fb266f2
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Mac/UISoundBank.bnk
+++ b/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Mac/UISoundBank.bnk
--- a/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Mac/UISoundBank.json
+++ b/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Mac/UISoundBank.json
@ -0,0 +1,69 @@
+{
+ "SoundBanksInfo": {
+  "Platform": "Mac",
+  "BasePlatform": "Mac",
+  "SchemaVersion": "16",
+  "SoundBankVersion": "154",
+  "SoundBanks": [
+   {
+    "Id": "3337922254",
+    "Type": "User",
+    "GUID": "{8B5663A3-D30E-4B46-8C03-4FE0ABEB9673}",
+    "Language": "SFX",
+    "Hash": "{B27DD9DB-782D-ADCC-5A11-39E47DA8FB62}",
+    "ObjectPath": "\\SoundBanks\\Default Work Unit\\UISoundBank",
+    "ShortName": "UISoundBank",
+    "Path": "UISoundBank.bnk",
+    "Media": [
+     {
+      "Id": "383621867",
+      "Language": "SFX",
+      "Streaming": "false",
+      "Location": "Memory",
+      "ShortName": "click1.wav",
+      "CachePath": "2C/{2CB00E5D-AF6D-773B-FF21-C4D3E079FEF2}.wem"
+     },
+     {
+      "Id": "604437297",
+      "Language": "SFX",
+      "Streaming": "false",
+      "Location": "Memory",
+      "ShortName": "click2.wav",
+      "CachePath": "C8/{C8D21D6F-47EA-AB19-5674-1EDC21875019}.wem"
+     }
+    ],
+    "Events": [
+     {
+      "Id": "2790046327",
+      "Name": "Play_click1",
+      "ObjectPath": "\\Events\\Default Work Unit\\Play_click1",
+      "GUID": "{9D362A60-2826-4D57-9D0A-9602A2539D8E}",
+      "DurationType": "OneShot",
+      "DurationMin": "0.08852608",
+      "DurationMax": "0.08852608",
+      "MediaRefs": [
+       {
+        "Id": "383621867"
+       }
+      ]
+     },
+     {
+      "Id": "2790046324",
+      "Name": "Play_click2",
+      "ObjectPath": "\\Events\\Default Work Unit\\Play_click2",
+      "GUID": "{04C6AF09-4F06-4553-A410-F6FDDAFF0121}",
+      "DurationType": "OneShot",
+      "DurationMin": "0.10303855",
+      "DurationMax": "0.10303855",
+      "MediaRefs": [
+       {
+        "Id": "604437297"
+       }
+      ]
+     }
+    ]
+   }
+  ],
+  "FileHash": "{5EF706E8-E3D7-DD10-9DA3-7CE39E429D4F}"
+ }
+}
--- a/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Mac/UISoundBank.txt
+++ b/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Mac/UISoundBank.txt
@ -0,0 +1,8 @@
+Event	ID	Name			Wwise Object Path	Notes
+	2790046324	Play_click2			\Default Work Unit\Play_click2	
+	2790046327	Play_click1			\Default Work Unit\Play_click1	
+
+In Memory Audio	ID	Name	Audio source file		Wwise Object Path	Notes	Data Size
+	383621867	click1	C:\stPoelten\sem4\CCL4\ccl4NEW\blueberryPeak\blueberryPeak_WwiseProject\.cache\2C\{2CB00E5D-AF6D-773B-FF21-C4D3E079FEF2}.wem		\Actor-Mixer Hierarchy\Default Work Unit\UI\click1		15712
+	604437297	click2	C:\stPoelten\sem4\CCL4\ccl4NEW\blueberryPeak\blueberryPeak_WwiseProject\.cache\C8\{C8D21D6F-47EA-AB19-5674-1EDC21875019}.wem		\Actor-Mixer Hierarchy\Default Work Unit\UI\click2		18272
+
--- a/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Windows/UISoundBank.bnk
+++ b/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Windows/UISoundBank.bnk
--- a/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Windows/UISoundBank.json
+++ b/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Windows/UISoundBank.json
@ -0,0 +1,69 @@
+{
+ "SoundBanksInfo": {
+  "Platform": "Windows",
+  "BasePlatform": "Windows",
+  "SchemaVersion": "16",
+  "SoundBankVersion": "154",
+  "SoundBanks": [
+   {
+    "Id": "3337922254",
+    "Type": "User",
+    "GUID": "{8B5663A3-D30E-4B46-8C03-4FE0ABEB9673}",
+    "Language": "SFX",
+    "Hash": "{B27DD9DB-782D-ADCC-5A11-39E47DA8FB62}",
+    "ObjectPath": "\\SoundBanks\\Default Work Unit\\UISoundBank",
+    "ShortName": "UISoundBank",
+    "Path": "UISoundBank.bnk",
+    "Media": [
+     {
+      "Id": "383621867",
+      "Language": "SFX",
+      "Streaming": "false",
+      "Location": "Memory",
+      "ShortName": "click1.wav",
+      "CachePath": "2C/{2CB00E5D-AF6D-773B-FF21-C4D3E079FEF2}.wem"
+     },
+     {
+      "Id": "604437297",
+      "Language": "SFX",
+      "Streaming": "false",
+      "Location": "Memory",
+      "ShortName": "click2.wav",
+      "CachePath": "C8/{C8D21D6F-47EA-AB19-5674-1EDC21875019}.wem"
+     }
+    ],
+    "Events": [
+     {
+      "Id": "2790046327",
+      "Name": "Play_click1",
+      "ObjectPath": "\\Events\\Default Work Unit\\Play_click1",
+      "GUID": "{9D362A60-2826-4D57-9D0A-9602A2539D8E}",
+      "DurationType": "OneShot",
+      "DurationMin": "0.08852608",
+      "DurationMax": "0.08852608",
+      "MediaRefs": [
+       {
+        "Id": "383621867"
+       }
+      ]
+     },
+     {
+      "Id": "2790046324",
+      "Name": "Play_click2",
+      "ObjectPath": "\\Events\\Default Work Unit\\Play_click2",
+      "GUID": "{04C6AF09-4F06-4553-A410-F6FDDAFF0121}",
+      "DurationType": "OneShot",
+      "DurationMin": "0.10303855",
+      "DurationMax": "0.10303855",
+      "MediaRefs": [
+       {
+        "Id": "604437297"
+       }
+      ]
+     }
+    ]
+   }
+  ],
+  "FileHash": "{81D3E3DE-AD2C-8C4A-378D-44F211CF7824}"
+ }
+}
--- a/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Windows/UISoundBank.txt
+++ b/blueberryPeak/blueberryPeak_WwiseProject/GeneratedSoundBanks/Windows/UISoundBank.txt
@ -0,0 +1,8 @@
+Event	ID	Name			Wwise Object Path	Notes
+	2790046324	Play_click2			\Default Work Unit\Play_click2	
+	2790046327	Play_click1			\Default Work Unit\Play_click1	
+
+In Memory Audio	ID	Name	Audio source file		Wwise Object Path	Notes	Data Size
+	383621867	click1	C:\stPoelten\sem4\CCL4\ccl4NEW\blueberryPeak\blueberryPeak_WwiseProject\.cache\2C\{2CB00E5D-AF6D-773B-FF21-C4D3E079FEF2}.wem		\Actor-Mixer Hierarchy\Default Work Unit\UI\click1		15712
+	604437297	click2	C:\stPoelten\sem4\CCL4\ccl4NEW\blueberryPeak\blueberryPeak_WwiseProject\.cache\C8\{C8D21D6F-47EA-AB19-5674-1EDC21875019}.wem		\Actor-Mixer Hierarchy\Default Work Unit\UI\click2		18272
+
--- a/blueberryPeak/blueberryPeak_WwiseProject/SoundBanks/Default
+++ b/blueberryPeak/blueberryPeak_WwiseProject/SoundBanks/Default
@ -140,6 +140,14 @@
 					<ObjectExclusionList/>
 					<GameSyncExclusionList/>
 				</SoundBank>
+				<SoundBank Name="UISoundBank" ID="{8B5663A3-D30E-4B46-8C03-4FE0ABEB9673}">
+					<ObjectInclusionList>
+						<ObjectRef Name="Play_click2" ID="{04C6AF09-4F06-4553-A410-F6FDDAFF0121}" WorkUnitID="{4BCA03D5-8CC2-430B-84CF-91E122DEA841}" Origin="Manual" Filter="7"/>
+						<ObjectRef Name="Play_click1" ID="{9D362A60-2826-4D57-9D0A-9602A2539D8E}" WorkUnitID="{4BCA03D5-8CC2-430B-84CF-91E122DEA841}" Origin="Manual" Filter="7"/>
+					</ObjectInclusionList>
+					<ObjectExclusionList/>
+					<GameSyncExclusionList/>
+				</SoundBank>
 			</ChildrenList>
 		</WorkUnit>
 	</SoundBanks>
Author	SHA1	Message	Date
Florian	6f3db8bbf9	Merge remote-tracking branch 'origin/main'	2025-06-18 11:56:38 +02:00
Florian	bef43e2c98	UI sounds added to mainmenu scene	2025-06-18 11:56:26 +02:00