Commit 81896520 authored by Tt's avatar Tt

1

parent 27e5750d
...@@ -3877,8 +3877,8 @@ ...@@ -3877,8 +3877,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 100, "width": 0,
"height": 150 "height": 126
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -3974,8 +3974,8 @@ ...@@ -3974,8 +3974,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 85, "width": 0,
"height": 150 "height": 126
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -4028,7 +4028,7 @@ ...@@ -4028,7 +4028,7 @@
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "", "_string": "",
"_N$string": "", "_N$string": "",
"_fontSize": 80, "_fontSize": 95,
"_lineHeight": 100, "_lineHeight": 100,
"_enableWrapText": true, "_enableWrapText": true,
"_N$file": { "_N$file": {
...@@ -4232,7 +4232,7 @@ ...@@ -4232,7 +4232,7 @@
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "2878e53a-7fa3-40f0-b7e8-2d1aff1cf248" "__uuid__": "2878e53a-7fa3-40f0-b7e8-2d1aff1cf248"
}, },
"_type": 0, "_type": 1,
"_sizeMode": 0, "_sizeMode": 0,
"_fillType": 0, "_fillType": 0,
"_fillCenter": { "_fillCenter": {
...@@ -4327,7 +4327,7 @@ ...@@ -4327,7 +4327,7 @@
"width": 732, "width": 732,
"height": 124 "height": 124
}, },
"_resize": 2, "_resize": 1,
"_N$layoutType": 1, "_N$layoutType": 1,
"_N$cellSize": { "_N$cellSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
...@@ -4339,7 +4339,7 @@ ...@@ -4339,7 +4339,7 @@
"_N$paddingRight": 25, "_N$paddingRight": 25,
"_N$paddingTop": 0, "_N$paddingTop": 0,
"_N$paddingBottom": 0, "_N$paddingBottom": 0,
"_N$spacingX": 0, "_N$spacingX": 15,
"_N$spacingY": 0, "_N$spacingY": 0,
"_N$verticalDirection": 1, "_N$verticalDirection": 1,
"_N$horizontalDirection": 0, "_N$horizontalDirection": 0,
...@@ -4432,7 +4432,7 @@ ...@@ -4432,7 +4432,7 @@
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "c25ab265-b923-4fd0-ab93-f93bd01f436c" "__uuid__": "c25ab265-b923-4fd0-ab93-f93bd01f436c"
}, },
"_type": 0, "_type": 1,
"_sizeMode": 1, "_sizeMode": 1,
"_fillType": 0, "_fillType": 0,
"_fillCenter": { "_fillCenter": {
......
...@@ -727,6 +727,7 @@ cc.Class({ ...@@ -727,6 +727,7 @@ cc.Class({
laebl.active = true; laebl.active = true;
laebl.color = item.color == 0 ? new cc.Color(r[0], r[1], r[2]) : new cc.Color(l[0], l[1], l[2]); laebl.color = item.color == 0 ? new cc.Color(r[0], r[1], r[2]) : new cc.Color(l[0], l[1], l[2]);
laebl.data = item; laebl.data = item;
laebl.y = 8;
}) })
} else { } else {
let laebl = cc.instantiate(itemLaebl); let laebl = cc.instantiate(itemLaebl);
...@@ -735,6 +736,7 @@ cc.Class({ ...@@ -735,6 +736,7 @@ cc.Class({
laebl.active = true; laebl.active = true;
laebl.color = item.color == 0 ? new cc.Color(r[0], r[1], r[2]) : new cc.Color(l[0], l[1], l[2]); laebl.color = item.color == 0 ? new cc.Color(r[0], r[1], r[2]) : new cc.Color(l[0], l[1], l[2]);
laebl.data = item; laebl.data = item;
laebl.y = 8;
} }
}) })
}, },
......
...@@ -26,10 +26,10 @@ ...@@ -26,10 +26,10 @@
"height": 124, "height": 124,
"rawWidth": 732, "rawWidth": 732,
"rawHeight": 124, "rawHeight": 124,
"borderTop": 0, "borderTop": 41,
"borderBottom": 0, "borderBottom": 44,
"borderLeft": 0, "borderLeft": 58,
"borderRight": 0, "borderRight": 51,
"subMetas": {} "subMetas": {}
} }
} }
......
...@@ -26,10 +26,10 @@ ...@@ -26,10 +26,10 @@
"height": 124, "height": 124,
"rawWidth": 428, "rawWidth": 428,
"rawHeight": 124, "rawHeight": 124,
"borderTop": 0, "borderTop": 30,
"borderBottom": 0, "borderBottom": 30,
"borderLeft": 0, "borderLeft": 30,
"borderRight": 0, "borderRight": 30,
"subMetas": {} "subMetas": {}
} }
} }
......
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