tiboFDG/Ipseity-Demo
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	Assets/_Content/Scenes/BodiesInWater.unity
#	Assets/_Content/Scenes/Samyaza.unity
This commit is contained in:
Ferlat Thibaud
2026-06-08 11:24:10 +02:00
parent 4a3ba34e7a aad6a4810b
commit 4baf182a4e
502 changed files with 59332 additions and 12067 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/_Content/Scenes/Samyaza.unity
+74 -3
View File
@@ -347,7 +347,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
propertyPath: m_LocalPosition.z
value: 0.8
value: 9.7
objectReference: {fileID: 0}
- target: {fileID: 2721267321453921552, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
propertyPath: m_LocalRotation.w
@@ -388,7 +388,7 @@ PrefabInstance:
- target: {fileID: 9175439339295666836, guid: a4ca96f09a0c04645aa697def551b52d, type: 3}
propertyPath: roomToneEvent.WwiseObjectReference
value:
objectReference: {fileID: 11400000, guid: ec4bd41129eb3de4bbb0aa97414885c5, type: 2}
objectReference: {fileID: 11400000, guid: 320d186f4e69a4549b3782ef7216fd07, type: 2}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -602,6 +602,67 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &674667781
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 1386056836}
m_Modifications:
- target: {fileID: 4229867573999893934, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
propertyPath: m_LocalPosition.x
value: -0.33
objectReference: {fileID: 0}
- target: {fileID: 4229867573999893934, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
propertyPath: m_LocalPosition.y
value: -0.26
objectReference: {fileID: 0}
- target: {fileID: 4229867573999893934, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
propertyPath: m_LocalPosition.z
value: 0.23
objectReference: {fileID: 0}
- target: {fileID: 4229867573999893934, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4229867573999893934, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4229867573999893934, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4229867573999893934, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4229867573999893934, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4229867573999893934, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4229867573999893934, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5856443040925330738, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
propertyPath: m_Name
value: WwiseAkEmitter
objectReference: {fileID: 0}
- target: {fileID: 8660823651490621642, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
propertyPath: data.WwiseObjectReference
value:
objectReference: {fileID: 11400000, guid: cec2ea9f3839f8543bc4a740ef56458e, type: 2}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
--- !u!1 &832575517
GameObject:
m_ObjectHideFlags: 0
@@ -884,7 +945,7 @@ MonoBehaviour:
_tolerance: 0.5
_duration: 1
_execution: 1
_delay: 15
_delay: 14.8
_onTrigger:
m_PersistentCalls:
m_Calls: []
@@ -1130,6 +1191,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: b4c976c60f3fdd341aac54399b120b66, type: 3}
m_PrefabInstance: {fileID: 1343215278}
m_PrefabAsset: {fileID: 0}
--- !u!4 &1386056836 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5778405769220826163, guid: 21d4875f29fd5f9499e8822008e369b8, type: 3}
m_PrefabInstance: {fileID: 1468790604}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1468790604
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1431,6 +1497,11 @@ MonoBehaviour:
OnAnimationEnded:
m_PersistentCalls:
m_Calls: []
--- !u!4 &1694024956 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4229867573999893934, guid: d77f266a781cf58469c9872b9724fa29, type: 3}
m_PrefabInstance: {fileID: 674667781}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1836157291
GameObject:
m_ObjectHideFlags: 0