Commit 77f08c29 authored by yu's avatar yu

1

parent 2413df18
{
"ver": "1.1.0",
"uuid": "32a07afb-a7de-49ad-afa5-5151a4f801df",
"subMetas": {}
}
\ No newline at end of file
...@@ -75,37 +75,37 @@ ...@@ -75,37 +75,37 @@
"__id__": 5 "__id__": 5
}, },
{ {
"__id__": 15 "__id__": 17
}, },
{ {
"__id__": 22 "__id__": 24
}, },
{ {
"__id__": 30 "__id__": 32
}, },
{ {
"__id__": 43 "__id__": 45
}, },
{ {
"__id__": 51 "__id__": 53
}, },
{ {
"__id__": 54 "__id__": 56
}, },
{ {
"__id__": 57 "__id__": 59
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 62 "__id__": 64
}, },
{ {
"__id__": 63 "__id__": 65
}, },
{ {
"__id__": 64 "__id__": 66
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -266,10 +266,10 @@ ...@@ -266,10 +266,10 @@
"__id__": 6 "__id__": 6
}, },
{ {
"__id__": 9 "__id__": 11
}, },
{ {
"__id__": 10 "__id__": 12
} }
], ],
"_active": false, "_active": false,
...@@ -332,6 +332,9 @@ ...@@ -332,6 +332,9 @@
"_children": [ "_children": [
{ {
"__id__": 7 "__id__": 7
},
{
"__id__": 9
} }
], ],
"_active": true, "_active": true,
...@@ -477,6 +480,99 @@ ...@@ -477,6 +480,99 @@
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "f49NRI5YFFEoPxDgXlMSeS" "_id": "f49NRI5YFFEoPxDgXlMSeS"
}, },
{
"__type__": "cc.Node",
"_name": "ysmsyt",
"_objFlags": 0,
"_parent": {
"__id__": 6
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 10
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 0,
"height": 0
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "0fgipBQUBBZIIx00io+ZXY"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 9
},
"_enabled": true,
"_materials": [],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "",
"_N$string": "",
"_fontSize": 40,
"_lineHeight": 40,
"_enableWrapText": true,
"_N$file": {
"__uuid__": "32a07afb-a7de-49ad-afa5-5151a4f801df"
},
"_isSystemFontUsed": false,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 0,
"_N$verticalAlign": 0,
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "d40PW/cqtDvrzjTAE39kJj"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "img", "_name": "img",
...@@ -544,10 +640,10 @@ ...@@ -544,10 +640,10 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 11 "__id__": 13
}, },
{ {
"__id__": 13 "__id__": 15
} }
], ],
"_active": true, "_active": true,
...@@ -605,13 +701,13 @@ ...@@ -605,13 +701,13 @@
"_name": "error", "_name": "error",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 10 "__id__": 12
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 12 "__id__": 14
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -667,7 +763,7 @@ ...@@ -667,7 +763,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 11 "__id__": 13
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -686,13 +782,13 @@ ...@@ -686,13 +782,13 @@
"_name": "right", "_name": "right",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 10 "__id__": 12
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 14 "__id__": 16
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -748,7 +844,7 @@ ...@@ -748,7 +844,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 13 "__id__": 15
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -771,16 +867,16 @@ ...@@ -771,16 +867,16 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 16 "__id__": 18
}, },
{ {
"__id__": 19 "__id__": 21
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 21 "__id__": 23
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -836,16 +932,16 @@ ...@@ -836,16 +932,16 @@
"_name": "bg", "_name": "bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 15 "__id__": 17
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 17 "__id__": 19
}, },
{ {
"__id__": 18 "__id__": 20
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -901,7 +997,7 @@ ...@@ -901,7 +997,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 16 "__id__": 18
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -933,7 +1029,7 @@ ...@@ -933,7 +1029,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 16 "__id__": 18
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -960,13 +1056,13 @@ ...@@ -960,13 +1056,13 @@
"_name": "bg_img", "_name": "bg_img",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 15 "__id__": 17
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 20 "__id__": 22
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1022,7 +1118,7 @@ ...@@ -1022,7 +1118,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 19 "__id__": 21
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1054,7 +1150,7 @@ ...@@ -1054,7 +1150,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 15 "__id__": 17
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -1084,20 +1180,20 @@ ...@@ -1084,20 +1180,20 @@
"__id__": 2 "__id__": 2
}, },
"_children": [ "_children": [
{
"__id__": 23
},
{ {
"__id__": 25 "__id__": 25
}, },
{ {
"__id__": 27 "__id__": 27
},
{
"__id__": 29
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 29 "__id__": 31
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1153,13 +1249,13 @@ ...@@ -1153,13 +1249,13 @@
"_name": "layout_up", "_name": "layout_up",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 22 "__id__": 24
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 24 "__id__": 26
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1186,7 +1282,7 @@ ...@@ -1186,7 +1282,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
246, 270,
0, 0,
0, 0,
0, 0,
...@@ -1215,7 +1311,7 @@ ...@@ -1215,7 +1311,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 23 "__id__": 25
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -1247,13 +1343,13 @@ ...@@ -1247,13 +1343,13 @@
"_name": "layout_down", "_name": "layout_down",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 22 "__id__": 24
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 26 "__id__": 28
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1280,7 +1376,7 @@ ...@@ -1280,7 +1376,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
9.939, 31.939,
0, 0,
0, 0,
0, 0,
...@@ -1309,7 +1405,7 @@ ...@@ -1309,7 +1405,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 25 "__id__": 27
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -1341,13 +1437,13 @@ ...@@ -1341,13 +1437,13 @@
"_name": "box_up", "_name": "box_up",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 22 "__id__": 24
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 28 "__id__": 30
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1374,7 +1470,7 @@ ...@@ -1374,7 +1470,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
-281.294, -218,
0, 0,
0, 0,
0, 0,
...@@ -1403,7 +1499,7 @@ ...@@ -1403,7 +1499,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 27 "__id__": 29
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -1435,7 +1531,7 @@ ...@@ -1435,7 +1531,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 22 "__id__": 24
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -1465,14 +1561,14 @@ ...@@ -1465,14 +1561,14 @@
"__id__": 2 "__id__": 2
}, },
"_children": [ "_children": [
{
"__id__": 31
},
{ {
"__id__": 33 "__id__": 33
}, },
{ {
"__id__": 35 "__id__": 35
},
{
"__id__": 37
} }
], ],
"_active": false, "_active": false,
...@@ -1507,8 +1603,8 @@ ...@@ -1507,8 +1603,8 @@
0, 0,
0, 0,
1, 1,
1, 0.92,
1, 0.92,
1 1
] ]
}, },
...@@ -1530,13 +1626,13 @@ ...@@ -1530,13 +1626,13 @@
"_name": "bg_blank", "_name": "bg_blank",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 30 "__id__": 32
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 32 "__id__": 34
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1592,7 +1688,7 @@ ...@@ -1592,7 +1688,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 31 "__id__": 33
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1624,13 +1720,13 @@ ...@@ -1624,13 +1720,13 @@
"_name": "img", "_name": "img",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 30 "__id__": 32
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 34 "__id__": 36
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1686,7 +1782,7 @@ ...@@ -1686,7 +1782,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 33 "__id__": 35
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1718,23 +1814,23 @@ ...@@ -1718,23 +1814,23 @@
"_name": "laba", "_name": "laba",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 30 "__id__": 32
}, },
"_children": [ "_children": [
{
"__id__": 36
},
{ {
"__id__": 38 "__id__": 38
}, },
{ {
"__id__": 40 "__id__": 40
},
{
"__id__": 42
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 42 "__id__": 44
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1790,13 +1886,13 @@ ...@@ -1790,13 +1886,13 @@
"_name": "icon_laba1", "_name": "icon_laba1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 35 "__id__": 37
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 37 "__id__": 39
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1852,7 +1948,7 @@ ...@@ -1852,7 +1948,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 36 "__id__": 38
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1884,13 +1980,13 @@ ...@@ -1884,13 +1980,13 @@
"_name": "icon_laba2", "_name": "icon_laba2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 35 "__id__": 37
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 39 "__id__": 41
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1946,7 +2042,7 @@ ...@@ -1946,7 +2042,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 38 "__id__": 40
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1978,13 +2074,13 @@ ...@@ -1978,13 +2074,13 @@
"_name": "icon_laba3", "_name": "icon_laba3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 35 "__id__": 37
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 41 "__id__": 43
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2040,7 +2136,7 @@ ...@@ -2040,7 +2136,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 40 "__id__": 42
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2072,7 +2168,7 @@ ...@@ -2072,7 +2168,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 35 "__id__": 37
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -2143,20 +2239,20 @@ ...@@ -2143,20 +2239,20 @@
"__id__": 2 "__id__": 2
}, },
"_children": [ "_children": [
{
"__id__": 44
},
{ {
"__id__": 46 "__id__": 46
}, },
{ {
"__id__": 48 "__id__": 48
},
{
"__id__": 50
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 50 "__id__": 52
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2212,13 +2308,13 @@ ...@@ -2212,13 +2308,13 @@
"_name": "icon_laba1", "_name": "icon_laba1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 43 "__id__": 45
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 45 "__id__": 47
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2274,7 +2370,7 @@ ...@@ -2274,7 +2370,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 44 "__id__": 46
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2306,13 +2402,13 @@ ...@@ -2306,13 +2402,13 @@
"_name": "icon_laba2", "_name": "icon_laba2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 43 "__id__": 45
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 47 "__id__": 49
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2368,7 +2464,7 @@ ...@@ -2368,7 +2464,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 46 "__id__": 48
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2400,13 +2496,13 @@ ...@@ -2400,13 +2496,13 @@
"_name": "icon_laba3", "_name": "icon_laba3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 43 "__id__": 45
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 49 "__id__": 51
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2462,7 +2558,7 @@ ...@@ -2462,7 +2558,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 48 "__id__": 50
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2494,7 +2590,7 @@ ...@@ -2494,7 +2590,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 43 "__id__": 45
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -2568,10 +2664,10 @@ ...@@ -2568,10 +2664,10 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 52 "__id__": 54
}, },
{ {
"__id__": 53 "__id__": 55
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2585,8 +2681,8 @@ ...@@ -2585,8 +2681,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 275.7, "width": 254.8,
"height": 134 "height": 108
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -2627,7 +2723,7 @@ ...@@ -2627,7 +2723,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 51 "__id__": 53
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2643,7 +2739,7 @@ ...@@ -2643,7 +2739,7 @@
"_lineHeight": 100, "_lineHeight": 100,
"_enableWrapText": true, "_enableWrapText": true,
"_N$file": { "_N$file": {
"__uuid__": "4e023ddb-7ee9-411d-a69a-d5bb0cd536e9" "__uuid__": "32a07afb-a7de-49ad-afa5-5151a4f801df"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
"_spacingX": 0, "_spacingX": 0,
...@@ -2654,7 +2750,7 @@ ...@@ -2654,7 +2750,7 @@
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 2,
"_id": "e7/x8Ts0FJBbG+UWuFyPiN" "_id": "e7/x8Ts0FJBbG+UWuFyPiN"
}, },
{ {
...@@ -2662,7 +2758,7 @@ ...@@ -2662,7 +2758,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 51 "__id__": 53
}, },
"_enabled": true, "_enabled": true,
"_color": { "_color": {
...@@ -2686,10 +2782,10 @@ ...@@ -2686,10 +2782,10 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 55 "__id__": 57
}, },
{ {
"__id__": 56 "__id__": 58
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2703,8 +2799,8 @@ ...@@ -2703,8 +2799,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 275.7, "width": 254.8,
"height": 134 "height": 108
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -2745,7 +2841,7 @@ ...@@ -2745,7 +2841,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 54 "__id__": 56
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2761,7 +2857,7 @@ ...@@ -2761,7 +2857,7 @@
"_lineHeight": 100, "_lineHeight": 100,
"_enableWrapText": true, "_enableWrapText": true,
"_N$file": { "_N$file": {
"__uuid__": "4e023ddb-7ee9-411d-a69a-d5bb0cd536e9" "__uuid__": "32a07afb-a7de-49ad-afa5-5151a4f801df"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
"_spacingX": 0, "_spacingX": 0,
...@@ -2772,7 +2868,7 @@ ...@@ -2772,7 +2868,7 @@
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 2,
"_id": "3dP9UhFrZAdKGbk2/P3wgC" "_id": "3dP9UhFrZAdKGbk2/P3wgC"
}, },
{ {
...@@ -2780,7 +2876,7 @@ ...@@ -2780,7 +2876,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 54 "__id__": 56
}, },
"_enabled": true, "_enabled": true,
"_color": { "_color": {
...@@ -2802,16 +2898,16 @@ ...@@ -2802,16 +2898,16 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 58 "__id__": 60
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 60 "__id__": 62
}, },
{ {
"__id__": 61 "__id__": 63
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2825,8 +2921,8 @@ ...@@ -2825,8 +2921,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 269.7, "width": 254.8,
"height": 128 "height": 108
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -2867,13 +2963,13 @@ ...@@ -2867,13 +2963,13 @@
"_name": "right_ske", "_name": "right_ske",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 57 "__id__": 59
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 59 "__id__": 61
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2929,7 +3025,7 @@ ...@@ -2929,7 +3025,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 58 "__id__": 60
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2969,7 +3065,7 @@ ...@@ -2969,7 +3065,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 57 "__id__": 59
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2985,7 +3081,7 @@ ...@@ -2985,7 +3081,7 @@
"_lineHeight": 100, "_lineHeight": 100,
"_enableWrapText": true, "_enableWrapText": true,
"_N$file": { "_N$file": {
"__uuid__": "4e023ddb-7ee9-411d-a69a-d5bb0cd536e9" "__uuid__": "32a07afb-a7de-49ad-afa5-5151a4f801df"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
"_spacingX": 0, "_spacingX": 0,
...@@ -2996,7 +3092,7 @@ ...@@ -2996,7 +3092,7 @@
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 2,
"_id": "cdPXqdkSVPKZvNRn9+xAbe" "_id": "cdPXqdkSVPKZvNRn9+xAbe"
}, },
{ {
...@@ -3004,17 +3100,17 @@ ...@@ -3004,17 +3100,17 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 57 "__id__": 59
}, },
"_enabled": true, "_enabled": true,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 38, "r": 184,
"g": 170, "g": 216,
"b": 108, "b": 166,
"a": 255 "a": 255
}, },
"_width": 1, "_width": 4,
"_id": "fbjNMpx0pGHoXD/uEHTDxA" "_id": "fbjNMpx0pGHoXD/uEHTDxA"
}, },
{ {
...@@ -3070,31 +3166,31 @@ ...@@ -3070,31 +3166,31 @@
}, },
"_enabled": true, "_enabled": true,
"layout_game": { "layout_game": {
"__id__": 22 "__id__": 24
}, },
"layout_up": { "layout_up": {
"__id__": 23 "__id__": 25
}, },
"layout_qe": { "layout_qe": {
"__id__": 25 "__id__": 27
}, },
"layout_op": { "layout_op": {
"__id__": 27 "__id__": 29
}, },
"item1": { "item1": {
"__id__": 30 "__id__": 32
}, },
"item2": { "item2": {
"__id__": 43 "__id__": 45
}, },
"item_op": { "item_op": {
"__id__": 51 "__id__": 53
}, },
"item_qeN": { "item_qeN": {
"__id__": 54 "__id__": 56
}, },
"item_qeR": { "item_qeR": {
"__id__": 57 "__id__": 59
}, },
"_id": "f0hLmf9nhJx6afTFheWM4S" "_id": "f0hLmf9nhJx6afTFheWM4S"
} }
......
...@@ -208,36 +208,28 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -208,36 +208,28 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.layout_qe.removeAllChildren(); this.layout_qe.removeAllChildren();
data.contentArr.forEach((dt, idx) => { data.contentArr.forEach((dt, idx) => {
let item = dt.block ? cc.instantiate(this.item_qeR) : cc.instantiate(this.item_qeN); let item = cc.instantiate(this.item_qeN);
item.getComponent(cc.Label).string = dt.text; item.getComponent(cc.Label).string = dt.text;
item.active = true; item.active = true;
// item.getComponent(cc.Label)._forceUpdateRenderData(true);
item.parent = this.layout_qe; item.parent = this.layout_qe;
// this.layout_qe.getComponent(cc.Layout).updateLayout();
if (dt.block) { if (dt.block) {
let ri = cc.instantiate(this.item_qeR);
ri.parent = item;
this.wordItams.push(item); this.wordItams.push(item);
item.getComponent(cc.Label).enabled = false; ri.getComponent(cc.Label).string = dt.text;
ri.getComponent(cc.Label).enabled = false;
ri.active = true;
} }
item.data = dt.text.split(" ").join("");; item.data = dt.text.split(" ").join("");;
}) })
// this.layout_qe.getComponent(cc.Layout).updateLayout();
// let width = this.layout_qe.width;
// if (width < 1450) {
// this.layout_qe.getComponent(cc.Layout).type = cc.Layout.Type.HORIZONTAL;
// }
// this.layout_qe.getComponent(cc.Layout).updateLayout();
this.layout_op.removeAllChildren(); this.layout_op.removeAllChildren();
data.optionList.forEach((dt, idx) => { data.optionList.forEach((dt, idx) => {
let item = cc.instantiate(this.item_op); let item = cc.instantiate(this.item_op);
// let width = this.layout_op.width;
// item.getComponent(cc.Label)._forceUpdateRenderData(true);
// if (width > 1400) {
// this.layout_op.getComponent(cc.Layout).type = cc.Layout.Type.GRID;
// }
item.parent = this.layout_op; item.parent = this.layout_op;
// this.layout_op.getComponent(cc.Layout).updateLayout();
this.iniItem(item, dt.txt) this.iniItem(item, dt.txt)
}) })
this.layout_op.getComponent(cc.Layout).updateLayout(); this.layout_op.getComponent(cc.Layout).updateLayout();
...@@ -327,9 +319,14 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -327,9 +319,14 @@ export default class SceneComponent extends MyCocosSceneComponent {
return return
} }
this.playLocalAudio("right"); this.playLocalAudio("right");
let right_ske = cc.find("right_ske", itemBg); let item_right = cc.find("item_right", itemBg);
item_right.getComponent(cc.Label).enabled = true;
itemBg.getComponent(cc.Label).enabled = false;
let right_ske = cc.find("right_ske", item_right);
right_ske.active = true; right_ske.active = true;
target.parent = null; target.parent = null;
target.destroy(); target.destroy();
itemBg.getComponent(cc.Label).enabled = true; itemBg.getComponent(cc.Label).enabled = true;
...@@ -345,7 +342,8 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -345,7 +342,8 @@ export default class SceneComponent extends MyCocosSceneComponent {
private checkIsEnd() { private checkIsEnd() {
let count = 0; let count = 0;
this.wordItams.forEach((ch) => { this.wordItams.forEach((ch) => {
if (ch.getComponent(cc.Label).enabled) count++ let item_right = cc.find("item_right", ch);
if (item_right && item_right.getComponent(cc.Label).enabled) count++
}) })
return count >= this.wordItams.length; return count >= this.wordItams.length;
} }
......
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
</div> </div>
<div class="border-dashed" style="margin-top: 20px;width: 800px;"> <div class="border-dashed" style="margin-top: 20px;width: 800px;">
<h2>点击文本设置空格</h2> <h2>点击文本设置挖空项</h2>
<span *ngFor="let cont of question.contentArr; let i = index" style="margin-bottom: 5px; "> <span *ngFor="let cont of question.contentArr; let i = index" style="margin-bottom: 5px; ">
<span style="font-size: 40px;" *ngIf="cont.block" class="option-title-line" <span style="font-size: 40px;" *ngIf="cont.block" class="option-title-line"
(click)="onBlock(cont,false)" [innerHtml]="cont.text"></span> (click)="onBlock(cont,false)" [innerHtml]="cont.text"></span>
......
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