Commit 4996ace9 authored by limingzhe's avatar limingzhe

fix: debug

parent 3d2eeb3e
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
"__id__": 88 "__id__": 88
}, },
{ {
"__id__": 124 "__id__": 130
}, },
{ {
"__id__": 145 "__id__": 151
} }
], ],
"_active": false, "_active": false,
...@@ -750,7 +750,7 @@ ...@@ -750,7 +750,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
48.035, -70.105,
330.773, 330.773,
0, 0,
0, 0,
...@@ -4062,10 +4062,10 @@ ...@@ -4062,10 +4062,10 @@
"__id__": 89 "__id__": 89
}, },
{ {
"__id__": 94 "__id__": 98
}, },
{ {
"__id__": 121 "__id__": 127
} }
], ],
"_active": false, "_active": false,
...@@ -4131,6 +4131,12 @@ ...@@ -4131,6 +4131,12 @@
}, },
{ {
"__id__": 92 "__id__": 92
},
{
"__id__": 94
},
{
"__id__": 96
} }
], ],
"_active": false, "_active": false,
...@@ -4185,7 +4191,7 @@ ...@@ -4185,7 +4191,7 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "X", "_name": "try_again",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 89 "__id__": 89
...@@ -4206,6 +4212,96 @@ ...@@ -4206,6 +4212,96 @@
"b": 255, "b": 255,
"a": 255 "a": 255
}, },
"_contentSize": {
"__type__": "cc.Size",
"width": 470,
"height": 114
},
"_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": "f2cNMb9VBIeJXEJ1HJx6Wk"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 90
},
"_enabled": true,
"_materials": [],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "aeb4bc78-08d6-4b9b-92cb-853cb2ea3d6e"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "0awrYMFCxGv5PkUBVsDC4j"
},
{
"__type__": "cc.Node",
"_name": "X",
"_objFlags": 0,
"_parent": {
"__id__": 89
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 93
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 22, "width": 22,
...@@ -4250,7 +4346,7 @@ ...@@ -4250,7 +4346,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 90 "__id__": 92
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -4273,6 +4369,96 @@ ...@@ -4273,6 +4369,96 @@
"_atlas": null, "_atlas": null,
"_id": "e1KtuBF1pM4KlVJqlBknw0" "_id": "e1KtuBF1pM4KlVJqlBknw0"
}, },
{
"__type__": "cc.Node",
"_name": "right",
"_objFlags": 0,
"_parent": {
"__id__": 89
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 95
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 85,
"height": 67
},
"_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": "86Ggs4l6VAh4sNANSV/6yc"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 94
},
"_enabled": true,
"_materials": [],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "9303cfae-7bb7-4a2e-85f7-216e19669da9"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "71QWIuEAZC4ohCtrFLSe4T"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "input_bg", "_name": "input_bg",
...@@ -4284,7 +4470,7 @@ ...@@ -4284,7 +4470,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 93 "__id__": 97
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4340,7 +4526,7 @@ ...@@ -4340,7 +4526,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 92 "__id__": 96
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -4371,12 +4557,6 @@ ...@@ -4371,12 +4557,6 @@
"__id__": 88 "__id__": 88
}, },
"_children": [ "_children": [
{
"__id__": 95
},
{
"__id__": 97
},
{ {
"__id__": 99 "__id__": 99
}, },
...@@ -4409,6 +4589,15 @@ ...@@ -4409,6 +4589,15 @@
}, },
{ {
"__id__": 119 "__id__": 119
},
{
"__id__": 121
},
{
"__id__": 123
},
{
"__id__": 125
} }
], ],
"_active": true, "_active": true,
...@@ -4461,18 +4650,99 @@ ...@@ -4461,18 +4650,99 @@
"groupIndex": 0, "groupIndex": 0,
"_id": "b823DIVC9L+Ihc3T9Bt7m3" "_id": "b823DIVC9L+Ihc3T9Bt7m3"
}, },
{
"__type__": "cc.Node",
"_name": "sound_try_again",
"_objFlags": 0,
"_parent": {
"__id__": 98
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 100
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 0,
"height": 0
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "77XnYu1wJHsbXGZM3wW6yf"
},
{
"__type__": "cc.AudioSource",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 99
},
"_enabled": true,
"_clip": {
"__uuid__": "411b7a5e-fe8c-42da-9cdb-1bbeafda0ec0"
},
"_volume": 1,
"_mute": false,
"_loop": false,
"_firstlyEnabled": true,
"playOnLoad": false,
"preload": false,
"_id": "fftDHcuWpKJ4MxBvlM97nZ"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "right", "_name": "right",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 94 "__id__": 98
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 96 "__id__": 102
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4528,7 +4798,7 @@ ...@@ -4528,7 +4798,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 95 "__id__": 101
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -4547,13 +4817,13 @@ ...@@ -4547,13 +4817,13 @@
"_name": "wrong", "_name": "wrong",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 94 "__id__": 98
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 98 "__id__": 104
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4609,7 +4879,7 @@ ...@@ -4609,7 +4879,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 97 "__id__": 103
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -4628,13 +4898,13 @@ ...@@ -4628,13 +4898,13 @@
"_name": "a_o", "_name": "a_o",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 94 "__id__": 98
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 100 "__id__": 106
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4690,7 +4960,7 @@ ...@@ -4690,7 +4960,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 99 "__id__": 105
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -4709,13 +4979,13 @@ ...@@ -4709,13 +4979,13 @@
"_name": "select", "_name": "select",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 94 "__id__": 98
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 102 "__id__": 108
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4771,7 +5041,7 @@ ...@@ -4771,7 +5041,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 101 "__id__": 107
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -4790,13 +5060,13 @@ ...@@ -4790,13 +5060,13 @@
"_name": "button", "_name": "button",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 94 "__id__": 98
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 104 "__id__": 110
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4852,7 +5122,7 @@ ...@@ -4852,7 +5122,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 103 "__id__": 109
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -4871,13 +5141,13 @@ ...@@ -4871,13 +5141,13 @@
"_name": "finish", "_name": "finish",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 94 "__id__": 98
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 106 "__id__": 112
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4933,7 +5203,7 @@ ...@@ -4933,7 +5203,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 105 "__id__": 111
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -4952,13 +5222,13 @@ ...@@ -4952,13 +5222,13 @@
"_name": "click", "_name": "click",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 94 "__id__": 98
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 108 "__id__": 114
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5014,7 +5284,7 @@ ...@@ -5014,7 +5284,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 107 "__id__": 113
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -5033,13 +5303,13 @@ ...@@ -5033,13 +5303,13 @@
"_name": "correct", "_name": "correct",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 94 "__id__": 98
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 110 "__id__": 116
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5095,7 +5365,7 @@ ...@@ -5095,7 +5365,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 109 "__id__": 115
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -5114,13 +5384,13 @@ ...@@ -5114,13 +5384,13 @@
"_name": "incorrect", "_name": "incorrect",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 94 "__id__": 98
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 112 "__id__": 118
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5176,7 +5446,7 @@ ...@@ -5176,7 +5446,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 111 "__id__": 117
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -5195,13 +5465,13 @@ ...@@ -5195,13 +5465,13 @@
"_name": "lack", "_name": "lack",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 94 "__id__": 98
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 114 "__id__": 120
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5257,7 +5527,7 @@ ...@@ -5257,7 +5527,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 113 "__id__": 119
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -5276,13 +5546,13 @@ ...@@ -5276,13 +5546,13 @@
"_name": "painted", "_name": "painted",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 94 "__id__": 98
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 116 "__id__": 122
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5338,7 +5608,7 @@ ...@@ -5338,7 +5608,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 115 "__id__": 121
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -5357,13 +5627,13 @@ ...@@ -5357,13 +5627,13 @@
"_name": "demo", "_name": "demo",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 94 "__id__": 98
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 118 "__id__": 124
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5419,7 +5689,7 @@ ...@@ -5419,7 +5689,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 117 "__id__": 123
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -5438,13 +5708,13 @@ ...@@ -5438,13 +5708,13 @@
"_name": "star", "_name": "star",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 94 "__id__": 98
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 120 "__id__": 126
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5500,7 +5770,7 @@ ...@@ -5500,7 +5770,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 119 "__id__": 125
}, },
"_enabled": true, "_enabled": true,
"_clip": null, "_clip": null,
...@@ -5521,7 +5791,7 @@ ...@@ -5521,7 +5791,7 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 122 "__id__": 128
} }
], ],
"_active": false, "_active": false,
...@@ -5579,13 +5849,13 @@ ...@@ -5579,13 +5849,13 @@
"_name": "MMTextBook-Bold", "_name": "MMTextBook-Bold",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 121 "__id__": 127
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 123 "__id__": 129
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5641,7 +5911,7 @@ ...@@ -5641,7 +5911,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 122 "__id__": 128
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5680,19 +5950,19 @@ ...@@ -5680,19 +5950,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 125 "__id__": 131
}, },
{ {
"__id__": 129 "__id__": 135
}, },
{ {
"__id__": 133 "__id__": 139
}, },
{ {
"__id__": 137 "__id__": 143
}, },
{ {
"__id__": 141 "__id__": 147
} }
], ],
"_active": false, "_active": false,
...@@ -5750,11 +6020,11 @@ ...@@ -5750,11 +6020,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 124 "__id__": 130
}, },
"_children": [ "_children": [
{ {
"__id__": 126 "__id__": 132
} }
], ],
"_active": true, "_active": true,
...@@ -5812,11 +6082,11 @@ ...@@ -5812,11 +6082,11 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 125 "__id__": 131
}, },
"_children": [ "_children": [
{ {
"__id__": 127 "__id__": 133
} }
], ],
"_active": true, "_active": true,
...@@ -5874,13 +6144,13 @@ ...@@ -5874,13 +6144,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 126 "__id__": 132
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 128 "__id__": 134
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5936,7 +6206,7 @@ ...@@ -5936,7 +6206,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 127 "__id__": 133
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5968,11 +6238,11 @@ ...@@ -5968,11 +6238,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 124 "__id__": 130
}, },
"_children": [ "_children": [
{ {
"__id__": 130 "__id__": 136
} }
], ],
"_active": true, "_active": true,
...@@ -6030,11 +6300,11 @@ ...@@ -6030,11 +6300,11 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 129 "__id__": 135
}, },
"_children": [ "_children": [
{ {
"__id__": 131 "__id__": 137
} }
], ],
"_active": true, "_active": true,
...@@ -6092,13 +6362,13 @@ ...@@ -6092,13 +6362,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 130 "__id__": 136
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 132 "__id__": 138
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6154,7 +6424,7 @@ ...@@ -6154,7 +6424,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 131 "__id__": 137
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6186,11 +6456,11 @@ ...@@ -6186,11 +6456,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 124 "__id__": 130
}, },
"_children": [ "_children": [
{ {
"__id__": 134 "__id__": 140
} }
], ],
"_active": true, "_active": true,
...@@ -6248,11 +6518,11 @@ ...@@ -6248,11 +6518,11 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 133 "__id__": 139
}, },
"_children": [ "_children": [
{ {
"__id__": 135 "__id__": 141
} }
], ],
"_active": true, "_active": true,
...@@ -6310,13 +6580,13 @@ ...@@ -6310,13 +6580,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 134 "__id__": 140
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 136 "__id__": 142
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6372,7 +6642,7 @@ ...@@ -6372,7 +6642,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 135 "__id__": 141
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6404,11 +6674,11 @@ ...@@ -6404,11 +6674,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 124 "__id__": 130
}, },
"_children": [ "_children": [
{ {
"__id__": 138 "__id__": 144
} }
], ],
"_active": true, "_active": true,
...@@ -6466,11 +6736,11 @@ ...@@ -6466,11 +6736,11 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 137 "__id__": 143
}, },
"_children": [ "_children": [
{ {
"__id__": 139 "__id__": 145
} }
], ],
"_active": true, "_active": true,
...@@ -6528,13 +6798,13 @@ ...@@ -6528,13 +6798,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 138 "__id__": 144
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 140 "__id__": 146
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6590,7 +6860,7 @@ ...@@ -6590,7 +6860,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 139 "__id__": 145
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6622,11 +6892,11 @@ ...@@ -6622,11 +6892,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 124 "__id__": 130
}, },
"_children": [ "_children": [
{ {
"__id__": 142 "__id__": 148
} }
], ],
"_active": true, "_active": true,
...@@ -6684,11 +6954,11 @@ ...@@ -6684,11 +6954,11 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 141 "__id__": 147
}, },
"_children": [ "_children": [
{ {
"__id__": 143 "__id__": 149
} }
], ],
"_active": true, "_active": true,
...@@ -6746,13 +7016,13 @@ ...@@ -6746,13 +7016,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 142 "__id__": 148
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 144 "__id__": 150
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6808,7 +7078,7 @@ ...@@ -6808,7 +7078,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 143 "__id__": 149
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6844,28 +7114,28 @@ ...@@ -6844,28 +7114,28 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 146 "__id__": 152
}, },
{ {
"__id__": 148 "__id__": 154
}, },
{ {
"__id__": 150 "__id__": 156
}, },
{ {
"__id__": 152 "__id__": 158
}, },
{ {
"__id__": 154 "__id__": 160
}, },
{ {
"__id__": 156 "__id__": 162
}, },
{ {
"__id__": 158 "__id__": 164
}, },
{ {
"__id__": 160 "__id__": 166
} }
], ],
"_active": false, "_active": false,
...@@ -6923,13 +7193,13 @@ ...@@ -6923,13 +7193,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 145 "__id__": 151
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 147 "__id__": 153
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6985,7 +7255,7 @@ ...@@ -6985,7 +7255,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 146 "__id__": 152
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7017,13 +7287,13 @@ ...@@ -7017,13 +7287,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 145 "__id__": 151
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 149 "__id__": 155
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7079,7 +7349,7 @@ ...@@ -7079,7 +7349,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 148 "__id__": 154
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7111,13 +7381,13 @@ ...@@ -7111,13 +7381,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 145 "__id__": 151
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 151 "__id__": 157
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7173,7 +7443,7 @@ ...@@ -7173,7 +7443,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 150 "__id__": 156
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7205,13 +7475,13 @@ ...@@ -7205,13 +7475,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 145 "__id__": 151
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 153 "__id__": 159
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7267,7 +7537,7 @@ ...@@ -7267,7 +7537,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 152 "__id__": 158
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7299,13 +7569,13 @@ ...@@ -7299,13 +7569,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 145 "__id__": 151
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 155 "__id__": 161
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7361,7 +7631,7 @@ ...@@ -7361,7 +7631,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 154 "__id__": 160
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7393,13 +7663,13 @@ ...@@ -7393,13 +7663,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 145 "__id__": 151
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 157 "__id__": 163
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7455,7 +7725,7 @@ ...@@ -7455,7 +7725,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 156 "__id__": 162
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7487,13 +7757,13 @@ ...@@ -7487,13 +7757,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 145 "__id__": 151
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 159 "__id__": 165
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7549,7 +7819,7 @@ ...@@ -7549,7 +7819,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 158 "__id__": 164
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7581,13 +7851,13 @@ ...@@ -7581,13 +7851,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 145 "__id__": 151
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 161 "__id__": 167
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7643,7 +7913,7 @@ ...@@ -7643,7 +7913,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 160 "__id__": 166
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
......
...@@ -354,6 +354,7 @@ cc.Class({ ...@@ -354,6 +354,7 @@ cc.Class({
}, },
getDefaultData() { getDefaultData() {
return {"title":"Listen and colour.","audio_url":"https://teach.cdn.ireadabc.com/912a24d7632716e2eef28582de922c83.mp3","pic_url":"https://teach.cdn.ireadabc.com/e0fbdf22e406c44345a1797e265db317.png","picArr":[{"pic_url":"https://teach.cdn.ireadabc.com/f3b1e4143c22755132786626de582e28.png","colorData":{"key":"Pink","value":"粉色","code":"#FFC6EC"}},{"pic_url":"https://teach.cdn.ireadabc.com/751dbd7ff702de9985c5594eca41b023.png","colorData":{"key":"Orange","value":"橙色","code":"#FFBB55"}},{"pic_url":"https://teach.cdn.ireadabc.com/71aae3fa964afeb8034dfa26410d8300.png","colorData":{"key":"Purple","value":"紫色","code":"#9E00FF"}},{"pic_url":"https://teach.cdn.ireadabc.com/a5c1490013bb698b1f6309a2f081ead0.png","colorData":{"key":"Red","value":"红色","code":"#FF6868"}},{"pic_url":"https://teach.cdn.ireadabc.com/41b4e6d5b8e437e7e2a75dae362a0547.png","colorData":{"key":"Black","value":"黑色","code":"#555555"}},{"pic_url":"https://teach.cdn.ireadabc.com/4344875a3540dfa0c05d2978c07f3f19.png","colorData":{"key":"Blue","value":"蓝色","code":"#3988FF"}}],"bgItem":{"url":"https://teach.cdn.ireadabc.com/e0fbdf22e406c44345a1797e265db317.png","rect":{"x":620.62,"y":0,"width":518.75,"height":674}},"hotZoneItemArr":[{"id":"1727678842936","index":0,"itemType":"rect","fontScaleX":1.20078125,"fontScaleY":1.20078125,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.375,"dragDot":{"x":880,"y":338.3734547820429},"gIdx":"0","posX":743.5,"posY":225.5,"labelArr":[{"key":"number","title":"序号","value":"1"}],"sizeW":35,"sizeH":39,"rect":{"x":210.91,"y":234.93,"width":39.92,"height":44.48}},{"id":"1727678879054","index":1,"itemType":"rect","fontScaleX":1.20078125,"fontScaleY":1.20078125,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.375,"dragDot":{"x":880,"y":338.3734547820429},"gIdx":"0","posX":859.504956781083,"posY":234.50038991261363,"labelArr":[{"key":"number","title":"序号","value":"2"}],"sizeW":35.00006051858748,"sizeH":39.000067434997476,"rect":{"x":343.22,"y":245.19,"width":39.92,"height":44.48}},{"id":"1727678887838","index":2,"itemType":"rect","fontScaleX":1.20078125,"fontScaleY":1.20078125,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.375,"dragDot":{"x":880,"y":338.3734547820429},"gIdx":"0","posX":690.0880336102944,"posY":233.63576604057513,"labelArr":[{"key":"number","title":"序号","value":"3"}],"sizeW":29.27153208115027,"sizeH":29.27153208115027,"rect":{"x":470.21,"y":347.3,"width":46.42,"height":46.42}},{"id":"1727678903574","index":3,"itemType":"rect","fontScaleX":1.20078125,"fontScaleY":1.20078125,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.375,"dragDot":{"x":880,"y":338.3734547820429},"gIdx":"0","posX":493.7607059851401,"posY":248.89467913168428,"labelArr":[{"key":"number","title":"序号","value":"4"}],"sizeW":26.478588029719845,"sizeH":26.478588029719845,"rect":{"x":161.08,"y":373.73,"width":41.99,"height":41.99}},{"id":"1727678971766","index":4,"itemType":"rect","fontScaleX":1.20078125,"fontScaleY":1.20078125,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.375,"dragDot":{"x":880,"y":338.3734547820429},"gIdx":"0","posX":489.85037081838175,"posY":190.0163909036364,"labelArr":[{"key":"number","title":"序号","value":"5"}],"sizeW":25.169248257867476,"sizeH":28.045733773052326,"rect":{"x":155.93,"y":279.1,"width":39.92,"height":44.48}},{"id":"1732759939619","index":5,"itemType":"rect","fontScaleX":1.20078125,"fontScaleY":1.20078125,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.375,"dragDot":{"x":880,"y":338.3734547820429},"gIdx":"0","posX":412.52017910341124,"posY":191.1633846326649,"labelArr":[{"key":"number","title":"序号","value":"6"}],"sizeW":30.3267692653298,"sizeH":30.3267692653298,"rect":{"x":29.2,"y":279.11,"width":48.1,"height":48.1}}]};
return {"title":"Listen and colour.","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 {"title":"Listen and colour.","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;
}, },
...@@ -418,7 +419,6 @@ cc.Class({ ...@@ -418,7 +419,6 @@ cc.Class({
this.showBackBtn(); this.showBackBtn();
this.initListener(); this.initListener();
}, },
initListener() { initListener() {
...@@ -802,6 +802,7 @@ cc.Class({ ...@@ -802,6 +802,7 @@ cc.Class({
const data = this.data.picArr[i]; const data = this.data.picArr[i];
getSprNodeByUrl(this.data.picArr[i].pic_url, (spr) => { getSprNodeByUrl(this.data.picArr[i].pic_url, (spr) => {
this.data.picArr[i].sprNode = spr.node;
paintBg.addChild(spr.node, i+1); paintBg.addChild(spr.node, i+1);
this.bindSubImgHit(spr.node, data); this.bindSubImgHit(spr.node, data);
...@@ -1022,10 +1023,22 @@ cc.Class({ ...@@ -1022,10 +1023,22 @@ cc.Class({
eBoxNode.addChild(wrongIcon); eBoxNode.addChild(wrongIcon);
wrongIcon.active = false; wrongIcon.active = false;
const rightIcon = getSprNode("right");
rightIcon.x = eBoxNode.width / 3 * eBoxNode.scaleX;
rightIcon.y = -eBoxNode.height / 3 * eBoxNode.scaleY;
eBoxNode.addChild(rightIcon);
rightIcon.active = false;
const wSize = wrongIcon.getBoundingBoxToWorld(); const wSize = wrongIcon.getBoundingBoxToWorld();
wrongIcon.scale = 25 / wSize.width; wrongIcon.scale = 25 / wSize.width;
const rSize = rightIcon.getBoundingBoxToWorld();
rightIcon.scale = 25 / rSize.width;
// rightIcon.scale = 25 / rightIcon.getBoundingBoxToWorld().width;
eBox.wrongIcon = wrongIcon; eBox.wrongIcon = wrongIcon;
eBox.rightIcon = rightIcon;
eBoxNode.on('editing-did-ended', () => { eBoxNode.on('editing-did-ended', () => {
this.onEditBoxEnded(eBox); this.onEditBoxEnded(eBox);
...@@ -1108,6 +1121,44 @@ cc.Class({ ...@@ -1108,6 +1121,44 @@ cc.Class({
}, },
showTryAgain() {
this.playAudioByName('sound_try_again');
const sprNode = getSprNode('try_again');
sprNode.scale = 0;
this.canvas.addChild(sprNode);
cc.tween(sprNode)
.to(1, { scale: 1 }, {"easing": 'elasticOut'})
.to(1, { opacity: 0 }, {"easing": 'cubicIn'})
// .to(1, { scale: 1 })
.call(() => {
sprNode.removeFromParent();
})
.start();
},
cleanWrong() {
for(let i=0; i<this.editBoxArr.length; i++) {
const editBox = this.editBoxArr[i];
if (editBox.isWrong) {
editBox.isEnd = false;
editBox.isWrong = false;
editBox.wrongIcon.active = false;
editBox.string = '';
}
}
for (let i=0; i<this.data.picArr.length; i++) {
const data = this.data.picArr[i];
if (data.isWrong) {
data.rightIcon.active = false;
data.isEnd = false;
data.sprNode.color = cc.Color.WHITE;
}
}
},
onEditBoxEnded(curEditBox) { onEditBoxEnded(curEditBox) {
if (curEditBox) { if (curEditBox) {
...@@ -1176,10 +1227,14 @@ cc.Class({ ...@@ -1176,10 +1227,14 @@ cc.Class({
}, },
checkGameEnd() { checkGameEnd() {
console.log('in check game end');
console.log("this.editBoxArr.length: " , this.editBoxArr.length);
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];
if (!editBox.isEnd) { if (!editBox.isEnd) {
this.isFillEnd = false; this.isFillEnd = false;
console.log('exit 1 :' , i);
console.log('editBox: ' , editBox);
return; return;
} }
// const inputNum = editBox.string; // const inputNum = editBox.string;
...@@ -1192,6 +1247,8 @@ cc.Class({ ...@@ -1192,6 +1247,8 @@ cc.Class({
const data = this.data.picArr[i]; const data = this.data.picArr[i];
if (!data.isEnd) { if (!data.isEnd) {
this.isFillEnd = false; this.isFillEnd = false;
console.log('exit 2');
return; return;
} }
} }
...@@ -1202,17 +1259,18 @@ cc.Class({ ...@@ -1202,17 +1259,18 @@ cc.Class({
const isAllRight = this.checkIsAllRight(); const isAllRight = this.checkIsAllRight();
if (!isAllRight) { if (!isAllRight) {
// if (isShowWrongAudio) {
// if (!this.isFirstWrongEnd) {
// this.isFirstWrongEnd = true;
// this.playAudioByName('a_o'); // this.playAudioByName('a_o');
// } // }
if (!this.isFirstWrongEnd) { this.showTryAgain();
this.isFirstWrongEnd = true; this.cleanWrong();
this.playAudioByName('a_o');
}
return; return;
} }
this.gameEnd(); this.gameEnd();
}, },
...@@ -1220,17 +1278,23 @@ cc.Class({ ...@@ -1220,17 +1278,23 @@ cc.Class({
let isAllRight = true; let isAllRight = true;
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];
editBox.wrongIcon.active = editBox.isWrong editBox.rightIcon.active = !editBox.isWrong;
if (editBox.isWrong) { if (editBox.isWrong) {
isAllRight = false; isAllRight = false;
} else {
//editBox 禁止点击
editBox.enabled = false;
} }
} }
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];
data.wrongIcon.active = data.isWrong; // data.wrongIcon.active = data.isWrong;
data.rightIcon.active = !data.isWrong;
if (data.isWrong) { if (data.isWrong) {
isAllRight = false; isAllRight = false;
} else {
data.isLocked = true;
} }
} }
...@@ -1563,6 +1627,10 @@ cc.Class({ ...@@ -1563,6 +1627,10 @@ cc.Class({
// return; // return;
// } // }
if (data.isLocked) {
return;
}
sprNode.color = this.curPaintColor; sprNode.color = this.curPaintColor;
...@@ -1588,20 +1656,39 @@ cc.Class({ ...@@ -1588,20 +1656,39 @@ cc.Class({
wrongIcon.y = localPos.y; wrongIcon.y = localPos.y;
data.wrongIcon.active = false; data.wrongIcon.active = false;
} }
if(!data.rightIcon){
const rightIcon = getSprNode("right");
data.rightIcon = rightIcon;
sprNode.addChild(rightIcon);
const touchPos = e.getLocation();
const wSize = rightIcon.getBoundingBoxToWorld();
rightIcon.scale = 25 / wSize.width;
console.log('touchPos: ' , touchPos);
const localPos = sprNode.convertToNodeSpaceAR(touchPos);
rightIcon.x = localPos.x;
rightIcon.y = localPos.y;
data.rightIcon.active = false;
}
if (this.isFillEnd) { if (this.isFillEnd) {
if (data.isWrong) { if (data.isWrong) {
data.wrongIcon.active = true; // data.wrongIcon.active = true;
data.rightIcon.active = false;
} else { } else {
data.wrongIcon.active = false; data.rightIcon.active = true;
// data.wrongIcon.active = false;
} }
} }
if (this.isFillEnd && data.isWrong) { // if (this.isFillEnd && data.isWrong) {
this.playAudioByName('a_o'); // this.playAudioByName('a_o');
} else { // } else {
// this.checkGameEnd(!data.isWrong);
// }
this.checkGameEnd(!data.isWrong); this.checkGameEnd(!data.isWrong);
}
}); });
......
{
"ver": "2.3.5",
"uuid": "9b02bede-c8ea-41c6-959e-c5202d5b8325",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 96,
"height": 73,
"platformSettings": {},
"subMetas": {
"right": {
"ver": "1.0.4",
"uuid": "9303cfae-7bb7-4a2e-85f7-216e19669da9",
"rawTextureUuid": "9b02bede-c8ea-41c6-959e-c5202d5b8325",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": -1.5,
"offsetY": 0,
"trimX": 4,
"trimY": 3,
"width": 85,
"height": 67,
"rawWidth": 96,
"rawHeight": 73,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "411b7a5e-fe8c-42da-9cdb-1bbeafda0ec0",
"downloadMode": 0,
"duration": 1.253875,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "5245421e-5c11-407a-833e-a97bc34ea32c",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 470,
"height": 114,
"platformSettings": {},
"subMetas": {
"try_again": {
"ver": "1.0.4",
"uuid": "aeb4bc78-08d6-4b9b-92cb-853cb2ea3d6e",
"rawTextureUuid": "5245421e-5c11-407a-833e-a97bc34ea32c",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 470,
"height": 114,
"rawWidth": 470,
"rawHeight": 114,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
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