Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
jiaoyangna 2021-08-02 11:04:24 +08:00
commit 7f46481dbf
1 changed files with 6 additions and 6 deletions

View File

@ -192169,10 +192169,10 @@ RectTransform:
m_Father: {fileID: 224445502205186148} m_Father: {fileID: 224445502205186148}
m_RootOrder: 3 m_RootOrder: 3
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: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -959.99994} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 1920} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2572048864772778601 --- !u!222 &2572048864772778601
CanvasRenderer: CanvasRenderer:
@ -255625,10 +255625,10 @@ RectTransform:
m_Father: {fileID: 7236033547019594520} m_Father: {fileID: 7236033547019594520}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -540, y: -960.00006} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1080, y: 1920} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5201834630167657875 --- !u!222 &5201834630167657875
CanvasRenderer: CanvasRenderer: