Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

liujiaqi 2020-11-04 11:40:21 +08:00
commit d4ebf0767a
1 changed files with 7 additions and 7 deletions

View File

@ -41,7 +41,7 @@ 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: 563.0499, y: -45.05} m_AnchoredPosition: {x: 591.05, y: -45.050003}
m_SizeDelta: {x: 88.1, y: 90.1} m_SizeDelta: {x: 88.1, y: 90.1}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222229770521615770 --- !u!222 &222229770521615770
@ -612,7 +612,7 @@ 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: 328.24997, y: -45.05} m_AnchoredPosition: {x: 379.9833, y: -45.050003}
m_SizeDelta: {x: 88.1, y: 90.1} m_SizeDelta: {x: 88.1, y: 90.1}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222847014652085586 --- !u!222 &222847014652085586
@ -1285,7 +1285,7 @@ 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: 93.44998, y: -45.05} m_AnchoredPosition: {x: 168.91666, y: -45.050003}
m_SizeDelta: {x: 88.1, y: 90.1} m_SizeDelta: {x: 88.1, y: 90.1}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222917638141494732 --- !u!222 &222917638141494732
@ -1725,7 +1725,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5} m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -43.30002, y: -93.2} m_AnchoredPosition: {x: -57, y: -93.2}
m_SizeDelta: {x: 635.1, y: 130.7} m_SizeDelta: {x: 635.1, y: 130.7}
m_Pivot: {x: 1, y: 0} m_Pivot: {x: 1, y: 0}
--- !u!114 &114987565653667408 --- !u!114 &114987565653667408
@ -1742,11 +1742,11 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Padding: m_Padding:
m_Left: 0 m_Left: 0
m_Right: 28 m_Right: 0
m_Top: 0 m_Top: 0
m_Bottom: 0 m_Bottom: 0
m_ChildAlignment: 2 m_ChildAlignment: 2
m_Spacing: 97.3 m_Spacing: -1.9
m_ChildForceExpandWidth: 1 m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1 m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0 m_ChildControlWidth: 0
@ -9729,7 +9729,7 @@ 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: 1374.606, y: 23.050095} m_AnchoredPosition: {x: 1374.606, y: 23.05009}
m_SizeDelta: {x: 808.714, y: 5} m_SizeDelta: {x: 808.714, y: 5}
m_Pivot: {x: 0, y: 0.5} m_Pivot: {x: 0, y: 0.5}
--- !u!222 &8002259910232126921 --- !u!222 &8002259910232126921