Commit 06da72b5 authored by limingzhe's avatar limingzhe

fix: debug

parent c9f6b7c7
...@@ -17,13 +17,13 @@ ...@@ -17,13 +17,13 @@
"__id__": 2 "__id__": 2
}, },
{ {
"__id__": 75 "__id__": 86
}, },
{ {
"__id__": 109 "__id__": 122
}, },
{ {
"__id__": 130 "__id__": 143
} }
], ],
"_active": false, "_active": false,
...@@ -90,22 +90,22 @@ ...@@ -90,22 +90,22 @@
"__id__": 11 "__id__": 11
}, },
{ {
"__id__": 57 "__id__": 68
}, },
{ {
"__id__": 59 "__id__": 70
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 72 "__id__": 83
}, },
{ {
"__id__": 73 "__id__": 84
}, },
{ {
"__id__": 74 "__id__": 85
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -517,10 +517,19 @@ ...@@ -517,10 +517,19 @@
"__id__": 15 "__id__": 15
}, },
{ {
"__id__": 32 "__id__": 37
}, },
{ {
"__id__": 34 "__id__": 39
},
{
"__id__": 41
},
{
"__id__": 43
},
{
"__id__": 45
} }
], ],
"_active": true, "_active": true,
...@@ -536,7 +545,7 @@ ...@@ -536,7 +545,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 922, "width": 1157,
"height": 764 "height": 764
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -575,13 +584,13 @@ ...@@ -575,13 +584,13 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "title", "_name": "New Sprite(Splash)",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 11 "__id__": 11
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 13 "__id__": 13
...@@ -592,6 +601,199 @@ ...@@ -592,6 +601,199 @@
], ],
"_prefab": null, "_prefab": null,
"_opacity": 255, "_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1157,
"height": 764
},
"_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": "a8sk6somJDaLoXDGfTEzG0"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 12
},
"_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": "e0YB84DbFIwIIcPG11mJy0"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 12
},
"_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": "12FVX/vjlEQ7LPfEAxY0CI"
},
{
"__type__": "cc.Node",
"_name": "top_part",
"_objFlags": 0,
"_parent": {
"__id__": 11
},
"_children": [
{
"__id__": 16
},
{
"__id__": 19
}
],
"_active": true,
"_components": [
{
"__id__": 36
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 663.875,
"height": 93.1
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-29.191,
332.774,
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": "16SZL2/GtHpbbPFN2cGOuf"
},
{
"__type__": "cc.Node",
"_name": "title",
"_objFlags": 0,
"_parent": {
"__id__": 15
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 17
},
{
"__id__": 18
}
],
"_prefab": null,
"_opacity": 255,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 33, "r": 33,
...@@ -601,8 +803,8 @@ ...@@ -601,8 +803,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 62.25, "width": 54.47,
"height": 50.4 "height": 44.1
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -614,7 +816,7 @@ ...@@ -614,7 +816,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
340.698, 24.499999999999996,
0, 0,
0, 0,
0, 0,
...@@ -643,7 +845,7 @@ ...@@ -643,7 +845,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 12 "__id__": 16
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -655,8 +857,8 @@ ...@@ -655,8 +857,8 @@
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "title", "_string": "title",
"_N$string": "title", "_N$string": "title",
"_fontSize": 40, "_fontSize": 35,
"_lineHeight": 40, "_lineHeight": 35,
"_enableWrapText": true, "_enableWrapText": true,
"_N$file": null, "_N$file": null,
"_isSystemFontUsed": true, "_isSystemFontUsed": true,
...@@ -676,7 +878,7 @@ ...@@ -676,7 +878,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 12 "__id__": 16
}, },
"_enabled": false, "_enabled": false,
"alignMode": 1, "alignMode": 1,
...@@ -703,29 +905,29 @@ ...@@ -703,29 +905,29 @@
"_name": "AudioPlayer", "_name": "AudioPlayer",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 11 "__id__": 15
}, },
"_children": [ "_children": [
{ {
"__id__": 16 "__id__": 20
}, },
{ {
"__id__": 18 "__id__": 22
}, },
{ {
"__id__": 20 "__id__": 24
}, },
{ {
"__id__": 22 "__id__": 26
}, },
{ {
"__id__": 29 "__id__": 33
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 31 "__id__": 35
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -739,8 +941,8 @@ ...@@ -739,8 +941,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 0, "width": 526.625,
"height": 0 "height": 44
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -752,7 +954,7 @@ ...@@ -752,7 +954,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
270.123, -24.550000000000004,
0, 0,
0, 0,
0, 0,
...@@ -781,13 +983,13 @@ ...@@ -781,13 +983,13 @@
"_name": "curTime", "_name": "curTime",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 15 "__id__": 19
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 17 "__id__": 21
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -813,7 +1015,7 @@ ...@@ -813,7 +1015,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-207.281, -182.725,
1.058, 1.058,
0, 0,
0, 0,
...@@ -843,7 +1045,7 @@ ...@@ -843,7 +1045,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 16 "__id__": 20
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -876,13 +1078,13 @@ ...@@ -876,13 +1078,13 @@
"_name": "play", "_name": "play",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 15 "__id__": 19
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 19 "__id__": 23
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -908,7 +1110,7 @@ ...@@ -908,7 +1110,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-263.58, -239.024,
0, 0,
0, 0,
0, 0,
...@@ -938,7 +1140,7 @@ ...@@ -938,7 +1140,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 18 "__id__": 22
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -970,13 +1172,13 @@ ...@@ -970,13 +1172,13 @@
"_name": "pause", "_name": "pause",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 15 "__id__": 19
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 21 "__id__": 25
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1002,7 +1204,7 @@ ...@@ -1002,7 +1204,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-263.58, -239.024,
0, 0,
0, 0,
0, 0,
...@@ -1032,7 +1234,7 @@ ...@@ -1032,7 +1234,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 20 "__id__": 24
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1064,23 +1266,23 @@ ...@@ -1064,23 +1266,23 @@
"_name": "timeBar", "_name": "timeBar",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 15 "__id__": 19
}, },
"_children": [ "_children": [
{ {
"__id__": 23 "__id__": 27
}, },
{ {
"__id__": 25 "__id__": 29
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 27 "__id__": 31
}, },
{ {
"__id__": 28 "__id__": 32
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1106,7 +1308,7 @@ ...@@ -1106,7 +1308,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 24.556,
0, 0,
0, 0,
0, 0,
...@@ -1136,13 +1338,13 @@ ...@@ -1136,13 +1338,13 @@
"_name": "bar", "_name": "bar",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 22 "__id__": 26
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 24 "__id__": 28
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1198,7 +1400,7 @@ ...@@ -1198,7 +1400,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 23 "__id__": 27
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1230,13 +1432,13 @@ ...@@ -1230,13 +1432,13 @@
"_name": "progressBtn", "_name": "progressBtn",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 22 "__id__": 26
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 26 "__id__": 30
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1292,7 +1494,7 @@ ...@@ -1292,7 +1494,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 25 "__id__": 29
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1324,7 +1526,7 @@ ...@@ -1324,7 +1526,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 22 "__id__": 26
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1356,12 +1558,12 @@ ...@@ -1356,12 +1558,12 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 22 "__id__": 26
}, },
"_enabled": true, "_enabled": true,
"_N$totalLength": 342, "_N$totalLength": 342,
"_N$barSprite": { "_N$barSprite": {
"__id__": 24 "__id__": 28
}, },
"_N$mode": 0, "_N$mode": 0,
"_N$progress": 0, "_N$progress": 0,
...@@ -1373,28 +1575,370 @@ ...@@ -1373,28 +1575,370 @@
"_name": "totalTime", "_name": "totalTime",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 19
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 34
}
],
"_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": [
230.897,
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__": 33
},
"_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__": 19
},
"_enabled": false,
"alignMode": 1,
"_target": null,
"_alignFlags": 0,
"_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.Layout",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 15 "__id__": 15
}, },
"_enabled": true,
"_layoutSize": {
"__type__": "cc.Size",
"width": 663.875,
"height": 93.1
},
"_resize": 1,
"_N$layoutType": 2,
"_N$cellSize": {
"__type__": "cc.Size",
"width": 40,
"height": 40
},
"_N$startAxis": 0,
"_N$paddingLeft": 10,
"_N$paddingRight": 5,
"_N$paddingTop": 0,
"_N$paddingBottom": 0,
"_N$spacingX": 60,
"_N$spacingY": 5,
"_N$verticalDirection": 1,
"_N$horizontalDirection": 0,
"_N$affectedByScale": false,
"_id": "be0yBFHLNACKYesqHJ7r4Y"
},
{
"__type__": "cc.Node",
"_name": "top_part",
"_objFlags": 0,
"_parent": {
"__id__": 11
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 38
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 300,
"height": 59
},
"_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": "46r+Rq7dtDHrC6QyT0Is6c"
},
{
"__type__": "cc.Layout",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 37
},
"_enabled": true,
"_layoutSize": {
"__type__": "cc.Size",
"width": 300,
"height": 59
},
"_resize": 2,
"_N$layoutType": 1,
"_N$cellSize": {
"__type__": "cc.Size",
"width": 40,
"height": 40
},
"_N$startAxis": 0,
"_N$paddingLeft": 0,
"_N$paddingRight": 0,
"_N$paddingTop": 0,
"_N$paddingBottom": 0,
"_N$spacingX": 0,
"_N$spacingY": 0,
"_N$verticalDirection": 1,
"_N$horizontalDirection": 0,
"_N$affectedByScale": false,
"_id": "d4UpHJ/D5N45cBYZlOYDFe"
},
{
"__type__": "cc.Node",
"_name": "panel",
"_objFlags": 0,
"_parent": {
"__id__": 11
},
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 30 "__id__": 40
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1036,
"height": 698
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-74.306,
-54.13,
0,
0,
0,
0,
1,
0.95,
0.95,
0.9
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "1aBs90rxNJzpxVsuA8MHNV"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 39
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 1,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "f36fe91c-b267-44db-9481-dab1f9a46272"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "b30mTzkrRFh5Uk2OERRaGY"
},
{
"__type__": "cc.Node",
"_name": "panel_mask",
"_objFlags": 0,
"_parent": {
"__id__": 11
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 42
} }
], ],
"_prefab": null, "_prefab": null,
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 33, "r": 255,
"g": 33, "g": 255,
"b": 33, "b": 255,
"a": 255 "a": 255
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 50.05, "width": 1036,
"height": 50.4 "height": 698
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1405,8 +1949,8 @@ ...@@ -1405,8 +1949,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
206.341, -74.306,
1.058, -54.13,
0, 0,
0, 0,
0, 0,
...@@ -1428,80 +1972,30 @@ ...@@ -1428,80 +1972,30 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "b7nS2L5Q9H9Z2hjFDZ9ymx" "_id": "0bFfUGR7pE3YOJoHsK/Bi2"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.BlockInputEvents",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 29 "__id__": 41
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_id": "baLUf72QNNaaXRb3EiAui7"
{
"__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__": 15
},
"_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.Node", "__type__": "cc.Node",
"_name": "panel", "_name": "panel_old",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 11 "__id__": 11
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 33 "__id__": 44
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1515,8 +2009,8 @@ ...@@ -1515,8 +2009,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 985, "width": 1227,
"height": 518 "height": 643
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1528,15 +2022,15 @@ ...@@ -1528,15 +2022,15 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
0.273, -51.653,
0, 0,
0, 0,
0, 0,
0, 0,
1, 1,
0.9, 1,
0.9, 1,
0.9 1
] ]
}, },
"_eulerAngles": { "_eulerAngles": {
...@@ -1550,14 +2044,14 @@ ...@@ -1550,14 +2044,14 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "1aBs90rxNJzpxVsuA8MHNV" "_id": "b6aX4FBMBDgZRC0ch30nzN"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 32 "__id__": 43
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1568,7 +2062,7 @@ ...@@ -1568,7 +2062,7 @@
"_srcBlendFactor": 1, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "f36fe91c-b267-44db-9481-dab1f9a46272" "__uuid__": "d87c71ec-01d9-4144-b05d-210b752a7a81"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -1582,7 +2076,7 @@ ...@@ -1582,7 +2076,7 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "b30mTzkrRFh5Uk2OERRaGY" "_id": "dbCLMn1zJFDbuXytXXMHA4"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
...@@ -1593,37 +2087,37 @@ ...@@ -1593,37 +2087,37 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 35 "__id__": 46
}, },
{ {
"__id__": 37 "__id__": 48
}, },
{ {
"__id__": 39 "__id__": 50
}, },
{ {
"__id__": 41 "__id__": 52
}, },
{ {
"__id__": 43 "__id__": 54
}, },
{ {
"__id__": 45 "__id__": 56
}, },
{ {
"__id__": 47 "__id__": 58
}, },
{ {
"__id__": 49 "__id__": 60
}, },
{ {
"__id__": 51 "__id__": 62
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 56 "__id__": 67
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1649,8 +2143,8 @@ ...@@ -1649,8 +2143,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 505.548,
-295.944, 205.623,
0, 0,
0, 0,
0, 0,
...@@ -1679,13 +2173,13 @@ ...@@ -1679,13 +2173,13 @@
"_name": "select", "_name": "select",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 34 "__id__": 45
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 36 "__id__": 47
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1718,8 +2212,8 @@ ...@@ -1718,8 +2212,8 @@
0, 0,
0, 0,
1, 1,
1, 1.2,
1, 1.2,
1 1
] ]
}, },
...@@ -1741,7 +2235,7 @@ ...@@ -1741,7 +2235,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 35 "__id__": 46
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1773,13 +2267,13 @@ ...@@ -1773,13 +2267,13 @@
"_name": "color_1", "_name": "color_1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 34 "__id__": 45
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 38 "__id__": 49
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1835,7 +2329,7 @@ ...@@ -1835,7 +2329,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 37 "__id__": 48
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1867,13 +2361,13 @@ ...@@ -1867,13 +2361,13 @@
"_name": "color_2", "_name": "color_2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 34 "__id__": 45
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 40 "__id__": 51
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1929,7 +2423,7 @@ ...@@ -1929,7 +2423,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 39 "__id__": 50
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1961,13 +2455,13 @@ ...@@ -1961,13 +2455,13 @@
"_name": "color_3", "_name": "color_3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 34 "__id__": 45
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 42 "__id__": 53
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2023,7 +2517,7 @@ ...@@ -2023,7 +2517,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 41 "__id__": 52
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2055,13 +2549,13 @@ ...@@ -2055,13 +2549,13 @@
"_name": "color_4", "_name": "color_4",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 34 "__id__": 45
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 44 "__id__": 55
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2117,7 +2611,7 @@ ...@@ -2117,7 +2611,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 43 "__id__": 54
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2149,13 +2643,13 @@ ...@@ -2149,13 +2643,13 @@
"_name": "color_5", "_name": "color_5",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 34 "__id__": 45
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 46 "__id__": 57
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2211,7 +2705,7 @@ ...@@ -2211,7 +2705,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 45 "__id__": 56
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2243,13 +2737,13 @@ ...@@ -2243,13 +2737,13 @@
"_name": "color_6", "_name": "color_6",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 34 "__id__": 45
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 48 "__id__": 59
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2305,7 +2799,7 @@ ...@@ -2305,7 +2799,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 47 "__id__": 58
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2337,13 +2831,13 @@ ...@@ -2337,13 +2831,13 @@
"_name": "color_7", "_name": "color_7",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 34 "__id__": 45
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 50 "__id__": 61
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2399,7 +2893,7 @@ ...@@ -2399,7 +2893,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 49 "__id__": 60
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2431,14 +2925,14 @@ ...@@ -2431,14 +2925,14 @@
"_name": "color_btn", "_name": "color_btn",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 34 "__id__": 45
}, },
"_children": [ "_children": [
{ {
"__id__": 52 "__id__": 63
}, },
{ {
"__id__": 54 "__id__": 65
} }
], ],
"_active": false, "_active": false,
...@@ -2496,13 +2990,13 @@ ...@@ -2496,13 +2990,13 @@
"_name": "spr", "_name": "spr",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 51 "__id__": 62
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 53 "__id__": 64
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2558,7 +3052,7 @@ ...@@ -2558,7 +3052,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 52 "__id__": 63
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2590,13 +3084,13 @@ ...@@ -2590,13 +3084,13 @@
"_name": "label", "_name": "label",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 51 "__id__": 62
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 55 "__id__": 66
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2623,7 +3117,7 @@ ...@@ -2623,7 +3117,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
-68.371, -66.371,
0, 0,
0, 0,
0, 0,
...@@ -2652,7 +3146,7 @@ ...@@ -2652,7 +3146,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 54 "__id__": 65
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2687,7 +3181,7 @@ ...@@ -2687,7 +3181,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 34 "__id__": 45
}, },
"_enabled": false, "_enabled": false,
"alignMode": 1, "alignMode": 1,
...@@ -2720,7 +3214,7 @@ ...@@ -2720,7 +3214,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 58 "__id__": 69
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2776,7 +3270,7 @@ ...@@ -2776,7 +3270,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 57 "__id__": 68
}, },
"_enabled": true, "_enabled": true,
"_cullingMask": 0, "_cullingMask": 0,
...@@ -2816,13 +3310,13 @@ ...@@ -2816,13 +3310,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 60 "__id__": 71
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 71 "__id__": 82
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2878,23 +3372,23 @@ ...@@ -2878,23 +3372,23 @@
"_name": "editBox", "_name": "editBox",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 59 "__id__": 70
}, },
"_children": [ "_children": [
{ {
"__id__": 61 "__id__": 72
}, },
{ {
"__id__": 64 "__id__": 75
}, },
{ {
"__id__": 67 "__id__": 78
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 70 "__id__": 81
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2950,16 +3444,16 @@ ...@@ -2950,16 +3444,16 @@
"_name": "BACKGROUND_SPRITE", "_name": "BACKGROUND_SPRITE",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 60 "__id__": 71
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 62 "__id__": 73
}, },
{ {
"__id__": 63 "__id__": 74
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3015,7 +3509,7 @@ ...@@ -3015,7 +3509,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 61 "__id__": 72
}, },
"_enabled": false, "_enabled": false,
"_materials": [ "_materials": [
...@@ -3047,7 +3541,7 @@ ...@@ -3047,7 +3541,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 61 "__id__": 72
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 0,
...@@ -3074,16 +3568,16 @@ ...@@ -3074,16 +3568,16 @@
"_name": "TEXT_LABEL", "_name": "TEXT_LABEL",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 60 "__id__": 71
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 65 "__id__": 76
}, },
{ {
"__id__": 66 "__id__": 77
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3139,7 +3633,7 @@ ...@@ -3139,7 +3633,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 64 "__id__": 75
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -3170,7 +3664,7 @@ ...@@ -3170,7 +3664,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 64 "__id__": 75
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 0,
...@@ -3197,16 +3691,16 @@ ...@@ -3197,16 +3691,16 @@
"_name": "PLACEHOLDER_LABEL", "_name": "PLACEHOLDER_LABEL",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 60 "__id__": 71
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 68 "__id__": 79
}, },
{ {
"__id__": 69 "__id__": 80
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3262,7 +3756,7 @@ ...@@ -3262,7 +3756,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 67 "__id__": 78
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3295,7 +3789,7 @@ ...@@ -3295,7 +3789,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 67 "__id__": 78
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 0,
...@@ -3322,7 +3816,7 @@ ...@@ -3322,7 +3816,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 60 "__id__": 71
}, },
"_enabled": true, "_enabled": true,
"_string": "", "_string": "",
...@@ -3334,13 +3828,13 @@ ...@@ -3334,13 +3828,13 @@
"editingDidEnded": [], "editingDidEnded": [],
"editingReturn": [], "editingReturn": [],
"_N$textLabel": { "_N$textLabel": {
"__id__": 65 "__id__": 76
}, },
"_N$placeholderLabel": { "_N$placeholderLabel": {
"__id__": 68 "__id__": 79
}, },
"_N$background": { "_N$background": {
"__id__": 62 "__id__": 73
}, },
"_N$inputFlag": 5, "_N$inputFlag": 5,
"_N$inputMode": 2, "_N$inputMode": 2,
...@@ -3352,7 +3846,7 @@ ...@@ -3352,7 +3846,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 59 "__id__": 70
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3467,13 +3961,78 @@ ...@@ -3467,13 +3961,78 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 76 "__id__": 87
}, },
{ {
"__id__": 79 "__id__": 92
},
{
"__id__": 119
}
],
"_active": false,
"_components": [],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 0,
"height": 0
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
1088,
-546.971,
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": "0aAzbH6R1E+6AmGRrkKa5O"
},
{
"__type__": "cc.Node",
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 86
},
"_children": [
{
"__id__": 88
}, },
{ {
"__id__": 106 "__id__": 90
} }
], ],
"_active": false, "_active": false,
...@@ -3501,8 +4060,8 @@ ...@@ -3501,8 +4060,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
1088, -2453.528,
-546.971, 0,
0, 0,
0, 0,
0, 0,
...@@ -3524,22 +4083,22 @@ ...@@ -3524,22 +4083,22 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "0aAzbH6R1E+6AmGRrkKa5O" "_id": "53LUHHG2pEr79fyrvazXJs"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "img", "_name": "X",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 75 "__id__": 87
}, },
"_children": [ "_children": [],
"_active": true,
"_components": [
{ {
"__id__": 77 "__id__": 89
} }
], ],
"_active": false,
"_components": [],
"_prefab": null, "_prefab": null,
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -3551,8 +4110,8 @@ ...@@ -3551,8 +4110,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 0, "width": 22,
"height": 0 "height": 23
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -3563,7 +4122,7 @@ ...@@ -3563,7 +4122,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-2453.528, 0,
0, 0,
0, 0,
0, 0,
...@@ -3586,20 +4145,48 @@ ...@@ -3586,20 +4145,48 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "53LUHHG2pEr79fyrvazXJs" "_id": "ffge1eeNFDT7H1FIc0Fh5w"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 88
},
"_enabled": true,
"_materials": [],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "0d9479a8-eec8-4a2c-aa94-cc90afc6fee3"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "e1KtuBF1pM4KlVJqlBknw0"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "input_bg", "_name": "input_bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 76 "__id__": 87
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 78 "__id__": 91
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3655,7 +4242,7 @@ ...@@ -3655,7 +4242,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 77 "__id__": 90
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -3683,47 +4270,47 @@ ...@@ -3683,47 +4270,47 @@
"_name": "audio", "_name": "audio",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 75 "__id__": 86
}, },
"_children": [ "_children": [
{ {
"__id__": 80 "__id__": 93
}, },
{ {
"__id__": 82 "__id__": 95
}, },
{ {
"__id__": 84 "__id__": 97
}, },
{ {
"__id__": 86 "__id__": 99
}, },
{ {
"__id__": 88 "__id__": 101
}, },
{ {
"__id__": 90 "__id__": 103
}, },
{ {
"__id__": 92 "__id__": 105
}, },
{ {
"__id__": 94 "__id__": 107
}, },
{ {
"__id__": 96 "__id__": 109
}, },
{ {
"__id__": 98 "__id__": 111
}, },
{ {
"__id__": 100 "__id__": 113
}, },
{ {
"__id__": 102 "__id__": 115
}, },
{ {
"__id__": 104 "__id__": 117
} }
], ],
"_active": true, "_active": true,
...@@ -3781,13 +4368,13 @@ ...@@ -3781,13 +4368,13 @@
"_name": "right", "_name": "right",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 79 "__id__": 92
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 81 "__id__": 94
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3843,7 +4430,7 @@ ...@@ -3843,7 +4430,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 80 "__id__": 93
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -3862,13 +4449,13 @@ ...@@ -3862,13 +4449,13 @@
"_name": "wrong", "_name": "wrong",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 79 "__id__": 92
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 83 "__id__": 96
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3924,7 +4511,7 @@ ...@@ -3924,7 +4511,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 82 "__id__": 95
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -3943,13 +4530,13 @@ ...@@ -3943,13 +4530,13 @@
"_name": "a_o", "_name": "a_o",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 79 "__id__": 92
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 85 "__id__": 98
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4005,7 +4592,7 @@ ...@@ -4005,7 +4592,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 84 "__id__": 97
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -4024,13 +4611,13 @@ ...@@ -4024,13 +4611,13 @@
"_name": "select", "_name": "select",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 79 "__id__": 92
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 87 "__id__": 100
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4086,7 +4673,7 @@ ...@@ -4086,7 +4673,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 86 "__id__": 99
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -4105,13 +4692,13 @@ ...@@ -4105,13 +4692,13 @@
"_name": "button", "_name": "button",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 79 "__id__": 92
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 89 "__id__": 102
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4167,7 +4754,7 @@ ...@@ -4167,7 +4754,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 88 "__id__": 101
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -4186,13 +4773,13 @@ ...@@ -4186,13 +4773,13 @@
"_name": "finish", "_name": "finish",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 79 "__id__": 92
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 91 "__id__": 104
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4248,7 +4835,7 @@ ...@@ -4248,7 +4835,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 90 "__id__": 103
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -4267,13 +4854,13 @@ ...@@ -4267,13 +4854,13 @@
"_name": "click", "_name": "click",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 79 "__id__": 92
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 93 "__id__": 106
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4329,7 +4916,7 @@ ...@@ -4329,7 +4916,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 92 "__id__": 105
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -4348,13 +4935,13 @@ ...@@ -4348,13 +4935,13 @@
"_name": "correct", "_name": "correct",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 79 "__id__": 92
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 95 "__id__": 108
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4410,7 +4997,7 @@ ...@@ -4410,7 +4997,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 94 "__id__": 107
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -4429,13 +5016,13 @@ ...@@ -4429,13 +5016,13 @@
"_name": "incorrect", "_name": "incorrect",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 79 "__id__": 92
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 97 "__id__": 110
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4491,7 +5078,7 @@ ...@@ -4491,7 +5078,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 96 "__id__": 109
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -4510,13 +5097,13 @@ ...@@ -4510,13 +5097,13 @@
"_name": "lack", "_name": "lack",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 79 "__id__": 92
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 99 "__id__": 112
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4572,7 +5159,7 @@ ...@@ -4572,7 +5159,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 98 "__id__": 111
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -4591,13 +5178,13 @@ ...@@ -4591,13 +5178,13 @@
"_name": "painted", "_name": "painted",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 79 "__id__": 92
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 101 "__id__": 114
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4653,7 +5240,7 @@ ...@@ -4653,7 +5240,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 100 "__id__": 113
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -4672,13 +5259,13 @@ ...@@ -4672,13 +5259,13 @@
"_name": "demo", "_name": "demo",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 79 "__id__": 92
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 103 "__id__": 116
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4734,7 +5321,7 @@ ...@@ -4734,7 +5321,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 102 "__id__": 115
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -4753,13 +5340,13 @@ ...@@ -4753,13 +5340,13 @@
"_name": "star", "_name": "star",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 79 "__id__": 92
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 105 "__id__": 118
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4815,7 +5402,7 @@ ...@@ -4815,7 +5402,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 104 "__id__": 117
}, },
"_enabled": true, "_enabled": true,
"_clip": null, "_clip": null,
...@@ -4832,11 +5419,11 @@ ...@@ -4832,11 +5419,11 @@
"_name": "font", "_name": "font",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 75 "__id__": 86
}, },
"_children": [ "_children": [
{ {
"__id__": 107 "__id__": 120
} }
], ],
"_active": false, "_active": false,
...@@ -4894,13 +5481,13 @@ ...@@ -4894,13 +5481,13 @@
"_name": "MMTextBook-Bold", "_name": "MMTextBook-Bold",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 106 "__id__": 119
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 108 "__id__": 121
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4956,7 +5543,7 @@ ...@@ -4956,7 +5543,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 107 "__id__": 120
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4995,19 +5582,19 @@ ...@@ -4995,19 +5582,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 110 "__id__": 123
}, },
{ {
"__id__": 114 "__id__": 127
}, },
{ {
"__id__": 118 "__id__": 131
}, },
{ {
"__id__": 122 "__id__": 135
}, },
{ {
"__id__": 126 "__id__": 139
} }
], ],
"_active": false, "_active": false,
...@@ -5065,11 +5652,11 @@ ...@@ -5065,11 +5652,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 109 "__id__": 122
}, },
"_children": [ "_children": [
{ {
"__id__": 111 "__id__": 124
} }
], ],
"_active": true, "_active": true,
...@@ -5127,11 +5714,11 @@ ...@@ -5127,11 +5714,11 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 110 "__id__": 123
}, },
"_children": [ "_children": [
{ {
"__id__": 112 "__id__": 125
} }
], ],
"_active": true, "_active": true,
...@@ -5189,13 +5776,13 @@ ...@@ -5189,13 +5776,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 111 "__id__": 124
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 113 "__id__": 126
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5251,7 +5838,7 @@ ...@@ -5251,7 +5838,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 112 "__id__": 125
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5283,11 +5870,11 @@ ...@@ -5283,11 +5870,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 109 "__id__": 122
}, },
"_children": [ "_children": [
{ {
"__id__": 115 "__id__": 128
} }
], ],
"_active": true, "_active": true,
...@@ -5345,11 +5932,11 @@ ...@@ -5345,11 +5932,11 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 114 "__id__": 127
}, },
"_children": [ "_children": [
{ {
"__id__": 116 "__id__": 129
} }
], ],
"_active": true, "_active": true,
...@@ -5407,13 +5994,13 @@ ...@@ -5407,13 +5994,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 115 "__id__": 128
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 117 "__id__": 130
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5469,7 +6056,7 @@ ...@@ -5469,7 +6056,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 116 "__id__": 129
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5501,11 +6088,11 @@ ...@@ -5501,11 +6088,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 109 "__id__": 122
}, },
"_children": [ "_children": [
{ {
"__id__": 119 "__id__": 132
} }
], ],
"_active": true, "_active": true,
...@@ -5563,11 +6150,11 @@ ...@@ -5563,11 +6150,11 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 118 "__id__": 131
}, },
"_children": [ "_children": [
{ {
"__id__": 120 "__id__": 133
} }
], ],
"_active": true, "_active": true,
...@@ -5625,13 +6212,13 @@ ...@@ -5625,13 +6212,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 119 "__id__": 132
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 121 "__id__": 134
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5687,7 +6274,7 @@ ...@@ -5687,7 +6274,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 120 "__id__": 133
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5719,11 +6306,11 @@ ...@@ -5719,11 +6306,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 109 "__id__": 122
}, },
"_children": [ "_children": [
{ {
"__id__": 123 "__id__": 136
} }
], ],
"_active": true, "_active": true,
...@@ -5781,11 +6368,11 @@ ...@@ -5781,11 +6368,11 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 122 "__id__": 135
}, },
"_children": [ "_children": [
{ {
"__id__": 124 "__id__": 137
} }
], ],
"_active": true, "_active": true,
...@@ -5843,13 +6430,13 @@ ...@@ -5843,13 +6430,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 123 "__id__": 136
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 125 "__id__": 138
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5905,7 +6492,7 @@ ...@@ -5905,7 +6492,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 124 "__id__": 137
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5937,11 +6524,11 @@ ...@@ -5937,11 +6524,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 109 "__id__": 122
}, },
"_children": [ "_children": [
{ {
"__id__": 127 "__id__": 140
} }
], ],
"_active": true, "_active": true,
...@@ -5999,11 +6586,11 @@ ...@@ -5999,11 +6586,11 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 126 "__id__": 139
}, },
"_children": [ "_children": [
{ {
"__id__": 128 "__id__": 141
} }
], ],
"_active": true, "_active": true,
...@@ -6061,13 +6648,13 @@ ...@@ -6061,13 +6648,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 127 "__id__": 140
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 129 "__id__": 142
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6123,7 +6710,7 @@ ...@@ -6123,7 +6710,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 128 "__id__": 141
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6159,28 +6746,28 @@ ...@@ -6159,28 +6746,28 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 131 "__id__": 144
}, },
{ {
"__id__": 133 "__id__": 146
}, },
{ {
"__id__": 135 "__id__": 148
}, },
{ {
"__id__": 137 "__id__": 150
}, },
{ {
"__id__": 139 "__id__": 152
}, },
{ {
"__id__": 141 "__id__": 154
}, },
{ {
"__id__": 143 "__id__": 156
}, },
{ {
"__id__": 145 "__id__": 158
} }
], ],
"_active": false, "_active": false,
...@@ -6238,13 +6825,13 @@ ...@@ -6238,13 +6825,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 130 "__id__": 143
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 132 "__id__": 145
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6300,7 +6887,7 @@ ...@@ -6300,7 +6887,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 131 "__id__": 144
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6332,13 +6919,13 @@ ...@@ -6332,13 +6919,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 130 "__id__": 143
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 134 "__id__": 147
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6394,7 +6981,7 @@ ...@@ -6394,7 +6981,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 133 "__id__": 146
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6426,13 +7013,13 @@ ...@@ -6426,13 +7013,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 130 "__id__": 143
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 136 "__id__": 149
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6488,7 +7075,7 @@ ...@@ -6488,7 +7075,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 135 "__id__": 148
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6520,13 +7107,13 @@ ...@@ -6520,13 +7107,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 130 "__id__": 143
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 138 "__id__": 151
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6582,7 +7169,7 @@ ...@@ -6582,7 +7169,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 137 "__id__": 150
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6614,13 +7201,13 @@ ...@@ -6614,13 +7201,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 130 "__id__": 143
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 140 "__id__": 153
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6676,7 +7263,7 @@ ...@@ -6676,7 +7263,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 139 "__id__": 152
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6708,13 +7295,13 @@ ...@@ -6708,13 +7295,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 130 "__id__": 143
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 142 "__id__": 155
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6770,7 +7357,7 @@ ...@@ -6770,7 +7357,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 141 "__id__": 154
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6802,13 +7389,13 @@ ...@@ -6802,13 +7389,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 130 "__id__": 143
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 144 "__id__": 157
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6864,7 +7451,7 @@ ...@@ -6864,7 +7451,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 143 "__id__": 156
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6896,13 +7483,13 @@ ...@@ -6896,13 +7483,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 130 "__id__": 143
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 146 "__id__": 159
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6958,7 +7545,7 @@ ...@@ -6958,7 +7545,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 145 "__id__": 158
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
......
...@@ -354,6 +354,7 @@ cc.Class({ ...@@ -354,6 +354,7 @@ cc.Class({
}, },
getDefaultData() { getDefaultData() {
return {"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":"Black","value":"黑色","code":"#555555"}},{"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}}]}
return defaultData; return defaultData;
}, },
...@@ -446,13 +447,13 @@ cc.Class({ ...@@ -446,13 +447,13 @@ cc.Class({
initTitle() { initTitle() {
const title = cc.find('Canvas/bg_container/title'); const title = cc.find('Canvas/bg_container/top_part/title');
const titleLabel = title.getComponent(cc.Label); const titleLabel = title.getComponent(cc.Label);
titleLabel.string = this.data.title || ''; titleLabel.string = this.data.title || '';
}, },
initAudioPlayer() { initAudioPlayer() {
const audioPlayer = cc.find('Canvas/bg_container/AudioPlayer'); const audioPlayer = cc.find('Canvas/bg_container/top_part/AudioPlayer');
const playBtn = cc.find('play', audioPlayer); const playBtn = cc.find('play', audioPlayer);
const pauseBtn = cc.find('pause', audioPlayer); const pauseBtn = cc.find('pause', audioPlayer);
...@@ -571,9 +572,16 @@ cc.Class({ ...@@ -571,9 +572,16 @@ cc.Class({
if (!this.data.pic_url) { if (!this.data.pic_url) {
return; return;
} }
const panel = cc.find("Canvas/bg_container/panel");
this.canvas = cc.find("Canvas"); this.canvas = cc.find("Canvas");
const panel = cc.find("Canvas/bg_container/panel");
// const sx = this.canvas.width / panel.width;
// const sy = this.canvas.height / panel.height;
// panel.scale = Math.min(sx, sy);
getSprNodeByUrl(this.data.pic_url, (spr) => { getSprNodeByUrl(this.data.pic_url, (spr) => {
...@@ -613,6 +621,7 @@ cc.Class({ ...@@ -613,6 +621,7 @@ cc.Class({
console.log('colorArr: ', colorArr); console.log('colorArr: ', colorArr);
const disX = 120; const disX = 120;
const disY = 100;
const colorPanel = cc.find('Canvas/bg_container/color_panel'); const colorPanel = cc.find('Canvas/bg_container/color_panel');
const colorBtnBase = cc.find('Canvas/bg_container/color_panel/color_btn'); const colorBtnBase = cc.find('Canvas/bg_container/color_panel/color_btn');
...@@ -631,7 +640,9 @@ cc.Class({ ...@@ -631,7 +640,9 @@ cc.Class({
const colorBtn = cc.instantiate(colorBtnBase); const colorBtn = cc.instantiate(colorBtnBase);
colorBtn.active = true; colorBtn.active = true;
colorBtn.parent = colorBtnBase.parent; colorBtn.parent = colorBtnBase.parent;
colorBtn.x = i * disX; // colorBtn.x = i * disX;
colorBtn.x = 0;
colorBtn.y = -i * disY;
const colorSpr = cc.find("spr", colorBtn); const colorSpr = cc.find("spr", colorBtn);
colorSpr.color = cc.Color.fromHEX(new cc.Color(), color); colorSpr.color = cc.Color.fromHEX(new cc.Color(), color);
...@@ -645,16 +656,28 @@ cc.Class({ ...@@ -645,16 +656,28 @@ cc.Class({
this.curPaintColor = cc.Color.fromHEX(new cc.Color(), color); this.curPaintColor = cc.Color.fromHEX(new cc.Color(), color);
this.curPaintColorCode = color; this.curPaintColorCode = color;
selectCircle.x = colorBtn.x; selectCircle.x = colorBtn.x;
selectCircle.y = colorBtn.y;
if (this.lastColorSpr) {
this.lastColorSpr.scale = 1;
}
colorSpr.scale = 1.2;
this.lastColorSpr = colorSpr;
}) })
if (i == 0) { if (i == 0) {
this.curPaintColor = cc.Color.fromHEX(new cc.Color(), color); this.curPaintColor = cc.Color.fromHEX(new cc.Color(), color);
this.curPaintColorCode = color; this.curPaintColorCode = color;
selectCircle.x = colorBtn.x; selectCircle.x = colorBtn.x;
colorSpr.scale = 1.2;
} }
} }
colorPanel.x = -(len - 1) * disX / 2; // colorPanel.x = -(len - 1) * disX / 2;
colorPanel.y = (len - 1) * disY / 2;
}, },
...@@ -745,6 +768,7 @@ cc.Class({ ...@@ -745,6 +768,7 @@ cc.Class({
console.log(" in setOneInputRect ~", data) console.log(" in setOneInputRect ~", data)
const rectNode = this.setOneRect(data, bg); const rectNode = this.setOneRect(data, bg);
rectNode.zIndex += 100;
// const tempPos = rectNode.position; // const tempPos = rectNode.position;
// tempPos.x += rectNode.width / 2; // tempPos.x += rectNode.width / 2;
...@@ -767,6 +791,17 @@ cc.Class({ ...@@ -767,6 +791,17 @@ cc.Class({
eBox.data = data; eBox.data = data;
this.editBoxArr.push(eBox); this.editBoxArr.push(eBox);
const wrongIcon = getSprNode("X");
wrongIcon.x = eBoxNode.width / 2 * eBoxNode.scaleX;
wrongIcon.y = -eBoxNode.height / 2 * eBoxNode.scaleY;;
eBoxNode.addChild(wrongIcon);
wrongIcon.active = false;
const wSize = wrongIcon.getBoundingBoxToWorld();
wrongIcon.scale = 25 / wSize.width;
eBox.wrongIcon = wrongIcon;
eBoxNode.on('editing-did-ended', () => { eBoxNode.on('editing-did-ended', () => {
this.onEditBoxEnded(eBox); this.onEditBoxEnded(eBox);
}); });
...@@ -853,11 +888,42 @@ cc.Class({ ...@@ -853,11 +888,42 @@ cc.Class({
if (curEditBox) { if (curEditBox) {
const inputNum = curEditBox.string; const inputNum = curEditBox.string;
if (!inputNum) { if (!inputNum) {
this.playAudioByName('a_o'); // this.playAudioByName('a_o');
return; // return;
} else {
curEditBox.isEnd = true;
const data = curEditBox.data;
const targetNum = data.labelArr[0].value;
if (inputNum != targetNum) {
curEditBox.isWrong = true;
} else {
curEditBox.isWrong = false;
}
} }
} }
if (this.isFillEnd) {
if (curEditBox.isWrong) {
curEditBox.wrongIcon.active = true;
this.playAudioByName('a_o');
} else {
curEditBox.wrongIcon.active = false;
}
} else {
this.checkGameEnd(!curEditBox.isWrong);
}
return;
for(let i=0; i<this.editBoxArr.length; i++) { for(let i=0; i<this.editBoxArr.length; i++) {
const editBox = this.editBoxArr[i]; const editBox = this.editBoxArr[i];
...@@ -885,22 +951,65 @@ cc.Class({ ...@@ -885,22 +951,65 @@ cc.Class({
checkGameEnd() { checkGameEnd() {
for(let i=0; i<this.editBoxArr.length; i++) { for(let i=0; i<this.editBoxArr.length; i++) {
const editBox = this.editBoxArr[i]; const editBox = this.editBoxArr[i];
const inputNum = editBox.string; if (!editBox.isEnd) {
if (!inputNum) { this.isFillEnd = false;
return; return;
} }
// const inputNum = editBox.string;
// if (!inputNum) {
// return;
// }
} }
for (let i=0; i<this.data.picArr.length; i++) { for (let i=0; i<this.data.picArr.length; i++) {
const data = this.data.picArr[i]; const data = this.data.picArr[i];
if (!data.isEnd) { if (!data.isEnd) {
this.isFillEnd = false;
return; return;
} }
} }
this.isFillEnd = true;
console.log("isFillEnd == true ");
const isAllRight = this.checkIsAllRight();
if (!isAllRight) {
// if (isShowWrongAudio) {
// this.playAudioByName('a_o');
// }
if (!this.isFirstWrongEnd) {
this.isFirstWrongEnd = true;
this.playAudioByName('a_o');
}
return;
}
this.gameEnd(); this.gameEnd();
}, },
checkIsAllRight() {
let isAllRight = true;
for(let i=0; i<this.editBoxArr.length; i++) {
const editBox = this.editBoxArr[i];
editBox.wrongIcon.active = editBox.isWrong
if (editBox.isWrong) {
isAllRight = false;
}
}
for (let i=0; i<this.data.picArr.length; i++) {
const data = this.data.picArr[i];
data.wrongIcon.active = data.isWrong;
if (data.isWrong) {
isAllRight = false;
}
}
return isAllRight;
},
gameEnd() { gameEnd() {
if (this.isGameEnd) { if (this.isGameEnd) {
return; return;
...@@ -913,6 +1022,9 @@ cc.Class({ ...@@ -913,6 +1022,9 @@ cc.Class({
camera.zIndex = 100; camera.zIndex = 100;
showTrebleFirework(camera, cc.find('RibbonNodeBase').children); showTrebleFirework(camera, cc.find('RibbonNodeBase').children);
const panelMask = cc.find('Canvas/bg_container/panel_mask');
panelMask.active = true;
}, },
...@@ -1219,16 +1331,51 @@ cc.Class({ ...@@ -1219,16 +1331,51 @@ cc.Class({
console.log('data: ' , data); console.log('data: ' , data);
console.log('this.curPaintColorCode: ' + this.curPaintColorCode); console.log('this.curPaintColorCode: ' + this.curPaintColorCode);
if (data?.colorData?.code != this.curPaintColorCode) { // if (data?.colorData?.code != this.curPaintColorCode) {
this.playAudioByName('a_o'); // this.playAudioByName('a_o');
return; // return;
} // }
sprNode.color = this.curPaintColor; sprNode.color = this.curPaintColor;
data.isEnd = true; data.isEnd = true;
data.isWrong = data?.colorData?.code != this.curPaintColorCode;
this.playAudioByName('painted'); this.playAudioByName('painted');
this.checkGameEnd();
if (!data.wrongIcon) {
const wrongIcon = getSprNode('X');
data.wrongIcon = wrongIcon;
sprNode.addChild(wrongIcon);
const touchPos = e.getLocation();
const wSize = wrongIcon.getBoundingBoxToWorld();
wrongIcon.scale = 25 / wSize.width;
console.log('touchPos: ' , touchPos);
const localPos = sprNode.convertToNodeSpaceAR(touchPos);
wrongIcon.x = localPos.x;
wrongIcon.y = localPos.y;
data.wrongIcon.active = false;
}
if (this.isFillEnd) {
if (data.isWrong) {
data.wrongIcon.active = true;
} else {
data.wrongIcon.active = false;
}
}
if (this.isFillEnd && data.isWrong) {
this.playAudioByName('a_o');
} else {
this.checkGameEnd(!data.isWrong);
}
}); });
sprNode._hitTest = this._hitTest.bind(this); sprNode._hitTest = this._hitTest.bind(this);
......
{
"ver": "2.3.5",
"uuid": "17037567-4305-43a6-b37f-c3402b53f454",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 25,
"height": 25,
"platformSettings": {},
"subMetas": {
"X": {
"ver": "1.0.4",
"uuid": "0d9479a8-eec8-4a2c-aa94-cc90afc6fee3",
"rawTextureUuid": "17037567-4305-43a6-b37f-c3402b53f454",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0.5,
"offsetY": -1,
"trimX": 2,
"trimY": 2,
"width": 22,
"height": 23,
"rawWidth": 25,
"rawHeight": 25,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
assets/JJ38/textures/new/panel.png

20.2 KB | W: | H:

assets/JJ38/textures/new/panel.png

25.3 KB | W: | H:

assets/JJ38/textures/new/panel.png
assets/JJ38/textures/new/panel.png
assets/JJ38/textures/new/panel.png
assets/JJ38/textures/new/panel.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
"premultiplyAlpha": true, "premultiplyAlpha": true,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 985, "width": 1036,
"height": 518, "height": 698,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"panel": { "panel": {
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 985, "width": 1036,
"height": 518, "height": 698,
"rawWidth": 985, "rawWidth": 1036,
"rawHeight": 518, "rawHeight": 698,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
{
"ver": "2.3.5",
"uuid": "e527cceb-1d7d-4752-aa93-6d5995a29331",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": true,
"genMipmaps": false,
"packable": true,
"width": 1229,
"height": 645,
"platformSettings": {},
"subMetas": {
"panel_new": {
"ver": "1.0.4",
"uuid": "d87c71ec-01d9-4144-b05d-210b752a7a81",
"rawTextureUuid": "e527cceb-1d7d-4752-aa93-6d5995a29331",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 1,
"trimY": 1,
"width": 1227,
"height": 643,
"rawWidth": 1229,
"rawHeight": 645,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
...@@ -496,6 +496,7 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy { ...@@ -496,6 +496,7 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
{key: 'Green', value: '绿色', code: '#AAF50A'}, {key: 'Green', value: '绿色', code: '#AAF50A'},
{key: 'Blue', value: '蓝色', code: '#3988FF'}, {key: 'Blue', value: '蓝色', code: '#3988FF'},
{key: 'Orange', value: '橙色', code: '#FFBB55'}, {key: 'Orange', value: '橙色', code: '#FFBB55'},
{key: 'Black', value: '黑色', code: '#555555'},
] ]
......
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