Commit b895b8b7 authored by Tt's avatar Tt

修改异常

parent c34ddeb4
......@@ -96,19 +96,19 @@
"__id__": 59
},
{
"__id__": 61
"__id__": 62
}
],
"_active": true,
"_components": [
{
"__id__": 102
},
{
"__id__": 103
},
{
"__id__": 104
},
{
"__id__": 105
}
],
"_prefab": null,
......@@ -265,7 +265,7 @@
"__id__": 2
},
"_children": [],
"_active": true,
"_active": false,
"_components": [
{
"__id__": 6
......@@ -1322,7 +1322,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 1280,
"height": 920
"height": 921
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -1334,7 +1334,7 @@
"ctor": "Float64Array",
"array": [
0,
19,
19.5,
0,
0,
0,
......@@ -1377,7 +1377,7 @@
"__uuid__": "c9f7d5ba-b915-4205-b652-ff3a0db89faa"
},
"_type": 0,
"_sizeMode": 1,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
......@@ -1424,7 +1424,7 @@
"_alignFlags": 45,
"_left": 0,
"_right": 0,
"_top": 1,
"_top": 0,
"_bottom": 39,
"_verticalCenter": 0,
"_horizontalCenter": 0,
......@@ -2741,6 +2741,9 @@
"_components": [
{
"__id__": 60
},
{
"__id__": 61
}
],
"_prefab": null,
......@@ -2831,6 +2834,33 @@
"_N$enableBatch": false,
"_id": "c9G/bvpJVMjL/SR627TsFK"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 59
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 36,
"_left": 0,
"_right": 531.216842105263,
"_top": 0,
"_bottom": 334.93057381133474,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "ce0rMri+pCgZEnBqKxodJn"
},
{
"__type__": "cc.Node",
"_name": "ani",
......@@ -2840,7 +2870,7 @@
},
"_children": [
{
"__id__": 62
"__id__": 63
}
],
"_active": true,
......@@ -2898,14 +2928,14 @@
"_name": "firework_ani",
"_objFlags": 0,
"_parent": {
"__id__": 61
"__id__": 62
},
"_children": [
{
"__id__": 63
"__id__": 64
},
{
"__id__": 76
"__id__": 77
}
],
"_active": true,
......@@ -2963,26 +2993,26 @@
"_name": "RibbonNodeBase",
"_objFlags": 0,
"_parent": {
"__id__": 62
"__id__": 63
},
"_children": [
{
"__id__": 64
"__id__": 65
},
{
"__id__": 66
"__id__": 67
},
{
"__id__": 68
"__id__": 69
},
{
"__id__": 70
"__id__": 71
},
{
"__id__": 72
"__id__": 73
},
{
"__id__": 74
"__id__": 75
}
],
"_active": true,
......@@ -3040,13 +3070,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 63
"__id__": 64
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 65
"__id__": 66
}
],
"_prefab": null,
......@@ -3102,7 +3132,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 64
"__id__": 65
},
"_enabled": true,
"_materials": [
......@@ -3134,13 +3164,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 63
"__id__": 64
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 67
"__id__": 68
}
],
"_prefab": null,
......@@ -3196,7 +3226,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 66
"__id__": 67
},
"_enabled": true,
"_materials": [
......@@ -3228,13 +3258,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 63
"__id__": 64
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 69
"__id__": 70
}
],
"_prefab": null,
......@@ -3290,7 +3320,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 68
"__id__": 69
},
"_enabled": true,
"_materials": [
......@@ -3322,13 +3352,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 63
"__id__": 64
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 71
"__id__": 72
}
],
"_prefab": null,
......@@ -3384,7 +3414,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 70
"__id__": 71
},
"_enabled": true,
"_materials": [
......@@ -3416,13 +3446,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 63
"__id__": 64
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 73
"__id__": 74
}
],
"_prefab": null,
......@@ -3478,7 +3508,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 72
"__id__": 73
},
"_enabled": true,
"_materials": [
......@@ -3510,13 +3540,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 63
"__id__": 64
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 75
"__id__": 76
}
],
"_prefab": null,
......@@ -3572,7 +3602,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 74
"__id__": 75
},
"_enabled": true,
"_materials": [
......@@ -3604,23 +3634,23 @@
"_name": "paperBase",
"_objFlags": 0,
"_parent": {
"__id__": 62
"__id__": 63
},
"_children": [
{
"__id__": 77
"__id__": 78
},
{
"__id__": 82
"__id__": 83
},
{
"__id__": 87
"__id__": 88
},
{
"__id__": 92
"__id__": 93
},
{
"__id__": 97
"__id__": 98
}
],
"_active": true,
......@@ -3678,11 +3708,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 76
"__id__": 77
},
"_children": [
{
"__id__": 78
"__id__": 79
}
],
"_active": true,
......@@ -3740,17 +3770,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 77
"__id__": 78
},
"_children": [
{
"__id__": 79
"__id__": 80
}
],
"_active": true,
"_components": [
{
"__id__": 81
"__id__": 82
}
],
"_prefab": null,
......@@ -3806,13 +3836,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 78
"__id__": 79
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 80
"__id__": 81
}
],
"_prefab": null,
......@@ -3868,7 +3898,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 79
"__id__": 80
},
"_enabled": true,
"_materials": [
......@@ -3900,7 +3930,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 78
"__id__": 79
},
"_enabled": true,
"_materials": [
......@@ -3922,11 +3952,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 76
"__id__": 77
},
"_children": [
{
"__id__": 83
"__id__": 84
}
],
"_active": true,
......@@ -3984,17 +4014,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 82
"__id__": 83
},
"_children": [
{
"__id__": 84
"__id__": 85
}
],
"_active": true,
"_components": [
{
"__id__": 86
"__id__": 87
}
],
"_prefab": null,
......@@ -4050,13 +4080,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 83
"__id__": 84
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 85
"__id__": 86
}
],
"_prefab": null,
......@@ -4112,7 +4142,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 84
"__id__": 85
},
"_enabled": true,
"_materials": [
......@@ -4144,7 +4174,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 83
"__id__": 84
},
"_enabled": true,
"_materials": [
......@@ -4166,11 +4196,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 76
"__id__": 77
},
"_children": [
{
"__id__": 88
"__id__": 89
}
],
"_active": true,
......@@ -4228,17 +4258,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 87
"__id__": 88
},
"_children": [
{
"__id__": 89
"__id__": 90
}
],
"_active": true,
"_components": [
{
"__id__": 91
"__id__": 92
}
],
"_prefab": null,
......@@ -4294,13 +4324,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 88
"__id__": 89
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 90
"__id__": 91
}
],
"_prefab": null,
......@@ -4356,7 +4386,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 89
"__id__": 90
},
"_enabled": true,
"_materials": [
......@@ -4388,7 +4418,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 88
"__id__": 89
},
"_enabled": true,
"_materials": [
......@@ -4410,11 +4440,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 76
"__id__": 77
},
"_children": [
{
"__id__": 93
"__id__": 94
}
],
"_active": true,
......@@ -4472,17 +4502,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 92
"__id__": 93
},
"_children": [
{
"__id__": 94
"__id__": 95
}
],
"_active": true,
"_components": [
{
"__id__": 96
"__id__": 97
}
],
"_prefab": null,
......@@ -4538,13 +4568,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 93
"__id__": 94
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 95
"__id__": 96
}
],
"_prefab": null,
......@@ -4600,7 +4630,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 94
"__id__": 95
},
"_enabled": true,
"_materials": [
......@@ -4632,7 +4662,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 93
"__id__": 94
},
"_enabled": true,
"_materials": [
......@@ -4654,11 +4684,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 76
"__id__": 77
},
"_children": [
{
"__id__": 98
"__id__": 99
}
],
"_active": true,
......@@ -4716,17 +4746,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 97
"__id__": 98
},
"_children": [
{
"__id__": 99
"__id__": 100
}
],
"_active": true,
"_components": [
{
"__id__": 101
"__id__": 102
}
],
"_prefab": null,
......@@ -4782,13 +4812,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 98
"__id__": 99
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 100
"__id__": 101
}
],
"_prefab": null,
......@@ -4844,7 +4874,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 99
"__id__": 100
},
"_enabled": true,
"_materials": [
......@@ -4876,7 +4906,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 98
"__id__": 99
},
"_enabled": true,
"_materials": [
......
......@@ -145,7 +145,7 @@ cc.Class({
//数据解析
CardManager.getIns().initCards(this.data);
CardManager.getIns().resetPageNum();
CardManager.getIns().randomPageCards();
// CardManager.getIns().randomPageCards();
this._gameCode = 0;
},
//单局游戏
......@@ -543,15 +543,16 @@ cc.Class({
catChoice() {
return new Promise((resolve, reject) => {
this.playSFX("mao_choice").then(() => {
this.catNormal();
});
setTimeout(() => {
let items = this._cardLayout.children;
let item = items.filter(it => {
return it.data.cardId == 0
})[0];
let item = items.filter(it => { return it.data.cardId == 0 })[0];
pg.view.visible(pg.view.find(item, 'box'), true);
this._cantouch = true;
this.onTouchItem({ target: item }).then(() => {
this._successItems.push(item);
resolve('');
})
});
}, 300);
});
},
catFinish() {
......
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