Commit 4220ae94 authored by wangxin's avatar wangxin

调整

parent d1b8f8f5
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 422, "width": 422,
"height": 110 "height": 120
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
120, 130,
0, 0,
0, 0,
0, 0,
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
"_string": "", "_string": "",
"_N$string": "", "_N$string": "",
"_fontSize": 50, "_fontSize": 50,
"_lineHeight": 56, "_lineHeight": 50,
"_enableWrapText": true, "_enableWrapText": true,
"_N$file": { "_N$file": {
"__uuid__": "2ce69722-dd5c-4c59-8aab-030f9274292f" "__uuid__": "2ce69722-dd5c-4c59-8aab-030f9274292f"
...@@ -214,7 +214,7 @@ ...@@ -214,7 +214,7 @@
"_alignFlags": 1, "_alignFlags": 1,
"_left": 0, "_left": 0,
"_right": 0, "_right": 0,
"_top": 61.5, "_top": 51.5,
"_bottom": 0, "_bottom": 0,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
......
...@@ -128,8 +128,8 @@ ...@@ -128,8 +128,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 550, "width": 520,
"height": 110 "height": 130
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
120, 130,
0, 0,
0, 0,
0, 0,
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
"_string": "", "_string": "",
"_N$string": "", "_N$string": "",
"_fontSize": 50, "_fontSize": 50,
"_lineHeight": 56, "_lineHeight": 50,
"_enableWrapText": true, "_enableWrapText": true,
"_N$file": { "_N$file": {
"__uuid__": "2ce69722-dd5c-4c59-8aab-030f9274292f" "__uuid__": "2ce69722-dd5c-4c59-8aab-030f9274292f"
...@@ -214,7 +214,7 @@ ...@@ -214,7 +214,7 @@
"_alignFlags": 1, "_alignFlags": 1,
"_left": 0, "_left": 0,
"_right": 0, "_right": 0,
"_top": 57.5, "_top": 47.5,
"_bottom": 0, "_bottom": 0,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
......
...@@ -121,7 +121,7 @@ cc.Class({ ...@@ -121,7 +121,7 @@ cc.Class({
getDefaultData() { getDefaultData() {
const dataJson = const dataJson =
'{"title":"test","answer":3,"question":"hello world","options":[{"pic_url":"http://staging-teach.cdn.ireadabc.com/c5a7a94fbebdbf635952454cbe8b3371.jpeg","audio_url":"http://staging-teach.cdn.ireadabc.com/fff5204fc774e932bcd597b4094b0852.mp3","text":"选项1"},{"pic_url":"http://staging-teach.cdn.ireadabc.com/3064a1f8bec54390c031b2c2d8b84e7f.jpeg","audio_url":"http://staging-teach.cdn.ireadabc.com/e8627e7f3ec1a04fdb3660eae81f7636.mp3","text":"选项2"},{"pic_url":"http://staging-teach.cdn.ireadabc.com/3064a1f8bec54390c031b2c2d8b84e7f.jpeg","audio_url":"http://staging-teach.cdn.ireadabc.com/e8627e7f3ec1a04fdb3660eae81f7636.mp3","text":"选项2, how are you doing aaaa"},{"pic_url":"http://staging-teach.cdn.ireadabc.com/3064a1f8bec54390c031b2c2d8b84e7f.jpeg","audio_url":"","text":"选项2, how are you doing aaaa"}],"audio_title":"http://staging-teach.cdn.ireadabc.com/f7fb9f71ab7d460ac2f78c85efba7610.mp3","audio_question":"http://staging-teach.cdn.ireadabc.com/7934cdcec68eabe639020bad5420d7f8.mp3"}'; '{"title":"test","answer":3,"question":"hello world","options":[{"pic_url":"http://staging-teach.cdn.ireadabc.com/3064a1f8bec54390c031b2c2d8b84e7f.jpeg","audio_url":"http://staging-teach.cdn.ireadabc.com/e8627e7f3ec1a04fdb3660eae81f7636.mp3","text":"选项2"},{"pic_url":"http://staging-teach.cdn.ireadabc.com/3064a1f8bec54390c031b2c2d8b84e7f.jpeg","audio_url":"http://staging-teach.cdn.ireadabc.com/e8627e7f3ec1a04fdb3660eae81f7636.mp3","text":"选项2, how are you doing aaaa"},{"pic_url":"http://staging-teach.cdn.ireadabc.com/3064a1f8bec54390c031b2c2d8b84e7f.jpeg","audio_url":"","text":"选项2, how are you doing aaaa"}],"audio_title":"http://staging-teach.cdn.ireadabc.com/f7fb9f71ab7d460ac2f78c85efba7610.mp3","audio_question":"http://staging-teach.cdn.ireadabc.com/7934cdcec68eabe639020bad5420d7f8.mp3"}';
const data = JSON.parse(dataJson); const data = JSON.parse(dataJson);
return data; return data;
}, },
......
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