Commit baa47a6f authored by yu's avatar yu

7.8修改

parent 7076bf96
...@@ -87,28 +87,28 @@ ...@@ -87,28 +87,28 @@
"__id__": 42 "__id__": 42
}, },
{ {
"__id__": 47 "__id__": 48
}, },
{ {
"__id__": 50 "__id__": 51
}, },
{ {
"__id__": 57 "__id__": 58
}, },
{ {
"__id__": 208 "__id__": 209
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 217
},
{ {
"__id__": 218 "__id__": 218
}, },
{ {
"__id__": 219 "__id__": 219
},
{
"__id__": 220
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1501,9 +1501,9 @@ ...@@ -1501,9 +1501,9 @@
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 130, "r": 68,
"g": 209, "g": 172,
"b": 249, "b": 253,
"a": 255 "a": 255
}, },
"_contentSize": { "_contentSize": {
...@@ -2229,7 +2229,11 @@ ...@@ -2229,7 +2229,11 @@
}, },
"duration": 0.1, "duration": 0.1,
"zoomScale": 1.2, "zoomScale": 1.2,
"clickEvents": [], "clickEvents": [
{
"__id__": 47
}
],
"_N$interactable": false, "_N$interactable": false,
"_N$enableAutoGrayEffect": true, "_N$enableAutoGrayEffect": true,
"_N$transition": 2, "_N$transition": 2,
...@@ -2299,6 +2303,16 @@ ...@@ -2299,6 +2303,16 @@
}, },
"_id": "7aIRTp/sdJI7gcsb9KjJMD" "_id": "7aIRTp/sdJI7gcsb9KjJMD"
}, },
{
"__type__": "cc.ClickEvent",
"target": {
"__id__": 2
},
"component": "",
"_componentId": "408a6f4ZfpM8Yzyg+IOGg/V",
"handler": "touchOver",
"customEventData": ""
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "graphics", "_name": "graphics",
...@@ -2310,10 +2324,10 @@ ...@@ -2310,10 +2324,10 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 48 "__id__": 49
}, },
{ {
"__id__": 49 "__id__": 50
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2369,7 +2383,7 @@ ...@@ -2369,7 +2383,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 47 "__id__": 48
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -2396,7 +2410,7 @@ ...@@ -2396,7 +2410,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 47 "__id__": 48
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2433,19 +2447,19 @@ ...@@ -2433,19 +2447,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 51 "__id__": 52
}, },
{ {
"__id__": 53 "__id__": 54
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 55 "__id__": 56
}, },
{ {
"__id__": 56 "__id__": 57
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2501,13 +2515,13 @@ ...@@ -2501,13 +2515,13 @@
"_name": "left", "_name": "left",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 50 "__id__": 51
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 52 "__id__": 53
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2563,7 +2577,7 @@ ...@@ -2563,7 +2577,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 51 "__id__": 52
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -2595,13 +2609,13 @@ ...@@ -2595,13 +2609,13 @@
"_name": "right", "_name": "right",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 50 "__id__": 51
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 54 "__id__": 55
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2657,7 +2671,7 @@ ...@@ -2657,7 +2671,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 53 "__id__": 54
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -2689,7 +2703,7 @@ ...@@ -2689,7 +2703,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 50 "__id__": 51
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -2716,7 +2730,7 @@ ...@@ -2716,7 +2730,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 50 "__id__": 51
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -2752,31 +2766,31 @@ ...@@ -2752,31 +2766,31 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 58 "__id__": 59
}, },
{ {
"__id__": 76 "__id__": 77
}, },
{ {
"__id__": 94 "__id__": 95
}, },
{ {
"__id__": 108 "__id__": 109
}, },
{ {
"__id__": 126 "__id__": 127
}, },
{ {
"__id__": 140 "__id__": 141
}, },
{ {
"__id__": 158 "__id__": 159
}, },
{ {
"__id__": 172 "__id__": 173
}, },
{ {
"__id__": 190 "__id__": 191
} }
], ],
"_active": true, "_active": true,
...@@ -2834,29 +2848,29 @@ ...@@ -2834,29 +2848,29 @@
"_name": "item2_left", "_name": "item2_left",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 57 "__id__": 58
}, },
"_children": [ "_children": [
{ {
"__id__": 59 "__id__": 60
}, },
{ {
"__id__": 63 "__id__": 64
}, },
{ {
"__id__": 67 "__id__": 68
}, },
{ {
"__id__": 71 "__id__": 72
}, },
{ {
"__id__": 73 "__id__": 74
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 75 "__id__": 76
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2912,17 +2926,17 @@ ...@@ -2912,17 +2926,17 @@
"_name": "normal", "_name": "normal",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 58 "__id__": 59
}, },
"_children": [ "_children": [
{ {
"__id__": 60 "__id__": 61
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 62 "__id__": 63
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2978,13 +2992,13 @@ ...@@ -2978,13 +2992,13 @@
"_name": "text", "_name": "text",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 59 "__id__": 60
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 61 "__id__": 62
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2999,7 +3013,7 @@ ...@@ -2999,7 +3013,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 280, "width": 280,
"height": 50.4 "height": 47.88
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -3011,7 +3025,7 @@ ...@@ -3011,7 +3025,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-7, -7,
3.744, 4,
0, 0,
0, 0,
0, 0,
...@@ -3040,7 +3054,7 @@ ...@@ -3040,7 +3054,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 60 "__id__": 61
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3052,9 +3066,9 @@ ...@@ -3052,9 +3066,9 @@
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "Label", "_string": "Label",
"_N$string": "Label", "_N$string": "Label",
"_fontSize": 40, "_fontSize": 34,
"_lineHeight": 40, "_lineHeight": 38,
"_enableWrapText": false, "_enableWrapText": true,
"_N$file": null, "_N$file": null,
"_isSystemFontUsed": true, "_isSystemFontUsed": true,
"_spacingX": 0, "_spacingX": 0,
...@@ -3064,7 +3078,7 @@ ...@@ -3064,7 +3078,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 2, "_N$overflow": 3,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "bfmvU7wLJKkbDQ7dhJ74x2" "_id": "bfmvU7wLJKkbDQ7dhJ74x2"
}, },
...@@ -3073,7 +3087,7 @@ ...@@ -3073,7 +3087,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 59 "__id__": 60
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3105,17 +3119,17 @@ ...@@ -3105,17 +3119,17 @@
"_name": "select", "_name": "select",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 58 "__id__": 59
}, },
"_children": [ "_children": [
{ {
"__id__": 64 "__id__": 65
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 66 "__id__": 67
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3171,13 +3185,13 @@ ...@@ -3171,13 +3185,13 @@
"_name": "text", "_name": "text",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 63 "__id__": 64
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 65 "__id__": 66
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3204,7 +3218,7 @@ ...@@ -3204,7 +3218,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-7, -7,
3.744, 4,
0, 0,
0, 0,
0, 0,
...@@ -3233,7 +3247,7 @@ ...@@ -3233,7 +3247,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 64 "__id__": 65
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3245,9 +3259,9 @@ ...@@ -3245,9 +3259,9 @@
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "Label", "_string": "Label",
"_N$string": "Label", "_N$string": "Label",
"_fontSize": 40, "_fontSize": 34,
"_lineHeight": 40, "_lineHeight": 38,
"_enableWrapText": false, "_enableWrapText": true,
"_N$file": null, "_N$file": null,
"_isSystemFontUsed": true, "_isSystemFontUsed": true,
"_spacingX": 0, "_spacingX": 0,
...@@ -3257,7 +3271,7 @@ ...@@ -3257,7 +3271,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 2, "_N$overflow": 3,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "10qD1RpBhPepdwJHjdYpME" "_id": "10qD1RpBhPepdwJHjdYpME"
}, },
...@@ -3266,7 +3280,7 @@ ...@@ -3266,7 +3280,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 63 "__id__": 64
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3298,17 +3312,17 @@ ...@@ -3298,17 +3312,17 @@
"_name": "finish", "_name": "finish",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 58 "__id__": 59
}, },
"_children": [ "_children": [
{ {
"__id__": 68 "__id__": 69
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 70 "__id__": 71
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3364,13 +3378,13 @@ ...@@ -3364,13 +3378,13 @@
"_name": "text", "_name": "text",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 67 "__id__": 68
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 69 "__id__": 70
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3397,7 +3411,7 @@ ...@@ -3397,7 +3411,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-7, -7,
3.744, 4,
0, 0,
0, 0,
0, 0,
...@@ -3426,7 +3440,7 @@ ...@@ -3426,7 +3440,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 68 "__id__": 69
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3438,9 +3452,9 @@ ...@@ -3438,9 +3452,9 @@
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "Label", "_string": "Label",
"_N$string": "Label", "_N$string": "Label",
"_fontSize": 40, "_fontSize": 34,
"_lineHeight": 40, "_lineHeight": 38,
"_enableWrapText": false, "_enableWrapText": true,
"_N$file": null, "_N$file": null,
"_isSystemFontUsed": true, "_isSystemFontUsed": true,
"_spacingX": 0, "_spacingX": 0,
...@@ -3450,7 +3464,7 @@ ...@@ -3450,7 +3464,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 2, "_N$overflow": 3,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "1cpsb+gDpHz4e0L0M1EQbJ" "_id": "1cpsb+gDpHz4e0L0M1EQbJ"
}, },
...@@ -3459,7 +3473,7 @@ ...@@ -3459,7 +3473,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 67 "__id__": 68
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3491,13 +3505,13 @@ ...@@ -3491,13 +3505,13 @@
"_name": "circle_right", "_name": "circle_right",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 58 "__id__": 59
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 72 "__id__": 73
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3523,7 +3537,7 @@ ...@@ -3523,7 +3537,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
156.491, 152,
5, 5,
0, 0,
0, 0,
...@@ -3553,7 +3567,7 @@ ...@@ -3553,7 +3567,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 71 "__id__": 72
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3585,13 +3599,13 @@ ...@@ -3585,13 +3599,13 @@
"_name": "circle_lift", "_name": "circle_lift",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 58 "__id__": 59
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 74 "__id__": 75
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3617,7 +3631,7 @@ ...@@ -3617,7 +3631,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-170.043, -168,
5, 5,
0, 0,
0, 0,
...@@ -3647,7 +3661,7 @@ ...@@ -3647,7 +3661,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 73 "__id__": 74
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3679,7 +3693,7 @@ ...@@ -3679,7 +3693,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 58 "__id__": 59
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -3747,29 +3761,29 @@ ...@@ -3747,29 +3761,29 @@
"_name": "item2_right", "_name": "item2_right",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 57 "__id__": 58
}, },
"_children": [ "_children": [
{ {
"__id__": 77 "__id__": 78
}, },
{ {
"__id__": 81 "__id__": 82
}, },
{ {
"__id__": 85 "__id__": 86
}, },
{ {
"__id__": 89 "__id__": 90
}, },
{ {
"__id__": 91 "__id__": 92
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 93 "__id__": 94
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3825,17 +3839,17 @@ ...@@ -3825,17 +3839,17 @@
"_name": "normal", "_name": "normal",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 76 "__id__": 77
}, },
"_children": [ "_children": [
{ {
"__id__": 78 "__id__": 79
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 80 "__id__": 81
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3891,13 +3905,13 @@ ...@@ -3891,13 +3905,13 @@
"_name": "text", "_name": "text",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 77 "__id__": 78
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 79 "__id__": 80
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3912,7 +3926,7 @@ ...@@ -3912,7 +3926,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 260, "width": 260,
"height": 50.4 "height": 47.88
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -3953,7 +3967,7 @@ ...@@ -3953,7 +3967,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 78 "__id__": 79
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3965,8 +3979,8 @@ ...@@ -3965,8 +3979,8 @@
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "Label", "_string": "Label",
"_N$string": "Label", "_N$string": "Label",
"_fontSize": 40, "_fontSize": 34,
"_lineHeight": 40, "_lineHeight": 38,
"_enableWrapText": false, "_enableWrapText": false,
"_N$file": null, "_N$file": null,
"_isSystemFontUsed": true, "_isSystemFontUsed": true,
...@@ -3977,7 +3991,7 @@ ...@@ -3977,7 +3991,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 2, "_N$overflow": 3,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "b46pnNKbNMXJelAXczfpC6" "_id": "b46pnNKbNMXJelAXczfpC6"
}, },
...@@ -3986,7 +4000,7 @@ ...@@ -3986,7 +4000,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 77 "__id__": 78
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4018,17 +4032,17 @@ ...@@ -4018,17 +4032,17 @@
"_name": "select", "_name": "select",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 76 "__id__": 77
}, },
"_children": [ "_children": [
{ {
"__id__": 82 "__id__": 83
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 84 "__id__": 85
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4084,13 +4098,13 @@ ...@@ -4084,13 +4098,13 @@
"_name": "text", "_name": "text",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 81 "__id__": 82
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 83 "__id__": 84
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4146,7 +4160,7 @@ ...@@ -4146,7 +4160,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 82 "__id__": 83
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4158,8 +4172,8 @@ ...@@ -4158,8 +4172,8 @@
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "Label", "_string": "Label",
"_N$string": "Label", "_N$string": "Label",
"_fontSize": 40, "_fontSize": 34,
"_lineHeight": 40, "_lineHeight": 38,
"_enableWrapText": false, "_enableWrapText": false,
"_N$file": null, "_N$file": null,
"_isSystemFontUsed": true, "_isSystemFontUsed": true,
...@@ -4170,7 +4184,7 @@ ...@@ -4170,7 +4184,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 2, "_N$overflow": 3,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "1bS6ARxnNLqpqtymDqroX1" "_id": "1bS6ARxnNLqpqtymDqroX1"
}, },
...@@ -4179,7 +4193,7 @@ ...@@ -4179,7 +4193,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 81 "__id__": 82
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4211,17 +4225,17 @@ ...@@ -4211,17 +4225,17 @@
"_name": "finish", "_name": "finish",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 76 "__id__": 77
}, },
"_children": [ "_children": [
{ {
"__id__": 86 "__id__": 87
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 88 "__id__": 89
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4277,13 +4291,13 @@ ...@@ -4277,13 +4291,13 @@
"_name": "text", "_name": "text",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 85 "__id__": 86
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 87 "__id__": 88
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4339,7 +4353,7 @@ ...@@ -4339,7 +4353,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 86 "__id__": 87
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4351,8 +4365,8 @@ ...@@ -4351,8 +4365,8 @@
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "Label", "_string": "Label",
"_N$string": "Label", "_N$string": "Label",
"_fontSize": 40, "_fontSize": 34,
"_lineHeight": 40, "_lineHeight": 38,
"_enableWrapText": false, "_enableWrapText": false,
"_N$file": null, "_N$file": null,
"_isSystemFontUsed": true, "_isSystemFontUsed": true,
...@@ -4363,7 +4377,7 @@ ...@@ -4363,7 +4377,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 2, "_N$overflow": 3,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "179JsimmBFDKxrpKrCw4al" "_id": "179JsimmBFDKxrpKrCw4al"
}, },
...@@ -4372,7 +4386,7 @@ ...@@ -4372,7 +4386,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 85 "__id__": 86
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4404,13 +4418,13 @@ ...@@ -4404,13 +4418,13 @@
"_name": "circle_lift", "_name": "circle_lift",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 76 "__id__": 77
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 90 "__id__": 91
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4436,7 +4450,7 @@ ...@@ -4436,7 +4450,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-153.372, -151,
5, 5,
0, 0,
0, 0,
...@@ -4466,7 +4480,7 @@ ...@@ -4466,7 +4480,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 89 "__id__": 90
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4498,13 +4512,13 @@ ...@@ -4498,13 +4512,13 @@
"_name": "circle_right", "_name": "circle_right",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 76 "__id__": 77
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 92 "__id__": 93
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4530,7 +4544,7 @@ ...@@ -4530,7 +4544,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
139.017, 135.189,
5, 5,
0, 0,
0, 0,
...@@ -4560,7 +4574,7 @@ ...@@ -4560,7 +4574,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 91 "__id__": 92
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4592,7 +4606,7 @@ ...@@ -4592,7 +4606,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 76 "__id__": 77
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -4660,32 +4674,32 @@ ...@@ -4660,32 +4674,32 @@
"_name": "item3_pic", "_name": "item3_pic",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 57 "__id__": 58
}, },
"_children": [ "_children": [
{ {
"__id__": 95 "__id__": 96
}, },
{ {
"__id__": 97 "__id__": 98
}, },
{ {
"__id__": 99 "__id__": 100
}, },
{ {
"__id__": 101 "__id__": 102
}, },
{ {
"__id__": 103 "__id__": 104
}, },
{ {
"__id__": 105 "__id__": 106
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 107 "__id__": 108
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4741,13 +4755,13 @@ ...@@ -4741,13 +4755,13 @@
"_name": "normal", "_name": "normal",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 94 "__id__": 95
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 96 "__id__": 97
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4803,7 +4817,7 @@ ...@@ -4803,7 +4817,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 95 "__id__": 96
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4835,13 +4849,13 @@ ...@@ -4835,13 +4849,13 @@
"_name": "select", "_name": "select",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 94 "__id__": 95
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 98 "__id__": 99
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4897,7 +4911,7 @@ ...@@ -4897,7 +4911,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 97 "__id__": 98
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4929,13 +4943,13 @@ ...@@ -4929,13 +4943,13 @@
"_name": "finish", "_name": "finish",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 94 "__id__": 95
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 100 "__id__": 101
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4991,7 +5005,7 @@ ...@@ -4991,7 +5005,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 99 "__id__": 100
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5023,13 +5037,13 @@ ...@@ -5023,13 +5037,13 @@
"_name": "pic", "_name": "pic",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 94 "__id__": 95
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 102 "__id__": 103
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5085,7 +5099,7 @@ ...@@ -5085,7 +5099,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 101 "__id__": 102
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5117,13 +5131,13 @@ ...@@ -5117,13 +5131,13 @@
"_name": "circle_right", "_name": "circle_right",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 94 "__id__": 95
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 104 "__id__": 105
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5149,7 +5163,7 @@ ...@@ -5149,7 +5163,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
56.422, 48.407,
5, 5,
0, 0,
0, 0,
...@@ -5179,7 +5193,7 @@ ...@@ -5179,7 +5193,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 103 "__id__": 104
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5211,13 +5225,13 @@ ...@@ -5211,13 +5225,13 @@
"_name": "circle_lift", "_name": "circle_lift",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 94 "__id__": 95
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 106 "__id__": 107
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5243,7 +5257,7 @@ ...@@ -5243,7 +5257,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-71.966, -64.902,
5, 5,
0, 0,
0, 0,
...@@ -5273,7 +5287,7 @@ ...@@ -5273,7 +5287,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 105 "__id__": 106
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5305,7 +5319,7 @@ ...@@ -5305,7 +5319,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 94 "__id__": 95
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -5373,29 +5387,29 @@ ...@@ -5373,29 +5387,29 @@
"_name": "item3_text", "_name": "item3_text",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 57 "__id__": 58
}, },
"_children": [ "_children": [
{ {
"__id__": 109 "__id__": 110
}, },
{ {
"__id__": 113 "__id__": 114
}, },
{ {
"__id__": 117 "__id__": 118
}, },
{ {
"__id__": 121 "__id__": 122
}, },
{ {
"__id__": 123 "__id__": 124
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 125 "__id__": 126
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5451,17 +5465,17 @@ ...@@ -5451,17 +5465,17 @@
"_name": "normal", "_name": "normal",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 108 "__id__": 109
}, },
"_children": [ "_children": [
{ {
"__id__": 110 "__id__": 111
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 112 "__id__": 113
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5517,13 +5531,13 @@ ...@@ -5517,13 +5531,13 @@
"_name": "text", "_name": "text",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 109 "__id__": 110
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 111 "__id__": 112
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5538,7 +5552,7 @@ ...@@ -5538,7 +5552,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 260, "width": 260,
"height": 50.4 "height": 47.88
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -5579,7 +5593,7 @@ ...@@ -5579,7 +5593,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 110 "__id__": 111
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5591,8 +5605,8 @@ ...@@ -5591,8 +5605,8 @@
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "book", "_string": "book",
"_N$string": "book", "_N$string": "book",
"_fontSize": 40, "_fontSize": 34,
"_lineHeight": 40, "_lineHeight": 38,
"_enableWrapText": false, "_enableWrapText": false,
"_N$file": null, "_N$file": null,
"_isSystemFontUsed": true, "_isSystemFontUsed": true,
...@@ -5603,7 +5617,7 @@ ...@@ -5603,7 +5617,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 2, "_N$overflow": 3,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "daqg/ad5hMvrkuggGM20mC" "_id": "daqg/ad5hMvrkuggGM20mC"
}, },
...@@ -5612,7 +5626,7 @@ ...@@ -5612,7 +5626,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 109 "__id__": 110
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5644,17 +5658,17 @@ ...@@ -5644,17 +5658,17 @@
"_name": "select", "_name": "select",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 108 "__id__": 109
}, },
"_children": [ "_children": [
{ {
"__id__": 114 "__id__": 115
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 116 "__id__": 117
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5710,13 +5724,13 @@ ...@@ -5710,13 +5724,13 @@
"_name": "text", "_name": "text",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 113 "__id__": 114
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 115 "__id__": 116
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5772,7 +5786,7 @@ ...@@ -5772,7 +5786,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 114 "__id__": 115
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5784,8 +5798,8 @@ ...@@ -5784,8 +5798,8 @@
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "book", "_string": "book",
"_N$string": "book", "_N$string": "book",
"_fontSize": 40, "_fontSize": 34,
"_lineHeight": 40, "_lineHeight": 38,
"_enableWrapText": false, "_enableWrapText": false,
"_N$file": null, "_N$file": null,
"_isSystemFontUsed": true, "_isSystemFontUsed": true,
...@@ -5796,7 +5810,7 @@ ...@@ -5796,7 +5810,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 2, "_N$overflow": 3,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "58ssQSNDtHr7tDAeVaPiwO" "_id": "58ssQSNDtHr7tDAeVaPiwO"
}, },
...@@ -5805,7 +5819,7 @@ ...@@ -5805,7 +5819,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 113 "__id__": 114
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5837,17 +5851,17 @@ ...@@ -5837,17 +5851,17 @@
"_name": "finish", "_name": "finish",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 108 "__id__": 109
}, },
"_children": [ "_children": [
{ {
"__id__": 118 "__id__": 119
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 120 "__id__": 121
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5903,13 +5917,13 @@ ...@@ -5903,13 +5917,13 @@
"_name": "text", "_name": "text",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 117 "__id__": 118
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 119 "__id__": 120
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5965,7 +5979,7 @@ ...@@ -5965,7 +5979,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 118 "__id__": 119
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5977,8 +5991,8 @@ ...@@ -5977,8 +5991,8 @@
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "book", "_string": "book",
"_N$string": "book", "_N$string": "book",
"_fontSize": 40, "_fontSize": 34,
"_lineHeight": 40, "_lineHeight": 38,
"_enableWrapText": false, "_enableWrapText": false,
"_N$file": null, "_N$file": null,
"_isSystemFontUsed": true, "_isSystemFontUsed": true,
...@@ -5989,7 +6003,7 @@ ...@@ -5989,7 +6003,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 2, "_N$overflow": 3,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "eeSZZHD6hByoHe1JkneHMr" "_id": "eeSZZHD6hByoHe1JkneHMr"
}, },
...@@ -5998,7 +6012,7 @@ ...@@ -5998,7 +6012,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 117 "__id__": 118
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6030,13 +6044,13 @@ ...@@ -6030,13 +6044,13 @@
"_name": "circle_right", "_name": "circle_right",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 108 "__id__": 109
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 122 "__id__": 123
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6062,7 +6076,7 @@ ...@@ -6062,7 +6076,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
142.389, 137.714,
5, 5,
0, 0,
0, 0,
...@@ -6092,7 +6106,7 @@ ...@@ -6092,7 +6106,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 121 "__id__": 122
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6124,13 +6138,13 @@ ...@@ -6124,13 +6138,13 @@
"_name": "circle_lift", "_name": "circle_lift",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 108 "__id__": 109
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 124 "__id__": 125
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6156,7 +6170,7 @@ ...@@ -6156,7 +6170,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-157.483, -153.49,
5, 5,
0, 0,
0, 0,
...@@ -6186,7 +6200,7 @@ ...@@ -6186,7 +6200,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 123 "__id__": 124
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6218,7 +6232,7 @@ ...@@ -6218,7 +6232,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 108 "__id__": 109
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -6286,32 +6300,32 @@ ...@@ -6286,32 +6300,32 @@
"_name": "item4_pic", "_name": "item4_pic",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 57 "__id__": 58
}, },
"_children": [ "_children": [
{ {
"__id__": 127 "__id__": 128
}, },
{ {
"__id__": 129 "__id__": 130
}, },
{ {
"__id__": 131 "__id__": 132
}, },
{ {
"__id__": 133 "__id__": 134
}, },
{ {
"__id__": 135 "__id__": 136
}, },
{ {
"__id__": 137 "__id__": 138
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 139 "__id__": 140
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6367,13 +6381,13 @@ ...@@ -6367,13 +6381,13 @@
"_name": "normal", "_name": "normal",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 126 "__id__": 127
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 128 "__id__": 129
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6429,7 +6443,7 @@ ...@@ -6429,7 +6443,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 127 "__id__": 128
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6461,13 +6475,13 @@ ...@@ -6461,13 +6475,13 @@
"_name": "select", "_name": "select",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 126 "__id__": 127
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 130 "__id__": 131
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6523,7 +6537,7 @@ ...@@ -6523,7 +6537,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 129 "__id__": 130
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6555,13 +6569,13 @@ ...@@ -6555,13 +6569,13 @@
"_name": "finish", "_name": "finish",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 126 "__id__": 127
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 132 "__id__": 133
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6617,7 +6631,7 @@ ...@@ -6617,7 +6631,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 131 "__id__": 132
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6649,13 +6663,13 @@ ...@@ -6649,13 +6663,13 @@
"_name": "pic", "_name": "pic",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 126 "__id__": 127
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 134 "__id__": 135
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6711,7 +6725,7 @@ ...@@ -6711,7 +6725,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 133 "__id__": 134
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6743,13 +6757,13 @@ ...@@ -6743,13 +6757,13 @@
"_name": "circle_right", "_name": "circle_right",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 126 "__id__": 127
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 136 "__id__": 137
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6775,7 +6789,7 @@ ...@@ -6775,7 +6789,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
39.935, 34.641,
5, 5,
0, 0,
0, 0,
...@@ -6805,7 +6819,7 @@ ...@@ -6805,7 +6819,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 135 "__id__": 136
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6837,13 +6851,13 @@ ...@@ -6837,13 +6851,13 @@
"_name": "circle_lift", "_name": "circle_lift",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 126 "__id__": 127
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 138 "__id__": 139
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6869,7 +6883,7 @@ ...@@ -6869,7 +6883,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-55.497, -50.432,
5, 5,
0, 0,
0, 0,
...@@ -6899,7 +6913,7 @@ ...@@ -6899,7 +6913,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 137 "__id__": 138
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6931,7 +6945,7 @@ ...@@ -6931,7 +6945,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 126 "__id__": 127
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -6999,29 +7013,29 @@ ...@@ -6999,29 +7013,29 @@
"_name": "item4_text", "_name": "item4_text",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 57 "__id__": 58
}, },
"_children": [ "_children": [
{ {
"__id__": 141 "__id__": 142
}, },
{ {
"__id__": 145 "__id__": 146
}, },
{ {
"__id__": 149 "__id__": 150
}, },
{ {
"__id__": 153 "__id__": 154
}, },
{ {
"__id__": 155 "__id__": 156
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 157 "__id__": 158
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7077,17 +7091,17 @@ ...@@ -7077,17 +7091,17 @@
"_name": "normal", "_name": "normal",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 140 "__id__": 141
}, },
"_children": [ "_children": [
{ {
"__id__": 142 "__id__": 143
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 144 "__id__": 145
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7143,13 +7157,13 @@ ...@@ -7143,13 +7157,13 @@
"_name": "text", "_name": "text",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 141 "__id__": 142
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 143 "__id__": 144
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7164,7 +7178,7 @@ ...@@ -7164,7 +7178,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 350, "width": 350,
"height": 50.4 "height": 47.88
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -7205,7 +7219,7 @@ ...@@ -7205,7 +7219,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 142 "__id__": 143
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7217,8 +7231,8 @@ ...@@ -7217,8 +7231,8 @@
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "book", "_string": "book",
"_N$string": "book", "_N$string": "book",
"_fontSize": 40, "_fontSize": 34,
"_lineHeight": 40, "_lineHeight": 38,
"_enableWrapText": false, "_enableWrapText": false,
"_N$file": null, "_N$file": null,
"_isSystemFontUsed": true, "_isSystemFontUsed": true,
...@@ -7229,7 +7243,7 @@ ...@@ -7229,7 +7243,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 2, "_N$overflow": 3,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "875eBBjPRIiYbocwX8XsTL" "_id": "875eBBjPRIiYbocwX8XsTL"
}, },
...@@ -7238,7 +7252,7 @@ ...@@ -7238,7 +7252,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 141 "__id__": 142
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7270,17 +7284,17 @@ ...@@ -7270,17 +7284,17 @@
"_name": "select", "_name": "select",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 140 "__id__": 141
}, },
"_children": [ "_children": [
{ {
"__id__": 146 "__id__": 147
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 148 "__id__": 149
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7336,13 +7350,13 @@ ...@@ -7336,13 +7350,13 @@
"_name": "text", "_name": "text",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 145 "__id__": 146
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 147 "__id__": 148
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7398,7 +7412,7 @@ ...@@ -7398,7 +7412,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 146 "__id__": 147
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7410,8 +7424,8 @@ ...@@ -7410,8 +7424,8 @@
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "book", "_string": "book",
"_N$string": "book", "_N$string": "book",
"_fontSize": 40, "_fontSize": 34,
"_lineHeight": 40, "_lineHeight": 38,
"_enableWrapText": false, "_enableWrapText": false,
"_N$file": null, "_N$file": null,
"_isSystemFontUsed": true, "_isSystemFontUsed": true,
...@@ -7422,7 +7436,7 @@ ...@@ -7422,7 +7436,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 2, "_N$overflow": 3,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "e2azl+CexHa4SJp+8vv6kN" "_id": "e2azl+CexHa4SJp+8vv6kN"
}, },
...@@ -7431,7 +7445,7 @@ ...@@ -7431,7 +7445,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 145 "__id__": 146
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7463,17 +7477,17 @@ ...@@ -7463,17 +7477,17 @@
"_name": "finish", "_name": "finish",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 140 "__id__": 141
}, },
"_children": [ "_children": [
{ {
"__id__": 150 "__id__": 151
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 152 "__id__": 153
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7529,13 +7543,13 @@ ...@@ -7529,13 +7543,13 @@
"_name": "text", "_name": "text",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 149 "__id__": 150
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 151 "__id__": 152
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7591,7 +7605,7 @@ ...@@ -7591,7 +7605,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 150 "__id__": 151
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7603,8 +7617,8 @@ ...@@ -7603,8 +7617,8 @@
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "book", "_string": "book",
"_N$string": "book", "_N$string": "book",
"_fontSize": 40, "_fontSize": 34,
"_lineHeight": 40, "_lineHeight": 38,
"_enableWrapText": false, "_enableWrapText": false,
"_N$file": null, "_N$file": null,
"_isSystemFontUsed": true, "_isSystemFontUsed": true,
...@@ -7615,7 +7629,7 @@ ...@@ -7615,7 +7629,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 2, "_N$overflow": 3,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "7fx1Sat8xH6ZDFpnECmYs8" "_id": "7fx1Sat8xH6ZDFpnECmYs8"
}, },
...@@ -7624,7 +7638,7 @@ ...@@ -7624,7 +7638,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 149 "__id__": 150
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7656,13 +7670,13 @@ ...@@ -7656,13 +7670,13 @@
"_name": "circle_lift", "_name": "circle_lift",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 140 "__id__": 141
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 154 "__id__": 155
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7688,7 +7702,7 @@ ...@@ -7688,7 +7702,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-205.596, -202,
5, 5,
0, 0,
0, 0,
...@@ -7718,7 +7732,7 @@ ...@@ -7718,7 +7732,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 153 "__id__": 154
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7750,13 +7764,13 @@ ...@@ -7750,13 +7764,13 @@
"_name": "circle_right", "_name": "circle_right",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 140 "__id__": 141
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 156 "__id__": 157
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7782,7 +7796,7 @@ ...@@ -7782,7 +7796,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
192.523, 186,
5, 5,
0, 0,
0, 0,
...@@ -7812,7 +7826,7 @@ ...@@ -7812,7 +7826,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 155 "__id__": 156
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7844,7 +7858,7 @@ ...@@ -7844,7 +7858,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 140 "__id__": 141
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -7912,32 +7926,32 @@ ...@@ -7912,32 +7926,32 @@
"_name": "item5_pic", "_name": "item5_pic",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 57 "__id__": 58
}, },
"_children": [ "_children": [
{ {
"__id__": 159 "__id__": 160
}, },
{ {
"__id__": 161 "__id__": 162
}, },
{ {
"__id__": 163 "__id__": 164
}, },
{ {
"__id__": 165 "__id__": 166
}, },
{ {
"__id__": 167 "__id__": 168
}, },
{ {
"__id__": 169 "__id__": 170
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 171 "__id__": 172
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7993,13 +8007,13 @@ ...@@ -7993,13 +8007,13 @@
"_name": "normal", "_name": "normal",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 158 "__id__": 159
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 160 "__id__": 161
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8055,7 +8069,7 @@ ...@@ -8055,7 +8069,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 159 "__id__": 160
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8087,13 +8101,13 @@ ...@@ -8087,13 +8101,13 @@
"_name": "select", "_name": "select",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 158 "__id__": 159
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 162 "__id__": 163
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8149,7 +8163,7 @@ ...@@ -8149,7 +8163,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 161 "__id__": 162
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8181,13 +8195,13 @@ ...@@ -8181,13 +8195,13 @@
"_name": "finish", "_name": "finish",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 158 "__id__": 159
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 164 "__id__": 165
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8243,7 +8257,7 @@ ...@@ -8243,7 +8257,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 163 "__id__": 164
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8275,13 +8289,13 @@ ...@@ -8275,13 +8289,13 @@
"_name": "pic", "_name": "pic",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 158 "__id__": 159
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 166 "__id__": 167
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8337,7 +8351,7 @@ ...@@ -8337,7 +8351,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 165 "__id__": 166
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8369,13 +8383,13 @@ ...@@ -8369,13 +8383,13 @@
"_name": "circle_right", "_name": "circle_right",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 158 "__id__": 159
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 168 "__id__": 169
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8401,7 +8415,7 @@ ...@@ -8401,7 +8415,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
32.467, 26.05,
5, 5,
0, 0,
0, 0,
...@@ -8431,7 +8445,7 @@ ...@@ -8431,7 +8445,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 167 "__id__": 168
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8463,13 +8477,13 @@ ...@@ -8463,13 +8477,13 @@
"_name": "circle_lift", "_name": "circle_lift",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 158 "__id__": 159
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 170 "__id__": 171
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8495,7 +8509,7 @@ ...@@ -8495,7 +8509,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-46.896, -40.96,
5, 5,
0, 0,
0, 0,
...@@ -8525,7 +8539,7 @@ ...@@ -8525,7 +8539,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 169 "__id__": 170
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8557,7 +8571,7 @@ ...@@ -8557,7 +8571,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 158 "__id__": 159
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -8625,29 +8639,29 @@ ...@@ -8625,29 +8639,29 @@
"_name": "item5_left", "_name": "item5_left",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 57 "__id__": 58
}, },
"_children": [ "_children": [
{ {
"__id__": 173 "__id__": 174
}, },
{ {
"__id__": 177 "__id__": 178
}, },
{ {
"__id__": 181 "__id__": 182
}, },
{ {
"__id__": 185 "__id__": 186
}, },
{ {
"__id__": 187 "__id__": 188
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 189 "__id__": 190
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8703,17 +8717,17 @@ ...@@ -8703,17 +8717,17 @@
"_name": "normal", "_name": "normal",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 172 "__id__": 173
}, },
"_children": [ "_children": [
{ {
"__id__": 174 "__id__": 175
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 176 "__id__": 177
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8769,13 +8783,13 @@ ...@@ -8769,13 +8783,13 @@
"_name": "text", "_name": "text",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 173 "__id__": 174
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 175 "__id__": 176
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8790,7 +8804,7 @@ ...@@ -8790,7 +8804,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 220, "width": 220,
"height": 50.4 "height": 47.88
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -8831,7 +8845,7 @@ ...@@ -8831,7 +8845,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 174 "__id__": 175
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8843,8 +8857,8 @@ ...@@ -8843,8 +8857,8 @@
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "book", "_string": "book",
"_N$string": "book", "_N$string": "book",
"_fontSize": 40, "_fontSize": 34,
"_lineHeight": 40, "_lineHeight": 38,
"_enableWrapText": false, "_enableWrapText": false,
"_N$file": null, "_N$file": null,
"_isSystemFontUsed": true, "_isSystemFontUsed": true,
...@@ -8855,7 +8869,7 @@ ...@@ -8855,7 +8869,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 2, "_N$overflow": 3,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "20VtxOzxRJk5UQvD5cj0RK" "_id": "20VtxOzxRJk5UQvD5cj0RK"
}, },
...@@ -8864,7 +8878,7 @@ ...@@ -8864,7 +8878,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 173 "__id__": 174
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8896,17 +8910,17 @@ ...@@ -8896,17 +8910,17 @@
"_name": "select", "_name": "select",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 172 "__id__": 173
}, },
"_children": [ "_children": [
{ {
"__id__": 178 "__id__": 179
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 180 "__id__": 181
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8962,13 +8976,13 @@ ...@@ -8962,13 +8976,13 @@
"_name": "text", "_name": "text",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 177 "__id__": 178
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 179 "__id__": 180
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9024,7 +9038,7 @@ ...@@ -9024,7 +9038,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 178 "__id__": 179
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9036,8 +9050,8 @@ ...@@ -9036,8 +9050,8 @@
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "book", "_string": "book",
"_N$string": "book", "_N$string": "book",
"_fontSize": 40, "_fontSize": 34,
"_lineHeight": 40, "_lineHeight": 38,
"_enableWrapText": false, "_enableWrapText": false,
"_N$file": null, "_N$file": null,
"_isSystemFontUsed": true, "_isSystemFontUsed": true,
...@@ -9048,7 +9062,7 @@ ...@@ -9048,7 +9062,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 2, "_N$overflow": 3,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "e6dK6FiTJIzLVfVfQuEqYn" "_id": "e6dK6FiTJIzLVfVfQuEqYn"
}, },
...@@ -9057,7 +9071,7 @@ ...@@ -9057,7 +9071,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 177 "__id__": 178
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9089,17 +9103,17 @@ ...@@ -9089,17 +9103,17 @@
"_name": "finish", "_name": "finish",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 172 "__id__": 173
}, },
"_children": [ "_children": [
{ {
"__id__": 182 "__id__": 183
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 184 "__id__": 185
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9155,13 +9169,13 @@ ...@@ -9155,13 +9169,13 @@
"_name": "text", "_name": "text",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 181 "__id__": 182
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 183 "__id__": 184
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9217,7 +9231,7 @@ ...@@ -9217,7 +9231,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 182 "__id__": 183
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9229,8 +9243,8 @@ ...@@ -9229,8 +9243,8 @@
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "book", "_string": "book",
"_N$string": "book", "_N$string": "book",
"_fontSize": 40, "_fontSize": 34,
"_lineHeight": 40, "_lineHeight": 38,
"_enableWrapText": false, "_enableWrapText": false,
"_N$file": null, "_N$file": null,
"_isSystemFontUsed": true, "_isSystemFontUsed": true,
...@@ -9241,7 +9255,7 @@ ...@@ -9241,7 +9255,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 2, "_N$overflow": 3,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "1bsxxQrelAbq8pbXt6bFdf" "_id": "1bsxxQrelAbq8pbXt6bFdf"
}, },
...@@ -9250,7 +9264,7 @@ ...@@ -9250,7 +9264,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 181 "__id__": 182
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9282,13 +9296,13 @@ ...@@ -9282,13 +9296,13 @@
"_name": "circle_right", "_name": "circle_right",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 172 "__id__": 173
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 186 "__id__": 187
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9314,7 +9328,7 @@ ...@@ -9314,7 +9328,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
115.729, 111,
5, 5,
0, 0,
0, 0,
...@@ -9344,7 +9358,7 @@ ...@@ -9344,7 +9358,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 185 "__id__": 186
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9376,13 +9390,13 @@ ...@@ -9376,13 +9390,13 @@
"_name": "circle_lift", "_name": "circle_lift",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 172 "__id__": 173
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 188 "__id__": 189
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9408,7 +9422,7 @@ ...@@ -9408,7 +9422,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-131.644, -127,
5, 5,
0, 0,
0, 0,
...@@ -9438,7 +9452,7 @@ ...@@ -9438,7 +9452,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 187 "__id__": 188
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9470,7 +9484,7 @@ ...@@ -9470,7 +9484,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 172 "__id__": 173
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -9538,29 +9552,29 @@ ...@@ -9538,29 +9552,29 @@
"_name": "item5_right", "_name": "item5_right",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 57 "__id__": 58
}, },
"_children": [ "_children": [
{ {
"__id__": 191 "__id__": 192
}, },
{ {
"__id__": 195 "__id__": 196
}, },
{ {
"__id__": 199 "__id__": 200
}, },
{ {
"__id__": 203 "__id__": 204
}, },
{ {
"__id__": 205 "__id__": 206
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 207 "__id__": 208
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9616,17 +9630,17 @@ ...@@ -9616,17 +9630,17 @@
"_name": "normal", "_name": "normal",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 190 "__id__": 191
}, },
"_children": [ "_children": [
{ {
"__id__": 192 "__id__": 193
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 194 "__id__": 195
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9682,13 +9696,13 @@ ...@@ -9682,13 +9696,13 @@
"_name": "text", "_name": "text",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 191 "__id__": 192
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 193 "__id__": 194
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9703,7 +9717,7 @@ ...@@ -9703,7 +9717,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 300, "width": 300,
"height": 50.4 "height": 47.88
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -9744,7 +9758,7 @@ ...@@ -9744,7 +9758,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 192 "__id__": 193
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9756,8 +9770,8 @@ ...@@ -9756,8 +9770,8 @@
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "book", "_string": "book",
"_N$string": "book", "_N$string": "book",
"_fontSize": 40, "_fontSize": 34,
"_lineHeight": 40, "_lineHeight": 38,
"_enableWrapText": false, "_enableWrapText": false,
"_N$file": null, "_N$file": null,
"_isSystemFontUsed": true, "_isSystemFontUsed": true,
...@@ -9768,7 +9782,7 @@ ...@@ -9768,7 +9782,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 2, "_N$overflow": 3,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "7dbLU9N4VEmYbAEyjy3XgA" "_id": "7dbLU9N4VEmYbAEyjy3XgA"
}, },
...@@ -9777,7 +9791,7 @@ ...@@ -9777,7 +9791,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 191 "__id__": 192
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9809,17 +9823,17 @@ ...@@ -9809,17 +9823,17 @@
"_name": "select", "_name": "select",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 190 "__id__": 191
}, },
"_children": [ "_children": [
{ {
"__id__": 196 "__id__": 197
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 198 "__id__": 199
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9875,13 +9889,13 @@ ...@@ -9875,13 +9889,13 @@
"_name": "text", "_name": "text",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 195 "__id__": 196
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 197 "__id__": 198
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9937,7 +9951,7 @@ ...@@ -9937,7 +9951,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 196 "__id__": 197
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9949,8 +9963,8 @@ ...@@ -9949,8 +9963,8 @@
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "book", "_string": "book",
"_N$string": "book", "_N$string": "book",
"_fontSize": 40, "_fontSize": 34,
"_lineHeight": 40, "_lineHeight": 38,
"_enableWrapText": false, "_enableWrapText": false,
"_N$file": null, "_N$file": null,
"_isSystemFontUsed": true, "_isSystemFontUsed": true,
...@@ -9961,7 +9975,7 @@ ...@@ -9961,7 +9975,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 2, "_N$overflow": 3,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "62Uo1eWilBfbWUR3/sYcv8" "_id": "62Uo1eWilBfbWUR3/sYcv8"
}, },
...@@ -9970,7 +9984,7 @@ ...@@ -9970,7 +9984,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 195 "__id__": 196
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10002,17 +10016,17 @@ ...@@ -10002,17 +10016,17 @@
"_name": "finish", "_name": "finish",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 190 "__id__": 191
}, },
"_children": [ "_children": [
{ {
"__id__": 200 "__id__": 201
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 202 "__id__": 203
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10068,13 +10082,13 @@ ...@@ -10068,13 +10082,13 @@
"_name": "text", "_name": "text",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 199 "__id__": 200
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 201 "__id__": 202
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10130,7 +10144,7 @@ ...@@ -10130,7 +10144,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 200 "__id__": 201
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10142,8 +10156,8 @@ ...@@ -10142,8 +10156,8 @@
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "book", "_string": "book",
"_N$string": "book", "_N$string": "book",
"_fontSize": 40, "_fontSize": 34,
"_lineHeight": 40, "_lineHeight": 38,
"_enableWrapText": false, "_enableWrapText": false,
"_N$file": null, "_N$file": null,
"_isSystemFontUsed": true, "_isSystemFontUsed": true,
...@@ -10154,7 +10168,7 @@ ...@@ -10154,7 +10168,7 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 2, "_N$overflow": 3,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "4aLRTC+8tBWoUREu2/scim" "_id": "4aLRTC+8tBWoUREu2/scim"
}, },
...@@ -10163,7 +10177,7 @@ ...@@ -10163,7 +10177,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 199 "__id__": 200
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10195,13 +10209,13 @@ ...@@ -10195,13 +10209,13 @@
"_name": "circle_right", "_name": "circle_right",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 190 "__id__": 191
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 204 "__id__": 205
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10227,7 +10241,7 @@ ...@@ -10227,7 +10241,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
154.65, 149,
5, 5,
0, 0,
0, 0,
...@@ -10257,7 +10271,7 @@ ...@@ -10257,7 +10271,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 203 "__id__": 204
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10289,13 +10303,13 @@ ...@@ -10289,13 +10303,13 @@
"_name": "circle_lift", "_name": "circle_lift",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 190 "__id__": 191
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 206 "__id__": 207
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10321,7 +10335,7 @@ ...@@ -10321,7 +10335,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-169.987, -165,
5, 5,
0, 0,
0, 0,
...@@ -10351,7 +10365,7 @@ ...@@ -10351,7 +10365,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 205 "__id__": 206
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10383,7 +10397,7 @@ ...@@ -10383,7 +10397,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 190 "__id__": 191
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -10455,22 +10469,22 @@ ...@@ -10455,22 +10469,22 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 209 "__id__": 210
}, },
{ {
"__id__": 211 "__id__": 212
}, },
{ {
"__id__": 213 "__id__": 214
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 215 "__id__": 216
}, },
{ {
"__id__": 216 "__id__": 217
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10526,13 +10540,13 @@ ...@@ -10526,13 +10540,13 @@
"_name": "ske_candy", "_name": "ske_candy",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 208 "__id__": 209
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 210 "__id__": 211
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10588,7 +10602,7 @@ ...@@ -10588,7 +10602,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 209 "__id__": 210
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10628,13 +10642,13 @@ ...@@ -10628,13 +10642,13 @@
"_name": "ske", "_name": "ske",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 208 "__id__": 209
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 212 "__id__": 213
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10690,7 +10704,7 @@ ...@@ -10690,7 +10704,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 211 "__id__": 212
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10730,13 +10744,13 @@ ...@@ -10730,13 +10744,13 @@
"_name": "block", "_name": "block",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 208 "__id__": 209
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 214 "__id__": 215
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10792,7 +10806,7 @@ ...@@ -10792,7 +10806,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 213 "__id__": 214
}, },
"_enabled": true, "_enabled": true,
"_id": "97LxA+OV9PAobAvk5EN0yy" "_id": "97LxA+OV9PAobAvk5EN0yy"
...@@ -10802,7 +10816,7 @@ ...@@ -10802,7 +10816,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 208 "__id__": 209
}, },
"_enabled": true, "_enabled": true,
"startPosition": { "startPosition": {
...@@ -10823,7 +10837,7 @@ ...@@ -10823,7 +10837,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 208 "__id__": 209
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -10898,37 +10912,37 @@ ...@@ -10898,37 +10912,37 @@
}, },
"_enabled": true, "_enabled": true,
"item2_left": { "item2_left": {
"__id__": 58 "__id__": 59
}, },
"item2_right": { "item2_right": {
"__id__": 76 "__id__": 77
}, },
"item3_pic": { "item3_pic": {
"__id__": 94 "__id__": 95
}, },
"item3_text": { "item3_text": {
"__id__": 108 "__id__": 109
}, },
"item4_text": { "item4_text": {
"__id__": 140 "__id__": 141
}, },
"item4_pic": { "item4_pic": {
"__id__": 126 "__id__": 127
}, },
"item5_pic": { "item5_pic": {
"__id__": 158 "__id__": 159
}, },
"item5_left": { "item5_left": {
"__id__": 172 "__id__": 173
}, },
"item5_right": { "item5_right": {
"__id__": 190 "__id__": 191
}, },
"layout_left": { "layout_left": {
"__id__": 51 "__id__": 52
}, },
"layout_right": { "layout_right": {
"__id__": 53 "__id__": 54
}, },
"_id": "eaTVUpqahPfZeO9+sUI7RP" "_id": "eaTVUpqahPfZeO9+sUI7RP"
} }
......
...@@ -87,29 +87,28 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -87,29 +87,28 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.showGame(); this.showGame();
} }
private touchOver() { private touchOver() {
onHomeworkFinish(); this.playLocalAudio("finish"); let data: any = {};
let questions = this.logs.concat();
let score = 0;
questions.forEach(q => {
score += q.score;
})
data.questions = questions;
data.score = score;
console.log(data);
onHomeworkFinish(data);
} }
private gameOver() { private gameOver() {
setTimeout(() => { setTimeout(() => {
this.playLocalAudio("finish");
let btn_check = cc.find("btn_check", this.node); let btn_check = cc.find("btn_check", this.node);
btn_check.getComponent(cc.Button).interactable = true; btn_check.getComponent(cc.Button).interactable = true;
// let mouse_end = pg.view.find(this, "mouse_end"); // let mouse_end = pg.view.find(this, "mouse_end");
// mouse_end.active = true; // mouse_end.active = true;
// mouse_end.getComponent("mrbr04_mouse_end").play().then(() => { // mouse_end.getComponent("mrbr04_mouse_end").play().then(() => {
//结算 //结算
let data: any = {};
let questions = this.logs.concat();
let score = 0;
questions.forEach(q => {
score += q.score;
})
data.questions = questions;
data.score = score;
console.log(data);
onHomeworkFinish();
// }) // })
}, 1800); }, 1);
} }
private showGame() { private showGame() {
if (this.roundIdx >= this.data.questions.length) { if (this.roundIdx >= this.data.questions.length) {
...@@ -185,7 +184,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -185,7 +184,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
// let isText = this.upArr[0].type == 1; // let isText = this.upArr[0].type == 1;
let isText = type == "txt"; let isText = type == "txt";
if (this.upArr.length == 5) { if (this.upArr.length == 5) {
item = isText ? cc.instantiate(this.item5_left) : cc.instantiate(this.item5_pic); item = isText ? cc.instantiate(this.item5_right) : cc.instantiate(this.item5_pic);
} }
else if (this.upArr.length == 4) { else if (this.upArr.length == 4) {
item = isText ? cc.instantiate(this.item4_text) : cc.instantiate(this.item4_pic); item = isText ? cc.instantiate(this.item4_text) : cc.instantiate(this.item4_pic);
...@@ -218,9 +217,9 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -218,9 +217,9 @@ export default class SceneComponent extends MyCocosSceneComponent {
} }
private getlayoutSpacing() { private getlayoutSpacing() {
if (this.upArr.length == 2) return { sY: 100, top: 100 }; if (this.upArr.length == 2) return { sY: 100, top: 100 };
if (this.upArr.length == 3) return { sY: 20, top: 20 }; if (this.upArr.length == 3) return { sY: 0, top: 40 };
if (this.upArr.length == 4) return { sY: 15, top: 15 }; if (this.upArr.length == 4) return { sY: 0, top: 40 };
if (this.upArr.length == 5) return { sY: 0, top: 7 }; if (this.upArr.length == 5) return { sY: -9, top: 30 };
} }
private showLayout() { private showLayout() {
......
assets/BOY04/textures/word/check_1.png

6.84 KB | W: | H:

assets/BOY04/textures/word/check_1.png

6.69 KB | W: | H:

assets/BOY04/textures/word/check_1.png
assets/BOY04/textures/word/check_1.png
assets/BOY04/textures/word/check_1.png
assets/BOY04/textures/word/check_1.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -18,11 +18,11 @@ ...@@ -18,11 +18,11 @@
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
"offsetX": 0, "offsetX": -0.5,
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 110, "width": 109,
"height": 110, "height": 110,
"rawWidth": 110, "rawWidth": 110,
"rawHeight": 110, "rawHeight": 110,
......
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