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

dev_chengFeng
ZhangBiao 2021-10-28 16:03:33 +08:00
commit 5e0e41f7bf
3 changed files with 16 additions and 16 deletions

View File

@ -4560,7 +4560,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 11.7, y: -429} m_AnchoredPosition: {x: 11.7, y: -429}
m_SizeDelta: {x: 70, y: 70} m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3381247582769349829 --- !u!222 &3381247582769349829
CanvasRenderer: CanvasRenderer:
@ -34340,7 +34340,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 11.7, y: -124.2} m_AnchoredPosition: {x: 11.7, y: -124.2}
m_SizeDelta: {x: 70, y: 70} m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7043399783076622851 --- !u!222 &7043399783076622851
CanvasRenderer: CanvasRenderer:
@ -64968,7 +64968,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 11.7, y: 178.7} m_AnchoredPosition: {x: 11.7, y: 178.7}
m_SizeDelta: {x: 70, y: 70} m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6132459470176068623 --- !u!222 &6132459470176068623
CanvasRenderer: CanvasRenderer:

View File

@ -1480,8 +1480,8 @@ 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: 397.1001, y: 267.5} m_AnchoredPosition: {x: 401.8, y: 175.59998}
m_SizeDelta: {x: 98.19, y: 98.19} m_SizeDelta: {x: 127, y: 135}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &670189991352620818 --- !u!222 &670189991352620818
CanvasRenderer: CanvasRenderer:
@ -2388,8 +2388,8 @@ 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: 398.3, y: 601.7} m_AnchoredPosition: {x: 401.9, y: 569.4}
m_SizeDelta: {x: 104.900024, y: 104.1} m_SizeDelta: {x: 126, y: 126}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6273202940489087561 --- !u!222 &6273202940489087561
CanvasRenderer: CanvasRenderer:
@ -3065,8 +3065,8 @@ 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: 398.3, y: 382.2} m_AnchoredPosition: {x: 402, y: 311.59998}
m_SizeDelta: {x: 104.900024, y: 104.1} m_SizeDelta: {x: 127, y: 135}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1668860925638465505 --- !u!222 &1668860925638465505
CanvasRenderer: CanvasRenderer:
@ -3984,8 +3984,8 @@ 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: 398.3, y: 490.1} m_AnchoredPosition: {x: 401.3, y: 443}
m_SizeDelta: {x: 104.900024, y: 104.1} m_SizeDelta: {x: 126, y: 126}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6604730448762173639 --- !u!222 &6604730448762173639
CanvasRenderer: CanvasRenderer:
@ -6138,8 +6138,8 @@ 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: 396.8, y: 714.3} m_AnchoredPosition: {x: 401.7, y: 695.7}
m_SizeDelta: {x: 104, y: 104} m_SizeDelta: {x: 126, y: 126}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8615198845383106814 --- !u!222 &8615198845383106814
CanvasRenderer: CanvasRenderer:

View File

@ -1146,7 +1146,7 @@ RectTransform:
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: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 42.99999, y: 541} m_AnchoredPosition: {x: -4, y: 541}
m_SizeDelta: {x: 900, y: 180} m_SizeDelta: {x: 900, y: 180}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1795039166867134 --- !u!1 &1795039166867134
@ -1186,8 +1186,8 @@ RectTransform:
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: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 344.4, y: -4.5} m_AnchoredPosition: {x: 349, y: -22.1}
m_SizeDelta: {x: 170, y: 50} m_SizeDelta: {x: 195, y: 55}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222675474869398052 --- !u!222 &222675474869398052
CanvasRenderer: CanvasRenderer: