Commit a71d5593 authored by Tt's avatar Tt

内容修复

parent fec2580e
......@@ -1263,15 +1263,15 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
841.708,
1141.106,
793.308,
1367.739,
0,
0,
0,
0,
1,
1,
1,
1.8,
1.8,
1
]
},
......@@ -1333,7 +1333,7 @@
"_alignFlags": 33,
"_left": 0,
"_right": 185.79200000000003,
"_top": -341.106,
"_top": -567.739,
"_bottom": -232,
"_verticalCenter": 0,
"_horizontalCenter": 0,
......
......@@ -238,7 +238,7 @@ cc.Class({
optionNode.y = 0;//-(canvasHeight / 2) -800;
optionNode.scale = 0;
optionNode.parent = box;
optionNode.targetScale =1;// Math.min((maxOptionWidth * 0.80) / optionNode.width, maxOptionHeight / optionNode.height)
optionNode.targetScale = 1;// Math.min((maxOptionWidth * 0.80) / optionNode.width, maxOptionHeight / optionNode.height)
// console.log("targetScale: " + optionNode.targetScale);
optionNode.width = 280;
optionNode.height = 280;
......@@ -562,7 +562,7 @@ cc.Class({
}
submitBtn.showed = true;
cc.tween(submitBtn)
.by(1, { y: -submitBtn.height })
.by(1, { y: -submitBtn.height * 1.8 })
.start();
},
......@@ -574,7 +574,7 @@ cc.Class({
submitBtn.showed = false;
submitBtn.off('click');
cc.tween(submitBtn)
.by(1, { y: submitBtn.height })
.by(1, { y: submitBtn.height * 1.8 })
.start();
},
......
export const defaultData = {
"maxWrongNumber": 4,
"maxWrongNumber": 5,
"startAudio": "http://staging-teach.cdn.ireadabc.com/17edcaecd09a72a64a77480673cdc232.mp3",
"endAudio": "http://staging-teach.cdn.ireadabc.com/fd8a2b8eeb4abbe7683d30e728ece184.mp3",
"question_arr": [
{
"desc1": "gg",
"desc2": "tt",
"question_audio_url": "",
"option_arr": [
{
"pic_url": "http://staging-teach.cdn.ireadabc.com/5ba43828aef85c585743a0c898b43c42.png",
"audio_url": "http://staging-teach.cdn.ireadabc.com/ce3337620f22232dd15c29c66af57736.mp3",
"is_right": true
"pic_url": "http://staging-teach.cdn.ireadabc.com/0d062a47d7da7ca939479576c2e16d19.png",
"audio_url": "http://staging-teach.cdn.ireadabc.com/aa8d4f0add5c41218fb7c94097641b8b.mp3",
"is_right": false
},
{
"pic_url": "http://staging-teach.cdn.ireadabc.com/d69dee492fd35b3c066207c3fc8e3258.png",
"audio_url": "http://staging-teach.cdn.ireadabc.com/b4d95069fcc91976740461b9061a303a.mp3",
"is_right": false
"pic_url": "http://staging-teach.cdn.ireadabc.com/f9d0c3f9c7f0365af44532a99b776ee5.png",
"audio_url": "http://staging-teach.cdn.ireadabc.com/a8ed9422993b0865fe0625fcb3253070.mp3",
"is_right": true
},
{
"pic_url": "http://staging-teach.cdn.ireadabc.com/48ecba3519b1d58a1fa434ae694fc831.png",
"audio_url": "http://staging-teach.cdn.ireadabc.com/b4d95069fcc91976740461b9061a303a.mp3",
"is_right": false
"pic_url": "http://staging-teach.cdn.ireadabc.com/4b04b4769ea192344512f4849bb252bc.png",
"audio_url": "http://staging-teach.cdn.ireadabc.com/65c62cd89703cce9cec9c68b41b92f5d.mp3",
"is_right": true
},
{
"pic_url": "http://staging-teach.cdn.ireadabc.com/44464e706225cfe43e918bf1167a2ac1.png",
"audio_url": "http://staging-teach.cdn.ireadabc.com/e62f0e83bc744a6e508fa23aaa656792.mp3",
"pic_url": "http://staging-teach.cdn.ireadabc.com/f4310ca59080b87a692a47fc6fa04af6.png",
"audio_url": "http://staging-teach.cdn.ireadabc.com/f7fb9f71ab7d460ac2f78c85efba7610.mp3",
"is_right": false
},
{
"pic_url": "http://staging-teach.cdn.ireadabc.com/251667ae3d4921582392f6bc42bd2a96.png",
"audio_url": "http://staging-teach.cdn.ireadabc.com/f4e0925dec2f24505872b1c367343a6e.mp3",
"pic_url": "http://staging-teach.cdn.ireadabc.com/dec15decdbc3d72983dfab3b66a2fd8d.png",
"audio_url": "http://staging-teach.cdn.ireadabc.com/a8ed9422993b0865fe0625fcb3253070.mp3",
"is_right": false
}
],
"audio_url": "http://staging-teach.cdn.ireadabc.com/e62f0e83bc744a6e508fa23aaa656792.mp3",
"desc1": "OG",
"desc2": "TSM",
"audio_url": "http://staging-teach.cdn.ireadabc.com/a8ed9422993b0865fe0625fcb3253070.mp3"
},
{
"question_audio_url": "",
"option_arr": [
{
"pic_url": "http://staging-teach.cdn.ireadabc.com/5ba43828aef85c585743a0c898b43c42.png",
"audio_url": "http://staging-teach.cdn.ireadabc.com/ce3337620f22232dd15c29c66af57736.mp3",
"is_right": true
"pic_url": "http://staging-teach.cdn.ireadabc.com/c6801e75fbb8c86d5a5ccd46c4e43c04.png",
"audio_url": "http://staging-teach.cdn.ireadabc.com/aa8d4f0add5c41218fb7c94097641b8b.mp3",
"is_right": false
},
{
"pic_url": "http://staging-teach.cdn.ireadabc.com/d69dee492fd35b3c066207c3fc8e3258.png",
"audio_url": "http://staging-teach.cdn.ireadabc.com/b4d95069fcc91976740461b9061a303a.mp3",
"is_right": false
"pic_url": "http://staging-teach.cdn.ireadabc.com/fb02868f742a700213ab814a905543ce.png",
"audio_url": "http://staging-teach.cdn.ireadabc.com/65c62cd89703cce9cec9c68b41b92f5d.mp3",
"is_right": true
},
{
"pic_url": "http://staging-teach.cdn.ireadabc.com/48ecba3519b1d58a1fa434ae694fc831.png",
"audio_url": "http://staging-teach.cdn.ireadabc.com/b4d95069fcc91976740461b9061a303a.mp3",
"pic_url": "http://staging-teach.cdn.ireadabc.com/79f690e813c7857e523505cd8b12979a.png",
"audio_url": "http://staging-teach.cdn.ireadabc.com/a8ed9422993b0865fe0625fcb3253070.mp3",
"is_right": false
},
{
"pic_url": "http://staging-teach.cdn.ireadabc.com/44464e706225cfe43e918bf1167a2ac1.png",
"audio_url": "http://staging-teach.cdn.ireadabc.com/e62f0e83bc744a6e508fa23aaa656792.mp3",
"pic_url": "http://staging-teach.cdn.ireadabc.com/fa1770431b7b8b8266474a8791b2a8fb.png",
"audio_url": "http://staging-teach.cdn.ireadabc.com/aa8d4f0add5c41218fb7c94097641b8b.mp3",
"is_right": false
},
{
"pic_url": "http://staging-teach.cdn.ireadabc.com/251667ae3d4921582392f6bc42bd2a96.png",
"audio_url": "http://staging-teach.cdn.ireadabc.com/f4e0925dec2f24505872b1c367343a6e.mp3",
"pic_url": "http://staging-teach.cdn.ireadabc.com/07e5fc4f5a8ce4c7851b91e51d68702c.png",
"audio_url": "http://staging-teach.cdn.ireadabc.com/a8ed9422993b0865fe0625fcb3253070.mp3",
"is_right": false
}
],
"audio_url": "http://staging-teach.cdn.ireadabc.com/e62f0e83bc744a6e508fa23aaa656792.mp3",
"desc1": "fg",
"desc2": "bn",
}]
"audio_url": "http://staging-teach.cdn.ireadabc.com/a8ed9422993b0865fe0625fcb3253070.mp3",
"desc1": "33"
}
]
}
\ No newline at end of file
......@@ -61,7 +61,9 @@ registerLocaleData(zh);
})
export class AppModule {
constructor(library: FaIconLibrary) {
library.addIconPacks(fas, far);
let fs :any = fas;
let fr :any = far;
library.addIconPacks(fs, fr);
// library.addIconPacks(far);
}
}
<div class="model-content">
<div style="padding: 10px;">
<div style="width: 500px; margin-top: 20px; border: 1px solid #ccc; border-radius: 5px; padding: 15px;">
答对所有题或答题满<input style="width: 50px;" type="number" nz-input [(ngModel)]="item.maxWrongNumber"
......@@ -8,8 +7,6 @@
</div>
</div>
<div style="padding: 10px;">
<div style="width: 500px; margin-top: 20px; border: 1px solid #ccc; border-radius: 5px; padding: 15px;">
猫咪开头音频:
......@@ -29,6 +26,7 @@
<div *ngFor="let q of questionArr; let i = index;"
style="width: 500px; margin-top: 20px; border: 1px solid #ccc; border-radius: 5px; padding: 15px;">
<!-- <div style=" display: flex; align-items: center;"> -->
<h3 style="margin-top: 5px">question-{{i+1}}:</h3>
<div>
......@@ -39,7 +37,7 @@
</div>
<div style=" display: flex; align-items: center;margin-top:10px">
<app-audio-recorder style="margin-left: 0px; " [audioUrl]="q.audio_url"
<app-audio-recorder style="margin-left: 10px; " [audioUrl]="q.audio_url"
(audioUploaded)="onAudioUploadSuccess($event, 'audio_url', q)"></app-audio-recorder>
<button *ngIf="q.option_arr.length < 5" nz-button nzType="primary" (click)="addOptionBtnClick(q)"
......
......@@ -26,7 +26,7 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
maxWrongNumber: 4,
startAudio: '',
endAudio: '',
question_arr: [],
question_arr: []
};
// 获取存储的数据
......@@ -61,8 +61,6 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
addQuestionBtnClick() {
this.questionArr.push({
desc1: '',
desc2: '',
question_audio_url: '',
option_arr: [ //选项 (多选)
......
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