Merge remote-tracking branch 'origin/main'

blueberryPeak/Assets/Scenes/Garden.unity

@@ -33523,6 +33523,71 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 4362319458209513468, guid: 348e52e7a39fa49abafa3271436475d8, type: 3}
   m_PrefabInstance: {fileID: 586488284}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &587195407
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -24.52
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.01
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -0.04
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1745689670249651042, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2264011724657500812, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: m_Name
+      value: SceneSwitcher
+      objectReference: {fileID: 0}
+    - target: {fileID: 7419702660099155392, guid: 157ff23549611354485c3446833dc2bf, type: 3}
+      propertyPath: switchToScene
+      value: Peak
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 157ff23549611354485c3446833dc2bf, type: 3}
 --- !u!1001 &587825805
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -121295,3 +121360,4 @@ SceneRoots:
   - {fileID: 109876465}
   - {fileID: 1301368587}
   - {fileID: 2049723525}
+  - {fileID: 587195407}

blueberryPeak/Assets/Wwise/Editor/ProjectData/AkWwiseProjectData.asset

@@ -66,7 +66,7 @@ MonoBehaviour:
     ParentPath: SoundBanks\Default Work Unit
     guid: 6dbe1735fe9da64689dc0e3d33d7b30f
     GuidInternal: 
-    m_lastTime: -8584513672351117367
+    m_lastTime: -8584513663180102621
     List:
     - name: BeachSoundBank
       guid: b821fdbb5f32f44990dd2c8c391bdb0d
@@ -138,6 +138,20 @@ MonoBehaviour:
         ObjectType: 7
         guid: a832004464ab90419e47e3fc0e049fbf
       Path: SoundBanks\Default Work Unit\PeakSoundBank
+    - name: UISoundBank
+      guid: a363568b0ed3464b8c034fe0abeb9673
+      id: 3337922254
+      PathAndIcons:
+      - ElementName: SoundBanks
+        ObjectType: 5
+        guid: 00000000000000000000000000000000
+      - ElementName: Default Work Unit
+        ObjectType: 12
+        guid: 6dbe1735fe9da64689dc0e3d33d7b30f
+      - ElementName: UISoundBank
+        ObjectType: 7
+        guid: a363568b0ed3464b8c034fe0abeb9673
+      Path: SoundBanks\Default Work Unit\UISoundBank
   EventWwu:
   - PhysicalPath: Events\Default Work Unit.wwu
     PathAndIcons: