Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24
This commit is contained in:
commit
97325abdb2
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -153,7 +153,7 @@ RectTransform:
|
||||||
m_LocalScale: {x: 2.5, y: 3.5, z: 1}
|
m_LocalScale: {x: 2.5, y: 3.5, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 4158834148864819268}
|
m_Father: {fileID: 0}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
|
@ -9276,6 +9276,10 @@ PrefabInstance:
|
||||||
propertyPath: m_IsActive
|
propertyPath: m_IsActive
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6303512888481769756, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
|
||||||
|
propertyPath: m_SizeDelta.x
|
||||||
|
value: 300
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 6502340811104000939, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
|
- target: {fileID: 6502340811104000939, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
|
||||||
propertyPath: m_Type
|
propertyPath: m_Type
|
||||||
value: 0
|
value: 0
|
||||||
|
@ -9308,6 +9312,30 @@ PrefabInstance:
|
||||||
propertyPath: m_IsActive
|
propertyPath: m_IsActive
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8197579949334750501, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
|
||||||
|
propertyPath: m_text
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8197579949334750501, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
|
||||||
|
propertyPath: m_fontSize
|
||||||
|
value: 20
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8197579949334750501, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
|
||||||
|
propertyPath: m_fontAsset
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 11400000, guid: 3849a5afa3e47364e935260b9e40a7af, type: 2}
|
||||||
|
- target: {fileID: 8197579949334750501, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
|
||||||
|
propertyPath: m_fontSizeBase
|
||||||
|
value: 20
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8197579949334750501, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
|
||||||
|
propertyPath: m_sharedMaterial
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: -9074696149777367781, guid: 3849a5afa3e47364e935260b9e40a7af, type: 2}
|
||||||
|
- target: {fileID: 8197579949334750501, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
|
||||||
|
propertyPath: m_hasFontAssetChanged
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 8215571626167240061, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
|
- target: {fileID: 8215571626167240061, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
|
||||||
propertyPath: m_Type
|
propertyPath: m_Type
|
||||||
value: 0
|
value: 0
|
||||||
|
@ -9739,3 +9767,4 @@ SceneRoots:
|
||||||
- {fileID: 5796191506433166633}
|
- {fileID: 5796191506433166633}
|
||||||
- {fileID: 1872712131}
|
- {fileID: 1872712131}
|
||||||
- {fileID: 1481267923}
|
- {fileID: 1481267923}
|
||||||
|
- {fileID: 65889293}
|
||||||
|
|
Loading…
Reference in New Issue