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

dev_chengFeng
jiaoyangna 2021-03-31 11:55:27 +08:00
commit 4095d2e67e
4 changed files with 103 additions and 103 deletions

View File

@ -31743,7 +31743,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 50, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 217.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1473222624206509369
@ -56891,9 +56891,9 @@ RectTransform:
m_Father: {fileID: 6976277603980592380}
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 533, y: 397}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -7, y: -563}
m_SizeDelta: {x: 68, y: 16}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8353568290887318895
@ -101652,7 +101652,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 50, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &109213283015355470

View File

@ -5719,9 +5719,9 @@ RectTransform:
m_Father: {fileID: 224077134289996652}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 175, y: -77.275}
m_SizeDelta: {x: 350, y: 44.45}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1263425883888223
@ -25158,9 +25158,9 @@ RectTransform:
m_Father: {fileID: 224077134289996652}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 175, y: -242.42502}
m_SizeDelta: {x: 350, y: 44.45}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1401902451482652
@ -31041,7 +31041,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &224215249341832938
RectTransform:
m_ObjectHideFlags: 0
@ -31521,9 +31521,9 @@ RectTransform:
m_Father: {fileID: 224077134289996652}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 175, y: -187.37502}
m_SizeDelta: {x: 350, y: 44.45}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1693898225246218
@ -31596,9 +31596,9 @@ RectTransform:
m_Father: {fileID: 224077134289996652}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 175, y: -132.32501}
m_SizeDelta: {x: 350, y: 44.45}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1700519201366438
@ -76459,9 +76459,9 @@ RectTransform:
m_Father: {fileID: 224077134289996652}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 175, y: -22.225}
m_SizeDelta: {x: 350, y: 44.45}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &4130171072445602559
@ -77001,7 +77001,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_SizeDelta: {x: -61.4, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5439432755245369760
MonoBehaviour:

View File

@ -4878,10 +4878,10 @@ RectTransform:
m_Father: {fileID: 4582672017453849580}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 800, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 540, y: -62.5}
m_SizeDelta: {x: 800, y: 105}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2834180261970663798
CanvasRenderer:
@ -5291,7 +5291,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -350}
m_SizeDelta: {x: 0, y: 66}
m_SizeDelta: {x: 754, y: 66}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1769818123379348598
CanvasRenderer:
@ -5616,10 +5616,10 @@ RectTransform:
m_Father: {fileID: 2787491680052849169}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 377, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 540, y: -41.5}
m_SizeDelta: {x: 377, y: 63}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7316062462329947025
CanvasRenderer:
@ -54823,9 +54823,9 @@ RectTransform:
m_Father: {fileID: 2996439500964844691}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: -0.000061035156, y: -960.00006}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.000061035156, y: -0.000061035156}
m_SizeDelta: {x: 1080, y: 1920}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2616101008849582229
@ -59873,9 +59873,9 @@ RectTransform:
m_Father: {fileID: 6468497135502490225}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 603, y: -33}
m_SizeDelta: {x: 302, y: 76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8096517168800184325
@ -60392,7 +60392,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: -482.65, y: 454.4}
m_AnchoredPosition: {x: -435, y: 512.9999}
m_SizeDelta: {x: 114.7, y: 168.1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5387149549598737904
@ -60524,7 +60524,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.00012207, y: -216.5}
m_SizeDelta: {x: 1080, y: 0}
m_SizeDelta: {x: 1080, y: 293}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5283433521350433378
CanvasRenderer:
@ -60641,10 +60641,10 @@ RectTransform:
m_Father: {fileID: 5284122085650758520}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 540, y: 0}
m_SizeDelta: {x: 1080, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -189}
m_SizeDelta: {x: 1080, y: 208}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2789001607555946551
MonoBehaviour:
@ -70269,10 +70269,10 @@ RectTransform:
m_Father: {fileID: 8713846913728412106}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 525.5, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 540, y: -31.5}
m_SizeDelta: {x: 525.5, y: 63}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3363106434993054977
CanvasRenderer:
@ -70421,10 +70421,10 @@ RectTransform:
m_Father: {fileID: 5284122085650758520}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1080, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 540, y: -42.5}
m_SizeDelta: {x: 1080, y: 85}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &9088967259428169059
MonoBehaviour:
@ -70759,9 +70759,9 @@ RectTransform:
m_Father: {fileID: 6468497135502490225}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 151, y: -33}
m_SizeDelta: {x: 302, y: 76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6569654108024820197
@ -70877,7 +70877,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: 482.65, y: 454.4}
m_AnchoredPosition: {x: 438, y: 513}
m_SizeDelta: {x: 114.7, y: 168.1}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1540808609004004019
@ -71738,10 +71738,10 @@ RectTransform:
m_Father: {fileID: 2787491680052849169}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 540, y: 0}
m_SizeDelta: {x: 1080, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -135.5}
m_SizeDelta: {x: 1080, y: 125}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &473350595775239708
CanvasRenderer:
@ -72289,10 +72289,10 @@ RectTransform:
m_Father: {fileID: 8713846913728412106}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1080, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -63}
m_SizeDelta: {x: 1080, y: 22}
m_Pivot: {x: 0, y: 1}
--- !u!114 &2771112079376197031
MonoBehaviour:

View File

@ -5802,10 +5802,10 @@ RectTransform:
m_Father: {fileID: 2688741801705900761}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 339.52002, y: -25}
m_SizeDelta: {x: 450, y: 50}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1880789683
CanvasRenderer:
@ -6665,8 +6665,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -0.000030517578}
m_SizeDelta: {x: 0, y: 49}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &2781897261202178156
MonoBehaviour:
@ -12921,7 +12921,6 @@ RectTransform:
m_Children:
- {fileID: 1384121691}
- {fileID: 2689364971332473045}
- {fileID: 2689486735632733049}
m_Father: {fileID: 2688693659964828665}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -13174,10 +13173,10 @@ RectTransform:
m_Father: {fileID: 1140878141797173410}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 13, y: -28.5}
m_SizeDelta: {x: 0, y: 41}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 13, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5307027406452831801
MonoBehaviour:
@ -37696,8 +37695,8 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2689109811163513307}
m_Father: {fileID: 2689199158799360139}
m_RootOrder: 2
m_Father: {fileID: 2688693659964828665}
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -37747,10 +37746,10 @@ RectTransform:
m_Father: {fileID: 2688693659964828665}
m_RootOrder: 3
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: 0, y: -586.8}
m_SizeDelta: {x: 1080, y: 410.1}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 373.2}
m_SizeDelta: {x: 1080, y: 410.09998}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2691953947246644797
CanvasRenderer:
@ -42977,6 +42976,7 @@ RectTransform:
- {fileID: 422436676}
- {fileID: 1014332141}
- {fileID: 1528566762338444629}
- {fileID: 2689486735632733049}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -44179,10 +44179,10 @@ RectTransform:
m_Father: {fileID: 2688741801705900761}
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: 339.52002, y: -75}
m_SizeDelta: {x: 450, y: 50}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3240506387495551981
CanvasRenderer:
@ -49503,9 +49503,9 @@ RectTransform:
m_Father: {fileID: 2688828308012583799}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 20.5, y: -20.5}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 41, y: 41}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5457461477382774726
@ -49812,10 +49812,10 @@ RectTransform:
m_Father: {fileID: 2688828308012583799}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 325.515, y: 0}
m_SizeDelta: {x: 569.03, y: 38}
m_SizeDelta: {x: 569.03, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &5454571531986427168
CanvasRenderer:
@ -50165,10 +50165,10 @@ RectTransform:
m_Father: {fileID: 5455457837940663430}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 284.515, y: 0}
m_SizeDelta: {x: 569.03, y: 38}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 569.03, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &5458361211353407146
CanvasRenderer:
@ -51341,7 +51341,7 @@ RectTransform:
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
@ -51951,10 +51951,10 @@ RectTransform:
m_Father: {fileID: 2688741801705900761}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 819.52, y: -25}
m_SizeDelta: {x: 450, y: 50}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5525565508332388175
CanvasRenderer:
@ -52967,10 +52967,10 @@ RectTransform:
m_Father: {fileID: 2688741801705900761}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 819.52, y: -75}
m_SizeDelta: {x: 450, y: 50}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &596483134041477348
CanvasRenderer: