Merge branch 'Pasha'

This commit is contained in:
Pasha Bibko
2026-01-22 13:51:29 +00:00
21 changed files with 320 additions and 558 deletions

View File

@@ -1023,6 +1023,21 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7297418410848169550, guid: 15c9da29f34c88d4c82acf24cc874e3b,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7297418410848169550, guid: 15c9da29f34c88d4c82acf24cc874e3b,
type: 3}
propertyPath: m_LocalPosition.y
value: -0.9
objectReference: {fileID: 0}
- target: {fileID: 7297418410848169550, guid: 15c9da29f34c88d4c82acf24cc874e3b,
type: 3}
propertyPath: m_LocalPosition.z
value: -0.45
objectReference: {fileID: 0}
- target: {fileID: 7563216493506774349, guid: 15c9da29f34c88d4c82acf24cc874e3b,
type: 3}
propertyPath: m_Name
@@ -1047,16 +1062,67 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 833602854707986350, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
- target: {fileID: 430841442987754630, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.a
value: 0.6666667
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: fe05722d1c0421046b275859905cc71e,
type: 3}
- target: {fileID: 430841442987754630, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.b
value: 1
objectReference: {fileID: 0}
- target: {fileID: 430841442987754630, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.g
value: 1
objectReference: {fileID: 0}
- target: {fileID: 430841442987754630, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.r
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2020022267469913571, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Name
value: GameCanvas
objectReference: {fileID: 0}
- target: {fileID: 2020022267469913571, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2058749420242249500, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3457638843023186478, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.b
value: 0.46226418
objectReference: {fileID: 0}
- target: {fileID: 3457638843023186478, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.g
value: 0.46226418
objectReference: {fileID: 0}
- target: {fileID: 3457638843023186478, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.r
value: 0.46226418
objectReference: {fileID: 0}
- target: {fileID: 3457638843023186478, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_FontData.m_MinSize
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3457638843023186478, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_FontData.m_FontSize
value: 40
objectReference: {fileID: 0}
- target: {fileID: 3614641596273148411, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_LocalPosition.x
@@ -1107,8 +1173,49 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4017024745020146958, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_SizeDelta.y
value: 275
objectReference: {fileID: 0}
- target: {fileID: 6436671234165154367, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.b
value: 0.46226418
objectReference: {fileID: 0}
- target: {fileID: 6436671234165154367, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.g
value: 0.46226418
objectReference: {fileID: 0}
- target: {fileID: 6436671234165154367, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.r
value: 0.46226418
objectReference: {fileID: 0}
- target: {fileID: 7960376733688604242, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -79.5
objectReference: {fileID: 0}
- target: {fileID: 8522275853895335114, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.b
value: 0.46226418
objectReference: {fileID: 0}
- target: {fileID: 8522275853895335114, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.g
value: 0.46226418
objectReference: {fileID: 0}
- target: {fileID: 8522275853895335114, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
type: 3}
propertyPath: m_Color.r
value: 0.46226418
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_RemovedGameObjects:
- {fileID: 3563736642392842882, guid: e29ce1fe47a855c4e907d4312c9e9d6e, type: 3}
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e29ce1fe47a855c4e907d4312c9e9d6e, type: 3}