Commit fb89326c authored by linzhiguo's avatar linzhiguo

# bugs

parent ebe4b858
...@@ -17,16 +17,16 @@ ...@@ -17,16 +17,16 @@
"__id__": 2 "__id__": 2
}, },
{ {
"__id__": 140 "__id__": 157
}, },
{ {
"__id__": 153 "__id__": 170
}, },
{ {
"__id__": 38 "__id__": 38
}, },
{ {
"__id__": 159 "__id__": 176
} }
], ],
"_active": false, "_active": false,
...@@ -105,31 +105,31 @@ ...@@ -105,31 +105,31 @@
"__id__": 28 "__id__": 28
}, },
{ {
"__id__": 111 "__id__": 128
}, },
{ {
"__id__": 118 "__id__": 135
}, },
{ {
"__id__": 125 "__id__": 142
}, },
{ {
"__id__": 132 "__id__": 149
}, },
{ {
"__id__": 133 "__id__": 150
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 137 "__id__": 154
}, },
{ {
"__id__": 138 "__id__": 155
}, },
{ {
"__id__": 139 "__id__": 156
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1388,7 +1388,7 @@ ...@@ -1388,7 +1388,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 110 "__id__": 127
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1748,31 +1748,31 @@ ...@@ -1748,31 +1748,31 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 71 "__id__": 88
}, },
{ {
"__id__": 83 "__id__": 100
}, },
{ {
"__id__": 89 "__id__": 107
}, },
{ {
"__id__": 95 "__id__": 114
}, },
{ {
"__id__": 103 "__id__": 120
}, },
{ {
"__id__": 105 "__id__": 122
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 108 "__id__": 125
}, },
{ {
"__id__": 109 "__id__": 126
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1839,6 +1839,9 @@ ...@@ -1839,6 +1839,9 @@
}, },
{ {
"__id__": 56 "__id__": 56
},
{
"__id__": 71
} }
], ],
"_active": true, "_active": true,
...@@ -3332,10 +3335,10 @@ ...@@ -3332,10 +3335,10 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "layout_area", "_name": "option_bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 37 "__id__": 38
}, },
"_children": [ "_children": [
{ {
...@@ -3349,20 +3352,22 @@ ...@@ -3349,20 +3352,22 @@
}, },
{ {
"__id__": 78 "__id__": 78
} },
],
"_active": true,
"_components": [
{ {
"__id__": 80 "__id__": 80
}, },
{ {
"__id__": 81 "__id__": 82
}, },
{ {
"__id__": 82 "__id__": 84
},
{
"__id__": 86
} }
], ],
"_active": true,
"_components": [],
"_prefab": null, "_prefab": null,
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -3374,8 +3379,8 @@ ...@@ -3374,8 +3379,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 450, "width": 0,
"height": 254 "height": 0
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -3386,8 +3391,8 @@ ...@@ -3386,8 +3391,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 526.633,
0, -287.422,
0, 0,
0, 0,
0, 0,
...@@ -3409,11 +3414,11 @@ ...@@ -3409,11 +3414,11 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "2fHGpxTu1NlL6ZKugLqKjH" "_id": "6bO7/8fkZDR6tstV3jt95B"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "bg_picture1", "_name": "bg_word1-finish",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 71 "__id__": 71
...@@ -3436,8 +3441,8 @@ ...@@ -3436,8 +3441,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 160, "width": 341,
"height": 100 "height": 102
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -3448,8 +3453,8 @@ ...@@ -3448,8 +3453,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-135, 0,
67, 0,
0, 0,
0, 0,
0, 0,
...@@ -3471,7 +3476,7 @@ ...@@ -3471,7 +3476,7 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "5ehFH+PUJKhLShCZV23CfD" "_id": "a8Bq+Iug5FLpiK/O/dQOvb"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -3489,10 +3494,10 @@ ...@@ -3489,10 +3494,10 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8f555038-53ff-4e35-93e9-adfc82dbb782" "__uuid__": "8efbd0c0-f277-4551-8a43-8bfd7032318b"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 0, "_sizeMode": 1,
"_fillType": 0, "_fillType": 0,
"_fillCenter": { "_fillCenter": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -3503,11 +3508,11 @@ ...@@ -3503,11 +3508,11 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "20++XpDBtLMbnP11G8a42G" "_id": "b22BTvbGdERpGE3ryeCgUj"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "bg_picture1 copy", "_name": "bg_picture1-finish",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 71 "__id__": 71
...@@ -3530,8 +3535,8 @@ ...@@ -3530,8 +3535,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 160, "width": 276,
"height": 100 "height": 192
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -3542,8 +3547,8 @@ ...@@ -3542,8 +3547,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
30, 0,
67, 0,
0, 0,
0, 0,
0, 0,
...@@ -3565,7 +3570,7 @@ ...@@ -3565,7 +3570,7 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "bcNWHmm2hHMbg4mU23TtLJ" "_id": "c5ujErsFRJx6sZuLe+VJSi"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -3586,7 +3591,7 @@ ...@@ -3586,7 +3591,7 @@
"__uuid__": "8f555038-53ff-4e35-93e9-adfc82dbb782" "__uuid__": "8f555038-53ff-4e35-93e9-adfc82dbb782"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 0, "_sizeMode": 1,
"_fillType": 0, "_fillType": 0,
"_fillCenter": { "_fillCenter": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -3597,11 +3602,11 @@ ...@@ -3597,11 +3602,11 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "aah+laK1NLq7+jYJhb5k3g" "_id": "7d56p2835OUYX2CRk5ZyWD"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "bg_picture1 copy", "_name": "bg_word1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 71 "__id__": 71
...@@ -3624,8 +3629,8 @@ ...@@ -3624,8 +3629,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 160, "width": 393,
"height": 100 "height": 126
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -3636,8 +3641,8 @@ ...@@ -3636,8 +3641,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-135, 0,
-13, 0,
0, 0,
0, 0,
0, 0,
...@@ -3659,7 +3664,7 @@ ...@@ -3659,7 +3664,7 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "f1O2oaNmtCILD0du1Z5gmA" "_id": "2fMZDgSgBN0rcDBm/k2+eS"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -3677,10 +3682,10 @@ ...@@ -3677,10 +3682,10 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8f555038-53ff-4e35-93e9-adfc82dbb782" "__uuid__": "f90e8fe9-f604-4725-9807-3be06761002b"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 0, "_sizeMode": 1,
"_fillType": 0, "_fillType": 0,
"_fillCenter": { "_fillCenter": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -3691,11 +3696,11 @@ ...@@ -3691,11 +3696,11 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "cagwt87j9Kp5rk1Pd1w4eo" "_id": "bdPifxjk5Ik5KY9VjIDrC9"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "bg_picture1 copy", "_name": "bg_picture1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 71 "__id__": 71
...@@ -3718,8 +3723,8 @@ ...@@ -3718,8 +3723,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 160, "width": 327,
"height": 100 "height": 216
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -3730,8 +3735,8 @@ ...@@ -3730,8 +3735,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
30, 0,
-13, 0,
0, 0,
0, 0,
0, 0,
...@@ -3753,7 +3758,7 @@ ...@@ -3753,7 +3758,7 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "56Rs0RFbpAWaONuQxCoAoQ" "_id": "a3If8BD+lE67P+d9lnKP4F"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -3771,10 +3776,10 @@ ...@@ -3771,10 +3776,10 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8f555038-53ff-4e35-93e9-adfc82dbb782" "__uuid__": "222dd88f-4283-47d4-a103-1a4711148a48"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 0, "_sizeMode": 1,
"_fillType": 0, "_fillType": 0,
"_fillCenter": { "_fillCenter": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -3785,109 +3790,20 @@ ...@@ -3785,109 +3790,20 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "07xkA0LVFJ85sCAo67ApzL" "_id": "2bebYCVNRCH4K199mpX5rc"
},
{
"__type__": "cc.Layout",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 71
},
"_enabled": true,
"_layoutSize": {
"__type__": "cc.Size",
"width": 450,
"height": 254
},
"_resize": 0,
"_N$layoutType": 3,
"_N$cellSize": {
"__type__": "cc.Size",
"width": 40,
"height": 40
},
"_N$startAxis": 0,
"_N$paddingLeft": 10,
"_N$paddingRight": 10,
"_N$paddingTop": 10,
"_N$paddingBottom": 10,
"_N$spacingX": 5,
"_N$spacingY": -20,
"_N$verticalDirection": 1,
"_N$horizontalDirection": 0,
"_N$affectedByScale": false,
"_id": "e2TUIqMw9Jq41Kq4nnHFUc"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 71
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 45,
"_left": 14.5,
"_right": 14.5,
"_top": 15,
"_bottom": 15,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 450,
"_originalHeight": 254,
"_id": "b3E4eJTT5JRJnPcmZHLxSO"
},
{
"__type__": "cc.Mask",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 71
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_spriteFrame": null,
"_type": 0,
"_segments": 64,
"_N$alphaThreshold": 0.1,
"_N$inverted": false,
"_id": "efzNMmOWdHpZ+PA9ERrLG/"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "bg_pic", "_name": "bg_picture2-finish",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 37 "__id__": 71
}, },
"_children": [ "_children": [],
{
"__id__": 84
}
],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 86 "__id__": 81
},
{
"__id__": 87
},
{
"__id__": 88
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3901,8 +3817,8 @@ ...@@ -3901,8 +3817,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 221, "width": 276,
"height": 135 "height": 192
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -3913,8 +3829,8 @@ ...@@ -3913,8 +3829,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-148, 0,
-120, 0,
0, 0,
0, 0,
0, 0,
...@@ -3936,35 +3852,960 @@ ...@@ -3936,35 +3852,960 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "10IkI9f4VFObPQZ1WkACZ6" "_id": "2a5iAsjjFPw4WzYyDfWhs2"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Sprite",
"_name": "word_pic", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "node": {
"__id__": 83 "__id__": 80
}, },
"_children": [], "_enabled": true,
"_active": true, "_materials": [
"_components": [
{ {
"__id__": 85 "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_prefab": null, "_srcBlendFactor": 770,
"_opacity": 255, "_dstBlendFactor": 771,
"_color": { "_spriteFrame": {
"__type__": "cc.Color", "__uuid__": "beb22cf5-86dd-40db-ad16-93300de9719c"
"r": 255,
"g": 255,
"b": 255,
"a": 255
}, },
"_contentSize": { "_type": 0,
"__type__": "cc.Size", "_sizeMode": 1,
"width": 188, "_fillType": 0,
"height": 122 "_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "34OLkppYVKnoj7Df58/gz4"
},
{
"__type__": "cc.Node",
"_name": "bg_word2",
"_objFlags": 0,
"_parent": {
"__id__": 71
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 83
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 393,
"height": 126
},
"_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": "10EBMeoZJHGImRAvsqMPD5"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 82
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "e638c31e-fecb-41a4-aaf7-5a9316af7ab6"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "29W6T/AC9IjLxhSHHde7og"
},
{
"__type__": "cc.Node",
"_name": "bg_picture2",
"_objFlags": 0,
"_parent": {
"__id__": 71
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 85
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 327,
"height": 216
},
"_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": "a3xfZKu81Ijp0vzUbOcIzI"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 84
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "cd84f7dc-dbc6-43d5-bf3a-8f02e411a119"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "486vR+OOBJYrAs7F9338cI"
},
{
"__type__": "cc.Node",
"_name": "bg_word2-finish",
"_objFlags": 0,
"_parent": {
"__id__": 71
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 87
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 341,
"height": 102
},
"_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": "b5MWZpSb5KGJPyb+I/MdZZ"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 86
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "5ddb5005-3563-4851-bfcf-f22413f6ff72"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "1beQL9RApJhrre5P0jnPgL"
},
{
"__type__": "cc.Node",
"_name": "layout_area",
"_objFlags": 0,
"_parent": {
"__id__": 37
},
"_children": [
{
"__id__": 89
},
{
"__id__": 91
},
{
"__id__": 93
},
{
"__id__": 95
}
],
"_active": true,
"_components": [
{
"__id__": 97
},
{
"__id__": 98
},
{
"__id__": 99
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 450,
"height": 254
},
"_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": "2fHGpxTu1NlL6ZKugLqKjH"
},
{
"__type__": "cc.Node",
"_name": "bg_picture1",
"_objFlags": 0,
"_parent": {
"__id__": 88
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 90
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 160,
"height": 100
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-135,
67,
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": "5ehFH+PUJKhLShCZV23CfD"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 89
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "8f555038-53ff-4e35-93e9-adfc82dbb782"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "20++XpDBtLMbnP11G8a42G"
},
{
"__type__": "cc.Node",
"_name": "bg_picture1 copy",
"_objFlags": 0,
"_parent": {
"__id__": 88
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 92
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 160,
"height": 100
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
25,
67,
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": "bcNWHmm2hHMbg4mU23TtLJ"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 91
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "8f555038-53ff-4e35-93e9-adfc82dbb782"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "aah+laK1NLq7+jYJhb5k3g"
},
{
"__type__": "cc.Node",
"_name": "bg_picture1 copy",
"_objFlags": 0,
"_parent": {
"__id__": 88
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 94
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 160,
"height": 100
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-135,
-3,
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": "f1O2oaNmtCILD0du1Z5gmA"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 93
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "8f555038-53ff-4e35-93e9-adfc82dbb782"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "cagwt87j9Kp5rk1Pd1w4eo"
},
{
"__type__": "cc.Node",
"_name": "bg_picture1 copy",
"_objFlags": 0,
"_parent": {
"__id__": 88
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 96
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 160,
"height": 100
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
25,
-3,
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": "56Rs0RFbpAWaONuQxCoAoQ"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 95
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "8f555038-53ff-4e35-93e9-adfc82dbb782"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "07xkA0LVFJ85sCAo67ApzL"
},
{
"__type__": "cc.Layout",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 88
},
"_enabled": true,
"_layoutSize": {
"__type__": "cc.Size",
"width": 450,
"height": 254
},
"_resize": 0,
"_N$layoutType": 3,
"_N$cellSize": {
"__type__": "cc.Size",
"width": 40,
"height": 40
},
"_N$startAxis": 0,
"_N$paddingLeft": 10,
"_N$paddingRight": 10,
"_N$paddingTop": 10,
"_N$paddingBottom": 10,
"_N$spacingX": 0,
"_N$spacingY": -30,
"_N$verticalDirection": 1,
"_N$horizontalDirection": 0,
"_N$affectedByScale": false,
"_id": "e2TUIqMw9Jq41Kq4nnHFUc"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 88
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 45,
"_left": 14.5,
"_right": 14.5,
"_top": 15,
"_bottom": 15,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 450,
"_originalHeight": 254,
"_id": "b3E4eJTT5JRJnPcmZHLxSO"
},
{
"__type__": "cc.Mask",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 88
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_spriteFrame": null,
"_type": 0,
"_segments": 64,
"_N$alphaThreshold": 0.1,
"_N$inverted": false,
"_id": "efzNMmOWdHpZ+PA9ERrLG/"
},
{
"__type__": "cc.Node",
"_name": "bg_pic",
"_objFlags": 0,
"_parent": {
"__id__": 37
},
"_children": [
{
"__id__": 101
}
],
"_active": true,
"_components": [
{
"__id__": 104
},
{
"__id__": 105
},
{
"__id__": 106
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 221,
"height": 135
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-148,
-120,
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": "10IkI9f4VFObPQZ1WkACZ6"
},
{
"__type__": "cc.Node",
"_name": "word_pic",
"_objFlags": 0,
"_parent": {
"__id__": 100
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 102
},
{
"__id__": 103
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 188,
"height": 122
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -4005,7 +4846,7 @@ ...@@ -4005,7 +4846,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 84 "__id__": 101
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4032,12 +4873,39 @@ ...@@ -4032,12 +4873,39 @@
"_atlas": null, "_atlas": null,
"_id": "66d5Mzb5dGU7yXIbcmUku7" "_id": "66d5Mzb5dGU7yXIbcmUku7"
}, },
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 101
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 18,
"_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": "dcOzfSJcBK36qg7q121c9q"
},
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 83 "__id__": 100
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4069,7 +4937,7 @@ ...@@ -4069,7 +4937,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 83 "__id__": 100
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -4137,15 +5005,15 @@ ...@@ -4137,15 +5005,15 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 83 "__id__": 100
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
"_target": null, "_target": null,
"_alignFlags": 12, "_alignFlags": 9,
"_left": -19, "_left": -19,
"_right": 0, "_right": 0,
"_top": 0, "_top": 194.5,
"_bottom": -45.5, "_bottom": -45.5,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
...@@ -4156,7 +5024,7 @@ ...@@ -4156,7 +5024,7 @@
"_isAbsHorizontalCenter": true, "_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true, "_isAbsVerticalCenter": true,
"_originalWidth": 0, "_originalWidth": 0,
"_originalHeight": 0, "_originalHeight": 135,
"_id": "8eFpPSO6tDt5YPcgCG7ZLW" "_id": "8eFpPSO6tDt5YPcgCG7ZLW"
}, },
{ {
...@@ -4168,19 +5036,19 @@ ...@@ -4168,19 +5036,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 90 "__id__": 108
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 92 "__id__": 111
}, },
{ {
"__id__": 93 "__id__": 112
}, },
{ {
"__id__": 94 "__id__": 113
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4236,13 +5104,16 @@ ...@@ -4236,13 +5104,16 @@
"_name": "word_text", "_name": "word_text",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 89 "__id__": 107
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 91 "__id__": 109
},
{
"__id__": 110
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4256,7 +5127,7 @@ ...@@ -4256,7 +5127,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 183.62, "width": 259,
"height": 63 "height": 63
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -4298,7 +5169,7 @@ ...@@ -4298,7 +5169,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 90 "__id__": 108
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4324,16 +5195,43 @@ ...@@ -4324,16 +5195,43 @@
"_N$horizontalAlign": 1, "_N$horizontalAlign": 1,
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 2,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "15LjrU2p1P4IKZXOOvX/Go" "_id": "15LjrU2p1P4IKZXOOvX/Go"
}, },
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 108
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 42,
"_left": 40,
"_right": 40,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 183.62,
"_originalHeight": 0,
"_id": "aeUsSnxKRLzKExCDcvh5VJ"
},
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 89 "__id__": 107
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4365,7 +5263,7 @@ ...@@ -4365,7 +5263,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 89 "__id__": 107
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -4433,15 +5331,15 @@ ...@@ -4433,15 +5331,15 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 89 "__id__": 107
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
"_target": null, "_target": null,
"_alignFlags": 12, "_alignFlags": 9,
"_left": -27, "_left": -27,
"_right": 0, "_right": 0,
"_top": 0, "_top": 252.5,
"_bottom": -45.5, "_bottom": -45.5,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
...@@ -4452,7 +5350,7 @@ ...@@ -4452,7 +5350,7 @@
"_isAbsHorizontalCenter": true, "_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true, "_isAbsVerticalCenter": true,
"_originalWidth": 0, "_originalWidth": 0,
"_originalHeight": 0, "_originalHeight": 77,
"_id": "9bTi4WyUpGqqAmxBZwTYG9" "_id": "9bTi4WyUpGqqAmxBZwTYG9"
}, },
{ {
...@@ -4464,16 +5362,16 @@ ...@@ -4464,16 +5362,16 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 96 "__id__": 115
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 101 "__id__": 118
}, },
{ {
"__id__": 102 "__id__": 119
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4499,8 +5397,8 @@ ...@@ -4499,8 +5397,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-204, -208,
-154, 133.23200000000003,
0, 0,
0, 0,
0, 0,
...@@ -4529,20 +5427,16 @@ ...@@ -4529,20 +5427,16 @@
"_name": "Background", "_name": "Background",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 95 "__id__": 114
}, },
"_children": [ "_children": [],
{
"__id__": 97
}
],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 99 "__id__": 116
}, },
{ {
"__id__": 100 "__id__": 117
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4593,107 +5487,12 @@ ...@@ -4593,107 +5487,12 @@
"groupIndex": 0, "groupIndex": 0,
"_id": "f0mWtX1xJJ1LFj/+Ka6QNZ" "_id": "f0mWtX1xJJ1LFj/+Ka6QNZ"
}, },
{
"__type__": "cc.Node",
"_name": "Label",
"_objFlags": 512,
"_parent": {
"__id__": 96
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 98
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 100,
"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": "81Q7ePbFJOWo3O+3qtSkW8"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 97
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "button",
"_N$string": "button",
"_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": "97O1DpCbNAGZ9KQQSibdGZ"
},
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 96 "__id__": 115
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4725,7 +5524,7 @@ ...@@ -4725,7 +5524,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 96 "__id__": 115
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 0,
...@@ -4752,7 +5551,7 @@ ...@@ -4752,7 +5551,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 95 "__id__": 114
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -4825,7 +5624,7 @@ ...@@ -4825,7 +5624,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
}, },
"_N$target": { "_N$target": {
"__id__": 96 "__id__": 115
}, },
"_id": "e0mhGmRlRMfLPZO0bKDTQn" "_id": "e0mhGmRlRMfLPZO0bKDTQn"
}, },
...@@ -4834,15 +5633,15 @@ ...@@ -4834,15 +5633,15 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 95 "__id__": 114
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
"_target": null, "_target": null,
"_alignFlags": 12, "_alignFlags": 9,
"_left": 4, "_left": 0,
"_right": 0, "_right": 0,
"_top": 0, "_top": -24.232000000000014,
"_bottom": -45, "_bottom": -45,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
...@@ -4853,7 +5652,7 @@ ...@@ -4853,7 +5652,7 @@
"_isAbsHorizontalCenter": true, "_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true, "_isAbsVerticalCenter": true,
"_originalWidth": 0, "_originalWidth": 0,
"_originalHeight": 0, "_originalHeight": 66,
"_id": "67jB//RBxDhYhhTInLsmAC" "_id": "67jB//RBxDhYhhTInLsmAC"
}, },
{ {
...@@ -4867,7 +5666,7 @@ ...@@ -4867,7 +5666,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 104 "__id__": 121
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4923,7 +5722,7 @@ ...@@ -4923,7 +5722,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 103 "__id__": 120
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -4956,10 +5755,10 @@ ...@@ -4956,10 +5755,10 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 106 "__id__": 123
}, },
{ {
"__id__": 107 "__id__": 124
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5015,7 +5814,7 @@ ...@@ -5015,7 +5814,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 105 "__id__": 122
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5055,7 +5854,7 @@ ...@@ -5055,7 +5854,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 105 "__id__": 122
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -5118,22 +5917,22 @@ ...@@ -5118,22 +5917,22 @@
}, },
"_enabled": true, "_enabled": true,
"layout": { "layout": {
"__id__": 80 "__id__": 97
}, },
"btn_sound": { "btn_sound": {
"__id__": 101 "__id__": 118
}, },
"tips_text_bg": { "tips_text_bg": {
"__id__": 89 "__id__": 107
}, },
"tips_pic_bg": { "tips_pic_bg": {
"__id__": 83 "__id__": 100
}, },
"show_node": { "show_node": {
"__id__": 103 "__id__": 120
}, },
"animate_node": { "animate_node": {
"__id__": 105 "__id__": 122
}, },
"_id": "c9qKhRAYhDn4CMZDd11frs" "_id": "c9qKhRAYhDn4CMZDd11frs"
}, },
...@@ -5173,13 +5972,13 @@ ...@@ -5173,13 +5972,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 112 "__id__": 129
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 117 "__id__": 134
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5235,20 +6034,20 @@ ...@@ -5235,20 +6034,20 @@
"_name": "Background", "_name": "Background",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 111 "__id__": 128
}, },
"_children": [ "_children": [
{ {
"__id__": 113 "__id__": 130
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 115 "__id__": 132
}, },
{ {
"__id__": 116 "__id__": 133
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5304,13 +6103,13 @@ ...@@ -5304,13 +6103,13 @@
"_name": "Label", "_name": "Label",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 112 "__id__": 129
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 114 "__id__": 131
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5366,7 +6165,7 @@ ...@@ -5366,7 +6165,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 113 "__id__": 130
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5399,7 +6198,7 @@ ...@@ -5399,7 +6198,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 112 "__id__": 129
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5431,7 +6230,7 @@ ...@@ -5431,7 +6230,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 112 "__id__": 129
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 0,
...@@ -5458,7 +6257,7 @@ ...@@ -5458,7 +6257,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 111 "__id__": 128
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -5531,7 +6330,7 @@ ...@@ -5531,7 +6330,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
}, },
"_N$target": { "_N$target": {
"__id__": 112 "__id__": 129
}, },
"_id": "08X/7fPaZJsYxODfLTQ3pD" "_id": "08X/7fPaZJsYxODfLTQ3pD"
}, },
...@@ -5544,13 +6343,13 @@ ...@@ -5544,13 +6343,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 119 "__id__": 136
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 124 "__id__": 141
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5606,20 +6405,20 @@ ...@@ -5606,20 +6405,20 @@
"_name": "Background", "_name": "Background",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 118 "__id__": 135
}, },
"_children": [ "_children": [
{ {
"__id__": 120 "__id__": 137
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 122 "__id__": 139
}, },
{ {
"__id__": 123 "__id__": 140
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5675,13 +6474,13 @@ ...@@ -5675,13 +6474,13 @@
"_name": "Label", "_name": "Label",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 119 "__id__": 136
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 121 "__id__": 138
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5737,7 +6536,7 @@ ...@@ -5737,7 +6536,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 120 "__id__": 137
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5770,7 +6569,7 @@ ...@@ -5770,7 +6569,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 119 "__id__": 136
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5802,7 +6601,7 @@ ...@@ -5802,7 +6601,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 119 "__id__": 136
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 0,
...@@ -5829,7 +6628,7 @@ ...@@ -5829,7 +6628,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 118 "__id__": 135
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -5902,7 +6701,7 @@ ...@@ -5902,7 +6701,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
}, },
"_N$target": { "_N$target": {
"__id__": 119 "__id__": 136
}, },
"_id": "c9YYFUeMZEJIDtnNx+WYUc" "_id": "c9YYFUeMZEJIDtnNx+WYUc"
}, },
...@@ -5915,13 +6714,13 @@ ...@@ -5915,13 +6714,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 126 "__id__": 143
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 131 "__id__": 148
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5977,20 +6776,20 @@ ...@@ -5977,20 +6776,20 @@
"_name": "Background", "_name": "Background",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 125 "__id__": 142
}, },
"_children": [ "_children": [
{ {
"__id__": 127 "__id__": 144
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 129 "__id__": 146
}, },
{ {
"__id__": 130 "__id__": 147
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6046,13 +6845,13 @@ ...@@ -6046,13 +6845,13 @@
"_name": "Label", "_name": "Label",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 126 "__id__": 143
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 128 "__id__": 145
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6108,7 +6907,7 @@ ...@@ -6108,7 +6907,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 127 "__id__": 144
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6141,7 +6940,7 @@ ...@@ -6141,7 +6940,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 126 "__id__": 143
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6173,7 +6972,7 @@ ...@@ -6173,7 +6972,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 126 "__id__": 143
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 0,
...@@ -6200,7 +6999,7 @@ ...@@ -6200,7 +6999,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 125 "__id__": 142
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -6273,7 +7072,7 @@ ...@@ -6273,7 +7072,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
}, },
"_N$target": { "_N$target": {
"__id__": 126 "__id__": 143
}, },
"_id": "49NDPbH/xBe5OuIIfr1l+x" "_id": "49NDPbH/xBe5OuIIfr1l+x"
}, },
...@@ -6346,13 +7145,13 @@ ...@@ -6346,13 +7145,13 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 134 "__id__": 151
}, },
{ {
"__id__": 135 "__id__": 152
}, },
{ {
"__id__": 136 "__id__": 153
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6408,7 +7207,7 @@ ...@@ -6408,7 +7207,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 133 "__id__": 150
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6438,7 +7237,7 @@ ...@@ -6438,7 +7237,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 133 "__id__": 150
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -6470,7 +7269,7 @@ ...@@ -6470,7 +7269,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 133 "__id__": 150
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -6555,22 +7354,22 @@ ...@@ -6555,22 +7354,22 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 141 "__id__": 158
}, },
{ {
"__id__": 143 "__id__": 160
}, },
{ {
"__id__": 145 "__id__": 162
}, },
{ {
"__id__": 147 "__id__": 164
}, },
{ {
"__id__": 149 "__id__": 166
}, },
{ {
"__id__": 151 "__id__": 168
} }
], ],
"_active": true, "_active": true,
...@@ -6628,13 +7427,13 @@ ...@@ -6628,13 +7427,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 140 "__id__": 157
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 142 "__id__": 159
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6690,7 +7489,7 @@ ...@@ -6690,7 +7489,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 141 "__id__": 158
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6722,13 +7521,13 @@ ...@@ -6722,13 +7521,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 140 "__id__": 157
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 144 "__id__": 161
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6784,7 +7583,7 @@ ...@@ -6784,7 +7583,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 143 "__id__": 160
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6816,13 +7615,13 @@ ...@@ -6816,13 +7615,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 140 "__id__": 157
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 146 "__id__": 163
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6878,7 +7677,7 @@ ...@@ -6878,7 +7677,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 145 "__id__": 162
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6910,13 +7709,13 @@ ...@@ -6910,13 +7709,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 140 "__id__": 157
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 148 "__id__": 165
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6972,7 +7771,7 @@ ...@@ -6972,7 +7771,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 147 "__id__": 164
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7004,13 +7803,13 @@ ...@@ -7004,13 +7803,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 140 "__id__": 157
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 150 "__id__": 167
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7066,7 +7865,7 @@ ...@@ -7066,7 +7865,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 149 "__id__": 166
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7098,13 +7897,13 @@ ...@@ -7098,13 +7897,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 140 "__id__": 157
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 152 "__id__": 169
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7160,7 +7959,7 @@ ...@@ -7160,7 +7959,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 151 "__id__": 168
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7196,13 +7995,13 @@ ...@@ -7196,13 +7995,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 154 "__id__": 171
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 158 "__id__": 175
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7258,17 +8057,17 @@ ...@@ -7258,17 +8057,17 @@
"_name": "Star", "_name": "Star",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 153 "__id__": 170
}, },
"_children": [ "_children": [
{ {
"__id__": 155 "__id__": 172
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 157 "__id__": 174
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7324,13 +8123,13 @@ ...@@ -7324,13 +8123,13 @@
"_name": "StarBig", "_name": "StarBig",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 154 "__id__": 171
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 156 "__id__": 173
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7386,7 +8185,7 @@ ...@@ -7386,7 +8185,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 155 "__id__": 172
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -7414,7 +8213,7 @@ ...@@ -7414,7 +8213,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 154 "__id__": 171
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7446,7 +8245,7 @@ ...@@ -7446,7 +8245,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 153 "__id__": 170
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7482,22 +8281,22 @@ ...@@ -7482,22 +8281,22 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 160 "__id__": 177
}, },
{ {
"__id__": 162 "__id__": 179
}, },
{ {
"__id__": 166 "__id__": 183
}, },
{ {
"__id__": 168 "__id__": 185
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 173 "__id__": 190
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7553,13 +8352,13 @@ ...@@ -7553,13 +8352,13 @@
"_name": "bg_picture1-finish", "_name": "bg_picture1-finish",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 159 "__id__": 176
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 161 "__id__": 178
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7615,7 +8414,7 @@ ...@@ -7615,7 +8414,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 160 "__id__": 177
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7647,17 +8446,17 @@ ...@@ -7647,17 +8446,17 @@
"_name": "bg_picture1", "_name": "bg_picture1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 159 "__id__": 176
}, },
"_children": [ "_children": [
{ {
"__id__": 163 "__id__": 180
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 165 "__id__": 182
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7713,13 +8512,13 @@ ...@@ -7713,13 +8512,13 @@
"_name": "pic", "_name": "pic",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 162 "__id__": 179
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 164 "__id__": 181
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7775,7 +8574,7 @@ ...@@ -7775,7 +8574,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 163 "__id__": 180
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7807,7 +8606,7 @@ ...@@ -7807,7 +8606,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 162 "__id__": 179
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7839,13 +8638,13 @@ ...@@ -7839,13 +8638,13 @@
"_name": "bg_word1-finish", "_name": "bg_word1-finish",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 159 "__id__": 176
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 167 "__id__": 184
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7901,7 +8700,7 @@ ...@@ -7901,7 +8700,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 166 "__id__": 183
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7933,17 +8732,17 @@ ...@@ -7933,17 +8732,17 @@
"_name": "bg_word1", "_name": "bg_word1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 159 "__id__": 176
}, },
"_children": [ "_children": [
{ {
"__id__": 169 "__id__": 186
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 172 "__id__": 189
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7999,16 +8798,16 @@ ...@@ -7999,16 +8798,16 @@
"_name": "New Label", "_name": "New Label",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 168 "__id__": 185
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 170 "__id__": 187
}, },
{ {
"__id__": 171 "__id__": 188
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8064,7 +8863,7 @@ ...@@ -8064,7 +8863,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 169 "__id__": 186
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8099,7 +8898,7 @@ ...@@ -8099,7 +8898,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 169 "__id__": 186
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -8126,7 +8925,7 @@ ...@@ -8126,7 +8925,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 168 "__id__": 185
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8158,26 +8957,26 @@ ...@@ -8158,26 +8957,26 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 159 "__id__": 176
}, },
"_enabled": true, "_enabled": true,
"pic_node": { "pic_node": {
"__id__": 162 "__id__": 179
}, },
"pic_finish": { "pic_finish": {
"__id__": 160 "__id__": 177
}, },
"pic": { "pic": {
"__id__": 164 "__id__": 181
}, },
"word_node": { "word_node": {
"__id__": 168 "__id__": 185
}, },
"word_finish": { "word_finish": {
"__id__": 166 "__id__": 183
}, },
"word": { "word": {
"__id__": 170 "__id__": 187
}, },
"_id": "8dsxiyZ1dGt6uZJDUodj+3" "_id": "8dsxiyZ1dGt6uZJDUodj+3"
} }
......
...@@ -198,7 +198,11 @@ cc.Class({ ...@@ -198,7 +198,11 @@ cc.Class({
this._kind_group = cc.find('Canvas/fg/kind').getComponent(cc.js.getClassByName('KindGroup')); this._kind_group = cc.find('Canvas/fg/kind').getComponent(cc.js.getClassByName('KindGroup'));
this._move_area.height = this._frameSize.height - 260; this._move_area.height = this._frameSize.height - 260;
this._ys = [-this._move_area.height/4, this._move_area.height/4]; let h1 = this._frameSize.height - 260 - 216*2;
let s1 = h1/3;
let offy = 216/2 +10;
this._ys = [-offy, offy];
// let option_node = cc.find('res/option'); // let option_node = cc.find('res/option');
// let option = option_node.getComponent(cc.js.getClassByName('WordOption')); // let option = option_node.getComponent(cc.js.getClassByName('WordOption'));
...@@ -214,7 +218,10 @@ cc.Class({ ...@@ -214,7 +218,10 @@ cc.Class({
}); });
cc.find('Canvas/show').on('click', ()=>{ cc.find('Canvas/show').on('click', ()=>{
let item = cc.instantiate(this._kind_group.template_node);
this._kind_group.node.addChild(item);
item.y = 43;
this._kind_group.updateView();
}); });
...@@ -234,7 +241,13 @@ cc.Class({ ...@@ -234,7 +241,13 @@ cc.Class({
let option = option_node.getComponent(cc.js.getClassByName('WordOption')); let option = option_node.getComponent(cc.js.getClassByName('WordOption'));
if (this._touched != true && cc.rect(option_node.getBoundingBoxToWorld()).contains(event.touch._point)){ if (this._touched != true && cc.rect(option_node.getBoundingBoxToWorld()).contains(event.touch._point)){
this.playAudioByName('tap'); this.playAudioByName('tap');
this._moved = false; cc.tween(this)
.delay(0.5)
.call(()=>{
option.playAudio();
})
.start();
//this._moved = false;
this._touched = true; this._touched = true;
selected.copyValues(option); selected.copyValues(option);
selected.selected(true); selected.selected(true);
...@@ -263,7 +276,7 @@ cc.Class({ ...@@ -263,7 +276,7 @@ cc.Class({
this.node.on(cc.Node.EventType.TOUCH_CANCEL, (event)=>{ this.node.on(cc.Node.EventType.TOUCH_CANCEL, (event)=>{
if (!this._touched) if (!this._touched)
return; return;
this._moved = true; //this._moved = true;
this._touched = false; this._touched = false;
selected.target.active = true; selected.target.active = true;
selected.node.x = selected.cx; selected.node.x = selected.cx;
...@@ -295,6 +308,13 @@ cc.Class({ ...@@ -295,6 +308,13 @@ cc.Class({
if (this.tryFinish()) if (this.tryFinish())
this.pageFinish(); this.pageFinish();
}); });
cc.tween(this)
.delay(0.5)
.call(()=>{
ot.playAudio();
})
.start();
selected.target.removeFromParent(); selected.target.removeFromParent();
selected.target = null; selected.target = null;
...@@ -321,7 +341,6 @@ cc.Class({ ...@@ -321,7 +341,6 @@ cc.Class({
this.updateData(); this.updateData();
this.upForeground(()=>{ this.upForeground(()=>{
this._moved = true; this._moved = true;
this.playAudioByName('up');
}); });
}); });
this._btn_start.active = true; this._btn_start.active = true;
...@@ -335,6 +354,11 @@ cc.Class({ ...@@ -335,6 +354,11 @@ cc.Class({
// this.resetData(); // this.resetData();
// }); // });
this.resetData(); this.resetData();
this._btn_start.active = false;
this.updateData();
this.upForeground(()=>{
this._moved = true;
});
}); });
}, },
...@@ -343,9 +367,11 @@ cc.Class({ ...@@ -343,9 +367,11 @@ cc.Class({
let fg_top = cc.find('Canvas/fg_top').y; let fg_top = cc.find('Canvas/fg_top').y;
let fg_bottom = fg_top - 260; let fg_bottom = fg_top - 260;
fg.y = fg_bottom; fg.y = fg_bottom;
this.playAudioByName('up');
cc.tween(fg) cc.tween(fg)
.to(0.3, {y :fg_top}) .to(0.3, {y :fg_top})
.call(()=>{ .call(()=>{
this._moved = true;
cb && cb(); cb && cb();
}) })
.start(); .start();
...@@ -584,17 +610,15 @@ cc.Class({ ...@@ -584,17 +610,15 @@ cc.Class({
onode.addChild(item); onode.addChild(item);
op = item.getComponent(cc.js.getClassByName('WordOption')); op = item.getComponent(cc.js.getClassByName('WordOption'));
op.init(os[i]); op.init(os[i]);
console.log(item._w);
this._xs[i%2] -= (i < 2 ? item._w/2 : item._w); this._xs[i%2] -= (i < 2 ? item._w/2 : item._w);
item.x = this._xs[i%2]; item.x = this._xs[i%2];
console.log(item.x);
item.y = this._ys[i%2]; item.y = this._ys[i%2];
} }
}, },
pageFinish(){ pageFinish(){
this._moved = false;
this._page_idx ++; this._page_idx ++;
this.downForeground(()=>{ this.downForeground(()=>{
if (this._page_idx >= this._page_max){ if (this._page_idx >= this._page_max){
...@@ -610,14 +634,12 @@ cc.Class({ ...@@ -610,14 +634,12 @@ cc.Class({
this._page_idx = 0; this._page_idx = 0;
this.upForeground(()=>{ this.upForeground(()=>{
this.updateData(); this.updateData();
this.playAudioByName('up');
}); });
}); });
} }
else{ else{
this.upForeground(()=>{ this.upForeground(()=>{
this.updateData(); this.updateData();
this.playAudioByName('up');
}); });
} }
}); });
...@@ -659,7 +681,8 @@ cc.Class({ ...@@ -659,7 +681,8 @@ cc.Class({
if (item.x > this._frameSize.width + item._w*1.2){ if (item.x > this._frameSize.width + item._w*1.2){
this._xs[i%2] -= item._w*1.2; this._xs[i%2] -= item._w*1.2;
item.x = Math.min(-item._w/2, this._xs[i%2]); //item.x = Math.min(-item._w/2, this._xs[i%2]);
item.x = -item._w/2;
} }
} }
}, },
......
...@@ -23,7 +23,6 @@ cc.Class({ ...@@ -23,7 +23,6 @@ cc.Class({
this.node.addChild(item); this.node.addChild(item);
kind = item.getComponent(cc.js.getClassByName('WordKind')); kind = item.getComponent(cc.js.getClassByName('WordKind'));
kind.init(data[i]); kind.init(data[i]);
console.log(i);
item.y += 43; item.y += 43;
} }
...@@ -35,6 +34,7 @@ cc.Class({ ...@@ -35,6 +34,7 @@ cc.Class({
let wr = sw/1280; let wr = sw/1280;
let num = this.node.childrenCount; let num = this.node.childrenCount;
let width = -1; let width = -1;
let w_scale = 1;
if (num== 2){ if (num== 2){
this.layout.paddingLeft = 100; this.layout.paddingLeft = 100;
this.layout.spacingX = 100; this.layout.spacingX = 100;
...@@ -54,7 +54,7 @@ cc.Class({ ...@@ -54,7 +54,7 @@ cc.Class({
this.layout.paddingLeft = 10; this.layout.paddingLeft = 10;
this.layout.spacingX = 10; this.layout.spacingX = 10;
width = (1280-num*10-10) / num; width = (1280-num*10-10) / num;
w_scale = width/273;
} }
this.layout.paddingLeft *= wr; this.layout.paddingLeft *= wr;
...@@ -67,6 +67,7 @@ cc.Class({ ...@@ -67,6 +67,7 @@ cc.Class({
for(let i = 0; i < num; i++){ for(let i = 0; i < num; i++){
this.node.children[i].width = width; this.node.children[i].width = width;
this.node.children[i].getComponent(cc.js.getClassByName('WordKind')).updateScale(w_scale);
} }
} }
......
...@@ -120,6 +120,7 @@ cc.Class({ ...@@ -120,6 +120,7 @@ cc.Class({
node.scale *= sr; node.scale *= sr;
// node.opacity = 0; // node.opacity = 0;
option.adjustPicSize(); option.adjustPicSize();
cb && cb();
// cc.tween(node) // cc.tween(node)
// .to(0.5, {opacity:255}) // .to(0.5, {opacity:255})
// .call(()=>{ // .call(()=>{
...@@ -131,6 +132,22 @@ cc.Class({ ...@@ -131,6 +132,22 @@ cc.Class({
this.show_node.active = false; this.show_node.active = false;
this.animate_node.active = false; this.animate_node.active = false;
}); });
},
updateScale(scale){
if (scale == 1) return;
this.tips_text_bg.scale = scale;
this.tips_text_bg.getComponent(cc.Widget).isAlignHorizontalCenter = true;
this.tips_pic_bg.scale = scale;
this.tips_pic_bg.getComponent(cc.Widget).isAlignHorizontalCenter = true;
let item, len = this.layout.childrenCount;
for(i = 0; i < len; i++){
item = this.layout.children[i];
item.width *= scale;
item.height *= scale;
item.scale *= scale;
}
} }
......
import { getSpriteFrimeByUrl,setSpriteWH } from "../script/util"; import { getSpriteFrimeByUrl,setSpriteWH, RandomInt,playAudioByUrl} from "../script/util";
cc.Class({ cc.Class({
extends: cc.Component, extends: cc.Component,
...@@ -56,6 +56,7 @@ cc.Class({ ...@@ -56,6 +56,7 @@ cc.Class({
this.word_finish.active = false; this.word_finish.active = false;
this.node._w = [340, 410][type]; this.node._w = [340, 410][type];
this.resetWH(); this.resetWH();
this.changeBackground();
}, },
resetWH(){ resetWH(){
...@@ -101,12 +102,18 @@ cc.Class({ ...@@ -101,12 +102,18 @@ cc.Class({
this.setPic(o.pic.spriteFrame); this.setPic(o.pic.spriteFrame);
this.pic.width = o.pic.node.width; this.pic.width = o.pic.node.width;
this.pic.height = o.pic.node.height; this.pic.height = o.pic.node.height;
this.pic_node.getComponent(cc.Sprite).spriteFrame = o.pic_node.getComponent(cc.Sprite).spriteFrame;
this.pic_finish.getComponent(cc.Sprite).spriteFrame = o.pic_finish.getComponent(cc.Sprite).spriteFrame;
} }
else if (this._type == 1) else if (this._type == 1){
this.setWord(o.word.string); this.setWord(o.word.string);
this.word_node.getComponent(cc.Sprite).spriteFrame = o.word_node.getComponent(cc.Sprite).spriteFrame;
this.word_finish.getComponent(cc.Sprite).spriteFrame = o.word_finish.getComponent(cc.Sprite).spriteFrame;
}
this.kind_id = o.kind_id; this.kind_id = o.kind_id;
this.node._w = o.node._w; this.node._w = o.node._w;
this.audio = o.audio;
}, },
adjustPicSize(){ adjustPicSize(){
...@@ -123,11 +130,36 @@ cc.Class({ ...@@ -123,11 +130,36 @@ cc.Class({
this.word_node.getComponent(cc.Sprite).enabled = false; this.word_node.getComponent(cc.Sprite).enabled = false;
if (this._type == 0){ if (this._type == 0){
this.pic_finish.active = true; this.pic_finish.active = true;
this.node.width = this.pic_finish.width;
this.node.height = this.pic_finish.height;
} }
else{ else{
this.word_finish.active = true; this.word_finish.active = true;
this.node.width = this.word_finish.width;
this.node.height = this.word_finish.height;
} }
} },
changeBackground(){
let type = this._type;
let fname;
if (type == 0){
fname = 'bg_picture' + (RandomInt(2)+1);
this.pic_node.getComponent(cc.Sprite).spriteFrame = cc.find('res/option_bg/'+fname).getComponent(cc.Sprite).spriteFrame;
fname += '-finish';
this.pic_finish.getComponent(cc.Sprite).spriteFrame = cc.find('res/option_bg/'+fname).getComponent(cc.Sprite).spriteFrame;
}
else if (type == 1){
fname = 'bg_word' + (RandomInt(2)+1);
this.word_node.getComponent(cc.Sprite).spriteFrame = cc.find('res/option_bg/'+fname).getComponent(cc.Sprite).spriteFrame;
fname += '-finish';
this.word_finish.getComponent(cc.Sprite).spriteFrame = cc.find('res/option_bg/'+fname).getComponent(cc.Sprite).spriteFrame;
}
},
playAudio(){
if (this.audio && this.audio!=""){
playAudioByUrl(this.audio);
}
},
}); });
\ 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