Commit c9510c03 authored by 张世斌's avatar 张世斌

1.修复bug\

parent 094842f9
{"ver":"1.1.2","uuid":"c35bb2f6-f24a-4850-ae44-643f2fdc7541","isBundle":false,"bundleName":"","priority":1,"compressionType":{},"optimizeHotUpdate":{},"inlineSpriteFrames":{},"isRemoteBundle":{"ios":false,"android":false},"subMetas":{}}
\ No newline at end of file
{
"ver": "1.1.2",
"uuid": "c35bb2f6-f24a-4850-ae44-643f2fdc7541",
"isBundle": false,
"bundleName": "",
"priority": 1,
"compressionType": {},
"optimizeHotUpdate": {},
"inlineSpriteFrames": {},
"isRemoteBundle": {
"ios": false,
"android": false
},
"subMetas": {}
}
\ No newline at end of file
......@@ -17,7 +17,7 @@
"__id__": 2
},
{
"__id__": 260
"__id__": 261
}
],
"_active": false,
......@@ -78,25 +78,25 @@
"__id__": 5
},
{
"__id__": 202
"__id__": 203
},
{
"__id__": 210
"__id__": 211
},
{
"__id__": 212
"__id__": 213
}
],
"_active": true,
"_components": [
{
"__id__": 257
},
{
"__id__": 258
},
{
"__id__": 259
},
{
"__id__": 260
}
],
"_prefab": null,
......@@ -272,19 +272,19 @@
"__id__": 108
},
{
"__id__": 150
"__id__": 151
},
{
"__id__": 159
"__id__": 160
}
],
"_active": true,
"_components": [
{
"__id__": 200
"__id__": 201
},
{
"__id__": 201
"__id__": 202
}
],
"_prefab": null,
......@@ -5570,7 +5570,7 @@
"_active": true,
"_components": [
{
"__id__": 149
"__id__": 150
}
],
"_prefab": null,
......@@ -5643,6 +5643,9 @@
},
{
"__id__": 148
},
{
"__id__": 149
}
],
"_prefab": null,
......@@ -7550,6 +7553,74 @@
"_originalHeight": 0,
"_id": "32X9P5qPtEFrFaXmrHnv3z"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 109
},
"_enabled": true,
"_normalMaterial": null,
"_grayMaterial": null,
"duration": 0.1,
"zoomScale": 1.2,
"clickEvents": [],
"_N$interactable": true,
"_N$enableAutoGrayEffect": false,
"_N$transition": 0,
"transition": 0,
"_N$normalColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$pressedColor": {
"__type__": "cc.Color",
"r": 211,
"g": 211,
"b": 211,
"a": 255
},
"pressedColor": {
"__type__": "cc.Color",
"r": 211,
"g": 211,
"b": 211,
"a": 255
},
"_N$hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$disabledColor": {
"__type__": "cc.Color",
"r": 124,
"g": 124,
"b": 124,
"a": 255
},
"_N$normalSprite": null,
"_N$pressedSprite": null,
"pressedSprite": null,
"_N$hoverSprite": null,
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": null,
"_id": "204X4GSuRNrKx5gytdBJ9E"
},
{
"__type__": "cc.Widget",
"_name": "",
......@@ -7586,16 +7657,16 @@
},
"_children": [
{
"__id__": 151
"__id__": 152
},
{
"__id__": 155
"__id__": 156
}
],
"_active": true,
"_components": [
{
"__id__": 158
"__id__": 159
}
],
"_prefab": null,
......@@ -7651,19 +7722,19 @@
"_name": "btn_submit",
"_objFlags": 0,
"_parent": {
"__id__": 150
"__id__": 151
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 152
},
{
"__id__": 153
},
{
"__id__": 154
},
{
"__id__": 155
}
],
"_prefab": null,
......@@ -7719,7 +7790,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 151
"__id__": 152
},
"_enabled": true,
"_materials": [
......@@ -7751,7 +7822,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 151
"__id__": 152
},
"_enabled": true,
"alignMode": 1,
......@@ -7778,7 +7849,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 151
"__id__": 152
},
"_enabled": true,
"_normalMaterial": null,
......@@ -7846,16 +7917,16 @@
"_name": "coolcat",
"_objFlags": 0,
"_parent": {
"__id__": 150
"__id__": 151
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 156
"__id__": 157
},
{
"__id__": 157
"__id__": 158
}
],
"_prefab": null,
......@@ -7911,7 +7982,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 155
"__id__": 156
},
"_enabled": true,
"_materials": [
......@@ -7951,7 +8022,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 155
"__id__": 156
},
"_enabled": true,
"alignMode": 1,
......@@ -7978,7 +8049,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 150
"__id__": 151
},
"_enabled": true,
"alignMode": 1,
......@@ -8009,7 +8080,7 @@
},
"_children": [
{
"__id__": 160
"__id__": 161
}
],
"_active": false,
......@@ -8067,23 +8138,23 @@
"_name": "paint",
"_objFlags": 512,
"_parent": {
"__id__": 159
"__id__": 160
},
"_children": [
{
"__id__": 161
"__id__": 162
},
{
"__id__": 195
"__id__": 196
}
],
"_active": true,
"_components": [
{
"__id__": 198
"__id__": 199
},
{
"__id__": 199
"__id__": 200
}
],
"_prefab": null,
......@@ -8139,38 +8210,38 @@
"_name": "alligator",
"_objFlags": 512,
"_parent": {
"__id__": 160
"__id__": 161
},
"_children": [
{
"__id__": 162
"__id__": 163
},
{
"__id__": 166
"__id__": 167
},
{
"__id__": 170
"__id__": 171
},
{
"__id__": 174
"__id__": 175
},
{
"__id__": 178
"__id__": 179
},
{
"__id__": 182
"__id__": 183
},
{
"__id__": 186
"__id__": 187
},
{
"__id__": 190
"__id__": 191
}
],
"_active": true,
"_components": [
{
"__id__": 194
"__id__": 195
}
],
"_prefab": null,
......@@ -8226,17 +8297,17 @@
"_name": "t2",
"_objFlags": 0,
"_parent": {
"__id__": 161
"__id__": 162
},
"_children": [
{
"__id__": 163
"__id__": 164
}
],
"_active": true,
"_components": [
{
"__id__": 165
"__id__": 166
}
],
"_prefab": null,
......@@ -8292,13 +8363,13 @@
"_name": "word",
"_objFlags": 0,
"_parent": {
"__id__": 162
"__id__": 163
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 164
"__id__": 165
}
],
"_prefab": null,
......@@ -8354,7 +8425,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 163
"__id__": 164
},
"_enabled": true,
"_materials": [
......@@ -8389,7 +8460,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 162
"__id__": 163
},
"_enabled": true,
"_materials": [
......@@ -8421,17 +8492,17 @@
"_name": "t3",
"_objFlags": 0,
"_parent": {
"__id__": 161
"__id__": 162
},
"_children": [
{
"__id__": 167
"__id__": 168
}
],
"_active": true,
"_components": [
{
"__id__": 169
"__id__": 170
}
],
"_prefab": null,
......@@ -8487,13 +8558,13 @@
"_name": "word",
"_objFlags": 0,
"_parent": {
"__id__": 166
"__id__": 167
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 168
"__id__": 169
}
],
"_prefab": null,
......@@ -8549,7 +8620,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 167
"__id__": 168
},
"_enabled": true,
"_materials": [
......@@ -8584,7 +8655,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 166
"__id__": 167
},
"_enabled": true,
"_materials": [
......@@ -8616,17 +8687,17 @@
"_name": "t4",
"_objFlags": 0,
"_parent": {
"__id__": 161
"__id__": 162
},
"_children": [
{
"__id__": 171
"__id__": 172
}
],
"_active": true,
"_components": [
{
"__id__": 173
"__id__": 174
}
],
"_prefab": null,
......@@ -8682,13 +8753,13 @@
"_name": "word",
"_objFlags": 0,
"_parent": {
"__id__": 170
"__id__": 171
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 172
"__id__": 173
}
],
"_prefab": null,
......@@ -8744,7 +8815,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 171
"__id__": 172
},
"_enabled": true,
"_materials": [
......@@ -8779,7 +8850,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 170
"__id__": 171
},
"_enabled": true,
"_materials": [
......@@ -8811,17 +8882,17 @@
"_name": "t5",
"_objFlags": 0,
"_parent": {
"__id__": 161
"__id__": 162
},
"_children": [
{
"__id__": 175
"__id__": 176
}
],
"_active": true,
"_components": [
{
"__id__": 177
"__id__": 178
}
],
"_prefab": null,
......@@ -8877,13 +8948,13 @@
"_name": "word",
"_objFlags": 0,
"_parent": {
"__id__": 174
"__id__": 175
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 176
"__id__": 177
}
],
"_prefab": null,
......@@ -8939,7 +9010,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 175
"__id__": 176
},
"_enabled": true,
"_materials": [
......@@ -8974,7 +9045,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 174
"__id__": 175
},
"_enabled": true,
"_materials": [
......@@ -9006,17 +9077,17 @@
"_name": "t6",
"_objFlags": 0,
"_parent": {
"__id__": 161
"__id__": 162
},
"_children": [
{
"__id__": 179
"__id__": 180
}
],
"_active": true,
"_components": [
{
"__id__": 181
"__id__": 182
}
],
"_prefab": null,
......@@ -9072,13 +9143,13 @@
"_name": "word",
"_objFlags": 0,
"_parent": {
"__id__": 178
"__id__": 179
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 180
"__id__": 181
}
],
"_prefab": null,
......@@ -9134,7 +9205,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 179
"__id__": 180
},
"_enabled": true,
"_materials": [
......@@ -9169,7 +9240,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 178
"__id__": 179
},
"_enabled": true,
"_materials": [
......@@ -9201,17 +9272,17 @@
"_name": "t7",
"_objFlags": 0,
"_parent": {
"__id__": 161
"__id__": 162
},
"_children": [
{
"__id__": 183
"__id__": 184
}
],
"_active": true,
"_components": [
{
"__id__": 185
"__id__": 186
}
],
"_prefab": null,
......@@ -9267,13 +9338,13 @@
"_name": "word",
"_objFlags": 0,
"_parent": {
"__id__": 182
"__id__": 183
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 184
"__id__": 185
}
],
"_prefab": null,
......@@ -9329,7 +9400,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 183
"__id__": 184
},
"_enabled": true,
"_materials": [
......@@ -9364,7 +9435,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 182
"__id__": 183
},
"_enabled": true,
"_materials": [
......@@ -9396,17 +9467,17 @@
"_name": "t8",
"_objFlags": 0,
"_parent": {
"__id__": 161
"__id__": 162
},
"_children": [
{
"__id__": 187
"__id__": 188
}
],
"_active": true,
"_components": [
{
"__id__": 189
"__id__": 190
}
],
"_prefab": null,
......@@ -9462,13 +9533,13 @@
"_name": "word",
"_objFlags": 0,
"_parent": {
"__id__": 186
"__id__": 187
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 188
"__id__": 189
}
],
"_prefab": null,
......@@ -9524,7 +9595,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 187
"__id__": 188
},
"_enabled": true,
"_materials": [
......@@ -9559,7 +9630,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 186
"__id__": 187
},
"_enabled": true,
"_materials": [
......@@ -9591,17 +9662,17 @@
"_name": "t9",
"_objFlags": 0,
"_parent": {
"__id__": 161
"__id__": 162
},
"_children": [
{
"__id__": 191
"__id__": 192
}
],
"_active": true,
"_components": [
{
"__id__": 193
"__id__": 194
}
],
"_prefab": null,
......@@ -9657,13 +9728,13 @@
"_name": "word",
"_objFlags": 0,
"_parent": {
"__id__": 190
"__id__": 191
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 192
"__id__": 193
}
],
"_prefab": null,
......@@ -9719,7 +9790,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 191
"__id__": 192
},
"_enabled": true,
"_materials": [
......@@ -9754,7 +9825,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 190
"__id__": 191
},
"_enabled": true,
"_materials": [
......@@ -9786,7 +9857,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 161
"__id__": 162
},
"_enabled": true,
"alignMode": 1,
......@@ -9813,16 +9884,16 @@
"_name": "alligator_img",
"_objFlags": 512,
"_parent": {
"__id__": 160
"__id__": 161
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 196
"__id__": 197
},
{
"__id__": 197
"__id__": 198
}
],
"_prefab": null,
......@@ -9878,7 +9949,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 195
"__id__": 196
},
"_enabled": true,
"_materials": [
......@@ -9910,7 +9981,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 195
"__id__": 196
},
"_enabled": true,
"alignMode": 1,
......@@ -9937,7 +10008,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 160
"__id__": 161
},
"_enabled": true,
"_materials": [
......@@ -9969,7 +10040,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 160
"__id__": 161
},
"_enabled": true,
"alignMode": 1,
......@@ -10059,19 +10130,19 @@
},
"_children": [
{
"__id__": 203
"__id__": 204
},
{
"__id__": 206
"__id__": 207
}
],
"_active": false,
"_components": [
{
"__id__": 208
"__id__": 209
},
{
"__id__": 209
"__id__": 210
}
],
"_prefab": null,
......@@ -10127,16 +10198,16 @@
"_name": "start_bg",
"_objFlags": 0,
"_parent": {
"__id__": 202
"__id__": 203
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 204
"__id__": 205
},
{
"__id__": 205
"__id__": 206
}
],
"_prefab": null,
......@@ -10192,7 +10263,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 203
"__id__": 204
},
"_enabled": true,
"_materials": [
......@@ -10224,7 +10295,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 203
"__id__": 204
},
"_enabled": true,
"alignMode": 1,
......@@ -10251,13 +10322,13 @@
"_name": "start",
"_objFlags": 0,
"_parent": {
"__id__": 202
"__id__": 203
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 207
"__id__": 208
}
],
"_prefab": null,
......@@ -10313,7 +10384,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 206
"__id__": 207
},
"_enabled": true,
"_materials": [
......@@ -10345,7 +10416,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 202
"__id__": 203
},
"_enabled": true,
"_normalMaterial": null,
......@@ -10406,7 +10477,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 202
"__id__": 203
},
"_id": "dcCiAjNMREj6CcPYJOxYXZ"
},
......@@ -10415,7 +10486,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 202
"__id__": 203
},
"_enabled": true,
"alignMode": 1,
......@@ -10448,7 +10519,7 @@
"_active": false,
"_components": [
{
"__id__": 211
"__id__": 212
}
],
"_prefab": null,
......@@ -10504,7 +10575,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 210
"__id__": 211
},
"_enabled": true,
"_cullingMask": 2,
......@@ -10544,32 +10615,32 @@
},
"_children": [
{
"__id__": 213
"__id__": 214
},
{
"__id__": 217
"__id__": 218
},
{
"__id__": 221
"__id__": 222
},
{
"__id__": 225
"__id__": 226
},
{
"__id__": 234
"__id__": 235
}
],
"_active": true,
"_components": [
{
"__id__": 254
"__id__": 255
},
{
"__id__": 255
"__id__": 256
}
],
"_prefab": {
"__id__": 256
"__id__": 257
},
"_opacity": 255,
"_color": {
......@@ -10623,20 +10694,20 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 212
"__id__": 213
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 214
"__id__": 215
},
{
"__id__": 215
"__id__": 216
}
],
"_prefab": {
"__id__": 216
"__id__": 217
},
"_opacity": 255,
"_color": {
......@@ -10690,7 +10761,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 213
"__id__": 214
},
"_enabled": true,
"_materials": [
......@@ -10722,7 +10793,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 213
"__id__": 214
},
"_enabled": true,
"alignMode": 1,
......@@ -10747,7 +10818,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 212
"__id__": 213
},
"asset": {
"__uuid__": "3fc9f999-6ccd-4605-869d-34e1d9d8a6b8"
......@@ -10760,20 +10831,20 @@
"_name": "layout",
"_objFlags": 0,
"_parent": {
"__id__": 212
"__id__": 213
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 218
"__id__": 219
},
{
"__id__": 219
"__id__": 220
}
],
"_prefab": {
"__id__": 220
"__id__": 221
},
"_opacity": 255,
"_color": {
......@@ -10827,7 +10898,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 217
"__id__": 218
},
"_enabled": true,
"_layoutSize": {
......@@ -10859,7 +10930,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 217
"__id__": 218
},
"_enabled": true,
"alignMode": 1,
......@@ -10884,7 +10955,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 212
"__id__": 213
},
"asset": {
"__uuid__": "3fc9f999-6ccd-4605-869d-34e1d9d8a6b8"
......@@ -10897,20 +10968,20 @@
"_name": "label",
"_objFlags": 0,
"_parent": {
"__id__": 212
"__id__": 213
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 222
"__id__": 223
},
{
"__id__": 223
"__id__": 224
}
],
"_prefab": {
"__id__": 224
"__id__": 225
},
"_opacity": 255,
"_color": {
......@@ -10964,7 +11035,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 221
"__id__": 222
},
"_enabled": true,
"_materials": [
......@@ -10999,7 +11070,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 221
"__id__": 222
},
"_enabled": true,
"alignMode": 2,
......@@ -11024,7 +11095,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 212
"__id__": 213
},
"asset": {
"__uuid__": "3fc9f999-6ccd-4605-869d-34e1d9d8a6b8"
......@@ -11037,27 +11108,27 @@
"_name": "progressBar",
"_objFlags": 0,
"_parent": {
"__id__": 212
"__id__": 213
},
"_children": [
{
"__id__": 226
"__id__": 227
}
],
"_active": true,
"_components": [
{
"__id__": 230
},
{
"__id__": 231
},
{
"__id__": 232
},
{
"__id__": 233
}
],
"_prefab": {
"__id__": 233
"__id__": 234
},
"_opacity": 255,
"_color": {
......@@ -11111,20 +11182,20 @@
"_name": "bar",
"_objFlags": 512,
"_parent": {
"__id__": 225
"__id__": 226
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 227
"__id__": 228
},
{
"__id__": 228
"__id__": 229
}
],
"_prefab": {
"__id__": 229
"__id__": 230
},
"_opacity": 255,
"_color": {
......@@ -11178,7 +11249,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 226
"__id__": 227
},
"_enabled": true,
"_materials": [
......@@ -11210,7 +11281,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 226
"__id__": 227
},
"_enabled": true,
"alignMode": 1,
......@@ -11235,7 +11306,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 212
"__id__": 213
},
"asset": {
"__uuid__": "3fc9f999-6ccd-4605-869d-34e1d9d8a6b8"
......@@ -11248,7 +11319,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 225
"__id__": 226
},
"_enabled": true,
"_materials": [
......@@ -11280,12 +11351,12 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 225
"__id__": 226
},
"_enabled": true,
"_N$totalLength": 1568,
"_N$barSprite": {
"__id__": 227
"__id__": 228
},
"_N$mode": 0,
"_N$progress": 0.1,
......@@ -11297,7 +11368,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 225
"__id__": 226
},
"_enabled": true,
"alignMode": 2,
......@@ -11322,7 +11393,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 212
"__id__": 213
},
"asset": {
"__uuid__": "3fc9f999-6ccd-4605-869d-34e1d9d8a6b8"
......@@ -11335,29 +11406,29 @@
"_name": "head",
"_objFlags": 0,
"_parent": {
"__id__": 212
"__id__": 213
},
"_children": [
{
"__id__": 235
"__id__": 236
},
{
"__id__": 238
"__id__": 239
},
{
"__id__": 244
"__id__": 245
},
{
"__id__": 247
"__id__": 248
},
{
"__id__": 250
"__id__": 251
}
],
"_active": true,
"_components": [],
"_prefab": {
"__id__": 253
"__id__": 254
},
"_opacity": 255,
"_color": {
......@@ -11411,17 +11482,17 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 234
"__id__": 235
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 236
"__id__": 237
}
],
"_prefab": {
"__id__": 237
"__id__": 238
},
"_opacity": 255,
"_color": {
......@@ -11475,7 +11546,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 235
"__id__": 236
},
"_enabled": true,
"_materials": [
......@@ -11505,7 +11576,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 212
"__id__": 213
},
"asset": {
"__uuid__": "3fc9f999-6ccd-4605-869d-34e1d9d8a6b8"
......@@ -11518,21 +11589,21 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 234
"__id__": 235
},
"_children": [
{
"__id__": 239
"__id__": 240
}
],
"_active": true,
"_components": [
{
"__id__": 242
"__id__": 243
}
],
"_prefab": {
"__id__": 243
"__id__": 244
},
"_opacity": 255,
"_color": {
......@@ -11586,17 +11657,17 @@
"_name": "headImg",
"_objFlags": 0,
"_parent": {
"__id__": 238
"__id__": 239
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 240
"__id__": 241
}
],
"_prefab": {
"__id__": 241
"__id__": 242
},
"_opacity": 255,
"_color": {
......@@ -11650,7 +11721,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 239
"__id__": 240
},
"_enabled": true,
"_materials": [
......@@ -11680,7 +11751,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 212
"__id__": 213
},
"asset": {
"__uuid__": "3fc9f999-6ccd-4605-869d-34e1d9d8a6b8"
......@@ -11693,7 +11764,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 238
"__id__": 239
},
"_enabled": true,
"_materials": [
......@@ -11713,7 +11784,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 212
"__id__": 213
},
"asset": {
"__uuid__": "3fc9f999-6ccd-4605-869d-34e1d9d8a6b8"
......@@ -11726,17 +11797,17 @@
"_name": "frame",
"_objFlags": 0,
"_parent": {
"__id__": 234
"__id__": 235
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 245
"__id__": 246
}
],
"_prefab": {
"__id__": 246
"__id__": 247
},
"_opacity": 255,
"_color": {
......@@ -11790,7 +11861,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 244
"__id__": 245
},
"_enabled": true,
"_materials": [
......@@ -11820,7 +11891,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 212
"__id__": 213
},
"asset": {
"__uuid__": "3fc9f999-6ccd-4605-869d-34e1d9d8a6b8"
......@@ -11833,17 +11904,17 @@
"_name": "frame_self",
"_objFlags": 0,
"_parent": {
"__id__": 234
"__id__": 235
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 248
"__id__": 249
}
],
"_prefab": {
"__id__": 249
"__id__": 250
},
"_opacity": 255,
"_color": {
......@@ -11897,7 +11968,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 247
"__id__": 248
},
"_enabled": true,
"_materials": [
......@@ -11927,7 +11998,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 212
"__id__": 213
},
"asset": {
"__uuid__": "3fc9f999-6ccd-4605-869d-34e1d9d8a6b8"
......@@ -11940,17 +12011,17 @@
"_name": "name",
"_objFlags": 0,
"_parent": {
"__id__": 234
"__id__": 235
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 251
"__id__": 252
}
],
"_prefab": {
"__id__": 252
"__id__": 253
},
"_opacity": 255,
"_color": {
......@@ -12004,7 +12075,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 250
"__id__": 251
},
"_enabled": true,
"_materials": [
......@@ -12037,7 +12108,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 212
"__id__": 213
},
"asset": {
"__uuid__": "3fc9f999-6ccd-4605-869d-34e1d9d8a6b8"
......@@ -12048,7 +12119,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 212
"__id__": 213
},
"asset": {
"__uuid__": "3fc9f999-6ccd-4605-869d-34e1d9d8a6b8"
......@@ -12061,7 +12132,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 212
"__id__": 213
},
"_enabled": true,
"alignMode": 2,
......@@ -12088,7 +12159,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 212
"__id__": 213
},
"_enabled": true,
"_id": "a4jtPj/itCEpEs6F8iLtKd"
......@@ -12096,7 +12167,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 212
"__id__": 213
},
"asset": {
"__uuid__": "3fc9f999-6ccd-4605-869d-34e1d9d8a6b8"
......@@ -12169,10 +12240,10 @@
"__id__": 15
},
"coolcat": {
"__id__": 155
"__id__": 156
},
"btn_submit": {
"__id__": 154
"__id__": 155
},
"btn_next": {
"__id__": 13
......@@ -12238,13 +12309,13 @@
},
"_children": [
{
"__id__": 261
"__id__": 262
},
{
"__id__": 278
"__id__": 279
},
{
"__id__": 309
"__id__": 310
}
],
"_active": true,
......@@ -12302,32 +12373,32 @@
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 260
"__id__": 261
},
"_children": [
{
"__id__": 262
"__id__": 263
},
{
"__id__": 264
"__id__": 265
},
{
"__id__": 266
"__id__": 267
},
{
"__id__": 268
"__id__": 269
},
{
"__id__": 270
"__id__": 271
},
{
"__id__": 272
"__id__": 273
},
{
"__id__": 274
"__id__": 275
},
{
"__id__": 276
"__id__": 277
}
],
"_active": false,
......@@ -12385,13 +12456,13 @@
"_name": "name_bg",
"_objFlags": 0,
"_parent": {
"__id__": 261
"__id__": 262
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 263
"__id__": 264
}
],
"_prefab": null,
......@@ -12447,7 +12518,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 262
"__id__": 263
},
"_enabled": true,
"_materials": [
......@@ -12479,13 +12550,13 @@
"_name": "time_strip",
"_objFlags": 0,
"_parent": {
"__id__": 261
"__id__": 262
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 265
"__id__": 266
}
],
"_prefab": null,
......@@ -12541,7 +12612,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 264
"__id__": 265
},
"_enabled": true,
"_materials": [
......@@ -12573,13 +12644,13 @@
"_name": "time_strip_bg",
"_objFlags": 0,
"_parent": {
"__id__": 261
"__id__": 262
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 267
"__id__": 268
}
],
"_prefab": null,
......@@ -12635,7 +12706,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 266
"__id__": 267
},
"_enabled": true,
"_materials": [
......@@ -12667,13 +12738,13 @@
"_name": "online_bg",
"_objFlags": 0,
"_parent": {
"__id__": 261
"__id__": 262
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 269
"__id__": 270
}
],
"_prefab": null,
......@@ -12729,7 +12800,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 268
"__id__": 269
},
"_enabled": true,
"_materials": [
......@@ -12761,13 +12832,13 @@
"_name": "smiling_face",
"_objFlags": 0,
"_parent": {
"__id__": 261
"__id__": 262
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 271
"__id__": 272
}
],
"_prefab": null,
......@@ -12823,7 +12894,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 270
"__id__": 271
},
"_enabled": true,
"_materials": [
......@@ -12855,13 +12926,13 @@
"_name": "star",
"_objFlags": 0,
"_parent": {
"__id__": 261
"__id__": 262
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 273
"__id__": 274
}
],
"_prefab": null,
......@@ -12917,7 +12988,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 272
"__id__": 273
},
"_enabled": true,
"_materials": [
......@@ -12949,13 +13020,13 @@
"_name": "me",
"_objFlags": 0,
"_parent": {
"__id__": 261
"__id__": 262
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 275
"__id__": 276
}
],
"_prefab": null,
......@@ -13011,7 +13082,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 274
"__id__": 275
},
"_enabled": true,
"_materials": [
......@@ -13043,13 +13114,13 @@
"_name": "score_bg",
"_objFlags": 0,
"_parent": {
"__id__": 261
"__id__": 262
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 277
"__id__": 278
}
],
"_prefab": null,
......@@ -13105,7 +13176,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 276
"__id__": 277
},
"_enabled": true,
"_materials": [
......@@ -13137,53 +13208,53 @@
"_name": "audio",
"_objFlags": 0,
"_parent": {
"__id__": 260
"__id__": 261
},
"_children": [
{
"__id__": 279
"__id__": 280
},
{
"__id__": 281
"__id__": 282
},
{
"__id__": 283
"__id__": 284
},
{
"__id__": 285
"__id__": 286
},
{
"__id__": 287
"__id__": 288
},
{
"__id__": 289
"__id__": 290
},
{
"__id__": 291
"__id__": 292
},
{
"__id__": 293
"__id__": 294
},
{
"__id__": 295
"__id__": 296
},
{
"__id__": 297
"__id__": 298
},
{
"__id__": 299
"__id__": 300
},
{
"__id__": 301
"__id__": 302
},
{
"__id__": 303
"__id__": 304
},
{
"__id__": 305
"__id__": 306
},
{
"__id__": 307
"__id__": 308
}
],
"_active": true,
......@@ -13241,13 +13312,13 @@
"_name": "result_1",
"_objFlags": 0,
"_parent": {
"__id__": 278
"__id__": 279
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 280
"__id__": 281
}
],
"_prefab": null,
......@@ -13303,7 +13374,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 279
"__id__": 280
},
"_enabled": true,
"_clip": {
......@@ -13322,13 +13393,13 @@
"_name": "result_2",
"_objFlags": 0,
"_parent": {
"__id__": 278
"__id__": 279
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 282
"__id__": 283
}
],
"_prefab": null,
......@@ -13384,7 +13455,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 281
"__id__": 282
},
"_enabled": true,
"_clip": {
......@@ -13403,13 +13474,13 @@
"_name": "result_3",
"_objFlags": 0,
"_parent": {
"__id__": 278
"__id__": 279
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 284
"__id__": 285
}
],
"_prefab": null,
......@@ -13465,7 +13536,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 283
"__id__": 284
},
"_enabled": true,
"_clip": {
......@@ -13484,13 +13555,13 @@
"_name": "result_4",
"_objFlags": 0,
"_parent": {
"__id__": 278
"__id__": 279
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 286
"__id__": 287
}
],
"_prefab": null,
......@@ -13546,7 +13617,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 285
"__id__": 286
},
"_enabled": true,
"_clip": {
......@@ -13565,13 +13636,13 @@
"_name": "result_5",
"_objFlags": 0,
"_parent": {
"__id__": 278
"__id__": 279
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 288
"__id__": 289
}
],
"_prefab": null,
......@@ -13627,7 +13698,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 287
"__id__": 288
},
"_enabled": true,
"_clip": {
......@@ -13646,13 +13717,13 @@
"_name": "tip_result",
"_objFlags": 0,
"_parent": {
"__id__": 278
"__id__": 279
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 290
"__id__": 291
}
],
"_prefab": null,
......@@ -13708,7 +13779,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 289
"__id__": 290
},
"_enabled": true,
"_clip": {
......@@ -13727,13 +13798,13 @@
"_name": "button",
"_objFlags": 0,
"_parent": {
"__id__": 278
"__id__": 279
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 292
"__id__": 293
}
],
"_prefab": null,
......@@ -13789,7 +13860,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 291
"__id__": 292
},
"_enabled": true,
"_clip": {
......@@ -13808,13 +13879,13 @@
"_name": "click",
"_objFlags": 0,
"_parent": {
"__id__": 278
"__id__": 279
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 294
"__id__": 295
}
],
"_prefab": null,
......@@ -13870,7 +13941,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 293
"__id__": 294
},
"_enabled": true,
"_clip": {
......@@ -13889,13 +13960,13 @@
"_name": "correct",
"_objFlags": 0,
"_parent": {
"__id__": 278
"__id__": 279
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 296
"__id__": 297
}
],
"_prefab": null,
......@@ -13951,7 +14022,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 295
"__id__": 296
},
"_enabled": true,
"_clip": {
......@@ -13970,13 +14041,13 @@
"_name": "finish",
"_objFlags": 0,
"_parent": {
"__id__": 278
"__id__": 279
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 298
"__id__": 299
}
],
"_prefab": null,
......@@ -14032,7 +14103,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 297
"__id__": 298
},
"_enabled": true,
"_clip": {
......@@ -14051,13 +14122,13 @@
"_name": "incorrect",
"_objFlags": 0,
"_parent": {
"__id__": 278
"__id__": 279
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 300
"__id__": 301
}
],
"_prefab": null,
......@@ -14113,7 +14184,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 299
"__id__": 300
},
"_enabled": true,
"_clip": {
......@@ -14132,13 +14203,13 @@
"_name": "lack",
"_objFlags": 0,
"_parent": {
"__id__": 278
"__id__": 279
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 302
"__id__": 303
}
],
"_prefab": null,
......@@ -14194,7 +14265,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 301
"__id__": 302
},
"_enabled": true,
"_clip": {
......@@ -14213,13 +14284,13 @@
"_name": "painted",
"_objFlags": 0,
"_parent": {
"__id__": 278
"__id__": 279
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 304
"__id__": 305
}
],
"_prefab": null,
......@@ -14275,7 +14346,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 303
"__id__": 304
},
"_enabled": true,
"_clip": {
......@@ -14294,13 +14365,13 @@
"_name": "star",
"_objFlags": 0,
"_parent": {
"__id__": 278
"__id__": 279
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 306
"__id__": 307
}
],
"_prefab": null,
......@@ -14356,7 +14427,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 305
"__id__": 306
},
"_enabled": true,
"_clip": {
......@@ -14375,13 +14446,13 @@
"_name": "demo",
"_objFlags": 0,
"_parent": {
"__id__": 278
"__id__": 279
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 308
"__id__": 309
}
],
"_prefab": null,
......@@ -14437,7 +14508,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 307
"__id__": 308
},
"_enabled": true,
"_clip": {
......@@ -14456,11 +14527,11 @@
"_name": "font",
"_objFlags": 0,
"_parent": {
"__id__": 260
"__id__": 261
},
"_children": [
{
"__id__": 310
"__id__": 311
}
],
"_active": false,
......@@ -14518,13 +14589,13 @@
"_name": "MMTextBook-Bold",
"_objFlags": 0,
"_parent": {
"__id__": 309
"__id__": 310
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 311
"__id__": 312
}
],
"_prefab": null,
......@@ -14580,7 +14651,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 310
"__id__": 311
},
"_enabled": true,
"_materials": [
......
......@@ -206,7 +206,18 @@ cc.Class({
// this.playAudioByName('click');
// });
// }
this.paint.on("click",()=>{
if (this._can_tap != true)
return;
this._can_tap=false;
cc.log("paint 点击");
playDragonBoneAnimation(this.coolcat, 'wrong', -1);
this.playAudioByUrl(this.data.wrongAudio,()=>{
playDragonBoneAnimation(this.coolcat, 'normal', -1);
this._can_tap = true;
})
})
this.paint.active = false;
this.paint2.active = false;
this.color_paint.active = false;
......@@ -1553,7 +1564,7 @@ cc.Class({
// if (sprite.painted == true)
// return;
this._can_tap = false;
if (this.color_selector.active == false)
return;
console.log('area:' + sprite.t_idx);
......
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