Commit 788b31e9 authored by yu's avatar yu

1

parent 2d362bb8
......@@ -17,7 +17,7 @@
"__id__": 2
},
{
"__id__": 200
"__id__": 201
}
],
"_active": false,
......@@ -84,43 +84,43 @@
"__id__": 41
},
{
"__id__": 98
"__id__": 99
},
{
"__id__": 101
"__id__": 102
},
{
"__id__": 103
"__id__": 104
},
{
"__id__": 105
"__id__": 106
},
{
"__id__": 140
"__id__": 141
},
{
"__id__": 143
"__id__": 144
},
{
"__id__": 147
"__id__": 148
},
{
"__id__": 149
"__id__": 150
},
{
"__id__": 180
"__id__": 181
}
],
"_active": true,
"_components": [
{
"__id__": 197
},
{
"__id__": 198
},
{
"__id__": 199
},
{
"__id__": 200
}
],
"_prefab": null,
......@@ -1920,7 +1920,11 @@
}
],
"_active": false,
"_components": [],
"_components": [
{
"__id__": 98
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
......@@ -4680,6 +4684,33 @@
"_atlas": null,
"_id": "ebfvI1ppNMk5Ng+f5bYmMH"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 41
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 4,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 360,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "dfgcKGugBE3rYK6tfWrC43"
},
{
"__type__": "cc.Node",
"_name": "bg_3",
......@@ -4691,10 +4722,10 @@
"_active": true,
"_components": [
{
"__id__": 99
"__id__": 100
},
{
"__id__": 100
"__id__": 101
}
],
"_prefab": null,
......@@ -4750,7 +4781,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 98
"__id__": 99
},
"_enabled": true,
"_materials": [
......@@ -4782,7 +4813,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 98
"__id__": 99
},
"_enabled": true,
"alignMode": 1,
......@@ -4815,7 +4846,7 @@
"_active": true,
"_components": [
{
"__id__": 102
"__id__": 103
}
],
"_prefab": null,
......@@ -4871,7 +4902,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 101
"__id__": 102
},
"_enabled": true,
"alignMode": 1,
......@@ -4904,7 +4935,7 @@
"_active": true,
"_components": [
{
"__id__": 104
"__id__": 105
}
],
"_prefab": null,
......@@ -4960,7 +4991,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 103
"__id__": 104
},
"_enabled": true,
"alignMode": 1,
......@@ -4991,13 +5022,13 @@
},
"_children": [
{
"__id__": 106
"__id__": 107
}
],
"_active": true,
"_components": [
{
"__id__": 139
"__id__": 140
}
],
"_prefab": null,
......@@ -5053,32 +5084,32 @@
"_name": "LoadingLayer",
"_objFlags": 0,
"_parent": {
"__id__": 105
"__id__": 106
},
"_children": [
{
"__id__": 107
"__id__": 108
},
{
"__id__": 111
"__id__": 112
},
{
"__id__": 114
"__id__": 115
},
{
"__id__": 117
"__id__": 118
},
{
"__id__": 124
"__id__": 125
}
],
"_active": false,
"_components": [
{
"__id__": 137
"__id__": 138
},
{
"__id__": 138
"__id__": 139
}
],
"_prefab": null,
......@@ -5134,19 +5165,19 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 106
"__id__": 107
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 108
},
{
"__id__": 109
},
{
"__id__": 110
},
{
"__id__": 111
}
],
"_prefab": null,
......@@ -5202,7 +5233,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 107
"__id__": 108
},
"_enabled": true,
"_materials": [
......@@ -5234,7 +5265,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 107
"__id__": 108
},
"_enabled": true,
"alignMode": 1,
......@@ -5261,7 +5292,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 107
"__id__": 108
},
"_enabled": true,
"_normalMaterial": null,
......@@ -5329,16 +5360,16 @@
"_name": "layout",
"_objFlags": 0,
"_parent": {
"__id__": 106
"__id__": 107
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 112
"__id__": 113
},
{
"__id__": 113
"__id__": 114
}
],
"_prefab": null,
......@@ -5394,7 +5425,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 111
"__id__": 112
},
"_enabled": true,
"_layoutSize": {
......@@ -5426,7 +5457,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 111
"__id__": 112
},
"_enabled": true,
"alignMode": 1,
......@@ -5453,16 +5484,16 @@
"_name": "label",
"_objFlags": 0,
"_parent": {
"__id__": 106
"__id__": 107
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 115
"__id__": 116
},
{
"__id__": 116
"__id__": 117
}
],
"_prefab": null,
......@@ -5518,7 +5549,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 114
"__id__": 115
},
"_enabled": true,
"_materials": [
......@@ -5553,7 +5584,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 114
"__id__": 115
},
"_enabled": true,
"alignMode": 2,
......@@ -5580,23 +5611,23 @@
"_name": "progressBar",
"_objFlags": 0,
"_parent": {
"__id__": 106
"__id__": 107
},
"_children": [
{
"__id__": 118
"__id__": 119
}
],
"_active": true,
"_components": [
{
"__id__": 121
},
{
"__id__": 122
},
{
"__id__": 123
},
{
"__id__": 124
}
],
"_prefab": null,
......@@ -5652,16 +5683,16 @@
"_name": "bar",
"_objFlags": 512,
"_parent": {
"__id__": 117
"__id__": 118
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 119
"__id__": 120
},
{
"__id__": 120
"__id__": 121
}
],
"_prefab": null,
......@@ -5717,7 +5748,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 118
"__id__": 119
},
"_enabled": true,
"_materials": [
......@@ -5749,7 +5780,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 118
"__id__": 119
},
"_enabled": true,
"alignMode": 1,
......@@ -5776,7 +5807,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 117
"__id__": 118
},
"_enabled": true,
"_materials": [
......@@ -5808,12 +5839,12 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 117
"__id__": 118
},
"_enabled": true,
"_N$totalLength": 1568,
"_N$barSprite": {
"__id__": 119
"__id__": 120
},
"_N$mode": 0,
"_N$progress": 0,
......@@ -5825,7 +5856,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 117
"__id__": 118
},
"_enabled": true,
"alignMode": 2,
......@@ -5852,23 +5883,23 @@
"_name": "head",
"_objFlags": 0,
"_parent": {
"__id__": 106
"__id__": 107
},
"_children": [
{
"__id__": 125
"__id__": 126
},
{
"__id__": 127
"__id__": 128
},
{
"__id__": 131
"__id__": 132
},
{
"__id__": 133
"__id__": 134
},
{
"__id__": 135
"__id__": 136
}
],
"_active": false,
......@@ -5926,13 +5957,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 124
"__id__": 125
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 126
"__id__": 127
}
],
"_prefab": null,
......@@ -5988,7 +6019,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 125
"__id__": 126
},
"_enabled": true,
"_materials": [
......@@ -6020,17 +6051,17 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 124
"__id__": 125
},
"_children": [
{
"__id__": 128
"__id__": 129
}
],
"_active": true,
"_components": [
{
"__id__": 130
"__id__": 131
}
],
"_prefab": null,
......@@ -6086,13 +6117,13 @@
"_name": "headImg",
"_objFlags": 0,
"_parent": {
"__id__": 127
"__id__": 128
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 129
"__id__": 130
}
],
"_prefab": null,
......@@ -6148,7 +6179,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 128
"__id__": 129
},
"_enabled": true,
"_materials": [
......@@ -6180,7 +6211,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 127
"__id__": 128
},
"_enabled": true,
"_materials": [
......@@ -6202,13 +6233,13 @@
"_name": "frame",
"_objFlags": 0,
"_parent": {
"__id__": 124
"__id__": 125
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 132
"__id__": 133
}
],
"_prefab": null,
......@@ -6264,7 +6295,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 131
"__id__": 132
},
"_enabled": true,
"_materials": [
......@@ -6296,13 +6327,13 @@
"_name": "frame_self",
"_objFlags": 0,
"_parent": {
"__id__": 124
"__id__": 125
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 134
"__id__": 135
}
],
"_prefab": null,
......@@ -6358,7 +6389,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 133
"__id__": 134
},
"_enabled": true,
"_materials": [
......@@ -6390,13 +6421,13 @@
"_name": "name",
"_objFlags": 0,
"_parent": {
"__id__": 124
"__id__": 125
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 136
"__id__": 137
}
],
"_prefab": null,
......@@ -6452,7 +6483,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 135
"__id__": 136
},
"_enabled": true,
"_materials": [
......@@ -6487,7 +6518,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 106
"__id__": 107
},
"_enabled": true,
"alignMode": 2,
......@@ -6514,7 +6545,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 106
"__id__": 107
},
"_enabled": true,
"_id": "f54eYuLvlJyYIF4wrxhwvC"
......@@ -6524,7 +6555,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 105
"__id__": 106
},
"_enabled": true,
"alignMode": 1,
......@@ -6557,10 +6588,10 @@
"_active": false,
"_components": [
{
"__id__": 141
"__id__": 142
},
{
"__id__": 142
"__id__": 143
}
],
"_prefab": null,
......@@ -6616,7 +6647,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 140
"__id__": 141
},
"_enabled": true,
"_id": "53uGFb6qJMFZHndqSAD7ZB"
......@@ -6626,7 +6657,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 140
"__id__": 141
},
"_enabled": true,
"alignMode": 1,
......@@ -6657,13 +6688,13 @@
},
"_children": [
{
"__id__": 144
"__id__": 145
}
],
"_active": true,
"_components": [
{
"__id__": 146
"__id__": 147
}
],
"_prefab": null,
......@@ -6678,7 +6709,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 362.6105263157899,
"height": 483.5600000000002
"height": 483.5647539622176
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -6719,13 +6750,13 @@
"_name": "btnCheckCat",
"_objFlags": 0,
"_parent": {
"__id__": 143
"__id__": 144
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 145
"__id__": 146
}
],
"_prefab": null,
......@@ -6781,7 +6812,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 144
"__id__": 145
},
"_enabled": true,
"_normalMaterial": null,
......@@ -6849,7 +6880,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 143
"__id__": 144
},
"_enabled": true,
"_materials": [
......@@ -6895,7 +6926,7 @@
"_active": false,
"_components": [
{
"__id__": 148
"__id__": 149
}
],
"_prefab": null,
......@@ -6951,7 +6982,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 147
"__id__": 148
},
"_enabled": true,
"_materials": [
......@@ -6995,13 +7026,13 @@
},
"_children": [
{
"__id__": 150
"__id__": 151
},
{
"__id__": 166
"__id__": 167
},
{
"__id__": 173
"__id__": 174
}
],
"_active": true,
......@@ -7059,35 +7090,35 @@
"_name": "item_1",
"_objFlags": 0,
"_parent": {
"__id__": 149
"__id__": 150
},
"_children": [
{
"__id__": 151
"__id__": 152
},
{
"__id__": 153
"__id__": 154
},
{
"__id__": 155
"__id__": 156
},
{
"__id__": 157
"__id__": 158
},
{
"__id__": 159
"__id__": 160
},
{
"__id__": 161
"__id__": 162
},
{
"__id__": 163
"__id__": 164
}
],
"_active": true,
"_components": [
{
"__id__": 165
"__id__": 166
}
],
"_prefab": null,
......@@ -7143,13 +7174,13 @@
"_name": "basket_22",
"_objFlags": 0,
"_parent": {
"__id__": 150
"__id__": 151
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 152
"__id__": 153
}
],
"_prefab": null,
......@@ -7205,7 +7236,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 151
"__id__": 152
},
"_enabled": true,
"_materials": [
......@@ -7237,13 +7268,13 @@
"_name": "layout_img",
"_objFlags": 0,
"_parent": {
"__id__": 150
"__id__": 151
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 154
"__id__": 155
}
],
"_prefab": null,
......@@ -7270,7 +7301,7 @@
"ctor": "Float64Array",
"array": [
0,
128.024,
133.024,
0,
0,
0,
......@@ -7299,7 +7330,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 153
"__id__": 154
},
"_enabled": true,
"_layoutSize": {
......@@ -7331,13 +7362,13 @@
"_name": "basket_12",
"_objFlags": 0,
"_parent": {
"__id__": 150
"__id__": 151
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 156
"__id__": 157
}
],
"_prefab": null,
......@@ -7393,7 +7424,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 155
"__id__": 156
},
"_enabled": true,
"_materials": [
......@@ -7425,13 +7456,13 @@
"_name": "title",
"_objFlags": 0,
"_parent": {
"__id__": 150
"__id__": 151
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 158
"__id__": 159
}
],
"_prefab": null,
......@@ -7487,7 +7518,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 157
"__id__": 158
},
"_enabled": true,
"_materials": [
......@@ -7522,13 +7553,13 @@
"_name": "btnAudio",
"_objFlags": 0,
"_parent": {
"__id__": 150
"__id__": 151
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 160
"__id__": 161
}
],
"_prefab": null,
......@@ -7584,7 +7615,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 159
"__id__": 160
},
"_enabled": true,
"_materials": [
......@@ -7616,13 +7647,13 @@
"_name": "layout_word",
"_objFlags": 0,
"_parent": {
"__id__": 150
"__id__": 151
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 162
"__id__": 163
}
],
"_prefab": null,
......@@ -7678,7 +7709,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 161
"__id__": 162
},
"_enabled": true,
"_layoutSize": {
......@@ -7710,13 +7741,13 @@
"_name": "labText",
"_objFlags": 0,
"_parent": {
"__id__": 150
"__id__": 151
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 164
"__id__": 165
}
],
"_prefab": null,
......@@ -7772,7 +7803,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 163
"__id__": 164
},
"_enabled": true,
"_materials": [
......@@ -7807,7 +7838,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 150
"__id__": 151
},
"_enabled": true,
"alignMode": 1,
......@@ -7834,17 +7865,17 @@
"_name": "item_2",
"_objFlags": 0,
"_parent": {
"__id__": 149
"__id__": 150
},
"_children": [
{
"__id__": 167
"__id__": 168
},
{
"__id__": 169
"__id__": 170
},
{
"__id__": 171
"__id__": 172
}
],
"_active": true,
......@@ -7902,13 +7933,13 @@
"_name": "answer_4",
"_objFlags": 0,
"_parent": {
"__id__": 166
"__id__": 167
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 168
"__id__": 169
}
],
"_prefab": null,
......@@ -7964,7 +7995,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 167
"__id__": 168
},
"_enabled": true,
"_materials": [
......@@ -7996,13 +8027,13 @@
"_name": "pic",
"_objFlags": 0,
"_parent": {
"__id__": 166
"__id__": 167
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 170
"__id__": 171
}
],
"_prefab": null,
......@@ -8058,7 +8089,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 169
"__id__": 170
},
"_enabled": true,
"_materials": [
......@@ -8088,13 +8119,13 @@
"_name": "bee_ske",
"_objFlags": 0,
"_parent": {
"__id__": 166
"__id__": 167
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 172
"__id__": 173
}
],
"_prefab": null,
......@@ -8150,7 +8181,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 171
"__id__": 172
},
"_enabled": true,
"_materials": [
......@@ -8190,14 +8221,14 @@
"_name": "item_3",
"_objFlags": 0,
"_parent": {
"__id__": 149
"__id__": 150
},
"_children": [
{
"__id__": 174
"__id__": 175
},
{
"__id__": 178
"__id__": 179
}
],
"_active": true,
......@@ -8255,17 +8286,17 @@
"_name": "answer_4",
"_objFlags": 0,
"_parent": {
"__id__": 173
"__id__": 174
},
"_children": [
{
"__id__": 175
"__id__": 176
}
],
"_active": true,
"_components": [
{
"__id__": 177
"__id__": 178
}
],
"_prefab": null,
......@@ -8321,13 +8352,13 @@
"_name": "word",
"_objFlags": 0,
"_parent": {
"__id__": 174
"__id__": 175
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 176
"__id__": 177
}
],
"_prefab": null,
......@@ -8383,7 +8414,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 175
"__id__": 176
},
"_enabled": true,
"_materials": [
......@@ -8418,7 +8449,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 174
"__id__": 175
},
"_enabled": true,
"_materials": [
......@@ -8450,13 +8481,13 @@
"_name": "bee_ske",
"_objFlags": 0,
"_parent": {
"__id__": 173
"__id__": 174
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 179
"__id__": 180
}
],
"_prefab": null,
......@@ -8512,7 +8543,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 178
"__id__": 179
},
"_enabled": true,
"_materials": [
......@@ -8556,19 +8587,19 @@
},
"_children": [
{
"__id__": 181
"__id__": 182
},
{
"__id__": 185
"__id__": 186
}
],
"_active": false,
"_components": [
{
"__id__": 195
"__id__": 196
},
{
"__id__": 196
"__id__": 197
}
],
"_prefab": null,
......@@ -8624,19 +8655,19 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 180
"__id__": 181
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 182
},
{
"__id__": 183
},
{
"__id__": 184
},
{
"__id__": 185
}
],
"_prefab": null,
......@@ -8692,7 +8723,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 181
"__id__": 182
},
"_enabled": true,
"_materials": [
......@@ -8724,7 +8755,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 181
"__id__": 182
},
"_enabled": true,
"alignMode": 2,
......@@ -8751,7 +8782,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 181
"__id__": 182
},
"_enabled": true,
"_normalMaterial": null,
......@@ -8819,20 +8850,20 @@
"_name": "BtnFrame",
"_objFlags": 0,
"_parent": {
"__id__": 180
"__id__": 181
},
"_children": [
{
"__id__": 186
"__id__": 187
},
{
"__id__": 190
"__id__": 191
}
],
"_active": true,
"_components": [
{
"__id__": 194
"__id__": 195
}
],
"_prefab": null,
......@@ -8888,19 +8919,19 @@
"_name": "BtnExit",
"_objFlags": 0,
"_parent": {
"__id__": 185
"__id__": 186
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 187
},
{
"__id__": 188
},
{
"__id__": 189
},
{
"__id__": 190
}
],
"_prefab": null,
......@@ -8956,7 +8987,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 186
"__id__": 187
},
"_enabled": true,
"_materials": [
......@@ -8988,7 +9019,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 186
"__id__": 187
},
"_enabled": true,
"alignMode": 1,
......@@ -9015,7 +9046,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 186
"__id__": 187
},
"_enabled": true,
"_normalMaterial": null,
......@@ -9083,19 +9114,19 @@
"_name": "BtnPlayAgain",
"_objFlags": 0,
"_parent": {
"__id__": 185
"__id__": 186
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 191
},
{
"__id__": 192
},
{
"__id__": 193
},
{
"__id__": 194
}
],
"_prefab": null,
......@@ -9151,7 +9182,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 190
"__id__": 191
},
"_enabled": true,
"_materials": [
......@@ -9183,7 +9214,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 190
"__id__": 191
},
"_enabled": true,
"alignMode": 1,
......@@ -9210,7 +9241,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 190
"__id__": 191
},
"_enabled": true,
"_normalMaterial": null,
......@@ -9278,7 +9309,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 185
"__id__": 186
},
"_enabled": true,
"_materials": [
......@@ -9310,7 +9341,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 180
"__id__": 181
},
"_enabled": true,
"alignMode": 2,
......@@ -9337,7 +9368,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 180
"__id__": 181
},
"_enabled": true,
"_id": "68evFVe1pHtLw2FrqnkBxx"
......@@ -9398,25 +9429,25 @@
"__id__": 41
},
"loadingLayer": {
"__id__": 106
"__id__": 107
},
"dbCat": {
"__id__": 143
"__id__": 144
},
"item_1": {
"__id__": 150
"__id__": 151
},
"item_2": {
"__id__": 166
"__id__": 167
},
"item_3": {
"__id__": 173
"__id__": 174
},
"layout_Answer": {
"__id__": 103
"__id__": 104
},
"layout_game": {
"__id__": 101
"__id__": 102
},
"_id": "576JkPRhpGh5Xq4Klm2tbT"
},
......@@ -9429,28 +9460,28 @@
},
"_children": [
{
"__id__": 201
"__id__": 202
},
{
"__id__": 203
"__id__": 204
},
{
"__id__": 207
"__id__": 208
},
{
"__id__": 209
"__id__": 210
},
{
"__id__": 271
"__id__": 272
}
],
"_active": false,
"_components": [
{
"__id__": 275
"__id__": 276
},
{
"__id__": 276
"__id__": 277
}
],
"_prefab": null,
......@@ -9506,13 +9537,13 @@
"_name": "star",
"_objFlags": 0,
"_parent": {
"__id__": 200
"__id__": 201
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 202
"__id__": 203
}
],
"_prefab": null,
......@@ -9568,7 +9599,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 201
"__id__": 202
},
"_enabled": true,
"_materials": [
......@@ -9600,19 +9631,19 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 200
"__id__": 201
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 204
},
{
"__id__": 205
},
{
"__id__": 206
},
{
"__id__": 207
}
],
"_prefab": null,
......@@ -9668,7 +9699,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 203
"__id__": 204
},
"_enabled": true,
"_materials": [
......@@ -9700,7 +9731,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 203
"__id__": 204
},
"_enabled": true,
"alignMode": 1,
......@@ -9727,7 +9758,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 203
"__id__": 204
},
"_enabled": true,
"_normalMaterial": null,
......@@ -9795,13 +9826,13 @@
"_name": "label",
"_objFlags": 0,
"_parent": {
"__id__": 200
"__id__": 201
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 208
"__id__": 209
}
],
"_prefab": null,
......@@ -9857,7 +9888,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 207
"__id__": 208
},
"_enabled": true,
"_materials": [
......@@ -9890,32 +9921,32 @@
"_name": "jiangtaiNode",
"_objFlags": 0,
"_parent": {
"__id__": 200
"__id__": 201
},
"_children": [
{
"__id__": 210
"__id__": 211
},
{
"__id__": 212
"__id__": 213
},
{
"__id__": 214
"__id__": 215
},
{
"__id__": 216
"__id__": 217
},
{
"__id__": 227
"__id__": 228
},
{
"__id__": 238
"__id__": 239
},
{
"__id__": 249
"__id__": 250
},
{
"__id__": 260
"__id__": 261
}
],
"_active": true,
......@@ -9973,13 +10004,13 @@
"_name": "light",
"_objFlags": 0,
"_parent": {
"__id__": 209
"__id__": 210
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 211
"__id__": 212
}
],
"_prefab": null,
......@@ -10035,7 +10066,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 210
"__id__": 211
},
"_enabled": true,
"_materials": [
......@@ -10067,13 +10098,13 @@
"_name": "fire",
"_objFlags": 0,
"_parent": {
"__id__": 209
"__id__": 210
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 213
"__id__": 214
}
],
"_prefab": null,
......@@ -10129,7 +10160,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 212
"__id__": 213
},
"_enabled": true,
"_materials": [
......@@ -10161,13 +10192,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 209
"__id__": 210
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 215
"__id__": 216
}
],
"_prefab": null,
......@@ -10223,7 +10254,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 214
"__id__": 215
},
"_enabled": true,
"_materials": [
......@@ -10255,20 +10286,20 @@
"_name": "head_0",
"_objFlags": 0,
"_parent": {
"__id__": 209
"__id__": 210
},
"_children": [
{
"__id__": 217
"__id__": 218
},
{
"__id__": 221
"__id__": 222
},
{
"__id__": 223
"__id__": 224
},
{
"__id__": 225
"__id__": 226
}
],
"_active": false,
......@@ -10326,17 +10357,17 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 216
"__id__": 217
},
"_children": [
{
"__id__": 218
"__id__": 219
}
],
"_active": true,
"_components": [
{
"__id__": 220
"__id__": 221
}
],
"_prefab": null,
......@@ -10392,13 +10423,13 @@
"_name": "headImg",
"_objFlags": 0,
"_parent": {
"__id__": 217
"__id__": 218
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 219
"__id__": 220
}
],
"_prefab": null,
......@@ -10454,7 +10485,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 218
"__id__": 219
},
"_enabled": true,
"_materials": [
......@@ -10484,7 +10515,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 217
"__id__": 218
},
"_enabled": true,
"_materials": [
......@@ -10504,13 +10535,13 @@
"_name": "head",
"_objFlags": 0,
"_parent": {
"__id__": 216
"__id__": 217
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 222
"__id__": 223
}
],
"_prefab": null,
......@@ -10566,7 +10597,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 221
"__id__": 222
},
"_enabled": true,
"_materials": [
......@@ -10598,13 +10629,13 @@
"_name": "name",
"_objFlags": 0,
"_parent": {
"__id__": 216
"__id__": 217
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 224
"__id__": 225
}
],
"_prefab": null,
......@@ -10660,7 +10691,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 223
"__id__": 224
},
"_enabled": true,
"_materials": [
......@@ -10693,13 +10724,13 @@
"_name": "arrow",
"_objFlags": 0,
"_parent": {
"__id__": 216
"__id__": 217
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 226
"__id__": 227
}
],
"_prefab": null,
......@@ -10755,7 +10786,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 225
"__id__": 226
},
"_enabled": true,
"_materials": [
......@@ -10787,20 +10818,20 @@
"_name": "head_1",
"_objFlags": 0,
"_parent": {
"__id__": 209
"__id__": 210
},
"_children": [
{
"__id__": 228
"__id__": 229
},
{
"__id__": 232
"__id__": 233
},
{
"__id__": 234
"__id__": 235
},
{
"__id__": 236
"__id__": 237
}
],
"_active": false,
......@@ -10858,17 +10889,17 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 227
"__id__": 228
},
"_children": [
{
"__id__": 229
"__id__": 230
}
],
"_active": true,
"_components": [
{
"__id__": 231
"__id__": 232
}
],
"_prefab": null,
......@@ -10924,13 +10955,13 @@
"_name": "headImg",
"_objFlags": 0,
"_parent": {
"__id__": 228
"__id__": 229
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 230
"__id__": 231
}
],
"_prefab": null,
......@@ -10986,7 +11017,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 229
"__id__": 230
},
"_enabled": true,
"_materials": [
......@@ -11016,7 +11047,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 228
"__id__": 229
},
"_enabled": true,
"_materials": [
......@@ -11036,13 +11067,13 @@
"_name": "head",
"_objFlags": 0,
"_parent": {
"__id__": 227
"__id__": 228
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 233
"__id__": 234
}
],
"_prefab": null,
......@@ -11098,7 +11129,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 232
"__id__": 233
},
"_enabled": true,
"_materials": [
......@@ -11130,13 +11161,13 @@
"_name": "name",
"_objFlags": 0,
"_parent": {
"__id__": 227
"__id__": 228
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 235
"__id__": 236
}
],
"_prefab": null,
......@@ -11192,7 +11223,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 234
"__id__": 235
},
"_enabled": true,
"_materials": [
......@@ -11225,13 +11256,13 @@
"_name": "arrow",
"_objFlags": 0,
"_parent": {
"__id__": 227
"__id__": 228
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 237
"__id__": 238
}
],
"_prefab": null,
......@@ -11287,7 +11318,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 236
"__id__": 237
},
"_enabled": true,
"_materials": [
......@@ -11319,20 +11350,20 @@
"_name": "head_2",
"_objFlags": 0,
"_parent": {
"__id__": 209
"__id__": 210
},
"_children": [
{
"__id__": 239
"__id__": 240
},
{
"__id__": 243
"__id__": 244
},
{
"__id__": 245
"__id__": 246
},
{
"__id__": 247
"__id__": 248
}
],
"_active": false,
......@@ -11390,17 +11421,17 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 238
"__id__": 239
},
"_children": [
{
"__id__": 240
"__id__": 241
}
],
"_active": true,
"_components": [
{
"__id__": 242
"__id__": 243
}
],
"_prefab": null,
......@@ -11456,13 +11487,13 @@
"_name": "headImg",
"_objFlags": 0,
"_parent": {
"__id__": 239
"__id__": 240
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 241
"__id__": 242
}
],
"_prefab": null,
......@@ -11518,7 +11549,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 240
"__id__": 241
},
"_enabled": true,
"_materials": [
......@@ -11548,7 +11579,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 239
"__id__": 240
},
"_enabled": true,
"_materials": [
......@@ -11568,13 +11599,13 @@
"_name": "head",
"_objFlags": 0,
"_parent": {
"__id__": 238
"__id__": 239
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 244
"__id__": 245
}
],
"_prefab": null,
......@@ -11630,7 +11661,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 243
"__id__": 244
},
"_enabled": true,
"_materials": [
......@@ -11662,13 +11693,13 @@
"_name": "name",
"_objFlags": 0,
"_parent": {
"__id__": 238
"__id__": 239
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 246
"__id__": 247
}
],
"_prefab": null,
......@@ -11724,7 +11755,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 245
"__id__": 246
},
"_enabled": true,
"_materials": [
......@@ -11757,13 +11788,13 @@
"_name": "arrow",
"_objFlags": 0,
"_parent": {
"__id__": 238
"__id__": 239
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 248
"__id__": 249
}
],
"_prefab": null,
......@@ -11819,7 +11850,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 247
"__id__": 248
},
"_enabled": true,
"_materials": [
......@@ -11851,20 +11882,20 @@
"_name": "head_3",
"_objFlags": 0,
"_parent": {
"__id__": 209
"__id__": 210
},
"_children": [
{
"__id__": 250
"__id__": 251
},
{
"__id__": 254
"__id__": 255
},
{
"__id__": 256
"__id__": 257
},
{
"__id__": 258
"__id__": 259
}
],
"_active": false,
......@@ -11922,17 +11953,17 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 249
"__id__": 250
},
"_children": [
{
"__id__": 251
"__id__": 252
}
],
"_active": true,
"_components": [
{
"__id__": 253
"__id__": 254
}
],
"_prefab": null,
......@@ -11988,13 +12019,13 @@
"_name": "headImg",
"_objFlags": 0,
"_parent": {
"__id__": 250
"__id__": 251
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 252
"__id__": 253
}
],
"_prefab": null,
......@@ -12050,7 +12081,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 251
"__id__": 252
},
"_enabled": true,
"_materials": [
......@@ -12080,7 +12111,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 250
"__id__": 251
},
"_enabled": true,
"_materials": [
......@@ -12100,13 +12131,13 @@
"_name": "head",
"_objFlags": 0,
"_parent": {
"__id__": 249
"__id__": 250
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 255
"__id__": 256
}
],
"_prefab": null,
......@@ -12162,7 +12193,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 254
"__id__": 255
},
"_enabled": true,
"_materials": [
......@@ -12194,13 +12225,13 @@
"_name": "name",
"_objFlags": 0,
"_parent": {
"__id__": 249
"__id__": 250
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 257
"__id__": 258
}
],
"_prefab": null,
......@@ -12256,7 +12287,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 256
"__id__": 257
},
"_enabled": true,
"_materials": [
......@@ -12289,13 +12320,13 @@
"_name": "arrow",
"_objFlags": 0,
"_parent": {
"__id__": 249
"__id__": 250
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 259
"__id__": 260
}
],
"_prefab": null,
......@@ -12351,7 +12382,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 258
"__id__": 259
},
"_enabled": true,
"_materials": [
......@@ -12383,20 +12414,20 @@
"_name": "head_4",
"_objFlags": 0,
"_parent": {
"__id__": 209
"__id__": 210
},
"_children": [
{
"__id__": 261
"__id__": 262
},
{
"__id__": 265
"__id__": 266
},
{
"__id__": 267
"__id__": 268
},
{
"__id__": 269
"__id__": 270
}
],
"_active": false,
......@@ -12454,17 +12485,17 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 260
"__id__": 261
},
"_children": [
{
"__id__": 262
"__id__": 263
}
],
"_active": true,
"_components": [
{
"__id__": 264
"__id__": 265
}
],
"_prefab": null,
......@@ -12520,13 +12551,13 @@
"_name": "headImg",
"_objFlags": 0,
"_parent": {
"__id__": 261
"__id__": 262
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 263
"__id__": 264
}
],
"_prefab": null,
......@@ -12582,7 +12613,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 262
"__id__": 263
},
"_enabled": true,
"_materials": [
......@@ -12612,7 +12643,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 261
"__id__": 262
},
"_enabled": true,
"_materials": [
......@@ -12632,13 +12663,13 @@
"_name": "head",
"_objFlags": 0,
"_parent": {
"__id__": 260
"__id__": 261
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 266
"__id__": 267
}
],
"_prefab": null,
......@@ -12694,7 +12725,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 265
"__id__": 266
},
"_enabled": true,
"_materials": [
......@@ -12726,13 +12757,13 @@
"_name": "name",
"_objFlags": 0,
"_parent": {
"__id__": 260
"__id__": 261
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 268
"__id__": 269
}
],
"_prefab": null,
......@@ -12788,7 +12819,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 267
"__id__": 268
},
"_enabled": true,
"_materials": [
......@@ -12821,13 +12852,13 @@
"_name": "arrow",
"_objFlags": 0,
"_parent": {
"__id__": 260
"__id__": 261
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 270
"__id__": 271
}
],
"_prefab": null,
......@@ -12883,7 +12914,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 269
"__id__": 270
},
"_enabled": true,
"_materials": [
......@@ -12915,17 +12946,17 @@
"_name": "catFrame",
"_objFlags": 0,
"_parent": {
"__id__": 200
"__id__": 201
},
"_children": [
{
"__id__": 272
"__id__": 273
}
],
"_active": true,
"_components": [
{
"__id__": 274
"__id__": 275
}
],
"_prefab": null,
......@@ -12981,13 +13012,13 @@
"_name": "CoolCat",
"_objFlags": 0,
"_parent": {
"__id__": 271
"__id__": 272
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 273
"__id__": 274
}
],
"_prefab": null,
......@@ -13043,7 +13074,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 272
"__id__": 273
},
"_enabled": true,
"_materials": [
......@@ -13083,7 +13114,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 271
"__id__": 272
},
"_enabled": true,
"alignMode": 1,
......@@ -13110,7 +13141,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 200
"__id__": 201
},
"_enabled": true,
"alignMode": 1,
......@@ -13137,7 +13168,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 200
"__id__": 201
},
"_enabled": true,
"_id": "2di0B0u6VIfa27gpyDYfMr"
......
......@@ -286,6 +286,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
}
this.playLocalAudio("right");
if (question.type == "txt") {
this.addTxteImg(item);
cc.tween(target).to(0.5, { scale: 1.2 }).to(0.2, { scale: 0.5 }).call(() => {
this.wordRight(item).then(() => {
this.hideTop(card);
......@@ -307,6 +308,15 @@ export default class SceneComponent extends MyCocosSceneComponent {
}).start();
}
private addTxteImg(item) {
let node = new cc.Node();
node.addComponent(cc.Sprite);
pg.view.setNetImg(node, this.cardInfo.picUrl, { w: 110, h: 114 });
let layout_img = cc.find("layout_img", item);
node.parent = layout_img;
let scale = layout_img.parent.scale
node.scale = scale < 0.9 ? 0.9 : scale;
}
private wordRight(item) {
return new Promise((resolve, reject) => {
let layout_word = cc.find("layout_word", item);
......
......@@ -19,42 +19,42 @@ export const defaultData = {
{
"type": "img",
"text": "1",
"image": "",
"image": "http://staging-teach.cdn.ireadabc.com/5835aa41da46fd1e9d3aab12e8510051.png",
"audio": "",
"idx": "1"
},
{
"type": "txt",
"text": "1",
"image": "",
"image": "http://staging-teach.cdn.ireadabc.com/5835aa41da46fd1e9d3aab12e8510051.png",
"audio": "",
"idx": "1"
},
{
"type": "txt",
"text": "2",
"image": "",
"image": "http://staging-teach.cdn.ireadabc.com/5835aa41da46fd1e9d3aab12e8510051.png",
"audio": "",
"idx": "2"
},
{
"type": "txt",
"text": "3",
"image": "",
"image": "http://staging-teach.cdn.ireadabc.com/5835aa41da46fd1e9d3aab12e8510051.png",
"audio": "",
"idx": "3"
},
{
"type": "txt",
"text": "2",
"image": "",
"image": "http://staging-teach.cdn.ireadabc.com/5835aa41da46fd1e9d3aab12e8510051.png",
"audio": "",
"idx": "2"
},
{
"type": "txt",
"text": "4",
"image": "",
"image": "http://staging-teach.cdn.ireadabc.com/5835aa41da46fd1e9d3aab12e8510051.png",
"audio": "",
"idx": "4"
}
......
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