Commit 29caab5b authored by yu's avatar yu

1

parent 2706e036
...@@ -4202,7 +4202,7 @@ ...@@ -4202,7 +4202,7 @@
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "d4bb8589-c706-479e-bbef-3e8e29e1570a" "__uuid__": "d4bb8589-c706-479e-bbef-3e8e29e1570a"
}, },
"_type": 0, "_type": 1,
"_sizeMode": 0, "_sizeMode": 0,
"_fillType": 0, "_fillType": 0,
"_fillCenter": { "_fillCenter": {
...@@ -4402,7 +4402,7 @@ ...@@ -4402,7 +4402,7 @@
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "9adb8766-6247-4228-9fc4-3fa4504b85aa" "__uuid__": "9adb8766-6247-4228-9fc4-3fa4504b85aa"
}, },
"_type": 0, "_type": 1,
"_sizeMode": 1, "_sizeMode": 1,
"_fillType": 0, "_fillType": 0,
"_fillCenter": { "_fillCenter": {
......
...@@ -713,6 +713,7 @@ cc.Class({ ...@@ -713,6 +713,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);
...@@ -721,6 +722,7 @@ cc.Class({ ...@@ -721,6 +722,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": 40,
"borderBottom": 0, "borderBottom": 40,
"borderLeft": 0, "borderLeft": 40,
"borderRight": 0, "borderRight": 40,
"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