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

Merge branch 'main' into YK-Opti

Browse Source 
# Conflicts:
#	Assets/_Content/Scenes/BodiesInWater.unity
#	Assets/_Content/Scenes/Samyaza.unity
#	Assets/_Content/Scenes/Theatre.unity
This commit is contained in:
Jahnisse
2026-06-11 17:11:55 +02:00
parent 7e9e358c8e 641de18d3b
commit de4fa41e21
78 changed files with 31709 additions and 3410 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/_Content/Scenes/Samyaza.unity
+76 -1
View File
@@ -1863,7 +1863,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8725966219179855439, guid: bfb9a06a57603714ca245d62fcd622f1, type: 3}
propertyPath: m_LocalPosition.z
value: 0
value: -0.03
objectReference: {fileID: 0}
- target: {fileID: 8725966219179855439, guid: bfb9a06a57603714ca245d62fcd622f1, type: 3}
propertyPath: m_LocalRotation.w
@@ -3551,6 +3551,80 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1381997587}
m_Mesh: {fileID: -6137490931089931848, guid: 303e3cf8f55aa5c4496d590985c18325, type: 3}
--- !u!1001 &1410562653
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 3810177374303855382}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 303e3cf8f55aa5c4496d590985c18325, type: 3}
propertyPath: m_LocalPosition.x
value: 0.16
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 303e3cf8f55aa5c4496d590985c18325, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 303e3cf8f55aa5c4496d590985c18325, type: 3}
propertyPath: m_LocalPosition.z
value: 6.52
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 303e3cf8f55aa5c4496d590985c18325, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 303e3cf8f55aa5c4496d590985c18325, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 303e3cf8f55aa5c4496d590985c18325, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 303e3cf8f55aa5c4496d590985c18325, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 303e3cf8f55aa5c4496d590985c18325, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 303e3cf8f55aa5c4496d590985c18325, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 303e3cf8f55aa5c4496d590985c18325, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -3334822080195584727, guid: 303e3cf8f55aa5c4496d590985c18325, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: -3040090587557307837, guid: 303e3cf8f55aa5c4496d590985c18325, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 303e3cf8f55aa5c4496d590985c18325, type: 3}
propertyPath: m_Name
value: GroundCables
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 303e3cf8f55aa5c4496d590985c18325, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 303e3cf8f55aa5c4496d590985c18325, type: 3}
--- !u!4 &1410562654 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 303e3cf8f55aa5c4496d590985c18325, type: 3}
m_PrefabInstance: {fileID: 1410562653}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1427769123
GameObject:
m_ObjectHideFlags: 0
@@ -22122,6 +22196,7 @@ Transform:
m_Children:
- {fileID: 543450652358898415}
- {fileID: 543450652953374655}
- {fileID: 1410562654}
m_Father: {fileID: 543450652265058471}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &3811968858410181536