Commit 87364bc7 authored by limingzhe's avatar limingzhe

fix: debug

parent 3a1ffb36
......@@ -17,13 +17,13 @@
"__id__": 2
},
{
"__id__": 74
"__id__": 75
},
{
"__id__": 108
"__id__": 109
},
{
"__id__": 129
"__id__": 130
}
],
"_active": false,
......@@ -84,31 +84,28 @@
"__id__": 5
},
{
"__id__": 28
},
{
"__id__": 31
"__id__": 8
},
{
"__id__": 33
"__id__": 11
},
{
"__id__": 56
"__id__": 57
},
{
"__id__": 58
"__id__": 59
}
],
"_active": true,
"_components": [
{
"__id__": 71
},
{
"__id__": 72
},
{
"__id__": 73
},
{
"__id__": 74
}
],
"_prefab": null,
......@@ -264,36 +261,283 @@
"_parent": {
"__id__": 2
},
"_children": [
"_children": [],
"_active": true,
"_components": [
{
"__id__": 6
},
{
"__id__": 9
"__id__": 7
}
],
"_active": true,
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 220,
"g": 235,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1688,
"height": 780
},
"_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": "a4rZHUyABAUqiCcDhhXH0N"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 5
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "d3k36h3OpOjocVeo3Hvpxp"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 5
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 45,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 100,
"_originalHeight": 100,
"_id": "25RIqyeOpPQrnywJu9TpRc"
},
{
"__type__": "cc.Node",
"_name": "back_btn",
"_objFlags": 0,
"_parent": {
"__id__": 2
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 26
"__id__": 9
},
{
"__id__": 27
"__id__": 10
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 220,
"g": 235,
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1688,
"height": 780
"width": 100,
"height": 80
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-762,
322,
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": "c88Kj5Ng1C9LX8kn9aDpRx"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 8
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 1,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "329b9491-7e80-40bd-a35b-4ae8642753eb"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "94SzBnKLRH5rlLQDO7OXZX"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 8
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 9,
"_left": 32,
"_right": 0,
"_top": 28,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "01YbIdoohIUKIaWcqWz7G5"
},
{
"__type__": "cc.Node",
"_name": "bg_container",
"_objFlags": 0,
"_parent": {
"__id__": 2
},
"_children": [
{
"__id__": 12
},
{
"__id__": 15
},
{
"__id__": 32
},
{
"__id__": 34
}
],
"_active": true,
"_components": [],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 922,
"height": 764
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -327,23 +571,23 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "a4rZHUyABAUqiCcDhhXH0N"
"_id": "72xouXBspIS5rakconuJSo"
},
{
"__type__": "cc.Node",
"_name": "title",
"_objFlags": 0,
"_parent": {
"__id__": 5
"__id__": 11
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 7
"__id__": 13
},
{
"__id__": 8
"__id__": 14
}
],
"_prefab": null,
......@@ -399,7 +643,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 6
"__id__": 12
},
"_enabled": true,
"_materials": [
......@@ -432,7 +676,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 6
"__id__": 12
},
"_enabled": false,
"alignMode": 1,
......@@ -459,29 +703,29 @@
"_name": "AudioPlayer",
"_objFlags": 0,
"_parent": {
"__id__": 5
"__id__": 11
},
"_children": [
{
"__id__": 10
"__id__": 16
},
{
"__id__": 12
"__id__": 18
},
{
"__id__": 14
"__id__": 20
},
{
"__id__": 16
"__id__": 22
},
{
"__id__": 23
"__id__": 29
}
],
"_active": true,
"_components": [
{
"__id__": 25
"__id__": 31
}
],
"_prefab": null,
......@@ -537,13 +781,13 @@
"_name": "curTime",
"_objFlags": 0,
"_parent": {
"__id__": 9
"__id__": 15
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 11
"__id__": 17
}
],
"_prefab": null,
......@@ -599,7 +843,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 10
"__id__": 16
},
"_enabled": true,
"_materials": [
......@@ -632,13 +876,13 @@
"_name": "play",
"_objFlags": 0,
"_parent": {
"__id__": 9
"__id__": 15
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 13
"__id__": 19
}
],
"_prefab": null,
......@@ -694,7 +938,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 12
"__id__": 18
},
"_enabled": true,
"_materials": [
......@@ -726,13 +970,13 @@
"_name": "pause",
"_objFlags": 0,
"_parent": {
"__id__": 9
"__id__": 15
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 15
"__id__": 21
}
],
"_prefab": null,
......@@ -788,7 +1032,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 14
"__id__": 20
},
"_enabled": true,
"_materials": [
......@@ -820,23 +1064,23 @@
"_name": "timeBar",
"_objFlags": 0,
"_parent": {
"__id__": 9
"__id__": 15
},
"_children": [
{
"__id__": 17
"__id__": 23
},
{
"__id__": 19
"__id__": 25
}
],
"_active": true,
"_components": [
{
"__id__": 21
"__id__": 27
},
{
"__id__": 22
"__id__": 28
}
],
"_prefab": null,
......@@ -892,13 +1136,13 @@
"_name": "bar",
"_objFlags": 512,
"_parent": {
"__id__": 16
"__id__": 22
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 18
"__id__": 24
}
],
"_prefab": null,
......@@ -954,7 +1198,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 17
"__id__": 23
},
"_enabled": true,
"_materials": [
......@@ -986,13 +1230,13 @@
"_name": "progressBtn",
"_objFlags": 0,
"_parent": {
"__id__": 16
"__id__": 22
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 20
"__id__": 26
}
],
"_prefab": null,
......@@ -1048,7 +1292,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 19
"__id__": 25
},
"_enabled": true,
"_materials": [
......@@ -1080,7 +1324,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 16
"__id__": 22
},
"_enabled": true,
"_materials": [
......@@ -1112,212 +1356,28 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 16
"__id__": 22
},
"_enabled": true,
"_N$totalLength": 342,
"_N$barSprite": {
"__id__": 18
},
"_N$mode": 0,
"_N$progress": 0,
"_N$reverse": false,
"_id": "e4UndZLGhC/otXiGJ79cRK"
},
{
"__type__": "cc.Node",
"_name": "totalTime",
"_objFlags": 0,
"_parent": {
"__id__": 9
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 24
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 33,
"g": 33,
"b": 33,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 50.05,
"height": 50.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
206.341,
1.058,
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": "b7nS2L5Q9H9Z2hjFDZ9ymx"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 23
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "00:00",
"_N$string": "00:00",
"_fontSize": 20,
"_lineHeight": 40,
"_enableWrapText": true,
"_N$file": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "07WWCVcW5EvploLmBqzXlZ"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 9
},
"_enabled": false,
"alignMode": 1,
"_target": null,
"_alignFlags": 1,
"_left": 0,
"_right": 0,
"_top": 119.87700000000001,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "03rAoa0GtPGoRMAnoqO8yM"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 5
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "d3k36h3OpOjocVeo3Hvpxp"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 5
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 45,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 100,
"_originalHeight": 100,
"_id": "25RIqyeOpPQrnywJu9TpRc"
"__id__": 24
},
"_N$mode": 0,
"_N$progress": 0,
"_N$reverse": false,
"_id": "e4UndZLGhC/otXiGJ79cRK"
},
{
"__type__": "cc.Node",
"_name": "back_btn",
"_name": "totalTime",
"_objFlags": 0,
"_parent": {
"__id__": 2
"__id__": 15
},
"_children": [],
"_active": false,
"_active": true,
"_components": [
{
"__id__": 29
},
{
"__id__": 30
}
......@@ -1326,15 +1386,15 @@
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"r": 33,
"g": 33,
"b": 33,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 100,
"height": 80
"width": 50.05,
"height": 50.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -1345,8 +1405,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-762,
322,
206.341,
1.058,
0,
0,
0,
......@@ -1368,14 +1428,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "c88Kj5Ng1C9LX8kn9aDpRx"
"_id": "b7nS2L5Q9H9Z2hjFDZ9ymx"
},
{
"__type__": "cc.Sprite",
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 28
"__id__": 29
},
"_enabled": true,
"_materials": [
......@@ -1383,39 +1443,40 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 1,
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "329b9491-7e80-40bd-a35b-4ae8642753eb"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "94SzBnKLRH5rlLQDO7OXZX"
"_string": "00:00",
"_N$string": "00:00",
"_fontSize": 20,
"_lineHeight": 40,
"_enableWrapText": true,
"_N$file": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "07WWCVcW5EvploLmBqzXlZ"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 28
"__id__": 15
},
"_enabled": true,
"_enabled": false,
"alignMode": 1,
"_target": null,
"_alignFlags": 9,
"_left": 32,
"_alignFlags": 1,
"_left": 0,
"_right": 0,
"_top": 28,
"_top": 119.87700000000001,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
......@@ -1427,20 +1488,20 @@
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "01YbIdoohIUKIaWcqWz7G5"
"_id": "03rAoa0GtPGoRMAnoqO8yM"
},
{
"__type__": "cc.Node",
"_name": "panel",
"_objFlags": 0,
"_parent": {
"__id__": 2
"__id__": 11
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 32
"__id__": 33
}
],
"_prefab": null,
......@@ -1475,7 +1536,7 @@
1,
0.9,
0.9,
1
0.9
]
},
"_eulerAngles": {
......@@ -1496,7 +1557,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 31
"__id__": 32
},
"_enabled": true,
"_materials": [
......@@ -1528,41 +1589,41 @@
"_name": "color_panel",
"_objFlags": 0,
"_parent": {
"__id__": 2
"__id__": 11
},
"_children": [
{
"__id__": 34
"__id__": 35
},
{
"__id__": 36
"__id__": 37
},
{
"__id__": 38
"__id__": 39
},
{
"__id__": 40
"__id__": 41
},
{
"__id__": 42
"__id__": 43
},
{
"__id__": 44
"__id__": 45
},
{
"__id__": 46
"__id__": 47
},
{
"__id__": 48
"__id__": 49
},
{
"__id__": 50
"__id__": 51
}
],
"_active": true,
"_components": [
{
"__id__": 55
"__id__": 56
}
],
"_prefab": null,
......@@ -1589,7 +1650,7 @@
"ctor": "Float64Array",
"array": [
0,
-305.716,
-295.944,
0,
0,
0,
......@@ -1618,13 +1679,13 @@
"_name": "select",
"_objFlags": 0,
"_parent": {
"__id__": 33
"__id__": 34
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 35
"__id__": 36
}
],
"_prefab": null,
......@@ -1680,7 +1741,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 34
"__id__": 35
},
"_enabled": true,
"_materials": [
......@@ -1712,13 +1773,13 @@
"_name": "color_1",
"_objFlags": 0,
"_parent": {
"__id__": 33
"__id__": 34
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 37
"__id__": 38
}
],
"_prefab": null,
......@@ -1774,7 +1835,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 36
"__id__": 37
},
"_enabled": true,
"_materials": [
......@@ -1806,13 +1867,13 @@
"_name": "color_2",
"_objFlags": 0,
"_parent": {
"__id__": 33
"__id__": 34
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 39
"__id__": 40
}
],
"_prefab": null,
......@@ -1868,7 +1929,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 38
"__id__": 39
},
"_enabled": true,
"_materials": [
......@@ -1900,13 +1961,13 @@
"_name": "color_3",
"_objFlags": 0,
"_parent": {
"__id__": 33
"__id__": 34
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 41
"__id__": 42
}
],
"_prefab": null,
......@@ -1962,7 +2023,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 40
"__id__": 41
},
"_enabled": true,
"_materials": [
......@@ -1994,13 +2055,13 @@
"_name": "color_4",
"_objFlags": 0,
"_parent": {
"__id__": 33
"__id__": 34
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 43
"__id__": 44
}
],
"_prefab": null,
......@@ -2056,7 +2117,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 42
"__id__": 43
},
"_enabled": true,
"_materials": [
......@@ -2088,13 +2149,13 @@
"_name": "color_5",
"_objFlags": 0,
"_parent": {
"__id__": 33
"__id__": 34
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 45
"__id__": 46
}
],
"_prefab": null,
......@@ -2150,7 +2211,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 44
"__id__": 45
},
"_enabled": true,
"_materials": [
......@@ -2182,13 +2243,13 @@
"_name": "color_6",
"_objFlags": 0,
"_parent": {
"__id__": 33
"__id__": 34
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 47
"__id__": 48
}
],
"_prefab": null,
......@@ -2244,7 +2305,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 46
"__id__": 47
},
"_enabled": true,
"_materials": [
......@@ -2276,13 +2337,13 @@
"_name": "color_7",
"_objFlags": 0,
"_parent": {
"__id__": 33
"__id__": 34
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 49
"__id__": 50
}
],
"_prefab": null,
......@@ -2338,7 +2399,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 48
"__id__": 49
},
"_enabled": true,
"_materials": [
......@@ -2370,14 +2431,14 @@
"_name": "color_btn",
"_objFlags": 0,
"_parent": {
"__id__": 33
"__id__": 34
},
"_children": [
{
"__id__": 51
"__id__": 52
},
{
"__id__": 53
"__id__": 54
}
],
"_active": false,
......@@ -2435,13 +2496,13 @@
"_name": "spr",
"_objFlags": 0,
"_parent": {
"__id__": 50
"__id__": 51
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 52
"__id__": 53
}
],
"_prefab": null,
......@@ -2497,7 +2558,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 51
"__id__": 52
},
"_enabled": true,
"_materials": [
......@@ -2529,13 +2590,13 @@
"_name": "label",
"_objFlags": 0,
"_parent": {
"__id__": 50
"__id__": 51
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 54
"__id__": 55
}
],
"_prefab": null,
......@@ -2591,7 +2652,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 53
"__id__": 54
},
"_enabled": true,
"_materials": [
......@@ -2626,7 +2687,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 33
"__id__": 34
},
"_enabled": false,
"alignMode": 1,
......@@ -2659,7 +2720,7 @@
"_active": false,
"_components": [
{
"__id__": 57
"__id__": 58
}
],
"_prefab": null,
......@@ -2715,7 +2776,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 56
"__id__": 57
},
"_enabled": true,
"_cullingMask": 0,
......@@ -2755,13 +2816,13 @@
},
"_children": [
{
"__id__": 59
"__id__": 60
}
],
"_active": false,
"_components": [
{
"__id__": 70
"__id__": 71
}
],
"_prefab": null,
......@@ -2817,23 +2878,23 @@
"_name": "editBox",
"_objFlags": 0,
"_parent": {
"__id__": 58
"__id__": 59
},
"_children": [
{
"__id__": 60
"__id__": 61
},
{
"__id__": 63
"__id__": 64
},
{
"__id__": 66
"__id__": 67
}
],
"_active": true,
"_components": [
{
"__id__": 69
"__id__": 70
}
],
"_prefab": null,
......@@ -2889,16 +2950,16 @@
"_name": "BACKGROUND_SPRITE",
"_objFlags": 0,
"_parent": {
"__id__": 59
"__id__": 60
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 61
"__id__": 62
},
{
"__id__": 62
"__id__": 63
}
],
"_prefab": null,
......@@ -2954,7 +3015,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 60
"__id__": 61
},
"_enabled": false,
"_materials": [
......@@ -2986,7 +3047,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 60
"__id__": 61
},
"_enabled": true,
"alignMode": 0,
......@@ -3013,16 +3074,16 @@
"_name": "TEXT_LABEL",
"_objFlags": 0,
"_parent": {
"__id__": 59
"__id__": 60
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 64
"__id__": 65
},
{
"__id__": 65
"__id__": 66
}
],
"_prefab": null,
......@@ -3078,7 +3139,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 63
"__id__": 64
},
"_enabled": true,
"_materials": [],
......@@ -3109,7 +3170,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 63
"__id__": 64
},
"_enabled": true,
"alignMode": 0,
......@@ -3136,16 +3197,16 @@
"_name": "PLACEHOLDER_LABEL",
"_objFlags": 512,
"_parent": {
"__id__": 59
"__id__": 60
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 67
"__id__": 68
},
{
"__id__": 68
"__id__": 69
}
],
"_prefab": null,
......@@ -3201,7 +3262,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 66
"__id__": 67
},
"_enabled": true,
"_materials": [
......@@ -3234,7 +3295,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 66
"__id__": 67
},
"_enabled": true,
"alignMode": 0,
......@@ -3261,7 +3322,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 59
"__id__": 60
},
"_enabled": true,
"_string": "",
......@@ -3273,13 +3334,13 @@
"editingDidEnded": [],
"editingReturn": [],
"_N$textLabel": {
"__id__": 64
"__id__": 65
},
"_N$placeholderLabel": {
"__id__": 67
"__id__": 68
},
"_N$background": {
"__id__": 61
"__id__": 62
},
"_N$inputFlag": 5,
"_N$inputMode": 2,
......@@ -3291,7 +3352,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 58
"__id__": 59
},
"_enabled": true,
"_materials": [
......@@ -3406,13 +3467,13 @@
},
"_children": [
{
"__id__": 75
"__id__": 76
},
{
"__id__": 78
"__id__": 79
},
{
"__id__": 105
"__id__": 106
}
],
"_active": false,
......@@ -3470,11 +3531,11 @@
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 74
"__id__": 75
},
"_children": [
{
"__id__": 76
"__id__": 77
}
],
"_active": false,
......@@ -3532,13 +3593,13 @@
"_name": "input_bg",
"_objFlags": 0,
"_parent": {
"__id__": 75
"__id__": 76
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 77
"__id__": 78
}
],
"_prefab": null,
......@@ -3594,7 +3655,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 76
"__id__": 77
},
"_enabled": true,
"_materials": [],
......@@ -3622,47 +3683,47 @@
"_name": "audio",
"_objFlags": 0,
"_parent": {
"__id__": 74
"__id__": 75
},
"_children": [
{
"__id__": 79
"__id__": 80
},
{
"__id__": 81
"__id__": 82
},
{
"__id__": 83
"__id__": 84
},
{
"__id__": 85
"__id__": 86
},
{
"__id__": 87
"__id__": 88
},
{
"__id__": 89
"__id__": 90
},
{
"__id__": 91
"__id__": 92
},
{
"__id__": 93
"__id__": 94
},
{
"__id__": 95
"__id__": 96
},
{
"__id__": 97
"__id__": 98
},
{
"__id__": 99
"__id__": 100
},
{
"__id__": 101
"__id__": 102
},
{
"__id__": 103
"__id__": 104
}
],
"_active": true,
......@@ -3720,13 +3781,13 @@
"_name": "right",
"_objFlags": 0,
"_parent": {
"__id__": 78
"__id__": 79
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 80
"__id__": 81
}
],
"_prefab": null,
......@@ -3782,7 +3843,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 79
"__id__": 80
},
"_enabled": true,
"_clip": {
......@@ -3801,13 +3862,13 @@
"_name": "wrong",
"_objFlags": 0,
"_parent": {
"__id__": 78
"__id__": 79
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 82
"__id__": 83
}
],
"_prefab": null,
......@@ -3863,7 +3924,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 81
"__id__": 82
},
"_enabled": true,
"_clip": {
......@@ -3882,13 +3943,13 @@
"_name": "a_o",
"_objFlags": 0,
"_parent": {
"__id__": 78
"__id__": 79
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 84
"__id__": 85
}
],
"_prefab": null,
......@@ -3944,7 +4005,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 83
"__id__": 84
},
"_enabled": true,
"_clip": {
......@@ -3963,13 +4024,13 @@
"_name": "select",
"_objFlags": 0,
"_parent": {
"__id__": 78
"__id__": 79
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 86
"__id__": 87
}
],
"_prefab": null,
......@@ -4025,7 +4086,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 85
"__id__": 86
},
"_enabled": true,
"_clip": {
......@@ -4044,13 +4105,13 @@
"_name": "button",
"_objFlags": 0,
"_parent": {
"__id__": 78
"__id__": 79
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 88
"__id__": 89
}
],
"_prefab": null,
......@@ -4106,7 +4167,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 87
"__id__": 88
},
"_enabled": true,
"_clip": {
......@@ -4125,13 +4186,13 @@
"_name": "finish",
"_objFlags": 0,
"_parent": {
"__id__": 78
"__id__": 79
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 90
"__id__": 91
}
],
"_prefab": null,
......@@ -4187,7 +4248,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 89
"__id__": 90
},
"_enabled": true,
"_clip": {
......@@ -4206,13 +4267,13 @@
"_name": "click",
"_objFlags": 0,
"_parent": {
"__id__": 78
"__id__": 79
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 92
"__id__": 93
}
],
"_prefab": null,
......@@ -4268,7 +4329,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 91
"__id__": 92
},
"_enabled": true,
"_clip": {
......@@ -4287,13 +4348,13 @@
"_name": "correct",
"_objFlags": 0,
"_parent": {
"__id__": 78
"__id__": 79
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 94
"__id__": 95
}
],
"_prefab": null,
......@@ -4349,7 +4410,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 93
"__id__": 94
},
"_enabled": true,
"_clip": {
......@@ -4368,13 +4429,13 @@
"_name": "incorrect",
"_objFlags": 0,
"_parent": {
"__id__": 78
"__id__": 79
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 96
"__id__": 97
}
],
"_prefab": null,
......@@ -4430,7 +4491,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 95
"__id__": 96
},
"_enabled": true,
"_clip": {
......@@ -4449,13 +4510,13 @@
"_name": "lack",
"_objFlags": 0,
"_parent": {
"__id__": 78
"__id__": 79
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 98
"__id__": 99
}
],
"_prefab": null,
......@@ -4511,7 +4572,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 97
"__id__": 98
},
"_enabled": true,
"_clip": {
......@@ -4530,13 +4591,13 @@
"_name": "painted",
"_objFlags": 0,
"_parent": {
"__id__": 78
"__id__": 79
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 100
"__id__": 101
}
],
"_prefab": null,
......@@ -4592,7 +4653,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 99
"__id__": 100
},
"_enabled": true,
"_clip": {
......@@ -4611,13 +4672,13 @@
"_name": "demo",
"_objFlags": 0,
"_parent": {
"__id__": 78
"__id__": 79
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 102
"__id__": 103
}
],
"_prefab": null,
......@@ -4673,7 +4734,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 101
"__id__": 102
},
"_enabled": true,
"_clip": {
......@@ -4692,13 +4753,13 @@
"_name": "star",
"_objFlags": 0,
"_parent": {
"__id__": 78
"__id__": 79
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 104
"__id__": 105
}
],
"_prefab": null,
......@@ -4754,7 +4815,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 103
"__id__": 104
},
"_enabled": true,
"_clip": null,
......@@ -4771,11 +4832,11 @@
"_name": "font",
"_objFlags": 0,
"_parent": {
"__id__": 74
"__id__": 75
},
"_children": [
{
"__id__": 106
"__id__": 107
}
],
"_active": false,
......@@ -4833,13 +4894,13 @@
"_name": "MMTextBook-Bold",
"_objFlags": 0,
"_parent": {
"__id__": 105
"__id__": 106
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 107
"__id__": 108
}
],
"_prefab": null,
......@@ -4895,7 +4956,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 106
"__id__": 107
},
"_enabled": true,
"_materials": [
......@@ -4934,19 +4995,19 @@
},
"_children": [
{
"__id__": 109
"__id__": 110
},
{
"__id__": 113
"__id__": 114
},
{
"__id__": 117
"__id__": 118
},
{
"__id__": 121
"__id__": 122
},
{
"__id__": 125
"__id__": 126
}
],
"_active": false,
......@@ -5004,11 +5065,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 108
"__id__": 109
},
"_children": [
{
"__id__": 110
"__id__": 111
}
],
"_active": true,
......@@ -5066,11 +5127,11 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 109
"__id__": 110
},
"_children": [
{
"__id__": 111
"__id__": 112
}
],
"_active": true,
......@@ -5128,13 +5189,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 110
"__id__": 111
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 112
"__id__": 113
}
],
"_prefab": null,
......@@ -5190,7 +5251,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 111
"__id__": 112
},
"_enabled": true,
"_materials": [
......@@ -5222,11 +5283,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 108
"__id__": 109
},
"_children": [
{
"__id__": 114
"__id__": 115
}
],
"_active": true,
......@@ -5284,11 +5345,11 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 113
"__id__": 114
},
"_children": [
{
"__id__": 115
"__id__": 116
}
],
"_active": true,
......@@ -5346,13 +5407,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 114
"__id__": 115
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 116
"__id__": 117
}
],
"_prefab": null,
......@@ -5408,7 +5469,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 115
"__id__": 116
},
"_enabled": true,
"_materials": [
......@@ -5440,11 +5501,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 108
"__id__": 109
},
"_children": [
{
"__id__": 118
"__id__": 119
}
],
"_active": true,
......@@ -5502,11 +5563,11 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 117
"__id__": 118
},
"_children": [
{
"__id__": 119
"__id__": 120
}
],
"_active": true,
......@@ -5564,13 +5625,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 118
"__id__": 119
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 120
"__id__": 121
}
],
"_prefab": null,
......@@ -5626,7 +5687,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 119
"__id__": 120
},
"_enabled": true,
"_materials": [
......@@ -5658,11 +5719,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 108
"__id__": 109
},
"_children": [
{
"__id__": 122
"__id__": 123
}
],
"_active": true,
......@@ -5720,11 +5781,11 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 121
"__id__": 122
},
"_children": [
{
"__id__": 123
"__id__": 124
}
],
"_active": true,
......@@ -5782,13 +5843,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 122
"__id__": 123
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 124
"__id__": 125
}
],
"_prefab": null,
......@@ -5844,7 +5905,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 123
"__id__": 124
},
"_enabled": true,
"_materials": [
......@@ -5876,11 +5937,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 108
"__id__": 109
},
"_children": [
{
"__id__": 126
"__id__": 127
}
],
"_active": true,
......@@ -5938,11 +5999,11 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 125
"__id__": 126
},
"_children": [
{
"__id__": 127
"__id__": 128
}
],
"_active": true,
......@@ -6000,13 +6061,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 126
"__id__": 127
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 128
"__id__": 129
}
],
"_prefab": null,
......@@ -6062,7 +6123,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 127
"__id__": 128
},
"_enabled": true,
"_materials": [
......@@ -6098,28 +6159,28 @@
},
"_children": [
{
"__id__": 130
"__id__": 131
},
{
"__id__": 132
"__id__": 133
},
{
"__id__": 134
"__id__": 135
},
{
"__id__": 136
"__id__": 137
},
{
"__id__": 138
"__id__": 139
},
{
"__id__": 140
"__id__": 141
},
{
"__id__": 142
"__id__": 143
},
{
"__id__": 144
"__id__": 145
}
],
"_active": false,
......@@ -6177,13 +6238,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 129
"__id__": 130
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 131
"__id__": 132
}
],
"_prefab": null,
......@@ -6239,7 +6300,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 130
"__id__": 131
},
"_enabled": true,
"_materials": [
......@@ -6271,13 +6332,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 129
"__id__": 130
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 133
"__id__": 134
}
],
"_prefab": null,
......@@ -6333,7 +6394,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 132
"__id__": 133
},
"_enabled": true,
"_materials": [
......@@ -6365,13 +6426,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 129
"__id__": 130
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 135
"__id__": 136
}
],
"_prefab": null,
......@@ -6427,7 +6488,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 134
"__id__": 135
},
"_enabled": true,
"_materials": [
......@@ -6459,13 +6520,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 129
"__id__": 130
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 137
"__id__": 138
}
],
"_prefab": null,
......@@ -6521,7 +6582,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 136
"__id__": 137
},
"_enabled": true,
"_materials": [
......@@ -6553,13 +6614,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 129
"__id__": 130
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 139
"__id__": 140
}
],
"_prefab": null,
......@@ -6615,7 +6676,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 138
"__id__": 139
},
"_enabled": true,
"_materials": [
......@@ -6647,13 +6708,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 129
"__id__": 130
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 141
"__id__": 142
}
],
"_prefab": null,
......@@ -6709,7 +6770,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 140
"__id__": 141
},
"_enabled": true,
"_materials": [
......@@ -6741,13 +6802,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 129
"__id__": 130
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 143
"__id__": 144
}
],
"_prefab": null,
......@@ -6803,7 +6864,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 142
"__id__": 143
},
"_enabled": true,
"_materials": [
......@@ -6835,13 +6896,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 129
"__id__": 130
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 145
"__id__": 146
}
],
"_prefab": null,
......@@ -6897,7 +6958,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 144
"__id__": 145
},
"_enabled": true,
"_materials": [
......
......@@ -408,7 +408,7 @@ cc.Class({
initView() {
this.initBgContainer();
this.initTitle();
this.initAudioPlayer();
this.initPanel();
......@@ -419,6 +419,14 @@ cc.Class({
},
initBgContainer() {
const bgContainer = cc.find('Canvas/bg_container');
const canvas = cc.find("Canvas");
const sx = canvas.width / bgContainer.width;
const sy = canvas.height / bgContainer.height;
bgContainer.scale = Math.min(sx, sy);
},
showBackBtn() {
const backBtn = cc.find('Canvas/back_btn');
backBtn.active = true;
......@@ -438,13 +446,13 @@ cc.Class({
initTitle() {
const title = cc.find('Canvas/bg/title');
const title = cc.find('Canvas/bg_container/title');
const titleLabel = title.getComponent(cc.Label);
titleLabel.string = this.data.title || '';
},
initAudioPlayer() {
const audioPlayer = cc.find('Canvas/bg/AudioPlayer');
const audioPlayer = cc.find('Canvas/bg_container/AudioPlayer');
const playBtn = cc.find('play', audioPlayer);
const pauseBtn = cc.find('pause', audioPlayer);
......@@ -464,7 +472,13 @@ cc.Class({
cc.assetManager.loadRemote(this.data.audio_url, (err, _audioClip) => {
audioClip = _audioClip;
this.totalTime = audioClip.duration;
setTimeout(() => {
if (this.isDestroy) {
return;
}
totalTimeLabel.string = this.formatTime(audioClip.duration * 1000);
}, 300);
});
let audioId;
......@@ -509,7 +523,7 @@ cc.Class({
if (!this.data.pic_url) {
return;
}
const panel = cc.find("Canvas/panel");
const panel = cc.find("Canvas/bg_container/panel");
this.canvas = cc.find("Canvas");
......@@ -544,28 +558,28 @@ cc.Class({
initColorPanel() {
const selectCircle = cc.find("Canvas/color_panel/select");
const selectCircle = cc.find("Canvas/bg_container/color_panel/select");
const colorArr = this.getColorArr();
// [
// '#FF6868',
// '#FFBB55',
// '#FAFF04',
// '#AAF50A',
// '#0DF0FF',
// '#3988FF',
// '#9E00FF',
// ];
console.log('colorArr: ', colorArr);
const disX = 120;
const colorPanel = cc.find('Canvas/color_panel');
const colorBtnBase = cc.find('Canvas/color_panel/color_btn');
const colorPanel = cc.find('Canvas/bg_container/color_panel');
const colorBtnBase = cc.find('Canvas/bg_container/color_panel/color_btn');
const colorObj = {};
let len = 0;
for (let i=0; i<colorArr.length; i++) {
const color = colorArr[i].code;
if (colorObj[colorArr[i].key]) {
continue;
}
colorObj[colorArr[i].key] = true;
len ++;
const colorBtn = cc.instantiate(colorBtnBase);
colorBtn.active = true;
colorBtn.parent = colorBtnBase.parent;
......@@ -587,11 +601,12 @@ cc.Class({
if (i == 0) {
this.curPaintColor = cc.Color.fromHEX(new cc.Color(), color);
this.curPaintColorCode = color;
selectCircle.x = colorBtn.x;
}
}
colorPanel.x = -(colorArr.length - 1) * disX / 2;
colorPanel.x = -(len - 1) * disX / 2;
},
......@@ -633,7 +648,7 @@ cc.Class({
formatTime(milliseconds) {
formatTime(milliseconds = 0) {
if (typeof milliseconds !== 'number' || isNaN(milliseconds) || milliseconds < 0) {
console.error('传入的不是一个有效的非负数值');
return null;
......
export const defaultData = {"title":"Choose your favorite color and paint it.","audio_url":"http://staging-teach.cdn.ireadabc.com/555083b19cc70078d2ece421b0619520.mp3","picArr":[{"pic_url":"http://staging-teach.cdn.ireadabc.com/90ce5433218c53cb580a57a04ce696f8.png","colorData":{"key":"Blue","value":"蓝色","code":"#3988FF"}},{"pic_url":"http://staging-teach.cdn.ireadabc.com/223b1e8fc317bd435397347f6756c79b.png","colorData":{"key":"Yellow","value":"黄色","code":"#FAFF04"}},{"pic_url":"http://staging-teach.cdn.ireadabc.com/2c4061df2a7d91590b17580d6a426e7b.png","colorData":{"key":"Pink","value":"粉色","code":"#FFC6EC"}},{"pic_url":"http://staging-teach.cdn.ireadabc.com/a89d9738d55bd7373e34141f4c1c3e65.png","colorData":{"key":"Purple","value":"紫色","code":"#9E00FF"}},{"pic_url":"http://staging-teach.cdn.ireadabc.com/ee942a82682b6d5929c7f0b7c9b2c071.png","colorData":{"key":"Green","value":"绿色","code":"#AAF50A"}}],"pic_url":"http://staging-teach.cdn.ireadabc.com/f4d9c566c17699ff7af21ec3beaa7d97.png","bgItem":{"url":"http://staging-teach.cdn.ireadabc.com/f4d9c566c17699ff7af21ec3beaa7d97.png","rect":{"x":405.12,"y":0,"width":1066.76,"height":717}},"hotZoneItemArr":[{"id":"1716804401017","index":0,"itemType":"rect","fontScaleX":1.46640625,"fontScaleY":1.46640625,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.46640625,"dragDot":{"x":938.5,"y":358.5},"gIdx":"0","posX":612.5,"posY":657.5,"labelArr":[{"key":"number","title":"序号","value":"1"}],"sizeW":56.99999999999999,"sizeH":56.99999999999999,"rect":{"x":178.88,"y":629,"width":57,"height":57}},{"id":"1716804410047","index":1,"itemType":"rect","fontScaleX":1.46640625,"fontScaleY":1.46640625,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.46640625,"dragDot":{"x":938.5,"y":358.5},"gIdx":"0","posX":872.5011925785761,"posY":576.4975947226569,"labelArr":[{"key":"number","title":"序号","value":"2"}],"sizeW":56.99979148165999,"sizeH":56.99979148165999,"rect":{"x":438.88,"y":548,"width":57,"height":57}},{"id":"1716804421092","index":2,"itemType":"rect","fontScaleX":1.46640625,"fontScaleY":1.46640625,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.46640625,"dragDot":{"x":938.5,"y":358.5},"gIdx":"0","posX":619.5002414422884,"posY":386.49789103819273,"labelArr":[{"key":"number","title":"序号","value":"3"}],"sizeW":56.99979148165999,"sizeH":56.99979148165999,"rect":{"x":185.88,"y":358,"width":57,"height":57}},{"id":"1716804428169","index":3,"itemType":"rect","fontScaleX":1.46640625,"fontScaleY":1.46640625,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.46640625,"dragDot":{"x":938.5,"y":358.5},"gIdx":"0","posX":1142.5011669710607,"posY":512.4985860993261,"labelArr":[{"key":"number","title":"序号","value":"4"}],"sizeW":56.99979148165999,"sizeH":56.99979148165999,"rect":{"x":708.88,"y":484,"width":57,"height":57}},{"id":"1716804439994","index":4,"itemType":"rect","fontScaleX":1.46640625,"fontScaleY":1.46640625,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.46640625,"dragDot":{"x":938.5,"y":358.5},"gIdx":"0","posX":1228.4992537238356,"posY":270.49812516404813,"labelArr":[{"key":"number","title":"序号","value":"5"}],"sizeW":56.99979148165999,"sizeH":56.99979148165999,"rect":{"x":794.88,"y":242,"width":57,"height":57}}]}
export const defaultData = {"title":"Choose your favorite color and paint it.","audio_url":"http://staging-teach.cdn.ireadabc.com/555083b19cc70078d2ece421b0619520.mp3","picArr":[{"pic_url":"http://staging-teach.cdn.ireadabc.com/90ce5433218c53cb580a57a04ce696f8.png","colorData":{"key":"Blue","value":"蓝色","code":"#3988FF"}},{"pic_url":"http://staging-teach.cdn.ireadabc.com/223b1e8fc317bd435397347f6756c79b.png","colorData":{"key":"Yellow","value":"黄色","code":"#FAFF04"}},{"pic_url":"http://staging-teach.cdn.ireadabc.com/2c4061df2a7d91590b17580d6a426e7b.png","colorData":{"key":"Pink","value":"粉色","code":"#FFC6EC"}},{"pic_url":"http://staging-teach.cdn.ireadabc.com/a89d9738d55bd7373e34141f4c1c3e65.png","colorData":{"key":"Purple","value":"紫色","code":"#9E00FF"}},{"pic_url":"http://staging-teach.cdn.ireadabc.com/ee942a82682b6d5929c7f0b7c9b2c071.png","colorData":{"key":"Yellow","value":"黄色","code":"#FAFF04"}}],"pic_url":"http://staging-teach.cdn.ireadabc.com/f4d9c566c17699ff7af21ec3beaa7d97.png","bgItem":{"url":"http://staging-teach.cdn.ireadabc.com/f4d9c566c17699ff7af21ec3beaa7d97.png","rect":{"x":405.12,"y":0,"width":1066.76,"height":717}},"hotZoneItemArr":[{"id":"1716804401017","index":0,"itemType":"rect","fontScaleX":1.46640625,"fontScaleY":1.46640625,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.46640625,"dragDot":{"x":938.5,"y":358.5},"gIdx":"0","posX":612.5,"posY":657.5,"labelArr":[{"key":"number","title":"序号","value":"1"}],"sizeW":56.99999999999999,"sizeH":56.99999999999999,"rect":{"x":178.88,"y":629,"width":57,"height":57}},{"id":"1716804410047","index":1,"itemType":"rect","fontScaleX":1.46640625,"fontScaleY":1.46640625,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.46640625,"dragDot":{"x":938.5,"y":358.5},"gIdx":"0","posX":872.5011925785761,"posY":576.4975947226569,"labelArr":[{"key":"number","title":"序号","value":"2"}],"sizeW":56.99979148165999,"sizeH":56.99979148165999,"rect":{"x":438.88,"y":548,"width":57,"height":57}},{"id":"1716804421092","index":2,"itemType":"rect","fontScaleX":1.46640625,"fontScaleY":1.46640625,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.46640625,"dragDot":{"x":938.5,"y":358.5},"gIdx":"0","posX":619.5002414422884,"posY":386.49789103819273,"labelArr":[{"key":"number","title":"序号","value":"3"}],"sizeW":56.99979148165999,"sizeH":56.99979148165999,"rect":{"x":185.88,"y":358,"width":57,"height":57}},{"id":"1716804428169","index":3,"itemType":"rect","fontScaleX":1.46640625,"fontScaleY":1.46640625,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.46640625,"dragDot":{"x":938.5,"y":358.5},"gIdx":"0","posX":1142.5011669710607,"posY":512.4985860993261,"labelArr":[{"key":"number","title":"序号","value":"4"}],"sizeW":56.99979148165999,"sizeH":56.99979148165999,"rect":{"x":708.88,"y":484,"width":57,"height":57}},{"id":"1716804439994","index":4,"itemType":"rect","fontScaleX":1.46640625,"fontScaleY":1.46640625,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.46640625,"dragDot":{"x":938.5,"y":358.5},"gIdx":"0","posX":1228.4992537238356,"posY":270.49812516404813,"labelArr":[{"key":"number","title":"序号","value":"5"}],"sizeW":56.99979148165999,"sizeH":56.99979148165999,"rect":{"x":794.88,"y":242,"width":57,"height":57}}]}
// {"title":"Choose your favorite color and paint it.","audio_url":"http://staging-teach.cdn.ireadabc.com/555083b19cc70078d2ece421b0619520.mp3","picArr":[{"pic_url":"http://staging-teach.cdn.ireadabc.com/47cbc362bdda20a5a15a5c9012174e8f.png"},{"pic_url":"http://staging-teach.cdn.ireadabc.com/d1f337cde81bbe6570e3c4c6989d64fd.png"}],"pic_url":"http://staging-teach.cdn.ireadabc.com/c30eef64a4d7d75972e7bd9ffa8e71cf.png"}
......
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