Commit 8a82ba9d authored by Guo Yuhang's avatar Guo Yuhang

ui 走查问题清理

Signed-off-by: Guo Yuhang's avatar郭宇航 <guoyuhang@iplayabc.com>
parent 3cfb5c0d
......@@ -17,7 +17,7 @@
"__id__": 2
},
{
"__id__": 47
"__id__": 48
}
],
"_active": true,
......@@ -78,22 +78,22 @@
"__id__": 5
},
{
"__id__": 27
"__id__": 28
},
{
"__id__": 39
"__id__": 40
}
],
"_active": true,
"_components": [
{
"__id__": 44
},
{
"__id__": 45
},
{
"__id__": 46
},
{
"__id__": 47
}
],
"_prefab": null,
......@@ -183,7 +183,7 @@
"array": [
0,
0,
537.7898563845391,
494.77113849959716,
0,
0,
0,
......@@ -266,10 +266,10 @@
"_active": true,
"_components": [
{
"__id__": 25
"__id__": 26
},
{
"__id__": 26
"__id__": 27
}
],
"_prefab": null,
......@@ -283,7 +283,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1600,
"width": 1280,
"height": 720
},
"_anchorPoint": {
......@@ -302,7 +302,7 @@
0,
0,
1,
0.8,
1,
1,
1
]
......@@ -348,7 +348,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1600,
"width": 1280,
"height": 720
},
"_anchorPoint": {
......@@ -475,7 +475,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1600,
"width": 1280,
"height": 720
},
"_anchorPoint": {
......@@ -616,7 +616,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1600,
"width": 1280,
"height": 102
},
"_anchorPoint": {
......@@ -738,13 +738,13 @@
"__id__": 18
},
{
"__id__": 21
"__id__": 22
}
],
"_active": true,
"_components": [
{
"__id__": 24
"__id__": 25
}
],
"_prefab": null,
......@@ -758,8 +758,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 0,
"height": 0
"width": 500,
"height": 107
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -770,7 +770,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-500,
-340,
290,
0,
0,
......@@ -810,6 +810,9 @@
},
{
"__id__": 20
},
{
"__id__": 21
}
],
"_prefab": null,
......@@ -835,8 +838,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
2.65,
2.12,
0,
1.613,
0,
0,
0,
......@@ -879,7 +882,7 @@
"__uuid__": "7e6c30c3-f574-481f-82ae-b37ca91599eb"
},
"_type": 0,
"_sizeMode": 1,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
......@@ -908,6 +911,20 @@
"preload": false,
"_id": "ccxY31tWtOOrM4av2NDLdn"
},
{
"__type__": "b2354GTZopG4oaGZ40/baPN",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 18
},
"_enabled": true,
"image": null,
"displayMode": 3,
"offsetX": 0,
"offsetY": 0,
"_id": "994ix3oB9JJa0JjZBHYC26"
},
{
"__type__": "cc.Node",
"_name": "label",
......@@ -919,10 +936,10 @@
"_active": true,
"_components": [
{
"__id__": 22
"__id__": 23
},
{
"__id__": 23
"__id__": 24
}
],
"_prefab": null,
......@@ -948,8 +965,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
10.598,
14.838,
20.44,
17.462,
0,
0,
0,
......@@ -978,7 +995,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 21
"__id__": 22
},
"_enabled": true,
"_materials": [
......@@ -989,13 +1006,13 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_useOriginalSize": false,
"_string": "",
"_N$string": "",
"_string": "\n",
"_N$string": "\n",
"_fontSize": 40,
"_lineHeight": 40,
"_enableWrapText": true,
"_N$file": {
"__uuid__": "aa5b426e-3b93-4e31-b27f-bbe5ce50bcb9"
"__uuid__": "90ea68e6-f414-45e8-92af-5f4353f9449a"
},
"_isSystemFontUsed": false,
"_spacingX": 0,
......@@ -1014,7 +1031,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 21
"__id__": 22
},
"_enabled": true,
"_color": {
......@@ -1038,9 +1055,9 @@
"alignMode": 1,
"_target": null,
"_alignFlags": 9,
"_left": 300,
"_left": 50,
"_right": 0,
"_top": 70,
"_top": 16.5,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
......@@ -1114,19 +1131,19 @@
{
"__type__": "cc.Node",
"_name": "Card",
"_objFlags": 512,
"_objFlags": 0,
"_parent": {
"__id__": 2
},
"_children": [
{
"__id__": 28
"__id__": 29
},
{
"__id__": 30
"__id__": 31
},
{
"__id__": 33
"__id__": 34
}
],
"_active": true,
......@@ -1184,13 +1201,13 @@
"_name": "bgfront",
"_objFlags": 0,
"_parent": {
"__id__": 27
"__id__": 28
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 29
"__id__": 30
}
],
"_prefab": null,
......@@ -1246,7 +1263,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 28
"__id__": 29
},
"_enabled": true,
"_materials": [
......@@ -1278,16 +1295,16 @@
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 27
"__id__": 28
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 31
"__id__": 32
},
{
"__id__": 32
"__id__": 33
}
],
"_prefab": null,
......@@ -1343,7 +1360,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 30
"__id__": 31
},
"_enabled": true,
"_materials": [
......@@ -1373,7 +1390,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 30
"__id__": 31
},
"_enabled": true,
"_clip": null,
......@@ -1389,20 +1406,20 @@
"_name": "bgback",
"_objFlags": 0,
"_parent": {
"__id__": 27
"__id__": 28
},
"_children": [
{
"__id__": 34
"__id__": 35
}
],
"_active": true,
"_components": [
{
"__id__": 37
"__id__": 38
},
{
"__id__": 38
"__id__": 39
}
],
"_prefab": null,
......@@ -1458,16 +1475,16 @@
"_name": "label",
"_objFlags": 0,
"_parent": {
"__id__": 33
"__id__": 34
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 35
"__id__": 36
},
{
"__id__": 36
"__id__": 37
}
],
"_prefab": null,
......@@ -1493,8 +1510,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
135,
-1,
150,
0,
0,
0,
......@@ -1523,7 +1540,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 34
"__id__": 35
},
"_enabled": true,
"_materials": [
......@@ -1557,16 +1574,16 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 34
"__id__": 35
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 45,
"_left": 30,
"_right": 30,
"_top": 10,
"_bottom": 10,
"_left": 29,
"_right": 31,
"_top": -5,
"_bottom": 25,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
......@@ -1584,7 +1601,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 33
"__id__": 34
},
"_enabled": true,
"_materials": [
......@@ -1616,7 +1633,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 33
"__id__": 34
},
"_enabled": true,
"_clip": {
......@@ -1632,19 +1649,19 @@
{
"__type__": "cc.Node",
"_name": "AutoContainer",
"_objFlags": 512,
"_objFlags": 0,
"_parent": {
"__id__": 2
},
"_children": [
{
"__id__": 40
"__id__": 41
}
],
"_active": true,
"_components": [
{
"__id__": 43
"__id__": 44
}
],
"_prefab": null,
......@@ -1700,16 +1717,16 @@
"_name": "layout",
"_objFlags": 0,
"_parent": {
"__id__": 39
"__id__": 40
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 41
"__id__": 42
},
{
"__id__": 42
"__id__": 43
}
],
"_prefab": null,
......@@ -1736,7 +1753,7 @@
"ctor": "Float64Array",
"array": [
0,
-100.00000000000001,
-120,
0,
0,
0,
......@@ -1765,7 +1782,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 40
"__id__": 41
},
"_enabled": true,
"_layoutSize": {
......@@ -1797,7 +1814,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 40
"__id__": 41
},
"_enabled": true,
"alignMode": 1,
......@@ -1805,8 +1822,8 @@
"_alignFlags": 45,
"_left": 0,
"_right": 0,
"_top": 200.00000000000006,
"_bottom": 4.263256414560601e-14,
"_top": 220.00000000000006,
"_bottom": -19.999999999999943,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
......@@ -1824,7 +1841,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 39
"__id__": 40
},
"_enabled": true,
"designWidth": 1280,
......@@ -1899,7 +1916,7 @@
"_active": false,
"_components": [
{
"__id__": 48
"__id__": 49
}
],
"_prefab": null,
......@@ -1955,7 +1972,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 47
"__id__": 48
},
"_enabled": true,
"_materials": [
......
......@@ -105,7 +105,7 @@ cc.Class({
getDefaultData() {
const dataJson = ' {"contentObj":{"picArr":[{"left":{"title":"","pic_url":"","audio_url":""},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"","pic_url":"","audio_url":""},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"","pic_url":"","audio_url":""},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"","pic_url":"","audio_url":""},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"","pic_url":"","audio_url":""},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"","pic_url":"","audio_url":""},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"","pic_url":"","audio_url":""},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"","pic_url":"","audio_url":""},"right":{"title":"","pic_url":"","audio_url":""}}],"audio_url":"http://staging-teach.cdn.ireadabc.com/a4d27ad173a95823d4b8ec82363c5aa0.mp3","title":""},"audio_url":""}';
const dataJson = ' {"contentObj":{"picArr":[{"left":{"title":"","pic_url":"","audio_url":""},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"","pic_url":"","audio_url":""},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"","pic_url":"","audio_url":""},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"","pic_url":"","audio_url":""},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"","pic_url":"","audio_url":""},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"","pic_url":"","audio_url":""},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"","pic_url":"","audio_url":""},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"","pic_url":"","audio_url":""},"right":{"title":"","pic_url":"","audio_url":""}}],"audio_url":"","title":""},"audio_url":""}';
// const dataJson = '{"contentObj":{"picArr":[{"left":{"title":"11111","pic_url":"http://staging-teach.cdn.ireadabc.com/156b8293a073ef828f6e01fc620c3562.png","audio_url":"http://staging-teach.cdn.ireadabc.com/83513f8d6083ebe072e3f9e47a21558a.mp3"},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"222222","pic_url":"http://staging-teach.cdn.ireadabc.com/e029bf3210a23a169f1cc14a851cc9e4.jpg","audio_url":"http://staging-teach.cdn.ireadabc.com/5285e1e88a26a08783757e9c43a8653f.mp3"},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"3333","pic_url":"http://staging-teach.cdn.ireadabc.com/89f8093ced2b9ddeccec352e9b7f2775.jpg","audio_url":"http://staging-teach.cdn.ireadabc.com/440cf9d57752b30691d90ed565e8c924.mp3"},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"444444","pic_url":"http://staging-teach.cdn.ireadabc.com/5a2c61d8faf5935e70fd9b15953b12f6.png","audio_url":"http://staging-teach.cdn.ireadabc.com/a5fa20e0c6024421b0d9a7007c303503.mp3"},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"5555","pic_url":"http://staging-teach.cdn.ireadabc.com/ce2e48ecefbf8b7011385a95133fe987.jpg","audio_url":"http://staging-teach.cdn.ireadabc.com/a41f0f2bf190396e2641ec8dada8edfe.mp3"},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"66","pic_url":"http://staging-teach.cdn.ireadabc.com/13845267419e50bd7f0c0f74ba424be2.jpg","audio_url":"http://staging-teach.cdn.ireadabc.com/32258b839eca32b6ccf94f3dd6c86e0c.mp3"},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"77777","pic_url":"http://staging-teach.cdn.ireadabc.com/7ec7599c86f974c9f88409893010811d.png","audio_url":"http://staging-teach.cdn.ireadabc.com/49ac987d13695eb411da4bef0adb318f.mp3"},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"8888888","pic_url":"http://staging-teach.cdn.ireadabc.com/24ee95ea61a2a653ce25c65557b18356.jpg","audio_url":"http://staging-teach.cdn.ireadabc.com/85cff126986f5cc11b05e95181da5869.mp3"},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"99999999999999999","pic_url":"http://staging-teach.cdn.ireadabc.com/3aa5a936d8e0e6f1dd2f6eb6d3d26645.jpg","audio_url":"http://staging-teach.cdn.ireadabc.com/a4d27ad173a95823d4b8ec82363c5aa0.mp3"},"right":{"title":"","pic_url":"","audio_url":""}},{"left":{"title":"10101010101010","pic_url":"http://staging-teach.cdn.ireadabc.com/5ec43bf9507ff08d556487dee9234653.png","audio_url":"http://staging-teach.cdn.ireadabc.com/66878465ec50d162bd60fcdaa641933b.mp3"},"right":{"title":"","pic_url":"","audio_url":""}}]}}'
const data1 = JSON.parse(dataJson);
return data1;
......@@ -258,8 +258,8 @@ cc.Class({
layout.spacingX = 120;
// layout.paddingLeft = 60;
} else {
cardNode.scaleY = 0.8;
cardNode.scaleX = 0.8;
cardNode.scaleY = 0.9;
cardNode.scaleX = 0.9;
layout.spacingX = 180;
// layout.paddingLeft = 100;
}
......
{
"ver": "1.1.0",
"uuid": "90ea68e6-f414-45e8-92af-5f4353f9449a",
"subMetas": {}
}
\ No newline at end of file
{
"last-module-event-record-time": 1600677246969
"last-module-event-record-time": 1600677246969,
"group-list": [
"default"
],
"collision-matrix": [
[
true
]
],
"excluded-modules": [
"3D Physics/Builtin"
],
"preview-port": 7456,
"design-resolution-width": 1280,
"design-resolution-height": 720,
"fit-width": false,
"fit-height": true,
"use-project-simulator-setting": false,
"simulator-orientation": false,
"use-customize-simulator": true,
"simulator-resolution": {
"height": 640,
"width": 960
},
"facebook": {
"appID": "",
"audience": {
"enable": false
},
"enable": false,
"live": {
"enable": false
}
}
}
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