Commit e34eeed3 authored by yu's avatar yu

表格,游戏调整

parent 93df25a3
{ {"ver":"1.1.2","uuid":"4e7ab4f4-4d24-404d-84db-f43ee5136c53","isBundle":false,"bundleName":"","priority":1,"compressionType":{},"optimizeHotUpdate":{},"inlineSpriteFrames":{},"isRemoteBundle":{"ios":false,"android":false},"subMetas":{}}
"ver": "1.1.2", \ No newline at end of file
"uuid": "c35bb2f6-f24a-4850-ae44-643f2fdc7541",
"isBundle": false,
"bundleName": "",
"priority": 1,
"compressionType": {},
"optimizeHotUpdate": {},
"inlineSpriteFrames": {},
"isRemoteBundle": {
"ios": false,
"android": false
},
"subMetas": {}
}
\ No newline at end of file
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "0853721c-3f55-4eb2-873d-e3081cfadd4b", "uuid": "a524b137-f5ee-4fe1-befd-9845084aaf01",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "2.1.0", "ver": "2.1.0",
"uuid": "0d5372fb-b93d-48bc-8fef-9dd83cd1c642", "uuid": "1a6cda6f-7066-4a5d-b525-7798367f30e1",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "cb9fa4ea-66ca-45af-ad31-e445c7b0ef32", "uuid": "628d03bc-c5af-48b7-a4a5-2aa868c681c6",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "f0680ae0-c079-45ef-abd7-9e63d90b982b", "uuid": "f45bebf9-f989-496e-820a-d0703ce71cc0",
"downloadMode": 0, "downloadMode": 0,
"duration": 0.130612, "duration": 0.130612,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "20185448-a1ca-4de2-8b37-7bf6cdfccbae", "uuid": "6da6224e-f2db-4311-98e6-27817fb84d21",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "1.1.0", "ver": "1.1.0",
"uuid": "10d7986f-e45e-477c-a36c-013d0f2f6aa5", "uuid": "5426cd8a-6b5d-4fb0-8117-3bf3bbb23936",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "1.1.0", "ver": "1.1.0",
"uuid": "48c24708-ba06-46b1-8333-46e2c69a9858", "uuid": "b3b0a1d4-b8c9-4c58-88fd-d037cce1b608",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "1.1.0", "ver": "1.1.0",
"uuid": "57ac8728-e57f-4644-9c7a-aaac1c6f629a", "uuid": "c9459d7c-e3d2-4aa1-9f58-1782c5cffcd4",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "e8bd16b0-3804-45a9-a8ca-f52c02224f55", "uuid": "0296ae2b-dcfd-49b1-b0b4-b2082699b1a6",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"autoReleaseAssets": true, "autoReleaseAssets": true,
"_id": "0737ce42-24f0-45c6-8e1a-8bdab4f74ba3" "_id": "dc6cadcb-bc4a-4828-aec9-68b2704af968"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
...@@ -96,34 +96,40 @@ ...@@ -96,34 +96,40 @@
"__id__": 72 "__id__": 72
}, },
{ {
"__id__": 77 "__id__": 82
}, },
{ {
"__id__": 80 "__id__": 87
}, },
{ {
"__id__": 85 "__id__": 90
}, },
{ {
"__id__": 88 "__id__": 95
}, },
{ {
"__id__": 93 "__id__": 98
}, },
{ {
"__id__": 112 "__id__": 103
},
{
"__id__": 122
},
{
"__id__": 126
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 116 "__id__": 130
}, },
{ {
"__id__": 117 "__id__": 131
}, },
{ {
"__id__": 118 "__id__": 132
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -350,7 +356,7 @@ ...@@ -350,7 +356,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "863518e7-0988-49a7-b86a-a38e18a7df6e" "__uuid__": "499363b7-7c56-4825-ba34-2c79491ac5c8"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -622,7 +628,7 @@ ...@@ -622,7 +628,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "cc97012b-938d-4722-bf03-236ec311aca4" "__uuid__": "7ec21352-6825-4341-a31d-167a64f51734"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -719,7 +725,7 @@ ...@@ -719,7 +725,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "4306a7e1-463b-4586-9415-3c55b5146fd4" "__uuid__": "18703644-13ef-4c4b-8aa1-51861c0d55a3"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -884,7 +890,7 @@ ...@@ -884,7 +890,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "dbf4c42e-4369-4415-81e8-20cbceec34b6" "__uuid__": "21dd6c68-cb4f-4e21-9414-d48f4ac76868"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -1046,7 +1052,7 @@ ...@@ -1046,7 +1052,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "0806b0d1-1612-4944-806e-fd53102cf75c" "__uuid__": "b0ee16b1-d77f-45b7-998a-d504aeb097e3"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -1318,7 +1324,7 @@ ...@@ -1318,7 +1324,7 @@
"_N$startAxis": 0, "_N$startAxis": 0,
"_N$paddingLeft": 0, "_N$paddingLeft": 0,
"_N$paddingRight": 0, "_N$paddingRight": 0,
"_N$paddingTop": 48, "_N$paddingTop": 15,
"_N$paddingBottom": 60, "_N$paddingBottom": 60,
"_N$spacingX": 0, "_N$spacingX": 0,
"_N$spacingY": 58, "_N$spacingY": 58,
...@@ -1495,7 +1501,7 @@ ...@@ -1495,7 +1501,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "73183706-2979-449f-9b60-4d76e84e9b16" "__uuid__": "dec1cc6c-7652-4132-9ab8-86baa3c7397e"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -1627,7 +1633,7 @@ ...@@ -1627,7 +1633,7 @@
"_lineHeight": 48, "_lineHeight": 48,
"_enableWrapText": true, "_enableWrapText": true,
"_N$file": { "_N$file": {
"__uuid__": "48c24708-ba06-46b1-8333-46e2c69a9858" "__uuid__": "b3b0a1d4-b8c9-4c58-88fd-d037cce1b608"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
"_spacingX": 0, "_spacingX": 0,
...@@ -1669,7 +1675,7 @@ ...@@ -1669,7 +1675,7 @@
"_id": "00+e1hkJ5EWqCI9GNwV/Ii" "_id": "00+e1hkJ5EWqCI9GNwV/Ii"
}, },
{ {
"__type__": "998d88YjM1IrJt43BOg8I/T", "__type__": "c3955gfR6dNSJgdT66dklsV",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
...@@ -1725,7 +1731,7 @@ ...@@ -1725,7 +1731,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
462.5, 462.5,
-32, -22,
0, 0,
0, 0,
0, 0,
...@@ -1765,7 +1771,7 @@ ...@@ -1765,7 +1771,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "ecdb5a4b-cf12-4fa4-acc9-e4025d2c2122" "__uuid__": "bcb57f69-3e43-4cbd-8da1-727ae03570d1"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 2, "_sizeMode": 2,
...@@ -1957,7 +1963,7 @@ ...@@ -1957,7 +1963,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "7f3a6f30-3c29-4fd8-af77-8788bf1fac32" "__uuid__": "cc65cf90-36ac-4533-8f1c-0529dc516933"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 2, "_sizeMode": 2,
...@@ -2053,8 +2059,8 @@ ...@@ -2053,8 +2059,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
555.5, 551.5,
-32, -22,
0, 0,
0, 0,
0, 0,
...@@ -2156,7 +2162,7 @@ ...@@ -2156,7 +2162,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "d678c02e-0c4a-400a-9649-1983114c8c9a" "__uuid__": "70f7dff2-7807-4f29-84ee-97e987d66338"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 2, "_sizeMode": 2,
...@@ -2250,7 +2256,7 @@ ...@@ -2250,7 +2256,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8a94a8dd-cfc7-416c-88ca-9f93658d5953" "__uuid__": "640399a0-5da2-449e-bca2-8e8a63c9bed9"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 2, "_sizeMode": 2,
...@@ -2344,7 +2350,7 @@ ...@@ -2344,7 +2350,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "03c91a7f-b926-4500-8d87-05a3095ac0a5" "__uuid__": "50bf845a-9acc-4913-a5e5-6eb145d33386"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 2, "_sizeMode": 2,
...@@ -2376,7 +2382,7 @@ ...@@ -2376,7 +2382,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "177da723-4dae-4484-95f2-e6ce8f7c9b23" "__uuid__": "91d05432-5f8f-4125-acfb-8cea61e94648"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 2, "_sizeMode": 2,
...@@ -2543,8 +2549,8 @@ ...@@ -2543,8 +2549,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
555.5, 551.5,
-32, -22,
0, 0,
0, 0,
0, 0,
...@@ -2646,7 +2652,7 @@ ...@@ -2646,7 +2652,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "d678c02e-0c4a-400a-9649-1983114c8c9a" "__uuid__": "70f7dff2-7807-4f29-84ee-97e987d66338"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 2, "_sizeMode": 2,
...@@ -2740,7 +2746,7 @@ ...@@ -2740,7 +2746,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8a94a8dd-cfc7-416c-88ca-9f93658d5953" "__uuid__": "640399a0-5da2-449e-bca2-8e8a63c9bed9"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 2, "_sizeMode": 2,
...@@ -2834,7 +2840,7 @@ ...@@ -2834,7 +2840,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "03c91a7f-b926-4500-8d87-05a3095ac0a5" "__uuid__": "50bf845a-9acc-4913-a5e5-6eb145d33386"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 2, "_sizeMode": 2,
...@@ -2866,7 +2872,7 @@ ...@@ -2866,7 +2872,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "c70929a6-8e1d-4b0a-be5a-c2ab845afecf" "__uuid__": "5efd1f25-e2c1-4cda-ad7e-7bdf95fe2345"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 2, "_sizeMode": 2,
...@@ -2891,11 +2897,11 @@ ...@@ -2891,11 +2897,11 @@
}, },
"_enabled": true, "_enabled": true,
"_defaultClip": { "_defaultClip": {
"__uuid__": "0d5372fb-b93d-48bc-8fef-9dd83cd1c642" "__uuid__": "1a6cda6f-7066-4a5d-b525-7798367f30e1"
}, },
"_clips": [ "_clips": [
{ {
"__uuid__": "0d5372fb-b93d-48bc-8fef-9dd83cd1c642" "__uuid__": "1a6cda6f-7066-4a5d-b525-7798367f30e1"
} }
], ],
"playOnLoad": true, "playOnLoad": true,
...@@ -3024,7 +3030,7 @@ ...@@ -3024,7 +3030,7 @@
"_id": "65zR58YwRIKof+I/1V4pou" "_id": "65zR58YwRIKof+I/1V4pou"
}, },
{ {
"__type__": "23ce4M3yNpIbq3D8f8IIro+", "__type__": "9085ad/27BMTKn3vM+iI/zk",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
...@@ -3203,7 +3209,7 @@ ...@@ -3203,7 +3209,7 @@
"_lineHeight": 48, "_lineHeight": 48,
"_enableWrapText": true, "_enableWrapText": true,
"_N$file": { "_N$file": {
"__uuid__": "48c24708-ba06-46b1-8333-46e2c69a9858" "__uuid__": "b3b0a1d4-b8c9-4c58-88fd-d037cce1b608"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
"_spacingX": 0, "_spacingX": 0,
...@@ -3371,7 +3377,7 @@ ...@@ -3371,7 +3377,7 @@
"node": { "node": {
"__id__": 21 "__id__": 21
}, },
"_enabled": true, "_enabled": false,
"horizontal": false, "horizontal": false,
"vertical": true, "vertical": true,
"inertia": true, "inertia": true,
...@@ -3392,7 +3398,7 @@ ...@@ -3392,7 +3398,7 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "mask", "_name": "PageView",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 2 "__id__": 2
...@@ -3400,15 +3406,15 @@ ...@@ -3400,15 +3406,15 @@
"_children": [ "_children": [
{ {
"__id__": 73 "__id__": 73
},
{
"__id__": 79
} }
], ],
"_active": false, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 75 "__id__": 81
},
{
"__id__": 76
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3422,8 +3428,8 @@ ...@@ -3422,8 +3428,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1334, "width": 650,
"height": 750 "height": 620
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -3434,8 +3440,8 @@ ...@@ -3434,8 +3440,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 297,
0, -22,
0, 0,
0, 0,
0, 0,
...@@ -3457,20 +3463,27 @@ ...@@ -3457,20 +3463,27 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "8cIiCBJAFPIq4Ev/ei0YiR" "_id": "43m+sHf7BDx6+ATW7s4pb7"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "icon_record", "_name": "view",
"_objFlags": 0, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 72 "__id__": 72
}, },
"_children": [], "_children": [
{
"__id__": 74
}
],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 74 "__id__": 77
},
{
"__id__": 78
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3484,8 +3497,8 @@ ...@@ -3484,8 +3497,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 205, "width": 650,
"height": 208 "height": 620
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -3497,7 +3510,7 @@ ...@@ -3497,7 +3510,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
-240, 0,
0, 0,
0, 0,
0, 0,
...@@ -3519,158 +3532,23 @@ ...@@ -3519,158 +3532,23 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "6f5IpqEClFwaKyo48pdbHP" "_id": "93AsoirVVHN6FihY33s7Kk"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 73
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_armatureName": "Armature",
"_animationName": "newAnimation",
"_preCacheMode": 0,
"_cacheMode": 0,
"playTimes": -1,
"premultipliedAlpha": false,
"_armatureKey": "98532705-4bf7-43f5-8016-6d82b5d468b5#3495d729-5f8e-4b65-847c-765a457a73af",
"_accTime": 0,
"_playCount": 0,
"_frameCache": null,
"_curFrame": null,
"_playing": false,
"_armatureCache": null,
"_N$dragonAsset": {
"__uuid__": "98532705-4bf7-43f5-8016-6d82b5d468b5"
},
"_N$dragonAtlasAsset": {
"__uuid__": "3495d729-5f8e-4b65-847c-765a457a73af"
},
"_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 1,
"_N$_defaultCacheMode": 0,
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "13N8Wx0d5KpaWGqJw5ibYa"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 72
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 45,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "43RDdOlUtM97lO9LRCL+eS"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 72
},
"_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": "a0JUVqsYRGb7Qih5DNfs7a"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "btn_record_start", "_name": "content",
"_objFlags": 0, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 2 "__id__": 73
}, },
"_children": [], "_children": [],
"_active": false, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 78 "__id__": 75
}, },
{ {
"__id__": 79 "__id__": 76
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3684,20 +3562,20 @@ ...@@ -3684,20 +3562,20 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 279, "width": 0,
"height": 101 "height": 350
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
"x": 0.5, "x": 0,
"y": 0.5 "y": 0.5
}, },
"_trs": { "_trs": {
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
297, -200,
-300, 0,
0, 0,
0, 0,
0, 0,
...@@ -3719,46 +3597,604 @@ ...@@ -3719,46 +3597,604 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "bezoa3kulMb4DgS+38kCV0" "_id": "a1uvcXWxhJ3ZA6A3AElPTw"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Layout",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 77 "__id__": 74
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_layoutSize": {
{ "__type__": "cc.Size",
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "width": 0,
} "height": 350
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "ae53f6e5-6076-431d-8e41-18405492b320"
}, },
"_type": 0, "_resize": 1,
"_sizeMode": 1, "_N$layoutType": 1,
"_fillType": 0, "_N$cellSize": {
"_fillCenter": { "__type__": "cc.Size",
"__type__": "cc.Vec2", "width": 40,
"x": 0, "height": 40
"y": 0
}, },
"_fillStart": 0, "_N$startAxis": 0,
"_fillRange": 0, "_N$paddingLeft": 0,
"_isTrimmedMode": true, "_N$paddingRight": 0,
"_atlas": null, "_N$paddingTop": 0,
"_id": "2chIn/WmROIYPbBuE4RY9S" "_N$paddingBottom": 0,
}, "_N$spacingX": 50,
{ "_N$spacingY": 15,
"__type__": "cc.Button", "_N$verticalDirection": 1,
"_name": "", "_N$horizontalDirection": 0,
"_N$affectedByScale": false,
"_id": "b2chxn1p5OZbxpOKErkl/j"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 74
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 0,
"_left": 0,
"_right": -800,
"_top": 135,
"_bottom": 135,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 1200,
"_originalHeight": 350,
"_id": "97vKfqlX5Bp5yIv/sfHHkk"
},
{
"__type__": "cc.Mask",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 73
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_spriteFrame": null,
"_type": 0,
"_segments": 64,
"_N$alphaThreshold": 0,
"_N$inverted": false,
"_id": "b7oAaw+JNJn4Es8U36cA83"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 73
},
"_enabled": false,
"alignMode": 1,
"_target": null,
"_alignFlags": 45,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 400,
"_originalHeight": 350,
"_id": "84N9ab7RBFW7Ml3SpipLUg"
},
{
"__type__": "cc.Node",
"_name": "indicator",
"_objFlags": 512,
"_parent": {
"__id__": 72
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 80
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 100,
"height": 27
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
-160,
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": "1fI31LyolFmJN19cW4T88L"
},
{
"__type__": "cc.PageViewIndicator",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 79
},
"_enabled": true,
"_layout": null,
"_pageView": {
"__id__": 81
},
"_indicators": [],
"spriteFrame": {
"__uuid__": "c9fa51ff-3f01-4601-8f80-325d1b11dab7"
},
"direction": 0,
"cellSize": {
"__type__": "cc.Size",
"width": 10,
"height": 10
},
"spacing": 10,
"_id": "2dkHcVVG1Kn7GjWZhs2PXn"
},
{
"__type__": "cc.PageView",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 72
},
"_enabled": true,
"horizontal": true,
"vertical": true,
"inertia": true,
"brake": 0.4,
"elastic": true,
"bounceDuration": 0.1,
"scrollEvents": [],
"cancelInnerEvents": true,
"_N$content": {
"__id__": 74
},
"content": {
"__id__": 74
},
"scrollThreshold": 0.5,
"autoPageTurningThreshold": 500,
"pageTurningEventTiming": 0.8,
"pageTurningSpeed": 0.3,
"pageEvents": [],
"_N$sizeMode": 0,
"_N$direction": 0,
"_N$indicator": {
"__id__": 80
},
"_id": "bbvs4CbP1AJYLVxODdrurA"
},
{
"__type__": "cc.Node",
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 2
},
"_children": [
{
"__id__": 83
}
],
"_active": false,
"_components": [
{
"__id__": 85
},
{
"__id__": 86
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1334,
"height": 750
},
"_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": "8cIiCBJAFPIq4Ev/ei0YiR"
},
{
"__type__": "cc.Node",
"_name": "icon_record",
"_objFlags": 0,
"_parent": {
"__id__": 82
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 84
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 205,
"height": 208
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
-240,
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": "6f5IpqEClFwaKyo48pdbHP"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 83
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_armatureName": "Armature",
"_animationName": "newAnimation",
"_preCacheMode": 0,
"_cacheMode": 0,
"playTimes": -1,
"premultipliedAlpha": false,
"_armatureKey": "0e6b87da-2e7d-4339-b7ff-c6fd7d7bb0b4#7c07e323-ac64-4444-8ae4-b76998b85028",
"_accTime": 0,
"_playCount": 0,
"_frameCache": null,
"_curFrame": null,
"_playing": false,
"_armatureCache": null,
"_N$dragonAsset": {
"__uuid__": "0e6b87da-2e7d-4339-b7ff-c6fd7d7bb0b4"
},
"_N$dragonAtlasAsset": {
"__uuid__": "7c07e323-ac64-4444-8ae4-b76998b85028"
},
"_N$_defaultArmatureIndex": 0,
"_N$_animationIndex": 1,
"_N$_defaultCacheMode": 0,
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "13N8Wx0d5KpaWGqJw5ibYa"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 82
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 45,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "43RDdOlUtM97lO9LRCL+eS"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 82
},
"_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": "a0JUVqsYRGb7Qih5DNfs7a"
},
{
"__type__": "cc.Node",
"_name": "btn_record_start",
"_objFlags": 0,
"_parent": {
"__id__": 2
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 88
},
{
"__id__": 89
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 279,
"height": 101
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
297,
-300,
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": "bezoa3kulMb4DgS+38kCV0"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 87
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "99ff0f7f-fdaa-4459-89df-cf1d93b666e9"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "2chIn/WmROIYPbBuE4RY9S"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 77 "__id__": 87
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -3830,13 +4266,13 @@ ...@@ -3830,13 +4266,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 81 "__id__": 91
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 84 "__id__": 94
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3892,16 +4328,16 @@ ...@@ -3892,16 +4328,16 @@
"_name": "label", "_name": "label",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 80 "__id__": 90
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 82 "__id__": 92
}, },
{ {
"__id__": 83 "__id__": 93
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3957,7 +4393,7 @@ ...@@ -3957,7 +4393,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 81 "__id__": 91
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3973,7 +4409,7 @@ ...@@ -3973,7 +4409,7 @@
"_lineHeight": 64, "_lineHeight": 64,
"_enableWrapText": true, "_enableWrapText": true,
"_N$file": { "_N$file": {
"__uuid__": "10d7986f-e45e-477c-a36c-013d0f2f6aa5" "__uuid__": "5426cd8a-6b5d-4fb0-8117-3bf3bbb23936"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
"_spacingX": 0, "_spacingX": 0,
...@@ -3992,7 +4428,7 @@ ...@@ -3992,7 +4428,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 81 "__id__": 91
}, },
"_enabled": false, "_enabled": false,
"_color": { "_color": {
...@@ -4010,7 +4446,7 @@ ...@@ -4010,7 +4446,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 80 "__id__": 90
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4021,7 +4457,7 @@ ...@@ -4021,7 +4457,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8eda48c8-60ae-420e-b20a-734f2f05467a" "__uuid__": "3ffa057c-34dc-4175-ac4e-346cd09cea9e"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -4048,10 +4484,10 @@ ...@@ -4048,10 +4484,10 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 86 "__id__": 96
}, },
{ {
"__id__": 87 "__id__": 97
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4107,7 +4543,7 @@ ...@@ -4107,7 +4543,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 85 "__id__": 95
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4118,7 +4554,7 @@ ...@@ -4118,7 +4554,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "524ba650-639c-48c0-adf4-b74f1fc8a1d3" "__uuid__": "3589ebfd-b890-41f5-9779-87b22be66397"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -4139,7 +4575,7 @@ ...@@ -4139,7 +4575,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 85 "__id__": 95
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -4211,16 +4647,16 @@ ...@@ -4211,16 +4647,16 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 89 "__id__": 99
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 91 "__id__": 101
}, },
{ {
"__id__": 92 "__id__": 102
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4276,13 +4712,13 @@ ...@@ -4276,13 +4712,13 @@
"_name": "label", "_name": "label",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 88 "__id__": 98
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 90 "__id__": 100
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4338,7 +4774,7 @@ ...@@ -4338,7 +4774,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 89 "__id__": 99
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4371,7 +4807,7 @@ ...@@ -4371,7 +4807,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 88 "__id__": 98
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4382,7 +4818,7 @@ ...@@ -4382,7 +4818,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "97c41253-7e7a-4193-abc2-824f4c8b188b" "__uuid__": "7245a885-b55f-4db1-8fb8-72bb815a7483"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -4403,7 +4839,7 @@ ...@@ -4403,7 +4839,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 88 "__id__": 98
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -4434,25 +4870,25 @@ ...@@ -4434,25 +4870,25 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 94 "__id__": 104
}, },
{ {
"__id__": 98 "__id__": 108
}, },
{ {
"__id__": 101 "__id__": 111
}, },
{ {
"__id__": 103 "__id__": 113
}, },
{ {
"__id__": 107 "__id__": 117
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 111 "__id__": 121
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4508,19 +4944,19 @@ ...@@ -4508,19 +4944,19 @@
"_name": "mask", "_name": "mask",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 93 "__id__": 103
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 95 "__id__": 105
}, },
{ {
"__id__": 96 "__id__": 106
}, },
{ {
"__id__": 97 "__id__": 107
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4576,7 +5012,7 @@ ...@@ -4576,7 +5012,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 94 "__id__": 104
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4608,7 +5044,7 @@ ...@@ -4608,7 +5044,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 94 "__id__": 104
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -4635,7 +5071,7 @@ ...@@ -4635,7 +5071,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 94 "__id__": 104
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -4703,16 +5139,16 @@ ...@@ -4703,16 +5139,16 @@
"_name": "bg", "_name": "bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 93 "__id__": 103
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 99 "__id__": 109
}, },
{ {
"__id__": 100 "__id__": 110
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4768,7 +5204,7 @@ ...@@ -4768,7 +5204,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 98 "__id__": 108
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4779,7 +5215,7 @@ ...@@ -4779,7 +5215,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "1ebe30a0-2832-4f7b-a0bf-b4b59d6d5420" "__uuid__": "cf998b2c-faaa-479b-9778-40f45f04a9e9"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -4800,7 +5236,7 @@ ...@@ -4800,7 +5236,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 98 "__id__": 108
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -4861,7 +5297,7 @@ ...@@ -4861,7 +5297,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 98 "__id__": 108
}, },
"_id": "dbf6SlfeFJtqujsCK52/CR" "_id": "dbf6SlfeFJtqujsCK52/CR"
}, },
...@@ -4870,13 +5306,13 @@ ...@@ -4870,13 +5306,13 @@
"_name": "label", "_name": "label",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 93 "__id__": 103
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 102 "__id__": 112
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4932,7 +5368,7 @@ ...@@ -4932,7 +5368,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 101 "__id__": 111
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4948,7 +5384,7 @@ ...@@ -4948,7 +5384,7 @@
"_lineHeight": 48, "_lineHeight": 48,
"_enableWrapText": true, "_enableWrapText": true,
"_N$file": { "_N$file": {
"__uuid__": "57ac8728-e57f-4644-9c7a-aaac1c6f629a" "__uuid__": "c9459d7c-e3d2-4aa1-9f58-1782c5cffcd4"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
"_spacingX": 0, "_spacingX": 0,
...@@ -4967,16 +5403,16 @@ ...@@ -4967,16 +5403,16 @@
"_name": "start", "_name": "start",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 93 "__id__": 103
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 104 "__id__": 114
}, },
{ {
"__id__": 105 "__id__": 115
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5032,7 +5468,7 @@ ...@@ -5032,7 +5468,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 103 "__id__": 113
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5043,7 +5479,7 @@ ...@@ -5043,7 +5479,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "cd741e27-5a5f-4492-8dcf-3434c5f3ac9e" "__uuid__": "a2d31e93-9014-4d97-addd-9fdbd407145a"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -5064,7 +5500,7 @@ ...@@ -5064,7 +5500,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 103 "__id__": 113
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -5073,7 +5509,7 @@ ...@@ -5073,7 +5509,7 @@
"zoomScale": 1.2, "zoomScale": 1.2,
"clickEvents": [ "clickEvents": [
{ {
"__id__": 106 "__id__": 116
} }
], ],
"_N$interactable": true, "_N$interactable": true,
...@@ -5129,7 +5565,7 @@ ...@@ -5129,7 +5565,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 103 "__id__": 113
}, },
"_id": "f86X4c6OtP4K2F2ODiAK9B" "_id": "f86X4c6OtP4K2F2ODiAK9B"
}, },
...@@ -5139,7 +5575,7 @@ ...@@ -5139,7 +5575,7 @@
"__id__": 2 "__id__": 2
}, },
"component": "", "component": "",
"_componentId": "408a6f4ZfpM8Yzyg+IOGg/V", "_componentId": "4c587oiYVlCf7OLcCqCOwcm",
"handler": "onCallBack", "handler": "onCallBack",
"customEventData": "start" "customEventData": "start"
}, },
...@@ -5148,16 +5584,16 @@ ...@@ -5148,16 +5584,16 @@
"_name": "restart", "_name": "restart",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 93 "__id__": 103
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 108 "__id__": 118
}, },
{ {
"__id__": 109 "__id__": 119
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5213,7 +5649,7 @@ ...@@ -5213,7 +5649,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 107 "__id__": 117
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5224,7 +5660,7 @@ ...@@ -5224,7 +5660,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "7904e895-909f-4d90-aafa-fc62de9e4a66" "__uuid__": "259193c5-c6bf-4b30-9dfe-cef344a5a3f5"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -5245,7 +5681,7 @@ ...@@ -5245,7 +5681,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 107 "__id__": 117
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -5254,7 +5690,7 @@ ...@@ -5254,7 +5690,7 @@
"zoomScale": 1.2, "zoomScale": 1.2,
"clickEvents": [ "clickEvents": [
{ {
"__id__": 110 "__id__": 120
} }
], ],
"_N$interactable": true, "_N$interactable": true,
...@@ -5320,7 +5756,7 @@ ...@@ -5320,7 +5756,7 @@
"__id__": 2 "__id__": 2
}, },
"component": "", "component": "",
"_componentId": "408a6f4ZfpM8Yzyg+IOGg/V", "_componentId": "4c587oiYVlCf7OLcCqCOwcm",
"handler": "onCallBack", "handler": "onCallBack",
"customEventData": "restart" "customEventData": "restart"
}, },
...@@ -5329,7 +5765,7 @@ ...@@ -5329,7 +5765,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 93 "__id__": 103
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -5360,7 +5796,7 @@ ...@@ -5360,7 +5796,7 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 113 "__id__": 123
} }
], ],
"_active": true, "_active": true,
...@@ -5418,11 +5854,11 @@ ...@@ -5418,11 +5854,11 @@
"_name": "audio", "_name": "audio",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 112 "__id__": 122
}, },
"_children": [ "_children": [
{ {
"__id__": 114 "__id__": 124
} }
], ],
"_active": true, "_active": true,
...@@ -5480,13 +5916,13 @@ ...@@ -5480,13 +5916,13 @@
"_name": "btn", "_name": "btn",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 113 "__id__": 123
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 115 "__id__": 125
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5542,11 +5978,11 @@ ...@@ -5542,11 +5978,11 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 114 "__id__": 124
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
"__uuid__": "f0680ae0-c079-45ef-abd7-9e63d90b982b" "__uuid__": "f45bebf9-f989-496e-820a-d0703ce71cc0"
}, },
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
...@@ -5556,6 +5992,234 @@ ...@@ -5556,6 +5992,234 @@
"preload": false, "preload": false,
"_id": "dey05oKrBIspvsDa6pOIQz" "_id": "dey05oKrBIspvsDa6pOIQz"
}, },
{
"__type__": "cc.Node",
"_name": "btn_arrow",
"_objFlags": 0,
"_parent": {
"__id__": 2
},
"_children": [
{
"__id__": 127
}
],
"_active": true,
"_components": [
{
"__id__": 129
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 140,
"height": 60
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
608,
-320,
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": "92aRTUiUdNh6LCZVxyZHZh"
},
{
"__type__": "cc.Node",
"_name": "btn_arrow",
"_objFlags": 0,
"_parent": {
"__id__": 126
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 128
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 79,
"height": 54
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-0.623,
-0.894,
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": "d5GlYR6GZMiY+pCs5c1+dg"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 127
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "12c1360d-6e2c-4dbd-9ca4-9bb1455b539d"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "a1CA1bxG5MH7kI/Jwnu5Lk"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 126
},
"_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": "15HkoamNxAXYUbyeq1Sc83"
},
{ {
"__type__": "cc.Canvas", "__type__": "cc.Canvas",
"_name": "", "_name": "",
...@@ -5601,7 +6265,7 @@ ...@@ -5601,7 +6265,7 @@
"_id": "29zXboiXFBKoIV4PQ2liTe" "_id": "29zXboiXFBKoIV4PQ2liTe"
}, },
{ {
"__type__": "408a6f4ZfpM8Yzyg+IOGg/V", "__type__": "4c587oiYVlCf7OLcCqCOwcm",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
...@@ -5615,7 +6279,13 @@ ...@@ -5615,7 +6279,13 @@
"__id__": 23 "__id__": 23
}, },
"tip": { "tip": {
"__id__": 93 "__id__": 103
},
"pagContent": {
"__id__": 74
},
"btn_arrow": {
"__id__": 126
}, },
"_id": "eaTVUpqahPfZeO9+sUI7RP" "_id": "eaTVUpqahPfZeO9+sUI7RP"
} }
......
{ {
"ver": "1.2.9", "ver": "1.2.9",
"uuid": "0737ce42-24f0-45c6-8e1a-8bdab4f74ba3", "uuid": "dc6cadcb-bc4a-4828-aec9-68b2704af968",
"asyncLoadAssets": false, "asyncLoadAssets": false,
"autoReleaseAssets": true, "autoReleaseAssets": true,
"subMetas": {} "subMetas": {}
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
* @FilePath: \ls_gramophone\assets\ls_gramophone\scene\ls_gramophone.ts * @FilePath: \ls_gramophone\assets\ls_gramophone\scene\ls_gramophone.ts
*/ */
import { threadId } from 'worker_threads';
import Item from '../script/Item'; import Item from '../script/Item';
import { MyCocosSceneComponent } from '../script/MyCocosSceneComponent'; import { MyCocosSceneComponent } from '../script/MyCocosSceneComponent';
import { onHomeworkFinish } from '../script/util'; import { onHomeworkFinish } from '../script/util';
...@@ -24,6 +25,12 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -24,6 +25,12 @@ export default class SceneComponent extends MyCocosSceneComponent {
@property(cc.Node) @property(cc.Node)
tip: cc.Node = null; tip: cc.Node = null;
@property(cc.Node)
pagContent: cc.Node = null;
@property(cc.Node)
btn_arrow: cc.Node = null;
// 录音中 // 录音中
_recording = false; _recording = false;
// 录音音频 // 录音音频
...@@ -36,6 +43,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -36,6 +43,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
_results = []; _results = [];
private _curData = null;
addPreloadImage() { addPreloadImage() {
// TODO 根据自己的配置预加载图片资源 // TODO 根据自己的配置预加载图片资源
this._imageResList.push({ url: this.data.pageImage }); this._imageResList.push({ url: this.data.pageImage });
...@@ -46,12 +54,12 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -46,12 +54,12 @@ export default class SceneComponent extends MyCocosSceneComponent {
this._audioResList.push({ url: this.data.questionTextAudio }); this._audioResList.push({ url: this.data.questionTextAudio });
this._audioResList.push({ url: this.data.pageAudio }); this._audioResList.push({ url: this.data.pageAudio });
for (let index = 0; index < this.data.sentences.length; index++) { for (let index = 0; index < this.data.questions.length; index++) {
this._audioResList.push({ url: this.data.sentences[index].audio }); this._audioResList.push({ url: this.data.questions[index].audio });
} }
} }
addPreloadAnima() {} addPreloadAnima() { }
onLoadEnd() { onLoadEnd() {
// TODO 加载完成后的逻辑写在这里, 下面的代码仅供参考 // TODO 加载完成后的逻辑写在这里, 下面的代码仅供参考
...@@ -62,12 +70,18 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -62,12 +70,18 @@ export default class SceneComponent extends MyCocosSceneComponent {
initData() { initData() {
this._recording = false; this._recording = false;
this._curData = null;
this.roundIdx = 0;
this._records.length = 0; this._records.length = 0;
this._results.length = 0; this._results.length = 0;
this.data.sentences.forEach((element) => { this.data.questions.forEach((element, idx) => {
this._records.push(null); this._records.push([]);
this._results.push(null); this._results.push([]);
element.options.forEach(op => {
this._records[idx].push(null);
this._results[idx].push(null);
});
}); });
} }
...@@ -77,13 +91,6 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -77,13 +91,6 @@ export default class SceneComponent extends MyCocosSceneComponent {
cc.find('Canvas/bg_title/label').getComponent(cc.Label).string = this.data.title; cc.find('Canvas/bg_title/label').getComponent(cc.Label).string = this.data.title;
this.getSpriteFrimeByUrl(this.data.pageImage + '?x-oss-process=image/resize,m_fill,h_520,w_560', (sp) => {
// this.getSpriteFrimeByUrl(this.data.pageImage, (sp) => {
cc.find('Canvas/bg_img/img').getComponent(cc.Sprite).spriteFrame = sp;
cc.find('Canvas/bg_img/img').scale = Math.max(520 / cc.find('Canvas/bg_img/img').width, 560 / cc.find('Canvas/bg_img/img').height);
});
let play = cc.find('Canvas/btn_play'); let play = cc.find('Canvas/btn_play');
let stop = cc.find('Canvas/btn_stop'); let stop = cc.find('Canvas/btn_stop');
play.active = false; play.active = false;
...@@ -104,84 +111,92 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -104,84 +111,92 @@ export default class SceneComponent extends MyCocosSceneComponent {
play.active = true; play.active = true;
stop.active = false; stop.active = false;
this.playAudioByUrl(this.data.pageAudio, () => { this.playAudioByUrl(this.data.questions[this.roundIdx].audio, () => {
play.active = false; play.active = false;
stop.active = true; stop.active = true;
}); });
}); });
let pag = cc.find("PageView", this.node);
for (let index = 0; index < this.data.sentences.length; index++) { pag.on('page-turning', this.pageTurning, this);
let item = cc.instantiate(this.item); for (let i = 0; i < this.data.questions.length; i++) {
item.active = true; let ScrollView = cc.instantiate(cc.find("ScrollView", this.node));
item.name = '' + index; // this.pagContent.addChild(ScrollView);
item.parent = this.content; pag.getComponent(cc.PageView).addPage(ScrollView);
} let option = this.data.questions[i];
let content = cc.find("view/content", ScrollView);
for (let index = 0; index < this.content.childrenCount; index++) { for (let index = 0; index < option.options.length; index++) {
const element = this.content.children[index]; let quest = option.options[index];
element.getComponent(Item).init(this.data.sentences[index].text); let element = cc.instantiate(this.item);
element.active = true;
// 播放当前句子 element.name = '' + index;
element.off('click'); element.parent = content;
element.on('click', () => {
this.resetText(); // const element = this.content.children[index];
this.resetRecord(); element.getComponent(Item).init(quest.text);
cc.audioEngine.stopAll();
play.active = false; // 播放当前句子
stop.active = true; element.off('click');
element.on('click', () => {
element.getComponent(Item).playing(); this.resetText();
this.playAudioByUrl(this.data.sentences[index].audio, () => { this.resetRecord();
element.getComponent(Item).stop(); cc.audioEngine.stopAll();
play.active = false;
stop.active = true;
element.getComponent(Item).playing();
this.playAudioByUrl(quest.audio, () => {
element.getComponent(Item).stop();
});
}); });
});
element.getComponent(Item).recorded(); element.getComponent(Item).recorded();
let record = cc.find('btn_record', element); let record = cc.find('btn_record', element);
record.off('click'); record.off('click');
record.on('click', () => { record.on('click', () => {
if (this._recording) return; if (this._recording) return;
this.resetText(); this.resetText();
this.resetRecord(); this.resetRecord();
cc.audioEngine.stopAll(); cc.audioEngine.stopAll();
play.active = false; play.active = false;
stop.active = true; stop.active = true;
this.playLocalAudio('btn'); this.playLocalAudio('btn');
element.getComponent(Item).recording(); element.getComponent(Item).recording();
// 显示录音界面 // 显示录音界面
mask.active = true; mask.active = true;
record_start.active = true; record_start.active = true;
record_stop.active = false; record_stop.active = false;
this._curData = quest;
this._curIndex = index;
});
this._curIndex = index; element.getComponent(Item).hideRecord();
});
let myrecord = cc.find('btn_myrecord', element);
let myrecord_play = cc.find('btn_myrecord_play', element);
myrecord.off('click');
myrecord_play.off('click');
myrecord.on('click', () => {
this.resetText();
this.resetRecord();
cc.audioEngine.stopAll();
element.getComponent(Item).playRecord();
//
if (this._records[this.roundIdx][index] != null) {
this.playAudioByUrl(this._records[this.roundIdx][index], () => {
element.getComponent(Item).stopRecord();
}); // 播放音效
}
});
myrecord_play.on('click', () => {
cc.audioEngine.stopAll();
element.getComponent(Item).stopRecord();
});
}
element.getComponent(Item).hideRecord();
let myrecord = cc.find('btn_myrecord', element);
let myrecord_play = cc.find('btn_myrecord_play', element);
myrecord.off('click');
myrecord_play.off('click');
myrecord.on('click', () => {
this.resetText();
this.resetRecord();
cc.audioEngine.stopAll();
element.getComponent(Item).playRecord();
//
if (this._records[index] != null) {
this.playAudioByUrl(this._records[index], () => {
element.getComponent(Item).stopRecord();
}); // 播放音效
}
});
myrecord_play.on('click', () => {
cc.audioEngine.stopAll();
element.getComponent(Item).stopRecord();
});
} }
// 录音界面 // 录音界面
...@@ -210,8 +225,8 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -210,8 +225,8 @@ export default class SceneComponent extends MyCocosSceneComponent {
countdown.active = true; countdown.active = true;
let cd = 10; let cd = 10;
if (this._curIndex !== -1) { if (this._curData) {
cd = this.data.sentences[this._curIndex].duration; cd = this._curData.duration;
} }
this.unschedule(this.onCountdown); this.unschedule(this.onCountdown);
this._countdown = Number(cd) + 1; this._countdown = Number(cd) + 1;
...@@ -248,18 +263,29 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -248,18 +263,29 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.unschedule(this.onCountdown); this.unschedule(this.onCountdown);
this._curIndex = -1; this._curIndex = -1;
this._curData = null
this._recording = false; this._recording = false;
let idx = -1; // 获取当前录制下标 let idx = -1; // 获取当前录制下标
for (let index = 0; index < this.content.childrenCount; index++) { // for (let index = 0; index < this.content.childrenCount; index++) {
const element = this.content.children[index]; // const element = this.content.children[index];
// 正在录制中 // // 正在录制中
if (element.getComponent(Item).getRecording()) { // if (element.getComponent(Item).getRecording()) {
idx = index; // idx = index;
break; // break;
} // }
} // }
this.pagContent.children.forEach((sc) => {
let content = cc.find("view/content", sc);
content.children.forEach((item, index) => {
if (item.getComponent(Item).getRecording()) {
idx = index;
}
})
})
this.log('idx:' + idx);
if (window['courseware']) { if (window['courseware']) {
window['courseware'].stopTest((res) => { window['courseware'].stopTest((res) => {
...@@ -270,7 +296,9 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -270,7 +296,9 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.log('json res.result.sentences' + JSON.stringify(res.result.sentences)); this.log('json res.result.sentences' + JSON.stringify(res.result.sentences));
if (idx !== -1) { if (idx !== -1) {
let it = this.content.children[idx].getComponent(Item); // let it = this.content.children[idx].getComponent(Item);
let content = cc.find("view/content", this.pagContent.children[0]);
let it = content.children[idx].getComponent(Item);
it.recorded(); it.recorded();
let arr = []; let arr = [];
...@@ -306,7 +334,8 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -306,7 +334,8 @@ export default class SceneComponent extends MyCocosSceneComponent {
if (res && res.audioUrl) { if (res && res.audioUrl) {
if (idx !== -1) { if (idx !== -1) {
this._records[idx] = res.audioUrl; this._records[this.roundIdx][idx] = res.audioUrl;
// this._records[idx] = res.audioUrl;
this.log(`${idx} ===> ${res.audioUrl}`); this.log(`${idx} ===> ${res.audioUrl}`);
this.resetRecord(); this.resetRecord();
...@@ -314,42 +343,96 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -314,42 +343,96 @@ export default class SceneComponent extends MyCocosSceneComponent {
} }
} }
this._results[idx] = res; this._results[this.roundIdx][idx] = res;
for (const iterator of this._results) { for (const iterator of this._results) {
if (iterator === null) { for (const op of iterator) {
return; if (op === null) {
return;
}
} }
} }
onHomeworkFinish({ stone: 10, details: this._results }); onHomeworkFinish({ stone: 10, details: this._results });
}); });
} else { } else {
if (idx !== -1) { if (idx !== -1) {
this.content.children[idx].getComponent(Item).recorded(); let content = cc.find("view/content", this.pagContent.children[0]);
content.children[idx].getComponent(Item).recorded();
} }
// 模拟测试 // 模拟测试
// this._records[idx] = 'http://staging-teach.cdn.ireadabc.com/92ddbc65e9af775f7a8450a5bef1a732.mp3'; this._records[this.roundIdx][idx] = 'http://staging-teach.cdn.ireadabc.com/92ddbc65e9af775f7a8450a5bef1a732.mp3';
} }
this.resetRecord();
}); });
this.btn_arrow.on(cc.Node.EventType.TOUCH_END, this.onArrow, this);
this.setPagBg();
} }
private roundIdx;
private setPagBg() {
let play = cc.find('Canvas/btn_play');
let stop = cc.find('Canvas/btn_stop');
play.active = false;
stop.active = true;
cc.audioEngine.stopAll();
this.resetText();
this.resetRecord();
let pag = cc.find("PageView", this.node);
let idx = pag.getComponent(cc.PageView).getCurrentPageIndex();
let data = this.data.questions[this.roundIdx].pageImage;
this.getSpriteFrimeByUrl(data + '?x-oss-process=image/resize,m_fill,h_520,w_560', (sp) => {
// this.getSpriteFrimeByUrl(this.data.pageImage, (sp) => {
cc.find('Canvas/bg_img/img').getComponent(cc.Sprite).spriteFrame = sp;
cc.find('Canvas/bg_img/img').scale = Math.max(520 / cc.find('Canvas/bg_img/img').width, 560 / cc.find('Canvas/bg_img/img').height);
});
}
private arrowTouch = false;
private onArrow() {
if (this.arrowTouch) return;
this.arrowTouch = true;
this.roundIdx++;
let pag = cc.find("PageView", this.node);
let len = pag.getComponent(cc.PageView).getPages().length;
if (len <= 1) return;
pag.getComponent(cc.PageView).scrollToPage(1, 0.5);
setTimeout(() => {
this.setPagBg();
this.arrowTouch = false;
pag.getComponent(cc.PageView).removePageAtIndex(0);
}, 600);
}
private pageTurning() {
if (this.arrowTouch) return;
this.roundIdx++;
let pag = cc.find("PageView", this.node);
let idx = pag.getComponent(cc.PageView).getCurrentPageIndex();
if (idx != 0) {
pag.getComponent(cc.PageView).removePageAtIndex(0);
}
this.setPagBg();
this.log("31232")
}
/** /**
* 重置文字 * 重置文字
*/ */
resetText() { resetText() {
for (let index = 0; index < this.content.childrenCount; index++) { this.pagContent.children.forEach((sc) => {
const element = this.content.children[index]; let content = cc.find("view/content", sc);
element.getComponent(Item).stop(); content.children.forEach((item) => {
} item.getComponent(Item).stop();
})
})
} }
/** /**
* 重置录制音频 * 重置录制音频
*/ */
resetRecord() { resetRecord() {
for (let index = 0; index < this.content.childrenCount; index++) { let content = cc.find("view/content", this.pagContent.children[0]);
const element = this.content.children[index]; for (let index = 0; index < content.childrenCount; index++) {
if (this._records[index] === null) { const element = content.children[index];
if (this._records[this.roundIdx][index] === null) {
element.getComponent(Item).hideRecord(); element.getComponent(Item).hideRecord();
} else { } else {
console.log(`===> ${index}`); console.log(`===> ${index}`);
...@@ -373,12 +456,12 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -373,12 +456,12 @@ export default class SceneComponent extends MyCocosSceneComponent {
tip.off('click'); tip.off('click');
tip.on('click', () => { tip.on('click', () => {
cc.audioEngine.stopAll(); cc.audioEngine.stopAll();
this.playAudioByUrl(this.data.questionTextAudio, () => {}); // 播放提示音效 this.playAudioByUrl(this.data.questionTextAudio, () => { }); // 播放提示音效
}); });
// 提示内容 // 提示内容
let tip_label = cc.find('label', this.tip).getComponent(cc.Label); let tip_label = cc.find('label', this.tip).getComponent(cc.Label);
tip_label.string = this.data.questionText; tip_label.string = this.data.questionText;
this.playAudioByUrl(this.data.questionTextAudio, () => {}); // 播放提示音效 this.playAudioByUrl(this.data.questionTextAudio, () => { }); // 播放提示音效
} }
/** /**
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "408a67f8-65fa-4cf1-8cf2-83e20e1a0fd5", "uuid": "4c587a22-6159-427f-b38b-702a823b0726",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "b0c008bc-cf92-463b-8360-0984e13c2e4d", "uuid": "78f3ccab-beba-462c-a398-db21c137d5c6",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
...@@ -53,8 +53,10 @@ export default class Item extends cc.Component { ...@@ -53,8 +53,10 @@ export default class Item extends cc.Component {
this.scheduleOnce(() => { this.scheduleOnce(() => {
this.node.height = this.label.getRows() * 48; // 更新节点高度 this.node.height = this.label.getRows() * 48; // 更新节点高度
let c = this.node.width - this.label.getLastStringLenght();
if (this.node.width - this.label.getLastStringLenght() >= 170 - 48) { // console.log(str);
// console.log("c: " + c);
if (this.node.width - this.label.getLastStringLenght() >= 118) {//170-48
this.record.getComponent(cc.Widget).enabled = false; this.record.getComponent(cc.Widget).enabled = false;
this.record_click.getComponent(cc.Widget).enabled = false; this.record_click.getComponent(cc.Widget).enabled = false;
this.myrecord.getComponent(cc.Widget).enabled = false; this.myrecord.getComponent(cc.Widget).enabled = false;
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "23ce4337-c8da-486e-adc3-f1ff0822ba3e", "uuid": "9085a77f-dbb0-4c4c-a9f7-bccfa223fce4",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "f8b451ff-857c-4ca8-9870-866bc5154a29", "uuid": "a7cdc836-7521-45e3-b392-ece599e652ce",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
...@@ -8,36 +8,65 @@ ...@@ -8,36 +8,65 @@
*/ */
export const defaultData = { export const defaultData = {
title: '标题标题', "title": "故事留声机",
questionText: '题目说明题目说明题目说明题目说明题目说明题目说明题目说明题目说明题目说明题目说明题目说明题目说明题目说明题目说明题目说明题目说明题目说明题目说明题目说明题目说明题目说明题目说明题目说明题目说明题目说明题目说明题目说明题目说明', "questionText": "欢乐的故事时间到了,亲爱的小玩家,请点击故事台词,仔细听,然后大声的模仿,全部完成后,根据模仿情况,你将获得相应的能量石奖励!快去试试吧!",
questionTextAudio: 'http://staging-teach.cdn.ireadabc.com/92ddbc65e9af775f7a8450a5bef1a732.mp3', "questionTextAudio": "http://staging-teach.cdn.ireadabc.com/92ddbc65e9af775f7a8450a5bef1a732.mp3",
pageImage: 'http://staging-teach.cdn.ireadabc.com/0d332cb2b167feb4204b1d77a6f02ed6.jpg', // 左边的图片 "questionTextAudioName": "热气球大战 游戏说明.mp3",
pageAudio: 'http://staging-teach.cdn.ireadabc.com/c0e467e1950cb24b1e581737a1344cb4.mp3', // 整体音频 "pageAudio": 'http://staging-teach.cdn.ireadabc.com/c0e467e1950cb24b1e581737a1344cb4.mp3', // 整体音频
sentences: [ "questions": [{
{ "options": [{
duration: 7, "duration": 7,
text: 'Good morning', "text": 'Good morning',
audio: 'http://staging-teach.cdn.ireadabc.com/c0e467e1950cb24b1e581737a1344cb4.mp3', "audio": 'http://staging-teach.cdn.ireadabc.com/c0e467e1950cb24b1e581737a1344cb4.mp3',
}, }, {
{ "duration": 8,
duration: 8, "text": 'what can i do for you',
text: 'what can i do for you', "audio": 'http://staging-teach.cdn.ireadabc.com/c0e467e1950cb24b1e581737a1344cb4.mp3',
audio: 'http://staging-teach.cdn.ireadabc.com/c0e467e1950cb24b1e581737a1344cb4.mp3', }, {
}, "duration": 9,
{ "text": 'Hello, how are you',
duration: 9, "audio": 'http://staging-teach.cdn.ireadabc.com/17edcaecd09a72a64a77480673cdc232.mp3',
text: 'Hello, how are you', }, {
audio: 'http://staging-teach.cdn.ireadabc.com/17edcaecd09a72a64a77480673cdc232.mp3', "duration": 10,
}, "text": 'Hello, how old are you yo',
{ "audio": 'http://staging-teach.cdn.ireadabc.com/17edcaecd09a72a64a77480673cdc232.mp3',
duration: 10, }, {
text: 'Hello, how old are you you', "duration": 11,
audio: 'http://staging-teach.cdn.ireadabc.com/17edcaecd09a72a64a77480673cdc232.mp3', "text": 'Hello, how dare you, Hello, how dare you how dare you how dare you how dare you h',
}, "audio": 'http://staging-teach.cdn.ireadabc.com/17edcaecd09a72a64a77480673cdc232.mp3',
{ }
duration: 11, ],
text: 'Hello, how dare you, Hello, how dare you how dare you how dare you how dare you h', "type": "",
audio: 'http://staging-teach.cdn.ireadabc.com/17edcaecd09a72a64a77480673cdc232.mp3', "audio": "http://staging-teach.cdn.ireadabc.com/c0e467e1950cb24b1e581737a1344cb4.mp3",
}, "audioName": "热气球大战 游戏说明.mp3",
], "pageImage": "http://staging-teach.cdn.ireadabc.com/2e3b759b961266f3a37559ef759293d7.png"
}; }, {
"options": [{
"duration": 7,
"text": 'Good morning 1',
"audio": 'http://staging-teach.cdn.ireadabc.com/c0e467e1950cb24b1e581737a1344cb4.mp3',
}, {
"duration": 8,
"text": 'what can i do for you 1',
"audio": 'http://staging-teach.cdn.ireadabc.com/c0e467e1950cb24b1e581737a1344cb4.mp3',
}, {
"duration": 9,
"text": 'Hello, how are you',
"audio": 'http://staging-teach.cdn.ireadabc.com/17edcaecd09a72a64a77480673cdc232.mp3',
}, {
"duration": 10,
"text": 'Hello, how old are you you',
"audio": 'http://staging-teach.cdn.ireadabc.com/17edcaecd09a72a64a77480673cdc232.mp3',
}, {
"duration": 11,
"text": 'Hello, how dare you, Hello, how dare you how dare you how dare you how dare you h',
"audio": 'http://staging-teach.cdn.ireadabc.com/17edcaecd09a72a64a77480673cdc232.mp3',
}
],
"type": "",
"audio": "https://teach.cdn.ireadabc.com/5b720d91d319a52655ffe39fb14c2948.mp3",
"audioName": "热气球大战 游戏说明.mp3",
"pageImage": "http://staging-teach.cdn.ireadabc.com/7780195055731416480edbc97072fe5b.png"
}
]
}
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "c41b0e51-55d7-443c-af3a-b22c3dd9b9e5", "uuid": "a5805ade-0f28-4a7c-9b2b-e6f22beeb6b8",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "b54300af-b8e5-4b4e-aa2f-9ac1cef7b598", "uuid": "2bcb6aaa-e20c-48c4-8e3a-dda855482927",
"isPlugin": true, "isPlugin": true,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "998d8f18-8ccd-48ac-9b78-dc13a0f08fd3", "uuid": "c395581f-47a7-4d48-981d-4fae9d925b15",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "ade7af40-d56d-4087-bbc6-2888fef55353", "uuid": "5a5544b6-d474-4808-ba2e-c18ea55c8004",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "8ba21262-178f-4fa5-afc9-2c1dd50ba3ab", "uuid": "e5b3f4c3-360f-49eb-9869-970499b81f7a",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "281e7acb-5fa9-4805-aaaa-2a2a89b4d217", "uuid": "67f62179-8605-455d-b49d-e03658edad8f",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "64bb4b6e-f254-41ab-ab45-018f1bee46c5", "uuid": "6e5c871a-20b2-4920-a026-59c55108dcfc",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg_bg": { "bg_bg": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "863518e7-0988-49a7-b86a-a38e18a7df6e", "uuid": "499363b7-7c56-4825-ba34-2c79491ac5c8",
"rawTextureUuid": "64bb4b6e-f254-41ab-ab45-018f1bee46c5", "rawTextureUuid": "6e5c871a-20b2-4920-a026-59c55108dcfc",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "b5ab3d81-0e98-4693-a631-e29ead0c931a", "uuid": "019c2b29-f5d0-412a-9d42-881fe85d54b5",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg_title": { "bg_title": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "97c41253-7e7a-4193-abc2-824f4c8b188b", "uuid": "7245a885-b55f-4db1-8fb8-72bb815a7483",
"rawTextureUuid": "b5ab3d81-0e98-4693-a631-e29ead0c931a", "rawTextureUuid": "019c2b29-f5d0-412a-9d42-881fe85d54b5",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "1000682d-19a5-48d3-98bb-8603bf5aa12b", "uuid": "62ef5e9c-9b5d-468d-9347-5e25881e6e3d",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "5e9c2ff6-95b7-4114-9c71-ae16d5a6c6c3", "uuid": "4e3f5d8d-dbf2-4708-a62e-2b1fcfb5c58a",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg_pic": { "bg_pic": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "cc97012b-938d-4722-bf03-236ec311aca4", "uuid": "7ec21352-6825-4341-a31d-167a64f51734",
"rawTextureUuid": "5e9c2ff6-95b7-4114-9c71-ae16d5a6c6c3", "rawTextureUuid": "4e3f5d8d-dbf2-4708-a62e-2b1fcfb5c58a",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "8ac1ba67-eb9f-4044-953c-bbc10f327808", "uuid": "534d37d4-a463-4bba-a2f4-e54cb8471a3d",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"btn_play": { "btn_play": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "4306a7e1-463b-4586-9415-3c55b5146fd4", "uuid": "18703644-13ef-4c4b-8aa1-51861c0d55a3",
"rawTextureUuid": "8ac1ba67-eb9f-4044-953c-bbc10f327808", "rawTextureUuid": "534d37d4-a463-4bba-a2f4-e54cb8471a3d",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "d12c595e-290f-4238-8226-2a7c664f98eb", "uuid": "01657e26-b3ad-43dc-a62f-fa5484c6a20c",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"btn_stop": { "btn_stop": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "dbf4c42e-4369-4415-81e8-20cbceec34b6", "uuid": "21dd6c68-cb4f-4e21-9414-d48f4ac76868",
"rawTextureUuid": "d12c595e-290f-4238-8226-2a7c664f98eb", "rawTextureUuid": "01657e26-b3ad-43dc-a62f-fa5484c6a20c",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "13ff0e83-c767-4d00-86eb-25c821069ad0", "uuid": "4f6ef26e-c893-4101-96e9-e18eac6e350c",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "c7f5a228-fa49-48d9-be37-f49d18e34d60", "uuid": "cae6ab1a-270c-46f2-bcda-944669f187b0",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg_word": { "bg_word": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "0806b0d1-1612-4944-806e-fd53102cf75c", "uuid": "b0ee16b1-d77f-45b7-998a-d504aeb097e3",
"rawTextureUuid": "c7f5a228-fa49-48d9-be37-f49d18e34d60", "rawTextureUuid": "cae6ab1a-270c-46f2-bcda-944669f187b0",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "b1ea59a6-cf8c-4664-9af5-2c708cf8adda", "uuid": "c73163a0-5595-4204-9ccb-2bff70e0ef5b",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"btn_myrecord": { "btn_myrecord": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "177da723-4dae-4484-95f2-e6ce8f7c9b23", "uuid": "91d05432-5f8f-4125-acfb-8cea61e94648",
"rawTextureUuid": "b1ea59a6-cf8c-4664-9af5-2c708cf8adda", "rawTextureUuid": "c73163a0-5595-4204-9ccb-2bff70e0ef5b",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "fe1f693d-ac57-4020-a7b1-a96950991098", "uuid": "dbd16bf9-9590-4883-8d3d-2c8df6706ec9",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"btn_myrecord_play": { "btn_myrecord_play": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "c70929a6-8e1d-4b0a-be5a-c2ab845afecf", "uuid": "5efd1f25-e2c1-4cda-ad7e-7bdf95fe2345",
"rawTextureUuid": "fe1f693d-ac57-4020-a7b1-a96950991098", "rawTextureUuid": "dbd16bf9-9590-4883-8d3d-2c8df6706ec9",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "c5187b97-9ffa-4c6e-a20d-2654ac6378bc", "uuid": "41267663-161e-45fd-b942-21bc9c4114b4",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"btn_record": { "btn_record": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "ecdb5a4b-cf12-4fa4-acc9-e4025d2c2122", "uuid": "bcb57f69-3e43-4cbd-8da1-727ae03570d1",
"rawTextureUuid": "c5187b97-9ffa-4c6e-a20d-2654ac6378bc", "rawTextureUuid": "41267663-161e-45fd-b942-21bc9c4114b4",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "07b3c478-7076-4aae-9e65-2d9c287f9806", "uuid": "1c37d421-f5f6-44e9-9239-587b31071c4e",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"btn_record_click": { "btn_record_click": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "7f3a6f30-3c29-4fd8-af77-8788bf1fac32", "uuid": "cc65cf90-36ac-4533-8f1c-0529dc516933",
"rawTextureUuid": "07b3c478-7076-4aae-9e65-2d9c287f9806", "rawTextureUuid": "1c37d421-f5f6-44e9-9239-587b31071c4e",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "cef6a399-9d6a-4111-aa48-2426ffccf26c", "uuid": "3f26028e-5299-4a62-866c-651845a7feaa",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"icon_myrecord1": { "icon_myrecord1": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "d678c02e-0c4a-400a-9649-1983114c8c9a", "uuid": "70f7dff2-7807-4f29-84ee-97e987d66338",
"rawTextureUuid": "cef6a399-9d6a-4111-aa48-2426ffccf26c", "rawTextureUuid": "3f26028e-5299-4a62-866c-651845a7feaa",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "f64181fc-93f1-4ab2-840c-9143770cbe61", "uuid": "da2867d9-b47d-4e39-bb21-45fa2a2a6ff2",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"icon_myrecord2": { "icon_myrecord2": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "8a94a8dd-cfc7-416c-88ca-9f93658d5953", "uuid": "640399a0-5da2-449e-bca2-8e8a63c9bed9",
"rawTextureUuid": "f64181fc-93f1-4ab2-840c-9143770cbe61", "rawTextureUuid": "da2867d9-b47d-4e39-bb21-45fa2a2a6ff2",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "0688c169-2a43-4729-8f88-c69ca88e8e25", "uuid": "77dc26c0-da70-4847-bf2e-ede932bbe774",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"icon_myrecord3": { "icon_myrecord3": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "03c91a7f-b926-4500-8d87-05a3095ac0a5", "uuid": "50bf845a-9acc-4913-a5e5-6eb145d33386",
"rawTextureUuid": "0688c169-2a43-4729-8f88-c69ca88e8e25", "rawTextureUuid": "77dc26c0-da70-4847-bf2e-ede932bbe774",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "80cc2edb-a4d4-4d88-b2a1-d0cddfca21d4", "uuid": "37927636-8ab3-4bc5-a8bc-497cc0e2478c",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"icon_tip": { "icon_tip": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "73183706-2979-449f-9b60-4d76e84e9b16", "uuid": "dec1cc6c-7652-4132-9ab8-86baa3c7397e",
"rawTextureUuid": "80cc2edb-a4d4-4d88-b2a1-d0cddfca21d4", "rawTextureUuid": "37927636-8ab3-4bc5-a8bc-497cc0e2478c",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "8af48e1d-a982-4f4e-958b-c50fe0770a46", "uuid": "1490d9f0-ae9a-41e9-8a55-1be053fd6809",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "fc19548a-2465-469c-a001-c936a5f587ff", "uuid": "43a22ee4-cb60-4401-ab06-c0b3e05fc4c8",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg": { "bg": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "1ebe30a0-2832-4f7b-a0bf-b4b59d6d5420", "uuid": "cf998b2c-faaa-479b-9778-40f45f04a9e9",
"rawTextureUuid": "fc19548a-2465-469c-a001-c936a5f587ff", "rawTextureUuid": "43a22ee4-cb60-4401-ab06-c0b3e05fc4c8",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "e70590fd-bf9c-4e55-ae2d-0bf3b69d5b20", "uuid": "305d4089-cf42-427b-8989-a4c655ce7106",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"btn_restart": { "btn_restart": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "7904e895-909f-4d90-aafa-fc62de9e4a66", "uuid": "259193c5-c6bf-4b30-9dfe-cef344a5a3f5",
"rawTextureUuid": "e70590fd-bf9c-4e55-ae2d-0bf3b69d5b20", "rawTextureUuid": "305d4089-cf42-427b-8989-a4c655ce7106",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "4d13a173-f148-4466-8c7c-20b03f04f204", "uuid": "f072484c-6b88-4fa2-b9f6-4652523227f4",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"btn_start": { "btn_start": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "cd741e27-5a5f-4492-8dcf-3434c5f3ac9e", "uuid": "a2d31e93-9014-4d97-addd-9fdbd407145a",
"rawTextureUuid": "4d13a173-f148-4466-8c7c-20b03f04f204", "rawTextureUuid": "f072484c-6b88-4fa2-b9f6-4652523227f4",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "9e70c229-d350-46dc-9f44-ac254d4352e9", "uuid": "19b1ec76-69bc-4932-96b9-41972d88512e",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"bg_countdown": { "bg_countdown": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "8eda48c8-60ae-420e-b20a-734f2f05467a", "uuid": "3ffa057c-34dc-4175-ac4e-346cd09cea9e",
"rawTextureUuid": "9e70c229-d350-46dc-9f44-ac254d4352e9", "rawTextureUuid": "19b1ec76-69bc-4932-96b9-41972d88512e",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{
"ver": "2.3.5",
"uuid": "a92db344-8920-45e2-bf78-6a01713bc04b",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 79,
"height": 54,
"platformSettings": {},
"subMetas": {
"btn_arrow": {
"ver": "1.0.4",
"uuid": "12c1360d-6e2c-4dbd-9ca4-9bb1455b539d",
"rawTextureUuid": "a92db344-8920-45e2-bf78-6a01713bc04b",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 79,
"height": 54,
"rawWidth": 79,
"rawHeight": 54,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "0fe3c031-7086-4498-bae7-faf2281ff3e8", "uuid": "04fa0d21-9401-4d5c-bd9a-266345edb63b",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"btn_record_start": { "btn_record_start": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "ae53f6e5-6076-431d-8e41-18405492b320", "uuid": "99ff0f7f-fdaa-4459-89df-cf1d93b666e9",
"rawTextureUuid": "0fe3c031-7086-4498-bae7-faf2281ff3e8", "rawTextureUuid": "04fa0d21-9401-4d5c-bd9a-266345edb63b",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "5d320289-99cf-4d6d-9dbb-8fbf9c030eae", "uuid": "6090ec9e-a386-4b47-996e-fb90706e371b",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"btn_record_stop": { "btn_record_stop": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "524ba650-639c-48c0-adf4-b74f1fc8a1d3", "uuid": "3589ebfd-b890-41f5-9779-87b22be66397",
"rawTextureUuid": "5d320289-99cf-4d6d-9dbb-8fbf9c030eae", "rawTextureUuid": "6090ec9e-a386-4b47-996e-fb90706e371b",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "be614518-478a-4b8c-b334-54df8d63544c", "uuid": "fc3b4e12-d054-4263-8920-e6d70067796d",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"default_sprite_splash": { "default_sprite_splash": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "87170b12-fd1d-4b10-b17b-262c0403f815", "uuid": "8df70460-206f-4961-beb7-4f8e7c0a223d",
"rawTextureUuid": "be614518-478a-4b8c-b334-54df8d63544c", "rawTextureUuid": "fc3b4e12-d054-4263-8920-e6d70067796d",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "fb73c820-7ca8-4450-8bb6-79d231e5733a", "uuid": "58a180c6-470b-4065-880d-48cc65ca48ee",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"icon_record": { "icon_record": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "5b67343e-8927-4b5f-9653-3aa36a67c245", "uuid": "4d553da5-0474-4855-a684-bfee1f02831f",
"rawTextureUuid": "fb73c820-7ca8-4450-8bb6-79d231e5733a", "rawTextureUuid": "58a180c6-470b-4065-880d-48cc65ca48ee",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "66e78df2-a6ed-4f05-a15a-62bbd749b258", "uuid": "d298ef40-bfc3-40ff-9321-6cf4aa4c683d",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "1.0.1", "ver": "1.0.1",
"uuid": "98532705-4bf7-43f5-8016-6d82b5d468b5", "uuid": "0e6b87da-2e7d-4339-b7ff-c6fd7d7bb0b4",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "1.0.1", "ver": "1.0.1",
"uuid": "3495d729-5f8e-4b65-847c-765a457a73af", "uuid": "7c07e323-ac64-4444-8ae4-b76998b85028",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "d7e3ff14-27f9-42a6-be35-b87c5395383b", "uuid": "6380e700-293b-4c6d-88ea-136fa3b06b39",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"录音动画_tex": { "录音动画_tex": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "ac106ac6-db96-4a08-9375-36bf50588bb0", "uuid": "8f26d43e-86e9-488a-a391-036c63b4ffa4",
"rawTextureUuid": "d7e3ff14-27f9-42a6-be35-b87c5395383b", "rawTextureUuid": "6380e700-293b-4c6d-88ea-136fa3b06b39",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
...@@ -52,7 +52,7 @@ function execCmd(cmd, params, path) { ...@@ -52,7 +52,7 @@ function execCmd(cmd, params, path) {
} }
let creatorBasePath = 'CocosCreator'; let creatorBasePath = 'D:/CocosDashboard_1.1.1/resources/.editors/Creator/2.4.5/CocosCreator.exe';
if (process.platform !== 'win32') { if (process.platform !== 'win32') {
creatorBasePath = "/Applications/CocosCreator/Creator/2.4.5/CocosCreator.app/Contents/MacOS/CocosCreator"; creatorBasePath = "/Applications/CocosCreator/Creator/2.4.5/CocosCreator.app/Contents/MacOS/CocosCreator";
} }
......
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
<div nz-row> <div nz-row>
<div nz-col [nzSpan]="18" [nzOffset]="1"> <div nz-col [nzSpan]="18" [nzOffset]="1">
<div *ngFor="let page of item.pages; let j=index" style="margin-bottom: 5mm;" nz-col [nzXs]='24' <div *ngFor="let page of item.questions; let j=index" style="margin-bottom: 5mm;" nz-col [nzXs]='24'
[nzSm]='24' [nzMd]='24' [nzLg]='24'> [nzSm]='24' [nzMd]='24' [nzLg]='24'>
<nz-card nzTitle="第{{j+1}}页" [nzHoverable]="true" [nzExtra]="actionCard"> <nz-card nzTitle="第{{j+1}}页" [nzHoverable]="true" [nzExtra]="actionCard">
<!--题目区域--> <!--题目区域-->
...@@ -115,15 +115,15 @@ ...@@ -115,15 +115,15 @@
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="4">完整音频</nz-form-label> <nz-form-label [nzSpan]="4">完整音频</nz-form-label>
<nz-form-control [nzSpan]="12"> <nz-form-control [nzSpan]="12">
<app-audio-recorder [audioUrl]="item.pageAudio" [_audioName]="item.pageAudioName" <app-audio-recorder [audioUrl]="page.audio" [_audioName]="page.audioName"
(audioUploaded)="onAudioUploadSuccess($event, item, 'pageAudio')" (audioName)="onAudioName($event, item, 'pageAudioName')"></app-audio-recorder> (audioUploaded)="onAudioUploadSuccess($event, page, 'audio')" (audioName)="onAudioName($event, page, 'audioName')"></app-audio-recorder>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="4">故事图片</nz-form-label> <nz-form-label [nzSpan]="4">故事图片</nz-form-label>
<nz-form-control [nzSpan]="6"> <nz-form-control [nzSpan]="6">
<app-upload-image-with-preview style="width: 100%" [picUrl]="item.pageImage" <app-upload-image-with-preview style="width: 100%" [picUrl]="page.pageImage"
(imageUploaded)="onImageUploadSuccess($event, item, 'pageImage')"></app-upload-image-with-preview> (imageUploaded)="onImageUploadSuccess($event, page, 'pageImage')"></app-upload-image-with-preview>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
</nz-card> </nz-card>
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
<div nz-row> <div nz-row>
<div nz-col [nzSpan]="18" [nzOffset]="1"> <div nz-col [nzSpan]="18" [nzOffset]="1">
<h4 nz-typography>文本内容:</h4> <h4 nz-typography>文本内容:</h4>
<div *ngFor="let data of page; let i=index" style="margin-bottom: 5mm;" nz-col [nzXs]='24' [nzSm]='24' [nzMd]='24' [nzLg]='24'> <div *ngFor="let data of page.options; let i=index" style="margin-bottom: 5mm;" nz-col [nzXs]='24' [nzSm]='24' [nzMd]='24' [nzLg]='24'>
<nz-card nzTitle="文本{{i+1}}" [nzHoverable]="true" [nzExtra]="actionCard"> <nz-card nzTitle="文本{{i+1}}" [nzHoverable]="true" [nzExtra]="actionCard">
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="4">音频</nz-form-label> <nz-form-label [nzSpan]="4">音频</nz-form-label>
...@@ -159,10 +159,10 @@ ...@@ -159,10 +159,10 @@
</nz-form-item> </nz-form-item>
</nz-card> </nz-card>
<ng-template #actionCard> <ng-template #actionCard>
<button nz-button nzType="danger" (click)="delCard(item.pages[j],i)"> <button nz-button nzType="danger" (click)="removeoption(j,i)">
<i nz-icon nzType="delete" nzTheme="outline"></i>删除 <i nz-icon nzType="delete" nzTheme="outline"></i>删除
</button>&nbsp;&nbsp;&nbsp; </button>&nbsp;&nbsp;&nbsp;
<button nz-button nzType="default" (click)="copyCard(item.pages[j],i)"> <button nz-button nzType="default" (click)="copyoption(j,i)">
<i nz-icon nzType="copy" nzTheme="outline"></i>复制 <i nz-icon nzType="copy" nzTheme="outline"></i>复制
</button> </button>
</ng-template> </ng-template>
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
<br/> <br/>
<div nz-row> <div nz-row>
<div nz-col [nzSpan]="18" [nzOffset]="1"> <div nz-col [nzSpan]="18" [nzOffset]="1">
<button nz-button nzType="primary" nzSize="large" (click)="addCard(item.pages[j])"> <button nz-button nzType="primary" nzSize="large" (click)="addoption(j)">
<font style="font-weight: 800;">+增加文本</font> <font style="font-weight: 800;">+增加文本</font>
</button> </button>
</div> </div>
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
<br/> <br/>
</nz-card> </nz-card>
<ng-template #actionCard> <ng-template #actionCard>
<button nz-button nzType="danger" (click)="delPage(j)"> <button nz-button nzType="danger" (click)="removequestion(j)">
<i nz-icon nzType="delete" nzTheme="outline"></i>删除 <i nz-icon nzType="delete" nzTheme="outline"></i>删除
</button> </button>
</ng-template> </ng-template>
...@@ -189,10 +189,23 @@ ...@@ -189,10 +189,23 @@
</div> </div>
<div nz-row> <div nz-row>
<div nz-col [nzSpan]="18" [nzOffset]="1"> <div nz-col [nzSpan]="18" [nzOffset]="1">
<button nz-button nzType="primary" nzSize="large" (click)="addPage()"> <button nz-button nzType="primary" nzSize="large" (click)="addquestion()">
<font style="font-weight: 800;">+增加页面</font> <font style="font-weight: 800;">+增加页面</font>
</button> </button>
</div> </div>
</div> </div>
<nz-modal [(nzVisible)]="isVisible" [nzTitle]="null" [nzContent]="modalContent" [nzFooter]="modalFooter"
(nzOnCancel)="handleCancel()">
<ng-template #modalContent>
<p>{{deleteTitle}}</p>
</ng-template>
<ng-template #modalFooter>
<button nz-button nzType="default" (click)="handleCancel()">取消</button>
<button nz-button nzType="primary" (click)="handleOk()">确定</button>
</ng-template>
</nz-modal>
</div> </div>
\ No newline at end of file
...@@ -67,8 +67,8 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy { ...@@ -67,8 +67,8 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
this.save(); this.save();
} }
if (!this.item.pages) { if (!this.item.questions) {
this.item.pages = []; this.item.questions = [];
this.addPage() this.addPage()
this.save(); this.save();
} }
...@@ -175,6 +175,13 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy { ...@@ -175,6 +175,13 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
this.deleteTitle = title; this.deleteTitle = title;
this.isVisible = true; this.isVisible = true;
} }
handleCancel() {
this.isVisible = false;
}
handleOk() {
this.deleteCallback && this.deleteCallback();
this.handleCancel();
}
removeoption(i, j) { removeoption(i, j) {
this.openDelete("确定删除选项?", () => { this.openDelete("确定删除选项?", () => {
this.item.questions[i].options.splice(j, 1); this.item.questions[i].options.splice(j, 1);
...@@ -187,6 +194,12 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy { ...@@ -187,6 +194,12 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
this.save(); this.save();
} }
removequestion(idx) {
this.openDelete("确定删除题目?", () => {
this.item.questions.splice(idx, 1);
this.save();
})
}
addoption(i) { addoption(i) {
this.item.questions[i].options.push({ this.item.questions[i].options.push({
type: "", type: "",
......
{ {
"title": "play", "title": "play",
"packageName": "org.cocos2d.demo", "packageName": "org.cocos2d.demo",
"startScene": "0737ce42-24f0-45c6-8e1a-8bdab4f74ba3", "startScene": "dc6cadcb-bc4a-4828-aec9-68b2704af968",
"excludeScenes": [], "excludeScenes": [],
"includeSDKBox": false, "includeSDKBox": false,
"orientation": { "orientation": {
......
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