Commit c316d03e authored by limingzhe's avatar limingzhe

fix: 盘子底部对去,进度条顶部对齐

parent 85ea6811
...@@ -90,40 +90,40 @@ ...@@ -90,40 +90,40 @@
"__id__": 33 "__id__": 33
}, },
{ {
"__id__": 60 "__id__": 61
}, },
{ {
"__id__": 67 "__id__": 68
}, },
{ {
"__id__": 69 "__id__": 70
}, },
{ {
"__id__": 71 "__id__": 72
}, },
{ {
"__id__": 74 "__id__": 75
}, },
{ {
"__id__": 83 "__id__": 84
}, },
{ {
"__id__": 85 "__id__": 86
}, },
{ {
"__id__": 92 "__id__": 93
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 101 "__id__": 103
}, },
{ {
"__id__": 102 "__id__": 104
}, },
{ {
"__id__": 103 "__id__": 105
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1610,6 +1610,9 @@ ...@@ -1610,6 +1610,9 @@
"_components": [ "_components": [
{ {
"__id__": 59 "__id__": 59
},
{
"__id__": 60
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1636,7 +1639,7 @@ ...@@ -1636,7 +1639,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
33.298, 33.298,
-125.116, -125.11599999999999,
0, 0,
0, 0,
0, 0,
...@@ -2972,6 +2975,33 @@ ...@@ -2972,6 +2975,33 @@
"_N$affectedByScale": false, "_N$affectedByScale": false,
"_id": "58Ef5DGmVP25pmxRMRUt9X" "_id": "58Ef5DGmVP25pmxRMRUt9X"
}, },
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 33
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 4,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 174.88400000000001,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "a0OxYN3WxCdK6JKaXGxpGi"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "word_item", "_name": "word_item",
...@@ -2981,13 +3011,13 @@ ...@@ -2981,13 +3011,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 61 "__id__": 62
}, },
{ {
"__id__": 63 "__id__": 64
}, },
{ {
"__id__": 65 "__id__": 66
} }
], ],
"_active": false, "_active": false,
...@@ -3045,13 +3075,13 @@ ...@@ -3045,13 +3075,13 @@
"_name": "fangkuang", "_name": "fangkuang",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 60 "__id__": 61
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 62 "__id__": 63
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3107,7 +3137,7 @@ ...@@ -3107,7 +3137,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 61 "__id__": 62
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3139,13 +3169,13 @@ ...@@ -3139,13 +3169,13 @@
"_name": "word", "_name": "word",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 60 "__id__": 61
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 64 "__id__": 65
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3201,7 +3231,7 @@ ...@@ -3201,7 +3231,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 63 "__id__": 64
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3236,13 +3266,13 @@ ...@@ -3236,13 +3266,13 @@
"_name": "line", "_name": "line",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 60 "__id__": 61
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 66 "__id__": 67
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3298,7 +3328,7 @@ ...@@ -3298,7 +3328,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 65 "__id__": 66
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3339,7 +3369,7 @@ ...@@ -3339,7 +3369,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 68 "__id__": 69
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3395,7 +3425,7 @@ ...@@ -3395,7 +3425,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 67 "__id__": 68
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -3433,7 +3463,7 @@ ...@@ -3433,7 +3463,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 70 "__id__": 71
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3489,7 +3519,7 @@ ...@@ -3489,7 +3519,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 69 "__id__": 70
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -3527,10 +3557,10 @@ ...@@ -3527,10 +3557,10 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 72 "__id__": 73
}, },
{ {
"__id__": 73 "__id__": 74
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3586,7 +3616,7 @@ ...@@ -3586,7 +3616,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 71 "__id__": 72
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3621,7 +3651,7 @@ ...@@ -3621,7 +3651,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 71 "__id__": 72
}, },
"_enabled": true, "_enabled": true,
"_color": { "_color": {
...@@ -3643,16 +3673,16 @@ ...@@ -3643,16 +3673,16 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 75 "__id__": 76
}, },
{ {
"__id__": 77 "__id__": 78
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 82 "__id__": 83
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3708,13 +3738,13 @@ ...@@ -3708,13 +3738,13 @@
"_name": "img", "_name": "img",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 74 "__id__": 75
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 76 "__id__": 77
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3770,7 +3800,7 @@ ...@@ -3770,7 +3800,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 75 "__id__": 76
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3802,20 +3832,20 @@ ...@@ -3802,20 +3832,20 @@
"_name": "icon", "_name": "icon",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 74 "__id__": 75
}, },
"_children": [ "_children": [
{ {
"__id__": 78 "__id__": 79
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 80 "__id__": 81
}, },
{ {
"__id__": 81 "__id__": 82
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3871,13 +3901,13 @@ ...@@ -3871,13 +3901,13 @@
"_name": "icon_2", "_name": "icon_2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 77 "__id__": 78
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 79 "__id__": 80
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3933,7 +3963,7 @@ ...@@ -3933,7 +3963,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 78 "__id__": 79
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3965,7 +3995,7 @@ ...@@ -3965,7 +3995,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 77 "__id__": 78
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3997,7 +4027,7 @@ ...@@ -3997,7 +4027,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 77 "__id__": 78
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -4065,7 +4095,7 @@ ...@@ -4065,7 +4095,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 74 "__id__": 75
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4103,7 +4133,7 @@ ...@@ -4103,7 +4133,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 84 "__id__": 85
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4159,7 +4189,7 @@ ...@@ -4159,7 +4189,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 83 "__id__": 84
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -4190,16 +4220,16 @@ ...@@ -4190,16 +4220,16 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 86 "__id__": 87
}, },
{ {
"__id__": 89 "__id__": 90
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 91 "__id__": 92
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4255,16 +4285,16 @@ ...@@ -4255,16 +4285,16 @@
"_name": "New Sprite(Splash)", "_name": "New Sprite(Splash)",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 85 "__id__": 86
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 87 "__id__": 88
}, },
{ {
"__id__": 88 "__id__": 89
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4320,7 +4350,7 @@ ...@@ -4320,7 +4350,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 86 "__id__": 87
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4352,7 +4382,7 @@ ...@@ -4352,7 +4382,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 86 "__id__": 87
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -4379,13 +4409,13 @@ ...@@ -4379,13 +4409,13 @@
"_name": "bg_good-job2", "_name": "bg_good-job2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 85 "__id__": 86
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 90 "__id__": 91
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4441,7 +4471,7 @@ ...@@ -4441,7 +4471,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 89 "__id__": 90
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4473,7 +4503,7 @@ ...@@ -4473,7 +4503,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 85 "__id__": 86
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -4504,19 +4534,22 @@ ...@@ -4504,19 +4534,22 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 93 "__id__": 94
}, },
{ {
"__id__": 96 "__id__": 97
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 99 "__id__": 100
}, },
{ {
"__id__": 100 "__id__": 101
},
{
"__id__": 102
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4572,16 +4605,16 @@ ...@@ -4572,16 +4605,16 @@
"_name": "bar", "_name": "bar",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 92 "__id__": 93
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 94 "__id__": 95
}, },
{ {
"__id__": 95 "__id__": 96
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4637,7 +4670,7 @@ ...@@ -4637,7 +4670,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 93 "__id__": 94
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4669,7 +4702,7 @@ ...@@ -4669,7 +4702,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 93 "__id__": 94
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -4696,16 +4729,16 @@ ...@@ -4696,16 +4729,16 @@
"_name": "pro_label", "_name": "pro_label",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 92 "__id__": 93
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 97 "__id__": 98
}, },
{ {
"__id__": 98 "__id__": 99
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4761,7 +4794,7 @@ ...@@ -4761,7 +4794,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 96 "__id__": 97
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4794,7 +4827,7 @@ ...@@ -4794,7 +4827,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 96 "__id__": 97
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -4821,7 +4854,7 @@ ...@@ -4821,7 +4854,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 92 "__id__": 93
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4853,18 +4886,45 @@ ...@@ -4853,18 +4886,45 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 92 "__id__": 93
}, },
"_enabled": true, "_enabled": true,
"_N$totalLength": 540, "_N$totalLength": 540,
"_N$barSprite": { "_N$barSprite": {
"__id__": 94 "__id__": 95
}, },
"_N$mode": 0, "_N$mode": 0,
"_N$progress": 0, "_N$progress": 0,
"_N$reverse": false, "_N$reverse": false,
"_id": "57qwrMUQpDWJAV7RzfzLe/" "_id": "57qwrMUQpDWJAV7RzfzLe/"
}, },
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 93
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 1,
"_left": 0,
"_right": 0,
"_top": 22.11099999999999,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "d6ZaE/CqtDnL0JlXCM9qgG"
},
{ {
"__type__": "cc.Canvas", "__type__": "cc.Canvas",
"_name": "", "_name": "",
...@@ -4921,25 +4981,25 @@ ...@@ -4921,25 +4981,25 @@
"__id__": 33 "__id__": 33
}, },
"word_layout": { "word_layout": {
"__id__": 67 "__id__": 68
}, },
"nor_label": { "nor_label": {
"__id__": 71 "__id__": 72
}, },
"op_item": { "op_item": {
"__id__": 28 "__id__": 28
}, },
"word_item": { "word_item": {
"__id__": 60 "__id__": 61
}, },
"tips": { "tips": {
"__id__": 74 "__id__": 75
}, },
"progressBar": { "progressBar": {
"__id__": 92 "__id__": 93
}, },
"goodJob": { "goodJob": {
"__id__": 85 "__id__": 86
}, },
"_id": "c7RS18039BKJE5rgl8xIoE" "_id": "c7RS18039BKJE5rgl8xIoE"
} }
......
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