Merge remote-tracking branch 'origin/main'

# Conflicts: # blueberryPeak/Assets/Materials/Material.mat.meta # blueberryPeak/Assets/Textures/FoxHouse.meta # blueberryPeak/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset
Market and beach with steps Sound
2025-06-16 10:28:48 +02:00 · 2025-06-16 10:26:32 +02:00
7 changed files with 254 additions and 89 deletions
--- a/blueberryPeak/Assets/Scenes/Market.unity
+++ b/blueberryPeak/Assets/Scenes/Market.unity
@ -334,6 +334,35 @@ Transform:
  m_Children: []
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &259279071 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7563270112099016041, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
+  m_PrefabInstance: {fileID: 2071877021}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &259279079
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 259279071}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: eb406d5b56f128c459c8013143f26241, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  triggerList: f7e1664c
+  useOtherObject: 0
+  data:
+    idInternal: 0
+    valueGuidInternal: 
+    groupIdInternal: 0
+    groupGuidInternal: 
+    WwiseObjectReference: {fileID: 11400000, guid: 6db10d635a886864fab77277a370b163, type: 2}
+  valueIdInternal: 0
+  groupIdInternal: 0
+  valueGuidInternal: 
+  groupGuidInternal: 
 --- !u!1001 &269692911
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -4623,6 +4652,14 @@ PrefabInstance:
      propertyPath: cameraTransform
      value: 
      objectReference: {fileID: 1755022767}
+    - target: {fileID: 3740866600301396226, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
+      propertyPath: footstepInterval
+      value: 0.6
+      objectReference: {fileID: 0}
+    - target: {fileID: 3740866600301396226, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
+      propertyPath: footstepEvent.WwiseObjectReference
+      value: 
+      objectReference: {fileID: 11400000, guid: 0a40e999cf3ad3349893f6e7878d1798, type: 2}
    - target: {fileID: 7563270112099016041, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
      propertyPath: m_Name
      value: Fox
@ -4630,7 +4667,10 @@ PrefabInstance:
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
-    m_AddedComponents: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 7563270112099016041, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 259279079}
  m_SourcePrefab: {fileID: 100100000, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
 --- !u!1001 &2120212726
 PrefabInstance:
--- 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: -8584517862097926414
+    m_lastTime: -8584515452736820231
    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: -8584517862101176526
+    m_lastTime: -8584515452737275721
    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_BerryWithBush
        ObjectType: 3
        guid: 89297e144d487444b281240357815fa9
-      Path: Events/Default Work Unit/Play_BerryWithBush
+      Path: Events\Default Work Unit\Play_BerryWithBush
      maxAttenuation: 0
      maxDuration: 0.5993424
      minDuration: 0.5993424
@ -143,7 +143,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
@ -160,7 +160,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
@ -177,7 +177,7 @@ MonoBehaviour:
      - ElementName: Play_Bird3
        ObjectType: 3
        guid: 55d4602c47e30a4087f9d076c64fcb60
-      Path: Events/Default Work Unit/Play_Bird3
+      Path: Events\Default Work Unit\Play_Bird3
      maxAttenuation: 30
      maxDuration: 19.536009
      minDuration: 19.536009
@ -194,7 +194,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
@ -211,7 +211,7 @@ MonoBehaviour:
      - ElementName: Play_Bush
        ObjectType: 3
        guid: 71436099af5471499ccf8c1b76e00f74
-      Path: Events/Default Work Unit/Play_Bush
+      Path: Events\Default Work Unit\Play_Bush
      maxAttenuation: 0
      maxDuration: 0.5993424
      minDuration: 0.5993424
@ -228,10 +228,27 @@ MonoBehaviour:
      - ElementName: Play_Bush2
        ObjectType: 3
        guid: 6e50d7016ff4d841be8160d5eb758293
-      Path: Events/Default Work Unit/Play_Bush2
+      Path: Events\Default Work Unit\Play_Bush2
      maxAttenuation: 0
      maxDuration: 0.6429932
      minDuration: 0.6429932
+    - name: Play_Bushes
+      guid: 8ca5211f24c6264bbd431cb4f03beb3a
+      id: 1487213420
+      PathAndIcons:
+      - ElementName: Events
+        ObjectType: 5
+        guid: 00000000000000000000000000000000
+      - ElementName: Default Work Unit
+        ObjectType: 12
+        guid: d503ca4bc28c0b4384cf91e122dea841
+      - ElementName: Play_Bushes
+        ObjectType: 3
+        guid: 8ca5211f24c6264bbd431cb4f03beb3a
+      Path: Events\Default Work Unit\Play_Bushes
+      maxAttenuation: 0
+      maxDuration: 0.6429932
+      minDuration: 0.5993424
    - name: Play_click1
      guid: 602a369d2628574d9d0a9602a2539d8e
      id: 2790046327
@ -245,7 +262,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
@ -262,7 +279,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
@ -279,7 +296,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
@ -296,7 +313,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
@ -313,7 +330,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
@ -330,7 +347,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
@ -347,7 +364,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
@ -364,10 +381,27 @@ 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
+    - name: Play_MarketMusic
+      guid: ae3394ce0be9794bbda1870ea432b2f9
+      id: 3892216159
+      PathAndIcons:
+      - ElementName: Events
+        ObjectType: 5
+        guid: 00000000000000000000000000000000
+      - ElementName: Default Work Unit
+        ObjectType: 12
+        guid: d503ca4bc28c0b4384cf91e122dea841
+      - ElementName: Play_MarketMusic
+        ObjectType: 3
+        guid: ae3394ce0be9794bbda1870ea432b2f9
+      Path: Events\Default Work Unit\Play_MarketMusic
+      maxAttenuation: 0
+      maxDuration: 0
+      minDuration: 0
    - name: Play_Ocean
      guid: 71a8eb3c14d2db4ca3b54b43832fee29
      id: 1724638476
@ -381,7 +415,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
@ -398,7 +432,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
@ -415,7 +449,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
@ -432,7 +466,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
@ -449,7 +483,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
@ -466,7 +500,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
@ -483,7 +517,7 @@ MonoBehaviour:
      - ElementName: Play_StartMusic_01
        ObjectType: 3
        guid: 283584f847a7f74695cd3d9c604b594e
-      Path: Events/Default Work Unit/Play_StartMusic_01
+      Path: Events\Default Work Unit\Play_StartMusic_01
      maxAttenuation: 0
      maxDuration: 0
      minDuration: 0
@ -500,7 +534,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
@ -517,12 +551,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
@ -530,13 +564,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
@ -544,10 +578,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
@ -562,7 +596,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
@ -632,7 +666,7 @@ MonoBehaviour:
      ValueIcons: []
      valuesInternal: []
  SwitchWwu:
-  - PhysicalPath: Switches/Default Work Unit.wwu
+  - PhysicalPath: Switches\Default Work Unit.wwu
    PathAndIcons:
    - ElementName: Switches
      ObjectType: 5
@ -640,10 +674,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
@ -658,7 +692,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
@ -712,7 +746,7 @@ MonoBehaviour:
      ValueIcons: []
      valuesInternal: []
  TriggerWwu:
-  - PhysicalPath: Triggers/Default Work Unit.wwu
+  - PhysicalPath: Triggers\Default Work Unit.wwu
    PathAndIcons:
    - ElementName: Triggers
      ObjectType: 5
@ -720,13 +754,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: 0500000006000000070000000e0000000f0000001f0000002000000023000000240000002500000026000000
+  ExpandedWaapiItemIds: 0500000006000000070000000e0000000f0000001f000000200000002300000024000000250000002600000028000000290000002a000000
  AutoSyncSelection: 0
  autoPopulateEnabled: 1
  currentDataSource: 0
--- a/blueberryPeak/Assets/Wwise/ScriptableObjects/Switch/B7DDB4D0-1ADB-44DF-BABA-88B5F3D3D872.asset
+++ b/blueberryPeak/Assets/Wwise/ScriptableObjects/Switch/B7DDB4D0-1ADB-44DF-BABA-88B5F3D3D872.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: B7DDB4D0-1ADB-44DF-BABA-88B5F3D3D872
+  m_EditorClassIdentifier: 
+  objectName: grass
+  id: 4248645337
+  guid: B7DDB4D0-1ADB-44DF-BABA-88B5F3D3D872
+  WwiseSwitchGroupReference: {fileID: 11400000, guid: fa917db249567fd429723f330d02ea79, type: 2}
--- a/blueberryPeak/Assets/Wwise/ScriptableObjects/Switch/B7DDB4D0-1ADB-44DF-BABA-88B5F3D3D872.asset.meta
+++ b/blueberryPeak/Assets/Wwise/ScriptableObjects/Switch/B7DDB4D0-1ADB-44DF-BABA-88B5F3D3D872.asset.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6db10d635a886864fab77277a370b163
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/blueberryPeak/blueberryPeak_WwiseProject/Actor-Mixer
+++ b/blueberryPeak/blueberryPeak_WwiseProject/Actor-Mixer
@ -1699,7 +1699,7 @@
 								<ActiveSource Name="BerryWithBush" ID="{77096F51-D2C8-4643-AF4C-25BB66A3F3B2}" Platform="Linked"/>
 							</ActiveSourceList>
 						</Sound>
-						<Sound Name="Bush" ID="{7A823E7E-9165-4B1E-A37D-ED8D81E0737E}" ShortID="199497895">
+						<RandomSequenceContainer Name="Bushes" ID="{61BF703B-F8DB-4599-A0A2-6600864BA073}" ShortID="115392514">
 							<ReferenceList>
 								<Reference Name="Conversion">
 									<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{76BF55DB-E02F-49D9-A994-1CA76B6334EB}"/>
@ -1709,40 +1709,52 @@
 								</Reference>
 							</ReferenceList>
 							<ChildrenList>
-								<AudioFileSource Name="Bush" ID="{CD509510-7D9C-408A-8EDA-AD5332F00995}">
-									<Language>SFX</Language>
-									<AudioFile>Bush.wav</AudioFile>
-									<MediaIDList>
-										<MediaID ID="411979747"/>
-									</MediaIDList>
-								</AudioFileSource>
+								<Sound Name="Bush" ID="{7A823E7E-9165-4B1E-A37D-ED8D81E0737E}" ShortID="199497895">
+									<ReferenceList>
+										<Reference Name="Conversion">
+											<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{76BF55DB-E02F-49D9-A994-1CA76B6334EB}"/>
+										</Reference>
+										<Reference Name="OutputBus">
+											<ObjectRef Name="Master Audio Bus" ID="{1514A4D8-1DA6-412A-A17E-75CA0C2149F3}" WorkUnitID="{CA27FFE4-DBEC-474B-A4F4-55153B6FF5C5}"/>
+										</Reference>
+									</ReferenceList>
+									<ChildrenList>
+										<AudioFileSource Name="Bush" ID="{CD509510-7D9C-408A-8EDA-AD5332F00995}">
+											<Language>SFX</Language>
+											<AudioFile>Bush.wav</AudioFile>
+											<MediaIDList>
+												<MediaID ID="411979747"/>
+											</MediaIDList>
+										</AudioFileSource>
+									</ChildrenList>
+									<ActiveSourceList>
+										<ActiveSource Name="Bush" ID="{CD509510-7D9C-408A-8EDA-AD5332F00995}" Platform="Linked"/>
+									</ActiveSourceList>
+								</Sound>
+								<Sound Name="Bush2" ID="{E45F45B2-2824-4EFB-9ADA-3F6FBD80A960}" ShortID="651364755">
+									<ReferenceList>
+										<Reference Name="Conversion">
+											<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{76BF55DB-E02F-49D9-A994-1CA76B6334EB}"/>
+										</Reference>
+										<Reference Name="OutputBus">
+											<ObjectRef Name="Master Audio Bus" ID="{1514A4D8-1DA6-412A-A17E-75CA0C2149F3}" WorkUnitID="{CA27FFE4-DBEC-474B-A4F4-55153B6FF5C5}"/>
+										</Reference>
+									</ReferenceList>
+									<ChildrenList>
+										<AudioFileSource Name="Bush2" ID="{CF79B000-A701-4789-B775-0F53C445F750}">
+											<Language>SFX</Language>
+											<AudioFile>Bush2.wav</AudioFile>
+											<MediaIDList>
+												<MediaID ID="671416210"/>
+											</MediaIDList>
+										</AudioFileSource>
+									</ChildrenList>
+									<ActiveSourceList>
+										<ActiveSource Name="Bush2" ID="{CF79B000-A701-4789-B775-0F53C445F750}" Platform="Linked"/>
+									</ActiveSourceList>
+								</Sound>
 							</ChildrenList>
-							<ActiveSourceList>
-								<ActiveSource Name="Bush" ID="{CD509510-7D9C-408A-8EDA-AD5332F00995}" Platform="Linked"/>
-							</ActiveSourceList>
-						</Sound>
-						<Sound Name="Bush2" ID="{E45F45B2-2824-4EFB-9ADA-3F6FBD80A960}" ShortID="651364755">
-							<ReferenceList>
-								<Reference Name="Conversion">
-									<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{76BF55DB-E02F-49D9-A994-1CA76B6334EB}"/>
-								</Reference>
-								<Reference Name="OutputBus">
-									<ObjectRef Name="Master Audio Bus" ID="{1514A4D8-1DA6-412A-A17E-75CA0C2149F3}" WorkUnitID="{CA27FFE4-DBEC-474B-A4F4-55153B6FF5C5}"/>
-								</Reference>
-							</ReferenceList>
-							<ChildrenList>
-								<AudioFileSource Name="Bush2" ID="{CF79B000-A701-4789-B775-0F53C445F750}">
-									<Language>SFX</Language>
-									<AudioFile>Bush2.wav</AudioFile>
-									<MediaIDList>
-										<MediaID ID="671416210"/>
-									</MediaIDList>
-								</AudioFileSource>
-							</ChildrenList>
-							<ActiveSourceList>
-								<ActiveSource Name="Bush2" ID="{CF79B000-A701-4789-B775-0F53C445F750}" Platform="Linked"/>
-							</ActiveSourceList>
-						</Sound>
+						</RandomSequenceContainer>
 					</ChildrenList>
 				</Folder>
 				<Folder Name="Music" ID="{FB46ED40-3AC4-44B0-904C-D9770E110928}" ShortID="1029051791">
@ -1812,6 +1824,35 @@
 								<ActiveSource Name="StartMusic3" ID="{81F4A518-3CE7-4B69-BFCD-40AFE3DCAE04}" Platform="Linked"/>
 							</ActiveSourceList>
 						</Sound>
+						<Sound Name="MarketMusic" ID="{CBE52F21-EE90-4D6B-B56D-04DDB63E2E17}" ShortID="807720403">
+							<PropertyList>
+								<Property Name="IsLoopingEnabled" Type="bool" Value="True"/>
+							</PropertyList>
+							<ReferenceList>
+								<Reference Name="Conversion">
+									<ObjectRef Name="Default Conversion Settings" ID="{6D1B890C-9826-4384-BF07-C15223E9FB56}" WorkUnitID="{76BF55DB-E02F-49D9-A994-1CA76B6334EB}"/>
+								</Reference>
+								<Reference Name="OutputBus">
+									<ObjectRef Name="Master Audio Bus" ID="{1514A4D8-1DA6-412A-A17E-75CA0C2149F3}" WorkUnitID="{CA27FFE4-DBEC-474B-A4F4-55153B6FF5C5}"/>
+								</Reference>
+							</ReferenceList>
+							<ChildrenList>
+								<AudioFileSource Name="Market" ID="{A9030A4A-68D6-4094-B897-D1E30EBC2E9B}">
+									<PropertyList>
+										<Property Name="OverrideWavLoop" Type="bool" Value="True"/>
+										<Property Name="TrimBegin" Type="Real64" Value="0.140153781453837"/>
+									</PropertyList>
+									<Language>SFX</Language>
+									<AudioFile>Market.wav</AudioFile>
+									<MediaIDList>
+										<MediaID ID="126117844"/>
+									</MediaIDList>
+								</AudioFileSource>
+							</ChildrenList>
+							<ActiveSourceList>
+								<ActiveSource Name="Market" ID="{A9030A4A-68D6-4094-B897-D1E30EBC2E9B}" Platform="Linked"/>
+							</ActiveSourceList>
+						</Sound>
 					</ChildrenList>
 				</Folder>
 			</ChildrenList>
--- a/blueberryPeak/blueberryPeak_WwiseProject/Events/Default
+++ b/blueberryPeak/blueberryPeak_WwiseProject/Events/Default
@ -278,6 +278,28 @@
 						</Action>
 					</ChildrenList>
 				</Event>
+				<Event Name="Play_MarketMusic" ID="{CE9433AE-E90B-4B79-BDA1-870EA432B2F9}">
+					<ChildrenList>
+						<Action Name="" ID="{A0423716-74F6-4351-A115-8D204A8081E9}" ShortID="336640219">
+							<ReferenceList>
+								<Reference Name="Target">
+									<ObjectRef Name="MarketMusic" ID="{CBE52F21-EE90-4D6B-B56D-04DDB63E2E17}" WorkUnitID="{B5FDF94D-31BC-4AB0-A385-CC577C3D722E}"/>
+								</Reference>
+							</ReferenceList>
+						</Action>
+					</ChildrenList>
+				</Event>
+				<Event Name="Play_Bushes" ID="{1F21A58C-C624-4B26-BD43-1CB4F03BEB3A}">
+					<ChildrenList>
+						<Action Name="" ID="{BF2B7438-4C9C-41E0-8018-BB3BD5AF9E80}" ShortID="23399497">
+							<ReferenceList>
+								<Reference Name="Target">
+									<ObjectRef Name="Bushes" ID="{61BF703B-F8DB-4599-A0A2-6600864BA073}" WorkUnitID="{B5FDF94D-31BC-4AB0-A385-CC577C3D722E}"/>
+								</Reference>
+							</ReferenceList>
+						</Action>
+					</ChildrenList>
+				</Event>
 			</ChildrenList>
 		</WorkUnit>
 	</Events>
--- a/blueberryPeak/blueberryPeak_WwiseProject/SoundBanks/Default
+++ b/blueberryPeak/blueberryPeak_WwiseProject/SoundBanks/Default
@ -21,6 +21,8 @@
 						<ObjectRef Name="Play_Bird1" ID="{11E00BAF-650E-4729-8A0A-70AA791ECF7C}" WorkUnitID="{4BCA03D5-8CC2-430B-84CF-91E122DEA841}" Origin="Manual" Filter="7"/>
 						<ObjectRef Name="Play_SandFootsteps" ID="{5FA520EA-B98C-47A0-A4BE-B1236644799F}" WorkUnitID="{4BCA03D5-8CC2-430B-84CF-91E122DEA841}" Origin="Manual" Filter="7"/>
 						<ObjectRef Name="Play_Bush" ID="{99604371-54AF-4971-9CCF-8C1B76E00F74}" WorkUnitID="{4BCA03D5-8CC2-430B-84CF-91E122DEA841}" Origin="Manual" Filter="7"/>
+						<ObjectRef Name="Play_Bushes" ID="{1F21A58C-C624-4B26-BD43-1CB4F03BEB3A}" WorkUnitID="{4BCA03D5-8CC2-430B-84CF-91E122DEA841}" Origin="Manual" Filter="7"/>
+						<ObjectRef Name="Play_MarketMusic" ID="{CE9433AE-E90B-4B79-BDA1-870EA432B2F9}" WorkUnitID="{4BCA03D5-8CC2-430B-84CF-91E122DEA841}" Origin="Manual" Filter="7"/>
 						<ObjectRef Name="Play_Digging" ID="{DC9349F3-0DF1-4BC8-90BF-D101ADD5E039}" WorkUnitID="{4BCA03D5-8CC2-430B-84CF-91E122DEA841}" Origin="Manual" Filter="7"/>
 						<ObjectRef Name="Play_River" ID="{930459F4-424E-4BCD-A070-F99A52EA6670}" WorkUnitID="{4BCA03D5-8CC2-430B-84CF-91E122DEA841}" Origin="Manual" Filter="7"/>
 						<ObjectRef Name="Play_BackgroundMusic" ID="{14AE3CE7-5697-4CCC-A487-7C502DECB508}" WorkUnitID="{4BCA03D5-8CC2-430B-84CF-91E122DEA841}" Origin="Manual" Filter="7"/>
Author	SHA1	Message	Date
Florian	2e55548530	Merge remote-tracking branch 'origin/main' # Conflicts: # blueberryPeak/Assets/Materials/Material.mat.meta # blueberryPeak/Assets/Textures/FoxHouse.meta # blueberryPeak/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset	2025-06-16 10:28:48 +02:00
Florian	e3f39057f8	Market and beach with steps Sound	2025-06-16 10:26:32 +02:00