Merge branch 'main' of http://212.24.110.183:3000/IPSEITY/Unheimlich_POC

# Conflicts: # Assets/_Content/Fonts/MerchandePrintCerif/AssetFont/MerchandePrintSerif SDF.asset # Assets/_Content/Prefabs/OctoPlayerFP.prefab # Assets/_Content/Scenes/BodiesInWater.unity
2026-05-26 20:19:12 +02:00
parent e7d5ef04dd c9b517959e
commit a847d6a454
29 changed files with 1483 additions and 15 deletions
@@ -498,6 +498,63 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 8725966219179855439, guid: 6493d77978c5c1246a0410d1f9204524, type: 3}
  m_PrefabInstance: {fileID: 917697128}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1186577683
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1186577685}
+  - component: {fileID: 1186577684}
+  m_Layer: 0
+  m_Name: WwiseGlobal
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1186577684
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1186577683}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ca8082afa1214454c828fd22641b8692, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: AK.Wwise.Unity.MonoBehaviour::AkInitializer
+  InitializationSettings: {fileID: 11400000, guid: de5fd82fbf79ed247b9046e375a4b249, type: 2}
+  basePath: 
+  language: 
+  defaultPoolSize: 0
+  lowerPoolSize: 0
+  streamingPoolSize: 0
+  memoryCutoffThreshold: 0
+  monitorPoolSize: 0
+  monitorQueuePoolSize: 0
+  callbackManagerBufferSize: 0
+  spatialAudioPoolSize: 0
+  maxSoundPropagationDepth: 0
+  engineLogging: 0
+--- !u!4 &1186577685
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1186577683}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  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 &1280641848
 GameObject:
  m_ObjectHideFlags: 0
@@ -1365,6 +1422,91 @@ Transform:
  - {fileID: 1280641849}
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1706244649
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 2.5262501
+      objectReference: {fileID: 0}
+    - target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 4.7476563
+      objectReference: {fileID: 0}
+    - target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 49.137
+      objectReference: {fileID: 0}
+    - target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.05
+      objectReference: {fileID: 0}
+    - target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 1.74
+      objectReference: {fileID: 0}
+    - target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 15.31912
+      objectReference: {fileID: 0}
+    - target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3976092107026356747, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
+      propertyPath: m_Size.x
+      value: 1.88
+      objectReference: {fileID: 0}
+    - target: {fileID: 5808716582761680893, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
+      propertyPath: m_Name
+      value: WwiseAkRoom
+      objectReference: {fileID: 0}
+    - target: {fileID: 9175439339295666836, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
+      propertyPath: roomToneAuxSend
+      value: 0.51
+      objectReference: {fileID: 0}
+    - target: {fileID: 9175439339295666836, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
+      propertyPath: reverbAuxBus.WwiseObjectReference
+      value: 
+      objectReference: {fileID: 11400000, guid: 72b304cdac43568428f4ebbbc3956599, type: 2}
+    - target: {fileID: 9175439339295666836, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
+      propertyPath: roomToneEvent.WwiseObjectReference
+      value: 
+      objectReference: {fileID: 11400000, guid: 094935737315d3c4ca81fdbb453dea7c, type: 2}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
 --- !u!1 &1904167640
 GameObject:
  m_ObjectHideFlags: 0
@@ -1476,3 +1618,5 @@ SceneRoots:
  - {fileID: 1624955847}
  - {fileID: 300277222}
  - {fileID: 917697128}
+  - {fileID: 1186577685}
+  - {fileID: 1706244649}