Commit 9e54c779 authored by 李维's avatar 李维

Change request

parent f995a9b7
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<br> <br>
</div> </div>
<div class="border" style="float: left; width: 350px;"> <!-- <div class="border" style="float: left; width: 350px;">
<span style="height: 30px; font-size: 18px;">可选小写字母(点击下方字母选择):</span> <span style="height: 30px; font-size: 18px;">可选小写字母(点击下方字母选择):</span>
<br> <br>
<a (click)="addLetter('a')" style="font-size: 50px;">a&nbsp;</a> <a (click)="addLetter('a')" style="font-size: 50px;">a&nbsp;</a>
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
<a (click)="addLetter('z')" style="font-size: 50px;">z&nbsp;</a> <a (click)="addLetter('z')" style="font-size: 50px;">z&nbsp;</a>
<br> <br>
</div> </div>
</div> </div> -->
<!-- <div class="border" style=" width: 520px; height: 120px;"> <!-- <div class="border" style=" width: 520px; height: 120px;">
<span style="height: 30px; font-size: 18px;">单词音频:</span> <span style="height: 30px; font-size: 18px;">单词音频:</span>
......
{
"ver": "2.0.1",
"uuid": "a8b712a7-104b-465b-a29f-9ee7ee0fd1ec",
"downloadMode": 0,
"duration": 1.044898,
"subMetas": {}
}
\ No newline at end of file
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
"__id__": 2 "__id__": 2
}, },
{ {
"__id__": 147 "__id__": 153
} }
], ],
"_active": false, "_active": false,
...@@ -90,13 +90,13 @@ ...@@ -90,13 +90,13 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 144 "__id__": 150
}, },
{ {
"__id__": 145 "__id__": 151
}, },
{ {
"__id__": 146 "__id__": 152
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
"array": [ "array": [
0, 0,
0, 0,
273.54286020177153, 477.45063042390836,
0, 0,
0, 0,
0, 0,
...@@ -272,7 +272,7 @@ ...@@ -272,7 +272,7 @@
"__id__": 21 "__id__": 21
}, },
{ {
"__id__": 28 "__id__": 27
}, },
{ {
"__id__": 34 "__id__": 34
...@@ -969,7 +969,7 @@ ...@@ -969,7 +969,7 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "BtnSwitch", "_name": "SmallLetterBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 5 "__id__": 5
...@@ -986,9 +986,6 @@ ...@@ -986,9 +986,6 @@
"_components": [ "_components": [
{ {
"__id__": 26 "__id__": 26
},
{
"__id__": 27
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1002,20 +999,20 @@ ...@@ -1002,20 +999,20 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 170, "width": 476,
"height": 135 "height": 466
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
"x": 0.5, "x": 0.15,
"y": 0.5 "y": 0.85
}, },
"_trs": { "_trs": {
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
535, -528.861,
272.5, 244.225,
0, 0,
0, 0,
0, 0,
...@@ -1037,17 +1034,17 @@ ...@@ -1037,17 +1034,17 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "c9ofFybqlPIZwzFi/OkOUw" "_id": "44S3NTqBVF/bLL3pV7QTy0"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "ChangeToBig", "_name": "Bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 21 "__id__": 21
}, },
"_children": [], "_children": [],
"_active": false, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 23 "__id__": 23
...@@ -1064,8 +1061,8 @@ ...@@ -1064,8 +1061,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 170, "width": 476,
"height": 135 "height": 466
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1076,8 +1073,8 @@ ...@@ -1076,8 +1073,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 166.227,
0, -163.965,
0, 0,
0, 0,
0, 0,
...@@ -1099,7 +1096,7 @@ ...@@ -1099,7 +1096,7 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "aaG9ltIEtGW6aLR76KWDAd" "_id": "94SG20y1dC9rSQb6C4IR6x"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -1117,7 +1114,7 @@ ...@@ -1117,7 +1114,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "5407f8fa-25d0-4f8d-9f59-3664ee5d7a62" "__uuid__": "729f9e6f-b907-46b7-922f-8600e1ccb1a2"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -1131,11 +1128,11 @@ ...@@ -1131,11 +1128,11 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "652okOJtJGwZ4t93XN4aJy" "_id": "f9pa/pRE9EJ4FsvGb4MTRG"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "ChangeToSmall", "_name": "SmallLetter",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 21 "__id__": 21
...@@ -1158,8 +1155,8 @@ ...@@ -1158,8 +1155,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 170, "width": 236.4,
"height": 135 "height": 630
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1170,8 +1167,8 @@ ...@@ -1170,8 +1167,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 166.227,
0, -151.905,
0, 0,
0, 0,
0, 0,
...@@ -1193,10 +1190,10 @@ ...@@ -1193,10 +1190,10 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "adNnS9DxBK76fnYv//O/FB" "_id": "b8sk2a0rlFYKdZaB4A3LwB"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Label",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
...@@ -1210,49 +1207,26 @@ ...@@ -1210,49 +1207,26 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_useOriginalSize": false,
"__uuid__": "51de5baf-a0ef-4226-bd5d-b65acfe1ddef" "_string": "d",
}, "_N$string": "d",
"_type": 0, "_fontSize": 400,
"_sizeMode": 1, "_lineHeight": 500,
"_fillType": 0, "_enableWrapText": true,
"_fillCenter": { "_N$file": {
"__type__": "cc.Vec2", "__uuid__": "2045d93a-58c1-423d-9846-aab243658a2d"
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "df8I5JAIJEZ63Xk5f03B1p"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 21
}, },
"_enabled": true, "_isSystemFontUsed": false,
"alignMode": 1, "_spacingX": 0,
"_target": null, "_batchAsBitmap": false,
"_alignFlags": 33, "_styleFlags": 0,
"_left": 0, "_underlineHeight": 0,
"_right": 20, "_N$horizontalAlign": 1,
"_top": 20, "_N$verticalAlign": 1,
"_bottom": 0, "_N$fontFamily": "Arial",
"_verticalCenter": 0, "_N$overflow": 0,
"_horizontalCenter": 0, "_N$cacheMode": 0,
"_isAbsLeft": true, "_id": "c8NYk+9qlMWrll4eGQ83hp"
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "4fm48DFRREjaj296VS129s"
}, },
{ {
"__type__": "cc.Button", "__type__": "cc.Button",
...@@ -1320,25 +1294,28 @@ ...@@ -1320,25 +1294,28 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": null, "_N$target": null,
"_id": "aa+8mV0T5DzqF3uH54qJpO" "_id": "bb2Y2sTUtAe5AnPkrcz43x"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "SmallLetterBase", "_name": "BtnSwitch",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 5 "__id__": 5
}, },
"_children": [ "_children": [
{ {
"__id__": 29 "__id__": 28
}, },
{ {
"__id__": 31 "__id__": 30
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 32
},
{ {
"__id__": 33 "__id__": 33
} }
...@@ -1354,20 +1331,20 @@ ...@@ -1354,20 +1331,20 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 476, "width": 170,
"height": 466 "height": 135
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
"x": 0.15, "x": 0.5,
"y": 0.85 "y": 0.5
}, },
"_trs": { "_trs": {
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-528.861, 535,
244.225, 272.5,
0, 0,
0, 0,
0, 0,
...@@ -1389,20 +1366,20 @@ ...@@ -1389,20 +1366,20 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "44S3NTqBVF/bLL3pV7QTy0" "_id": "c9ofFybqlPIZwzFi/OkOUw"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "Bg", "_name": "ChangeToBig",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 28 "__id__": 27
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 30 "__id__": 29
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1416,8 +1393,8 @@ ...@@ -1416,8 +1393,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 476, "width": 170,
"height": 466 "height": 135
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1428,8 +1405,8 @@ ...@@ -1428,8 +1405,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
166.227, 0,
-163.965, 0,
0, 0,
0, 0,
0, 0,
...@@ -1451,14 +1428,14 @@ ...@@ -1451,14 +1428,14 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "94SG20y1dC9rSQb6C4IR6x" "_id": "aaG9ltIEtGW6aLR76KWDAd"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 29 "__id__": 28
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1469,7 +1446,7 @@ ...@@ -1469,7 +1446,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "729f9e6f-b907-46b7-922f-8600e1ccb1a2" "__uuid__": "5407f8fa-25d0-4f8d-9f59-3664ee5d7a62"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -1483,20 +1460,20 @@ ...@@ -1483,20 +1460,20 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "f9pa/pRE9EJ4FsvGb4MTRG" "_id": "652okOJtJGwZ4t93XN4aJy"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "SmallLetter", "_name": "ChangeToSmall",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 28 "__id__": 27
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 32 "__id__": 31
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1510,8 +1487,8 @@ ...@@ -1510,8 +1487,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 236.4, "width": 170,
"height": 630 "height": 135
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1522,8 +1499,8 @@ ...@@ -1522,8 +1499,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
166.227, 0,
-151.905, 0,
0, 0,
0, 0,
0, 0,
...@@ -1545,14 +1522,14 @@ ...@@ -1545,14 +1522,14 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "b8sk2a0rlFYKdZaB4A3LwB" "_id": "adNnS9DxBK76fnYv//O/FB"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 31 "__id__": 30
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1562,33 +1539,56 @@ ...@@ -1562,33 +1539,56 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_useOriginalSize": false, "_spriteFrame": {
"_string": "d", "__uuid__": "51de5baf-a0ef-4226-bd5d-b65acfe1ddef"
"_N$string": "d",
"_fontSize": 400,
"_lineHeight": 500,
"_enableWrapText": true,
"_N$file": {
"__uuid__": "2045d93a-58c1-423d-9846-aab243658a2d"
}, },
"_isSystemFontUsed": false, "_type": 0,
"_spacingX": 0, "_sizeMode": 1,
"_batchAsBitmap": false, "_fillType": 0,
"_styleFlags": 0, "_fillCenter": {
"_underlineHeight": 0, "__type__": "cc.Vec2",
"_N$horizontalAlign": 1, "x": 0,
"_N$verticalAlign": 1, "y": 0
"_N$fontFamily": "Arial", },
"_N$overflow": 0, "_fillStart": 0,
"_N$cacheMode": 0, "_fillRange": 0,
"_id": "c8NYk+9qlMWrll4eGQ83hp" "_isTrimmedMode": true,
"_atlas": null,
"_id": "df8I5JAIJEZ63Xk5f03B1p"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 27
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 33,
"_left": 0,
"_right": 20,
"_top": 20,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "4fm48DFRREjaj296VS129s"
}, },
{ {
"__type__": "cc.Button", "__type__": "cc.Button",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 28 "__id__": 27
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -1649,7 +1649,7 @@ ...@@ -1649,7 +1649,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": null, "_N$target": null,
"_id": "bb2Y2sTUtAe5AnPkrcz43x" "_id": "aa+8mV0T5DzqF3uH54qJpO"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
...@@ -5221,7 +5221,7 @@ ...@@ -5221,7 +5221,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "06puSejsdB7JE/aDbkuc4T" "_id": "99lJsuIaJEa4t86rGnvtcn"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -5257,7 +5257,7 @@ ...@@ -5257,7 +5257,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "28JET8+WBJpJ8DZsDvtwLg" "_id": "d8ghQzltFFIIDStLfTujJJ"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -5320,7 +5320,7 @@ ...@@ -5320,7 +5320,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "97t8KGeWxN3KUNS6sWUy/a" "_id": "e3JjLcOZlLQJ+4AQnJWZhn"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -5356,7 +5356,7 @@ ...@@ -5356,7 +5356,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "68gZuRd1RPY5vEdnZd9pWi" "_id": "faEobYCGpDnJiVoT9HrO31"
}, },
{ {
"__type__": "cc.RichText", "__type__": "cc.RichText",
...@@ -6455,6 +6455,9 @@ ...@@ -6455,6 +6455,9 @@
"按钮": { "按钮": {
"__uuid__": "046cfc8b-c79c-45e2-94fc-a445b922329c" "__uuid__": "046cfc8b-c79c-45e2-94fc-a445b922329c"
}, },
"GoodJob": {
"__uuid__": "a8b712a7-104b-465b-a29f-9ee7ee0fd1ec"
},
"撒花": { "撒花": {
"__uuid__": "001f8670-8f10-4071-8204-8ad587cbe293" "__uuid__": "001f8670-8f10-4071-8204-8ad587cbe293"
}, },
...@@ -6635,6 +6638,12 @@ ...@@ -6635,6 +6638,12 @@
}, },
{ {
"__id__": 141 "__id__": 141
},
{
"__id__": 144
},
{
"__id__": 147
} }
], ],
"_active": true, "_active": true,
...@@ -6730,8 +6739,8 @@ ...@@ -6730,8 +6739,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-1215.5, -574.746,
-652.5, -293.414,
0, 0,
0, 0,
0, 0,
...@@ -6798,10 +6807,10 @@ ...@@ -6798,10 +6807,10 @@
"alignMode": 1, "alignMode": 1,
"_target": null, "_target": null,
"_alignFlags": 12, "_alignFlags": 12,
"_left": -625, "_left": 15.754000000000019,
"_right": 0, "_right": 0,
"_top": 0, "_top": 0,
"_bottom": -345, "_bottom": 14.086000000000013,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
"_isAbsLeft": true, "_isAbsLeft": true,
...@@ -6925,8 +6934,8 @@ ...@@ -6925,8 +6934,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
1215.5, 575.313,
-652.5, -291.261,
0, 0,
0, 0,
0, 0,
...@@ -6994,9 +7003,9 @@ ...@@ -6994,9 +7003,9 @@
"_target": null, "_target": null,
"_alignFlags": 36, "_alignFlags": 36,
"_left": 0, "_left": 0,
"_right": -625, "_right": 15.187000000000012,
"_top": 0, "_top": 0,
"_bottom": -345, "_bottom": 16.238999999999976,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
"_isAbsLeft": true, "_isAbsLeft": true,
...@@ -7242,6 +7251,336 @@ ...@@ -7242,6 +7251,336 @@
"_N$target": null, "_N$target": null,
"_id": "f5rwEYBcROaZZCxpgVpca+" "_id": "f5rwEYBcROaZZCxpgVpca+"
}, },
{
"__type__": "cc.Node",
"_name": "switch_b2s",
"_objFlags": 0,
"_parent": {
"__id__": 132
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 145
},
{
"__id__": 146
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 170,
"height": 135
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
294.827,
270.96,
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": "86R31PzZ1L3443l5xvEVX4"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 144
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "51de5baf-a0ef-4226-bd5d-b65acfe1ddef"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "27ELQRgWRO+q9uY9y2LqQt"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 144
},
"_enabled": true,
"_normalMaterial": null,
"_grayMaterial": null,
"duration": 0.1,
"zoomScale": 1.2,
"clickEvents": [],
"_N$interactable": true,
"_N$enableAutoGrayEffect": false,
"_N$transition": 0,
"transition": 0,
"_N$normalColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$pressedColor": {
"__type__": "cc.Color",
"r": 211,
"g": 211,
"b": 211,
"a": 255
},
"pressedColor": {
"__type__": "cc.Color",
"r": 211,
"g": 211,
"b": 211,
"a": 255
},
"_N$hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$disabledColor": {
"__type__": "cc.Color",
"r": 124,
"g": 124,
"b": 124,
"a": 255
},
"_N$normalSprite": null,
"_N$pressedSprite": null,
"pressedSprite": null,
"_N$hoverSprite": null,
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": null,
"_id": "36V09d6r9NLpPXEINhNOft"
},
{
"__type__": "cc.Node",
"_name": "switch_s2b",
"_objFlags": 0,
"_parent": {
"__id__": 132
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 148
},
{
"__id__": 149
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 170,
"height": 135
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
294.827,
270.96,
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": "81d0PhFjBJApnEWmAgjZOt"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 147
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "5407f8fa-25d0-4f8d-9f59-3664ee5d7a62"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "d4wq+Pf/lA17m2TxoxEgLJ"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 147
},
"_enabled": true,
"_normalMaterial": null,
"_grayMaterial": null,
"duration": 0.1,
"zoomScale": 1.2,
"clickEvents": [],
"_N$interactable": true,
"_N$enableAutoGrayEffect": false,
"_N$transition": 0,
"transition": 0,
"_N$normalColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$pressedColor": {
"__type__": "cc.Color",
"r": 211,
"g": 211,
"b": 211,
"a": 255
},
"pressedColor": {
"__type__": "cc.Color",
"r": 211,
"g": 211,
"b": 211,
"a": 255
},
"_N$hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$disabledColor": {
"__type__": "cc.Color",
"r": 124,
"g": 124,
"b": 124,
"a": 255
},
"_N$normalSprite": null,
"_N$pressedSprite": null,
"pressedSprite": null,
"_N$hoverSprite": null,
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": null,
"_id": "e9rBRAoZlHv6HaclipWia2"
},
{ {
"__type__": "cc.Canvas", "__type__": "cc.Canvas",
"_name": "", "_name": "",
...@@ -7486,22 +7825,22 @@ ...@@ -7486,22 +7825,22 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 148 "__id__": 154
}, },
{ {
"__id__": 150 "__id__": 156
}, },
{ {
"__id__": 152 "__id__": 158
}, },
{ {
"__id__": 154 "__id__": 160
}, },
{ {
"__id__": 156 "__id__": 162
}, },
{ {
"__id__": 158 "__id__": 164
} }
], ],
"_active": true, "_active": true,
...@@ -7559,13 +7898,13 @@ ...@@ -7559,13 +7898,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 147 "__id__": 153
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 149 "__id__": 155
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7621,7 +7960,7 @@ ...@@ -7621,7 +7960,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 148 "__id__": 154
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7653,13 +7992,13 @@ ...@@ -7653,13 +7992,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 147 "__id__": 153
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 151 "__id__": 157
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7715,7 +8054,7 @@ ...@@ -7715,7 +8054,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 150 "__id__": 156
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7747,13 +8086,13 @@ ...@@ -7747,13 +8086,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 147 "__id__": 153
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 153 "__id__": 159
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7809,7 +8148,7 @@ ...@@ -7809,7 +8148,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 152 "__id__": 158
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7841,13 +8180,13 @@ ...@@ -7841,13 +8180,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 147 "__id__": 153
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 155 "__id__": 161
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7903,7 +8242,7 @@ ...@@ -7903,7 +8242,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 154 "__id__": 160
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7935,13 +8274,13 @@ ...@@ -7935,13 +8274,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 147 "__id__": 153
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 157 "__id__": 163
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7997,7 +8336,7 @@ ...@@ -7997,7 +8336,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 156 "__id__": 162
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8029,13 +8368,13 @@ ...@@ -8029,13 +8368,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 147 "__id__": 153
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 159 "__id__": 165
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8091,7 +8430,7 @@ ...@@ -8091,7 +8430,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 158 "__id__": 164
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
......
...@@ -282,6 +282,8 @@ cc.Class({ ...@@ -282,6 +282,8 @@ cc.Class({
this._lastDrawPos = -1; this._lastDrawPos = -1;
this._lastMainBg = 1; this._lastMainBg = 1;
this._enableRestart = true; this._enableRestart = true;
this.doneFlag = [false, false];
this.currentCase = 0;
}, },
start() { start() {
...@@ -347,11 +349,14 @@ cc.Class({ ...@@ -347,11 +349,14 @@ cc.Class({
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/buttons/btn_restart');
const switch_b2s = cc.find('Canvas/buttons/switch_b2s');
const switch_s2b = cc.find('Canvas/buttons/switch_s2b');
console.log(switch_b2s, switch_s2b)
this.repositionButton(); this.repositionButton();
let that = this let that = this
cc.view.setResizeCallback(function() { cc.view.setResizeCallback(function() {
// console.log("sizeChange");
that.repositionButton(); that.repositionButton();
}); });
...@@ -364,7 +369,12 @@ cc.Class({ ...@@ -364,7 +369,12 @@ cc.Class({
await jelly(btn_restart); await jelly(btn_restart);
btn_restart.active = false; btn_restart.active = false;
this.pageFlyOut(); this.pageFlyOut();
this.restartGame(); // this.restartGame();
if(this.sharkNode) {
this.sharkNode.parent = null;
this.sharkNode = null;
}
this.createLetterPage(this.letter);
setTimeout(() => { setTimeout(() => {
btn_restart.active = true; btn_restart.active = true;
this._enableRestart = true;; this._enableRestart = true;;
...@@ -388,6 +398,49 @@ cc.Class({ ...@@ -388,6 +398,49 @@ cc.Class({
pictureWordSmallBg.active = !pictureWordSmallBg.active; pictureWordSmallBg.active = !pictureWordSmallBg.active;
}); });
switch_b2s.on('click', () => {
console.log("switch_b2s click")
// this.playEffect(`letter${this.letter.toUpperCase()}`);
cc.tween(switch_b2s)
.call(()=>{
this.letter = this.letter.toLowerCase();
this.pageFlyOut();
if(this.sharkNode) {
this.sharkNode.parent = null;
this.sharkNode = null;
}
this.createLetterPage(this.letter);
this.currentCase = 1;
switch_b2s.active = false;
switch_s2b.active = true;
})
.to(0.1, { angle: 5 })
.to(0.1, { angle: -5 })
.to(0.1, { angle: 0 })
.start();
});
switch_s2b.on('click', () => {
console.log("switch_s2b click")
// this.playEffect(`letter${this.letter.toUpperCase()}`);
cc.tween(switch_s2b)
.call(()=>{
this.letter = this.letter.toUpperCase();
this.pageFlyOut();
if(this.sharkNode) {
this.sharkNode.parent = null;
this.sharkNode = null;
}
this.createLetterPage(this.letter);
this.currentCase = 0;
switch_b2s.active = true;
switch_s2b.active = false;
})
.to(0.1, { angle: 5 })
.to(0.1, { angle: -5 })
.to(0.1, { angle: 0 })
.start();
});
smallLetterBase.on('click', () => { smallLetterBase.on('click', () => {
this.playEffect(`letter${this.letter.toUpperCase()}`); this.playEffect(`letter${this.letter.toUpperCase()}`);
cc.tween(smallLetterBase) cc.tween(smallLetterBase)
...@@ -420,20 +473,31 @@ cc.Class({ ...@@ -420,20 +473,31 @@ cc.Class({
btnNext.active = false; btnNext.active = false;
btnBefore.on('click', async () => { btnBefore.on('click', async () => {
console.log("btnBefore click")
if (btnClicked) { if (btnClicked) {
return; return;
} }
btnClicked = true; btnClicked = true;
this.playEffect('按钮'); this.playEffect('按钮');
await jelly(btnBefore); await jelly(btnBefore);
this._status.currentLetterIdx--; this._status.currentLetterIdx--;
this._status.currentLetterIdx = Math.max(this._status.currentLetterIdx, 0); this._status.currentLetterIdx = Math.max(this._status.currentLetterIdx, 0);
this.letter = this.data.letterList[this._status.currentLetterIdx];
this.updateLetter(); if(this.sharkNode) {
this.sharkNode.parent = null;
this.sharkNode = null;
}
this.pageFlyOut();
this.createLetterPage(this.letter);
this.checkButton();
this.currentCase = 0;
switch_b2s.active = true;
switch_s2b.active = false;
btnClicked = false; btnClicked = false;
}); });
btnNext.on('click', async () => { btnNext.on('click', async () => {
console.log("btnNext click")
if (btnClicked) { if (btnClicked) {
return; return;
} }
...@@ -444,18 +508,39 @@ cc.Class({ ...@@ -444,18 +508,39 @@ cc.Class({
this._status.currentLetterIdx++; this._status.currentLetterIdx++;
this._status.currentLetterIdx = Math.min(this._status.currentLetterIdx, this.data.letterList.length - 1); this._status.currentLetterIdx = Math.min(this._status.currentLetterIdx, this.data.letterList.length - 1);
this.updateLetter(); this.letter = this.data.letterList[this._status.currentLetterIdx];
if(this.sharkNode) {
this.sharkNode.parent = null;
this.sharkNode = null;
}
this.pageFlyOut();
this.createLetterPage(this.letter);
this.checkButton();
this.currentCase = 0;
switch_b2s.active = true;
switch_s2b.active = false;
btnClicked = false; btnClicked = false;
}); });
// this.checkButton();
}, },
loadNextLetter() { loadNextLetter() {
const switch_b2s = cc.find('Canvas/buttons/switch_b2s');
const switch_s2b = cc.find('Canvas/buttons/switch_s2b');
switch_b2s.active = true;
switch_s2b.active = false;
this._status.currentLetterIdx++; this._status.currentLetterIdx++;
this._status.currentLetterIdx = Math.min(this._status.currentLetterIdx, this.data.letterList.length - 1); this._status.currentLetterIdx = Math.min(this._status.currentLetterIdx, this.data.letterList.length - 1);
this.doneFlag = [false, false];
this.currentCase = 0;
this.updateLetter(); this.updateLetter();
this.checkButton()
}, },
onLoadFinish() { onLoadFinish() {
this.initListeners(); this.initListeners();
this._status = { this._status = {
...@@ -464,6 +549,7 @@ cc.Class({ ...@@ -464,6 +549,7 @@ cc.Class({
currentStrokeStageIdx: 0 currentStrokeStageIdx: 0
} }
this.updateLetter(); this.updateLetter();
this.checkButton();
}, },
restartGame() { restartGame() {
...@@ -971,14 +1057,21 @@ cc.Class({ ...@@ -971,14 +1057,21 @@ cc.Class({
}, 5000); }, 5000);
this.hideShark(); this.hideShark();
this.playEffect('放大'); // this.playEffect('放大');
await this.showCompleteStar(); await this.showCompleteStar();
this.playEffect(`letter${this.letter.toUpperCase()}`); await this.playEffect("GoodJob");
// await this.showRibbons(); await asyncDelay(0.5)
if(this._status.currentLetterIdx != (this.data.letterList.length-1)) { await this.playEffect(`letter${this.letter.toUpperCase()}`);
this.doneFlag[this.currentCase] = true;
if(this.doneFlag[0] && this.doneFlag[1]) {
await this.fireworks() await this.fireworks()
this.playEffect('撒花'); this.playEffect('撒花');
} }
// await this.showRibbons();
// if(this._status.currentLetterIdx != (this.data.letterList.length-1)) {
// await this.fireworks()
// this.playEffect('撒花');
// }
await this.showCloud(); await this.showCloud();
// console.log(this._status.currentLetterIdx, this.data.letterList.length-1) // console.log(this._status.currentLetterIdx, this.data.letterList.length-1)
// if (this.letter !== this.letter.toLowerCase()) { // if (this.letter !== this.letter.toLowerCase()) {
...@@ -991,10 +1084,11 @@ cc.Class({ ...@@ -991,10 +1084,11 @@ cc.Class({
// this.loadNextLetter() // this.loadNextLetter()
// } // }
// } // }
if(this._status.currentLetterIdx != (this.data.letterList.length-1)) {
this.pageFlyOut(); // if(this._status.currentLetterIdx != (this.data.letterList.length-1)) {
this.loadNextLetter() // this.pageFlyOut();
} // this.loadNextLetter()
// }
}, },
async showCompleteStar() { async showCompleteStar() {
......
...@@ -36,6 +36,10 @@ cc.Class({ ...@@ -36,6 +36,10 @@ cc.Class({
default: null, default: null,
type: cc.AudioClip type: cc.AudioClip
}, },
GoodJob: {
default: null,
type: cc.AudioClip
},
撒花: { 撒花: {
default: null, default: null,
type: cc.AudioClip type: cc.AudioClip
......
module.exports = { module.exports = {
letterList: ["A", "a", "B", "C", "d"] letterList: ["A", "B", "C"]
} }
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