Merge branch 'emil'

This commit is contained in:
Emil Shanaty
2025-03-08 21:24:26 +03:00
5 changed files with 706 additions and 3 deletions
+17
View File
@@ -454,6 +454,21 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &2060574367
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2060574361}
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 &3997104640432974468
PrefabInstance:
m_ObjectHideFlags: 0
@@ -515,8 +530,10 @@ PrefabInstance:
SceneRoots:
m_ObjectHideFlags: 0
m_Roots:
- {fileID: 2060574367}
- {fileID: 1560783769}
- {fileID: 1692628191}
- {fileID: 3997104640432974468}
- {fileID: 1555151540}
- {fileID: 840308438}
- {fileID: 1907799224}