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

dev_chengFeng
ZhangBiao 2021-03-17 16:17:50 +08:00
commit 2e685100ea
1 changed files with 4 additions and 4 deletions

View File

@ -5744,7 +5744,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -180, y: -42}
m_AnchoredPosition: {x: -212, y: -42}
m_SizeDelta: {x: 556, y: 140}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2518333082779791461
@ -6930,7 +6930,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: 70, y: -21.5}
m_AnchoredPosition: {x: 76, y: -21.5}
m_SizeDelta: {x: 152, y: 42}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2518333084341339611
@ -8114,7 +8114,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0.00012207031, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &6954504526559241720
@ -14130,7 +14130,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: 375.16, y: -21.5}
m_AnchoredPosition: {x: 363, y: -21.5}
m_SizeDelta: {x: 22, y: 43}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5213216419983842381