Commit cdbb4bb3 authored by limingzhe's avatar limingzhe

fix: debug

parent 7e1760fa
......@@ -17,10 +17,10 @@
"__id__": 2
},
{
"__id__": 59
"__id__": 62
},
{
"__id__": 80
"__id__": 83
}
],
"_active": false,
......@@ -87,13 +87,13 @@
"_active": true,
"_components": [
{
"__id__": 56
"__id__": 59
},
{
"__id__": 57
"__id__": 60
},
{
"__id__": 58
"__id__": 61
}
],
"_prefab": null,
......@@ -411,13 +411,13 @@
"__id__": 21
},
{
"__id__": 24
"__id__": 27
},
{
"__id__": 49
"__id__": 52
},
{
"__id__": 55
"__id__": 58
}
],
"_active": false,
......@@ -1004,6 +1004,9 @@
"_children": [
{
"__id__": 22
},
{
"__id__": 24
}
],
"_active": true,
......@@ -1149,6 +1152,120 @@
"_N$cacheMode": 0,
"_id": "7eR2W2mtdP34+kdle7Vyfw"
},
{
"__type__": "cc.Node",
"_name": "MMTB_label",
"_objFlags": 0,
"_parent": {
"__id__": 21
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 25
},
{
"__id__": 26
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 128,
"height": 50
},
"_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": "b5abwb+M9JaYP+iibHRDmY"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
},
"_enabled": true,
"_materials": [],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "Label",
"_N$string": "Label",
"_fontSize": 40,
"_lineHeight": 40,
"_enableWrapText": true,
"_N$file": {
"__uuid__": "762b4844-65c4-443a-96a1-d32b8cbb0cd0"
},
"_isSystemFontUsed": false,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "f16IG718FFQpQOM8SO4BOB"
},
{
"__type__": "cc.LabelOutline",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
},
"_enabled": true,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_width": 1,
"_id": "650G4bVBtC7p853Pzh9ejv"
},
{
"__type__": "cc.Node",
"_name": "audio",
......@@ -1158,40 +1275,40 @@
},
"_children": [
{
"__id__": 25
"__id__": 28
},
{
"__id__": 27
"__id__": 30
},
{
"__id__": 29
"__id__": 32
},
{
"__id__": 31
"__id__": 34
},
{
"__id__": 33
"__id__": 36
},
{
"__id__": 35
"__id__": 38
},
{
"__id__": 37
"__id__": 40
},
{
"__id__": 39
"__id__": 42
},
{
"__id__": 41
"__id__": 44
},
{
"__id__": 43
"__id__": 46
},
{
"__id__": 45
"__id__": 48
},
{
"__id__": 47
"__id__": 50
}
],
"_active": true,
......@@ -1249,13 +1366,13 @@
"_name": "click",
"_objFlags": 0,
"_parent": {
"__id__": 24
"__id__": 27
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 26
"__id__": 29
}
],
"_prefab": null,
......@@ -1311,7 +1428,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 25
"__id__": 28
},
"_enabled": true,
"_clip": {
......@@ -1330,13 +1447,13 @@
"_name": "next",
"_objFlags": 0,
"_parent": {
"__id__": 24
"__id__": 27
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 28
"__id__": 31
}
],
"_prefab": null,
......@@ -1392,7 +1509,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 27
"__id__": 30
},
"_enabled": true,
"_clip": {
......@@ -1411,13 +1528,13 @@
"_name": "move_3",
"_objFlags": 0,
"_parent": {
"__id__": 24
"__id__": 27
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 30
"__id__": 33
}
],
"_prefab": null,
......@@ -1473,7 +1590,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 29
"__id__": 32
},
"_enabled": true,
"_clip": {
......@@ -1492,13 +1609,13 @@
"_name": "move_1",
"_objFlags": 0,
"_parent": {
"__id__": 24
"__id__": 27
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 32
"__id__": 35
}
],
"_prefab": null,
......@@ -1554,7 +1671,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 31
"__id__": 34
},
"_enabled": true,
"_clip": {
......@@ -1573,13 +1690,13 @@
"_name": "move_2",
"_objFlags": 0,
"_parent": {
"__id__": 24
"__id__": 27
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 34
"__id__": 37
}
],
"_prefab": null,
......@@ -1635,7 +1752,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 33
"__id__": 36
},
"_enabled": true,
"_clip": {
......@@ -1654,13 +1771,13 @@
"_name": "move_2_2",
"_objFlags": 0,
"_parent": {
"__id__": 24
"__id__": 27
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 36
"__id__": 39
}
],
"_prefab": null,
......@@ -1716,7 +1833,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 35
"__id__": 38
},
"_enabled": true,
"_clip": {
......@@ -1735,13 +1852,13 @@
"_name": "right",
"_objFlags": 0,
"_parent": {
"__id__": 24
"__id__": 27
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 38
"__id__": 41
}
],
"_prefab": null,
......@@ -1797,7 +1914,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 37
"__id__": 40
},
"_enabled": true,
"_clip": {
......@@ -1816,13 +1933,13 @@
"_name": "fail_1",
"_objFlags": 0,
"_parent": {
"__id__": 24
"__id__": 27
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 40
"__id__": 43
}
],
"_prefab": null,
......@@ -1878,7 +1995,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 39
"__id__": 42
},
"_enabled": true,
"_clip": {
......@@ -1897,13 +2014,13 @@
"_name": "fail_2",
"_objFlags": 0,
"_parent": {
"__id__": 24
"__id__": 27
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 42
"__id__": 45
}
],
"_prefab": null,
......@@ -1959,7 +2076,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 41
"__id__": 44
},
"_enabled": true,
"_clip": {
......@@ -1978,13 +2095,13 @@
"_name": "fail_4",
"_objFlags": 0,
"_parent": {
"__id__": 24
"__id__": 27
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 44
"__id__": 47
}
],
"_prefab": null,
......@@ -2040,7 +2157,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 43
"__id__": 46
},
"_enabled": true,
"_clip": {
......@@ -2059,13 +2176,13 @@
"_name": "fail_3",
"_objFlags": 0,
"_parent": {
"__id__": 24
"__id__": 27
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 46
"__id__": 49
}
],
"_prefab": null,
......@@ -2121,7 +2238,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 45
"__id__": 48
},
"_enabled": true,
"_clip": {
......@@ -2140,13 +2257,13 @@
"_name": "fail_5",
"_objFlags": 0,
"_parent": {
"__id__": 24
"__id__": 27
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 48
"__id__": 51
}
],
"_prefab": null,
......@@ -2202,7 +2319,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 47
"__id__": 50
},
"_enabled": true,
"_clip": {
......@@ -2225,10 +2342,10 @@
},
"_children": [
{
"__id__": 50
"__id__": 53
},
{
"__id__": 52
"__id__": 55
}
],
"_active": true,
......@@ -2286,13 +2403,13 @@
"_name": "right",
"_objFlags": 0,
"_parent": {
"__id__": 49
"__id__": 52
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 51
"__id__": 54
}
],
"_prefab": null,
......@@ -2348,7 +2465,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 50
"__id__": 53
},
"_enabled": true,
"_materials": [],
......@@ -2384,16 +2501,16 @@
"_name": "soundAnim",
"_objFlags": 0,
"_parent": {
"__id__": 49
"__id__": 52
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 53
"__id__": 56
},
{
"__id__": 54
"__id__": 57
}
],
"_prefab": null,
......@@ -2449,7 +2566,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 52
"__id__": 55
},
"_enabled": true,
"_materials": [
......@@ -2481,7 +2598,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 52
"__id__": 55
},
"_enabled": true,
"_defaultClip": {
......@@ -2618,19 +2735,19 @@
},
"_children": [
{
"__id__": 60
"__id__": 63
},
{
"__id__": 64
"__id__": 67
},
{
"__id__": 68
"__id__": 71
},
{
"__id__": 72
"__id__": 75
},
{
"__id__": 76
"__id__": 79
}
],
"_active": false,
......@@ -2688,11 +2805,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 59
"__id__": 62
},
"_children": [
{
"__id__": 61
"__id__": 64
}
],
"_active": true,
......@@ -2750,11 +2867,11 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 60
"__id__": 63
},
"_children": [
{
"__id__": 62
"__id__": 65
}
],
"_active": true,
......@@ -2812,13 +2929,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 61
"__id__": 64
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 63
"__id__": 66
}
],
"_prefab": null,
......@@ -2874,7 +2991,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 62
"__id__": 65
},
"_enabled": true,
"_materials": [
......@@ -2904,11 +3021,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 59
"__id__": 62
},
"_children": [
{
"__id__": 65
"__id__": 68
}
],
"_active": true,
......@@ -2966,11 +3083,11 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 64
"__id__": 67
},
"_children": [
{
"__id__": 66
"__id__": 69
}
],
"_active": true,
......@@ -3028,13 +3145,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 65
"__id__": 68
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 67
"__id__": 70
}
],
"_prefab": null,
......@@ -3090,7 +3207,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 66
"__id__": 69
},
"_enabled": true,
"_materials": [
......@@ -3120,11 +3237,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 59
"__id__": 62
},
"_children": [
{
"__id__": 69
"__id__": 72
}
],
"_active": true,
......@@ -3182,11 +3299,11 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 68
"__id__": 71
},
"_children": [
{
"__id__": 70
"__id__": 73
}
],
"_active": true,
......@@ -3244,13 +3361,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 69
"__id__": 72
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 71
"__id__": 74
}
],
"_prefab": null,
......@@ -3306,7 +3423,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 70
"__id__": 73
},
"_enabled": true,
"_materials": [
......@@ -3336,11 +3453,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 59
"__id__": 62
},
"_children": [
{
"__id__": 73
"__id__": 76
}
],
"_active": true,
......@@ -3398,11 +3515,11 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 72
"__id__": 75
},
"_children": [
{
"__id__": 74
"__id__": 77
}
],
"_active": true,
......@@ -3460,13 +3577,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 73
"__id__": 76
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 75
"__id__": 78
}
],
"_prefab": null,
......@@ -3522,7 +3639,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 74
"__id__": 77
},
"_enabled": true,
"_materials": [
......@@ -3552,11 +3669,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 59
"__id__": 62
},
"_children": [
{
"__id__": 77
"__id__": 80
}
],
"_active": true,
......@@ -3614,11 +3731,11 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 76
"__id__": 79
},
"_children": [
{
"__id__": 78
"__id__": 81
}
],
"_active": true,
......@@ -3676,13 +3793,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 77
"__id__": 80
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 79
"__id__": 82
}
],
"_prefab": null,
......@@ -3738,7 +3855,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 78
"__id__": 81
},
"_enabled": true,
"_materials": [
......@@ -3772,28 +3889,28 @@
},
"_children": [
{
"__id__": 81
"__id__": 84
},
{
"__id__": 83
"__id__": 86
},
{
"__id__": 85
"__id__": 88
},
{
"__id__": 87
"__id__": 90
},
{
"__id__": 89
"__id__": 92
},
{
"__id__": 91
"__id__": 94
},
{
"__id__": 93
"__id__": 96
},
{
"__id__": 95
"__id__": 98
}
],
"_active": false,
......@@ -3851,13 +3968,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 80
"__id__": 83
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 82
"__id__": 85
}
],
"_prefab": null,
......@@ -3913,7 +4030,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 81
"__id__": 84
},
"_enabled": true,
"_materials": [
......@@ -3943,13 +4060,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 80
"__id__": 83
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 84
"__id__": 87
}
],
"_prefab": null,
......@@ -4005,7 +4122,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 83
"__id__": 86
},
"_enabled": true,
"_materials": [
......@@ -4035,13 +4152,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 80
"__id__": 83
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 86
"__id__": 89
}
],
"_prefab": null,
......@@ -4097,7 +4214,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 85
"__id__": 88
},
"_enabled": true,
"_materials": [
......@@ -4127,13 +4244,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 80
"__id__": 83
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 88
"__id__": 91
}
],
"_prefab": null,
......@@ -4189,7 +4306,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 87
"__id__": 90
},
"_enabled": true,
"_materials": [
......@@ -4219,13 +4336,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 80
"__id__": 83
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 90
"__id__": 93
}
],
"_prefab": null,
......@@ -4281,7 +4398,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 89
"__id__": 92
},
"_enabled": true,
"_materials": [
......@@ -4311,13 +4428,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 80
"__id__": 83
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 92
"__id__": 95
}
],
"_prefab": null,
......@@ -4373,7 +4490,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 91
"__id__": 94
},
"_enabled": true,
"_materials": [
......@@ -4403,13 +4520,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 80
"__id__": 83
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 94
"__id__": 97
}
],
"_prefab": null,
......@@ -4465,7 +4582,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 93
"__id__": 96
},
"_enabled": true,
"_materials": [
......@@ -4495,13 +4612,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 80
"__id__": 83
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 96
"__id__": 99
}
],
"_prefab": null,
......@@ -4557,7 +4674,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 95
"__id__": 98
},
"_enabled": true,
"_materials": [
......
......@@ -1460,8 +1460,10 @@ cc.Class({
getLetter(text) {
const node = new cc.Node();
const letterY = this.getRichText(text, 140, "#b4502e", 2, "#ffffff", true, true);
const letterB = this.getRichText(text, 140, "#3a77ad", 2, "#ffffff", true, true);
// const letterY = this.getRichText(text, 140, "#b4502e", 2, "#ffffff", true, true);
// const letterB = this.getRichText(text, 140, "#3a77ad", 2, "#ffffff", true, true);
const letterY = this.getLabelNew(text, 140, "#b4502e", 2, "#ffffff", true);
const letterB = this.getLabelNew(text, 140, "#3a77ad", 2, "#ffffff", true);
letterY.active = false;
node.yNode = letterY;
......@@ -1543,16 +1545,16 @@ cc.Class({
getRichText(text, fontSize, color, outlineWidth, outlineColor, isBlod=false, isFont=false) {
getRichText(text, fontSize, color, outlineWidth, outlineColor, isBold=false, isFont=false) {
const labelNode = new cc.Node();
const label = labelNode.addComponent(cc.RichText);
label.string = `<outline color=${outlineColor} width=${outlineWidth}><color=${color}><size=${fontSize}>${text}</></color></outline>`
if (isBlod) {
if (isBold) {
label.string = `<b>${label.string}</b>`
labelNode.isBlod = true;
labelNode.isBold = true;
}
labelNode.color = cc.Color.BLACK;
......@@ -6139,6 +6141,64 @@ cc.Class({
return labelNode;
},
getLabelNew(text, fontSize, color, outlineWidth, outlineColor, isBold=false) {
const baseNode = cc.find('Canvas/res/font/MMTB_label');
const labelNode = cc.instantiate(baseNode);
const label = labelNode.getComponent(cc.Label);
const labelOutline = labelNode.getComponent(cc.LabelOutline);
label.string = text;
label.fontSize = fontSize;
labelNode.color = cc.Color.fromHEX(new cc.Color(), color);
labelOutline.width = outlineWidth;
labelOutline.color = cc.Color.fromHEX(new cc.Color(), outlineColor);
// label.enableBold = isBold;
label.lineHeight = fontSize;
// const labelNode = new cc.Node();
// const label = labelNode.addComponent(cc.Label);
// label.string = text;
// labelNode.color = cc.Color.BLACK;
// label.fontSize = fontSize;
// label.lineHeight = fontSize;
// label.font = cc.find('Canvas/res/font/MMTB').getComponent(cc.Label).font;
// if (isBold) {
// label.string = `<b>${label.string}</b>`
// labelNode.isBold = true;
// }
// labelNode.color = cc.Color.BLACK;
// // label.fontSize = fontSize;
// labelNode.baseFontSize = fontSize;
// labelNode.baseColor = color;
// labelNode.baseOutlineColor = outlineColor;
// labelNode.baseOutlineWidth = outlineWidth;
// label.lineHeight = fontSize * 1.2;
// label.horizontalAlign = cc.macro.TextAlignment.CENTER;
// if (isFont) {
// label.font = cc.find('Canvas/res/font/MMTB').getComponent(cc.Label).font;
// label.MMTB = label.font;
// }
return labelNode;
},
debugLayer: null,
......
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