# Conflicts:
#	Assets/_Content/Fonts/MerchandePrintCerif/AssetFont/MerchandePrintSerif SDF.asset
#	Assets/_Content/Prefabs/OctoPlayerFP.prefab
#	Assets/_Content/Scenes/BodiesInWater.unity
This commit is contained in:
2026-05-26 20:19:12 +02:00
29 changed files with 1483 additions and 15 deletions
@@ -17,6 +17,7 @@ GameObject:
- component: {fileID: 2242241179127902993}
- component: {fileID: 6578902307436344113}
- component: {fileID: 2963135821278175517}
- component: {fileID: 1050349503168033948}
m_Layer: 0
m_Name: Camera Player
m_TagString: MainCamera
@@ -245,6 +246,18 @@ CapsuleCollider:
m_Height: 1
m_Direction: 1
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &1050349503168033948
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2101508725665932610}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 976062e6c0f8cb944ad0f941852ec198, type: 3}
m_Name:
m_EditorClassIdentifier: AK.Wwise.Unity.MonoBehaviour::AkSpatialAudioListener
--- !u!1 &8162540767767967414
GameObject:
m_ObjectHideFlags: 0