Commit db4244d0 authored by yu's avatar yu

1

parent ca0b8e93
...@@ -421,7 +421,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -421,7 +421,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
let anis = db.getAnimationNames(db.armatureName); let anis = db.getAnimationNames(db.armatureName);
db.playAnimation(anis[0], 0); db.playAnimation(anis[0], 0);
cc.tween(start_ske).by(0.5, { x: -500 }).call(() => { cc.tween(start_ske).by(0.5, { x: -500 }).call(() => {
pg.audio.playAudioByUrl(Game.getIns().errorAudio).then(() => { pg.audio.playAudioByUrl(Game.getIns().getCurrentPage().rightAudio).then(() => {
cc.tween(start_ske).delay(0.2).by(0.5, { x: 500 }).call(() => { cc.tween(start_ske).delay(0.2).by(0.5, { x: 500 }).call(() => {
this.layout_start.active = false; this.layout_start.active = false;
this.showTip(); this.showTip();
......
...@@ -43,6 +43,7 @@ export class Option { ...@@ -43,6 +43,7 @@ export class Option {
export class Item { export class Item {
public page; public page;
public audio; public audio;
public rightAudio;
public duration; public duration;
public optionList; public optionList;
public word; public word;
...@@ -53,6 +54,7 @@ export class Item { ...@@ -53,6 +54,7 @@ export class Item {
public isRecord: boolean; public isRecord: boolean;
constructor(data, page) { constructor(data, page) {
this.audio = data.audio || ""; this.audio = data.audio || "";
this.rightAudio = data.rightAudio || "";
this.text = data.text; this.text = data.text;
this.word = data.word.toLowerCase(); this.word = data.word.toLowerCase();
this.type = data.type; this.type = data.type;
...@@ -152,13 +154,11 @@ export default class Game { ...@@ -152,13 +154,11 @@ export default class Game {
public dispelCount; public dispelCount;
public aniEnter; public aniEnter;
public startAudio: string; public startAudio: string;
public errorAudio: string;
// public questionText: string; // public questionText: string;
public init(data) { public init(data) {
// this.question = { text: data.questionText, audio: data.questionTextAudio }; // this.question = { text: data.questionText, audio: data.questionTextAudio };
this.title = data.title; this.title = data.title;
this.startAudio = data.startAudio || ""; this.startAudio = data.startAudio || "";
this.errorAudio = data.errorAudio || "";
// this.questionText = data.questionText; // this.questionText = data.questionText;
this.start = false; this.start = false;
this.lists = []; this.lists = [];
......
...@@ -22,6 +22,7 @@ export const defaultData = { ...@@ -22,6 +22,7 @@ export const defaultData = {
{ {
"type": "txt", "type": "txt",
"audio": "",// "http://staging-teach.cdn.ireadabc.com/449e65975d358514cc3494f9f67bc012_l.mp3", "audio": "",// "http://staging-teach.cdn.ireadabc.com/449e65975d358514cc3494f9f67bc012_l.mp3",
"rightAudio": "http://staging-teach.cdn.ireadabc.com/449e65975d358514cc3494f9f67bc012_l.mp3",
"text": "what are you kettle ?", "text": "what are you kettle ?",
"image": "", "image": "",
"time": 10, "time": 10,
...@@ -32,6 +33,7 @@ export const defaultData = { ...@@ -32,6 +33,7 @@ export const defaultData = {
{ {
"type": "img", "type": "img",
"audio": "http://staging-teach.cdn.ireadabc.com/944ae51b57fb9390dd03104d9651e5f4_l.mp3", "audio": "http://staging-teach.cdn.ireadabc.com/944ae51b57fb9390dd03104d9651e5f4_l.mp3",
"rightAudio": "http://staging-teach.cdn.ireadabc.com/449e65975d358514cc3494f9f67bc012_l.mp3",
"text": "what your name ?", "text": "what your name ?",
"image": "http://staging-teach.cdn.ireadabc.com/95c760f287a3c55bacc6c12ea47259ea.jpg", "image": "http://staging-teach.cdn.ireadabc.com/95c760f287a3c55bacc6c12ea47259ea.jpg",
"time": 10, "time": 10,
...@@ -42,6 +44,7 @@ export const defaultData = { ...@@ -42,6 +44,7 @@ export const defaultData = {
{ {
"type": "txt", "type": "txt",
"audio": "http://staging-teach.cdn.ireadabc.com/36067f9e2415d59fa37c3795a3929087_l.mp3", "audio": "http://staging-teach.cdn.ireadabc.com/36067f9e2415d59fa37c3795a3929087_l.mp3",
"rightAudio": "http://staging-teach.cdn.ireadabc.com/449e65975d358514cc3494f9f67bc012_l.mp3",
"text": "what are you disdain?", "text": "what are you disdain?",
"image": "", "image": "",
"time": 20, "time": 20,
......
...@@ -89,8 +89,8 @@ ...@@ -89,8 +89,8 @@
<span>{{ item.audioName}}</span> <span>{{ item.audioName}}</span>
</div> </div>
</div> </div>
<span style="font-size: 20px;">错误音频: </span> <!-- <span style="font-size: 20px;">错误音频: </span> -->
<div style="display:flex ;"> <!-- <div style="display:flex ;">
<div> <div>
<app-audio-recorder [audioUrl]="item.errorAudio" <app-audio-recorder [audioUrl]="item.errorAudio"
(audioUploaded)="onAudioUploadSuccess($event, 'errorAudio',item,'errorAudioName')"></app-audio-recorder> (audioUploaded)="onAudioUploadSuccess($event, 'errorAudio',item,'errorAudioName')"></app-audio-recorder>
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
<div style="margin: 5px"> <div style="margin: 5px">
<span>{{ item.errorAudioName}}</span> <span>{{ item.errorAudioName}}</span>
</div> </div>
</div> </div> -->
<div *ngIf="item.tipSwitch == 1"> <div *ngIf="item.tipSwitch == 1">
<span style="font-size: 20px;">提示动画: </span> <span style="font-size: 20px;">提示动画: </span>
<app-upload-dragon-bone style="width: 100%" (save)="onDragonBoneSave($event,item)" <app-upload-dragon-bone style="width: 100%" (save)="onDragonBoneSave($event,item)"
...@@ -178,6 +178,22 @@ ...@@ -178,6 +178,22 @@
</div> </div>
</div> </div>
</div> </div>
<div class="option-audio">
<div class="word-input-title">
正确音频:
</div>
<div style="display: flex">
<div>
<app-audio-recorder [audioUrl]="question.rightAudio"
(audioUploaded)="onAudioUploadSuccess($event, 'rightAudio',question,'rightAudioName')"></app-audio-recorder>
</div>
<div style="margin: 5px">
<span>
{{ question.rightAudioName}}
</span>
</div>
</div>
</div>
<div *ngIf="question.type=='img'"> <div *ngIf="question.type=='img'">
<span style="font-size: 20px;">标题图片: </span> <span style="font-size: 20px;">标题图片: </span>
<div style="width:300px"> <div style="width:300px">
......
...@@ -61,6 +61,7 @@ export class FormComponent extends ComponentBase implements OnInit, OnChanges, O ...@@ -61,6 +61,7 @@ export class FormComponent extends ComponentBase implements OnInit, OnChanges, O
time: null, time: null,
audioName: "", audioName: "",
word: '', word: '',
rightAudio: '',
noWord: 1 noWord: 1
}); });
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