Merge branches 'main' and 'main' of https://git.steelants.cz/GJP/GGJ2022

This commit is contained in:
nexovec 2022-01-29 19:41:58 +01:00
commit 23d996e774

View File

@ -1391,7 +1391,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3244356566819001084}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 4.32, z: 0.7}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -1414,7 +1414,7 @@ MeshRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3244356566819001084}
m_Enabled: 1
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
@ -1646,7 +1646,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3244356567786994344}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1.3, y: 6.799999, z: 21.3}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: