Commit f8e2c066 authored by 范雪寒's avatar 范雪寒

fix: 去黑边

parent 22ce0a3b
...@@ -17,19 +17,19 @@ ...@@ -17,19 +17,19 @@
"__id__": 2 "__id__": 2
}, },
{ {
"__id__": 70 "__id__": 68
}, },
{ {
"__id__": 96 "__id__": 94
}, },
{ {
"__id__": 107 "__id__": 105
}, },
{ {
"__id__": 108 "__id__": 106
}, },
{ {
"__id__": 112 "__id__": 110
} }
], ],
"_active": false, "_active": false,
...@@ -90,11 +90,17 @@ ...@@ -90,11 +90,17 @@
"__id__": 6 "__id__": 6
}, },
{ {
"__id__": 61 "__id__": 59
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 61
},
{
"__id__": 62
},
{ {
"__id__": 63 "__id__": 63
}, },
...@@ -109,12 +115,6 @@ ...@@ -109,12 +115,6 @@
}, },
{ {
"__id__": 67 "__id__": 67
},
{
"__id__": 68
},
{
"__id__": 69
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -305,19 +305,19 @@ ...@@ -305,19 +305,19 @@
"__id__": 7 "__id__": 7
}, },
{ {
"__id__": 10 "__id__": 9
}, },
{ {
"__id__": 13 "__id__": 11
}, },
{ {
"__id__": 56 "__id__": 54
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 60 "__id__": 58
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -380,9 +380,6 @@ ...@@ -380,9 +380,6 @@
"_components": [ "_components": [
{ {
"__id__": 8 "__id__": 8
},
{
"__id__": 9
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -465,33 +462,6 @@ ...@@ -465,33 +462,6 @@
"_atlas": null, "_atlas": null,
"_id": "1aHJtSgYNCY4arOE6l5oI0" "_id": "1aHJtSgYNCY4arOE6l5oI0"
}, },
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 7
},
"_enabled": true,
"alignMode": 2,
"_target": null,
"_alignFlags": 45,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 1280,
"_originalHeight": 720,
"_id": "822HTX3JhMhpQyTIPoB3aI"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "bg_mask", "_name": "bg_mask",
...@@ -503,10 +473,7 @@ ...@@ -503,10 +473,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 11 "__id__": 10
},
{
"__id__": 12
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -562,7 +529,7 @@ ...@@ -562,7 +529,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 10 "__id__": 9
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -589,33 +556,6 @@ ...@@ -589,33 +556,6 @@
"_atlas": null, "_atlas": null,
"_id": "d9IKfQbTpN8KyByctmX+YO" "_id": "d9IKfQbTpN8KyByctmX+YO"
}, },
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 10
},
"_enabled": true,
"alignMode": 2,
"_target": null,
"_alignFlags": 45,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 100,
"_originalHeight": 100,
"_id": "d1/xeSy09LmKqEkNEuvBbr"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "connent", "_name": "connent",
...@@ -625,10 +565,10 @@ ...@@ -625,10 +565,10 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 14 "__id__": 12
}, },
{ {
"__id__": 52 "__id__": 50
} }
], ],
"_active": true, "_active": true,
...@@ -686,29 +626,29 @@ ...@@ -686,29 +626,29 @@
"_name": "nodCenter", "_name": "nodCenter",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 13 "__id__": 11
}, },
"_children": [ "_children": [
{ {
"__id__": 15 "__id__": 13
}, },
{ {
"__id__": 17 "__id__": 15
}, },
{ {
"__id__": 20 "__id__": 18
}, },
{ {
"__id__": 27 "__id__": 25
}, },
{ {
"__id__": 29 "__id__": 27
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 51 "__id__": 49
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -764,13 +704,13 @@ ...@@ -764,13 +704,13 @@
"_name": "bg_trafficlight", "_name": "bg_trafficlight",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 14 "__id__": 12
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 16 "__id__": 14
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -826,7 +766,7 @@ ...@@ -826,7 +766,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 15 "__id__": 13
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -858,16 +798,16 @@ ...@@ -858,16 +798,16 @@
"_name": "bg_trafficlight2", "_name": "bg_trafficlight2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 14 "__id__": 12
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 18 "__id__": 16
}, },
{ {
"__id__": 19 "__id__": 17
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -923,7 +863,7 @@ ...@@ -923,7 +863,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 17 "__id__": 15
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -955,7 +895,7 @@ ...@@ -955,7 +895,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 17 "__id__": 15
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -987,23 +927,23 @@ ...@@ -987,23 +927,23 @@
"_name": "frame", "_name": "frame",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 14 "__id__": 12
}, },
"_children": [ "_children": [
{ {
"__id__": 21 "__id__": 19
}, },
{ {
"__id__": 23 "__id__": 21
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 25 "__id__": 23
}, },
{ {
"__id__": 26 "__id__": 24
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1059,13 +999,13 @@ ...@@ -1059,13 +999,13 @@
"_name": "spt", "_name": "spt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 20 "__id__": 18
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 22 "__id__": 20
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1121,7 +1061,7 @@ ...@@ -1121,7 +1061,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 21 "__id__": 19
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1151,13 +1091,13 @@ ...@@ -1151,13 +1091,13 @@
"_name": "item", "_name": "item",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 20 "__id__": 18
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 24 "__id__": 22
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1213,7 +1153,7 @@ ...@@ -1213,7 +1153,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 23 "__id__": 21
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -1240,7 +1180,7 @@ ...@@ -1240,7 +1180,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 20 "__id__": 18
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1272,14 +1212,14 @@ ...@@ -1272,14 +1212,14 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 20 "__id__": 18
}, },
"_enabled": true, "_enabled": true,
"hitPre": { "hitPre": {
"__uuid__": "2ce7d58d-b6fe-4ef7-a128-de76f672a803" "__uuid__": "2ce7d58d-b6fe-4ef7-a128-de76f672a803"
}, },
"quan": { "quan": {
"__id__": 23 "__id__": 21
}, },
"_id": "93QFh2Uc1DrYGA75mds7eI" "_id": "93QFh2Uc1DrYGA75mds7eI"
}, },
...@@ -1288,13 +1228,13 @@ ...@@ -1288,13 +1228,13 @@
"_name": "Layout", "_name": "Layout",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 14 "__id__": 12
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 28 "__id__": 26
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1350,7 +1290,7 @@ ...@@ -1350,7 +1290,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 27 "__id__": 25
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -1382,23 +1322,23 @@ ...@@ -1382,23 +1322,23 @@
"_name": "nodtype", "_name": "nodtype",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 14 "__id__": 12
}, },
"_children": [ "_children": [
{ {
"__id__": 30 "__id__": 28
}, },
{ {
"__id__": 37 "__id__": 35
}, },
{ {
"__id__": 40 "__id__": 38
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 50 "__id__": 48
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1454,17 +1394,17 @@ ...@@ -1454,17 +1394,17 @@
"_name": "type1", "_name": "type1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 29 "__id__": 27
}, },
"_children": [ "_children": [
{ {
"__id__": 31 "__id__": 29
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 35 "__id__": 33
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1520,17 +1460,17 @@ ...@@ -1520,17 +1460,17 @@
"_name": "audio", "_name": "audio",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 30 "__id__": 28
}, },
"_children": [ "_children": [
{ {
"__id__": 32 "__id__": 30
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 34 "__id__": 32
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1586,13 +1526,13 @@ ...@@ -1586,13 +1526,13 @@
"_name": "audio", "_name": "audio",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 31 "__id__": 29
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 33 "__id__": 31
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1648,7 +1588,7 @@ ...@@ -1648,7 +1588,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 32 "__id__": 30
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1680,7 +1620,7 @@ ...@@ -1680,7 +1620,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 31 "__id__": 29
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1712,7 +1652,7 @@ ...@@ -1712,7 +1652,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 30 "__id__": 28
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -1721,7 +1661,7 @@ ...@@ -1721,7 +1661,7 @@
"zoomScale": 1.2, "zoomScale": 1.2,
"clickEvents": [ "clickEvents": [
{ {
"__id__": 36 "__id__": 34
} }
], ],
"_N$interactable": true, "_N$interactable": true,
...@@ -1782,7 +1722,7 @@ ...@@ -1782,7 +1722,7 @@
{ {
"__type__": "cc.ClickEvent", "__type__": "cc.ClickEvent",
"target": { "target": {
"__id__": 29 "__id__": 27
}, },
"component": "", "component": "",
"_componentId": "e5c11r7ePhGEZ6vDXWFElFo", "_componentId": "e5c11r7ePhGEZ6vDXWFElFo",
...@@ -1794,11 +1734,11 @@ ...@@ -1794,11 +1734,11 @@
"_name": "type2", "_name": "type2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 29 "__id__": 27
}, },
"_children": [ "_children": [
{ {
"__id__": 38 "__id__": 36
} }
], ],
"_active": false, "_active": false,
...@@ -1856,13 +1796,13 @@ ...@@ -1856,13 +1796,13 @@
"_name": "title", "_name": "title",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 37 "__id__": 35
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 39 "__id__": 37
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1918,7 +1858,7 @@ ...@@ -1918,7 +1858,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 38 "__id__": 36
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1951,23 +1891,23 @@ ...@@ -1951,23 +1891,23 @@
"_name": "type3", "_name": "type3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 29 "__id__": 27
}, },
"_children": [ "_children": [
{ {
"__id__": 41 "__id__": 39
}, },
{ {
"__id__": 45 "__id__": 43
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 47 "__id__": 45
}, },
{ {
"__id__": 48 "__id__": 46
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2023,17 +1963,17 @@ ...@@ -2023,17 +1963,17 @@
"_name": "audio", "_name": "audio",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 40 "__id__": 38
}, },
"_children": [ "_children": [
{ {
"__id__": 42 "__id__": 40
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 44 "__id__": 42
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2089,13 +2029,13 @@ ...@@ -2089,13 +2029,13 @@
"_name": "audio", "_name": "audio",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 41 "__id__": 39
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 43 "__id__": 41
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2151,7 +2091,7 @@ ...@@ -2151,7 +2091,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 42 "__id__": 40
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2183,7 +2123,7 @@ ...@@ -2183,7 +2123,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 41 "__id__": 39
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2215,13 +2155,13 @@ ...@@ -2215,13 +2155,13 @@
"_name": "title", "_name": "title",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 40 "__id__": 38
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 46 "__id__": 44
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2277,7 +2217,7 @@ ...@@ -2277,7 +2217,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 45 "__id__": 43
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2310,7 +2250,7 @@ ...@@ -2310,7 +2250,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 40 "__id__": 38
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -2342,7 +2282,7 @@ ...@@ -2342,7 +2282,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 40 "__id__": 38
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -2351,7 +2291,7 @@ ...@@ -2351,7 +2291,7 @@
"zoomScale": 1.2, "zoomScale": 1.2,
"clickEvents": [ "clickEvents": [
{ {
"__id__": 49 "__id__": 47
} }
], ],
"_N$interactable": true, "_N$interactable": true,
...@@ -2412,7 +2352,7 @@ ...@@ -2412,7 +2352,7 @@
{ {
"__type__": "cc.ClickEvent", "__type__": "cc.ClickEvent",
"target": { "target": {
"__id__": 29 "__id__": 27
}, },
"component": "", "component": "",
"_componentId": "e5c11r7ePhGEZ6vDXWFElFo", "_componentId": "e5c11r7ePhGEZ6vDXWFElFo",
...@@ -2424,18 +2364,18 @@ ...@@ -2424,18 +2364,18 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 29 "__id__": 27
}, },
"_enabled": true, "_enabled": true,
"TitleType": [ "TitleType": [
{ {
"__id__": 30 "__id__": 28
}, },
{ {
"__id__": 37 "__id__": 35
}, },
{ {
"__id__": 40 "__id__": 38
} }
], ],
"_id": "6eJo7R+stI870GmPBvMBPk" "_id": "6eJo7R+stI870GmPBvMBPk"
...@@ -2445,7 +2385,7 @@ ...@@ -2445,7 +2385,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 14 "__id__": 12
}, },
"_enabled": true, "_enabled": true,
"alignMode": 2, "alignMode": 2,
...@@ -2472,16 +2412,16 @@ ...@@ -2472,16 +2412,16 @@
"_name": "reStart", "_name": "reStart",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 13 "__id__": 11
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 53 "__id__": 51
}, },
{ {
"__id__": 54 "__id__": 52
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2537,7 +2477,7 @@ ...@@ -2537,7 +2477,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 52 "__id__": 50
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2569,7 +2509,7 @@ ...@@ -2569,7 +2509,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 52 "__id__": 50
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -2578,7 +2518,7 @@ ...@@ -2578,7 +2518,7 @@
"zoomScale": 0.95, "zoomScale": 0.95,
"clickEvents": [ "clickEvents": [
{ {
"__id__": 55 "__id__": 53
} }
], ],
"_N$interactable": true, "_N$interactable": true,
...@@ -2657,10 +2597,10 @@ ...@@ -2657,10 +2597,10 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 57 "__id__": 55
}, },
{ {
"__id__": 58 "__id__": 56
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2716,7 +2656,7 @@ ...@@ -2716,7 +2656,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 56 "__id__": 54
}, },
"_enabled": true, "_enabled": true,
"_id": "80PylZIy9EbJR4/AZl0xgK" "_id": "80PylZIy9EbJR4/AZl0xgK"
...@@ -2726,7 +2666,7 @@ ...@@ -2726,7 +2666,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 56 "__id__": 54
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -2735,7 +2675,7 @@ ...@@ -2735,7 +2675,7 @@
"zoomScale": 1.2, "zoomScale": 1.2,
"clickEvents": [ "clickEvents": [
{ {
"__id__": 59 "__id__": 57
} }
], ],
"_N$interactable": true, "_N$interactable": true,
...@@ -2841,7 +2781,7 @@ ...@@ -2841,7 +2781,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 62 "__id__": 60
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2897,7 +2837,7 @@ ...@@ -2897,7 +2837,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 61 "__id__": 59
}, },
"_enabled": true, "_enabled": true,
"eff_audio": [ "eff_audio": [
...@@ -2979,15 +2919,18 @@ ...@@ -2979,15 +2919,18 @@
"bgScaleMax": [ "bgScaleMax": [
{ {
"__id__": 7 "__id__": 7
},
{
"__id__": 9
} }
], ],
"nodeUIOffset": [ "nodeUIOffset": [
{ {
"__id__": 13 "__id__": 11
} }
], ],
"canvasView": { "canvasView": {
"__id__": 63 "__id__": 61
}, },
"isCanvas": true, "isCanvas": true,
"_id": "5eOVDDzARGnoMLcNXyk5ml" "_id": "5eOVDDzARGnoMLcNXyk5ml"
...@@ -3011,7 +2954,7 @@ ...@@ -3011,7 +2954,7 @@
}, },
"_enabled": true, "_enabled": true,
"btnRestart": { "btnRestart": {
"__id__": 52 "__id__": 50
}, },
"_id": "4f+bKs17xGbZW0EZ8TwWW2" "_id": "4f+bKs17xGbZW0EZ8TwWW2"
}, },
...@@ -3055,19 +2998,19 @@ ...@@ -3055,19 +2998,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 71 "__id__": 69
}, },
{ {
"__id__": 76 "__id__": 74
}, },
{ {
"__id__": 81 "__id__": 79
}, },
{ {
"__id__": 86 "__id__": 84
}, },
{ {
"__id__": 91 "__id__": 89
} }
], ],
"_active": true, "_active": true,
...@@ -3125,11 +3068,11 @@ ...@@ -3125,11 +3068,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 70 "__id__": 68
}, },
"_children": [ "_children": [
{ {
"__id__": 72 "__id__": 70
} }
], ],
"_active": true, "_active": true,
...@@ -3187,17 +3130,17 @@ ...@@ -3187,17 +3130,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 71 "__id__": 69
}, },
"_children": [ "_children": [
{ {
"__id__": 73 "__id__": 71
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 75 "__id__": 73
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3253,13 +3196,13 @@ ...@@ -3253,13 +3196,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 72 "__id__": 70
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 74 "__id__": 72
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3315,7 +3258,7 @@ ...@@ -3315,7 +3258,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 73 "__id__": 71
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3347,7 +3290,7 @@ ...@@ -3347,7 +3290,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 72 "__id__": 70
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3369,11 +3312,11 @@ ...@@ -3369,11 +3312,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 70 "__id__": 68
}, },
"_children": [ "_children": [
{ {
"__id__": 77 "__id__": 75
} }
], ],
"_active": true, "_active": true,
...@@ -3431,17 +3374,17 @@ ...@@ -3431,17 +3374,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 76 "__id__": 74
}, },
"_children": [ "_children": [
{ {
"__id__": 78 "__id__": 76
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 80 "__id__": 78
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3497,13 +3440,13 @@ ...@@ -3497,13 +3440,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 77 "__id__": 75
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 79 "__id__": 77
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3559,7 +3502,7 @@ ...@@ -3559,7 +3502,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 78 "__id__": 76
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3591,7 +3534,7 @@ ...@@ -3591,7 +3534,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 77 "__id__": 75
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3613,11 +3556,11 @@ ...@@ -3613,11 +3556,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 70 "__id__": 68
}, },
"_children": [ "_children": [
{ {
"__id__": 82 "__id__": 80
} }
], ],
"_active": true, "_active": true,
...@@ -3675,17 +3618,17 @@ ...@@ -3675,17 +3618,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 81 "__id__": 79
}, },
"_children": [ "_children": [
{ {
"__id__": 83 "__id__": 81
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 85 "__id__": 83
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3741,13 +3684,13 @@ ...@@ -3741,13 +3684,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 82 "__id__": 80
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 84 "__id__": 82
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3803,7 +3746,7 @@ ...@@ -3803,7 +3746,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 83 "__id__": 81
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3835,7 +3778,7 @@ ...@@ -3835,7 +3778,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 82 "__id__": 80
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3857,11 +3800,11 @@ ...@@ -3857,11 +3800,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 70 "__id__": 68
}, },
"_children": [ "_children": [
{ {
"__id__": 87 "__id__": 85
} }
], ],
"_active": true, "_active": true,
...@@ -3919,17 +3862,17 @@ ...@@ -3919,17 +3862,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 86 "__id__": 84
}, },
"_children": [ "_children": [
{ {
"__id__": 88 "__id__": 86
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 90 "__id__": 88
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3985,13 +3928,13 @@ ...@@ -3985,13 +3928,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 87 "__id__": 85
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 89 "__id__": 87
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4047,7 +3990,7 @@ ...@@ -4047,7 +3990,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 88 "__id__": 86
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4079,7 +4022,7 @@ ...@@ -4079,7 +4022,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 87 "__id__": 85
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4101,11 +4044,11 @@ ...@@ -4101,11 +4044,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 70 "__id__": 68
}, },
"_children": [ "_children": [
{ {
"__id__": 92 "__id__": 90
} }
], ],
"_active": true, "_active": true,
...@@ -4163,17 +4106,17 @@ ...@@ -4163,17 +4106,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 91 "__id__": 89
}, },
"_children": [ "_children": [
{ {
"__id__": 93 "__id__": 91
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 95 "__id__": 93
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4229,13 +4172,13 @@ ...@@ -4229,13 +4172,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 92 "__id__": 90
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 94 "__id__": 92
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4291,7 +4234,7 @@ ...@@ -4291,7 +4234,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 93 "__id__": 91
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4323,7 +4266,7 @@ ...@@ -4323,7 +4266,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 92 "__id__": 90
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4348,6 +4291,9 @@ ...@@ -4348,6 +4291,9 @@
"__id__": 1 "__id__": 1
}, },
"_children": [ "_children": [
{
"__id__": 95
},
{ {
"__id__": 97 "__id__": 97
}, },
...@@ -4359,9 +4305,6 @@ ...@@ -4359,9 +4305,6 @@
}, },
{ {
"__id__": 103 "__id__": 103
},
{
"__id__": 105
} }
], ],
"_active": true, "_active": true,
...@@ -4419,13 +4362,13 @@ ...@@ -4419,13 +4362,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 96 "__id__": 94
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 98 "__id__": 96
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4481,7 +4424,7 @@ ...@@ -4481,7 +4424,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 97 "__id__": 95
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4513,13 +4456,13 @@ ...@@ -4513,13 +4456,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 96 "__id__": 94
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 100 "__id__": 98
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4575,7 +4518,7 @@ ...@@ -4575,7 +4518,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 99 "__id__": 97
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4607,13 +4550,13 @@ ...@@ -4607,13 +4550,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 96 "__id__": 94
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 102 "__id__": 100
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4669,7 +4612,7 @@ ...@@ -4669,7 +4612,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 101 "__id__": 99
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4701,13 +4644,13 @@ ...@@ -4701,13 +4644,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 96 "__id__": 94
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 104 "__id__": 102
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4763,7 +4706,7 @@ ...@@ -4763,7 +4706,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 103 "__id__": 101
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4795,13 +4738,13 @@ ...@@ -4795,13 +4738,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 96 "__id__": 94
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 106 "__id__": 104
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4857,7 +4800,7 @@ ...@@ -4857,7 +4800,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 105 "__id__": 103
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4951,13 +4894,13 @@ ...@@ -4951,13 +4894,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 109 "__id__": 107
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 111 "__id__": 109
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5013,13 +4956,13 @@ ...@@ -5013,13 +4956,13 @@
"_name": "sprite", "_name": "sprite",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 108 "__id__": 106
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 110 "__id__": 108
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5075,7 +5018,7 @@ ...@@ -5075,7 +5018,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 109 "__id__": 107
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5105,7 +5048,7 @@ ...@@ -5105,7 +5048,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 108 "__id__": 106
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5141,13 +5084,13 @@ ...@@ -5141,13 +5084,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 113 "__id__": 111
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 117 "__id__": 115
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5203,17 +5146,17 @@ ...@@ -5203,17 +5146,17 @@
"_name": "Star", "_name": "Star",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 112 "__id__": 110
}, },
"_children": [ "_children": [
{ {
"__id__": 114 "__id__": 112
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 116 "__id__": 114
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5269,13 +5212,13 @@ ...@@ -5269,13 +5212,13 @@
"_name": "StarBig", "_name": "StarBig",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 113 "__id__": 111
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 115 "__id__": 113
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5331,7 +5274,7 @@ ...@@ -5331,7 +5274,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 114 "__id__": 112
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5363,7 +5306,7 @@ ...@@ -5363,7 +5306,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 113 "__id__": 111
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5395,7 +5338,7 @@ ...@@ -5395,7 +5338,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 112 "__id__": 110
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
......
...@@ -50,18 +50,6 @@ var game = cc.Class({ ...@@ -50,18 +50,6 @@ var game = cc.Class({
g.Light.inst.showLight(); g.Light.inst.showLight();
}, },
//检查当前缩放倍数
checkScale: function (num) {
var scale = 1;
if (num > 2 && num <= 4) {
scale = 0.74;
}
if (num > 4) {
scale = 0.65;
}
return scale;
},
//添加节点 //添加节点
addItem: function () { addItem: function () {
let itemArr = g.data_mgr.getSheepArr(); let itemArr = g.data_mgr.getSheepArr();
......
...@@ -248,13 +248,15 @@ export function initDataMgr_NGT_02() { ...@@ -248,13 +248,15 @@ export function initDataMgr_NGT_02() {
preload() { preload() {
cc.assetManager.loadAny(null, null, null, (err, data) => { cc.assetManager.loadAny(null, null, null, (err, data) => {
window.air.onCourseInScreen = (next) => {
//结束回调
this.loadEnd();
next();
}
if (window && window["air"]) { if (window && window["air"]) {
window["air"].onCourseInScreen = (next) => {
//结束回调
this.loadEnd();
next();
}
window["air"].hideAirClassLoading(); window["air"].hideAirClassLoading();
} else {
this.loadEnd();
} }
cc.debug.setDisplayStats(false); cc.debug.setDisplayStats(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