Commit b3fd9cc8 authored by 李维's avatar 李维

dev commit

parent 7af4c8a9
{
"ver": "2.0.1",
"uuid": "001f8670-8f10-4071-8204-8ad587cbe293",
"downloadMode": 0,
"duration": 4.04898,
"subMetas": {}
}
\ No newline at end of file
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -459,8 +459,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -468,8 +468,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -456,8 +456,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -465,8 +465,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
This diff is collapsed.
......@@ -13,7 +13,8 @@ import {
asyncPlayDragonBoneAnimation,
asyncPlayEffectByUrl,
RandomInt,
jelly
jelly,
showFireworks
} from '../script/utils';
cc.Class({
......@@ -376,8 +377,8 @@ cc.Class({
});
let btnClicked = false;
const btnBefore = cc.find('Canvas/LetterPicturePage/BtnBefore');
const btnNext = cc.find('Canvas/LetterPicturePage/BtnNext');
const btnBefore = cc.find('Canvas/buttons/BtnBefore');
const btnNext = cc.find('Canvas/buttons/BtnNext');
btnBefore.on('click', async () => {
if (btnClicked) {
return;
......@@ -385,7 +386,7 @@ cc.Class({
btnClicked = true;
this.playEffect('按钮');
await jelly(btnBefore);
this._status.currentLetterIdx--;
this._status.currentLetterIdx = Math.max(this._status.currentLetterIdx, 0);
......@@ -427,6 +428,9 @@ cc.Class({
},
updatePicturePage() {
const LetterPicturePage = cc.find('Canvas/LetterPicturePage')
LetterPicturePage.active = false;
const bigLetter = cc.find('Canvas/LetterPicturePage/BigLetterBase/BigLetter');
bigLetter.getComponent(cc.Label).string = this.letter.toUpperCase();
const smallLetter = cc.find('Canvas/LetterPicturePage/SmallLetterBase/SmallLetter');
......@@ -514,6 +518,21 @@ cc.Class({
}
},
checkButton() {
const btnBefore = cc.find('Canvas/buttons/BtnBefore');
const btnNext = cc.find('Canvas/buttons/BtnNext');
btnBefore.active = true;
btnNext.active = true;
if (this._status.currentLetterIdx == 0) {
btnBefore.active = false;
}
if (this._status.currentLetterIdx == this.data.letterList.length - 1) {
btnNext.active = false;
}
},
createLetterPage(letter) {
this._status.currentStrokeIdx = 0;
this._status.currentStrokeStageIdx = 0;
......@@ -521,9 +540,10 @@ cc.Class({
const letterNodeBase = cc.instantiate(this[`letter${letter}Prefab`]);
letterNodeBase.name = 'letterNodeBase';
letterNodeBase.parent = this.node;
letterNodeBase.zIndex = -1
const btnUpdate = letterNodeBase.getChildByName('BtnUpdate');
btnUpdate.on('click', () => {
this.fireworks()
this.drawCompleteLine(this._status.currentStrokeIdx);
this._status.currentStrokeIdx++;
if (this._status.currentStrokeIdx >= 4) {
......@@ -531,7 +551,7 @@ cc.Class({
}
this.updateArrows(this._status.currentStrokeIdx);
});
btnUpdate.active = false;
// btnUpdate.active = false;
this.updateArrows(this._status.currentStrokeIdx);
// this.drawCompleteLine(this._status.currentStrokeIdx);
......@@ -868,7 +888,8 @@ cc.Class({
this.playEffect('放大');
await this.showCompleteStar();
this.playEffect(`letter${this.letter.toUpperCase()}`);
await this.showRibbons();
// await this.showRibbons();
await this.fireworks()
this.playEffect('撒花');
await this.showCloud();
this.pageFlyOut();
......@@ -1017,7 +1038,7 @@ cc.Class({
}
},
drawCompleteLine(strokeIdx) {
drawCompleteLine(strokeIdx, ) {
const drawGraphyNode = cc.find('Canvas/letterNodeBase/DrawMaskNode/DrawGraphyNodeBase');
this.drawLines(drawGraphyNode, this.getPosListByStrokeIdx(strokeIdx));
},
......@@ -1113,5 +1134,23 @@ cc.Class({
async playEffect(name, loop, volume) {
let musicComponent = cc.find('Canvas/MusicNode').getComponent('MusicNode');
await musicComponent.playEffect(name, loop, volume);
},
async fireworks() {
showFireworks(
cc.find('Canvas/Main Camera'),
cc.find('RibbonNodeBase').children,
cc.v2(0, -400), cc.v2(0, 1000), 200, 200, 4
);
showFireworks(
cc.find('Canvas/Main Camera'),
cc.find('RibbonNodeBase').children,
cc.v2(-600, -400), cc.v2(200, 1000), 200, 200, 4
);
showFireworks(
cc.find('Canvas/Main Camera'),
cc.find('RibbonNodeBase').children,
cc.v2(600, -400), cc.v2(-200, 1000), 200, 200, 4
);
}
});
......@@ -74,6 +74,17 @@ export async function asyncTweenTo(node, duration, obj, ease = undefined) {
});
}
export async function asyncTweenBy(node, duration, obj, ease = undefined) {
return new Promise((resolve, reject) => {
cc.tween(node)
.by(duration, obj, ease)
.call(() => {
resolve();
})
.start();
});
}
export async function asyncPlayDragonBoneAnimation(node, animationName, time = 1) {
return new Promise((resolve, reject) => {
node.getComponent(dragonBones.ArmatureDisplay)
......@@ -105,3 +116,71 @@ export async function jelly(node) {
});
}
export async function asyncDelay(time) {
return new Promise((resolve, reject) => {
setTimeout(() => {
resolve();
}, time * 1000);
})
}
async function rabbonFall(node) {
const time = 1 + Math.random();
const offsetX = RandomInt(-200, 200) * time;
await asyncTweenBy(node, time, { x: offsetX, angle: offsetX * 60 / 200 });
rabbonFall(node);
}
export async function showFireworks(baseNode, nodeList, pos = cc.v2(0, 0), side = cc.v2(0, 100), range = 50, number = 100, time = 8) {
new Array(number).fill(' ').forEach(async (_, i) => {
let rabbonNode = new cc.Node();
rabbonNode.parent = baseNode;
rabbonNode.x = pos.x;
rabbonNode.y = pos.y;
rabbonNode.angle = 60 * Math.random() - 30;
let node = cc.instantiate(nodeList[RandomInt(nodeList.length)]);
node.parent = rabbonNode;
node.active = true;
node.x = 0;
node.y = 0;
node.angle = 0;
node.zIndex = 999
const rate = Math.random();
const angle = Math.PI * (Math.random() * 2 - 1);
await asyncTweenBy(rabbonNode, 0.3, {
x: side.x * rate + Math.cos(angle) * range * rate,
y: side.y * rate + Math.sin(angle) * range * rate
}, {
easing: 'quadIn'
});
cc.tween(rabbonNode)
.by(time, { y: -2000 })
.start();
rabbonFall(rabbonNode);
await asyncDelay(Math.random());
cc.tween(node)
.by(0.15, { x: -10, angle: -10 })
.by(0.3, { x: 20, angle: 20 })
.by(0.15, { x: -10, angle: -10 })
.union()
.repeatForever()
.start();
cc.tween(rabbonNode)
.delay(5)
.to(0.3, { opacity: 0 })
.call(() => {
node.stopAllActions();
node.active = false;
node.parent = null;
node = null;
})
.start();
});
}
{
"ver": "2.3.5",
"uuid": "32d97571-fbda-49a5-8a78-4dada0a444d8",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 36,
"height": 24,
"platformSettings": {},
"subMetas": {
"bg_sahua": {
"ver": "1.0.4",
"uuid": "5357c3e4-46d3-4eca-ad1b-8d4e740a537e",
"rawTextureUuid": "32d97571-fbda-49a5-8a78-4dada0a444d8",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 36,
"height": 24,
"rawWidth": 36,
"rawHeight": 24,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
......@@ -7,8 +7,8 @@
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 172,
"height": 168,
"width": 159,
"height": 149,
"platformSettings": {},
"subMetas": {
"btn_monkey": {
......@@ -18,14 +18,14 @@
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0.5,
"offsetY": 0.5,
"trimX": 7,
"trimY": 9,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 159,
"height": 149,
"rawWidth": 172,
"rawHeight": 168,
"rawWidth": 159,
"rawHeight": 149,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
......
......@@ -7,7 +7,7 @@
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 172,
"width": 169,
"height": 168,
"platformSettings": {},
"subMetas": {
......@@ -19,12 +19,12 @@
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"offsetY": -3,
"trimX": 0,
"trimY": 23,
"width": 172,
"height": 122,
"rawWidth": 172,
"trimY": 32,
"width": 169,
"height": 110,
"rawWidth": 169,
"rawHeight": 168,
"borderTop": 0,
"borderBottom": 0,
......
......@@ -7,8 +7,8 @@
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 85,
"height": 88,
"width": 78,
"height": 79,
"platformSettings": {},
"subMetas": {
"icon_star": {
......@@ -22,10 +22,10 @@
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 85,
"height": 88,
"rawWidth": 85,
"rawHeight": 88,
"width": 78,
"height": 79,
"rawWidth": 78,
"rawHeight": 79,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
......
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