Merge branch 'main' into DamianBranch

This commit is contained in:
2025-12-19 17:01:08 +01:00
13 changed files with 257 additions and 205 deletions

View File

@@ -1691,7 +1691,7 @@ GameObject:
- component: {fileID: 1536057437}
m_Layer: 5
m_Name: MainCanvas
m_TagString: Untagged
m_TagString: MainCanvas
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0

View File

@@ -939,7 +939,7 @@ GameObject:
- component: {fileID: 818930088}
m_Layer: 5
m_Name: MainCanvas
m_TagString: Untagged
m_TagString: MainCanvas
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0

View File

@@ -5529,7 +5529,7 @@ GameObject:
- component: {fileID: 1156219949}
m_Layer: 5
m_Name: MainCanvas
m_TagString: Untagged
m_TagString: MainCanvas
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -5613,7 +5613,7 @@ RectTransform:
- {fileID: 1585033672}
- {fileID: 805585728}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -0.079}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
@@ -8511,7 +8511,7 @@ Camera:
far clip plane: 1000
field of view: 60
orthographic: 1
orthographic size: 20
orthographic size: 35
m_Depth: -1
m_CullingMask:
serializedVersion: 2
@@ -8536,7 +8536,7 @@ Transform:
m_GameObject: {fileID: 1810521056}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -10}
m_LocalPosition: {x: 0, y: 13.5999975, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []