Commit 7e1760fa authored by limingzhe's avatar limingzhe

fix: debug

parent f04e611f
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "6835c08a-28be-484c-85e4-dcf5373d15f6", "uuid": "b98931c6-5145-4825-8fcc-854b2552ac01",
"downloadMode": 0, "downloadMode": 0,
"duration": 0.504, "duration": 0.432,
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "6835c08a-28be-484c-85e4-dcf5373d15f6",
"downloadMode": 0,
"duration": 0.504,
"subMetas": {}
}
\ No newline at end of file
...@@ -1304,7 +1304,7 @@ ...@@ -1304,7 +1304,7 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "26eKv9UwlIiLAA2spJYceJ" "_id": "1138hgH2BDmJnXtTU1bR9O"
}, },
{ {
"__type__": "cc.AudioSource", "__type__": "cc.AudioSource",
...@@ -1315,7 +1315,7 @@ ...@@ -1315,7 +1315,7 @@
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
"__uuid__": "6835c08a-28be-484c-85e4-dcf5373d15f6" "__uuid__": "b98931c6-5145-4825-8fcc-854b2552ac01"
}, },
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
...@@ -1323,7 +1323,7 @@ ...@@ -1323,7 +1323,7 @@
"_firstlyEnabled": true, "_firstlyEnabled": true,
"playOnLoad": false, "playOnLoad": false,
"preload": false, "preload": false,
"_id": "cfoXZiE81B275+s3p1s2al" "_id": "5bdfunmVFDDKk6wONBWyHc"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
......
...@@ -1569,6 +1569,7 @@ cc.Class({ ...@@ -1569,6 +1569,7 @@ cc.Class({
if (isFont) { if (isFont) {
label.font = cc.find('Canvas/res/font/MMTB').getComponent(cc.Label).font; label.font = cc.find('Canvas/res/font/MMTB').getComponent(cc.Label).font;
label.MMTB = label.font;
} }
return labelNode; return labelNode;
...@@ -1580,6 +1581,9 @@ cc.Class({ ...@@ -1580,6 +1581,9 @@ cc.Class({
const label = labelNode.getComponent(cc.RichText); const label = labelNode.getComponent(cc.RichText);
const {baseFontSize, baseColor, baseOutlineColor, baseOutlineWidth} = labelNode; const {baseFontSize, baseColor, baseOutlineColor, baseOutlineWidth} = labelNode;
label.string = `<outline color=${baseOutlineColor} width=${baseOutlineWidth}> <color=${baseColor}><size=${baseFontSize}>${text}</></color></outline>` label.string = `<outline color=${baseOutlineColor} width=${baseOutlineWidth}> <color=${baseColor}><size=${baseFontSize}>${text}</></color></outline>`
if (label.MMTB) {
label.font = label.MMTB;
}
}, },
......
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