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
This commit is contained in:
@@ -1424,6 +1424,38 @@ Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
|
||||
m_PrefabInstance: {fileID: 379159062}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &380412242
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 380412243}
|
||||
m_Layer: 0
|
||||
m_Name: //Audio
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &380412243
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 380412242}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 2.52753, y: 1.014, z: 29.87976}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 620676193}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &388702211 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 8829451551789304542, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
|
||||
@@ -1888,6 +1920,88 @@ Transform:
|
||||
- {fileID: 1715108806}
|
||||
m_Father: {fileID: 1884628756}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1001 &620676192
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 380412243}
|
||||
m_Modifications:
|
||||
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_LocalScale.x
|
||||
value: 91.774
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 33.084
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_LocalScale.z
|
||||
value: 71.199
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -3.58576
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 15.3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -6.3
|
||||
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: 5808716582761680893, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: WwiseAkRoom
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9175439339295666836, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: reverbAuxBus.WwiseObjectReference
|
||||
value:
|
||||
objectReference: {fileID: 11400000, guid: 0ffa2518f917d5547b7ca09e61bc3b3d, type: 2}
|
||||
- target: {fileID: 9175439339295666836, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
propertyPath: roomToneEvent.WwiseObjectReference
|
||||
value:
|
||||
objectReference: {fileID: 11400000, guid: 33cf9216d8746e54c9b5b3cbda6389fc, type: 2}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
--- !u!4 &620676193 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
|
||||
m_PrefabInstance: {fileID: 620676192}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &658668483
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -2586,6 +2700,63 @@ Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 8829451551789304537, guid: 8206b722d11501a449d6a278cca2adfa, type: 3}
|
||||
m_PrefabInstance: {fileID: 1074058715}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &1212848185
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1212848187}
|
||||
- component: {fileID: 1212848186}
|
||||
m_Layer: 0
|
||||
m_Name: WwiseGlobal
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &1212848186
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1212848185}
|
||||
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 &1212848187
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1212848185}
|
||||
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!1001 &1224080683
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -4089,3 +4260,5 @@ SceneRoots:
|
||||
- {fileID: 1358231749}
|
||||
- {fileID: 571823342}
|
||||
- {fileID: 178584620}
|
||||
- {fileID: 1212848187}
|
||||
- {fileID: 380412243}
|
||||
|
||||
Reference in New Issue
Block a user