Commit 96367531 authored by huoshizhe's avatar huoshizhe

fix: 退出按钮问题

parent 7f8d797d
...@@ -17,19 +17,19 @@ ...@@ -17,19 +17,19 @@
"__id__": 2 "__id__": 2
}, },
{ {
"__id__": 64 "__id__": 65
}, },
{ {
"__id__": 90 "__id__": 91
}, },
{ {
"__id__": 101 "__id__": 102
}, },
{ {
"__id__": 102 "__id__": 103
}, },
{ {
"__id__": 106 "__id__": 107
} }
], ],
"_active": false, "_active": false,
...@@ -87,17 +87,14 @@ ...@@ -87,17 +87,14 @@
"__id__": 3 "__id__": 3
}, },
{ {
"__id__": 5 "__id__": 6
}, },
{ {
"__id__": 55 "__id__": 56
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 57
},
{ {
"__id__": 58 "__id__": 58
}, },
...@@ -115,6 +112,9 @@ ...@@ -115,6 +112,9 @@
}, },
{ {
"__id__": 63 "__id__": 63
},
{
"__id__": 64
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -177,6 +177,9 @@ ...@@ -177,6 +177,9 @@
"_components": [ "_components": [
{ {
"__id__": 4 "__id__": 4
},
{
"__id__": 5
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -263,6 +266,33 @@ ...@@ -263,6 +266,33 @@
"_alignWithScreen": true, "_alignWithScreen": true,
"_id": "81GN3uXINKVLeW4+iKSlim" "_id": "81GN3uXINKVLeW4+iKSlim"
}, },
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 3
},
"_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": "3dSWMcEq5NppDNlZkmkzlZ"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "bg", "_name": "bg",
...@@ -272,13 +302,13 @@ ...@@ -272,13 +302,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 6 "__id__": 7
}, },
{ {
"__id__": 8 "__id__": 9
}, },
{ {
"__id__": 51 "__id__": 52
} }
], ],
"_active": true, "_active": true,
...@@ -336,13 +366,13 @@ ...@@ -336,13 +366,13 @@
"_name": "bg", "_name": "bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 5 "__id__": 6
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 7 "__id__": 8
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -398,7 +428,7 @@ ...@@ -398,7 +428,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 6 "__id__": 7
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -430,14 +460,14 @@ ...@@ -430,14 +460,14 @@
"_name": "connent", "_name": "connent",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 5 "__id__": 6
}, },
"_children": [ "_children": [
{ {
"__id__": 9 "__id__": 10
}, },
{ {
"__id__": 47 "__id__": 48
} }
], ],
"_active": true, "_active": true,
...@@ -495,29 +525,29 @@ ...@@ -495,29 +525,29 @@
"_name": "nodCenter", "_name": "nodCenter",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 8 "__id__": 9
}, },
"_children": [ "_children": [
{ {
"__id__": 10 "__id__": 11
}, },
{ {
"__id__": 12 "__id__": 13
}, },
{ {
"__id__": 15 "__id__": 16
}, },
{ {
"__id__": 22 "__id__": 23
}, },
{ {
"__id__": 24 "__id__": 25
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 46 "__id__": 47
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -573,13 +603,13 @@ ...@@ -573,13 +603,13 @@
"_name": "bg_trafficlight", "_name": "bg_trafficlight",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 9 "__id__": 10
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 11 "__id__": 12
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -635,7 +665,7 @@ ...@@ -635,7 +665,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 10 "__id__": 11
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -667,16 +697,16 @@ ...@@ -667,16 +697,16 @@
"_name": "bg_trafficlight2", "_name": "bg_trafficlight2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 9 "__id__": 10
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 13 "__id__": 14
}, },
{ {
"__id__": 14 "__id__": 15
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -732,7 +762,7 @@ ...@@ -732,7 +762,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 12 "__id__": 13
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -764,7 +794,7 @@ ...@@ -764,7 +794,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 12 "__id__": 13
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -796,23 +826,23 @@ ...@@ -796,23 +826,23 @@
"_name": "frame", "_name": "frame",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 9 "__id__": 10
}, },
"_children": [ "_children": [
{ {
"__id__": 16 "__id__": 17
}, },
{ {
"__id__": 18 "__id__": 19
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 20 "__id__": 21
}, },
{ {
"__id__": 21 "__id__": 22
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -868,13 +898,13 @@ ...@@ -868,13 +898,13 @@
"_name": "spt", "_name": "spt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 15 "__id__": 16
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 17 "__id__": 18
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -930,7 +960,7 @@ ...@@ -930,7 +960,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 16 "__id__": 17
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -960,13 +990,13 @@ ...@@ -960,13 +990,13 @@
"_name": "item", "_name": "item",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 15 "__id__": 16
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 19 "__id__": 20
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1022,7 +1052,7 @@ ...@@ -1022,7 +1052,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 18 "__id__": 19
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -1049,7 +1079,7 @@ ...@@ -1049,7 +1079,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 15 "__id__": 16
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1081,14 +1111,14 @@ ...@@ -1081,14 +1111,14 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 15 "__id__": 16
}, },
"_enabled": true, "_enabled": true,
"hitPre": { "hitPre": {
"__uuid__": "2ce7d58d-b6fe-4ef7-a128-de76f672a803" "__uuid__": "2ce7d58d-b6fe-4ef7-a128-de76f672a803"
}, },
"quan": { "quan": {
"__id__": 18 "__id__": 19
}, },
"_id": "93QFh2Uc1DrYGA75mds7eI" "_id": "93QFh2Uc1DrYGA75mds7eI"
}, },
...@@ -1097,13 +1127,13 @@ ...@@ -1097,13 +1127,13 @@
"_name": "Layout", "_name": "Layout",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 9 "__id__": 10
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 23 "__id__": 24
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1159,7 +1189,7 @@ ...@@ -1159,7 +1189,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 22 "__id__": 23
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -1191,23 +1221,23 @@ ...@@ -1191,23 +1221,23 @@
"_name": "nodtype", "_name": "nodtype",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 9 "__id__": 10
}, },
"_children": [ "_children": [
{ {
"__id__": 25 "__id__": 26
}, },
{ {
"__id__": 32 "__id__": 33
}, },
{ {
"__id__": 35 "__id__": 36
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 45 "__id__": 46
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1263,17 +1293,17 @@ ...@@ -1263,17 +1293,17 @@
"_name": "type1", "_name": "type1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 24 "__id__": 25
}, },
"_children": [ "_children": [
{ {
"__id__": 26 "__id__": 27
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 30 "__id__": 31
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1329,17 +1359,17 @@ ...@@ -1329,17 +1359,17 @@
"_name": "audio", "_name": "audio",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 25 "__id__": 26
}, },
"_children": [ "_children": [
{ {
"__id__": 27 "__id__": 28
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 29 "__id__": 30
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1395,13 +1425,13 @@ ...@@ -1395,13 +1425,13 @@
"_name": "audio", "_name": "audio",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 26 "__id__": 27
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 28 "__id__": 29
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1457,7 +1487,7 @@ ...@@ -1457,7 +1487,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 27 "__id__": 28
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1489,7 +1519,7 @@ ...@@ -1489,7 +1519,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 26 "__id__": 27
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1521,7 +1551,7 @@ ...@@ -1521,7 +1551,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 25 "__id__": 26
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -1530,7 +1560,7 @@ ...@@ -1530,7 +1560,7 @@
"zoomScale": 1.2, "zoomScale": 1.2,
"clickEvents": [ "clickEvents": [
{ {
"__id__": 31 "__id__": 32
} }
], ],
"_N$interactable": true, "_N$interactable": true,
...@@ -1591,7 +1621,7 @@ ...@@ -1591,7 +1621,7 @@
{ {
"__type__": "cc.ClickEvent", "__type__": "cc.ClickEvent",
"target": { "target": {
"__id__": 24 "__id__": 25
}, },
"component": "", "component": "",
"_componentId": "e5c11r7ePhGEZ6vDXWFElFo", "_componentId": "e5c11r7ePhGEZ6vDXWFElFo",
...@@ -1603,11 +1633,11 @@ ...@@ -1603,11 +1633,11 @@
"_name": "type2", "_name": "type2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 24 "__id__": 25
}, },
"_children": [ "_children": [
{ {
"__id__": 33 "__id__": 34
} }
], ],
"_active": false, "_active": false,
...@@ -1665,13 +1695,13 @@ ...@@ -1665,13 +1695,13 @@
"_name": "title", "_name": "title",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 32 "__id__": 33
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 34 "__id__": 35
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1727,7 +1757,7 @@ ...@@ -1727,7 +1757,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 33 "__id__": 34
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1760,23 +1790,23 @@ ...@@ -1760,23 +1790,23 @@
"_name": "type3", "_name": "type3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 24 "__id__": 25
}, },
"_children": [ "_children": [
{ {
"__id__": 36 "__id__": 37
}, },
{ {
"__id__": 40 "__id__": 41
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 42 "__id__": 43
}, },
{ {
"__id__": 43 "__id__": 44
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1832,17 +1862,17 @@ ...@@ -1832,17 +1862,17 @@
"_name": "audio", "_name": "audio",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 35 "__id__": 36
}, },
"_children": [ "_children": [
{ {
"__id__": 37 "__id__": 38
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 39 "__id__": 40
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1898,13 +1928,13 @@ ...@@ -1898,13 +1928,13 @@
"_name": "audio", "_name": "audio",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 36 "__id__": 37
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 38 "__id__": 39
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1960,7 +1990,7 @@ ...@@ -1960,7 +1990,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 37 "__id__": 38
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1992,7 +2022,7 @@ ...@@ -1992,7 +2022,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 36 "__id__": 37
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2024,13 +2054,13 @@ ...@@ -2024,13 +2054,13 @@
"_name": "title", "_name": "title",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 35 "__id__": 36
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 41 "__id__": 42
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2086,7 +2116,7 @@ ...@@ -2086,7 +2116,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 40 "__id__": 41
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2119,7 +2149,7 @@ ...@@ -2119,7 +2149,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 35 "__id__": 36
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -2151,7 +2181,7 @@ ...@@ -2151,7 +2181,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 35 "__id__": 36
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -2160,7 +2190,7 @@ ...@@ -2160,7 +2190,7 @@
"zoomScale": 1.2, "zoomScale": 1.2,
"clickEvents": [ "clickEvents": [
{ {
"__id__": 44 "__id__": 45
} }
], ],
"_N$interactable": true, "_N$interactable": true,
...@@ -2221,7 +2251,7 @@ ...@@ -2221,7 +2251,7 @@
{ {
"__type__": "cc.ClickEvent", "__type__": "cc.ClickEvent",
"target": { "target": {
"__id__": 24 "__id__": 25
}, },
"component": "", "component": "",
"_componentId": "e5c11r7ePhGEZ6vDXWFElFo", "_componentId": "e5c11r7ePhGEZ6vDXWFElFo",
...@@ -2233,18 +2263,18 @@ ...@@ -2233,18 +2263,18 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 24 "__id__": 25
}, },
"_enabled": true, "_enabled": true,
"TitleType": [ "TitleType": [
{ {
"__id__": 25 "__id__": 26
}, },
{ {
"__id__": 32 "__id__": 33
}, },
{ {
"__id__": 35 "__id__": 36
} }
], ],
"_id": "6eJo7R+stI870GmPBvMBPk" "_id": "6eJo7R+stI870GmPBvMBPk"
...@@ -2254,7 +2284,7 @@ ...@@ -2254,7 +2284,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 9 "__id__": 10
}, },
"_enabled": true, "_enabled": true,
"alignMode": 2, "alignMode": 2,
...@@ -2281,16 +2311,16 @@ ...@@ -2281,16 +2311,16 @@
"_name": "reStart", "_name": "reStart",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 8 "__id__": 9
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 48 "__id__": 49
}, },
{ {
"__id__": 49 "__id__": 50
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2346,7 +2376,7 @@ ...@@ -2346,7 +2376,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 47 "__id__": 48
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2378,7 +2408,7 @@ ...@@ -2378,7 +2408,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 47 "__id__": 48
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -2387,7 +2417,7 @@ ...@@ -2387,7 +2417,7 @@
"zoomScale": 0.95, "zoomScale": 0.95,
"clickEvents": [ "clickEvents": [
{ {
"__id__": 50 "__id__": 51
} }
], ],
"_N$interactable": true, "_N$interactable": true,
...@@ -2460,16 +2490,16 @@ ...@@ -2460,16 +2490,16 @@
"_name": "mask", "_name": "mask",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 5 "__id__": 6
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 52 "__id__": 53
}, },
{ {
"__id__": 53 "__id__": 54
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2525,7 +2555,7 @@ ...@@ -2525,7 +2555,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 51 "__id__": 52
}, },
"_enabled": true, "_enabled": true,
"_id": "80PylZIy9EbJR4/AZl0xgK" "_id": "80PylZIy9EbJR4/AZl0xgK"
...@@ -2535,7 +2565,7 @@ ...@@ -2535,7 +2565,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 51 "__id__": 52
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -2544,7 +2574,7 @@ ...@@ -2544,7 +2574,7 @@
"zoomScale": 1.2, "zoomScale": 1.2,
"clickEvents": [ "clickEvents": [
{ {
"__id__": 54 "__id__": 55
} }
], ],
"_N$interactable": true, "_N$interactable": true,
...@@ -2623,7 +2653,7 @@ ...@@ -2623,7 +2653,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 56 "__id__": 57
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2679,7 +2709,7 @@ ...@@ -2679,7 +2709,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 55 "__id__": 56
}, },
"_enabled": true, "_enabled": true,
"eff_audio": [ "eff_audio": [
...@@ -2729,7 +2759,7 @@ ...@@ -2729,7 +2759,7 @@
"__id__": 2 "__id__": 2
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 2,
"_target": null, "_target": null,
"_alignFlags": 45, "_alignFlags": 45,
"_left": 0, "_left": 0,
...@@ -2760,16 +2790,16 @@ ...@@ -2760,16 +2790,16 @@
"topUI": [], "topUI": [],
"bgScaleMax": [ "bgScaleMax": [
{ {
"__id__": 6 "__id__": 7
} }
], ],
"nodeUIOffset": [ "nodeUIOffset": [
{ {
"__id__": 8 "__id__": 9
} }
], ],
"canvasView": { "canvasView": {
"__id__": 57 "__id__": 58
}, },
"isCanvas": true, "isCanvas": true,
"_id": "5eOVDDzARGnoMLcNXyk5ml" "_id": "5eOVDDzARGnoMLcNXyk5ml"
...@@ -2793,7 +2823,7 @@ ...@@ -2793,7 +2823,7 @@
}, },
"_enabled": true, "_enabled": true,
"btnRestart": { "btnRestart": {
"__id__": 47 "__id__": 48
}, },
"_id": "4f+bKs17xGbZW0EZ8TwWW2" "_id": "4f+bKs17xGbZW0EZ8TwWW2"
}, },
...@@ -2837,19 +2867,19 @@ ...@@ -2837,19 +2867,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 65 "__id__": 66
}, },
{ {
"__id__": 70 "__id__": 71
}, },
{ {
"__id__": 75 "__id__": 76
}, },
{ {
"__id__": 80 "__id__": 81
}, },
{ {
"__id__": 85 "__id__": 86
} }
], ],
"_active": true, "_active": true,
...@@ -2907,11 +2937,11 @@ ...@@ -2907,11 +2937,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 64 "__id__": 65
}, },
"_children": [ "_children": [
{ {
"__id__": 66 "__id__": 67
} }
], ],
"_active": true, "_active": true,
...@@ -2969,17 +2999,17 @@ ...@@ -2969,17 +2999,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 65 "__id__": 66
}, },
"_children": [ "_children": [
{ {
"__id__": 67 "__id__": 68
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 69 "__id__": 70
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3035,13 +3065,13 @@ ...@@ -3035,13 +3065,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 66 "__id__": 67
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 68 "__id__": 69
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3097,7 +3127,7 @@ ...@@ -3097,7 +3127,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 67 "__id__": 68
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3129,7 +3159,7 @@ ...@@ -3129,7 +3159,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 66 "__id__": 67
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3151,11 +3181,11 @@ ...@@ -3151,11 +3181,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 64 "__id__": 65
}, },
"_children": [ "_children": [
{ {
"__id__": 71 "__id__": 72
} }
], ],
"_active": true, "_active": true,
...@@ -3213,17 +3243,17 @@ ...@@ -3213,17 +3243,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 70 "__id__": 71
}, },
"_children": [ "_children": [
{ {
"__id__": 72 "__id__": 73
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 74 "__id__": 75
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3279,13 +3309,13 @@ ...@@ -3279,13 +3309,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 71 "__id__": 72
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 73 "__id__": 74
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3341,7 +3371,7 @@ ...@@ -3341,7 +3371,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 72 "__id__": 73
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3373,7 +3403,7 @@ ...@@ -3373,7 +3403,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 71 "__id__": 72
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3395,11 +3425,11 @@ ...@@ -3395,11 +3425,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 64 "__id__": 65
}, },
"_children": [ "_children": [
{ {
"__id__": 76 "__id__": 77
} }
], ],
"_active": true, "_active": true,
...@@ -3457,17 +3487,17 @@ ...@@ -3457,17 +3487,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 75 "__id__": 76
}, },
"_children": [ "_children": [
{ {
"__id__": 77 "__id__": 78
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 79 "__id__": 80
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3523,13 +3553,13 @@ ...@@ -3523,13 +3553,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 76 "__id__": 77
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 78 "__id__": 79
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3585,7 +3615,7 @@ ...@@ -3585,7 +3615,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 77 "__id__": 78
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3617,7 +3647,7 @@ ...@@ -3617,7 +3647,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 76 "__id__": 77
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3639,11 +3669,11 @@ ...@@ -3639,11 +3669,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 64 "__id__": 65
}, },
"_children": [ "_children": [
{ {
"__id__": 81 "__id__": 82
} }
], ],
"_active": true, "_active": true,
...@@ -3701,17 +3731,17 @@ ...@@ -3701,17 +3731,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 80 "__id__": 81
}, },
"_children": [ "_children": [
{ {
"__id__": 82 "__id__": 83
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 84 "__id__": 85
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3767,13 +3797,13 @@ ...@@ -3767,13 +3797,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 81 "__id__": 82
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 83 "__id__": 84
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3829,7 +3859,7 @@ ...@@ -3829,7 +3859,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 82 "__id__": 83
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3861,7 +3891,7 @@ ...@@ -3861,7 +3891,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 81 "__id__": 82
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3883,11 +3913,11 @@ ...@@ -3883,11 +3913,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 64 "__id__": 65
}, },
"_children": [ "_children": [
{ {
"__id__": 86 "__id__": 87
} }
], ],
"_active": true, "_active": true,
...@@ -3945,17 +3975,17 @@ ...@@ -3945,17 +3975,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 85 "__id__": 86
}, },
"_children": [ "_children": [
{ {
"__id__": 87 "__id__": 88
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 89 "__id__": 90
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4011,13 +4041,13 @@ ...@@ -4011,13 +4041,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 86 "__id__": 87
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 88 "__id__": 89
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4073,7 +4103,7 @@ ...@@ -4073,7 +4103,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 87 "__id__": 88
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4105,7 +4135,7 @@ ...@@ -4105,7 +4135,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 86 "__id__": 87
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4131,19 +4161,19 @@ ...@@ -4131,19 +4161,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 91 "__id__": 92
}, },
{ {
"__id__": 93 "__id__": 94
}, },
{ {
"__id__": 95 "__id__": 96
}, },
{ {
"__id__": 97 "__id__": 98
}, },
{ {
"__id__": 99 "__id__": 100
} }
], ],
"_active": true, "_active": true,
...@@ -4201,13 +4231,13 @@ ...@@ -4201,13 +4231,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 90 "__id__": 91
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 92 "__id__": 93
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4263,7 +4293,7 @@ ...@@ -4263,7 +4293,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 91 "__id__": 92
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4295,13 +4325,13 @@ ...@@ -4295,13 +4325,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 90 "__id__": 91
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 94 "__id__": 95
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4357,7 +4387,7 @@ ...@@ -4357,7 +4387,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 93 "__id__": 94
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4389,13 +4419,13 @@ ...@@ -4389,13 +4419,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 90 "__id__": 91
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 96 "__id__": 97
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4451,7 +4481,7 @@ ...@@ -4451,7 +4481,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 95 "__id__": 96
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4483,13 +4513,13 @@ ...@@ -4483,13 +4513,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 90 "__id__": 91
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 98 "__id__": 99
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4545,7 +4575,7 @@ ...@@ -4545,7 +4575,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 97 "__id__": 98
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4577,13 +4607,13 @@ ...@@ -4577,13 +4607,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 90 "__id__": 91
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 100 "__id__": 101
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4639,7 +4669,7 @@ ...@@ -4639,7 +4669,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 99 "__id__": 100
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4733,13 +4763,13 @@ ...@@ -4733,13 +4763,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 103 "__id__": 104
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 105 "__id__": 106
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4795,13 +4825,13 @@ ...@@ -4795,13 +4825,13 @@
"_name": "sprite", "_name": "sprite",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 102 "__id__": 103
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 104 "__id__": 105
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4857,7 +4887,7 @@ ...@@ -4857,7 +4887,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 103 "__id__": 104
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4887,7 +4917,7 @@ ...@@ -4887,7 +4917,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 102 "__id__": 103
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4923,13 +4953,13 @@ ...@@ -4923,13 +4953,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 107 "__id__": 108
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 111 "__id__": 112
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4985,17 +5015,17 @@ ...@@ -4985,17 +5015,17 @@
"_name": "Star", "_name": "Star",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 106 "__id__": 107
}, },
"_children": [ "_children": [
{ {
"__id__": 108 "__id__": 109
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 110 "__id__": 111
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5051,13 +5081,13 @@ ...@@ -5051,13 +5081,13 @@
"_name": "StarBig", "_name": "StarBig",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 107 "__id__": 108
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 109 "__id__": 110
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5113,7 +5143,7 @@ ...@@ -5113,7 +5143,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 108 "__id__": 109
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5145,7 +5175,7 @@ ...@@ -5145,7 +5175,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 107 "__id__": 108
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5177,7 +5207,7 @@ ...@@ -5177,7 +5207,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 106 "__id__": 107
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
......
...@@ -102,7 +102,9 @@ cc.Class({ ...@@ -102,7 +102,9 @@ cc.Class({
}, },
onDestroy: function () { onDestroy: function () {
g.event_pump.unReg("adjustUI"); if (g.event_pump) {
g.event_pump.unReg("adjustUI");
}
}, },
settopUI: function (s) { settopUI: function (s) {
if (!g.data_mgr.phoneInfo) { if (!g.data_mgr.phoneInfo) {
......
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