Commit 683afb82 authored by limingzhe's avatar limingzhe

fix: 功能修改

parent b9fb01c5
{ {"ver":"1.1.2","uuid":"4baead34-c58e-4e1a-a89c-7e70991bd208","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": "bf1bf93b-195d-421e-be4a-37329ba94a4d",
"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": "0134e261-2d22-468f-9528-1d90c04bbf5b", "uuid": "15c80aeb-01db-4ccf-a062-1313a0b2933d",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "f0aa2ec8-903d-49f4-b3f4-0a6bfa3be2d0", "uuid": "a840f871-cc91-4c90-b20b-870720c9c371",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "50a035ed-67f7-4ccd-af5d-08c8c8d0db9e", "uuid": "81b23461-8ba9-4cd0-b8a7-2df82120f44a",
"downloadMode": 0, "downloadMode": 0,
"duration": 0.182857, "duration": 0.182857,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "7a2400d9-4fb1-4723-8e7f-64ffac7fe0b7", "uuid": "c3e95730-c957-4b88-9165-89cf0bbec77c",
"downloadMode": 0, "downloadMode": 0,
"duration": 0.264, "duration": 0.264,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "4e3d55bf-0eb7-4a1c-8c82-6aa1a5054531", "uuid": "35edb463-4924-4786-8cdd-c386c9203685",
"downloadMode": 0, "downloadMode": 0,
"duration": 0.432, "duration": 0.432,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "cda12b45-96bc-4787-ad31-47615ce81f10", "uuid": "6208966e-d221-46b1-a74a-30d0126ee223",
"downloadMode": 0, "downloadMode": 0,
"duration": 1.296, "duration": 1.296,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "563cd3a8-5bca-49e7-ae0a-641cee308426", "uuid": "3ea64523-787e-4b84-84b8-1e7918e191bb",
"downloadMode": 0, "downloadMode": 0,
"duration": 0.888163, "duration": 0.888163,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "e35fc831-80ae-4bb1-9816-429d0ac5a981", "uuid": "9aaa3a77-1aed-480a-bad4-1cb4531943e7",
"downloadMode": 0, "downloadMode": 0,
"duration": 0.912, "duration": 0.912,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "01774dc7-c672-4b38-a66c-1317e2390538", "uuid": "86c1df8b-6d71-4a75-b4fc-fddaf61e1cf5",
"downloadMode": 0, "downloadMode": 0,
"duration": 0.624, "duration": 0.624,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "51494b8c-e9f3-4e3b-bd25-1d44d9f36f5e", "uuid": "fd51166f-4c78-4db5-8456-b9279ad67315",
"downloadMode": 0, "downloadMode": 0,
"duration": 0.912, "duration": 0.912,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "ec42ad82-9c7a-4548-a2b0-66e09f23aee5", "uuid": "cafc6656-5641-4e8e-9100-379db2f253cb",
"downloadMode": 0, "downloadMode": 0,
"duration": 1.32, "duration": 1.32,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "ce1765dc-8d8f-4c7d-8423-b49bd3da2baa", "uuid": "b492db36-61bc-42dc-b299-5bb8fef662a4",
"downloadMode": 0, "downloadMode": 0,
"duration": 1.854694, "duration": 1.854694,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "6c28e3bb-3259-4eb0-afe9-f4c891dbfb30", "uuid": "88b05104-2fae-47e9-bdcb-b55d623e2078",
"downloadMode": 0, "downloadMode": 0,
"duration": 1.536, "duration": 1.536,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "cda46dec-f87f-4c2e-b819-6e76b52889aa", "uuid": "29d251fd-0e44-4094-8045-f7ac5cfcba1e",
"downloadMode": 0, "downloadMode": 0,
"duration": 1.651042, "duration": 1.651042,
"subMetas": {} "subMetas": {}
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "d86659c3-5399-40b4-9555-0e189165a508", "uuid": "3902e787-7695-467b-812b-578d0d39b577",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "7691593f-6a87-4596-a78c-e1a8ff857a0b", "uuid": "000a0bb0-2a8c-4bb7-a6e7-1ed1ec46d1b6",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "1.1.0", "ver": "1.1.0",
"uuid": "68efc501-3e54-43e9-b592-778e2881f4f6", "uuid": "cd8189ff-4285-45e8-89d1-5a0205980421",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "1.1.0", "ver": "1.1.0",
"uuid": "60549268-da3b-4be8-9455-40adf6597ca3", "uuid": "43b6a781-b16c-4021-b528-045dcc2416f7",
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "084af0b9-e3bd-4cd2-9bd6-4a97ffc81a12", "uuid": "86db0a37-b70d-4370-bd54-0f2d52c1f86b",
"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": false, "autoReleaseAssets": false,
"_id": "6625df9c-7648-471c-9f9e-bd6dd68dfcb8" "_id": "6904b0c4-2501-462b-b9d2-f262cd24da4a"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
...@@ -362,7 +362,7 @@ ...@@ -362,7 +362,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "dd8481f7-8fc1-48bf-a54e-7b1d5a5eaa42" "__uuid__": "83462da2-69d7-48dd-826b-cf16cd495a43"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -489,7 +489,7 @@ ...@@ -489,7 +489,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "b66cbf85-eb6c-4a1a-9436-8a2aa8929938" "__uuid__": "ce2d4bce-86de-48d1-a4e0-f4cdce20fa1a"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -684,7 +684,7 @@ ...@@ -684,7 +684,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "89e4ccf4-2222-45ab-bdc7-9a87ebdccede" "__uuid__": "4627615d-30a0-4ad2-ab0b-e0d502bde8a4"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -941,7 +941,7 @@ ...@@ -941,7 +941,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "9c1ce8b3-a327-476c-8e37-dfcf723f0e74" "__uuid__": "7889a3df-234e-440f-9511-8f9ac210a7f5"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -1035,7 +1035,7 @@ ...@@ -1035,7 +1035,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "c536921d-7726-4cb0-aa96-dbc4af2e7085" "__uuid__": "5602fed4-675b-4a10-a0c3-c873cd2c53e3"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -1129,7 +1129,7 @@ ...@@ -1129,7 +1129,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "bf053065-fad2-470c-b96d-aae31145cc17" "__uuid__": "204e913e-443c-481b-98da-671c03e9023e"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -1163,7 +1163,7 @@ ...@@ -1163,7 +1163,7 @@
"__id__": 30 "__id__": 30
} }
], ],
"_active": false, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 38 "__id__": 38
...@@ -1183,8 +1183,8 @@ ...@@ -1183,8 +1183,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 170, "width": 270,
"height": 106 "height": 306
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1258,7 +1258,7 @@ ...@@ -1258,7 +1258,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
-64.154, -157.058,
0, 0,
0, 0,
0, 0,
...@@ -1360,7 +1360,7 @@ ...@@ -1360,7 +1360,7 @@
"_srcBlendFactor": 1, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "636595cc-9191-456c-aa18-d4aca72ddb00" "__uuid__": "bbe8af69-363f-46f9-ad88-c4ef1467fe6f"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -1684,7 +1684,7 @@ ...@@ -1684,7 +1684,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "ce06f5a9-0787-4985-a954-a63fb4fb0feb" "__uuid__": "1a0d84f5-6d4e-4114-9d73-bc026ef0c476"
}, },
"_type": 3, "_type": 3,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -1716,7 +1716,7 @@ ...@@ -1716,7 +1716,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "2dd29e28-853f-4e84-bbcc-a4b3a5cf3510" "__uuid__": "22b019e5-c184-44ae-87ee-69fae300f051"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -1765,7 +1765,7 @@ ...@@ -1765,7 +1765,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "0ee804e2-8b85-4a32-bae7-90ac4fb58dde" "__uuid__": "108ea25d-c93c-494a-b72e-c71f4491b75b"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -1933,10 +1933,10 @@ ...@@ -1933,10 +1933,10 @@
"_srcBlendFactor": 1, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "f09e36b6-a20f-40b7-b677-6eebe668aa69" "__uuid__": "f31b0849-2bcb-431b-b6bd-5e06a7cdac48"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 2,
"_fillType": 0, "_fillType": 0,
"_fillCenter": { "_fillCenter": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1945,7 +1945,7 @@ ...@@ -1945,7 +1945,7 @@
}, },
"_fillStart": 0, "_fillStart": 0,
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": false,
"_atlas": null, "_atlas": null,
"_id": "d1HmQDfOJICLifESu8a1RE" "_id": "d1HmQDfOJICLifESu8a1RE"
}, },
...@@ -2033,7 +2033,7 @@ ...@@ -2033,7 +2033,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "abe38de7-6b48-4ef1-911e-01d3cd608782" "__uuid__": "3c192ad4-f038-4787-b6c4-fb288a83bc0b"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 0, "_sizeMode": 0,
...@@ -2293,7 +2293,7 @@ ...@@ -2293,7 +2293,7 @@
"_srcBlendFactor": 1, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "5e1ac188-b5e6-47b2-aa66-1b54ed0aed2d" "__uuid__": "a99b90fc-6101-41ad-bc6d-263f537bfa59"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
...@@ -2456,7 +2456,7 @@ ...@@ -2456,7 +2456,7 @@
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": true, "_enableWrapText": true,
"_N$file": { "_N$file": {
"__uuid__": "60549268-da3b-4be8-9455-40adf6597ca3" "__uuid__": "43b6a781-b16c-4021-b528-045dcc2416f7"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
"_spacingX": 0, "_spacingX": 0,
...@@ -2644,7 +2644,7 @@ ...@@ -2644,7 +2644,7 @@
"_lineHeight": 40, "_lineHeight": 40,
"_enableWrapText": true, "_enableWrapText": true,
"_N$file": { "_N$file": {
"__uuid__": "68efc501-3e54-43e9-b592-778e2881f4f6" "__uuid__": "cd8189ff-4285-45e8-89d1-5a0205980421"
}, },
"_isSystemFontUsed": false, "_isSystemFontUsed": false,
"_spacingX": 0, "_spacingX": 0,
...@@ -2797,7 +2797,7 @@ ...@@ -2797,7 +2797,7 @@
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
"__uuid__": "e35fc831-80ae-4bb1-9816-429d0ac5a981" "__uuid__": "9aaa3a77-1aed-480a-bad4-1cb4531943e7"
}, },
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
...@@ -2878,7 +2878,7 @@ ...@@ -2878,7 +2878,7 @@
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
"__uuid__": "cda12b45-96bc-4787-ad31-47615ce81f10" "__uuid__": "6208966e-d221-46b1-a74a-30d0126ee223"
}, },
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
...@@ -2959,7 +2959,7 @@ ...@@ -2959,7 +2959,7 @@
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
"__uuid__": "6c28e3bb-3259-4eb0-afe9-f4c891dbfb30" "__uuid__": "88b05104-2fae-47e9-bdcb-b55d623e2078"
}, },
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
...@@ -3072,7 +3072,7 @@ ...@@ -3072,7 +3072,7 @@
"_id": "29zXboiXFBKoIV4PQ2liTe" "_id": "29zXboiXFBKoIV4PQ2liTe"
}, },
{ {
"__type__": "a22ac/HTQpNcZnheZ2uWwOd", "__type__": "77a14/WbHJHOqrTHxq3On/1",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
......
{ {
"ver": "1.2.9", "ver": "1.2.9",
"uuid": "6625df9c-7648-471c-9f9e-bd6dd68dfcb8", "uuid": "6904b0c4-2501-462b-b9d2-f262cd24da4a",
"asyncLoadAssets": false, "asyncLoadAssets": false,
"autoReleaseAssets": false, "autoReleaseAssets": false,
"subMetas": {} "subMetas": {}
......
...@@ -613,6 +613,8 @@ cc.Class({ ...@@ -613,6 +613,8 @@ cc.Class({
this.showBackBtn(); this.showBackBtn();
// this.initBg(); // this.initBg();
// this.initPanel(); // this.initPanel();
// this.initScore(); // this.initScore();
...@@ -1393,7 +1395,7 @@ cc.Class({ ...@@ -1393,7 +1395,7 @@ cc.Class({
// refText: 'ant apple alligator ax.', // refText: 'ant apple alligator ax.',
// audioUrl: 'https://staging-teach.cdn.ireadabc.com/f01f0d63c0c4c0dd1203a6202ecaf34b.wav', // audioUrl: 'https://staging-teach.cdn.ireadabc.com/f01f0d63c0c4c0dd1203a6202ecaf34b.wav',
// result:{ // result:{
// overall: Math.random() * 40 + 40, // overall: Math.random() * 40 + 60,
// } // }
// } // }
...@@ -1459,7 +1461,15 @@ cc.Class({ ...@@ -1459,7 +1461,15 @@ cc.Class({
const overall = data.result?.overall; const overall = data.result?.overall;
const integrity = data.result?.integrity; const integrity = data.result?.integrity;
const score = overall //integrity * 0.4 + overall * 0.6; //data.result?.overall; let score = overall //integrity * 0.4 + overall * 0.6; //data.result?.overall;
if (this.rightWord) {
score = this.getScoreByRightWord(data, score);
}
ques.userAudioUrl = audioUrl; ques.userAudioUrl = audioUrl;
ques.score = score; ques.score = score;
...@@ -1519,6 +1529,48 @@ cc.Class({ ...@@ -1519,6 +1529,48 @@ cc.Class({
}) })
}, },
getScoreByRightWord(data, baseScore) {
console.log(" in getScoreByRightWord");
let newScore = baseScore;
const sentences = data?.result?.sentences;
if (sentences) {
sentences.forEach(it => {
const details = it.details;
if (details) {
console.log('details: ' + JSON.stringify(details));
const wordData = details.find(it => {
return it.word == this.rightWord.trim();
});
if (wordData) {
console.log('wordData: ', JSON.stringify(wordData));
if (wordData.overall < 60) {
newScore = 0;
}
}
}
});
}
// const details = data?.result?.sentences[0].details;
// if (details) {
// console.log('details: ' + JSON.stringify(details));
// const wordData = details.find(it => {
// it.word == this.rightWord.trim();
// });
// if (wordData) {
// console.log('wordData: ', JSON.stringify(wordData));
// if (wordData.overall < 60) {
// return 0;
// }
// }
// }
return newScore;
},
showScoreNode(score, isAnim=false) { showScoreNode(score, isAnim=false) {
if (!this.recordNode.scoreNode) { if (!this.recordNode.scoreNode) {
...@@ -1526,7 +1578,7 @@ cc.Class({ ...@@ -1526,7 +1578,7 @@ cc.Class({
const scoreNode = cc.instantiate(scoreNodeBase); const scoreNode = cc.instantiate(scoreNodeBase);
scoreNode.parent = this.recordNode; scoreNode.parent = this.recordNode;
// scoreNode.x = this.recordNode.width / 2; // scoreNode.x = this.recordNode.width / 2;
scoreNode.y = this.recordNode.height * 1; scoreNode.y = 10;
this.recordNode.scoreNode = scoreNode; this.recordNode.scoreNode = scoreNode;
scoreNode.scale = 0.8; scoreNode.scale = 0.8;
scoreNode.zIndex = 10; scoreNode.zIndex = 10;
...@@ -8463,10 +8515,50 @@ cc.Class({ ...@@ -8463,10 +8515,50 @@ cc.Class({
sprNode.opacity = 255; sprNode.opacity = 255;
} }
this.initTop();
}); });
} }
},
initTop() {
let labelText = '';
if (this.topLabelNode && this.topLabelNode.labelNode) {
const topLabelNode = this.topLabelNode.labelNode;
topLabelNode.parent = this.topBg;
topLabelNode.x = this.topBg.width / 2
topLabelNode.y = this.topBg.height / 2 + 5;
topLabelNode.zIndex = 99;
labelText = topLabelNode.getComponent(cc.Label).string;
console.log("labelText"+ labelText);
const topLabel = topLabelNode.getComponent(cc.Label);
topLabel.enableWrapText = true;
}
this.labaNode.parent = this.topBg;
this.labaNode.zIndex = 100;
if (labelText) {
this.labaNode.x = 0;
this.labaNode.y = 16;
this.topLabelNode.active = true;
} else {
this.labaNode.x = this.topBg.width / 2 - 50;
this.labaNode.y = 16;
this.topLabelNode.active = false;
}
}, },
initHotZoneItem(bgItem) { initHotZoneItem(bgItem) {
...@@ -8601,7 +8693,7 @@ cc.Class({ ...@@ -8601,7 +8693,7 @@ cc.Class({
}, },
setInputText(data, bg) { setInputText(data, bg) {
console.log(" in setInputText ") console.log(" in setInputText ~", data)
const rectNode = this.setOneRect(data, bg); const rectNode = this.setOneRect(data, bg);
...@@ -8685,10 +8777,11 @@ cc.Class({ ...@@ -8685,10 +8777,11 @@ cc.Class({
setFixedPic(data, bg) { setFixedPic(data, bg) {
const rectNode = this.setOneRect(data, bg, cc.Color.BLUE); const rectNode = this.setOneRect(data, bg, cc.Color.BLUE);
console.log('setFixedPic data~ ', data);
if (data.id == 1712912928089) {
console.log('data~ ', data); this.topBg = rectNode;
}
if (data.anchorGroup != null) { if (data.anchorGroup != null) {
...@@ -8805,14 +8898,17 @@ cc.Class({ ...@@ -8805,14 +8898,17 @@ cc.Class({
setRecordGroup(data, bg) { setRecordGroup(data, bg) {
console.log(' in setRecordGroup'); const tempOffY = 100;
console.log(' in setRecordGroup : ' , data);
const rectNode = this.setOneRect(data, bg, cc.Color.RED) const rectNode = this.setOneRect(data, bg, cc.Color.RED)
const recordNode = cc.find('Canvas/recordNode'); const recordNode = cc.find('Canvas/recordNode');
recordNode.active = true; recordNode.active = true;
recordNode.parent = rectNode; recordNode.parent = rectNode;
recordNode.zIndex = 100;
recordNode.x = rectNode.width / 2; recordNode.x = rectNode.width / 2;
recordNode.y = rectNode.height / 2; recordNode.y = rectNode.height / 2 + tempOffY * this._mapScaleMin;
// recordNode.startNode = cc.find("record_0", recordNode); // recordNode.startNode = cc.find("record_0", recordNode);
// recordNode.stopNode = cc.find("record_1", recordNode); // recordNode.stopNode = cc.find("record_1", recordNode);
...@@ -8873,7 +8969,7 @@ cc.Class({ ...@@ -8873,7 +8969,7 @@ cc.Class({
const startRecord = () => { const startRecord = () => {
cc.tween(mike) cc.tween(mike)
.to(0.3, {scale: 1, y: 0}, {easing: "cubicOut"}) .to(0.3, {scale: 1, y: mike.baseY + 50}, {easing: "cubicOut"})
.start(); .start();
showRecordParticle(); showRecordParticle();
...@@ -8892,6 +8988,16 @@ cc.Class({ ...@@ -8892,6 +8988,16 @@ cc.Class({
this.serverStopTest((recordData=null) => {}); this.serverStopTest((recordData=null) => {});
} }
particleNode.on('click', () => {
if (!this.isRecord) {
startRecord();
} else {
stopRecord();
}
this.isRecord = !this.isRecord;
})
recordNode.on('click', () => { recordNode.on('click', () => {
if (!this.isRecord) { if (!this.isRecord) {
startRecord(); startRecord();
...@@ -8936,7 +9042,7 @@ cc.Class({ ...@@ -8936,7 +9042,7 @@ cc.Class({
}, },
setAudioAnim(data, bg) { setAudioAnim(data, bg) {
// console.log(' in setAudioAnim') console.log(' in setAudioAnim')
const animNode = this.setOneAnim(data, bg, cc.Color.YELLOW) const animNode = this.setOneAnim(data, bg, cc.Color.YELLOW)
const rectNode = animNode.rectNode; const rectNode = animNode.rectNode;
...@@ -8952,10 +9058,17 @@ cc.Class({ ...@@ -8952,10 +9058,17 @@ cc.Class({
const inputData = this.curQues.find(it => { const inputData = this.curQues.find(it => {
return it[key]; return it[key];
}) })
// console.log('inputData: ', inputData); console.log('`inputData: ', inputData);
this.playAudioAnim(inputData[key], animNode, () => {
if (inputData) {
this.playAudioAnim(inputData[key], animNode, () => {
rectNode.isClicked = false;
});
} else {
rectNode.isClicked = false; rectNode.isClicked = false;
}); }
}) })
...@@ -8964,6 +9077,8 @@ cc.Class({ ...@@ -8964,6 +9077,8 @@ cc.Class({
} }
this.audioAnimArr.push(rectNode); this.audioAnimArr.push(rectNode);
this.labaNode = rectNode;
}, },
setTextOption(data, bg) { setTextOption(data, bg) {
...@@ -9547,20 +9662,32 @@ cc.Class({ ...@@ -9547,20 +9662,32 @@ cc.Class({
refreshInputText() { refreshInputText() {
console.log('inputTextArr: ', this.inputTextArr);
this.inputTextArr.forEach((node) => { this.inputTextArr.forEach((node) => {
node.removeAllChildren(); node.removeAllChildren();
if (node.labelNode) {
node.labelNode.removeFromParent();
}
const key = node.key; const key = node.key;
const inputData = this.curQues.find(it => { const inputData = this.curQues.find(it => {
return it[key]; return it[key];
}); });
this.topLabelNode = node;
let inputDataText = '';
if (inputData) { if (inputData) {
this.setLabelNodeByLabelArr(node.data.labelArr, inputData[key], node); inputDataText = inputData[key];
} }
node.warp = true;
this.setLabelNodeByLabelArr(node.data.labelArr, inputDataText, node);
}) })
}, },
...@@ -9576,7 +9703,7 @@ cc.Class({ ...@@ -9576,7 +9703,7 @@ cc.Class({
const fontSizeLabelData = this.findOneLabelByKey(labelArr, 'fontSize'); const fontSizeLabelData = this.findOneLabelByKey(labelArr, 'fontSize');
if (fontSizeLabelData || fontSizeLabelData.value) { if (fontSizeLabelData || fontSizeLabelData.value) {
fontSize = fontSizeLabelData.value; fontSize = Number(fontSizeLabelData.value) + 2;
} }
const fontColorLabelData = this.findOneLabelByKey(labelArr, 'fontColor'); const fontColorLabelData = this.findOneLabelByKey(labelArr, 'fontColor');
...@@ -9610,7 +9737,11 @@ cc.Class({ ...@@ -9610,7 +9737,11 @@ cc.Class({
labelNode.x = node.width / 2; labelNode.x = node.width / 2;
labelNode.y = node.height / 2; labelNode.y = node.height / 2;
node.labelNode = labelNode;
node.addChild(labelNode); node.addChild(labelNode);
}, },
...@@ -9633,6 +9764,8 @@ cc.Class({ ...@@ -9633,6 +9764,8 @@ cc.Class({
switch(key) { switch(key) {
case "answer_text": case "answer_text":
this.curAnswerText = text; this.curAnswerText = text;
this.rightWord = inputData.rightWord || '';
console.log('rightWord: ', this.rightWord);
break break
} }
...@@ -9676,6 +9809,9 @@ cc.Class({ ...@@ -9676,6 +9809,9 @@ cc.Class({
this.refreshPageDotArea(); this.refreshPageDotArea();
this.refreshMultResArea(); this.refreshMultResArea();
this.initTop();
}, },
refreshAudioAnim() { refreshAudioAnim() {
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "a22acfc7-4d0a-4d71-99e1-799dae5b039d", "uuid": "77a14fd6-6c72-473a-aad3-1f1ab73a7ff5",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "3c175131-9dd5-41f2-a35e-4f949b803486", "uuid": "627b3fa0-6111-4c70-842a-f5499729f2f4",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
This diff is collapsed.
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "82c21daa-6c65-4ea8-9d61-96574baf96c7", "uuid": "8098e4ee-974a-4b5b-8e32-af63f5dfa349",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "99ed4961-b327-4770-8ff2-4e29f3745cb3", "uuid": "7e3ba6a1-3fe8-4dd9-8904-113f2a6eb4b0",
"isPlugin": false, "isPlugin": false,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.0.8", "ver": "1.0.8",
"uuid": "bee1493c-0a38-463c-8631-58411b127981", "uuid": "27d623ed-5f81-492e-b89d-4ae17c17b8ae",
"isPlugin": true, "isPlugin": true,
"loadPluginInWeb": true, "loadPluginInWeb": true,
"loadPluginInNative": true, "loadPluginInNative": true,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "16ab1ce4-4e7c-4b1f-9b0f-650f3b98dfda", "uuid": "48ea2f76-a82b-4606-b836-aafa8ad50914",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "d716f595-7236-4357-8ba8-09e959ea43f3", "uuid": "415dc043-0f11-4567-a9c9-8a2a31057386",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"arrow_l": { "arrow_l": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "30bf454e-68af-45fc-ba8c-6982632fc01b", "uuid": "af514692-993e-4d25-9ece-a0ee5808c8eb",
"rawTextureUuid": "d716f595-7236-4357-8ba8-09e959ea43f3", "rawTextureUuid": "415dc043-0f11-4567-a9c9-8a2a31057386",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "c4336c8e-a965-4293-9f4e-c2b1cc98fb89", "uuid": "1f4091f0-bc90-4667-b460-73ee459c2fe0",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"arrow_l_2": { "arrow_l_2": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "b66cbf85-eb6c-4a1a-9436-8a2aa8929938", "uuid": "ce2d4bce-86de-48d1-a4e0-f4cdce20fa1a",
"rawTextureUuid": "c4336c8e-a965-4293-9f4e-c2b1cc98fb89", "rawTextureUuid": "1f4091f0-bc90-4667-b460-73ee459c2fe0",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "12d00178-f04d-4de3-abfb-4a3291b19c90", "uuid": "f36ca98e-ad3f-4cb5-8651-51b38e2ade8f",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"arrow_r": { "arrow_r": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "f2bc72ea-1d5f-4110-8426-4214f2dc44b7", "uuid": "2374229f-36c6-4ca3-ae63-4b8c9beec41f",
"rawTextureUuid": "12d00178-f04d-4de3-abfb-4a3291b19c90", "rawTextureUuid": "f36ca98e-ad3f-4cb5-8651-51b38e2ade8f",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "d89f8693-058b-4ae5-a846-2937589941cc", "uuid": "dbbb5573-add7-44ea-8e53-bf905b9e095e",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"arrow_r_2": { "arrow_r_2": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "89e4ccf4-2222-45ab-bdc7-9a87ebdccede", "uuid": "4627615d-30a0-4ad2-ab0b-e0d502bde8a4",
"rawTextureUuid": "d89f8693-058b-4ae5-a846-2937589941cc", "rawTextureUuid": "dbbb5573-add7-44ea-8e53-bf905b9e095e",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "89a6c9c2-06fd-46d2-98b4-03c7c212370d", "uuid": "f5d414d8-f7fd-4528-9a6a-9ac3533f3479",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"back_btn": { "back_btn": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "dd8481f7-8fc1-48bf-a54e-7b1d5a5eaa42", "uuid": "83462da2-69d7-48dd-826b-cf16cd495a43",
"rawTextureUuid": "89a6c9c2-06fd-46d2-98b4-03c7c212370d", "rawTextureUuid": "f5d414d8-f7fd-4528-9a6a-9ac3533f3479",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "b1e31160-9a38-4df3-beae-e94b221c4b24", "uuid": "679f13ea-5d19-4f44-979e-290d69ed389e",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"excellent": { "excellent": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "90998fd1-e308-4585-88f1-db3f72116045", "uuid": "8dcbf2db-cd88-48ec-84e5-4f00f82eca92",
"rawTextureUuid": "b1e31160-9a38-4df3-beae-e94b221c4b24", "rawTextureUuid": "679f13ea-5d19-4f44-979e-290d69ed389e",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "9fd98a84-e6ff-470e-890e-b08424d99f25", "uuid": "a149ed5e-eb14-45b1-b50c-033ef87730f0",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"good": { "good": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "1003d783-238c-4e3a-9b35-0df6e67b222d", "uuid": "afb0c3f0-8a2a-44c6-8acc-ece86c385e12",
"rawTextureUuid": "9fd98a84-e6ff-470e-890e-b08424d99f25", "rawTextureUuid": "a149ed5e-eb14-45b1-b50c-033ef87730f0",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "75357492-dd86-4532-a336-244592761f9c", "uuid": "29e6a95c-719b-464c-bd07-3d2107c54302",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "94341943-5e8d-4c74-8a70-64066bb1ff27", "uuid": "7840d71b-3d1d-49fe-881c-e111ecdf7a02",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"circle": { "circle": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "5e1ac188-b5e6-47b2-aa66-1b54ed0aed2d", "uuid": "a99b90fc-6101-41ad-bc6d-263f537bfa59",
"rawTextureUuid": "94341943-5e8d-4c74-8a70-64066bb1ff27", "rawTextureUuid": "7840d71b-3d1d-49fe-881c-e111ecdf7a02",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "299b7d54-6d14-49e9-bfe5-1707e4c83be0", "uuid": "7a9b1184-c930-453d-bf22-712fad3c6a78",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"excellent": { "excellent": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "bf053065-fad2-470c-b96d-aae31145cc17", "uuid": "204e913e-443c-481b-98da-671c03e9023e",
"rawTextureUuid": "299b7d54-6d14-49e9-bfe5-1707e4c83be0", "rawTextureUuid": "7a9b1184-c930-453d-bf22-712fad3c6a78",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "384970dc-7082-42ec-8095-f75019372dd8", "uuid": "0c46aa25-12d2-495c-b6f8-a1c9ad764d8d",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"good": { "good": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "c536921d-7726-4cb0-aa96-dbc4af2e7085", "uuid": "5602fed4-675b-4a10-a0c3-c873cd2c53e3",
"rawTextureUuid": "384970dc-7082-42ec-8095-f75019372dd8", "rawTextureUuid": "0c46aa25-12d2-495c-b6f8-a1c9ad764d8d",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "ae09af4f-1e3c-4bdf-b4b4-b8ed4dab51ba", "uuid": "9c82748e-04d9-4e50-a6ab-0bdf1e85765d",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"mike": { "mike": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "636595cc-9191-456c-aa18-d4aca72ddb00", "uuid": "bbe8af69-363f-46f9-ad88-c4ef1467fe6f",
"rawTextureUuid": "ae09af4f-1e3c-4bdf-b4b4-b8ed4dab51ba", "rawTextureUuid": "9c82748e-04d9-4e50-a6ab-0bdf1e85765d",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "10283143-2cec-4204-8290-b64ec57752ff", "uuid": "b51f9956-46e7-49f8-bfb1-fb888f545f8e",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
"premultiplyAlpha": true, "premultiplyAlpha": true,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 170, "width": 270,
"height": 106, "height": 306,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"record_bg": { "record_bg": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "f09e36b6-a20f-40b7-b677-6eebe668aa69", "uuid": "f31b0849-2bcb-431b-b6bd-5e06a7cdac48",
"rawTextureUuid": "10283143-2cec-4204-8290-b64ec57752ff", "rawTextureUuid": "b51f9956-46e7-49f8-bfb1-fb888f545f8e",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
"offsetX": 0, "offsetX": 0,
"offsetY": 0, "offsetY": -100,
"trimX": 0, "trimX": 50,
"trimY": 0, "trimY": 200,
"width": 170, "width": 170,
"height": 106, "height": 106,
"rawWidth": 170, "rawWidth": 270,
"rawHeight": 106, "rawHeight": 306,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "06a7f55d-1b1e-4bbb-809b-faec87fe04b5", "uuid": "ca3497bd-633e-49ae-8ce9-675793a72f86",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"try_again": { "try_again": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "9c1ce8b3-a327-476c-8e37-dfcf723f0e74", "uuid": "7889a3df-234e-440f-9511-8f9ac210a7f5",
"rawTextureUuid": "06a7f55d-1b1e-4bbb-809b-faec87fe04b5", "rawTextureUuid": "ca3497bd-633e-49ae-8ce9-675793a72f86",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "5bbd40f1-1b08-4c7a-922a-6e8adbaeb59e", "uuid": "a3558e6c-677b-4dae-ada9-51dd61086806",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"record_0": { "record_0": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "b3ca495b-faa4-463d-ac59-574a94797f1a", "uuid": "7c0547f5-a757-4b8b-9af3-478e3ac9c593",
"rawTextureUuid": "5bbd40f1-1b08-4c7a-922a-6e8adbaeb59e", "rawTextureUuid": "a3558e6c-677b-4dae-ada9-51dd61086806",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "6659f6bb-04f9-4ed5-b2b8-fa89c74b4136", "uuid": "4f1c3cbb-81df-4525-a104-d6e705add74b",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"record_1": { "record_1": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "0ee804e2-8b85-4a32-bae7-90ac4fb58dde", "uuid": "108ea25d-c93c-494a-b72e-c71f4491b75b",
"rawTextureUuid": "6659f6bb-04f9-4ed5-b2b8-fa89c74b4136", "rawTextureUuid": "4f1c3cbb-81df-4525-a104-d6e705add74b",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "e1b900b4-f9ef-4290-b007-1c4266cc1e0d", "uuid": "1b34d3a6-fddf-49a1-b450-98dbe819ca37",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"record_bg": { "record_bg": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "2dd29e28-853f-4e84-bbcc-a4b3a5cf3510", "uuid": "22b019e5-c184-44ae-87ee-69fae300f051",
"rawTextureUuid": "e1b900b4-f9ef-4290-b007-1c4266cc1e0d", "rawTextureUuid": "1b34d3a6-fddf-49a1-b450-98dbe819ca37",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "3dbbf49e-fdd6-4549-a4b4-e05e65038754", "uuid": "30dc91a8-0449-414e-a52c-bd6bfb9bc5fe",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"record_progress": { "record_progress": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "ce06f5a9-0787-4985-a954-a63fb4fb0feb", "uuid": "1a0d84f5-6d4e-4114-9d73-bc026ef0c476",
"rawTextureUuid": "3dbbf49e-fdd6-4549-a4b4-e05e65038754", "rawTextureUuid": "30dc91a8-0449-414e-a52c-bd6bfb9bc5fe",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "1.1.2", "ver": "1.1.2",
"uuid": "b0c49f1b-69c9-41fe-8174-15fed38072bc", "uuid": "83a8309f-ce18-4de4-b608-f2f2f9a26020",
"isBundle": false, "isBundle": false,
"bundleName": "", "bundleName": "",
"priority": 1, "priority": 1,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "c3f0a059-d7f1-473b-bf22-ff94bbd0afef", "uuid": "58a79a8c-4f42-4566-97b8-b5f3afb87e2d",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"black": { "black": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "abe38de7-6b48-4ef1-911e-01d3cd608782", "uuid": "3c192ad4-f038-4787-b6c4-fb288a83bc0b",
"rawTextureUuid": "c3f0a059-d7f1-473b-bf22-ff94bbd0afef", "rawTextureUuid": "58a79a8c-4f42-4566-97b8-b5f3afb87e2d",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "8b2791d8-150b-49d0-a2cc-0a91cbc4ed1b", "uuid": "a6c26c94-8ec5-46a2-9620-60da87d008c7",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"blue": { "blue": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "74d681ae-1011-4021-a489-02c7911a26c3", "uuid": "7f8fae73-4eca-4e7a-bd09-85e15ff7aea9",
"rawTextureUuid": "8b2791d8-150b-49d0-a2cc-0a91cbc4ed1b", "rawTextureUuid": "a6c26c94-8ec5-46a2-9620-60da87d008c7",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "4298a5ec-2093-42cc-8604-da8a34aae66a", "uuid": "ab780a11-8696-4b71-9260-6ce7cd7afeec",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"green": { "green": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "16890f0b-e670-481b-8028-958a26baa8f6", "uuid": "d174a578-f920-441e-abff-431cabdd8275",
"rawTextureUuid": "4298a5ec-2093-42cc-8604-da8a34aae66a", "rawTextureUuid": "ab780a11-8696-4b71-9260-6ce7cd7afeec",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "c5e9f7a5-3168-414f-8088-421a3db6c780", "uuid": "341e9a85-81fa-4613-86a5-0cccdc38e6ab",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"purple": { "purple": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "a4cc0b6b-97a7-4f3e-ad61-c2efe70b561c", "uuid": "5f2c82f3-9aab-47d9-8d0e-aab303b014a4",
"rawTextureUuid": "c5e9f7a5-3168-414f-8088-421a3db6c780", "rawTextureUuid": "341e9a85-81fa-4613-86a5-0cccdc38e6ab",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "d5442408-f08a-4c40-9915-d5b6a0588d35", "uuid": "d424bf33-22cf-44c1-970f-52cf83aad101",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"red": { "red": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "9317ffee-3928-4546-b3a5-7c2a1dc86b87", "uuid": "a4a81823-a8d2-4a30-8353-81879296df78",
"rawTextureUuid": "d5442408-f08a-4c40-9915-d5b6a0588d35", "rawTextureUuid": "d424bf33-22cf-44c1-970f-52cf83aad101",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "82171be1-4310-47d6-8410-54d0428b1cdd", "uuid": "d49eecb1-b235-4be8-a514-403b86c597d0",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"white": { "white": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "8cc7e203-4ebd-49c6-baf2-516b79a0dde9", "uuid": "bf723fe8-765a-4b71-83b1-82ec4e489d7a",
"rawTextureUuid": "82171be1-4310-47d6-8410-54d0428b1cdd", "rawTextureUuid": "d49eecb1-b235-4be8-a514-403b86c597d0",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "7e717740-7632-48c2-ba15-f87e3ea98b95", "uuid": "900606e9-428d-416f-8098-21560655f843",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"white_dot": { "white_dot": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "0b9f2f2d-8a41-4c7d-98cd-f2a0efd505e6", "uuid": "401c84e8-aea8-42f1-85c9-4915c192762f",
"rawTextureUuid": "7e717740-7632-48c2-ba15-f87e3ea98b95", "rawTextureUuid": "900606e9-428d-416f-8098-21560655f843",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "3dc4ff12-0740-4e7c-99d4-87c0a947aa24", "uuid": "c5f78f31-1918-40a8-9c11-1c996f554072",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"yellow": { "yellow": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "edc5058f-cc91-4e4c-ba11-355960c4bf49", "uuid": "f8372abe-4be4-44e8-b3eb-624cbe183a71",
"rawTextureUuid": "3dc4ff12-0740-4e7c-99d4-87c0a947aa24", "rawTextureUuid": "c5f78f31-1918-40a8-9c11-1c996f554072",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
{ {
"ver": "2.3.5", "ver": "2.3.5",
"uuid": "bd421e26-ae2b-40ba-9740-e07748448abf", "uuid": "3a52066f-d19b-420a-9a12-6ffaad93c095",
"type": "sprite", "type": "sprite",
"wrapMode": "clamp", "wrapMode": "clamp",
"filterMode": "bilinear", "filterMode": "bilinear",
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
"subMetas": { "subMetas": {
"try_again": { "try_again": {
"ver": "1.0.4", "ver": "1.0.4",
"uuid": "b5dea01c-532a-485e-b0f8-56c3146eee80", "uuid": "8122a653-756d-4b17-a96e-2b2980bbb839",
"rawTextureUuid": "bd421e26-ae2b-40ba-9740-e07748448abf", "rawTextureUuid": "3a52066f-d19b-420a-9a12-6ffaad93c095",
"trimType": "auto", "trimType": "auto",
"trimThreshold": 1, "trimThreshold": 1,
"rotated": false, "rotated": false,
......
...@@ -101,7 +101,13 @@ ...@@ -101,7 +101,13 @@
<label style="margin-left: 5px;" nz-radio [nzValue]="'isWrong'">{{'错误'}}</label> <label style="margin-left: 5px;" nz-radio [nzValue]="'isWrong'">{{'错误'}}</label>
</div> </div>
</nz-radio-group> </nz-radio-group>
</div> </div>
<div *ngIf="it.labelArr[0].value == '正确答案'">
<span style="margin-left:20px;">必含单词 (可不填):</span>
<input type="text" nz-input [(ngModel)]="it.rightWord" (blur)="saveItemText(it, it.rightWord)" style=" width: 100px;">
</div>
</div> </div>
<div *ngIf="getItemHasInputAudio(it)" style="margin: 20px; display: flex;"> <div *ngIf="getItemHasInputAudio(it)" style="margin: 20px; display: flex;">
......
...@@ -792,7 +792,6 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy { ...@@ -792,7 +792,6 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
} }
saveItemText(it, key) { saveItemText(it, key) {
console.log('it: ', it);
this.save(); this.save();
} }
......
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