Commit 4fc5ec3c authored by wangxin's avatar wangxin

调整1

parent 4220ae94
......@@ -184,7 +184,7 @@
"_string": "",
"_N$string": "",
"_fontSize": 50,
"_lineHeight": 50,
"_lineHeight": 60,
"_enableWrapText": true,
"_N$file": {
"__uuid__": "2ce69722-dd5c-4c59-8aab-030f9274292f"
......
......@@ -184,7 +184,7 @@
"_string": "",
"_N$string": "",
"_fontSize": 50,
"_lineHeight": 50,
"_lineHeight": 60,
"_enableWrapText": true,
"_N$file": {
"__uuid__": "2ce69722-dd5c-4c59-8aab-030f9274292f"
......
......@@ -87,19 +87,19 @@
"__id__": 22
},
{
"__id__": 29
"__id__": 30
}
],
"_active": true,
"_components": [
{
"__id__": 32
},
{
"__id__": 33
},
{
"__id__": 34
},
{
"__id__": 35
}
],
"_prefab": null,
......@@ -189,7 +189,7 @@
"array": [
0,
0,
381.91720306893745,
521.347293078232,
0,
0,
0,
......@@ -966,14 +966,14 @@
],
"_active": true,
"_components": [
{
"__id__": 25
},
{
"__id__": 26
},
{
"__id__": 27
},
{
"__id__": 28
}
],
"_prefab": null,
......@@ -1036,6 +1036,9 @@
"_components": [
{
"__id__": 24
},
{
"__id__": 25
}
],
"_prefab": null,
......@@ -1122,6 +1125,33 @@
"_N$cacheMode": 0,
"_id": "dab/NGA85CFqJIq1qBE8tf"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 23
},
"_enabled": true,
"alignMode": 2,
"_target": null,
"_alignFlags": 40,
"_left": 71.5,
"_right": 71.5,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 1800,
"_originalHeight": 0,
"_id": "344mF7eyFHr67scbVTqH+A"
},
{
"__type__": "cc.Sprite",
"_name": "",
......@@ -1195,7 +1225,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
"__id__": 28
"__id__": 29
}
],
"_N$interactable": true,
......@@ -1274,10 +1304,10 @@
"_active": true,
"_components": [
{
"__id__": 30
"__id__": 31
},
{
"__id__": 31
"__id__": 32
}
],
"_prefab": null,
......@@ -1333,7 +1363,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 29
"__id__": 30
},
"_enabled": true,
"alignMode": 2,
......@@ -1360,7 +1390,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 29
"__id__": 30
},
"_enabled": true,
"_layoutSize": {
......@@ -1440,7 +1470,7 @@
},
"_enabled": true,
"options": {
"__id__": 29
"__id__": 30
},
"title": {
"__id__": 15
......
......@@ -121,7 +121,7 @@ cc.Class({
getDefaultData() {
const dataJson =
'{"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"}';
'{"title":"test","answer":3,"question":"hello world hello world hello world 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);
return data;
},
......
......@@ -7,8 +7,8 @@
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 969,
"height": 540,
"width": 323,
"height": 180,
"platformSettings": {},
"subMetas": {
"1-6@3x_2": {
......
......@@ -7,7 +7,7 @@
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 240,
"width": 237,
"height": 187,
"platformSettings": {},
"subMetas": {
......
......@@ -7,8 +7,8 @@
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 293,
"height": 352,
"width": 296,
"height": 363,
"platformSettings": {},
"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