Commit c0d3ad25 authored by 李维's avatar 李维

Reposition

parent 9e54c779
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
"__id__": 2 "__id__": 2
}, },
{ {
"__id__": 153 "__id__": 154
} }
], ],
"_active": false, "_active": false,
...@@ -85,18 +85,21 @@ ...@@ -85,18 +85,21 @@
}, },
{ {
"__id__": 132 "__id__": 132
},
{
"__id__": 139
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 150
},
{ {
"__id__": 151 "__id__": 151
}, },
{ {
"__id__": 152 "__id__": 152
},
{
"__id__": 153
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -186,7 +189,7 @@ ...@@ -186,7 +189,7 @@
"array": [ "array": [
0, 0,
0, 0,
477.45063042390836, 469.5806533322543,
0, 0,
0, 0,
0, 0,
...@@ -5221,7 +5224,7 @@ ...@@ -5221,7 +5224,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "99lJsuIaJEa4t86rGnvtcn" "_id": "a6cMZKz9VPqr9hCh7APcsa"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -5257,7 +5260,7 @@ ...@@ -5257,7 +5260,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "d8ghQzltFFIIDStLfTujJJ" "_id": "68eDLZExhJ3rKi3Wkk17Vi"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -5320,7 +5323,7 @@ ...@@ -5320,7 +5323,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "e3JjLcOZlLQJ+4AQnJWZhn" "_id": "e07ojz2NtIYoZeBppxhZ7a"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -5356,7 +5359,7 @@ ...@@ -5356,7 +5359,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "faEobYCGpDnJiVoT9HrO31" "_id": "67LYV0D85IP6672RSADLKn"
}, },
{ {
"__type__": "cc.RichText", "__type__": "cc.RichText",
...@@ -6634,16 +6637,7 @@ ...@@ -6634,16 +6637,7 @@
"__id__": 133 "__id__": 133
}, },
{ {
"__id__": 137 "__id__": 136
},
{
"__id__": 141
},
{
"__id__": 144
},
{
"__id__": 147
} }
], ],
"_active": true, "_active": true,
...@@ -6671,8 +6665,8 @@ ...@@ -6671,8 +6665,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, -530,
0, -280,
0, 0,
0, 0,
0, 0,
...@@ -6698,7 +6692,7 @@ ...@@ -6698,7 +6692,7 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "BtnBefore", "_name": "switch_b2s",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 132 "__id__": 132
...@@ -6711,9 +6705,6 @@ ...@@ -6711,9 +6705,6 @@
}, },
{ {
"__id__": 135 "__id__": 135
},
{
"__id__": 136
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6727,8 +6718,8 @@ ...@@ -6727,8 +6718,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 99, "width": 170,
"height": 105 "height": 135
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -6739,8 +6730,8 @@ ...@@ -6739,8 +6730,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-574.746, 0,
-293.414, 0,
0, 0,
0, 0,
0, 0,
...@@ -6762,7 +6753,7 @@ ...@@ -6762,7 +6753,7 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "ebjzUo/ZNG3LRKigkT/0yt" "_id": "86R31PzZ1L3443l5xvEVX4"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -6780,7 +6771,7 @@ ...@@ -6780,7 +6771,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "4b4602ad-b857-4a9d-b1ad-c9476ecac53b" "__uuid__": "51de5baf-a0ef-4226-bd5d-b65acfe1ddef"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -6794,34 +6785,7 @@ ...@@ -6794,34 +6785,7 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "64UQa78oBCTZnimyO9TlgH" "_id": "27ELQRgWRO+q9uY9y2LqQt"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 133
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 12,
"_left": 15.754000000000019,
"_right": 0,
"_top": 0,
"_bottom": 14.086000000000013,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "230Cw//iFEi7P5zHfa/8z/"
}, },
{ {
"__type__": "cc.Button", "__type__": "cc.Button",
...@@ -6889,26 +6853,23 @@ ...@@ -6889,26 +6853,23 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": null, "_N$target": null,
"_id": "97SWNykDlLGqP8b+gA4Nkn" "_id": "36V09d6r9NLpPXEINhNOft"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "BtnNext", "_name": "switch_s2b",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 132 "__id__": 132
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 138 "__id__": 137
},
{
"__id__": 139
}, },
{ {
"__id__": 140 "__id__": 138
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6922,8 +6883,8 @@ ...@@ -6922,8 +6883,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 99, "width": 170,
"height": 105 "height": 135
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -6934,8 +6895,8 @@ ...@@ -6934,8 +6895,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
575.313, 0,
-291.261, 0,
0, 0,
0, 0,
0, 0,
...@@ -6957,14 +6918,14 @@ ...@@ -6957,14 +6918,14 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "edWsB2B7NMOazpaCsRafwk" "_id": "81d0PhFjBJApnEWmAgjZOt"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 137 "__id__": 136
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6975,7 +6936,7 @@ ...@@ -6975,7 +6936,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "ecc2eedf-ae21-46fe-a675-b7cb6cabfca5" "__uuid__": "5407f8fa-25d0-4f8d-9f59-3664ee5d7a62"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -6989,41 +6950,14 @@ ...@@ -6989,41 +6950,14 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "63CcF5ZX5IS6iPVo2VMD55" "_id": "d4wq+Pf/lA17m2TxoxEgLJ"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 137
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 36,
"_left": 0,
"_right": 15.187000000000012,
"_top": 0,
"_bottom": 16.238999999999976,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "f4R9Z4SbtAj5tMUfbaVNPp"
}, },
{ {
"__type__": "cc.Button", "__type__": "cc.Button",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 137 "__id__": 136
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -7084,23 +7018,91 @@ ...@@ -7084,23 +7018,91 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": null, "_N$target": null,
"_id": "b6yVOtz7BJeqlb+JrIAz4X" "_id": "e9rBRAoZlHv6HaclipWia2"
},
{
"__type__": "cc.Node",
"_name": "bottomButtons",
"_objFlags": 0,
"_parent": {
"__id__": 2
},
"_children": [
{
"__id__": 140
},
{
"__id__": 143
},
{
"__id__": 147
}
],
"_active": true,
"_components": [],
"_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": "3fwzfb1EZOxYlIYuCTqJeu"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "btn_restart", "_name": "btn_restart",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 132 "__id__": 139
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 142 "__id__": 141
}, },
{ {
"__id__": 143 "__id__": 142
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7126,8 +7128,8 @@ ...@@ -7126,8 +7128,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
482.351, 480,
-289.55, 0,
0, 0,
0, 0,
0, 0,
...@@ -7156,7 +7158,7 @@ ...@@ -7156,7 +7158,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 141 "__id__": 140
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7188,7 +7190,7 @@ ...@@ -7188,7 +7190,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 141 "__id__": 140
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -7253,14 +7255,17 @@ ...@@ -7253,14 +7255,17 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "switch_b2s", "_name": "BtnBefore",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 132 "__id__": 139
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 144
},
{ {
"__id__": 145 "__id__": 145
}, },
...@@ -7279,8 +7284,8 @@ ...@@ -7279,8 +7284,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 170, "width": 45,
"height": 135 "height": 46
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -7291,8 +7296,8 @@ ...@@ -7291,8 +7296,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
294.827, 410,
270.96, 0,
0, 0,
0, 0,
0, 0,
...@@ -7314,14 +7319,14 @@ ...@@ -7314,14 +7319,14 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "86R31PzZ1L3443l5xvEVX4" "_id": "ebjzUo/ZNG3LRKigkT/0yt"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 144 "__id__": 143
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7332,7 +7337,7 @@ ...@@ -7332,7 +7337,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "51de5baf-a0ef-4226-bd5d-b65acfe1ddef" "__uuid__": "f19d97eb-8b2c-47d6-be43-cfbd0cf5804e"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -7346,14 +7351,41 @@ ...@@ -7346,14 +7351,41 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "27ELQRgWRO+q9uY9y2LqQt" "_id": "64UQa78oBCTZnimyO9TlgH"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 143
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 12,
"_left": 387.5,
"_right": 0,
"_top": 0,
"_bottom": -23,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "230Cw//iFEi7P5zHfa/8z/"
}, },
{ {
"__type__": "cc.Button", "__type__": "cc.Button",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 144 "__id__": 143
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -7414,23 +7446,26 @@ ...@@ -7414,23 +7446,26 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": null, "_N$target": null,
"_id": "36V09d6r9NLpPXEINhNOft" "_id": "97SWNykDlLGqP8b+gA4Nkn"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "switch_s2b", "_name": "BtnNext",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 132 "__id__": 139
}, },
"_children": [], "_children": [],
"_active": false, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 148 "__id__": 148
}, },
{ {
"__id__": 149 "__id__": 149
},
{
"__id__": 150
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7444,8 +7479,8 @@ ...@@ -7444,8 +7479,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 170, "width": 44,
"height": 135 "height": 46
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -7456,8 +7491,8 @@ ...@@ -7456,8 +7491,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
294.827, 550,
270.96, 0,
0, 0,
0, 0,
0, 0,
...@@ -7479,7 +7514,7 @@ ...@@ -7479,7 +7514,7 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "81d0PhFjBJApnEWmAgjZOt" "_id": "edWsB2B7NMOazpaCsRafwk"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -7497,7 +7532,7 @@ ...@@ -7497,7 +7532,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "5407f8fa-25d0-4f8d-9f59-3664ee5d7a62" "__uuid__": "611de94c-3f79-48c3-a551-c9b3010bd82b"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -7511,7 +7546,34 @@ ...@@ -7511,7 +7546,34 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "d4wq+Pf/lA17m2TxoxEgLJ" "_id": "63CcF5ZX5IS6iPVo2VMD55"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 147
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 36,
"_left": 0,
"_right": -572,
"_top": 0,
"_bottom": -23,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "f4R9Z4SbtAj5tMUfbaVNPp"
}, },
{ {
"__type__": "cc.Button", "__type__": "cc.Button",
...@@ -7579,7 +7641,7 @@ ...@@ -7579,7 +7641,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": null, "_N$target": null,
"_id": "e9rBRAoZlHv6HaclipWia2" "_id": "b6yVOtz7BJeqlb+JrIAz4X"
}, },
{ {
"__type__": "cc.Canvas", "__type__": "cc.Canvas",
...@@ -7825,22 +7887,22 @@ ...@@ -7825,22 +7887,22 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 154 "__id__": 155
}, },
{ {
"__id__": 156 "__id__": 157
}, },
{ {
"__id__": 158 "__id__": 159
}, },
{ {
"__id__": 160 "__id__": 161
}, },
{ {
"__id__": 162 "__id__": 163
}, },
{ {
"__id__": 164 "__id__": 165
} }
], ],
"_active": true, "_active": true,
...@@ -7898,13 +7960,13 @@ ...@@ -7898,13 +7960,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 153 "__id__": 154
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 155 "__id__": 156
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7960,7 +8022,7 @@ ...@@ -7960,7 +8022,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 154 "__id__": 155
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7992,13 +8054,13 @@ ...@@ -7992,13 +8054,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 153 "__id__": 154
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 157 "__id__": 158
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8054,7 +8116,7 @@ ...@@ -8054,7 +8116,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 156 "__id__": 157
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8086,13 +8148,13 @@ ...@@ -8086,13 +8148,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 153 "__id__": 154
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 159 "__id__": 160
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8148,7 +8210,7 @@ ...@@ -8148,7 +8210,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 158 "__id__": 159
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8180,13 +8242,13 @@ ...@@ -8180,13 +8242,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 153 "__id__": 154
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 161 "__id__": 162
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8242,7 +8304,7 @@ ...@@ -8242,7 +8304,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 160 "__id__": 161
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8274,13 +8336,13 @@ ...@@ -8274,13 +8336,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 153 "__id__": 154
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 163 "__id__": 164
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8336,7 +8398,7 @@ ...@@ -8336,7 +8398,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 162 "__id__": 163
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8368,13 +8430,13 @@ ...@@ -8368,13 +8430,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 153 "__id__": 154
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 165 "__id__": 166
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8430,7 +8492,7 @@ ...@@ -8430,7 +8492,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 164 "__id__": 165
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
......
...@@ -336,8 +336,8 @@ cc.Class({ ...@@ -336,8 +336,8 @@ cc.Class({
}, },
repositionButton() { repositionButton() {
const btn_restart = cc.find('Canvas/buttons/btn_restart'); const bottomButtons = cc.find('Canvas/bottomButtons');
btn_restart.y = -cc.winSize.height / 2 + 40 bottomButtons.y = -cc.winSize.height / 2 + 40
}, },
initListeners() { initListeners() {
...@@ -348,7 +348,7 @@ cc.Class({ ...@@ -348,7 +348,7 @@ cc.Class({
const bigLetterBase = cc.find('Canvas/LetterPicturePage/BigLetterBase'); const bigLetterBase = cc.find('Canvas/LetterPicturePage/BigLetterBase');
const pictureWordSmallBg = cc.find('Canvas/LetterPicturePage/PictureWordSmallBg'); const pictureWordSmallBg = cc.find('Canvas/LetterPicturePage/PictureWordSmallBg');
const pictureWordBigBg = cc.find('Canvas/LetterPicturePage/PictureWordBigBg'); const pictureWordBigBg = cc.find('Canvas/LetterPicturePage/PictureWordBigBg');
const btn_restart = cc.find('Canvas/buttons/btn_restart'); const btn_restart = cc.find('Canvas/bottomButtons/btn_restart');
const switch_b2s = cc.find('Canvas/buttons/switch_b2s'); const switch_b2s = cc.find('Canvas/buttons/switch_b2s');
const switch_s2b = cc.find('Canvas/buttons/switch_s2b'); const switch_s2b = cc.find('Canvas/buttons/switch_s2b');
...@@ -398,8 +398,10 @@ cc.Class({ ...@@ -398,8 +398,10 @@ cc.Class({
pictureWordSmallBg.active = !pictureWordSmallBg.active; pictureWordSmallBg.active = !pictureWordSmallBg.active;
}); });
switch_b2s.on('click', () => { switch_b2s.on('click', async () => {
console.log("switch_b2s click") console.log("switch_b2s click");
this.playEffect('按钮');
await jelly(switch_b2s);
// this.playEffect(`letter${this.letter.toUpperCase()}`); // this.playEffect(`letter${this.letter.toUpperCase()}`);
cc.tween(switch_b2s) cc.tween(switch_b2s)
.call(()=>{ .call(()=>{
...@@ -419,8 +421,10 @@ cc.Class({ ...@@ -419,8 +421,10 @@ cc.Class({
.to(0.1, { angle: 0 }) .to(0.1, { angle: 0 })
.start(); .start();
}); });
switch_s2b.on('click', () => { switch_s2b.on('click', async () => {
console.log("switch_s2b click") console.log("switch_s2b click");
this.playEffect('按钮');
await jelly(switch_s2b);
// this.playEffect(`letter${this.letter.toUpperCase()}`); // this.playEffect(`letter${this.letter.toUpperCase()}`);
cc.tween(switch_s2b) cc.tween(switch_s2b)
.call(()=>{ .call(()=>{
...@@ -467,9 +471,9 @@ cc.Class({ ...@@ -467,9 +471,9 @@ cc.Class({
}); });
let btnClicked = false; let btnClicked = false;
const btnBefore = cc.find('Canvas/buttons/BtnBefore'); const btnBefore = cc.find('Canvas/bottomButtons/BtnBefore');
btnBefore.active = false; btnBefore.active = false;
const btnNext = cc.find('Canvas/buttons/BtnNext'); const btnNext = cc.find('Canvas/bottomButtons/BtnNext');
btnNext.active = false; btnNext.active = false;
btnBefore.on('click', async () => { btnBefore.on('click', async () => {
...@@ -664,8 +668,8 @@ cc.Class({ ...@@ -664,8 +668,8 @@ cc.Class({
}, },
checkButton() { checkButton() {
const btnBefore = cc.find('Canvas/buttons/BtnBefore'); const btnBefore = cc.find('Canvas/bottomButtons/BtnBefore');
const btnNext = cc.find('Canvas/buttons/BtnNext'); const btnNext = cc.find('Canvas/bottomButtons/BtnNext');
btnBefore.active = true; btnBefore.active = true;
btnNext.active = true; btnNext.active = true;
...@@ -1047,7 +1051,7 @@ cc.Class({ ...@@ -1047,7 +1051,7 @@ cc.Class({
}, },
async showOver() { async showOver() {
let btn_restart = cc.find('Canvas/buttons/btn_restart'); let btn_restart = cc.find('Canvas/bottomButtons/btn_restart');
btn_restart.active = false; btn_restart.active = false;
// btn_restart.scaleX = 0; // btn_restart.scaleX = 0;
// btn_restart.scaleY = 0; // btn_restart.scaleY = 0;
......
{
"ver": "2.3.5",
"uuid": "e664ea42-0228-4880-abe6-7926e09fd4a3",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 45,
"height": 46,
"platformSettings": {},
"subMetas": {
"btn_left": {
"ver": "1.0.4",
"uuid": "f19d97eb-8b2c-47d6-be43-cfbd0cf5804e",
"rawTextureUuid": "e664ea42-0228-4880-abe6-7926e09fd4a3",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 45,
"height": 46,
"rawWidth": 45,
"rawHeight": 46,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "980d6008-1148-4382-bc43-67be986026e6",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 44,
"height": 46,
"platformSettings": {},
"subMetas": {
"btn_right": {
"ver": "1.0.4",
"uuid": "611de94c-3f79-48c3-a551-c9b3010bd82b",
"rawTextureUuid": "980d6008-1148-4382-bc43-67be986026e6",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 44,
"height": 46,
"rawWidth": 44,
"rawHeight": 46,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ 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