Commit 30ce9f16 authored by Tt's avatar Tt

适配

parent b62d6173
...@@ -81,13 +81,13 @@ ...@@ -81,13 +81,13 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 44 "__id__": 49
}, },
{ {
"__id__": 45 "__id__": 50
}, },
{ {
"__id__": 46 "__id__": 51
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -766,19 +766,22 @@ ...@@ -766,19 +766,22 @@
"__id__": 16 "__id__": 16
}, },
{ {
"__id__": 18 "__id__": 19
}, },
{ {
"__id__": 20 "__id__": 22
}, },
{ {
"__id__": 37 "__id__": 39
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 43 "__id__": 47
},
{
"__id__": 48
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -792,8 +795,8 @@ ...@@ -792,8 +795,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 0, "width": 1334,
"height": 0 "height": 750
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -841,6 +844,9 @@ ...@@ -841,6 +844,9 @@
"_components": [ "_components": [
{ {
"__id__": 17 "__id__": 17
},
{
"__id__": 18
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -923,6 +929,33 @@ ...@@ -923,6 +929,33 @@
"_atlas": null, "_atlas": null,
"_id": "a2oRNjGANIvrHdvQvtmjgQ" "_id": "a2oRNjGANIvrHdvQvtmjgQ"
}, },
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 16
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 45,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 1334,
"_originalHeight": 750,
"_id": "46wH4UnA1AlpdgaX2/Z89b"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "bg_front", "_name": "bg_front",
...@@ -934,7 +967,10 @@ ...@@ -934,7 +967,10 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 19 "__id__": 20
},
{
"__id__": 21
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -961,7 +997,7 @@ ...@@ -961,7 +997,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
-293.7, -292,
0, 0,
0, 0,
0, 0,
...@@ -990,7 +1026,7 @@ ...@@ -990,7 +1026,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 18 "__id__": 19
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1017,6 +1053,33 @@ ...@@ -1017,6 +1053,33 @@
"_atlas": null, "_atlas": null,
"_id": "deQvNjFg1Gjq4ewtCRAAFL" "_id": "deQvNjFg1Gjq4ewtCRAAFL"
}, },
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 19
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 44,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 1334,
"_originalHeight": 0,
"_id": "c78qYtoO9Ig6YSsz+TquHA"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "item", "_name": "item",
...@@ -1025,9 +1088,6 @@ ...@@ -1025,9 +1088,6 @@
"__id__": 15 "__id__": 15
}, },
"_children": [ "_children": [
{
"__id__": 21
},
{ {
"__id__": 23 "__id__": 23
}, },
...@@ -1044,13 +1104,16 @@ ...@@ -1044,13 +1104,16 @@
"__id__": 31 "__id__": 31
}, },
{ {
"__id__": 34 "__id__": 33
},
{
"__id__": 36
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 36 "__id__": 38
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1106,13 +1169,13 @@ ...@@ -1106,13 +1169,13 @@
"_name": "bg_color", "_name": "bg_color",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 20 "__id__": 22
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 22 "__id__": 24
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1168,7 +1231,7 @@ ...@@ -1168,7 +1231,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 21 "__id__": 23
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1200,13 +1263,13 @@ ...@@ -1200,13 +1263,13 @@
"_name": "icon", "_name": "icon",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 20 "__id__": 22
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 24 "__id__": 26
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1262,7 +1325,7 @@ ...@@ -1262,7 +1325,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 23 "__id__": 25
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1294,13 +1357,13 @@ ...@@ -1294,13 +1357,13 @@
"_name": "bg_2", "_name": "bg_2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 20 "__id__": 22
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 26 "__id__": 28
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1356,7 +1419,7 @@ ...@@ -1356,7 +1419,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 25 "__id__": 27
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1388,13 +1451,13 @@ ...@@ -1388,13 +1451,13 @@
"_name": "bg_1", "_name": "bg_1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 20 "__id__": 22
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 28 "__id__": 30
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1450,7 +1513,7 @@ ...@@ -1450,7 +1513,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 27 "__id__": 29
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1482,13 +1545,13 @@ ...@@ -1482,13 +1545,13 @@
"_name": "bg_0", "_name": "bg_0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 20 "__id__": 22
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 30 "__id__": 32
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1544,7 +1607,7 @@ ...@@ -1544,7 +1607,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 29 "__id__": 31
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1576,16 +1639,16 @@ ...@@ -1576,16 +1639,16 @@
"_name": "title", "_name": "title",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 20 "__id__": 22
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 32 "__id__": 34
}, },
{ {
"__id__": 33 "__id__": 35
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1641,7 +1704,7 @@ ...@@ -1641,7 +1704,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 31 "__id__": 33
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1676,7 +1739,7 @@ ...@@ -1676,7 +1739,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 31 "__id__": 33
}, },
"_enabled": true, "_enabled": true,
"_color": { "_color": {
...@@ -1694,13 +1757,13 @@ ...@@ -1694,13 +1757,13 @@
"_name": "lock", "_name": "lock",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 20 "__id__": 22
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 35 "__id__": 37
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1756,7 +1819,7 @@ ...@@ -1756,7 +1819,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 34 "__id__": 36
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1788,7 +1851,7 @@ ...@@ -1788,7 +1851,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 20 "__id__": 22
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -1849,7 +1912,7 @@ ...@@ -1849,7 +1912,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 20 "__id__": 22
}, },
"_id": "aaeualvuRA8ZWpHLz30kha" "_id": "aaeualvuRA8ZWpHLz30kha"
}, },
...@@ -1862,13 +1925,16 @@ ...@@ -1862,13 +1925,16 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 38 "__id__": 40
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 42 "__id__": 45
},
{
"__id__": 46
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1924,17 +1990,20 @@ ...@@ -1924,17 +1990,20 @@
"_name": "view", "_name": "view",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 37 "__id__": 39
}, },
"_children": [ "_children": [
{ {
"__id__": 39 "__id__": 41
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 41 "__id__": 43
},
{
"__id__": 44
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1990,13 +2059,13 @@ ...@@ -1990,13 +2059,13 @@
"_name": "content", "_name": "content",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 38 "__id__": 40
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 40 "__id__": 42
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2052,7 +2121,7 @@ ...@@ -2052,7 +2121,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 39 "__id__": 41
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -2084,7 +2153,7 @@ ...@@ -2084,7 +2153,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 38 "__id__": 40
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2099,12 +2168,39 @@ ...@@ -2099,12 +2168,39 @@
"_N$inverted": false, "_N$inverted": false,
"_id": "c8BNc/Cw5JWaryYCA+9F2G" "_id": "c8BNc/Cw5JWaryYCA+9F2G"
}, },
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 40
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 40,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 1292,
"_originalHeight": 0,
"_id": "895vze1OlIuqBP5itJ3t/b"
},
{ {
"__type__": "cc.ScrollView", "__type__": "cc.ScrollView",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 37 "__id__": 39
}, },
"_enabled": true, "_enabled": true,
"horizontal": true, "horizontal": true,
...@@ -2116,15 +2212,42 @@ ...@@ -2116,15 +2212,42 @@
"scrollEvents": [], "scrollEvents": [],
"cancelInnerEvents": true, "cancelInnerEvents": true,
"_N$content": { "_N$content": {
"__id__": 39 "__id__": 41
}, },
"content": { "content": {
"__id__": 39 "__id__": 41
}, },
"_N$horizontalScrollBar": null, "_N$horizontalScrollBar": null,
"_N$verticalScrollBar": null, "_N$verticalScrollBar": null,
"_id": "d26BOGlllEx69n5dj5h92F" "_id": "d26BOGlllEx69n5dj5h92F"
}, },
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 39
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 40,
"_left": 38.277000000000044,
"_right": 3.7229999999999563,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 1292,
"_originalHeight": 0,
"_id": "26mF12Z0VGNJ5V9nzBTiCg"
},
{ {
"__type__": "cfef9RS1bRFZqpW++GCoUte", "__type__": "cfef9RS1bRFZqpW++GCoUte",
"_name": "", "_name": "",
...@@ -2135,6 +2258,33 @@ ...@@ -2135,6 +2258,33 @@
"_enabled": true, "_enabled": true,
"_id": "ffqDT6mC9MGJGXOPLSXFir" "_id": "ffqDT6mC9MGJGXOPLSXFir"
}, },
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 15
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 45,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "c4rd26VzFNyq8iZ8rS+3kG"
},
{ {
"__type__": "cc.Canvas", "__type__": "cc.Canvas",
"_name": "", "_name": "",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment