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

fix: 语音评测时切换下一页

parent ab9ea14c
...@@ -298,22 +298,22 @@ ...@@ -298,22 +298,22 @@
"__id__": 24 "__id__": 24
}, },
{ {
"__id__": 39 "__id__": 42
}, },
{ {
"__id__": 86 "__id__": 89
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 90 "__id__": 93
}, },
{ {
"__id__": 91 "__id__": 94
}, },
{ {
"__id__": 92 "__id__": 95
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1204,15 +1204,18 @@ ...@@ -1204,15 +1204,18 @@
}, },
{ {
"__id__": 34 "__id__": 34
},
{
"__id__": 37
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 37 "__id__": 40
}, },
{ {
"__id__": 38 "__id__": 41
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1759,6 +1762,130 @@ ...@@ -1759,6 +1762,130 @@
"_originalHeight": 10, "_originalHeight": 10,
"_id": "76RSPkZA9K373tL/lz15l5" "_id": "76RSPkZA9K373tL/lz15l5"
}, },
{
"__type__": "cc.Node",
"_name": "New Sprite(Splash)",
"_objFlags": 0,
"_parent": {
"__id__": 24
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 38
},
{
"__id__": 39
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 0,
"b": 0,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 20,
"height": 20
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "df6xg++KxGMYe7V49eYncy"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 37
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "a0AUmB561GXZPeFQir54eE"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 37
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 18,
"_left": 590,
"_right": 635,
"_top": 355,
"_bottom": 355,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 100,
"_originalHeight": 10,
"_id": "3aNyOT67RDGr5LiOLJHJ/v"
},
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
...@@ -1827,29 +1954,29 @@ ...@@ -1827,29 +1954,29 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 40 "__id__": 43
}, },
{ {
"__id__": 48 "__id__": 51
}, },
{ {
"__id__": 52 "__id__": 55
}, },
{ {
"__id__": 62 "__id__": 65
}, },
{ {
"__id__": 73 "__id__": 76
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 84 "__id__": 87
} }
], ],
"_prefab": { "_prefab": {
"__id__": 85 "__id__": 88
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -1903,24 +2030,24 @@ ...@@ -1903,24 +2030,24 @@
"_name": "content", "_name": "content",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 39 "__id__": 42
}, },
"_children": [ "_children": [
{ {
"__id__": 41 "__id__": 44
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 45 "__id__": 48
}, },
{ {
"__id__": 46 "__id__": 49
} }
], ],
"_prefab": { "_prefab": {
"__id__": 47 "__id__": 50
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -1974,20 +2101,20 @@ ...@@ -1974,20 +2101,20 @@
"_name": "label", "_name": "label",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 40 "__id__": 43
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 42 "__id__": 45
}, },
{ {
"__id__": 43 "__id__": 46
} }
], ],
"_prefab": { "_prefab": {
"__id__": 44 "__id__": 47
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -2041,7 +2168,7 @@ ...@@ -2041,7 +2168,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 41 "__id__": 44
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2074,7 +2201,7 @@ ...@@ -2074,7 +2201,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 41 "__id__": 44
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -2099,7 +2226,7 @@ ...@@ -2099,7 +2226,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 39 "__id__": 42
}, },
"asset": { "asset": {
"__uuid__": "a4cbf80d-fd89-477e-a6f9-7ca1bea43179" "__uuid__": "a4cbf80d-fd89-477e-a6f9-7ca1bea43179"
...@@ -2112,7 +2239,7 @@ ...@@ -2112,7 +2239,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 40 "__id__": 43
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -2144,7 +2271,7 @@ ...@@ -2144,7 +2271,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 40 "__id__": 43
}, },
"_enabled": true, "_enabled": true,
"alignMode": 2, "alignMode": 2,
...@@ -2169,7 +2296,7 @@ ...@@ -2169,7 +2296,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 39 "__id__": 42
}, },
"asset": { "asset": {
"__uuid__": "a4cbf80d-fd89-477e-a6f9-7ca1bea43179" "__uuid__": "a4cbf80d-fd89-477e-a6f9-7ca1bea43179"
...@@ -2182,20 +2309,20 @@ ...@@ -2182,20 +2309,20 @@
"_name": "bg", "_name": "bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 39 "__id__": 42
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 49 "__id__": 52
}, },
{ {
"__id__": 50 "__id__": 53
} }
], ],
"_prefab": { "_prefab": {
"__id__": 51 "__id__": 54
}, },
"_opacity": 138, "_opacity": 138,
"_color": { "_color": {
...@@ -2249,7 +2376,7 @@ ...@@ -2249,7 +2376,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 48 "__id__": 51
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2281,7 +2408,7 @@ ...@@ -2281,7 +2408,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 48 "__id__": 51
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -2306,7 +2433,7 @@ ...@@ -2306,7 +2433,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 39 "__id__": 42
}, },
"asset": { "asset": {
"__uuid__": "a4cbf80d-fd89-477e-a6f9-7ca1bea43179" "__uuid__": "a4cbf80d-fd89-477e-a6f9-7ca1bea43179"
...@@ -2319,30 +2446,30 @@ ...@@ -2319,30 +2446,30 @@
"_name": "Console", "_name": "Console",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 39 "__id__": 42
}, },
"_children": [ "_children": [
{ {
"__id__": 53 "__id__": 56
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 57 "__id__": 60
}, },
{ {
"__id__": 58 "__id__": 61
}, },
{ {
"__id__": 59 "__id__": 62
}, },
{ {
"__id__": 60 "__id__": 63
} }
], ],
"_prefab": { "_prefab": {
"__id__": 61 "__id__": 64
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -2396,20 +2523,20 @@ ...@@ -2396,20 +2523,20 @@
"_name": "content", "_name": "content",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 52 "__id__": 55
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 54 "__id__": 57
}, },
{ {
"__id__": 55 "__id__": 58
} }
], ],
"_prefab": { "_prefab": {
"__id__": 56 "__id__": 59
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -2463,7 +2590,7 @@ ...@@ -2463,7 +2590,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 53 "__id__": 56
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -2495,7 +2622,7 @@ ...@@ -2495,7 +2622,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 53 "__id__": 56
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -2520,7 +2647,7 @@ ...@@ -2520,7 +2647,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 39 "__id__": 42
}, },
"asset": { "asset": {
"__uuid__": "a4cbf80d-fd89-477e-a6f9-7ca1bea43179" "__uuid__": "a4cbf80d-fd89-477e-a6f9-7ca1bea43179"
...@@ -2533,7 +2660,7 @@ ...@@ -2533,7 +2660,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 52 "__id__": 55
}, },
"_enabled": true, "_enabled": true,
"alignMode": 2, "alignMode": 2,
...@@ -2560,7 +2687,7 @@ ...@@ -2560,7 +2687,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 52 "__id__": 55
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2580,7 +2707,7 @@ ...@@ -2580,7 +2707,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 52 "__id__": 55
}, },
"_enabled": true, "_enabled": true,
"horizontal": false, "horizontal": false,
...@@ -2592,10 +2719,10 @@ ...@@ -2592,10 +2719,10 @@
"scrollEvents": [], "scrollEvents": [],
"cancelInnerEvents": true, "cancelInnerEvents": true,
"_N$content": { "_N$content": {
"__id__": 53 "__id__": 56
}, },
"content": { "content": {
"__id__": 53 "__id__": 56
}, },
"_id": "4fq9X4ft1J57LkV+IZZI1P" "_id": "4fq9X4ft1J57LkV+IZZI1P"
}, },
...@@ -2604,7 +2731,7 @@ ...@@ -2604,7 +2731,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 52 "__id__": 55
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -2634,7 +2761,7 @@ ...@@ -2634,7 +2761,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 39 "__id__": 42
}, },
"asset": { "asset": {
"__uuid__": "a4cbf80d-fd89-477e-a6f9-7ca1bea43179" "__uuid__": "a4cbf80d-fd89-477e-a6f9-7ca1bea43179"
...@@ -2647,24 +2774,24 @@ ...@@ -2647,24 +2774,24 @@
"_name": "BtnClose", "_name": "BtnClose",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 39 "__id__": 42
}, },
"_children": [ "_children": [
{ {
"__id__": 63 "__id__": 66
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 70 "__id__": 73
}, },
{ {
"__id__": 71 "__id__": 74
} }
], ],
"_prefab": { "_prefab": {
"__id__": 72 "__id__": 75
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -2718,24 +2845,24 @@ ...@@ -2718,24 +2845,24 @@
"_name": "Background", "_name": "Background",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 62 "__id__": 65
}, },
"_children": [ "_children": [
{ {
"__id__": 64 "__id__": 67
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 67 "__id__": 70
}, },
{ {
"__id__": 68 "__id__": 71
} }
], ],
"_prefab": { "_prefab": {
"__id__": 69 "__id__": 72
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -2789,17 +2916,17 @@ ...@@ -2789,17 +2916,17 @@
"_name": "Label", "_name": "Label",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 63 "__id__": 66
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 65 "__id__": 68
} }
], ],
"_prefab": { "_prefab": {
"__id__": 66 "__id__": 69
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -2853,7 +2980,7 @@ ...@@ -2853,7 +2980,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 64 "__id__": 67
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2884,7 +3011,7 @@ ...@@ -2884,7 +3011,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 39 "__id__": 42
}, },
"asset": { "asset": {
"__uuid__": "a4cbf80d-fd89-477e-a6f9-7ca1bea43179" "__uuid__": "a4cbf80d-fd89-477e-a6f9-7ca1bea43179"
...@@ -2897,7 +3024,7 @@ ...@@ -2897,7 +3024,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 63 "__id__": 66
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2929,7 +3056,7 @@ ...@@ -2929,7 +3056,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 63 "__id__": 66
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 0,
...@@ -2954,7 +3081,7 @@ ...@@ -2954,7 +3081,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 39 "__id__": 42
}, },
"asset": { "asset": {
"__uuid__": "a4cbf80d-fd89-477e-a6f9-7ca1bea43179" "__uuid__": "a4cbf80d-fd89-477e-a6f9-7ca1bea43179"
...@@ -2967,7 +3094,7 @@ ...@@ -2967,7 +3094,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 62 "__id__": 65
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -3040,7 +3167,7 @@ ...@@ -3040,7 +3167,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
}, },
"_N$target": { "_N$target": {
"__id__": 63 "__id__": 66
}, },
"_id": "eeBszWa7xMXI6NvQVEw4Nb" "_id": "eeBszWa7xMXI6NvQVEw4Nb"
}, },
...@@ -3049,7 +3176,7 @@ ...@@ -3049,7 +3176,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 62 "__id__": 65
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -3074,7 +3201,7 @@ ...@@ -3074,7 +3201,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 39 "__id__": 42
}, },
"asset": { "asset": {
"__uuid__": "a4cbf80d-fd89-477e-a6f9-7ca1bea43179" "__uuid__": "a4cbf80d-fd89-477e-a6f9-7ca1bea43179"
...@@ -3087,24 +3214,24 @@ ...@@ -3087,24 +3214,24 @@
"_name": "BtnOpen", "_name": "BtnOpen",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 39 "__id__": 42
}, },
"_children": [ "_children": [
{ {
"__id__": 74 "__id__": 77
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 81 "__id__": 84
}, },
{ {
"__id__": 82 "__id__": 85
} }
], ],
"_prefab": { "_prefab": {
"__id__": 83 "__id__": 86
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -3158,24 +3285,24 @@ ...@@ -3158,24 +3285,24 @@
"_name": "Background", "_name": "Background",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 73 "__id__": 76
}, },
"_children": [ "_children": [
{ {
"__id__": 75 "__id__": 78
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 78 "__id__": 81
}, },
{ {
"__id__": 79 "__id__": 82
} }
], ],
"_prefab": { "_prefab": {
"__id__": 80 "__id__": 83
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -3229,17 +3356,17 @@ ...@@ -3229,17 +3356,17 @@
"_name": "Label", "_name": "Label",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 74 "__id__": 77
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 76 "__id__": 79
} }
], ],
"_prefab": { "_prefab": {
"__id__": 77 "__id__": 80
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -3293,7 +3420,7 @@ ...@@ -3293,7 +3420,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 75 "__id__": 78
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3324,7 +3451,7 @@ ...@@ -3324,7 +3451,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 39 "__id__": 42
}, },
"asset": { "asset": {
"__uuid__": "a4cbf80d-fd89-477e-a6f9-7ca1bea43179" "__uuid__": "a4cbf80d-fd89-477e-a6f9-7ca1bea43179"
...@@ -3337,7 +3464,7 @@ ...@@ -3337,7 +3464,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 74 "__id__": 77
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3369,7 +3496,7 @@ ...@@ -3369,7 +3496,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 74 "__id__": 77
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 0,
...@@ -3394,7 +3521,7 @@ ...@@ -3394,7 +3521,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 39 "__id__": 42
}, },
"asset": { "asset": {
"__uuid__": "a4cbf80d-fd89-477e-a6f9-7ca1bea43179" "__uuid__": "a4cbf80d-fd89-477e-a6f9-7ca1bea43179"
...@@ -3407,7 +3534,7 @@ ...@@ -3407,7 +3534,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 73 "__id__": 76
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -3480,7 +3607,7 @@ ...@@ -3480,7 +3607,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
}, },
"_N$target": { "_N$target": {
"__id__": 74 "__id__": 77
}, },
"_id": "74Llnxa+pCQIlfKC3VDt9i" "_id": "74Llnxa+pCQIlfKC3VDt9i"
}, },
...@@ -3489,7 +3616,7 @@ ...@@ -3489,7 +3616,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 73 "__id__": 76
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -3514,7 +3641,7 @@ ...@@ -3514,7 +3641,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 39 "__id__": 42
}, },
"asset": { "asset": {
"__uuid__": "a4cbf80d-fd89-477e-a6f9-7ca1bea43179" "__uuid__": "a4cbf80d-fd89-477e-a6f9-7ca1bea43179"
...@@ -3527,7 +3654,7 @@ ...@@ -3527,7 +3654,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 39 "__id__": 42
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -3552,7 +3679,7 @@ ...@@ -3552,7 +3679,7 @@
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",
"root": { "root": {
"__id__": 39 "__id__": 42
}, },
"asset": { "asset": {
"__uuid__": "a4cbf80d-fd89-477e-a6f9-7ca1bea43179" "__uuid__": "a4cbf80d-fd89-477e-a6f9-7ca1bea43179"
...@@ -3571,13 +3698,13 @@ ...@@ -3571,13 +3698,13 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 87 "__id__": 90
}, },
{ {
"__id__": 88 "__id__": 91
}, },
{ {
"__id__": 89 "__id__": 92
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3633,7 +3760,7 @@ ...@@ -3633,7 +3760,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 86 "__id__": 89
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3665,7 +3792,7 @@ ...@@ -3665,7 +3792,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 86 "__id__": 89
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -3692,7 +3819,7 @@ ...@@ -3692,7 +3819,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 86 "__id__": 89
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -3755,33 +3882,6 @@ ...@@ -3755,33 +3882,6 @@
"_N$target": null, "_N$target": null,
"_id": "f7AHHfoZBIA73rTkrZrSfm" "_id": "f7AHHfoZBIA73rTkrZrSfm"
}, },
{
"__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": "1bqJ4tHIpFjZymhKtOdYgN"
},
{ {
"__type__": "363f3apQ09ISIXTgtQqFoFF", "__type__": "363f3apQ09ISIXTgtQqFoFF",
"_name": "", "_name": "",
...@@ -3823,5 +3923,32 @@ ...@@ -3823,5 +3923,32 @@
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "77Taml+DhKYLCnxnSi08Bm" "_id": "77Taml+DhKYLCnxnSi08Bm"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 7
},
"_enabled": true,
"alignMode": 1,
"_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": "b8s6BwK6JGdo9khgpExHfg"
} }
] ]
\ No newline at end of file
...@@ -80,6 +80,7 @@ cc.Class({ ...@@ -80,6 +80,7 @@ cc.Class({
start() { start() {
initAir(this); initAir(this);
this.reWriteAir(); this.reWriteAir();
this.updateWidgets();
window.courseware.getEngineInfo((dataStr) => { window.courseware.getEngineInfo((dataStr) => {
const engineInfo = JSON.parse(dataStr); const engineInfo = JSON.parse(dataStr);
...@@ -397,7 +398,11 @@ cc.Class({ ...@@ -397,7 +398,11 @@ cc.Class({
console.log("sceneName = " + conf.sceneName); console.log("sceneName = " + conf.sceneName);
const canvas = cc.find("Canvas"); const canvas = cc.find("Canvas");
const middleLayer = cc.find("middleLayer"); const middleLayer = cc.find("middleLayer");
window.courseware.freeAllOcMethod();
this.hideWaitingLetters(); this.hideWaitingLetters();
this.updateWidgets();
callback && callback(); callback && callback();
}); });
}); });
...@@ -415,11 +420,40 @@ cc.Class({ ...@@ -415,11 +420,40 @@ cc.Class({
console.error("非源生环境"); console.error("非源生环境");
} }
}, },
reloadBundle() { reloadBundle() {
this.loadBundleByConf(this.bundleInfoList[this.currentBundleIndex]); this.loadBundleByConf(this.bundleInfoList[this.currentBundleIndex]);
}, },
updateWidgets() {
this.updateScale();
this.node.getComponentsInChildren(cc.Widget).forEach((widget) => {
widget.updateAlignment();
});
},
updateScale() {
// const canvas = cc.find("Canvas");
// const canvasSize = cc.view.getCanvasSize();
// const designSize = cc.view.getDesignResolutionSize();
// const scale =
// canvas.width / canvasSize.width / (canvas.height / canvasSize.height);
// console.log("canvasSize:", canvasSize);
// console.log("designSize:", designSize);
// console.log({ x: canvas.x, y: canvas.y });
// console.log({ width: canvas.width, height: canvas.height });
// console.log('scale = ' + scale);
// this.node.width = canvas.width;
// this.node.height = canvas.height * scale;
// this.node.x = this.node.width / 2;
// this.node.y = this.node.height / 2 - 120;
},
exit() { exit() {
cc.game.removePersistRootNode(this.node); cc.game.removePersistRootNode(this.node);
......
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