Commit 3232baae authored by Tt's avatar Tt

修改完成

parent e18de122
......@@ -84,37 +84,37 @@
"__id__": 94
},
{
"__id__": 141
"__id__": 143
},
{
"__id__": 146
"__id__": 148
},
{
"__id__": 166
"__id__": 168
},
{
"__id__": 179
"__id__": 181
},
{
"__id__": 200
"__id__": 202
},
{
"__id__": 202
"__id__": 204
},
{
"__id__": 206
"__id__": 208
}
],
"_active": true,
"_components": [
{
"__id__": 232
"__id__": 234
},
{
"__id__": 233
"__id__": 235
},
{
"__id__": 234
"__id__": 236
}
],
"_prefab": null,
......@@ -4189,7 +4189,7 @@
"_active": true,
"_components": [
{
"__id__": 140
"__id__": 142
}
],
"_prefab": null,
......@@ -5697,12 +5697,15 @@
},
{
"__id__": 137
},
{
"__id__": 139
}
],
"_active": false,
"_components": [
{
"__id__": 139
"__id__": 141
}
],
"_prefab": null,
......@@ -6071,7 +6074,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 358.6,
"width": 390,
"height": 136
},
"_anchorPoint": {
......@@ -6244,7 +6247,7 @@
"_string": "intnationnal",
"_N$string": "intnationnal",
"_fontSize": 50,
"_lineHeight": 100,
"_lineHeight": 50,
"_enableWrapText": true,
"_N$file": {
"__uuid__": "c997d9b5-8f21-439c-a5d4-c699f99a8b07"
......@@ -6281,7 +6284,7 @@
},
{
"__type__": "cc.Node",
"_name": "img",
"_name": "img_single",
"_objFlags": 0,
"_parent": {
"__id__": 124
......@@ -6305,7 +6308,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 280,
"height": 200
"height": 280
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -6317,7 +6320,7 @@
"ctor": "Float64Array",
"array": [
0,
34.249,
0.249,
0,
0,
0,
......@@ -6373,6 +6376,100 @@
"_atlas": null,
"_id": "daUiBQA3RFRrCAVTqxPahO"
},
{
"__type__": "cc.Node",
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 124
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 140
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 280,
"height": 200
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
34.249,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "ddURnAvq1IUpp0gmx9I8jZ"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 139
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "cd8AF9dThG9otjtxBj1Huw"
},
{
"__type__": "cc.Button",
"_name": "",
......@@ -6479,16 +6576,16 @@
},
"_children": [
{
"__id__": 142
"__id__": 144
}
],
"_active": true,
"_components": [
{
"__id__": 144
"__id__": 146
},
{
"__id__": 145
"__id__": 147
}
],
"_prefab": null,
......@@ -6544,13 +6641,13 @@
"_name": "btn_laba2",
"_objFlags": 0,
"_parent": {
"__id__": 141
"__id__": 143
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 143
"__id__": 145
}
],
"_prefab": null,
......@@ -6606,7 +6703,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 142
"__id__": 144
},
"_enabled": true,
"_materials": [
......@@ -6638,7 +6735,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 141
"__id__": 143
},
"_enabled": true,
"_materials": [
......@@ -6670,7 +6767,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 141
"__id__": 143
},
"_enabled": true,
"alignMode": 1,
......@@ -6701,22 +6798,22 @@
},
"_children": [
{
"__id__": 147
"__id__": 149
},
{
"__id__": 150
"__id__": 152
},
{
"__id__": 155
"__id__": 157
},
{
"__id__": 160
"__id__": 162
}
],
"_active": false,
"_components": [
{
"__id__": 165
"__id__": 167
}
],
"_prefab": null,
......@@ -6772,16 +6869,16 @@
"_name": "New Sprite(Splash)",
"_objFlags": 0,
"_parent": {
"__id__": 146
"__id__": 148
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 148
"__id__": 150
},
{
"__id__": 149
"__id__": 151
}
],
"_prefab": null,
......@@ -6837,7 +6934,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 147
"__id__": 149
},
"_enabled": true,
"alignMode": 1,
......@@ -6864,7 +6961,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 147
"__id__": 149
},
"_enabled": true,
"_normalMaterial": null,
......@@ -6932,14 +7029,14 @@
"_name": "img_gj",
"_objFlags": 0,
"_parent": {
"__id__": 146
"__id__": 148
},
"_children": [
{
"__id__": 151
"__id__": 153
},
{
"__id__": 153
"__id__": 155
}
],
"_active": false,
......@@ -6997,13 +7094,13 @@
"_name": "bg_light",
"_objFlags": 0,
"_parent": {
"__id__": 150
"__id__": 152
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 152
"__id__": 154
}
],
"_prefab": null,
......@@ -7059,7 +7156,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 151
"__id__": 153
},
"_enabled": true,
"_materials": [
......@@ -7089,13 +7186,13 @@
"_name": "bg_goodjob",
"_objFlags": 0,
"_parent": {
"__id__": 150
"__id__": 152
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 154
"__id__": 156
}
],
"_prefab": null,
......@@ -7151,7 +7248,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 153
"__id__": 155
},
"_enabled": true,
"_materials": [
......@@ -7183,14 +7280,14 @@
"_name": "img_ta",
"_objFlags": 0,
"_parent": {
"__id__": 146
"__id__": 148
},
"_children": [
{
"__id__": 156
"__id__": 158
},
{
"__id__": 158
"__id__": 160
}
],
"_active": false,
......@@ -7248,13 +7345,13 @@
"_name": "bg_light",
"_objFlags": 0,
"_parent": {
"__id__": 155
"__id__": 157
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 157
"__id__": 159
}
],
"_prefab": null,
......@@ -7310,7 +7407,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 156
"__id__": 158
},
"_enabled": true,
"_materials": [
......@@ -7340,13 +7437,13 @@
"_name": "bg_goodjob",
"_objFlags": 0,
"_parent": {
"__id__": 155
"__id__": 157
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 159
"__id__": 161
}
],
"_prefab": null,
......@@ -7402,7 +7499,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 158
"__id__": 160
},
"_enabled": true,
"_materials": [
......@@ -7434,14 +7531,14 @@
"_name": "img_co",
"_objFlags": 0,
"_parent": {
"__id__": 146
"__id__": 148
},
"_children": [
{
"__id__": 161
"__id__": 163
},
{
"__id__": 163
"__id__": 165
}
],
"_active": false,
......@@ -7499,13 +7596,13 @@
"_name": "bg_light",
"_objFlags": 0,
"_parent": {
"__id__": 160
"__id__": 162
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 162
"__id__": 164
}
],
"_prefab": null,
......@@ -7561,7 +7658,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 161
"__id__": 163
},
"_enabled": true,
"_materials": [
......@@ -7591,13 +7688,13 @@
"_name": "bg_goodjob",
"_objFlags": 0,
"_parent": {
"__id__": 160
"__id__": 162
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 164
"__id__": 166
}
],
"_prefab": null,
......@@ -7653,7 +7750,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 163
"__id__": 165
},
"_enabled": true,
"_materials": [
......@@ -7683,7 +7780,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 146
"__id__": 148
},
"_enabled": true,
"alignMode": 1,
......@@ -7713,9 +7810,6 @@
"__id__": 2
},
"_children": [
{
"__id__": 167
},
{
"__id__": 169
},
......@@ -7730,6 +7824,9 @@
},
{
"__id__": 177
},
{
"__id__": 179
}
],
"_active": true,
......@@ -7787,13 +7884,13 @@
"_name": "New Sprite(Splash)",
"_objFlags": 0,
"_parent": {
"__id__": 166
"__id__": 168
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 168
"__id__": 170
}
],
"_prefab": null,
......@@ -7849,7 +7946,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 167
"__id__": 169
},
"_enabled": true,
"_normalMaterial": null,
......@@ -7917,13 +8014,13 @@
"_name": "bg_instructions",
"_objFlags": 0,
"_parent": {
"__id__": 166
"__id__": 168
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 170
"__id__": 172
}
],
"_prefab": null,
......@@ -7979,7 +8076,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 169
"__id__": 171
},
"_enabled": true,
"_materials": [
......@@ -8011,13 +8108,13 @@
"_name": "text_1",
"_objFlags": 0,
"_parent": {
"__id__": 166
"__id__": 168
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 172
"__id__": 174
}
],
"_prefab": null,
......@@ -8073,7 +8170,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 171
"__id__": 173
},
"_enabled": true,
"_materials": [
......@@ -8105,13 +8202,13 @@
"_name": "text_2",
"_objFlags": 0,
"_parent": {
"__id__": 166
"__id__": 168
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 174
"__id__": 176
}
],
"_prefab": null,
......@@ -8167,7 +8264,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 173
"__id__": 175
},
"_enabled": true,
"_materials": [
......@@ -8199,13 +8296,13 @@
"_name": "text_3",
"_objFlags": 0,
"_parent": {
"__id__": 166
"__id__": 168
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 176
"__id__": 178
}
],
"_prefab": null,
......@@ -8261,7 +8358,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 175
"__id__": 177
},
"_enabled": true,
"_materials": [
......@@ -8293,13 +8390,13 @@
"_name": "text_0",
"_objFlags": 0,
"_parent": {
"__id__": 166
"__id__": 168
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 178
"__id__": 180
}
],
"_prefab": null,
......@@ -8355,7 +8452,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 177
"__id__": 179
},
"_enabled": true,
"_materials": [
......@@ -8391,19 +8488,19 @@
},
"_children": [
{
"__id__": 180
"__id__": 182
},
{
"__id__": 184
"__id__": 186
},
{
"__id__": 188
"__id__": 190
},
{
"__id__": 192
"__id__": 194
},
{
"__id__": 196
"__id__": 198
}
],
"_active": false,
......@@ -8461,11 +8558,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 179
"__id__": 181
},
"_children": [
{
"__id__": 181
"__id__": 183
}
],
"_active": true,
......@@ -8523,11 +8620,11 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 180
"__id__": 182
},
"_children": [
{
"__id__": 182
"__id__": 184
}
],
"_active": true,
......@@ -8585,13 +8682,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 181
"__id__": 183
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 183
"__id__": 185
}
],
"_prefab": null,
......@@ -8647,7 +8744,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 182
"__id__": 184
},
"_enabled": true,
"_materials": [
......@@ -8677,11 +8774,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 179
"__id__": 181
},
"_children": [
{
"__id__": 185
"__id__": 187
}
],
"_active": true,
......@@ -8739,11 +8836,11 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 184
"__id__": 186
},
"_children": [
{
"__id__": 186
"__id__": 188
}
],
"_active": true,
......@@ -8801,13 +8898,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 185
"__id__": 187
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 187
"__id__": 189
}
],
"_prefab": null,
......@@ -8863,7 +8960,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 186
"__id__": 188
},
"_enabled": true,
"_materials": [
......@@ -8893,11 +8990,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 179
"__id__": 181
},
"_children": [
{
"__id__": 189
"__id__": 191
}
],
"_active": true,
......@@ -8955,11 +9052,11 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 188
"__id__": 190
},
"_children": [
{
"__id__": 190
"__id__": 192
}
],
"_active": true,
......@@ -9017,13 +9114,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 189
"__id__": 191
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 191
"__id__": 193
}
],
"_prefab": null,
......@@ -9079,7 +9176,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 190
"__id__": 192
},
"_enabled": true,
"_materials": [
......@@ -9109,11 +9206,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 179
"__id__": 181
},
"_children": [
{
"__id__": 193
"__id__": 195
}
],
"_active": true,
......@@ -9171,11 +9268,11 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 192
"__id__": 194
},
"_children": [
{
"__id__": 194
"__id__": 196
}
],
"_active": true,
......@@ -9233,13 +9330,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 193
"__id__": 195
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 195
"__id__": 197
}
],
"_prefab": null,
......@@ -9295,7 +9392,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 194
"__id__": 196
},
"_enabled": true,
"_materials": [
......@@ -9325,11 +9422,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 179
"__id__": 181
},
"_children": [
{
"__id__": 197
"__id__": 199
}
],
"_active": true,
......@@ -9387,11 +9484,11 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 196
"__id__": 198
},
"_children": [
{
"__id__": 198
"__id__": 200
}
],
"_active": true,
......@@ -9449,13 +9546,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 197
"__id__": 199
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 199
"__id__": 201
}
],
"_prefab": null,
......@@ -9511,7 +9608,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 198
"__id__": 200
},
"_enabled": true,
"_materials": [
......@@ -9547,7 +9644,7 @@
"_active": false,
"_components": [
{
"__id__": 201
"__id__": 203
}
],
"_prefab": null,
......@@ -9603,7 +9700,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 200
"__id__": 202
},
"_enabled": true,
"_materials": [
......@@ -9639,13 +9736,13 @@
},
"_children": [
{
"__id__": 203
"__id__": 205
}
],
"_active": false,
"_components": [
{
"__id__": 205
"__id__": 207
}
],
"_prefab": null,
......@@ -9701,13 +9798,13 @@
"_name": "bg_record",
"_objFlags": 0,
"_parent": {
"__id__": 202
"__id__": 204
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 204
"__id__": 206
}
],
"_prefab": null,
......@@ -9763,7 +9860,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 203
"__id__": 205
},
"_enabled": true,
"_materials": [
......@@ -9795,7 +9892,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 202
"__id__": 204
},
"_enabled": true,
"_materials": [
......@@ -9831,10 +9928,7 @@
},
"_children": [
{
"__id__": 207
},
{
"__id__": 211
"__id__": 209
},
{
"__id__": 213
......@@ -9862,12 +9956,15 @@
},
{
"__id__": 229
},
{
"__id__": 231
}
],
"_active": false,
"_components": [
{
"__id__": 231
"__id__": 233
}
],
"_prefab": null,
......@@ -9923,19 +10020,19 @@
"_name": "New Sprite(Splash)",
"_objFlags": 0,
"_parent": {
"__id__": 206
"__id__": 208
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 208
"__id__": 210
},
{
"__id__": 209
"__id__": 211
},
{
"__id__": 210
"__id__": 212
}
],
"_prefab": null,
......@@ -9991,7 +10088,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 207
"__id__": 209
},
"_enabled": true,
"_materials": [
......@@ -10023,7 +10120,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 207
"__id__": 209
},
"_enabled": true,
"alignMode": 1,
......@@ -10050,7 +10147,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 207
"__id__": 209
},
"_enabled": true,
"_normalMaterial": null,
......@@ -10118,13 +10215,13 @@
"_name": "bg_congratulation",
"_objFlags": 0,
"_parent": {
"__id__": 206
"__id__": 208
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 212
"__id__": 214
}
],
"_prefab": null,
......@@ -10180,7 +10277,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 211
"__id__": 213
},
"_enabled": true,
"_materials": [
......@@ -10212,13 +10309,13 @@
"_name": "bg_settle",
"_objFlags": 0,
"_parent": {
"__id__": 206
"__id__": 208
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 214
"__id__": 216
}
],
"_prefab": null,
......@@ -10245,7 +10342,7 @@
"ctor": "Float64Array",
"array": [
-224,
-53.13,
14.956,
0,
0,
0,
......@@ -10274,7 +10371,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 213
"__id__": 215
},
"_enabled": true,
"_materials": [
......@@ -10306,13 +10403,13 @@
"_name": "bg_settle",
"_objFlags": 0,
"_parent": {
"__id__": 206
"__id__": 208
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 216
"__id__": 218
}
],
"_prefab": null,
......@@ -10339,7 +10436,7 @@
"ctor": "Float64Array",
"array": [
224,
-53.13,
14.956,
0,
0,
0,
......@@ -10368,7 +10465,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 215
"__id__": 217
},
"_enabled": true,
"_materials": [
......@@ -10400,13 +10497,13 @@
"_name": "btn_restart",
"_objFlags": 0,
"_parent": {
"__id__": 206
"__id__": 208
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 218
"__id__": 220
}
],
"_prefab": null,
......@@ -10462,7 +10559,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 217
"__id__": 219
},
"_enabled": true,
"_materials": [
......@@ -10494,13 +10591,13 @@
"_name": "btn_close",
"_objFlags": 0,
"_parent": {
"__id__": 206
"__id__": 208
},
"_children": [],
"_active": true,
"_active": false,
"_components": [
{
"__id__": 220
"__id__": 222
}
],
"_prefab": null,
......@@ -10556,7 +10653,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 219
"__id__": 221
},
"_enabled": true,
"_materials": [
......@@ -10588,13 +10685,13 @@
"_name": "name",
"_objFlags": 0,
"_parent": {
"__id__": 206
"__id__": 208
},
"_children": [],
"_active": true,
"_active": false,
"_components": [
{
"__id__": 222
"__id__": 224
}
],
"_prefab": null,
......@@ -10650,7 +10747,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 221
"__id__": 223
},
"_enabled": true,
"_materials": [
......@@ -10685,13 +10782,13 @@
"_name": "New Label",
"_objFlags": 0,
"_parent": {
"__id__": 206
"__id__": 208
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 224
"__id__": 226
}
],
"_prefab": null,
......@@ -10718,7 +10815,7 @@
"ctor": "Float64Array",
"array": [
-236.493,
-136.499,
-68.413,
0,
0,
0,
......@@ -10747,7 +10844,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 223
"__id__": 225
},
"_enabled": true,
"_materials": [
......@@ -10757,8 +10854,8 @@
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "评测次数",
"_N$string": "评测次数",
"_string": "答题次数",
"_N$string": "答题次数",
"_fontSize": 40,
"_lineHeight": 40,
"_enableWrapText": true,
......@@ -10782,13 +10879,13 @@
"_name": "New Label",
"_objFlags": 0,
"_parent": {
"__id__": 206
"__id__": 208
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 226
"__id__": 228
}
],
"_prefab": null,
......@@ -10815,7 +10912,7 @@
"ctor": "Float64Array",
"array": [
236.494,
-136.499,
-68.413,
0,
0,
0,
......@@ -10844,7 +10941,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 225
"__id__": 227
},
"_enabled": true,
"_materials": [
......@@ -10854,8 +10951,8 @@
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "答题用时",
"_N$string": "答题用时",
"_string": "答题时间",
"_N$string": "答题时间",
"_fontSize": 40,
"_lineHeight": 40,
"_enableWrapText": true,
......@@ -10879,13 +10976,13 @@
"_name": "count",
"_objFlags": 0,
"_parent": {
"__id__": 206
"__id__": 208
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 228
"__id__": 230
}
],
"_prefab": null,
......@@ -10912,7 +11009,7 @@
"ctor": "Float64Array",
"array": [
-237.943,
-16,
52.086,
0,
0,
0,
......@@ -10941,7 +11038,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 227
"__id__": 229
},
"_enabled": true,
"_materials": [
......@@ -10976,13 +11073,13 @@
"_name": "time",
"_objFlags": 0,
"_parent": {
"__id__": 206
"__id__": 208
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 230
"__id__": 232
}
],
"_prefab": null,
......@@ -11009,7 +11106,7 @@
"ctor": "Float64Array",
"array": [
225.785,
-16,
52.086,
0,
0,
0,
......@@ -11038,7 +11135,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 229
"__id__": 231
},
"_enabled": true,
"_materials": [
......@@ -11073,7 +11170,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 206
"__id__": 208
},
"_enabled": true,
"alignMode": 1,
......@@ -11151,22 +11248,22 @@
"__id__": 94
},
"layout_tip": {
"__id__": 146
"__id__": 148
},
"btn_laba": {
"__id__": 141
"__id__": 143
},
"btn_record": {
"__id__": 200
"__id__": 202
},
"btn_recording": {
"__id__": 202
"__id__": 204
},
"label_time": {
"__id__": 86
},
"layout_final": {
"__id__": 206
"__id__": 208
},
"_id": "db3L+4L+FH/5MIRcKcfiq+"
}
......
......@@ -133,6 +133,8 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.playLocalAudio("btn");
this.layout_final.active = false;
this.label_time.getComponent(cc.Label).string = "00:00";
let layout_play = this.layout_game.getChildByName('layout_play')
layout_play.removeAllChildren();
this.onLoadEnd();
}
private onCloseFinal() {
......@@ -229,6 +231,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
let btn_poper_break = pg.view.find(item, "btn_poper_break")
let title = pg.view.find(item, "title")
let img = pg.view.find(item, "img")
let img_single = pg.view.find(item, "img_single")
let desc = pg.view.find(item, "desc")
switch (data.type) {
......@@ -236,18 +239,21 @@ export default class SceneComponent extends MyCocosSceneComponent {
pg.view.setString(title, data.text)
pg.view.visible(title, true)
pg.view.visible(img, false)
pg.view.visible(img_single, false)
pg.view.visible(desc, false)
break;
case "img":
pg.view.setNetImg(img, data.image, { w: 280, h: 200 })
pg.view.setNetImg(img_single, data.image, { w: 280, h: 280 })
pg.view.visible(title, false)
pg.view.visible(img, true)
pg.view.visible(img, false)
pg.view.visible(img_single, true)
pg.view.visible(desc, false)
break;
case "img_text":
pg.view.setNetImg(img, data.image, { w: 280, h: 200 })
pg.view.setString(desc, data.text)
pg.view.visible(title, false)
pg.view.visible(img_single, false)
pg.view.visible(img, true)
pg.view.visible(desc, true)
break;
......@@ -258,9 +264,19 @@ export default class SceneComponent extends MyCocosSceneComponent {
pg.view.visible(btn_poper_break, false);
pg.view.touchOn(item, this.onTouchItem, this);
}
private touching: boolean;
onTouchItem(e) {
if (this.touching) return;
this.touching = true;
let item = e.target;
let data = item.data;
if (this.starData.inRight(data)) {
this.touching = false;
return;
}
setTimeout(() => {
this.touching = false;
}, 600);
this.assessCount++;
this.stopLaba();
if (data.right) {
......@@ -273,7 +289,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
if (this.starData.checkRight()) {
setTimeout(() => {
this.nextstar();
}, 1000);
}, 800);
}
} else {
this.playLocalAudio('fish_error')
......
export class Option {
private static ID: number = 100001;
public id: number;
public type: string;
public image: string;
public audio: string;
public text: string;
public right: boolean;
constructor(data) {
this.id = Option.ID++;
this.type = data.type;
this.image = data.image;
this.audio = data.audio;
......@@ -37,6 +40,9 @@ export class Question {
addRight(option) {
this.rights.push(option)
}
inRight(option) {
return this.rights.some(ri => ri.id == option.id)
}
checkRight() {
let rights = this.options.filter(op => op.right);
return this.rights.length >= rights.length
......
export const defaultData = { "title": "听音选择", "questions": [{ "audio": "http://staging-teach.cdn.ireadabc.com/c14938125a52096dc0be9fbbf6638cb2_l.mp3", "time": null, "duration": "", "audioName": "进入下一题.mp3", "options": [{ "type": "text", "audio": "", "image": "", "word": "", "text": "apple", "isRight": "1" }, { "type": "text", "audio": "", "image": "", "word": "", "text": "banner", "isRight": "0" }, { "type": "text", "audio": "", "image": "", "word": "", "text": "pie", "isRight": "0" }, { "type": "text", "audio": "", "image": "", "word": "", "text": "test", "isRight": "1" }] }, { "audio": "http://staging-teach.cdn.ireadabc.com/c14938125a52096dc0be9fbbf6638cb2_l.mp3", "time": null, "duration": "", "audioName": "进入下一题.mp3", "options": [{ "type": "img", "audio": "", "image": "http://staging-teach.cdn.ireadabc.com/07c89b4a6a1a18b0c0a3029720fdfdbc.png", "word": "", "isRight": "0" }, { "type": "img", "audio": "", "image": "http://staging-teach.cdn.ireadabc.com/d20b34eac11f5687d3386389aea170a2.png", "word": "", "isRight": "0" }, { "type": "img", "audio": "", "image": "http://staging-teach.cdn.ireadabc.com/639ada88f3e52966103caca156f720d6.png", "word": "", "isRight": "1" }, { "type": "img", "audio": "", "image": "http://staging-teach.cdn.ireadabc.com/38408b9ce048508830086c5e5cd2f384.png", "word": "", "isRight": "1" }] }, { "audio": "", "time": null, "duration": "", "audioName": "", "options": [{ "type": "img_text", "audio": "", "image": "http://staging-teach.cdn.ireadabc.com/3f36264d6aaa65e578a6d7e261ea8a2e.png", "isRight": "1", "text": "fish" }, { "type": "img_text", "audio": "", "image": "http://staging-teach.cdn.ireadabc.com/713e3312f1ed1876baf169026654d0c2.png", "isRight": "0", "text": "gray" }, { "type": "img_text", "audio": "", "image": "http://staging-teach.cdn.ireadabc.com/23290ec65a6700c931105c52aaf4e24c.jpg", "isRight": "0", "text": "international" }, { "type": "img_text", "audio": "", "image": "http://staging-teach.cdn.ireadabc.com/912b16d5a85e46fa5b0e2b75fb9d6bdf.png", "isRight": "0", "text": "break" }] }] }
\ No newline at end of file
export const defaultData = { "title": "听音选择", "questions": [{ "audio": "http://staging-teach.cdn.ireadabc.com/c14938125a52096dc0be9fbbf6638cb2_l.mp3", "time": null, "duration": "", "audioName": "进入下一题.mp3", "options": [{ "type": "text", "audio": "", "image": "", "word": "", "text": "appleappleap", "isRight": "1" }, { "type": "text", "audio": "", "image": "", "word": "", "text": "banner", "isRight": "0" }, { "type": "text", "audio": "", "image": "", "word": "", "text": "pie", "isRight": "0" }, { "type": "text", "audio": "", "image": "", "word": "", "text": "test", "isRight": "1" }] }, { "audio": "http://staging-teach.cdn.ireadabc.com/c14938125a52096dc0be9fbbf6638cb2_l.mp3", "time": null, "duration": "", "audioName": "进入下一题.mp3", "options": [{ "type": "img", "audio": "", "image": "http://staging-teach.cdn.ireadabc.com/07c89b4a6a1a18b0c0a3029720fdfdbc.png", "word": "", "isRight": "0" }, { "type": "img", "audio": "", "image": "http://staging-teach.cdn.ireadabc.com/d20b34eac11f5687d3386389aea170a2.png", "word": "", "isRight": "0" }, { "type": "img", "audio": "", "image": "http://staging-teach.cdn.ireadabc.com/639ada88f3e52966103caca156f720d6.png", "word": "", "isRight": "1" }, { "type": "img", "audio": "", "image": "http://staging-teach.cdn.ireadabc.com/38408b9ce048508830086c5e5cd2f384.png", "word": "", "isRight": "1" }] }, { "audio": "", "time": null, "duration": "", "audioName": "", "options": [{ "type": "img_text", "audio": "", "image": "http://staging-teach.cdn.ireadabc.com/3f36264d6aaa65e578a6d7e261ea8a2e.png", "isRight": "1", "text": "fish" }, { "type": "img_text", "audio": "", "image": "http://staging-teach.cdn.ireadabc.com/713e3312f1ed1876baf169026654d0c2.png", "isRight": "0", "text": "gray" }, { "type": "img_text", "audio": "", "image": "http://staging-teach.cdn.ireadabc.com/23290ec65a6700c931105c52aaf4e24c.jpg", "isRight": "0", "text": "international" }, { "type": "img_text", "audio": "", "image": "http://staging-teach.cdn.ireadabc.com/912b16d5a85e46fa5b0e2b75fb9d6bdf.png", "isRight": "0", "text": "break" }] }] }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment