Merge branch 'main' of http://212.24.110.183:3000/IPSEITY/Unheimlich_POC
# Conflicts: # Assets/_Content/Scenes/BodiesInWater.unity
This commit is contained in:
@@ -1387,7 +1387,7 @@ MonoBehaviour:
|
||||
_tolerance: 0.5
|
||||
_duration: 1
|
||||
_execution: 1
|
||||
_delay: 20
|
||||
_delay: 14.9
|
||||
_onTrigger:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
|
||||
@@ -681,7 +681,7 @@ MonoBehaviour:
|
||||
_tolerance: 0.5
|
||||
_duration: 1
|
||||
_execution: 1
|
||||
_delay: 20
|
||||
_delay: 15
|
||||
_onTrigger:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
|
||||
@@ -119,6 +119,79 @@ NavMeshSettings:
|
||||
debug:
|
||||
m_Flags: 0
|
||||
m_NavMeshData: {fileID: 0}
|
||||
--- !u!1 &100423306
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 100423309}
|
||||
- component: {fileID: 100423308}
|
||||
- component: {fileID: 100423307}
|
||||
m_Layer: 0
|
||||
m_Name: GameObject
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &100423307
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 100423306}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4ccb80e2899444642bdbf406a3c31f7b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: AK.Wwise.Unity.MonoBehaviour::AkGameObj
|
||||
m_listeners:
|
||||
initialListenerList: []
|
||||
useDefaultListeners: 1
|
||||
isEnvironmentAware: 1
|
||||
isStaticObject: 0
|
||||
usePositionOffsetData: 0
|
||||
m_positionOffsetData:
|
||||
KeepMe: 0
|
||||
positionOffset: {x: 0, y: 0, z: 0}
|
||||
scalingFactor: 1
|
||||
m_posOffsetData: {fileID: 0}
|
||||
listenerMask: 1
|
||||
--- !u!114 &100423308
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 100423306}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 57e4af8a70aa9904da2b35504ad63407, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::Audio_MusicCueListener
|
||||
musicEvent:
|
||||
idInternal: 0
|
||||
valueGuidInternal:
|
||||
WwiseObjectReference: {fileID: 11400000, guid: 9dc07a762aed4954bbd6034fe5032240, type: 2}
|
||||
--- !u!4 &100423309
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 100423306}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -2.07226, y: 3.29875, z: -5.01629}
|
||||
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 &245714134
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -421,6 +494,63 @@ MonoBehaviour:
|
||||
groupIdInternal: 0
|
||||
groupGuidInternal:
|
||||
WwiseObjectReference: {fileID: 11400000, guid: 90b25d313fd10fe4bb34ce68d987f60e, type: 2}
|
||||
--- !u!1001 &727419957
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 4395560298612109037, guid: 61f7fe4128138164295ef34aae4f6659, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -1.80955
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4395560298612109037, guid: 61f7fe4128138164295ef34aae4f6659, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 2.88452
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4395560298612109037, guid: 61f7fe4128138164295ef34aae4f6659, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -4.28006
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4395560298612109037, guid: 61f7fe4128138164295ef34aae4f6659, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4395560298612109037, guid: 61f7fe4128138164295ef34aae4f6659, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4395560298612109037, guid: 61f7fe4128138164295ef34aae4f6659, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4395560298612109037, guid: 61f7fe4128138164295ef34aae4f6659, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4395560298612109037, guid: 61f7fe4128138164295ef34aae4f6659, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4395560298612109037, guid: 61f7fe4128138164295ef34aae4f6659, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4395560298612109037, guid: 61f7fe4128138164295ef34aae4f6659, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6521978618824486866, guid: 61f7fe4128138164295ef34aae4f6659, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: AudioManager
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 61f7fe4128138164295ef34aae4f6659, type: 3}
|
||||
--- !u!1 &935580408 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 8162540767767967414, guid: 524ca0dabcf93844ea5f981410f44310, type: 3}
|
||||
@@ -1562,7 +1692,7 @@ PrefabInstance:
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: aa5fd76235a9d7f42b164cfd00ee58a4, type: 3}
|
||||
--- !u!1001 &1671855845641723936
|
||||
--- !u!1001 &1488412446344103320
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
@@ -1570,67 +1700,59 @@ PrefabInstance:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 4395560298612109037, guid: 61f7fe4128138164295ef34aae4f6659, type: 3}
|
||||
- target: {fileID: 4567019715677106522, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: WwiseEventTrigger
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5806845514899202101, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
value: -2.30955
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4395560298612109037, guid: 61f7fe4128138164295ef34aae4f6659, type: 3}
|
||||
- target: {fileID: 5806845514899202101, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -0
|
||||
value: 1.74
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4395560298612109037, guid: 61f7fe4128138164295ef34aae4f6659, type: 3}
|
||||
- target: {fileID: 5806845514899202101, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
value: -5.64
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4395560298612109037, guid: 61f7fe4128138164295ef34aae4f6659, type: 3}
|
||||
- target: {fileID: 5806845514899202101, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4395560298612109037, guid: 61f7fe4128138164295ef34aae4f6659, type: 3}
|
||||
- target: {fileID: 5806845514899202101, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4395560298612109037, guid: 61f7fe4128138164295ef34aae4f6659, type: 3}
|
||||
- target: {fileID: 5806845514899202101, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4395560298612109037, guid: 61f7fe4128138164295ef34aae4f6659, type: 3}
|
||||
- target: {fileID: 5806845514899202101, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4395560298612109037, guid: 61f7fe4128138164295ef34aae4f6659, type: 3}
|
||||
- target: {fileID: 5806845514899202101, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4395560298612109037, guid: 61f7fe4128138164295ef34aae4f6659, type: 3}
|
||||
- target: {fileID: 5806845514899202101, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4395560298612109037, guid: 61f7fe4128138164295ef34aae4f6659, type: 3}
|
||||
- target: {fileID: 5806845514899202101, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4908846766475971086, guid: 61f7fe4128138164295ef34aae4f6659, type: 3}
|
||||
propertyPath: PlayMusic.WwiseObjectReference
|
||||
value:
|
||||
objectReference: {fileID: 11400000, guid: 4303be4199a066247b73a540c1bf916a, type: 2}
|
||||
- target: {fileID: 4908846766475971086, guid: 61f7fe4128138164295ef34aae4f6659, type: 3}
|
||||
propertyPath: StopMusic.WwiseObjectReference
|
||||
value:
|
||||
objectReference: {fileID: 11400000, guid: 30074da3ee405904689ea5fcccb862bb, type: 2}
|
||||
- target: {fileID: 6521978618824486866, guid: 61f7fe4128138164295ef34aae4f6659, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: AudioManager
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6521978618824486866, guid: 61f7fe4128138164295ef34aae4f6659, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
- target: {fileID: 7365274582226833486, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
propertyPath: wwiseEvents.Array.data[0].label
|
||||
value: Binaural
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 61f7fe4128138164295ef34aae4f6659, type: 3}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: aec729894f9f57b46b671ad6de6dfd31, type: 3}
|
||||
--- !u!1001 &2118492718844646720
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1717,6 +1839,8 @@ SceneRoots:
|
||||
- {fileID: 245714138}
|
||||
- {fileID: 1586552169}
|
||||
- {fileID: 661203445}
|
||||
- {fileID: 1671855845641723936}
|
||||
- {fileID: 1250423863045520849}
|
||||
- {fileID: 2118492718844646720}
|
||||
- {fileID: 1488412446344103320}
|
||||
- {fileID: 727419957}
|
||||
- {fileID: 100423309}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 9db28fdf5c572414aa08b31921ca2e3a
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Reference in New Issue
Block a user