Commit a47ffd65 authored by liujiangnan's avatar liujiangnan

feat:

parent 23d6d7bd
......@@ -301,34 +301,37 @@
"__id__": 33
},
{
"__id__": 42
"__id__": 50
},
{
"__id__": 59
"__id__": 61
},
{
"__id__": 70
"__id__": 80
},
{
"__id__": 89
"__id__": 83
},
{
"__id__": 92
"__id__": 113
},
{
"__id__": 122
"__id__": 115
},
{
"__id__": 124
"__id__": 118
},
{
"__id__": 120
}
],
"_active": true,
"_components": [
{
"__id__": 127
"__id__": 129
},
{
"__id__": 128
"__id__": 130
}
],
"_prefab": null,
......@@ -1512,7 +1515,7 @@
},
{
"__type__": "cc.Node",
"_name": "tipsLayer",
"_name": "New Node",
"_objFlags": 0,
"_parent": {
"__id__": 7
......@@ -1523,12 +1526,21 @@
},
{
"__id__": 37
},
{
"__id__": 40
},
{
"__id__": 43
},
{
"__id__": 46
}
],
"_active": false,
"_components": [
{
"__id__": 41
"__id__": 49
}
],
"_prefab": null,
......@@ -1577,11 +1589,11 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "8dpIhzuitKjLurWo/y+zqQ"
"_id": "8aMQ/LrgJJXLamdzPRgRAs"
},
{
"__type__": "cc.Node",
"_name": "bg",
"_name": "New Sprite(Splash)",
"_objFlags": 0,
"_parent": {
"__id__": 33
......@@ -1597,12 +1609,12 @@
}
],
"_prefab": null,
"_opacity": 0,
"_opacity": 50,
"_color": {
"__type__": "cc.Color",
"r": 0,
"r": 46,
"g": 0,
"b": 0,
"b": 255,
"a": 255
},
"_contentSize": {
......@@ -1642,7 +1654,7 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "ccrzoppA9P3Jxmw63M2SK2"
"_id": "4c4sXhZRJOrLaVzGX4GdzJ"
},
{
"__type__": "cc.Sprite",
......@@ -1674,7 +1686,7 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "c48X7gXABAUKUb5HwLkjQB"
"_id": "f6uhkzkAdLTZcu6CJv3DIY"
},
{
"__type__": "cc.Widget",
......@@ -1684,7 +1696,7 @@
"__id__": 34
},
"_enabled": true,
"alignMode": 1,
"alignMode": 2,
"_target": null,
"_alignFlags": 45,
"_left": 0,
......@@ -1699,30 +1711,29 @@
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 2,
"_originalHeight": 2,
"_id": "6e0q1iDfpDZ7oBFcQZ5i8T"
"_originalWidth": 100,
"_originalHeight": 100,
"_id": "755VanNytOBbH+yCofIhBY"
},
{
"__type__": "cc.Node",
"_name": "tips",
"_name": "New Sprite(Splash)",
"_objFlags": 0,
"_parent": {
"__id__": 33
},
"_children": [
{
"__id__": 38
}
],
"_children": [],
"_active": true,
"_components": [
{
"__id__": 40
"__id__": 38
},
{
"__id__": 39
}
],
"_prefab": null,
"_opacity": 255,
"_opacity": 100,
"_color": {
"__type__": "cc.Color",
"r": 255,
......@@ -1732,8 +1743,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 398,
"height": 172
"width": 1280,
"height": 10
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -1745,7 +1756,7 @@
"ctor": "Float64Array",
"array": [
0,
0,
355,
0,
0,
0,
......@@ -1767,24 +1778,86 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "bc+NX8srtGCpx8x3MHUErI"
"_id": "34uyfp5vZFK5OLooUV6Ham"
},
{
"__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": "b70wrixHBCXJiKYl//uEbS"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 37
},
"_enabled": true,
"alignMode": 2,
"_target": null,
"_alignFlags": 41,
"_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": 0,
"_id": "87ug39YttME6awxFiAGWqw"
},
{
"__type__": "cc.Node",
"_name": "label",
"_name": "New Sprite(Splash)",
"_objFlags": 0,
"_parent": {
"__id__": 37
"__id__": 33
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 39
"__id__": 41
},
{
"__id__": 42
}
],
"_prefab": null,
"_opacity": 255,
"_opacity": 100,
"_color": {
"__type__": "cc.Color",
"r": 255,
......@@ -1794,8 +1867,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 587.23,
"height": 50.4
"width": 1280,
"height": 10
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -1807,7 +1880,7 @@
"ctor": "Float64Array",
"array": [
0,
0,
-355,
0,
0,
0,
......@@ -1829,47 +1902,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "3azAiHeUBNDK9qvDCJVcIo"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 38
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "LabelLabelLabelLabelLabelLabel",
"_N$string": "LabelLabelLabelLabelLabelLabel",
"_fontSize": 40,
"_lineHeight": 40,
"_enableWrapText": true,
"_N$file": null,
"_isSystemFontUsed": false,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "4e+eKpO8ZAGpll0BY9jZOn"
"_id": "11sDudqxJA9bIFCpEUpdu3"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 37
"__id__": 40
},
"_enabled": true,
"_materials": [
......@@ -1880,10 +1920,10 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "e1f510a2-a688-49f7-8de5-9501732f9e31"
"__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
},
"_type": 1,
"_sizeMode": 1,
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
......@@ -1894,19 +1934,19 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "ffhjvN3nlAF7lGhW+hmTcV"
"_id": "fcONrQudhAUagTkNGcOlJ5"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 33
"__id__": 40
},
"_enabled": true,
"alignMode": 1,
"alignMode": 2,
"_target": null,
"_alignFlags": 45,
"_alignFlags": 44,
"_left": 0,
"_right": 0,
"_top": 0,
......@@ -1919,42 +1959,29 @@
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 1280,
"_originalHeight": 720,
"_id": "b3B9SCYStJNpe7QmCD2vYN"
"_originalWidth": 100,
"_originalHeight": 10,
"_id": "f3RYMS9LFEqoEwVubJ28/H"
},
{
"__type__": "cc.Node",
"_name": "New Node",
"_name": "New Sprite(Splash)",
"_objFlags": 0,
"_parent": {
"__id__": 7
},
"_children": [
{
"__id__": 43
},
{
"__id__": 46
},
{
"__id__": 49
"__id__": 33
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 52
"__id__": 44
},
{
"__id__": 55
}
],
"_active": false,
"_components": [
{
"__id__": 58
"__id__": 45
}
],
"_prefab": null,
"_opacity": 255,
"_opacity": 100,
"_color": {
"__type__": "cc.Color",
"r": 255,
......@@ -1964,7 +1991,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1280,
"width": 10,
"height": 720
},
"_anchorPoint": {
......@@ -1976,7 +2003,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
-635,
0,
0,
0,
......@@ -1999,79 +2026,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "8aMQ/LrgJJXLamdzPRgRAs"
"_id": "f7klnAOihGwp2XKvCbQ3cj"
},
{
"__type__": "cc.Node",
"_name": "New Sprite(Splash)",
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"_parent": {
"__id__": 42
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 44
},
{
"__id__": 45
}
],
"_prefab": null,
"_opacity": 50,
"_color": {
"__type__": "cc.Color",
"r": 46,
"g": 0,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1280,
"height": 720
},
"_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": "4c4sXhZRJOrLaVzGX4GdzJ"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 43
"node": {
"__id__": 43
},
"_enabled": true,
"_materials": [
......@@ -2096,7 +2058,7 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "f6uhkzkAdLTZcu6CJv3DIY"
"_id": "b0FtOTfy5NdJJ6FLUHmYWY"
},
{
"__type__": "cc.Widget",
......@@ -2108,9 +2070,9 @@
"_enabled": true,
"alignMode": 2,
"_target": null,
"_alignFlags": 45,
"_alignFlags": 13,
"_left": 0,
"_right": 0,
"_right": 590,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
......@@ -2122,15 +2084,15 @@
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 100,
"_originalHeight": 100,
"_id": "755VanNytOBbH+yCofIhBY"
"_originalHeight": 10,
"_id": "120QXsrwRHP5g1f2FWLNSY"
},
{
"__type__": "cc.Node",
"_name": "New Sprite(Splash)",
"_objFlags": 0,
"_parent": {
"__id__": 42
"__id__": 33
},
"_children": [],
"_active": true,
......@@ -2153,8 +2115,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1280,
"height": 10
"width": 10,
"height": 720
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -2165,8 +2127,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
635,
0,
355,
0,
0,
0,
......@@ -2188,7 +2150,7 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "34uyfp5vZFK5OLooUV6Ham"
"_id": "4dXFZZamlE1LtRVQSwFHVz"
},
{
"__type__": "cc.Sprite",
......@@ -2220,7 +2182,7 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "b70wrixHBCXJiKYl//uEbS"
"_id": "857UBC1zlKfI22qcHkuvJW"
},
{
"__type__": "cc.Widget",
......@@ -2232,8 +2194,8 @@
"_enabled": true,
"alignMode": 2,
"_target": null,
"_alignFlags": 41,
"_left": 0,
"_alignFlags": 37,
"_left": 590,
"_right": 0,
"_top": 0,
"_bottom": 0,
......@@ -2246,28 +2208,65 @@
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 100,
"_originalHeight": 10,
"_id": "3fRiY2na1HU4R6Y8GhCLnf"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 33
},
"_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": 0,
"_originalHeight": 0,
"_id": "87ug39YttME6awxFiAGWqw"
"_id": "12LdxdbhJLH7ZwUfhbh20a"
},
{
"__type__": "cc.Node",
"_name": "New Sprite(Splash)",
"_name": "coolcat",
"_objFlags": 0,
"_parent": {
"__id__": 42
"__id__": 7
},
"_children": [],
"_active": true,
"_components": [
"_children": [
{
"__id__": 50
"__id__": 51
},
{
"__id__": 51
"__id__": 54
},
{
"__id__": 56
},
{
"__id__": 58
}
],
"_active": false,
"_components": [
{
"__id__": 60
}
],
"_prefab": null,
"_opacity": 100,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
......@@ -2278,7 +2277,7 @@
"_contentSize": {
"__type__": "cc.Size",
"width": 1280,
"height": 10
"height": 720
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -2290,7 +2289,7 @@
"ctor": "Float64Array",
"array": [
0,
-355,
0,
0,
0,
0,
......@@ -2312,86 +2311,27 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "11sDudqxJA9bIFCpEUpdu3"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 49
},
"_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": "fcONrQudhAUagTkNGcOlJ5"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 49
},
"_enabled": true,
"alignMode": 2,
"_target": null,
"_alignFlags": 44,
"_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": 10,
"_id": "f3RYMS9LFEqoEwVubJ28/H"
"_id": "59PPwEN51EYosVqaqvsP8e"
},
{
"__type__": "cc.Node",
"_name": "New Sprite(Splash)",
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 42
"__id__": 50
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 53
"__id__": 52
},
{
"__id__": 54
"__id__": 53
}
],
"_prefab": null,
"_opacity": 100,
"_opacity": 150,
"_color": {
"__type__": "cc.Color",
"r": 255,
......@@ -2401,7 +2341,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 10,
"width": 1280,
"height": 720
},
"_anchorPoint": {
......@@ -2413,7 +2353,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-635,
0,
0,
0,
0,
......@@ -2436,14 +2376,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "f7klnAOihGwp2XKvCbQ3cj"
"_id": "eezXuEXt5L2rPc5FhPF6K/"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 52
"__id__": 51
},
"_enabled": true,
"_materials": [
......@@ -2468,21 +2408,21 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "b0FtOTfy5NdJJ6FLUHmYWY"
"_id": "3580SV2J1FybvDGYQ7wKTB"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 52
"__id__": 51
},
"_enabled": true,
"alignMode": 2,
"_target": null,
"_alignFlags": 13,
"_alignFlags": 45,
"_left": 0,
"_right": 590,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
......@@ -2494,28 +2434,25 @@
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 100,
"_originalHeight": 10,
"_id": "120QXsrwRHP5g1f2FWLNSY"
"_originalHeight": 100,
"_id": "87/t6oPxdE2og9bAZ445is"
},
{
"__type__": "cc.Node",
"_name": "New Sprite(Splash)",
"_name": "light",
"_objFlags": 0,
"_parent": {
"__id__": 42
"__id__": 50
},
"_children": [],
"_active": true,
"_active": false,
"_components": [
{
"__id__": 56
},
{
"__id__": 57
"__id__": 55
}
],
"_prefab": null,
"_opacity": 100,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
......@@ -2525,8 +2462,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 10,
"height": 720
"width": 576,
"height": 576
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -2537,7 +2474,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
635,
0,
0,
0,
0,
......@@ -2560,14 +2497,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "4dXFZZamlE1LtRVQSwFHVz"
"_id": "2evjqfRs9Gnp6hck6/LUyz"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 55
"__id__": 54
},
"_enabled": true,
"_materials": [
......@@ -2578,10 +2515,10 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
"__uuid__": "45d79668-f606-4017-a94e-55644dc93641"
},
"_type": 0,
"_sizeMode": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
......@@ -2592,87 +2529,20 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "857UBC1zlKfI22qcHkuvJW"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 55
},
"_enabled": true,
"alignMode": 2,
"_target": null,
"_alignFlags": 37,
"_left": 590,
"_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": 10,
"_id": "3fRiY2na1HU4R6Y8GhCLnf"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 42
},
"_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": 0,
"_originalHeight": 0,
"_id": "12LdxdbhJLH7ZwUfhbh20a"
"_id": "b6fPUuAPNPr4SFEpZIYskr"
},
{
"__type__": "cc.Node",
"_name": "coolcat",
"_name": "star",
"_objFlags": 0,
"_parent": {
"__id__": 7
},
"_children": [
{
"__id__": 60
},
{
"__id__": 63
},
{
"__id__": 65
"__id__": 50
},
{
"__id__": 67
}
],
"_active": false,
"_children": [],
"_active": true,
"_components": [
{
"__id__": 69
"__id__": 57
}
],
"_prefab": null,
......@@ -2686,8 +2556,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1280,
"height": 720
"width": 1180,
"height": 709
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -2721,27 +2591,64 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "59PPwEN51EYosVqaqvsP8e"
"_id": "db49KvvkFCrJ/ePgbn0Ern"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 56
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_armatureName": "Armature",
"_animationName": "normal",
"_preCacheMode": 0,
"_cacheMode": 0,
"playTimes": 1,
"premultipliedAlpha": false,
"_armatureKey": "dd7f3155-7097-4fde-9485-63143c0a0969#449f362f-8125-487a-b452-10ea36b16144",
"_accTime": 0,
"_playCount": 0,
"_frameCache": null,
"_curFrame": null,
"_playing": false,
"_armatureCache": null,
"_N$dragonAsset": {
"__uuid__": "dd7f3155-7097-4fde-9485-63143c0a0969"
},
"_N$dragonAtlasAsset": {
"__uuid__": "449f362f-8125-487a-b452-10ea36b16144"
},
"_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 1,
"_N$_defaultCacheMode": 0,
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "878liw1zBMaZARNFNwz5EF"
},
{
"__type__": "cc.Node",
"_name": "bg",
"_name": "apple",
"_objFlags": 0,
"_parent": {
"__id__": 59
"__id__": 50
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 61
},
{
"__id__": 62
"__id__": 59
}
],
"_prefab": null,
"_opacity": 150,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
......@@ -2751,8 +2658,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1280,
"height": 720
"width": 40,
"height": 36
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -2786,14 +2693,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "eezXuEXt5L2rPc5FhPF6K/"
"_id": "14SD83zF1Nz5NtrjXKjn3A"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 60
"__id__": 58
},
"_enabled": true,
"_materials": [
......@@ -2804,10 +2711,10 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061"
},
"_type": 0,
"_sizeMode": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
......@@ -2818,14 +2725,14 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "3580SV2J1FybvDGYQ7wKTB"
"_id": "ddLgkrLfRLZqG3H1IW5m7S"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 60
"__id__": 50
},
"_enabled": true,
"alignMode": 2,
......@@ -2845,20 +2752,27 @@
"_isAbsVerticalCenter": true,
"_originalWidth": 100,
"_originalHeight": 100,
"_id": "87/t6oPxdE2og9bAZ445is"
"_id": "ac8X+QIhhDbqqqh/k/3K22"
},
{
"__type__": "cc.Node",
"_name": "light",
"_name": "confirmLayer",
"_objFlags": 0,
"_parent": {
"__id__": 59
"__id__": 7
},
"_children": [],
"_children": [
{
"__id__": 62
},
{
"__id__": 65
}
],
"_active": false,
"_components": [
{
"__id__": 64
"__id__": 79
}
],
"_prefab": null,
......@@ -2872,8 +2786,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 576,
"height": 576
"width": 1280,
"height": 720
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -2907,56 +2821,27 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "2evjqfRs9Gnp6hck6/LUyz"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 63
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "45d79668-f606-4017-a94e-55644dc93641"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "b6fPUuAPNPr4SFEpZIYskr"
"_id": "20hsN1A8lMbIxESD5HRUcG"
},
{
"__type__": "cc.Node",
"_name": "star",
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 59
"__id__": 61
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 66
"__id__": 63
},
{
"__id__": 64
}
],
"_prefab": null,
"_opacity": 255,
"_opacity": 187,
"_color": {
"__type__": "cc.Color",
"r": 255,
......@@ -2966,8 +2851,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1180,
"height": 709
"width": 2000,
"height": 2000
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -3001,14 +2886,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "db49KvvkFCrJ/ePgbn0Ern"
"_id": "29SgP3NY5Az48p4VZS3zR+"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 65
"__id__": 62
},
"_enabled": true,
"_materials": [
......@@ -3016,115 +2901,13 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_armatureName": "Armature",
"_animationName": "normal",
"_preCacheMode": 0,
"_cacheMode": 0,
"playTimes": 1,
"premultipliedAlpha": false,
"_armatureKey": "dd7f3155-7097-4fde-9485-63143c0a0969#449f362f-8125-487a-b452-10ea36b16144",
"_accTime": 0,
"_playCount": 0,
"_frameCache": null,
"_curFrame": null,
"_playing": false,
"_armatureCache": null,
"_N$dragonAsset": {
"__uuid__": "dd7f3155-7097-4fde-9485-63143c0a0969"
},
"_N$dragonAtlasAsset": {
"__uuid__": "449f362f-8125-487a-b452-10ea36b16144"
},
"_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 1,
"_N$_defaultCacheMode": 0,
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "878liw1zBMaZARNFNwz5EF"
},
{
"__type__": "cc.Node",
"_name": "apple",
"_objFlags": 0,
"_parent": {
"__id__": 59
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 68
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 40,
"height": 36
},
"_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": "14SD83zF1Nz5NtrjXKjn3A"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 67
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061"
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
},
"_type": 0,
"_sizeMode": 1,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
......@@ -3135,23 +2918,23 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "ddLgkrLfRLZqG3H1IW5m7S"
"_id": "301JLmjsNC0JWR6kqXz5Ay"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 59
"__id__": 62
},
"_enabled": true,
"alignMode": 2,
"alignMode": 1,
"_target": null,
"_alignFlags": 45,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_left": -360,
"_right": -360,
"_top": -640,
"_bottom": -640,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
......@@ -3160,29 +2943,32 @@
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 100,
"_originalHeight": 100,
"_id": "ac8X+QIhhDbqqqh/k/3K22"
"_originalWidth": 2,
"_originalHeight": 2,
"_id": "1dPxoHGC9GhLIuEgBQ5wnn"
},
{
"__type__": "cc.Node",
"_name": "confirmLayer",
"_name": "confirm_bg",
"_objFlags": 0,
"_parent": {
"__id__": 7
"__id__": 61
},
"_children": [
{
"__id__": 71
"__id__": 66
},
{
"__id__": 74
"__id__": 68
},
{
"__id__": 73
}
],
"_active": false,
"_active": true,
"_components": [
{
"__id__": 88
"__id__": 78
}
],
"_prefab": null,
......@@ -3196,8 +2982,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1280,
"height": 720
"width": 684,
"height": 244
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -3231,38 +3017,35 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "20hsN1A8lMbIxESD5HRUcG"
"_id": "24Zl1MP11Mt6VlqPvlG3rl"
},
{
"__type__": "cc.Node",
"_name": "bg",
"_name": "label",
"_objFlags": 0,
"_parent": {
"__id__": 70
"__id__": 65
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 72
},
{
"__id__": 73
"__id__": 67
}
],
"_prefab": null,
"_opacity": 187,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"r": 67,
"g": 67,
"b": 67,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 2000,
"height": 2000
"width": 587.23,
"height": 50.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -3274,7 +3057,7 @@
"ctor": "Float64Array",
"array": [
0,
0,
28.468,
0,
0,
0,
......@@ -3296,14 +3079,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "29SgP3NY5Az48p4VZS3zR+"
"_id": "0bvMuqg3VOuIQMU3+Z2Awv"
},
{
"__type__": "cc.Sprite",
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 71
"__id__": 66
},
"_enabled": true,
"_materials": [
......@@ -3313,72 +3096,43 @@
],
"_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": "301JLmjsNC0JWR6kqXz5Ay"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 71
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 45,
"_left": -360,
"_right": -360,
"_top": -640,
"_bottom": -640,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 2,
"_originalHeight": 2,
"_id": "1dPxoHGC9GhLIuEgBQ5wnn"
"_string": "LabelLabelLabelLabelLabelLabel",
"_N$string": "LabelLabelLabelLabelLabelLabel",
"_fontSize": 40,
"_lineHeight": 40,
"_enableWrapText": true,
"_N$file": null,
"_isSystemFontUsed": false,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "3d1fpXLglCapPWPHy7t8Zv"
},
{
"__type__": "cc.Node",
"_name": "confirm_bg",
"_name": "btn_no",
"_objFlags": 0,
"_parent": {
"__id__": 70
"__id__": 65
},
"_children": [
{
"__id__": 75
},
{
"__id__": 77
},
{
"__id__": 82
"__id__": 69
}
],
"_active": true,
"_components": [
{
"__id__": 87
"__id__": 71
},
{
"__id__": 72
}
],
"_prefab": null,
......@@ -3392,8 +3146,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 684,
"height": 244
"width": 158,
"height": 60
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -3404,8 +3158,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
-148,
-53,
0,
0,
0,
......@@ -3427,184 +3181,20 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "24Zl1MP11Mt6VlqPvlG3rl"
"_id": "0f1T6DNhBOHY8hHqUk9ZAE"
},
{
"__type__": "cc.Node",
"_name": "label",
"_name": "New Label",
"_objFlags": 0,
"_parent": {
"__id__": 74
"__id__": 68
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 76
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 67,
"g": 67,
"b": 67,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 587.23,
"height": 50.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
28.468,
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": "0bvMuqg3VOuIQMU3+Z2Awv"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 75
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "LabelLabelLabelLabelLabelLabel",
"_N$string": "LabelLabelLabelLabelLabelLabel",
"_fontSize": 40,
"_lineHeight": 40,
"_enableWrapText": true,
"_N$file": null,
"_isSystemFontUsed": false,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "3d1fpXLglCapPWPHy7t8Zv"
},
{
"__type__": "cc.Node",
"_name": "btn_no",
"_objFlags": 0,
"_parent": {
"__id__": 74
},
"_children": [
{
"__id__": 78
}
],
"_active": true,
"_components": [
{
"__id__": 80
},
{
"__id__": 81
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 158,
"height": 60
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-148,
-53,
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": "0f1T6DNhBOHY8hHqUk9ZAE"
},
{
"__type__": "cc.Node",
"_name": "New Label",
"_objFlags": 0,
"_parent": {
"__id__": 77
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 79
"__id__": 70
}
],
"_prefab": null,
......@@ -3660,7 +3250,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 78
"__id__": 69
},
"_enabled": true,
"_materials": [
......@@ -3693,7 +3283,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 77
"__id__": 68
},
"_enabled": true,
"_materials": [
......@@ -3725,7 +3315,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 77
"__id__": 68
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3786,7 +3376,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 77
"__id__": 68
},
"_id": "c0Mfl8X79DsqvxMASeT7S5"
},
......@@ -3795,20 +3385,20 @@
"_name": "btn_yes",
"_objFlags": 0,
"_parent": {
"__id__": 74
"__id__": 65
},
"_children": [
{
"__id__": 83
"__id__": 74
}
],
"_active": true,
"_components": [
{
"__id__": 85
"__id__": 76
},
{
"__id__": 86
"__id__": 77
}
],
"_prefab": null,
......@@ -3864,13 +3454,13 @@
"_name": "New Label",
"_objFlags": 0,
"_parent": {
"__id__": 82
"__id__": 73
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 84
"__id__": 75
}
],
"_prefab": null,
......@@ -3926,7 +3516,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 83
"__id__": 74
},
"_enabled": true,
"_materials": [
......@@ -3959,7 +3549,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 82
"__id__": 73
},
"_enabled": true,
"_materials": [
......@@ -3991,7 +3581,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 82
"__id__": 73
},
"_enabled": true,
"_normalMaterial": null,
......@@ -4052,7 +3642,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 82
"__id__": 73
},
"_id": "6aiQPNDmFJLareQY/Hy1Yf"
},
......@@ -4061,7 +3651,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 74
"__id__": 65
},
"_enabled": true,
"_materials": [
......@@ -4093,7 +3683,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 70
"__id__": 61
},
"_enabled": true,
"alignMode": 1,
......@@ -4124,7 +3714,7 @@
},
"_children": [
{
"__id__": 90
"__id__": 81
}
],
"_active": false,
......@@ -4182,13 +3772,13 @@
"_name": "win",
"_objFlags": 0,
"_parent": {
"__id__": 89
"__id__": 80
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 91
"__id__": 82
}
],
"_prefab": null,
......@@ -4244,7 +3834,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 90
"__id__": 81
},
"_enabled": true,
"_clip": {
......@@ -4267,19 +3857,19 @@
},
"_children": [
{
"__id__": 93
"__id__": 84
},
{
"__id__": 96
"__id__": 87
},
{
"__id__": 117
"__id__": 108
}
],
"_active": false,
"_components": [
{
"__id__": 121
"__id__": 112
}
],
"_prefab": null,
......@@ -4335,16 +3925,16 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 92
"__id__": 83
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 94
"__id__": 85
},
{
"__id__": 95
"__id__": 86
}
],
"_prefab": null,
......@@ -4400,7 +3990,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 93
"__id__": 84
},
"_enabled": true,
"_materials": [
......@@ -4432,7 +4022,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 93
"__id__": 84
},
"_enabled": true,
"alignMode": 1,
......@@ -4459,26 +4049,26 @@
"_name": "active_bg",
"_objFlags": 0,
"_parent": {
"__id__": 92
"__id__": 83
},
"_children": [
{
"__id__": 97
"__id__": 88
},
{
"__id__": 99
"__id__": 90
},
{
"__id__": 110
"__id__": 101
}
],
"_active": true,
"_components": [
{
"__id__": 115
"__id__": 106
},
{
"__id__": 116
"__id__": 107
}
],
"_prefab": null,
......@@ -4534,13 +4124,13 @@
"_name": "label",
"_objFlags": 0,
"_parent": {
"__id__": 96
"__id__": 87
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 98
"__id__": 89
}
],
"_prefab": null,
......@@ -4596,7 +4186,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 97
"__id__": 88
},
"_enabled": true,
"_materials": [
......@@ -4629,23 +4219,23 @@
"_name": "active_input",
"_objFlags": 0,
"_parent": {
"__id__": 96
"__id__": 87
},
"_children": [
{
"__id__": 100
"__id__": 91
},
{
"__id__": 103
"__id__": 94
},
{
"__id__": 106
"__id__": 97
}
],
"_active": true,
"_components": [
{
"__id__": 109
"__id__": 100
}
],
"_prefab": null,
......@@ -4701,16 +4291,16 @@
"_name": "BACKGROUND_SPRITE",
"_objFlags": 512,
"_parent": {
"__id__": 99
"__id__": 90
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 101
"__id__": 92
},
{
"__id__": 102
"__id__": 93
}
],
"_prefab": null,
......@@ -4766,7 +4356,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 100
"__id__": 91
},
"_enabled": true,
"_materials": [
......@@ -4798,7 +4388,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 100
"__id__": 91
},
"_enabled": true,
"alignMode": 0,
......@@ -4825,16 +4415,16 @@
"_name": "TEXT_LABEL",
"_objFlags": 512,
"_parent": {
"__id__": 99
"__id__": 90
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 104
"__id__": 95
},
{
"__id__": 105
"__id__": 96
}
],
"_prefab": null,
......@@ -4890,7 +4480,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 103
"__id__": 94
},
"_enabled": true,
"_materials": [
......@@ -4923,7 +4513,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 103
"__id__": 94
},
"_enabled": true,
"alignMode": 0,
......@@ -4950,16 +4540,16 @@
"_name": "PLACEHOLDER_LABEL",
"_objFlags": 512,
"_parent": {
"__id__": 99
"__id__": 90
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 107
"__id__": 98
},
{
"__id__": 108
"__id__": 99
}
],
"_prefab": null,
......@@ -5015,7 +4605,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 106
"__id__": 97
},
"_enabled": true,
"_materials": [
......@@ -5048,7 +4638,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 106
"__id__": 97
},
"_enabled": true,
"alignMode": 0,
......@@ -5075,7 +4665,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 99
"__id__": 90
},
"_enabled": true,
"_string": "",
......@@ -5087,13 +4677,13 @@
"editingDidEnded": [],
"editingReturn": [],
"_N$textLabel": {
"__id__": 104
"__id__": 95
},
"_N$placeholderLabel": {
"__id__": 107
"__id__": 98
},
"_N$background": {
"__id__": 101
"__id__": 92
},
"_N$inputFlag": 5,
"_N$inputMode": 6,
......@@ -5105,20 +4695,20 @@
"_name": "active",
"_objFlags": 0,
"_parent": {
"__id__": 96
"__id__": 87
},
"_children": [
{
"__id__": 111
"__id__": 102
}
],
"_active": true,
"_components": [
{
"__id__": 113
"__id__": 104
},
{
"__id__": 114
"__id__": 105
}
],
"_prefab": null,
......@@ -5174,13 +4764,13 @@
"_name": "New Label",
"_objFlags": 0,
"_parent": {
"__id__": 110
"__id__": 101
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 112
"__id__": 103
}
],
"_prefab": null,
......@@ -5236,7 +4826,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 111
"__id__": 102
},
"_enabled": true,
"_materials": [
......@@ -5269,7 +4859,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 110
"__id__": 101
},
"_enabled": true,
"_materials": [
......@@ -5301,7 +4891,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 110
"__id__": 101
},
"_enabled": true,
"_normalMaterial": null,
......@@ -5362,7 +4952,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 110
"__id__": 101
},
"_id": "2bfnrADYRFv7/n6Gse22nx"
},
......@@ -5371,7 +4961,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 96
"__id__": 87
},
"_enabled": true,
"_materials": [
......@@ -5403,7 +4993,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 96
"__id__": 87
},
"_enabled": true,
"_normalMaterial": null,
......@@ -5471,19 +5061,19 @@
"_name": "close",
"_objFlags": 0,
"_parent": {
"__id__": 92
"__id__": 83
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 118
"__id__": 109
},
{
"__id__": 119
"__id__": 110
},
{
"__id__": 120
"__id__": 111
}
],
"_prefab": null,
......@@ -5539,7 +5129,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 117
"__id__": 108
},
"_enabled": true,
"_materials": [
......@@ -5571,7 +5161,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 117
"__id__": 108
},
"_enabled": true,
"alignMode": 1,
......@@ -5598,7 +5188,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 117
"__id__": 108
},
"_enabled": true,
"_normalMaterial": null,
......@@ -5659,7 +5249,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 117
"__id__": 108
},
"_id": "b2SwOkSZ9C74Pi/2okqcPU"
},
......@@ -5668,7 +5258,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 92
"__id__": 83
},
"_enabled": true,
"alignMode": 1,
......@@ -5699,7 +5289,7 @@
},
"_children": [
{
"__id__": 123
"__id__": 114
}
],
"_active": false,
......@@ -5757,7 +5347,7 @@
"_name": "BtnOpen",
"_objFlags": 0,
"_parent": {
"__id__": 122
"__id__": 113
},
"_children": [],
"_active": true,
......@@ -5821,10 +5411,10 @@
"_active": false,
"_components": [
{
"__id__": 125
"__id__": 116
},
{
"__id__": 126
"__id__": 117
}
],
"_prefab": null,
......@@ -5880,7 +5470,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 124
"__id__": 115
},
"_enabled": true,
"_materials": [
......@@ -5913,7 +5503,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 124
"__id__": 115
},
"_enabled": true,
"alignMode": 1,
......@@ -5935,6 +5525,491 @@
"_originalHeight": 0,
"_id": "2fAw3kDz9Nr4NeXnq0G/fp"
},
{
"__type__": "cc.Node",
"_name": "Destroyer",
"_objFlags": 0,
"_parent": {
"__id__": 7
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 119
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 0,
"height": 0
},
"_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": "d0nM2HmM5GJLDnU1Y6GAnj"
},
{
"__type__": "64492tHXlJErbgscxgpzKXV",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 118
},
"_enabled": true,
"_id": "e282ye5o1FbbV8mH77WabH"
},
{
"__type__": "cc.Node",
"_name": "tipsLayer",
"_objFlags": 0,
"_parent": {
"__id__": 7
},
"_children": [
{
"__id__": 121
},
{
"__id__": 124
}
],
"_active": false,
"_components": [
{
"__id__": 128
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1280,
"height": 720
},
"_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": "8dpIhzuitKjLurWo/y+zqQ"
},
{
"__type__": "cc.Node",
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 120
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 122
},
{
"__id__": 123
}
],
"_prefab": null,
"_opacity": 0,
"_color": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1280,
"height": 720
},
"_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": "ccrzoppA9P3Jxmw63M2SK2"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 121
},
"_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": "c48X7gXABAUKUb5HwLkjQB"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 121
},
"_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": 2,
"_originalHeight": 2,
"_id": "6e0q1iDfpDZ7oBFcQZ5i8T"
},
{
"__type__": "cc.Node",
"_name": "tips",
"_objFlags": 0,
"_parent": {
"__id__": 120
},
"_children": [
{
"__id__": 125
}
],
"_active": true,
"_components": [
{
"__id__": 127
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 398,
"height": 172
},
"_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": "bc+NX8srtGCpx8x3MHUErI"
},
{
"__type__": "cc.Node",
"_name": "label",
"_objFlags": 0,
"_parent": {
"__id__": 124
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 126
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 587.23,
"height": 50.4
},
"_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": "3azAiHeUBNDK9qvDCJVcIo"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 125
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "LabelLabelLabelLabelLabelLabel",
"_N$string": "LabelLabelLabelLabelLabelLabel",
"_fontSize": 40,
"_lineHeight": 40,
"_enableWrapText": true,
"_N$file": null,
"_isSystemFontUsed": false,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "4e+eKpO8ZAGpll0BY9jZOn"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 124
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "e1f510a2-a688-49f7-8de5-9501732f9e31"
},
"_type": 1,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "ffhjvN3nlAF7lGhW+hmTcV"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 120
},
"_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": "b3B9SCYStJNpe7QmCD2vYN"
},
{
"__type__": "d98e34LKINGEIpG3utycEds",
"_name": "",
......
cc.Class({
extends: cc.Component,
start() {
this.middleLayer = cc.find('middleLayer').getComponent('middleLayer');
},
onDestroy() {
this.middleLayer.clearDragonDisplayAssetList();
}
});
{
"ver": "1.0.8",
"uuid": "64492b47-5e52-44ad-b82c-731829cca5d5",
"isPlugin": false,
"loadPluginInWeb": true,
"loadPluginInNative": true,
"loadPluginInEditor": false,
"subMetas": {}
}
\ No newline at end of file
......@@ -40,32 +40,47 @@ export default class NewClass extends middleLayerBase {
(<any>window).air = {};
}
(<any>window).air.hideAirClassLoading = () => {
console.log('汪汪汪');
(<any>window).air.onCourseInScreen && (<any>window).air.onCourseInScreen(() => {
if ((<any>window).air.onCourseInScreen) {
(<any>window).air.onCourseInScreen(() => {
console.log("***成功调用onCourseInScreen***");
(<any>window).air.onCourseInScreen = null;
this.hideWaitingLetters();
this.hideMask();
});
} else {
this.hideWaitingLetters();
this.hideMask();
}
}
}
tipsTween = null;
async showTips(str: string) {
const tipsLayer = cc.find('middleLayer/tipsLayer');
if (this.tipsTween) {
this.tipsTween.stop();
tipsLayer.active = false;
}
const label = cc.find('middleLayer/tipsLayer/tips/label');
label.getComponent(cc.Label).string = ` ${str} `;
const tips = cc.find('middleLayer/tipsLayer/tips');
tipsLayer.active = true;
tips.width = Math.max(300, label.width + 50);
cc.tween(tips)
this.tipsTween = cc.tween(tips)
.set({ opacity: 255 })
.to(2, { opacity: 0 })
.to(5, { opacity: 0 })
.call(() => {
tipsLayer.active = false;
this.tipsTween = null;
})
.start();
}
async showConfirm(str: string, yesFun: Function = null, noFun: Function = null) {
if (this.IS_BUNDLE_LOADING) {
return;
}
const tipsLayer = cc.find('middleLayer/confirmLayer');
const label = cc.find('middleLayer/confirmLayer/confirm_bg/label');
label.getComponent(cc.Label).string = ` ${str} `;
......@@ -89,17 +104,22 @@ export default class NewClass extends middleLayerBase {
});
}
async showActiveWindow() {
if (this.IS_BUNDLE_LOADING) {
return;
}
const tipsLayer = cc.find('middleLayer/activeLayer');
tipsLayer.active = true;
}
version = null;
isDev = null;
type = null;
engine_uuid = null;
async checkVersion() {
const { forceUpdateVersionName: onlineVersion, forceUpdateStoreList, forceUpdate } = await this.getOnlineVersion();
const nativeVersion = await this.getNativeVersion();
this.version = nativeVersion;
if (onlineVersion != '' && onlineVersion != nativeVersion && forceUpdate!=0) {
if (onlineVersion != '' && onlineVersion != nativeVersion && forceUpdate!=0 && this.type!='aixuebao') {
console.log('onlineVersion = ' + onlineVersion);
console.log('nativeVersion = ' + nativeVersion);
......@@ -108,9 +128,11 @@ export default class NewClass extends middleLayerBase {
}
async getNativeVersion() {
const engineInfo = await this.getEngineInfo();
const { version, isDev } = JSON.parse(engineInfo);
const { version, isDev, type, uuid, mac } = JSON.parse(engineInfo);
this.version = version;
this.isDev = isDev;
this.type = type;
this.engine_uuid = mac || uuid;
return this.version;
}
......@@ -127,7 +149,7 @@ export default class NewClass extends middleLayerBase {
}
const res: any = await this.asyncCallNetworkApiGet('/api/application/v1/checkVersion', {
pkg_name: 'com.iplayabc.oxford',
pkg_name: 'com.iplayabc.oxford.lite',
platform: platform
});
return JSON.parse(res).data;
......@@ -277,6 +299,7 @@ export default class NewClass extends middleLayerBase {
score: data ? data.score : 0,
result: JSON.stringify(data),
study_duration: Date.now() - this.courseOpenTimeStamp,
is_folder_end: (this.courseIndex == this.courses.length - 1) ? 1 : 0
});
callback && callback(res);
}
......@@ -299,9 +322,6 @@ export default class NewClass extends middleLayerBase {
}
async pdtdFinishHandler() {
(<any>window).courseware.freeAllOcMethod();
if (!this.getData("syllabus_path") || this.getData("syllabus_path").type !== "pdtd") {
// 不是拼读天地的学习内容
return;
......@@ -497,6 +517,7 @@ export default class NewClass extends middleLayerBase {
});
} else {
this.showTips("用户信息过期,请重新登录!");
this.IS_BUNDLE_LOADING = false;
this.loadOnlineBundle('NJ_login');
callback && callback(false);
}
......@@ -504,7 +525,12 @@ export default class NewClass extends middleLayerBase {
}
// 重写loadOnlineBundle方法;主要是对一些必要的页面跳转做一些拦截处理
loadOnlineBundle(bundleName) {
loadOnlineBundle(bundleName, callback = null) {
if (this.IS_BUNDLE_LOADING) {
return;
}
this.IS_BUNDLE_LOADING = true;
console.log(" in loadOnlineBundle")
cc.find('middleLayer/BtnRight').active = false;
cc.find('middleLayer/BtnLeft').active = false;
cc.find('middleLayer/ExitBtn').active = false;
......@@ -513,21 +539,31 @@ export default class NewClass extends middleLayerBase {
this.data = {};
cc.sys.localStorage.setItem("token", "");
}
this.callNetworkApiGet(`/api/template/v1/${bundleName}`, {}, (datastr) => {
const data = JSON.parse(datastr);
let configData = null;
this.callNetworkApiGet(`/api/template/v2/${bundleName}`, {}, (datastr) => {
const data = JSON.parse(datastr).data;
let sceneName, version, bondleUrl = "";
const templateBaseUrl = `${this.DOMAIN}h5template/${data.name}/v${data.last_version}`;
this.getConfigInfo(templateBaseUrl, (conf) => {
if (cc.sys.os == cc.sys.OS_IOS) {
configData = data.data.conf.ios;
sceneName = conf.ios.sceneName;
version = conf.ios.version;
bondleUrl = `${templateBaseUrl}/ios/${conf.ios.sceneName}`;
} else if (cc.sys.os == cc.sys.OS_ANDROID) {
configData = data.data.conf.android;
sceneName = conf.android.sceneName;
version = conf.android.version;
bondleUrl = `${templateBaseUrl}/android/${conf.android.sceneName}`;
} else {
configData = data.data.conf.web_desktop;
sceneName = conf.android.sceneName;
version = "";
bondleUrl = `${templateBaseUrl}/web_desktop`;
}
const sceneName = configData.sceneName;
const version = configData.version;
const bondleUrl = configData.bondleUrl;
this.loadBundle(sceneName, version, bondleUrl);
this.loadBundle(sceneName, version, bondleUrl, callback);
});
});
}
// 重写loadPageBundle方法;主要是添加上报记录“上次学习位置”
......@@ -537,21 +573,25 @@ export default class NewClass extends middleLayerBase {
return;
}
let sceneName, version, bondleUrl = "";
const templateBaseUrl = `${this.DOMAIN}h5template/${this.courseItem.template_name}/v${this.courseItem.last_version}`;
this.getConfigInfo(templateBaseUrl, (conf) => {
if (cc.sys.os == cc.sys.OS_IOS) {
sceneName = this.courseItem.conf.ios.sceneName;
version = this.courseItem.conf.ios.version;
bondleUrl = this.courseItem.conf.ios.bondleUrl;
sceneName = conf.ios.sceneName;
version = conf.ios.version;
bondleUrl = `${templateBaseUrl}/ios/${conf.ios.sceneName}`;
} else if (cc.sys.os == cc.sys.OS_ANDROID) {
sceneName = this.courseItem.conf.android.sceneName;
version = this.courseItem.conf.android.version;
bondleUrl = this.courseItem.conf.android.bondleUrl;
sceneName = conf.android.sceneName;
version = conf.android.version;
bondleUrl = `${templateBaseUrl}/android/${conf.ios.sceneName}`;
} else {
sceneName = this.courseItem.conf.web_desktop.sceneName;
version = this.courseItem.conf.web_desktop.version;
bondleUrl = this.courseItem.conf.web_desktop.bondleUrl;
sceneName = conf.android.sceneName;
version = "";
bondleUrl = `${templateBaseUrl}/web_desktop`;
}
this.loadBundle(sceneName, version, bondleUrl, callback);
});
});
}
......@@ -611,7 +651,7 @@ export default class NewClass extends middleLayerBase {
this.data["syllabus_path"].type = "pdtd";
this.data["syllabus_path"].type_id = data;
}
if (key === "NJ_QianShuiTing" || key === "NJ_ShaMo" || key === "NJ_NongChang") {
if (key === "NJ_QianShuiTing" || key === "NJ_ShaMo" || key === "NJ_NongChang" || key === "NJ_XueShan" || key === "NJ_TianKong") {
this.data["syllabus_path"].level_id = data;
}
if (key === "NJ_game_select") {
......@@ -669,7 +709,6 @@ export default class NewClass extends middleLayerBase {
cc.find('middleLayer/BtnLeft').active = false;
cc.find('middleLayer/ExitBtn').active = false;
this.showMask();
this.showWaitingLetters();
this.onMiddleLayerLoadingFinish();
......@@ -683,7 +722,6 @@ export default class NewClass extends middleLayerBase {
} else {
this.loadOnlineBundle('NJ_login');
}
this.initListener();
}
......@@ -715,6 +753,10 @@ export default class NewClass extends middleLayerBase {
this.loadOnlineBundle('NJ_ShaMo');
} else if (idx == '2') {
this.loadOnlineBundle('NJ_NongChang');
} else if (idx == '3') {
this.loadOnlineBundle('NJ_XueShan');
} else if (idx == '4') {
this.loadOnlineBundle('NJ_TianKong');
}
} else {
this.loadOnlineBundle('NJ_MoreGames_CourseList');
......@@ -754,7 +796,9 @@ export default class NewClass extends middleLayerBase {
return;
}
this.showConfirm("确定跳过吗?", () => {
if (!this.isShowWaiting) {
this.goNextPage();
}
});
});
buttonOnClick(cc.find('middleLayer/BtnLeft'), () => {
......@@ -776,11 +820,12 @@ export default class NewClass extends middleLayerBase {
kid_id: kidInfo.id, book_code: activeCode, token: cc.sys.localStorage.getItem('token')
});
if (res && res.code == 200) {
this.showTips("激活成功");
this.showTips(res.msg);
cc.find('middleLayer/activeLayer').active = false;
input.textLabel.string = "";
this.reloadBundle();
} else {
this.showTips(`激活失败:${res}`);
this.showTips(res.msg);
}
});
......@@ -822,8 +867,5 @@ export default class NewClass extends middleLayerBase {
initAir(this);
this.reWriteAir();
this.reportErrorLog();
// 测试定位使用的
// this.playGetParterAnim();
}
}
import { asyncDelay } from "./util";
import { asyncDelay, randomSortByArr } from "./util";
export abstract class middleLayerBase extends cc.Component {
......@@ -8,7 +8,8 @@ export abstract class middleLayerBase extends cc.Component {
abstract hideWaitingLetters(): void;
abstract showWaitingLetters(): void;
private oldSceneName = null;
oldSceneName = null;
IS_BUNDLE_LOADING = false;
onMiddleLayerLoadingFinish() {
if (cc.sys.isNative && cc.sys.os == cc.sys.OS_IOS) {
......@@ -66,12 +67,30 @@ export abstract class middleLayerBase extends cc.Component {
});
}
getConfigInfo(url, callback) {
const xhr = new XMLHttpRequest();
xhr.onreadystatechange = () => {
if (xhr.readyState == 4 && (xhr.status >= 200 && xhr.status < 400)) {
callback(JSON.parse(xhr.responseText));
}
};
console.warn('url = ' + `${url}/config.json`);
xhr.open('GET', `${url}/config.json`, true);
xhr.send();
}
ORG_ID;
DOMAIN;
async getBaseUrl(callback) {
const engineInfo = await this.getEngineInfo();
const { isDev } = JSON.parse(engineInfo);
if (isDev == 1) {
this.ORG_ID = 507;
this.DOMAIN = "http://staging-teach.cdn.ireadabc.com/";
callback('http://staging-openapi.iteachabc.com');
} else {
this.ORG_ID = 507;
this.DOMAIN = "http://teach.cdn.ireadabc.com/";
callback('http://openapi.iteachabc.com');
}
}
......@@ -102,38 +121,74 @@ export abstract class middleLayerBase extends cc.Component {
});
}
loadOnlineBundle(bundleName) {
loadOnlineBundle(bundleName, callback = null) {
if (this.IS_BUNDLE_LOADING) {
return;
}
this.IS_BUNDLE_LOADING = true;
cc.find('middleLayer/BtnRight').active = false;
cc.find('middleLayer/BtnLeft').active = false;
cc.find('middleLayer/ExitBtn').active = false;
this.callNetworkApiGet(`/api/template/v1/${bundleName}`, {}, (datastr) => {
const data = JSON.parse(datastr);
let configData = null;
this.callNetworkApiGet(`/api/template/v2/${bundleName}`, {}, (datastr) => {
const data = JSON.parse(datastr).data;
let sceneName, version, bondleUrl = "";
const templateBaseUrl = `${this.DOMAIN}h5template/${data.name}/v${data.last_version}`;
this.getConfigInfo(templateBaseUrl, (conf) => {
if (cc.sys.os == cc.sys.OS_IOS) {
configData = data.data.conf.ios;
sceneName = conf.ios.sceneName;
version = conf.ios.version;
bondleUrl = `${templateBaseUrl}/ios/${conf.ios.sceneName}`;
} else if (cc.sys.os == cc.sys.OS_ANDROID) {
configData = data.data.conf.android;
sceneName = conf.android.sceneName;
version = conf.android.version;
bondleUrl = `${templateBaseUrl}/android/${conf.ios.sceneName}`;
} else {
configData = data.data.conf.web_desktop;
sceneName = conf.android.sceneName;
version = "";
bondleUrl = `${templateBaseUrl}/web_desktop`;
}
const sceneName = configData.sceneName;
const version = configData.version;
const bondleUrl = configData.bondleUrl;
this.loadBundle(sceneName, version, bondleUrl);
this.loadBundle(sceneName, version, bondleUrl, callback);
});
});
}
currentBundleInfo = null;
loadBundleLock = false; // 未加载完成禁止新的加载
reloadBundle() {
if (this.IS_BUNDLE_LOADING) {
return;
}
this.IS_BUNDLE_LOADING = true;
const { sceneName, version, bondleUrl } = this.currentBundleInfo;
this.loadBundle(sceneName, version, bondleUrl);
}
async loadBundle(sceneName, version, bondleUrl, callback = null) {
if (this.oldSceneName) {
await this.checkRotateScreen(this.oldSceneName, sceneName);
}
this.assetList = [];
this.textureList = [];
this.assetObj = {};
this.atlasList = [];
this.nodeList = [];
this.getDragonDisplayAssetList(cc.find('Canvas'));
this.loadBundleLock = true; // 加锁
this.currentBundleInfo = { sceneName, version, bondleUrl };
this.showMask();
this.showWaitingLetters();
cc.audioEngine.stopAll();
this.setNodeListVisible();
// 手机端强制垃圾回收
if (cc.sys.os == cc.sys.OS_IOS || cc.sys.os == cc.sys.OS_ANDROID) {
cc.sys.garbageCollect();
}
const oldSceneName = this.oldSceneName; //this.currentBundleInfo?.sceneName;
const engineInfo = await this.getEngineInfo();
......@@ -143,10 +198,6 @@ export abstract class middleLayerBase extends cc.Component {
if (isChanged || (cc.sys.isNative && cc.sys.os == cc.sys.OS_IOS)) {
await this.checkRotateScreen(oldSceneName, sceneName);
}
// if (oldSceneName && (isChanged || true)) {
// await this.checkRotateScreen(oldSceneName, sceneName);
// }
const middleLayer = cc.find('middleLayer');
if (!middleLayer['baseW']) {
middleLayer['baseW'] = middleLayer.width;
......@@ -154,39 +205,40 @@ export abstract class middleLayerBase extends cc.Component {
cc.assetManager.loadBundle(bondleUrl, { version: version }, async (err, bundle) => {
bundle.loadScene(sceneName, null, null, (err, scene) => {
cc.audioEngine.stopAll();
this.loadBundleLock = false; // 加载完成 解锁
this.courseOpenTimeStamp = Date.now();
cc.director.runScene(scene, null, async () => {
cc.director.runScene(scene, null, () => {
console.log('sceneName = ' + sceneName);
const canvas = cc.find('Canvas');
cc.find('middleLayer/tipsLayer').active = false;
middleLayer.scale = canvas.width / middleLayer['baseW'];
canvas.getComponent(cc.Widget).updateAlignment();
// 挂载清洁骨骼机制节点
const destroyer = cc.instantiate(cc.find('middleLayer/Destroyer'));
destroyer.parent = cc.find('Canvas');
destroyer.active = true;
// 手机端强制垃圾回收
if (cc.sys.os == cc.sys.OS_IOS || cc.sys.os == cc.sys.OS_ANDROID) {
cc.sys.garbageCollect();
}
callback && callback();
this.oldSceneName = sceneName
this.IS_BUNDLE_LOADING = false;
this.oldSceneName = sceneName;
});
});
});
}
checkRotateScreen(oldSceneName: string, newSceneName: string) {
// if (!cc.sys.isNative || cc.sys.os != cc.sys.OS_IOS) {
// // 只有IOS旋转屏
// return;
// }
const sceneNameList = ["cc_mz_link_write_03", "NJ_game_select", "OP11", "OP12", "cc_mz_link_write_01", "cc_mz_link_write_02", "OP_18"];
if (true || sceneNameList.includes(oldSceneName) || sceneNameList.includes(newSceneName)) {
if (sceneNameList.includes(oldSceneName) || sceneNameList.includes(newSceneName)) {
return new Promise((resolve, reject) => {
console.log(' in RotateScreen 1 ...')
if (true || sceneNameList.includes(newSceneName)) {
console.log(' in RotateScreen 2 ...')
if (sceneNameList.includes(newSceneName)) {
// 如果已经是竖屏了
if (cc.view.getCanvasSize().width < cc.view.getCanvasSize().height) {
resolve(null);
......@@ -200,9 +252,6 @@ export abstract class middleLayerBase extends cc.Component {
resolve(null);
});
} else {
console.log(' in RotateScreen 3 ...')
// 如果已经是横屏了
if (cc.view.getCanvasSize().width > cc.view.getCanvasSize().height) {
resolve(null);
......@@ -220,17 +269,44 @@ export abstract class middleLayerBase extends cc.Component {
}
}
setNodeListVisible() {
const setParentVisible = (n) => {
n.active = true;
if (n.parent) {
setParentVisible(n.parent);
}
}
this.nodeList.forEach(node => {
setParentVisible(node);
});
}
getUUID() {
return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
var r = Math.random() * 16 | 0,
v = c == 'x' ? r : (r & 0x3 | 0x8);
return v.toString(16);
});
}
courses = null;
courseIndex = 0;
courseItem = null;
courseOpenTimeStamp = null;
loadOnlineCourseWare(courseId, linkFlag = false, coursewareId = null) {
if (this.IS_BUNDLE_LOADING) {
return;
}
this.IS_BUNDLE_LOADING = true;
this.showWaitingLetters();
let api = `/api/courseware/v1/${courseId}/list`;
let api = `/api/courseware/v2/${courseId}/list`;
if (linkFlag === true) {
api = `/api/courseware/v1/${courseId}/eq/level/list`;
api = `/api/courseware/v2/${courseId}/eq/level/list`;
}
this.callNetworkApiGet(api, {}, (datastr) => {
const data = JSON.parse(datastr);
if (data.rows && data.rows.length > 0) {
......@@ -244,8 +320,10 @@ export abstract class middleLayerBase extends cc.Component {
} else {
this.hideWaitingLetters();
this.showTips(`内容还未制作`);
this.IS_BUNDLE_LOADING = false;
return;
}
this.loadPageBundle(() => {
if (this.courses && this.courses.length > 1 && this.courseIndex < this.courses.length - 1) {
cc.find('middleLayer/BtnRight').active = true;
} else {
......@@ -254,42 +332,53 @@ export abstract class middleLayerBase extends cc.Component {
if (this.courseIndex > 0) {
cc.find('middleLayer/BtnLeft').active = false;
}
this.reWriteAir();
this.loadPageBundle(() => {
cc.find('middleLayer/ExitBtn').active = true;
});
});
}
loadPageBundle(callback = null) {
console.log(" in loadPageBundle");
let sceneName, version, bondleUrl = "";
const templateBaseUrl = `${this.DOMAIN}h5template/${this.courseItem.template_name}/v${this.courseItem.last_version}`;
this.getConfigInfo(templateBaseUrl, (conf) => {
if (cc.sys.os == cc.sys.OS_IOS) {
sceneName = this.courseItem.conf.ios.sceneName;
version = this.courseItem.conf.ios.version;
bondleUrl = this.courseItem.conf.ios.bondleUrl;
sceneName = conf.ios.sceneName;
version = conf.ios.version;
bondleUrl = `${templateBaseUrl}/ios/${conf.ios.sceneName}`;
} else if (cc.sys.os == cc.sys.OS_ANDROID) {
sceneName = this.courseItem.conf.android.sceneName;
version = this.courseItem.conf.android.version;
bondleUrl = this.courseItem.conf.android.bondleUrl;
sceneName = conf.android.sceneName;
version = conf.android.version;
bondleUrl = `${templateBaseUrl}/android/${conf.ios.sceneName}`;
} else {
sceneName = this.courseItem.conf.web_desktop.sceneName;
version = this.courseItem.conf.web_desktop.version;
bondleUrl = this.courseItem.conf.web_desktop.bondleUrl;
sceneName = conf.android.sceneName;
version = "";
bondleUrl = `${templateBaseUrl}/web_desktop`;
}
this.loadBundle(sceneName, version, bondleUrl, callback);
});
}
goPrePage() {
this.goTarIndexPage(this.courseIndex - 1);
}
goNextPage() {
console.log("====goNextPage====");
this.goTarIndexPage(this.courseIndex + 1);
}
goTarIndexPage(index) {
if (this.IS_BUNDLE_LOADING) {
return;
}
this.IS_BUNDLE_LOADING = true;
if (!this.courses || index == this.courseIndex || index < 0 || index > this.courses.length - 1) {
this.IS_BUNDLE_LOADING = false;
return;
}
this.showWaitingLetters();
(<any>window).courseware.freeAllOcMethod();
this.courseIndex = index;
......@@ -305,7 +394,6 @@ export abstract class middleLayerBase extends cc.Component {
log(str: string) {
console.log(str);
cc.log(str);
}
showTips(str: string) {
......@@ -333,4 +421,101 @@ export abstract class middleLayerBase extends cc.Component {
.removeSelf()
.start();
}
async clearDragonDisplayAssetList() {
if (this.atlasList.length == 0) {
return;
}
this.setNodeListVisible();
for (let i=0; i<this.atlasList.length; i++) {
const atlas = this.atlasList[i];
const asset = this.assetList[i];
const texture = this.textureList[i];
const node = this.nodeList[i];
atlas.decRef();
cc.assetManager.releaseAsset(atlas);
atlas.destroy();
asset.decRef();
cc.assetManager.releaseAsset(asset);
asset.destroy();
// node.active = false;
// node.removeFromParent();
texture.decRef();
}
}
// 原始方法
clearDragonDisplayAssetList3() {
[ ...this.atlasList , ...this.assetList].forEach(asset => {
asset.decRef();
cc.assetManager.releaseAsset(asset);
asset.destroy();
});
this.nodeList.forEach(node => {
node.active = false;
node.removeFromParent();
});
this.textureList.forEach(texture => {
texture.decRef();
});
}
assetObj = null;
nodeList = null;
atlasList = null;
assetList = null;
textureList = null;
getDragonDisplayAssetList(node) {
const dragonDisplay = node.getComponent(dragonBones.ArmatureDisplay);
if (dragonDisplay) {
const atlas = dragonDisplay.dragonAtlasAsset;
const asset = dragonDisplay.dragonAsset;
if (atlas && atlas.texture) {
if (atlas.texture.nativeUrl.includes('h5template')) {
node.children.forEach(child => {
this.getDragonDisplayAssetList(child);
});
return;
}
this.nodeList.push(node);
this.atlasList.push(atlas);
this.assetList.push(asset);
this.textureList.push(atlas.texture);
console.log('汪汪汪: atlas.texture.nativeUrl = ' + atlas.texture.nativeUrl);
}
}
node.children.forEach(child => {
this.getDragonDisplayAssetList(child);
});
}
toCleanParent() {
const canvas = cc.find("Canvas");
this.nodeList.forEach(node => {
node.parent = canvas;
});
}
}
\ No newline at end of file
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