Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
75d677d29e
|
@ -295,7 +295,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0.00004492931}
|
||||
m_AnchoredPosition: {x: 0, y: -0.0000008518533}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &7575507291051525301
|
||||
|
@ -922,9 +922,9 @@ RectTransform:
|
|||
m_Father: {fileID: 7723528773779627565}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 540.00006, y: -919.80005}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 35}
|
||||
m_SizeDelta: {x: 750, y: 906.6}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5994138449505195560
|
||||
|
|
Loading…
Reference in New Issue