Merge branch 'tcx_xiyou_yueNan' of http://192.168.1.21:3000/root/miduo_client into tcx_xiyou_yueNan
commit
3481a6fb5c
|
|
@ -604,8 +604,8 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 108, y: 25}
|
m_AnchoredPosition: {x: 116.2, y: 25}
|
||||||
m_SizeDelta: {x: 0, y: 50}
|
m_SizeDelta: {x: 232.4, y: 50}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &573654475003589758
|
--- !u!222 &573654475003589758
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
|
@ -642,7 +642,7 @@ MonoBehaviour:
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 2536559242930971238}
|
m_GameObject: {fileID: 2536559242930971238}
|
||||||
m_Enabled: 1
|
m_Enabled: 0
|
||||||
m_EditorHideFlags: 0
|
m_EditorHideFlags: 0
|
||||||
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
|
|
@ -680,7 +680,7 @@ MonoBehaviour:
|
||||||
m_AlignByGeometry: 0
|
m_AlignByGeometry: 0
|
||||||
m_RichText: 1
|
m_RichText: 1
|
||||||
m_HorizontalOverflow: 1
|
m_HorizontalOverflow: 1
|
||||||
m_VerticalOverflow: 0
|
m_VerticalOverflow: 1
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: "\u53D8\u8EAB\u5361\u6280\u80FD\uFF1A"
|
m_Text: "\u53D8\u8EAB\u5361\u6280\u80FD\uFF1A"
|
||||||
LanguageIndex: 0
|
LanguageIndex: 0
|
||||||
|
|
@ -1501,10 +1501,10 @@ MonoBehaviour:
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_FontData:
|
m_FontData:
|
||||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||||
m_FontSize: 50
|
m_FontSize: 37
|
||||||
m_FontStyle: 0
|
m_FontStyle: 0
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
m_MinSize: 4
|
m_MinSize: 3
|
||||||
m_MaxSize: 50
|
m_MaxSize: 50
|
||||||
m_Alignment: 3
|
m_Alignment: 3
|
||||||
m_AlignByGeometry: 0
|
m_AlignByGeometry: 0
|
||||||
|
|
@ -2079,10 +2079,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 5509733079217669299}
|
m_Father: {fileID: 5509733079217669299}
|
||||||
m_RootOrder: 4
|
m_RootOrder: 4
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 1, y: 1}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
m_AnchoredPosition: {x: 260.4, y: 46}
|
m_AnchoredPosition: {x: -135, y: -167}
|
||||||
m_SizeDelta: {x: 170.3, y: 50}
|
m_SizeDelta: {x: 170.29999, y: 50}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &8197051799499683400
|
--- !u!222 &8197051799499683400
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
|
@ -2258,7 +2258,7 @@ RectTransform:
|
||||||
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: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 412.90002, y: 0}
|
m_AnchoredPosition: {x: 412.9, y: 0}
|
||||||
m_SizeDelta: {x: 825.8, y: 0}
|
m_SizeDelta: {x: 825.8, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &5631977101328081240
|
--- !u!222 &5631977101328081240
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue