Commit 1f637066 authored by 范雪寒's avatar 范雪寒

feat: 打印sceneName

parent bc1d5ed6
...@@ -298,16 +298,16 @@ ...@@ -298,16 +298,16 @@
"__id__": 22 "__id__": 22
}, },
{ {
"__id__": 100 "__id__": 105
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 135 "__id__": 140
}, },
{ {
"__id__": 136 "__id__": 141
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1080,12 +1080,15 @@ ...@@ -1080,12 +1080,15 @@
}, },
{ {
"__id__": 97 "__id__": 97
},
{
"__id__": 99
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 99 "__id__": 104
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4787,6 +4790,218 @@ ...@@ -4787,6 +4790,218 @@
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "ee0WrmR8hIQbOtXJqrMoQ5" "_id": "ee0WrmR8hIQbOtXJqrMoQ5"
}, },
{
"__type__": "cc.Node",
"_name": "loadingProgress",
"_objFlags": 0,
"_parent": {
"__id__": 22
},
"_children": [
{
"__id__": 100
}
],
"_active": true,
"_components": [
{
"__id__": 102
},
{
"__id__": 103
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 300,
"height": 15
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
-106.947,
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": "8eQzQS+G9EIqiUtunVxOmS"
},
{
"__type__": "cc.Node",
"_name": "bar",
"_objFlags": 512,
"_parent": {
"__id__": 99
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 101
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 150,
"height": 15
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-150,
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": "4dGkzjGXpDp47yn3d4Qd9r"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 100
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "67e68bc9-dad5-4ad9-a2d8-7e03d458e32f"
},
"_type": 1,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "14PkFmJmtK/Yp9AZyo9gVv"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 99
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "88e79fd5-96b4-4a77-a1f4-312467171014"
},
"_type": 1,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "590gTWZEdMwIlULNUksORP"
},
{
"__type__": "cc.ProgressBar",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 99
},
"_enabled": true,
"_N$totalLength": 300,
"_N$barSprite": {
"__id__": 101
},
"_N$mode": 0,
"_N$progress": 0.5,
"_N$reverse": false,
"_id": "bc3W7j5EVJRaoW20bSToA3"
},
{ {
"__type__": "cc.Widget", "__type__": "cc.Widget",
"_name": "", "_name": "",
...@@ -4823,25 +5038,25 @@ ...@@ -4823,25 +5038,25 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 101 "__id__": 106
}, },
{ {
"__id__": 107 "__id__": 112
}, },
{ {
"__id__": 110 "__id__": 115
}, },
{ {
"__id__": 118 "__id__": 123
}, },
{ {
"__id__": 126 "__id__": 131
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 134 "__id__": 139
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4897,20 +5112,20 @@ ...@@ -4897,20 +5112,20 @@
"_name": "content", "_name": "content",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 100 "__id__": 105
}, },
"_children": [ "_children": [
{ {
"__id__": 102 "__id__": 107
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 105 "__id__": 110
}, },
{ {
"__id__": 106 "__id__": 111
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4966,16 +5181,16 @@ ...@@ -4966,16 +5181,16 @@
"_name": "label", "_name": "label",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 101 "__id__": 106
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 103 "__id__": 108
}, },
{ {
"__id__": 104 "__id__": 109
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5031,7 +5246,7 @@ ...@@ -5031,7 +5246,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 102 "__id__": 107
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5064,7 +5279,7 @@ ...@@ -5064,7 +5279,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 102 "__id__": 107
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -5091,7 +5306,7 @@ ...@@ -5091,7 +5306,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 101 "__id__": 106
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -5123,7 +5338,7 @@ ...@@ -5123,7 +5338,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 101 "__id__": 106
}, },
"_enabled": true, "_enabled": true,
"alignMode": 2, "alignMode": 2,
...@@ -5150,16 +5365,16 @@ ...@@ -5150,16 +5365,16 @@
"_name": "bg", "_name": "bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 100 "__id__": 105
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 108 "__id__": 113
}, },
{ {
"__id__": 109 "__id__": 114
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5215,7 +5430,7 @@ ...@@ -5215,7 +5430,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 107 "__id__": 112
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5247,7 +5462,7 @@ ...@@ -5247,7 +5462,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 107 "__id__": 112
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -5274,26 +5489,26 @@ ...@@ -5274,26 +5489,26 @@
"_name": "Console", "_name": "Console",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 100 "__id__": 105
}, },
"_children": [ "_children": [
{ {
"__id__": 111 "__id__": 116
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 114 "__id__": 119
}, },
{ {
"__id__": 115 "__id__": 120
}, },
{ {
"__id__": 116 "__id__": 121
}, },
{ {
"__id__": 117 "__id__": 122
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5349,16 +5564,16 @@ ...@@ -5349,16 +5564,16 @@
"_name": "content", "_name": "content",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 110 "__id__": 115
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 112 "__id__": 117
}, },
{ {
"__id__": 113 "__id__": 118
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5414,7 +5629,7 @@ ...@@ -5414,7 +5629,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 111 "__id__": 116
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -5446,7 +5661,7 @@ ...@@ -5446,7 +5661,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 111 "__id__": 116
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -5473,7 +5688,7 @@ ...@@ -5473,7 +5688,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 110 "__id__": 115
}, },
"_enabled": true, "_enabled": true,
"alignMode": 2, "alignMode": 2,
...@@ -5500,7 +5715,7 @@ ...@@ -5500,7 +5715,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 110 "__id__": 115
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5520,7 +5735,7 @@ ...@@ -5520,7 +5735,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 110 "__id__": 115
}, },
"_enabled": true, "_enabled": true,
"horizontal": false, "horizontal": false,
...@@ -5532,10 +5747,10 @@ ...@@ -5532,10 +5747,10 @@
"scrollEvents": [], "scrollEvents": [],
"cancelInnerEvents": true, "cancelInnerEvents": true,
"_N$content": { "_N$content": {
"__id__": 111 "__id__": 116
}, },
"content": { "content": {
"__id__": 111 "__id__": 116
}, },
"_id": "43wBGhGBpFP7OYyNM+j0Ho" "_id": "43wBGhGBpFP7OYyNM+j0Ho"
}, },
...@@ -5544,7 +5759,7 @@ ...@@ -5544,7 +5759,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 110 "__id__": 115
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -5576,20 +5791,20 @@ ...@@ -5576,20 +5791,20 @@
"_name": "BtnClose", "_name": "BtnClose",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 100 "__id__": 105
}, },
"_children": [ "_children": [
{ {
"__id__": 119 "__id__": 124
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 124 "__id__": 129
}, },
{ {
"__id__": 125 "__id__": 130
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5645,20 +5860,20 @@ ...@@ -5645,20 +5860,20 @@
"_name": "Background", "_name": "Background",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 118 "__id__": 123
}, },
"_children": [ "_children": [
{ {
"__id__": 120 "__id__": 125
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 122 "__id__": 127
}, },
{ {
"__id__": 123 "__id__": 128
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5714,13 +5929,13 @@ ...@@ -5714,13 +5929,13 @@
"_name": "Label", "_name": "Label",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 119 "__id__": 124
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 121 "__id__": 126
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5776,7 +5991,7 @@ ...@@ -5776,7 +5991,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 120 "__id__": 125
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5809,7 +6024,7 @@ ...@@ -5809,7 +6024,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 119 "__id__": 124
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5841,7 +6056,7 @@ ...@@ -5841,7 +6056,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 119 "__id__": 124
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 0,
...@@ -5868,7 +6083,7 @@ ...@@ -5868,7 +6083,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 118 "__id__": 123
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -5941,7 +6156,7 @@ ...@@ -5941,7 +6156,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
}, },
"_N$target": { "_N$target": {
"__id__": 119 "__id__": 124
}, },
"_id": "54SC9WcmBAZ6cTznyI0o+3" "_id": "54SC9WcmBAZ6cTznyI0o+3"
}, },
...@@ -5950,7 +6165,7 @@ ...@@ -5950,7 +6165,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 118 "__id__": 123
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -5977,20 +6192,20 @@ ...@@ -5977,20 +6192,20 @@
"_name": "BtnOpen", "_name": "BtnOpen",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 100 "__id__": 105
}, },
"_children": [ "_children": [
{ {
"__id__": 127 "__id__": 132
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 132 "__id__": 137
}, },
{ {
"__id__": 133 "__id__": 138
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6046,20 +6261,20 @@ ...@@ -6046,20 +6261,20 @@
"_name": "Background", "_name": "Background",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 126 "__id__": 131
}, },
"_children": [ "_children": [
{ {
"__id__": 128 "__id__": 133
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 130 "__id__": 135
}, },
{ {
"__id__": 131 "__id__": 136
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6115,13 +6330,13 @@ ...@@ -6115,13 +6330,13 @@
"_name": "Label", "_name": "Label",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 127 "__id__": 132
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 129 "__id__": 134
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6177,7 +6392,7 @@ ...@@ -6177,7 +6392,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 128 "__id__": 133
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6210,7 +6425,7 @@ ...@@ -6210,7 +6425,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 127 "__id__": 132
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6242,7 +6457,7 @@ ...@@ -6242,7 +6457,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 127 "__id__": 132
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 0,
...@@ -6269,7 +6484,7 @@ ...@@ -6269,7 +6484,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 126 "__id__": 131
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -6342,7 +6557,7 @@ ...@@ -6342,7 +6557,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
}, },
"_N$target": { "_N$target": {
"__id__": 127 "__id__": 132
}, },
"_id": "81HoUuRyJOppi+n4Av/u0p" "_id": "81HoUuRyJOppi+n4Av/u0p"
}, },
...@@ -6351,7 +6566,7 @@ ...@@ -6351,7 +6566,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 126 "__id__": 131
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -6378,7 +6593,7 @@ ...@@ -6378,7 +6593,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 100 "__id__": 105
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
......
...@@ -157,9 +157,12 @@ cc.Class({ ...@@ -157,9 +157,12 @@ cc.Class({
updateProcessBar() { updateProcessBar() {
const label = cc.find("middleLayer/ui/ProgressLabel").getComponent(cc.Label); const label = cc.find("middleLayer/ui/ProgressLabel").getComponent(cc.Label);
label.string = `正在加载:${this.loadedCount} / ${this.preloadCount}`; label.string = `正在加载:${this.loadedCount} / ${this.preloadCount}`;
const loadingProgress = cc.find('middleLayer/ui/loadingProgress');
if (this.loadedCount > this.preloadCount * 0.99) { if (this.loadedCount > this.preloadCount * 0.99) {
cc.find("middleLayer/ui/ProgressLabel").active = false; cc.find("middleLayer/ui/ProgressLabel").active = false;
loadingProgress.active = false;
} }
loadingProgress.getComponent(cc.ProgressBar).progress = this.loadedCount / this.preloadCount;
}, },
asyncDelayLog(str) { asyncDelayLog(str) {
...@@ -390,6 +393,7 @@ cc.Class({ ...@@ -390,6 +393,7 @@ cc.Class({
this.hideWaitingLetters(); this.hideWaitingLetters();
cc.audioEngine.stopAll(); cc.audioEngine.stopAll();
cc.director.runScene(scene, null, () => { cc.director.runScene(scene, null, () => {
console.log('sceneName = ' + sceneName);
const Canvas = cc.find('Canvas'); const Canvas = cc.find('Canvas');
const middleLayer = cc.find('middleLayer'); const middleLayer = cc.find('middleLayer');
middleLayer.scale = Canvas.width / middleLayer.width; middleLayer.scale = Canvas.width / middleLayer.width;
......
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