06.07.2022

This commit is contained in:
Plotnikov
2022-07-06 12:36:49 +03:00
parent 696daa0b2e
commit b0a0566f19
32 changed files with 5 additions and 39308 deletions

View File

@@ -10797,11 +10797,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1036527912875768121}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
<<<<<<< HEAD
m_LocalPosition: {x: 0.925, y: 0.21, z: -1}
=======
m_LocalPosition: {x: 0.925, y: 0.21, z: 0}
>>>>>>> 3b1b9479a46e90d056b92897ea9f8422b25fc052
m_LocalScale: {x: 0.7, y: 0.7, z: 1}
m_Children:
- {fileID: 4790444141562044227}
@@ -23893,11 +23889,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2442980966293290867}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
<<<<<<< HEAD
m_LocalPosition: {x: 0.905, y: 1.43, z: -1}
=======
m_LocalPosition: {x: 0.905, y: 1.43, z: 0}
>>>>>>> 3b1b9479a46e90d056b92897ea9f8422b25fc052
m_LocalScale: {x: 0.9, y: 0.9, z: 1}
m_Children:
- {fileID: 6205792711220792129}
@@ -29512,7 +29504,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3032182186520411513}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3305564199720297863}
@@ -38255,11 +38247,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3871349747585684964}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
<<<<<<< HEAD
m_LocalPosition: {x: 0.905, y: 1.77, z: -1}
=======
m_LocalPosition: {x: 0.905, y: 1.77, z: 0}
>>>>>>> 3b1b9479a46e90d056b92897ea9f8422b25fc052
m_LocalScale: {x: 0.9, y: 0.9, z: 1}
m_Children:
- {fileID: 4838764527194494006}
@@ -45415,11 +45403,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4701960777638634100}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
<<<<<<< HEAD
m_LocalPosition: {x: 0.901, y: 1.14, z: -1}
=======
m_LocalPosition: {x: 0.901, y: 1.14, z: 0}
>>>>>>> 3b1b9479a46e90d056b92897ea9f8422b25fc052
m_LocalScale: {x: 0.8, y: 0.8, z: 1}
m_Children:
- {fileID: 2877662115602588157}
@@ -83341,11 +83325,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8605012324018136611}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
<<<<<<< HEAD
m_LocalPosition: {x: 0.893, y: 2.07, z: -1}
=======
m_LocalPosition: {x: 0.893, y: 2.07, z: 0}
>>>>>>> 3b1b9479a46e90d056b92897ea9f8422b25fc052
m_LocalScale: {x: 0.81, y: 0.83, z: 1}
m_Children:
- {fileID: 31168962564789831}
@@ -88644,11 +88624,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9045570649270983783}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
<<<<<<< HEAD
m_LocalPosition: {x: 0.9, y: 0.87, z: -1}
=======
m_LocalPosition: {x: 0.9, y: 0.87, z: 0}
>>>>>>> 3b1b9479a46e90d056b92897ea9f8422b25fc052
m_LocalScale: {x: 0.17, y: 0.17, z: 0.2}
m_Children:
- {fileID: 7086154332574356283}