Commit c7bc91e8 authored by Tt's avatar Tt

1

parent 890a12a3
...@@ -3844,8 +3844,8 @@ ...@@ -3844,8 +3844,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 120, "width": 190,
"height": 150 "height": 240
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -3863,8 +3863,8 @@ ...@@ -3863,8 +3863,8 @@
0, 0,
0, 0,
1, 1,
2, 1,
2, 1,
1 1
] ]
}, },
...@@ -3898,9 +3898,9 @@ ...@@ -3898,9 +3898,9 @@
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "", "_string": "",
"_N$string": "", "_N$string": "",
"_fontSize": 100, "_fontSize": 200,
"_lineHeight": 100, "_lineHeight": 200,
"_enableWrapText": true, "_enableWrapText": false,
"_N$file": { "_N$file": {
"__uuid__": "04c2b808-1c8a-499b-9152-128a1abe340a" "__uuid__": "04c2b808-1c8a-499b-9152-128a1abe340a"
}, },
...@@ -4112,7 +4112,7 @@ ...@@ -4112,7 +4112,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 428, "width": 50,
"height": 250 "height": 250
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -4159,7 +4159,7 @@ ...@@ -4159,7 +4159,7 @@
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 428, "width": 50,
"height": 250 "height": 250
}, },
"_resize": 1, "_resize": 1,
...@@ -4170,11 +4170,11 @@ ...@@ -4170,11 +4170,11 @@
"height": 40 "height": 40
}, },
"_N$startAxis": 0, "_N$startAxis": 0,
"_N$paddingLeft": 25, "_N$paddingLeft": 50,
"_N$paddingRight": 25, "_N$paddingRight": 50,
"_N$paddingTop": 0, "_N$paddingTop": 0,
"_N$paddingBottom": 0, "_N$paddingBottom": 0,
"_N$spacingX": 25, "_N$spacingX": -10,
"_N$spacingY": 0, "_N$spacingY": 0,
"_N$verticalDirection": 1, "_N$verticalDirection": 1,
"_N$horizontalDirection": 0, "_N$horizontalDirection": 0,
......
...@@ -736,16 +736,24 @@ cc.Class({ ...@@ -736,16 +736,24 @@ cc.Class({
laebl.active = true; laebl.active = true;
} }
}) })
layout_card.getComponent(cc.Layout).updateLayout();
setTimeout(() => { setTimeout(() => {
layout_card.getComponent(cc.Layout).updateLayout();
layout_normal.getComponent(cc.Layout).updateLayout();
let size = this.node.width; let size = this.node.width;
let lWidth = layout_card.width; let lWidth = layout_card.width;
if (lWidth > size - 300) { if (lWidth > size - 300) {
layout_card.scale = size / lWidth - 0.05; layout_card.scale = size / lWidth - 0.05;
} else {
layout_card.scale = 1;
} }
layout_card.opacity = 255; layout_card.opacity = 255;
// card_bg2.width = layout_card.width; let nWidth = layout_normal.width;
}, 60); if (nWidth > size - 300) {
layout_normal.scale = size / nWidth - 0.05;
} else {
layout_normal.scale = 1;
}
}, 90);
}, },
showCardAction(time) { showCardAction(time) {
......
...@@ -16,7 +16,7 @@ export const defaultData = { ...@@ -16,7 +16,7 @@ export const defaultData = {
{ {
"titleObj": [ "titleObj": [
{ {
"card": "a", "card": "ma",
"color": 0 "color": 0
}, },
{ {
...@@ -35,6 +35,22 @@ export const defaultData = { ...@@ -35,6 +35,22 @@ export const defaultData = {
"card": "le", "card": "le",
"color": 1 "color": 1
}, },
{
"card": "pp",
"color": 1
},
{
"card": "le",
"color": 1
},
{
"card": "pp",
"color": 1
},
{
"card": "le",
"color": 1
},
], ],
"bgImg": "http://staging-teach.cdn.ireadabc.com/97e19da9309e4e5aafca5ea2e9db8f46.png", "bgImg": "http://staging-teach.cdn.ireadabc.com/97e19da9309e4e5aafca5ea2e9db8f46.png",
"wordAudio": "http://staging-teach.cdn.ireadabc.com/ab3538f7d4d57ac1abd740bd32f06b2d.mp3", "wordAudio": "http://staging-teach.cdn.ireadabc.com/ab3538f7d4d57ac1abd740bd32f06b2d.mp3",
......
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