Commit 49fc61f9 authored by 张世斌's avatar 张世斌

1.修复bug

parent 315dbab3
......@@ -17,10 +17,10 @@
"__id__": 2
},
{
"__id__": 163
"__id__": 164
},
{
"__id__": 199
"__id__": 200
}
],
"_active": false,
......@@ -81,22 +81,22 @@
"__id__": 5
},
{
"__id__": 150
"__id__": 151
},
{
"__id__": 158
"__id__": 159
}
],
"_active": true,
"_components": [
{
"__id__": 160
},
{
"__id__": 161
},
{
"__id__": 162
},
{
"__id__": 163
}
],
"_prefab": null,
......@@ -272,22 +272,22 @@
"__id__": 75
},
{
"__id__": 85
"__id__": 86
},
{
"__id__": 97
"__id__": 98
},
{
"__id__": 139
"__id__": 140
}
],
"_active": true,
"_components": [
{
"__id__": 148
"__id__": 149
},
{
"__id__": 149
"__id__": 150
}
],
"_prefab": null,
......@@ -3951,7 +3951,7 @@
"_active": true,
"_components": [
{
"__id__": 84
"__id__": 85
}
],
"_prefab": null,
......@@ -4024,6 +4024,9 @@
},
{
"__id__": 83
},
{
"__id__": 84
}
],
"_prefab": null,
......@@ -4344,6 +4347,74 @@
"_originalHeight": 0,
"_id": "32X9P5qPtEFrFaXmrHnv3z"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 76
},
"_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": "a8RXw0G/1AI6X71k7jhNq0"
},
{
"__type__": "cc.Widget",
"_name": "",
......@@ -4380,19 +4451,19 @@
},
"_children": [
{
"__id__": 86
"__id__": 87
},
{
"__id__": 90
"__id__": 91
},
{
"__id__": 93
"__id__": 94
}
],
"_active": true,
"_components": [
{
"__id__": 96
"__id__": 97
}
],
"_prefab": null,
......@@ -4448,19 +4519,19 @@
"_name": "btn_submit",
"_objFlags": 0,
"_parent": {
"__id__": 85
"__id__": 86
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 87
},
{
"__id__": 88
},
{
"__id__": 89
},
{
"__id__": 90
}
],
"_prefab": null,
......@@ -4516,7 +4587,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 86
"__id__": 87
},
"_enabled": true,
"_materials": [
......@@ -4548,7 +4619,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 86
"__id__": 87
},
"_enabled": true,
"alignMode": 1,
......@@ -4575,7 +4646,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 86
"__id__": 87
},
"_enabled": true,
"_normalMaterial": null,
......@@ -4643,16 +4714,16 @@
"_name": "coolcat",
"_objFlags": 0,
"_parent": {
"__id__": 85
"__id__": 86
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 91
"__id__": 92
},
{
"__id__": 92
"__id__": 93
}
],
"_prefab": null,
......@@ -4708,7 +4779,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 90
"__id__": 91
},
"_enabled": true,
"_materials": [
......@@ -4748,7 +4819,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 90
"__id__": 91
},
"_enabled": true,
"alignMode": 1,
......@@ -4775,16 +4846,16 @@
"_name": "BtnCoolCat",
"_objFlags": 0,
"_parent": {
"__id__": 85
"__id__": 86
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 94
"__id__": 95
},
{
"__id__": 95
"__id__": 96
}
],
"_prefab": null,
......@@ -4840,7 +4911,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 93
"__id__": 94
},
"_enabled": true,
"alignMode": 1,
......@@ -4867,7 +4938,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 93
"__id__": 94
},
"_enabled": true,
"_normalMaterial": null,
......@@ -4935,7 +5006,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 85
"__id__": 86
},
"_enabled": true,
"alignMode": 1,
......@@ -4966,13 +5037,13 @@
},
"_children": [
{
"__id__": 98
"__id__": 99
}
],
"_active": false,
"_components": [
{
"__id__": 138
"__id__": 139
}
],
"_prefab": null,
......@@ -5028,23 +5099,23 @@
"_name": "paint",
"_objFlags": 512,
"_parent": {
"__id__": 97
"__id__": 98
},
"_children": [
{
"__id__": 99
"__id__": 100
},
{
"__id__": 133
"__id__": 134
}
],
"_active": true,
"_components": [
{
"__id__": 136
"__id__": 137
},
{
"__id__": 137
"__id__": 138
}
],
"_prefab": null,
......@@ -5100,38 +5171,38 @@
"_name": "alligator",
"_objFlags": 512,
"_parent": {
"__id__": 98
"__id__": 99
},
"_children": [
{
"__id__": 100
"__id__": 101
},
{
"__id__": 104
"__id__": 105
},
{
"__id__": 108
"__id__": 109
},
{
"__id__": 112
"__id__": 113
},
{
"__id__": 116
"__id__": 117
},
{
"__id__": 120
"__id__": 121
},
{
"__id__": 124
"__id__": 125
},
{
"__id__": 128
"__id__": 129
}
],
"_active": true,
"_components": [
{
"__id__": 132
"__id__": 133
}
],
"_prefab": null,
......@@ -5187,17 +5258,17 @@
"_name": "t2",
"_objFlags": 0,
"_parent": {
"__id__": 99
"__id__": 100
},
"_children": [
{
"__id__": 101
"__id__": 102
}
],
"_active": true,
"_components": [
{
"__id__": 103
"__id__": 104
}
],
"_prefab": null,
......@@ -5253,13 +5324,13 @@
"_name": "word",
"_objFlags": 0,
"_parent": {
"__id__": 100
"__id__": 101
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 102
"__id__": 103
}
],
"_prefab": null,
......@@ -5315,7 +5386,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 101
"__id__": 102
},
"_enabled": true,
"_materials": [
......@@ -5350,7 +5421,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 100
"__id__": 101
},
"_enabled": true,
"_materials": [
......@@ -5382,17 +5453,17 @@
"_name": "t3",
"_objFlags": 0,
"_parent": {
"__id__": 99
"__id__": 100
},
"_children": [
{
"__id__": 105
"__id__": 106
}
],
"_active": true,
"_components": [
{
"__id__": 107
"__id__": 108
}
],
"_prefab": null,
......@@ -5448,13 +5519,13 @@
"_name": "word",
"_objFlags": 0,
"_parent": {
"__id__": 104
"__id__": 105
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 106
"__id__": 107
}
],
"_prefab": null,
......@@ -5510,7 +5581,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 105
"__id__": 106
},
"_enabled": true,
"_materials": [
......@@ -5545,7 +5616,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 104
"__id__": 105
},
"_enabled": true,
"_materials": [
......@@ -5577,17 +5648,17 @@
"_name": "t4",
"_objFlags": 0,
"_parent": {
"__id__": 99
"__id__": 100
},
"_children": [
{
"__id__": 109
"__id__": 110
}
],
"_active": true,
"_components": [
{
"__id__": 111
"__id__": 112
}
],
"_prefab": null,
......@@ -5643,13 +5714,13 @@
"_name": "word",
"_objFlags": 0,
"_parent": {
"__id__": 108
"__id__": 109
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 110
"__id__": 111
}
],
"_prefab": null,
......@@ -5705,7 +5776,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 109
"__id__": 110
},
"_enabled": true,
"_materials": [
......@@ -5740,7 +5811,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 108
"__id__": 109
},
"_enabled": true,
"_materials": [
......@@ -5772,17 +5843,17 @@
"_name": "t5",
"_objFlags": 0,
"_parent": {
"__id__": 99
"__id__": 100
},
"_children": [
{
"__id__": 113
"__id__": 114
}
],
"_active": true,
"_components": [
{
"__id__": 115
"__id__": 116
}
],
"_prefab": null,
......@@ -5838,13 +5909,13 @@
"_name": "word",
"_objFlags": 0,
"_parent": {
"__id__": 112
"__id__": 113
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 114
"__id__": 115
}
],
"_prefab": null,
......@@ -5900,7 +5971,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 113
"__id__": 114
},
"_enabled": true,
"_materials": [
......@@ -5935,7 +6006,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 112
"__id__": 113
},
"_enabled": true,
"_materials": [
......@@ -5967,17 +6038,17 @@
"_name": "t6",
"_objFlags": 0,
"_parent": {
"__id__": 99
"__id__": 100
},
"_children": [
{
"__id__": 117
"__id__": 118
}
],
"_active": true,
"_components": [
{
"__id__": 119
"__id__": 120
}
],
"_prefab": null,
......@@ -6033,13 +6104,13 @@
"_name": "word",
"_objFlags": 0,
"_parent": {
"__id__": 116
"__id__": 117
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 118
"__id__": 119
}
],
"_prefab": null,
......@@ -6095,7 +6166,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 117
"__id__": 118
},
"_enabled": true,
"_materials": [
......@@ -6130,7 +6201,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 116
"__id__": 117
},
"_enabled": true,
"_materials": [
......@@ -6162,17 +6233,17 @@
"_name": "t7",
"_objFlags": 0,
"_parent": {
"__id__": 99
"__id__": 100
},
"_children": [
{
"__id__": 121
"__id__": 122
}
],
"_active": true,
"_components": [
{
"__id__": 123
"__id__": 124
}
],
"_prefab": null,
......@@ -6228,13 +6299,13 @@
"_name": "word",
"_objFlags": 0,
"_parent": {
"__id__": 120
"__id__": 121
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 122
"__id__": 123
}
],
"_prefab": null,
......@@ -6290,7 +6361,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 121
"__id__": 122
},
"_enabled": true,
"_materials": [
......@@ -6325,7 +6396,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 120
"__id__": 121
},
"_enabled": true,
"_materials": [
......@@ -6357,17 +6428,17 @@
"_name": "t8",
"_objFlags": 0,
"_parent": {
"__id__": 99
"__id__": 100
},
"_children": [
{
"__id__": 125
"__id__": 126
}
],
"_active": true,
"_components": [
{
"__id__": 127
"__id__": 128
}
],
"_prefab": null,
......@@ -6423,13 +6494,13 @@
"_name": "word",
"_objFlags": 0,
"_parent": {
"__id__": 124
"__id__": 125
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 126
"__id__": 127
}
],
"_prefab": null,
......@@ -6485,7 +6556,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 125
"__id__": 126
},
"_enabled": true,
"_materials": [
......@@ -6520,7 +6591,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 124
"__id__": 125
},
"_enabled": true,
"_materials": [
......@@ -6552,17 +6623,17 @@
"_name": "t9",
"_objFlags": 0,
"_parent": {
"__id__": 99
"__id__": 100
},
"_children": [
{
"__id__": 129
"__id__": 130
}
],
"_active": true,
"_components": [
{
"__id__": 131
"__id__": 132
}
],
"_prefab": null,
......@@ -6618,13 +6689,13 @@
"_name": "word",
"_objFlags": 0,
"_parent": {
"__id__": 128
"__id__": 129
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 130
"__id__": 131
}
],
"_prefab": null,
......@@ -6680,7 +6751,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 129
"__id__": 130
},
"_enabled": true,
"_materials": [
......@@ -6715,7 +6786,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 128
"__id__": 129
},
"_enabled": true,
"_materials": [
......@@ -6747,7 +6818,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 99
"__id__": 100
},
"_enabled": true,
"alignMode": 1,
......@@ -6774,16 +6845,16 @@
"_name": "alligator_img",
"_objFlags": 512,
"_parent": {
"__id__": 98
"__id__": 99
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 134
"__id__": 135
},
{
"__id__": 135
"__id__": 136
}
],
"_prefab": null,
......@@ -6839,7 +6910,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 133
"__id__": 134
},
"_enabled": true,
"_materials": [
......@@ -6871,7 +6942,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 133
"__id__": 134
},
"_enabled": true,
"alignMode": 1,
......@@ -6898,7 +6969,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 98
"__id__": 99
},
"_enabled": true,
"_materials": [
......@@ -6928,7 +6999,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 98
"__id__": 99
},
"_enabled": true,
"alignMode": 1,
......@@ -6955,7 +7026,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 97
"__id__": 98
},
"_enabled": true,
"alignMode": 1,
......@@ -6986,22 +7057,22 @@
},
"_children": [
{
"__id__": 140
"__id__": 141
},
{
"__id__": 142
"__id__": 143
},
{
"__id__": 144
"__id__": 145
}
],
"_active": false,
"_components": [
{
"__id__": 146
"__id__": 147
},
{
"__id__": 147
"__id__": 148
}
],
"_prefab": null,
......@@ -7057,13 +7128,13 @@
"_name": "bg_circle2",
"_objFlags": 0,
"_parent": {
"__id__": 139
"__id__": 140
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 141
"__id__": 142
}
],
"_prefab": null,
......@@ -7119,7 +7190,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 140
"__id__": 141
},
"_enabled": true,
"_materials": [
......@@ -7151,13 +7222,13 @@
"_name": "bg_circle",
"_objFlags": 0,
"_parent": {
"__id__": 139
"__id__": 140
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 143
"__id__": 144
}
],
"_prefab": null,
......@@ -7213,7 +7284,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 142
"__id__": 143
},
"_enabled": true,
"_materials": [
......@@ -7245,13 +7316,13 @@
"_name": "btn_replay",
"_objFlags": 0,
"_parent": {
"__id__": 139
"__id__": 140
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 145
"__id__": 146
}
],
"_prefab": null,
......@@ -7307,7 +7378,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 144
"__id__": 145
},
"_enabled": true,
"_materials": [
......@@ -7339,7 +7410,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 139
"__id__": 140
},
"_enabled": true,
"_materials": [
......@@ -7371,7 +7442,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 139
"__id__": 140
},
"_enabled": true,
"_normalMaterial": null,
......@@ -7502,19 +7573,19 @@
},
"_children": [
{
"__id__": 151
"__id__": 152
},
{
"__id__": 154
"__id__": 155
}
],
"_active": false,
"_components": [
{
"__id__": 156
"__id__": 157
},
{
"__id__": 157
"__id__": 158
}
],
"_prefab": null,
......@@ -7570,16 +7641,16 @@
"_name": "start_bg",
"_objFlags": 0,
"_parent": {
"__id__": 150
"__id__": 151
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 152
"__id__": 153
},
{
"__id__": 153
"__id__": 154
}
],
"_prefab": null,
......@@ -7635,7 +7706,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 151
"__id__": 152
},
"_enabled": true,
"_materials": [
......@@ -7667,7 +7738,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 151
"__id__": 152
},
"_enabled": true,
"alignMode": 1,
......@@ -7694,13 +7765,13 @@
"_name": "start",
"_objFlags": 0,
"_parent": {
"__id__": 150
"__id__": 151
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 155
"__id__": 156
}
],
"_prefab": null,
......@@ -7756,7 +7827,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 154
"__id__": 155
},
"_enabled": true,
"_materials": [
......@@ -7788,7 +7859,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 150
"__id__": 151
},
"_enabled": true,
"_normalMaterial": null,
......@@ -7849,7 +7920,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 150
"__id__": 151
},
"_id": "dcCiAjNMREj6CcPYJOxYXZ"
},
......@@ -7858,7 +7929,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 150
"__id__": 151
},
"_enabled": true,
"alignMode": 1,
......@@ -7891,7 +7962,7 @@
"_active": false,
"_components": [
{
"__id__": 159
"__id__": 160
}
],
"_prefab": null,
......@@ -7947,7 +8018,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 158
"__id__": 159
},
"_enabled": true,
"_cullingMask": 2,
......@@ -8043,10 +8114,10 @@
"__id__": 15
},
"coolcat": {
"__id__": 90
"__id__": 91
},
"btn_submit": {
"__id__": 89
"__id__": 90
},
"btn_next": {
"__id__": 13
......@@ -8112,13 +8183,13 @@
},
"_children": [
{
"__id__": 164
"__id__": 165
},
{
"__id__": 177
"__id__": 178
},
{
"__id__": 196
"__id__": 197
}
],
"_active": true,
......@@ -8176,26 +8247,26 @@
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 163
"__id__": 164
},
"_children": [
{
"__id__": 165
"__id__": 166
},
{
"__id__": 167
"__id__": 168
},
{
"__id__": 169
"__id__": 170
},
{
"__id__": 171
"__id__": 172
},
{
"__id__": 173
"__id__": 174
},
{
"__id__": 175
"__id__": 176
}
],
"_active": false,
......@@ -8253,13 +8324,13 @@
"_name": "time_strip",
"_objFlags": 0,
"_parent": {
"__id__": 164
"__id__": 165
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 166
"__id__": 167
}
],
"_prefab": null,
......@@ -8315,7 +8386,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 165
"__id__": 166
},
"_enabled": true,
"_materials": [
......@@ -8345,13 +8416,13 @@
"_name": "time_strip_bg",
"_objFlags": 0,
"_parent": {
"__id__": 164
"__id__": 165
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 168
"__id__": 169
}
],
"_prefab": null,
......@@ -8407,7 +8478,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 167
"__id__": 168
},
"_enabled": true,
"_materials": [
......@@ -8437,13 +8508,13 @@
"_name": "online_bg",
"_objFlags": 0,
"_parent": {
"__id__": 164
"__id__": 165
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 170
"__id__": 171
}
],
"_prefab": null,
......@@ -8499,7 +8570,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 169
"__id__": 170
},
"_enabled": true,
"_materials": [
......@@ -8529,13 +8600,13 @@
"_name": "smiling_face",
"_objFlags": 0,
"_parent": {
"__id__": 164
"__id__": 165
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 172
"__id__": 173
}
],
"_prefab": null,
......@@ -8591,7 +8662,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 171
"__id__": 172
},
"_enabled": true,
"_materials": [
......@@ -8621,13 +8692,13 @@
"_name": "star",
"_objFlags": 0,
"_parent": {
"__id__": 164
"__id__": 165
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 174
"__id__": 175
}
],
"_prefab": null,
......@@ -8683,7 +8754,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 173
"__id__": 174
},
"_enabled": true,
"_materials": [
......@@ -8713,13 +8784,13 @@
"_name": "me",
"_objFlags": 0,
"_parent": {
"__id__": 164
"__id__": 165
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 176
"__id__": 177
}
],
"_prefab": null,
......@@ -8775,7 +8846,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 175
"__id__": 176
},
"_enabled": true,
"_materials": [
......@@ -8805,35 +8876,35 @@
"_name": "audio",
"_objFlags": 0,
"_parent": {
"__id__": 163
"__id__": 164
},
"_children": [
{
"__id__": 178
"__id__": 179
},
{
"__id__": 180
"__id__": 181
},
{
"__id__": 182
"__id__": 183
},
{
"__id__": 184
"__id__": 185
},
{
"__id__": 186
"__id__": 187
},
{
"__id__": 188
"__id__": 189
},
{
"__id__": 190
"__id__": 191
},
{
"__id__": 192
"__id__": 193
},
{
"__id__": 194
"__id__": 195
}
],
"_active": true,
......@@ -8891,13 +8962,13 @@
"_name": "button",
"_objFlags": 0,
"_parent": {
"__id__": 177
"__id__": 178
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 179
"__id__": 180
}
],
"_prefab": null,
......@@ -8953,7 +9024,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 178
"__id__": 179
},
"_enabled": true,
"_clip": {
......@@ -8972,13 +9043,13 @@
"_name": "finish",
"_objFlags": 0,
"_parent": {
"__id__": 177
"__id__": 178
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 181
"__id__": 182
}
],
"_prefab": null,
......@@ -9034,7 +9105,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 180
"__id__": 181
},
"_enabled": true,
"_clip": {
......@@ -9053,13 +9124,13 @@
"_name": "click",
"_objFlags": 0,
"_parent": {
"__id__": 177
"__id__": 178
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 183
"__id__": 184
}
],
"_prefab": null,
......@@ -9115,7 +9186,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 182
"__id__": 183
},
"_enabled": true,
"_clip": {
......@@ -9134,13 +9205,13 @@
"_name": "correct",
"_objFlags": 0,
"_parent": {
"__id__": 177
"__id__": 178
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 185
"__id__": 186
}
],
"_prefab": null,
......@@ -9196,7 +9267,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 184
"__id__": 185
},
"_enabled": true,
"_clip": {
......@@ -9215,13 +9286,13 @@
"_name": "incorrect",
"_objFlags": 0,
"_parent": {
"__id__": 177
"__id__": 178
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 187
"__id__": 188
}
],
"_prefab": null,
......@@ -9277,7 +9348,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 186
"__id__": 187
},
"_enabled": true,
"_clip": {
......@@ -9296,13 +9367,13 @@
"_name": "lack",
"_objFlags": 0,
"_parent": {
"__id__": 177
"__id__": 178
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 189
"__id__": 190
}
],
"_prefab": null,
......@@ -9358,7 +9429,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 188
"__id__": 189
},
"_enabled": true,
"_clip": {
......@@ -9377,13 +9448,13 @@
"_name": "painted",
"_objFlags": 0,
"_parent": {
"__id__": 177
"__id__": 178
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 191
"__id__": 192
}
],
"_prefab": null,
......@@ -9439,7 +9510,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 190
"__id__": 191
},
"_enabled": true,
"_clip": {
......@@ -9458,13 +9529,13 @@
"_name": "demo",
"_objFlags": 0,
"_parent": {
"__id__": 177
"__id__": 178
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 193
"__id__": 194
}
],
"_prefab": null,
......@@ -9520,7 +9591,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 192
"__id__": 193
},
"_enabled": true,
"_clip": {
......@@ -9539,13 +9610,13 @@
"_name": "star",
"_objFlags": 0,
"_parent": {
"__id__": 177
"__id__": 178
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 195
"__id__": 196
}
],
"_prefab": null,
......@@ -9601,7 +9672,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 194
"__id__": 195
},
"_enabled": true,
"_clip": null,
......@@ -9618,11 +9689,11 @@
"_name": "font",
"_objFlags": 0,
"_parent": {
"__id__": 163
"__id__": 164
},
"_children": [
{
"__id__": 197
"__id__": 198
}
],
"_active": false,
......@@ -9680,13 +9751,13 @@
"_name": "MMTextBook-Bold",
"_objFlags": 0,
"_parent": {
"__id__": 196
"__id__": 197
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 198
"__id__": 199
}
],
"_prefab": null,
......@@ -9742,7 +9813,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 197
"__id__": 198
},
"_enabled": true,
"_materials": [
......@@ -9781,7 +9852,7 @@
},
"_children": [
{
"__id__": 200
"__id__": 201
}
],
"_active": false,
......@@ -9839,17 +9910,17 @@
"_name": "Ff",
"_objFlags": 0,
"_parent": {
"__id__": 199
"__id__": 200
},
"_children": [
{
"__id__": 201
"__id__": 202
}
],
"_active": true,
"_components": [
{
"__id__": 203
"__id__": 204
}
],
"_prefab": null,
......@@ -9905,13 +9976,13 @@
"_name": "New Label",
"_objFlags": 0,
"_parent": {
"__id__": 200
"__id__": 201
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 202
"__id__": 203
}
],
"_prefab": null,
......@@ -9967,7 +10038,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 201
"__id__": 202
},
"_enabled": true,
"_materials": [
......@@ -10002,7 +10073,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 200
"__id__": 201
},
"_enabled": true,
"_materials": [
......
......@@ -167,14 +167,20 @@ cc.Class({
});
}
// this.paint.on("Click",()=>{
// playDragonBoneAnimation(this.coolcat, 'wrong', -1);
// this.playAudioByUrl(this.data.wrongAudio,()=>{
// playDragonBoneAnimation(this.coolcat, 'normal', -1);
// this._can_tap = true;
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.paintTimeID = setTimeout(() => {
// }, 500);
})
this.paint.active = false;
this.paint2.active = false;
......@@ -651,6 +657,8 @@ cc.Class({
if (this.color_selector.active == false)
return;
this._can_tap = false;
// clearTimeout(this.paintTimeID);
//correct
playDragonBoneAnimation(this.coolcat, 'right', -1);
this.playAudioByUrl(this.data.rightAudio,()=>{
......
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