Commit 42eb59e5 authored by liujiangnan's avatar liujiangnan

debug

parent 152bde57
...@@ -298,16 +298,16 @@ ...@@ -298,16 +298,16 @@
"__id__": 22 "__id__": 22
}, },
{ {
"__id__": 105 "__id__": 112
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 140 "__id__": 147
}, },
{ {
"__id__": 141 "__id__": 148
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1073,7 +1073,7 @@ ...@@ -1073,7 +1073,7 @@
"__id__": 81 "__id__": 81
}, },
{ {
"__id__": 83 "__id__": 88
}, },
{ {
"__id__": 90 "__id__": 90
...@@ -1082,13 +1082,16 @@ ...@@ -1082,13 +1082,16 @@
"__id__": 97 "__id__": 97
}, },
{ {
"__id__": 99 "__id__": 104
},
{
"__id__": 106
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 104 "__id__": 111
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3860,115 +3863,20 @@ ...@@ -3860,115 +3863,20 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "New Label", "_name": "BtnLoad",
"_objFlags": 0,
"_parent": {
"__id__": 22
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 82
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 440,
"height": 50.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-491.821,
-33.162,
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": "0c82Ku+IJHG5geRCtjuyT/"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 81
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "线上测试:请输入课件ID",
"_N$string": "线上测试:请输入课件ID",
"_fontSize": 40,
"_lineHeight": 40,
"_enableWrapText": true,
"_N$file": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "90lLVYuItAwohmPV+CWljy"
},
{
"__type__": "cc.Node",
"_name": "BtnOpenOsmo",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 22 "__id__": 22
}, },
"_children": [ "_children": [
{ {
"__id__": 84 "__id__": 82
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 89 "__id__": 87
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3982,7 +3890,7 @@ ...@@ -3982,7 +3890,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 150, "width": 200,
"height": 40 "height": 40
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -3994,8 +3902,8 @@ ...@@ -3994,8 +3902,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
433.571, 450.324,
81.418, -195.849,
0, 0,
0, 0,
0, 0,
...@@ -4017,27 +3925,27 @@ ...@@ -4017,27 +3925,27 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "32Gap6EZ1F3J3DtoN1UGtK" "_id": "86yX3G6S1JPrFSeJrv9jti"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "Background", "_name": "Background",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 83 "__id__": 81
}, },
"_children": [ "_children": [
{ {
"__id__": 85 "__id__": 83
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 87 "__id__": 85
}, },
{ {
"__id__": 88 "__id__": 86
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4051,7 +3959,7 @@ ...@@ -4051,7 +3959,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 150, "width": 200,
"height": 40 "height": 40
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -4086,20 +3994,20 @@ ...@@ -4086,20 +3994,20 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "c85nYyaM1Ce7w9p51WSJYS" "_id": "eaRVC5U89BcowInD+w5lYz"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "Label", "_name": "Label",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 84 "__id__": 82
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 86 "__id__": 84
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4113,7 +4021,7 @@ ...@@ -4113,7 +4021,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 150, "width": 200,
"height": 40 "height": 40
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -4148,14 +4056,14 @@ ...@@ -4148,14 +4056,14 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "c16T4d9ZNFyIMYefTOWVbu" "_id": "3e9Rg2Yo1LAblzyw+WxP+M"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 85 "__id__": 83
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4165,8 +4073,8 @@ ...@@ -4165,8 +4073,8 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "OpenOSMO", "_string": "加载资源",
"_N$string": "OpenOSMO", "_N$string": "加载资源",
"_fontSize": 20, "_fontSize": 20,
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": false, "_enableWrapText": false,
...@@ -4181,14 +4089,14 @@ ...@@ -4181,14 +4089,14 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 1, "_N$overflow": 1,
"_N$cacheMode": 1, "_N$cacheMode": 1,
"_id": "28Y+PWlgVGErDjYwL/fbjM" "_id": "39nrFBAwJFh6QzS2JF7aDc"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 84 "__id__": 82
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4213,14 +4121,14 @@ ...@@ -4213,14 +4121,14 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "975ioONQNOsLYhnmJo2ZRH" "_id": "5d8EZUTKxCkICfd0Izs8cZ"
}, },
{ {
"__type__": "cc.Widget", "__type__": "cc.Widget",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 84 "__id__": 82
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 0,
...@@ -4240,14 +4148,14 @@ ...@@ -4240,14 +4148,14 @@
"_isAbsVerticalCenter": true, "_isAbsVerticalCenter": true,
"_originalWidth": 100, "_originalWidth": 100,
"_originalHeight": 40, "_originalHeight": 40,
"_id": "70ipBYFJdFXIvYAyxODnJr" "_id": "04SRiHN+pC2oRavK1jPFEB"
}, },
{ {
"__type__": "cc.Button", "__type__": "cc.Button",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 83 "__id__": 81
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -4320,13 +4228,108 @@ ...@@ -4320,13 +4228,108 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
}, },
"_N$target": { "_N$target": {
"__id__": 84 "__id__": 82
}, },
"_id": "d3D8175pRBQIg3kZC6RPpq" "_id": "baeG7xV4RNK6WN2MZPVkxD"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "BtnCloseOsmo", "_name": "New Label",
"_objFlags": 0,
"_parent": {
"__id__": 22
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 89
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 440,
"height": 50.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-491.821,
-33.162,
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": "0c82Ku+IJHG5geRCtjuyT/"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 88
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "线上测试:请输入课件ID",
"_N$string": "线上测试:请输入课件ID",
"_fontSize": 40,
"_lineHeight": 40,
"_enableWrapText": true,
"_N$file": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "90lLVYuItAwohmPV+CWljy"
},
{
"__type__": "cc.Node",
"_name": "BtnOpenOsmo",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 22 "__id__": 22
...@@ -4365,8 +4368,8 @@ ...@@ -4365,8 +4368,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
435.629, 433.571,
-29.71, 81.418,
0, 0,
0, 0,
0, 0,
...@@ -4388,7 +4391,7 @@ ...@@ -4388,7 +4391,7 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "64Kn4xGW9PSJqoZ7ayrgZu" "_id": "32Gap6EZ1F3J3DtoN1UGtK"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
...@@ -4457,7 +4460,7 @@ ...@@ -4457,7 +4460,7 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "a4atTysq5MZYXuAR7OPR0B" "_id": "c85nYyaM1Ce7w9p51WSJYS"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
...@@ -4519,7 +4522,7 @@ ...@@ -4519,7 +4522,7 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "161xkiPIJCR6CwZaUCvBUI" "_id": "c16T4d9ZNFyIMYefTOWVbu"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -4536,8 +4539,8 @@ ...@@ -4536,8 +4539,8 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "CloseOSMO", "_string": "OpenOSMO",
"_N$string": "CloseOSMO", "_N$string": "OpenOSMO",
"_fontSize": 20, "_fontSize": 20,
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": false, "_enableWrapText": false,
...@@ -4552,7 +4555,7 @@ ...@@ -4552,7 +4555,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 1, "_N$overflow": 1,
"_N$cacheMode": 1, "_N$cacheMode": 1,
"_id": "a8iSQfSjVF7qGfo3hxji7I" "_id": "28Y+PWlgVGErDjYwL/fbjM"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -4584,7 +4587,7 @@ ...@@ -4584,7 +4587,7 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "69ZlIcwzJN5oHS5d/ktceg" "_id": "975ioONQNOsLYhnmJo2ZRH"
}, },
{ {
"__type__": "cc.Widget", "__type__": "cc.Widget",
...@@ -4611,7 +4614,7 @@ ...@@ -4611,7 +4614,7 @@
"_isAbsVerticalCenter": true, "_isAbsVerticalCenter": true,
"_originalWidth": 100, "_originalWidth": 100,
"_originalHeight": 40, "_originalHeight": 40,
"_id": "58WyKrehVLu4r0ukhirvsu" "_id": "70ipBYFJdFXIvYAyxODnJr"
}, },
{ {
"__type__": "cc.Button", "__type__": "cc.Button",
...@@ -4693,6 +4696,377 @@ ...@@ -4693,6 +4696,377 @@
"_N$target": { "_N$target": {
"__id__": 91 "__id__": 91
}, },
"_id": "d3D8175pRBQIg3kZC6RPpq"
},
{
"__type__": "cc.Node",
"_name": "BtnCloseOsmo",
"_objFlags": 0,
"_parent": {
"__id__": 22
},
"_children": [
{
"__id__": 98
}
],
"_active": true,
"_components": [
{
"__id__": 103
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 150,
"height": 40
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
435.629,
-29.71,
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": "64Kn4xGW9PSJqoZ7ayrgZu"
},
{
"__type__": "cc.Node",
"_name": "Background",
"_objFlags": 512,
"_parent": {
"__id__": 97
},
"_children": [
{
"__id__": 99
}
],
"_active": true,
"_components": [
{
"__id__": 101
},
{
"__id__": 102
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 150,
"height": 40
},
"_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": "a4atTysq5MZYXuAR7OPR0B"
},
{
"__type__": "cc.Node",
"_name": "Label",
"_objFlags": 512,
"_parent": {
"__id__": 98
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 100
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 150,
"height": 40
},
"_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": "161xkiPIJCR6CwZaUCvBUI"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 99
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "CloseOSMO",
"_N$string": "CloseOSMO",
"_fontSize": 20,
"_lineHeight": 40,
"_enableWrapText": false,
"_N$file": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Arial",
"_N$overflow": 1,
"_N$cacheMode": 1,
"_id": "a8iSQfSjVF7qGfo3hxji7I"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 98
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
},
"_type": 1,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "69ZlIcwzJN5oHS5d/ktceg"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 98
},
"_enabled": true,
"alignMode": 0,
"_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": 40,
"_id": "58WyKrehVLu4r0ukhirvsu"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 97
},
"_enabled": true,
"_normalMaterial": null,
"_grayMaterial": null,
"duration": 0.1,
"zoomScale": 1.2,
"clickEvents": [],
"_N$interactable": true,
"_N$enableAutoGrayEffect": false,
"_N$transition": 2,
"transition": 2,
"_N$normalColor": {
"__type__": "cc.Color",
"r": 230,
"g": 230,
"b": 230,
"a": 255
},
"_N$pressedColor": {
"__type__": "cc.Color",
"r": 200,
"g": 200,
"b": 200,
"a": 255
},
"pressedColor": {
"__type__": "cc.Color",
"r": 200,
"g": 200,
"b": 200,
"a": 255
},
"_N$hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$disabledColor": {
"__type__": "cc.Color",
"r": 120,
"g": 120,
"b": 120,
"a": 200
},
"_N$normalSprite": {
"__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
},
"_N$pressedSprite": {
"__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
},
"pressedSprite": {
"__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
},
"_N$hoverSprite": {
"__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
},
"hoverSprite": {
"__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
},
"_N$disabledSprite": {
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
},
"_N$target": {
"__id__": 98
},
"_id": "27BjR9SvZAhY/aQBzv9ezW" "_id": "27BjR9SvZAhY/aQBzv9ezW"
}, },
{ {
...@@ -4706,7 +5080,7 @@ ...@@ -4706,7 +5080,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 98 "__id__": 105
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4762,7 +5136,7 @@ ...@@ -4762,7 +5136,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 97 "__id__": 104
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4799,16 +5173,16 @@ ...@@ -4799,16 +5173,16 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 100 "__id__": 107
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 102 "__id__": 109
}, },
{ {
"__id__": 103 "__id__": 110
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4864,13 +5238,13 @@ ...@@ -4864,13 +5238,13 @@
"_name": "bar", "_name": "bar",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 99 "__id__": 106
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 101 "__id__": 108
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4926,7 +5300,7 @@ ...@@ -4926,7 +5300,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 100 "__id__": 107
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4958,7 +5332,7 @@ ...@@ -4958,7 +5332,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 99 "__id__": 106
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4990,12 +5364,12 @@ ...@@ -4990,12 +5364,12 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 99 "__id__": 106
}, },
"_enabled": true, "_enabled": true,
"_N$totalLength": 300, "_N$totalLength": 300,
"_N$barSprite": { "_N$barSprite": {
"__id__": 101 "__id__": 108
}, },
"_N$mode": 0, "_N$mode": 0,
"_N$progress": 0, "_N$progress": 0,
...@@ -5038,25 +5412,25 @@ ...@@ -5038,25 +5412,25 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 106 "__id__": 113
}, },
{ {
"__id__": 112 "__id__": 119
}, },
{ {
"__id__": 115 "__id__": 122
}, },
{ {
"__id__": 123 "__id__": 130
}, },
{ {
"__id__": 131 "__id__": 138
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 139 "__id__": 146
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5112,20 +5486,20 @@ ...@@ -5112,20 +5486,20 @@
"_name": "content", "_name": "content",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 105 "__id__": 112
}, },
"_children": [ "_children": [
{ {
"__id__": 107 "__id__": 114
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 110 "__id__": 117
}, },
{ {
"__id__": 111 "__id__": 118
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5181,16 +5555,16 @@ ...@@ -5181,16 +5555,16 @@
"_name": "label", "_name": "label",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 106 "__id__": 113
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 108 "__id__": 115
}, },
{ {
"__id__": 109 "__id__": 116
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5246,7 +5620,7 @@ ...@@ -5246,7 +5620,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 107 "__id__": 114
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5279,7 +5653,7 @@ ...@@ -5279,7 +5653,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 107 "__id__": 114
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -5306,7 +5680,7 @@ ...@@ -5306,7 +5680,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 106 "__id__": 113
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -5338,7 +5712,7 @@ ...@@ -5338,7 +5712,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 106 "__id__": 113
}, },
"_enabled": true, "_enabled": true,
"alignMode": 2, "alignMode": 2,
...@@ -5365,16 +5739,16 @@ ...@@ -5365,16 +5739,16 @@
"_name": "bg", "_name": "bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 105 "__id__": 112
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 113 "__id__": 120
}, },
{ {
"__id__": 114 "__id__": 121
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5430,7 +5804,7 @@ ...@@ -5430,7 +5804,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 112 "__id__": 119
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5462,7 +5836,7 @@ ...@@ -5462,7 +5836,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 112 "__id__": 119
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -5489,26 +5863,26 @@ ...@@ -5489,26 +5863,26 @@
"_name": "Console", "_name": "Console",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 105 "__id__": 112
}, },
"_children": [ "_children": [
{ {
"__id__": 116 "__id__": 123
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 119 "__id__": 126
}, },
{ {
"__id__": 120 "__id__": 127
}, },
{ {
"__id__": 121 "__id__": 128
}, },
{ {
"__id__": 122 "__id__": 129
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5564,16 +5938,16 @@ ...@@ -5564,16 +5938,16 @@
"_name": "content", "_name": "content",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 115 "__id__": 122
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 117 "__id__": 124
}, },
{ {
"__id__": 118 "__id__": 125
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5629,7 +6003,7 @@ ...@@ -5629,7 +6003,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 116 "__id__": 123
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -5661,7 +6035,7 @@ ...@@ -5661,7 +6035,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 116 "__id__": 123
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -5688,7 +6062,7 @@ ...@@ -5688,7 +6062,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 115 "__id__": 122
}, },
"_enabled": true, "_enabled": true,
"alignMode": 2, "alignMode": 2,
...@@ -5715,7 +6089,7 @@ ...@@ -5715,7 +6089,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 115 "__id__": 122
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5735,7 +6109,7 @@ ...@@ -5735,7 +6109,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 115 "__id__": 122
}, },
"_enabled": true, "_enabled": true,
"horizontal": false, "horizontal": false,
...@@ -5747,10 +6121,10 @@ ...@@ -5747,10 +6121,10 @@
"scrollEvents": [], "scrollEvents": [],
"cancelInnerEvents": true, "cancelInnerEvents": true,
"_N$content": { "_N$content": {
"__id__": 116 "__id__": 123
}, },
"content": { "content": {
"__id__": 116 "__id__": 123
}, },
"_id": "43wBGhGBpFP7OYyNM+j0Ho" "_id": "43wBGhGBpFP7OYyNM+j0Ho"
}, },
...@@ -5759,7 +6133,7 @@ ...@@ -5759,7 +6133,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 115 "__id__": 122
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -5791,20 +6165,20 @@ ...@@ -5791,20 +6165,20 @@
"_name": "BtnClose", "_name": "BtnClose",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 105 "__id__": 112
}, },
"_children": [ "_children": [
{ {
"__id__": 124 "__id__": 131
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 129 "__id__": 136
}, },
{ {
"__id__": 130 "__id__": 137
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5860,20 +6234,20 @@ ...@@ -5860,20 +6234,20 @@
"_name": "Background", "_name": "Background",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 123 "__id__": 130
}, },
"_children": [ "_children": [
{ {
"__id__": 125 "__id__": 132
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 127 "__id__": 134
}, },
{ {
"__id__": 128 "__id__": 135
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5929,13 +6303,13 @@ ...@@ -5929,13 +6303,13 @@
"_name": "Label", "_name": "Label",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 124 "__id__": 131
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 126 "__id__": 133
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5991,7 +6365,7 @@ ...@@ -5991,7 +6365,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 125 "__id__": 132
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6024,7 +6398,7 @@ ...@@ -6024,7 +6398,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 124 "__id__": 131
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6056,7 +6430,7 @@ ...@@ -6056,7 +6430,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 124 "__id__": 131
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 0,
...@@ -6083,7 +6457,7 @@ ...@@ -6083,7 +6457,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 123 "__id__": 130
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -6156,7 +6530,7 @@ ...@@ -6156,7 +6530,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
}, },
"_N$target": { "_N$target": {
"__id__": 124 "__id__": 131
}, },
"_id": "54SC9WcmBAZ6cTznyI0o+3" "_id": "54SC9WcmBAZ6cTznyI0o+3"
}, },
...@@ -6165,7 +6539,7 @@ ...@@ -6165,7 +6539,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 123 "__id__": 130
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -6192,20 +6566,20 @@ ...@@ -6192,20 +6566,20 @@
"_name": "BtnOpen", "_name": "BtnOpen",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 105 "__id__": 112
}, },
"_children": [ "_children": [
{ {
"__id__": 132 "__id__": 139
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 137 "__id__": 144
}, },
{ {
"__id__": 138 "__id__": 145
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6261,20 +6635,20 @@ ...@@ -6261,20 +6635,20 @@
"_name": "Background", "_name": "Background",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 131 "__id__": 138
}, },
"_children": [ "_children": [
{ {
"__id__": 133 "__id__": 140
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 135 "__id__": 142
}, },
{ {
"__id__": 136 "__id__": 143
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6330,13 +6704,13 @@ ...@@ -6330,13 +6704,13 @@
"_name": "Label", "_name": "Label",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 132 "__id__": 139
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 134 "__id__": 141
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6392,7 +6766,7 @@ ...@@ -6392,7 +6766,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 133 "__id__": 140
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6425,7 +6799,7 @@ ...@@ -6425,7 +6799,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 132 "__id__": 139
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6457,7 +6831,7 @@ ...@@ -6457,7 +6831,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 132 "__id__": 139
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 0,
...@@ -6484,7 +6858,7 @@ ...@@ -6484,7 +6858,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 131 "__id__": 138
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -6557,7 +6931,7 @@ ...@@ -6557,7 +6931,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
}, },
"_N$target": { "_N$target": {
"__id__": 132 "__id__": 139
}, },
"_id": "81HoUuRyJOppi+n4Av/u0p" "_id": "81HoUuRyJOppi+n4Av/u0p"
}, },
...@@ -6566,7 +6940,7 @@ ...@@ -6566,7 +6940,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 131 "__id__": 138
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -6593,7 +6967,7 @@ ...@@ -6593,7 +6967,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 105 "__id__": 112
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
......
...@@ -48,14 +48,14 @@ cc.Class({ ...@@ -48,14 +48,14 @@ cc.Class({
this.preloadCount = 0; this.preloadCount = 0;
this.loadedCount = 0; this.loadedCount = 0;
initAir(this); initAir(this);
if (!window.preloadBundleAndSourcesFlag) { // if (!window.preloadBundleAndSourcesFlag) {
// 只加载一次就行了 // // 只加载一次就行了
window.preloadBundleAndSourcesFlag = true; // window.preloadBundleAndSourcesFlag = true;
cc.find("middleLayer/ui/ProgressLabel").active = true; // cc.find("middleLayer/ui/ProgressLabel").active = true;
cc.find('middleLayer/ui/loadingProgress').active = true; // cc.find('middleLayer/ui/loadingProgress').active = true;
this.preloadBundle(); // this.preloadBundle();
this.preloadSource(); // this.preloadSource();
} // }
}, },
start() { start() {
......
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