Commit 11779dfa authored by limingzhe's avatar limingzhe

fix: debug

parent c483cfac
......@@ -17,10 +17,10 @@
"__id__": 2
},
{
"__id__": 65
"__id__": 67
},
{
"__id__": 86
"__id__": 88
}
],
"_active": false,
......@@ -87,13 +87,13 @@
"_active": true,
"_components": [
{
"__id__": 62
"__id__": 64
},
{
"__id__": 63
"__id__": 65
},
{
"__id__": 64
"__id__": 66
}
],
"_prefab": null,
......@@ -408,16 +408,16 @@
"__id__": 10
},
{
"__id__": 27
"__id__": 29
},
{
"__id__": 30
"__id__": 32
},
{
"__id__": 55
"__id__": 57
},
{
"__id__": 61
"__id__": 63
}
],
"_active": false,
......@@ -501,6 +501,9 @@
},
{
"__id__": 25
},
{
"__id__": 27
}
],
"_active": true,
......@@ -555,7 +558,7 @@
},
{
"__type__": "cc.Node",
"_name": "jelly_bg",
"_name": "btn",
"_objFlags": 0,
"_parent": {
"__id__": 10
......@@ -576,6 +579,96 @@
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 661,
"height": 230
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
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": "65dixS6hpIhrH+MFY4sPZP"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 11
},
"_enabled": true,
"_materials": [],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "7c9f1d61-512c-40af-8ba7-c5987e4f6bd8"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "6eQJMy9IdGv58VxUy+jPUE"
},
{
"__type__": "cc.Node",
"_name": "jelly_bg",
"_objFlags": 0,
"_parent": {
"__id__": 10
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 14
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 500,
......@@ -620,7 +713,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 11
"__id__": 13
},
"_enabled": true,
"_materials": [],
......@@ -654,7 +747,7 @@
"_active": true,
"_components": [
{
"__id__": 14
"__id__": 16
}
],
"_prefab": null,
......@@ -710,7 +803,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 13
"__id__": 15
},
"_enabled": true,
"_materials": [],
......@@ -744,7 +837,7 @@
"_active": true,
"_components": [
{
"__id__": 16
"__id__": 18
}
],
"_prefab": null,
......@@ -800,7 +893,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 15
"__id__": 17
},
"_enabled": true,
"_materials": [],
......@@ -834,7 +927,7 @@
"_active": true,
"_components": [
{
"__id__": 18
"__id__": 20
}
],
"_prefab": null,
......@@ -890,7 +983,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 17
"__id__": 19
},
"_enabled": true,
"_materials": [],
......@@ -924,7 +1017,7 @@
"_active": true,
"_components": [
{
"__id__": 20
"__id__": 22
}
],
"_prefab": null,
......@@ -980,7 +1073,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 19
"__id__": 21
},
"_enabled": true,
"_materials": [],
......@@ -1014,7 +1107,7 @@
"_active": true,
"_components": [
{
"__id__": 22
"__id__": 24
}
],
"_prefab": null,
......@@ -1070,7 +1163,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 21
"__id__": 23
},
"_enabled": true,
"_materials": [],
......@@ -1104,7 +1197,7 @@
"_active": true,
"_components": [
{
"__id__": 24
"__id__": 26
}
],
"_prefab": null,
......@@ -1160,7 +1253,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 23
"__id__": 25
},
"_enabled": true,
"_materials": [],
......@@ -1194,7 +1287,7 @@
"_active": true,
"_components": [
{
"__id__": 26
"__id__": 28
}
],
"_prefab": null,
......@@ -1250,7 +1343,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 25
"__id__": 27
},
"_enabled": true,
"_materials": [],
......@@ -1282,7 +1375,7 @@
},
"_children": [
{
"__id__": 28
"__id__": 30
}
],
"_active": true,
......@@ -1340,13 +1433,13 @@
"_name": "MMTB",
"_objFlags": 0,
"_parent": {
"__id__": 27
"__id__": 29
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 29
"__id__": 31
}
],
"_prefab": null,
......@@ -1402,7 +1495,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 28
"__id__": 30
},
"_enabled": true,
"_materials": [],
......@@ -1436,9 +1529,6 @@
"__id__": 9
},
"_children": [
{
"__id__": 31
},
{
"__id__": 33
},
......@@ -1471,6 +1561,9 @@
},
{
"__id__": 53
},
{
"__id__": 55
}
],
"_active": true,
......@@ -1528,13 +1621,13 @@
"_name": "move_3",
"_objFlags": 0,
"_parent": {
"__id__": 30
"__id__": 32
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 32
"__id__": 34
}
],
"_prefab": null,
......@@ -1590,7 +1683,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 31
"__id__": 33
},
"_enabled": true,
"_clip": {
......@@ -1609,13 +1702,13 @@
"_name": "move_1",
"_objFlags": 0,
"_parent": {
"__id__": 30
"__id__": 32
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 34
"__id__": 36
}
],
"_prefab": null,
......@@ -1671,7 +1764,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 33
"__id__": 35
},
"_enabled": true,
"_clip": {
......@@ -1690,13 +1783,13 @@
"_name": "move_2",
"_objFlags": 0,
"_parent": {
"__id__": 30
"__id__": 32
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 36
"__id__": 38
}
],
"_prefab": null,
......@@ -1752,7 +1845,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 35
"__id__": 37
},
"_enabled": true,
"_clip": {
......@@ -1771,13 +1864,13 @@
"_name": "move_2_2",
"_objFlags": 0,
"_parent": {
"__id__": 30
"__id__": 32
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 38
"__id__": 40
}
],
"_prefab": null,
......@@ -1833,7 +1926,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 37
"__id__": 39
},
"_enabled": true,
"_clip": {
......@@ -1852,13 +1945,13 @@
"_name": "right",
"_objFlags": 0,
"_parent": {
"__id__": 30
"__id__": 32
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 40
"__id__": 42
}
],
"_prefab": null,
......@@ -1914,7 +2007,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 39
"__id__": 41
},
"_enabled": true,
"_clip": {
......@@ -1933,13 +2026,13 @@
"_name": "fail_1",
"_objFlags": 0,
"_parent": {
"__id__": 30
"__id__": 32
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 42
"__id__": 44
}
],
"_prefab": null,
......@@ -1995,7 +2088,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 41
"__id__": 43
},
"_enabled": true,
"_clip": {
......@@ -2014,13 +2107,13 @@
"_name": "fail_2",
"_objFlags": 0,
"_parent": {
"__id__": 30
"__id__": 32
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 44
"__id__": 46
}
],
"_prefab": null,
......@@ -2076,7 +2169,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 43
"__id__": 45
},
"_enabled": true,
"_clip": {
......@@ -2095,13 +2188,13 @@
"_name": "fail_4",
"_objFlags": 0,
"_parent": {
"__id__": 30
"__id__": 32
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 46
"__id__": 48
}
],
"_prefab": null,
......@@ -2157,7 +2250,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 45
"__id__": 47
},
"_enabled": true,
"_clip": {
......@@ -2176,13 +2269,13 @@
"_name": "fail_3",
"_objFlags": 0,
"_parent": {
"__id__": 30
"__id__": 32
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 48
"__id__": 50
}
],
"_prefab": null,
......@@ -2238,7 +2331,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 47
"__id__": 49
},
"_enabled": true,
"_clip": {
......@@ -2257,13 +2350,13 @@
"_name": "fail_5",
"_objFlags": 0,
"_parent": {
"__id__": 30
"__id__": 32
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 50
"__id__": 52
}
],
"_prefab": null,
......@@ -2319,7 +2412,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 49
"__id__": 51
},
"_enabled": true,
"_clip": {
......@@ -2338,13 +2431,13 @@
"_name": "pop",
"_objFlags": 0,
"_parent": {
"__id__": 30
"__id__": 32
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 52
"__id__": 54
}
],
"_prefab": null,
......@@ -2400,7 +2493,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 51
"__id__": 53
},
"_enabled": true,
"_clip": {
......@@ -2419,13 +2512,13 @@
"_name": "finish",
"_objFlags": 0,
"_parent": {
"__id__": 30
"__id__": 32
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 54
"__id__": 56
}
],
"_prefab": null,
......@@ -2481,7 +2574,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 53
"__id__": 55
},
"_enabled": true,
"_clip": {
......@@ -2504,10 +2597,10 @@
},
"_children": [
{
"__id__": 56
"__id__": 58
},
{
"__id__": 58
"__id__": 60
}
],
"_active": true,
......@@ -2565,13 +2658,13 @@
"_name": "right",
"_objFlags": 0,
"_parent": {
"__id__": 55
"__id__": 57
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 57
"__id__": 59
}
],
"_prefab": null,
......@@ -2627,7 +2720,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 56
"__id__": 58
},
"_enabled": true,
"_materials": [],
......@@ -2663,16 +2756,16 @@
"_name": "soundAnim",
"_objFlags": 0,
"_parent": {
"__id__": 55
"__id__": 57
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 59
"__id__": 61
},
{
"__id__": 60
"__id__": 62
}
],
"_prefab": null,
......@@ -2728,7 +2821,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 58
"__id__": 60
},
"_enabled": true,
"_materials": [
......@@ -2760,7 +2853,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 58
"__id__": 60
},
"_enabled": true,
"_defaultClip": {
......@@ -2897,19 +2990,19 @@
},
"_children": [
{
"__id__": 66
"__id__": 68
},
{
"__id__": 70
"__id__": 72
},
{
"__id__": 74
"__id__": 76
},
{
"__id__": 78
"__id__": 80
},
{
"__id__": 82
"__id__": 84
}
],
"_active": false,
......@@ -2967,11 +3060,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 65
"__id__": 67
},
"_children": [
{
"__id__": 67
"__id__": 69
}
],
"_active": true,
......@@ -3029,11 +3122,11 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 66
"__id__": 68
},
"_children": [
{
"__id__": 68
"__id__": 70
}
],
"_active": true,
......@@ -3091,13 +3184,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 67
"__id__": 69
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 69
"__id__": 71
}
],
"_prefab": null,
......@@ -3153,7 +3246,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 68
"__id__": 70
},
"_enabled": true,
"_materials": [
......@@ -3183,11 +3276,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 65
"__id__": 67
},
"_children": [
{
"__id__": 71
"__id__": 73
}
],
"_active": true,
......@@ -3245,11 +3338,11 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 70
"__id__": 72
},
"_children": [
{
"__id__": 72
"__id__": 74
}
],
"_active": true,
......@@ -3307,13 +3400,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 71
"__id__": 73
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 73
"__id__": 75
}
],
"_prefab": null,
......@@ -3369,7 +3462,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 72
"__id__": 74
},
"_enabled": true,
"_materials": [
......@@ -3399,11 +3492,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 65
"__id__": 67
},
"_children": [
{
"__id__": 75
"__id__": 77
}
],
"_active": true,
......@@ -3461,11 +3554,11 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 74
"__id__": 76
},
"_children": [
{
"__id__": 76
"__id__": 78
}
],
"_active": true,
......@@ -3523,13 +3616,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 75
"__id__": 77
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 77
"__id__": 79
}
],
"_prefab": null,
......@@ -3585,7 +3678,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 76
"__id__": 78
},
"_enabled": true,
"_materials": [
......@@ -3615,11 +3708,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 65
"__id__": 67
},
"_children": [
{
"__id__": 79
"__id__": 81
}
],
"_active": true,
......@@ -3677,11 +3770,11 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 78
"__id__": 80
},
"_children": [
{
"__id__": 80
"__id__": 82
}
],
"_active": true,
......@@ -3739,13 +3832,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 79
"__id__": 81
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 81
"__id__": 83
}
],
"_prefab": null,
......@@ -3801,7 +3894,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 80
"__id__": 82
},
"_enabled": true,
"_materials": [
......@@ -3831,11 +3924,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 65
"__id__": 67
},
"_children": [
{
"__id__": 83
"__id__": 85
}
],
"_active": true,
......@@ -3893,11 +3986,11 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 82
"__id__": 84
},
"_children": [
{
"__id__": 84
"__id__": 86
}
],
"_active": true,
......@@ -3955,13 +4048,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 83
"__id__": 85
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 85
"__id__": 87
}
],
"_prefab": null,
......@@ -4017,7 +4110,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 84
"__id__": 86
},
"_enabled": true,
"_materials": [
......@@ -4050,9 +4143,6 @@
"__id__": 1
},
"_children": [
{
"__id__": 87
},
{
"__id__": 89
},
......@@ -4073,6 +4163,9 @@
},
{
"__id__": 101
},
{
"__id__": 103
}
],
"_active": false,
......@@ -4130,13 +4223,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 86
"__id__": 88
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 88
"__id__": 90
}
],
"_prefab": null,
......@@ -4192,7 +4285,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 87
"__id__": 89
},
"_enabled": true,
"_materials": [
......@@ -4222,13 +4315,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 86
"__id__": 88
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 90
"__id__": 92
}
],
"_prefab": null,
......@@ -4284,7 +4377,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 89
"__id__": 91
},
"_enabled": true,
"_materials": [
......@@ -4314,13 +4407,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 86
"__id__": 88
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 92
"__id__": 94
}
],
"_prefab": null,
......@@ -4376,7 +4469,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 91
"__id__": 93
},
"_enabled": true,
"_materials": [
......@@ -4406,13 +4499,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 86
"__id__": 88
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 94
"__id__": 96
}
],
"_prefab": null,
......@@ -4468,7 +4561,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 93
"__id__": 95
},
"_enabled": true,
"_materials": [
......@@ -4498,13 +4591,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 86
"__id__": 88
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 96
"__id__": 98
}
],
"_prefab": null,
......@@ -4560,7 +4653,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 95
"__id__": 97
},
"_enabled": true,
"_materials": [
......@@ -4590,13 +4683,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 86
"__id__": 88
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 98
"__id__": 100
}
],
"_prefab": null,
......@@ -4652,7 +4745,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 97
"__id__": 99
},
"_enabled": true,
"_materials": [
......@@ -4682,13 +4775,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 86
"__id__": 88
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 100
"__id__": 102
}
],
"_prefab": null,
......@@ -4744,7 +4837,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 99
"__id__": 101
},
"_enabled": true,
"_materials": [
......@@ -4774,13 +4867,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 86
"__id__": 88
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 102
"__id__": 104
}
],
"_prefab": null,
......@@ -4836,7 +4929,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 101
"__id__": 103
},
"_enabled": true,
"_materials": [
......
......@@ -1152,22 +1152,25 @@ cc.Class({
this.scoreNum = 0;
const scoreLabel = this.getRichText("Score: " + this.scoreNum, 100, "#ffffff", 6, "#111111", true);
this.canvas.addChild(scoreLabel, 2)
scoreLabel.x = this.canvas.width / 2 - 150 * this._mapScaleMin;
scoreLabel.y = this.canvas.height / 2 - 50 * this._mapScaleMin;
scoreLabel.scale = 0.5 * 1 / this.jellyLayer.scale;
scoreLabel.x = this.canvas.width / 2 - 270 * scoreLabel.scale;
scoreLabel.y = this.canvas.height / 2 - 50 * scoreLabel.scale;
// scoreLabel.anchorX = 1;
// scoreLabel.anchorY = 1;
scoreLabel.scale = 0.5;
this.scoreLabel = scoreLabel;
},
initStepLabel() {
this.stepNum = 10;
const stepLabel = this.getRichText("Step: " + this.stepNum, 50, "#ffffff", 3, "#111111", true);
this.stepNum = 20;
const stepLabel = this.getRichText("Step: " + this.stepNum, 100, "#ffffff", 6, "#111111", true);
this.canvas.addChild(stepLabel, 2)
stepLabel.x = this.scoreLabel.x;
stepLabel.y = this.scoreLabel.y - 20 * this._mapScaleMin;
stepLabel.y = this.scoreLabel.y - 25 * this.scoreLabel.scale;
// stepLabel.anchorX = 1;
stepLabel.anchorY = 1;
stepLabel.scale = this.scoreLabel.scale;
this.stepLabel = stepLabel;
},
......@@ -1221,7 +1224,7 @@ cc.Class({
const baseX = -this.canvas.height / 2 + edge + dis / 2;
const baseY = -this.canvas.height / 2 + edge + dis / 2 - 30 * this._mapScaleMin;
const baseY = -this.canvas.height / 2 + edge + dis / 2 - 20 * this._mapScaleMin;
const disX = dis;
const disY = dis;
......@@ -1229,6 +1232,9 @@ cc.Class({
this.baseX = baseX;
this.baseY = baseY;
for (let i=0; i<col; i++) {
const logicX = i.toString();
......@@ -1248,17 +1254,17 @@ cc.Class({
node.x = baseX + disX * i;
node.y = baseY + disY * j;
node.scale = len / 512
this.canvas.addChild(node);
this.jellyLayer.addChild(node);
node.addChild(jellyBg);
const jelly = this.getOneJelly(i, j);
jelly.x = node.x;
jelly.y = node.y;
jelly.scale = 512 * 0.8 * node.scaleX / jelly.width;
this.canvas.addChild(jelly, 2);
this.jellyLayer.addChild(jelly, 2);
console.log('jelly.width: ', jelly.width);
console.log('jellyBg.width: ', jellyBg.width);
// console.log('jelly.width: ', jelly.width);
// console.log('jellyBg.width: ', jellyBg.width);
this.itemBgObj[logicX][logicY] = node;
this.blockArray[i][j] = jelly;
......@@ -1352,6 +1358,8 @@ cc.Class({
playAudio(this.finishClip);
})
this.showRestart();
},
refreshRichText(labelNode, text) {
......@@ -1449,7 +1457,7 @@ cc.Class({
jelly.x = xPos;
jelly.y = curY;
jelly.scale =512 * 0.8 * (this.blockLen / 512) / jelly.width;
this.canvas.addChild(jelly, 2);
this.jellyLayer.addChild(jelly, 2);
this.blockArray[col][this.gridSize - emptyBlocksCount - 1] = jelly;
......@@ -1477,10 +1485,10 @@ cc.Class({
const blockScript = this.blockArray[col][row];
if (!blockScript || blockScript.colorId !== colorId || blockScript.isVisited) {
console.log("blockScript: ", blockScript);
console.log("blockScript colorId: ", blockScript.colorId);
console.log("blockScript isVisited: ", blockScript.isVisited);
console.log("return 2");
// console.log("blockScript: ", blockScript);
// console.log("blockScript colorId: ", blockScript.colorId);
// console.log("blockScript isVisited: ", blockScript.isVisited);
// console.log("return 2");
return;
}
......@@ -1517,15 +1525,17 @@ cc.Class({
},
addScore(jelly, score) {
const richText = this.getRichText("+" + score, "40", "#ffffff", "3", "111111");
const richText = this.getRichText("+" + score, "60", "#ffffff", "5", "111111");
richText.x = jelly.x;
richText.y = jelly.y;
richText.parent = jelly.parent;
richText.zIndex = 5;
richText.opacity = 0;
richText.scale = 1 / this.jellyLayer.scale;
cc.tween(richText)
.to(1, {opacity: 255}, {easing: "cubicOut"})
.delay(0.5)
.to(0.1, {opacity: 0}, {easing: "cubicOut"})
.call(() => {
richText.destroy();
......@@ -8009,6 +8019,7 @@ cc.Class({
this.showResultLayer();
this.endTesting();
// this.showRestart();
// playAudioByUrl(this.data.finish_right_audio_url, () => {
// delayCall(0.5, () => {
......@@ -8097,28 +8108,31 @@ cc.Class({
showRestart() {
const btn = getSprNode("btn_restart");
btn.scale = this._mapScaleMin;
btn.baseS = btn.scale;
const btn = getSprNode("btn");
btn.scale = this.jellyLayer.scale;
btn.baseS = btn.scale * 0.5;
btn.y = -100 * btn.scale;
this.canvas.addChild(btn, 21);
const rt = this.getRichText("Replay", 70, "#ffffff", 5, "#111111", true);
rt.y = 10;
btn.addChild(rt);
btn.on(cc.Node.EventType.TOUCH_START, () => {
// btn.removeFromParent();
// this.initData();
// this.initStar();
// this.showChangeQuesAnim();
// playAudio(this.btnClip);
const middleLayer = cc.find('middleLayer');
if (middleLayer) {
middleLayer.getComponent('middleLayer').reloadBundle();
}
cc.director.loadScene(cc.director.getScene().name);
// const middleLayer = cc.find('middleLayer');
// if (middleLayer) {
// middleLayer.getComponent('middleLayer').reloadBundle();
// }
})
const time = 0.9;
btn.scale = 0;
cc.tween(btn)
.delay(2.5)
// .delay(2.5)
.to(time, {scale: btn.baseS}, {easing: "elasticOut"})
.start();
......@@ -8279,6 +8293,25 @@ cc.Class({
const sy = this.canvas.height / bg.height;
bg.scale = Math.max(sx, sy);
if (this.canvas.width < this.canvas.height) {
this.isVertical = true;
}
console.log("this.canvas.width: ", this.canvas.width);
console.log("this.canvas.height: ", this.canvas.height);
this.jellyLayer = new cc.Node();
if (this.isVertical) {
this.jellyLayer.scale = 1920 / this.canvas.height ;
} else {
// this.jellyLayer.scale = this.canvas.height / 1080;
this.jellyLayer.scale = this.canvas.width / 1920;
}
this.canvas.addChild(this.jellyLayer, 1);
},
initVerticalBg() {
......
{
"ver": "2.3.5",
"uuid": "5c2fe851-1332-47d0-836f-2319c32b7a4b",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 661,
"height": 230,
"platformSettings": {},
"subMetas": {
"btn": {
"ver": "1.0.4",
"uuid": "7c9f1d61-512c-40af-8ba7-c5987e4f6bd8",
"rawTextureUuid": "5c2fe851-1332-47d0-836f-2319c32b7a4b",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 661,
"height": 230,
"rawWidth": 661,
"rawHeight": 230,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"title": "play",
"packageName": "org.cocos2d.demo",
"startScene": "0737ce42-24f0-45c6-8e1a-8bdab4f74ba3",
"startScene": "1545f2b8-c734-4b0a-9cdb-51218dc4602b",
"excludeScenes": [],
"includeSDKBox": false,
"orientation": {
......@@ -28,7 +28,8 @@
},
"ios": {
"REMOTE_SERVER_ROOT": "",
"packageName": "org.cocos2d.demo"
"packageName": "org.cocos2d.demo",
"ios_enable_jit": true
},
"mac": {
"REMOTE_SERVER_ROOT": "",
......@@ -50,5 +51,6 @@
"scheme": "https",
"skipRecord": false
},
"appBundle": false
"appBundle": false,
"agreements": {}
}
{
"last-module-event-record-time": 1600677246969,
"last-module-event-record-time": 1684763325695,
"migrate-history": [
"cloud-function"
]
......
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