Merge branch 'master_xma_local' into master_xma_test
commit
748609739b
|
|
@ -35,8 +35,8 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 1}
|
m_AnchorMin: {x: 0.5, y: 1}
|
||||||
m_AnchorMax: {x: 0.5, y: 1}
|
m_AnchorMax: {x: 0.5, y: 1}
|
||||||
m_AnchoredPosition: {x: -26.580048, y: -0.000061035156}
|
m_AnchoredPosition: {x: 0.00032997, y: -0.000061035156}
|
||||||
m_SizeDelta: {x: 779.3, y: 0}
|
m_SizeDelta: {x: 832.46, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 1}
|
m_Pivot: {x: 0.5, y: 1}
|
||||||
--- !u!222 &759258889793061984
|
--- !u!222 &759258889793061984
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
|
@ -90,10 +90,10 @@ MonoBehaviour:
|
||||||
m_Alignment: 0
|
m_Alignment: 0
|
||||||
m_AlignByGeometry: 0
|
m_AlignByGeometry: 0
|
||||||
m_RichText: 1
|
m_RichText: 1
|
||||||
m_HorizontalOverflow: 1
|
m_HorizontalOverflow: 0
|
||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 0
|
||||||
m_LineSpacing: 1.55
|
m_LineSpacing: 1.55
|
||||||
m_Text: nnjkbnjkbbjbjkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
|
m_Text:
|
||||||
LanguageIndex: 0
|
LanguageIndex: 0
|
||||||
--- !u!1 &6118186219131728448
|
--- !u!1 &6118186219131728448
|
||||||
GameObject:
|
GameObject:
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue