Commit 5645ceee authored by yu's avatar yu

11.25调整

parent e7bba903
{
"ver": "2.0.1",
"uuid": "924c41cb-644a-46f6-8920-301331b63dc8",
"downloadMode": 0,
"duration": 0.835918,
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "f66cd5ce-3586-461c-a819-f610db2b7c23",
"downloadMode": 0,
"duration": 0.2642,
"subMetas": {}
}
\ No newline at end of file
This diff is collapsed.
......@@ -104,7 +104,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
pg.event.clear();
}
initData() {
private initData() {
Game.getIns().init(this.data);
Game.getIns().reset();
// 所有全局变量 默认都是null
......@@ -116,10 +116,13 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.gameStart();
})
}
initEvent() {
private initEvent() {
cc.find("btnCheckCat", this.dbCat).on(cc.Node.EventType.TOUCH_END, this.onCat, this);
}
private onCat() {
this.catPlayAni(Game.getIns().waitAudio, () => {
})
}
private gameOver() {
Game.getIns().state = GAME_STATE.OVER;
// let data: any = {};
......@@ -132,6 +135,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
// let leaf_ske = cc.find("leaf_ske", this.node);
// leaf_ske.active = true;
// playDragonBoneAnimation(leaf_ske, "normal", 1);
cc.audioEngine.stopAllEffects();
this.catPlayAni(Game.getIns().endAudio, () => {
this.dbCat.active = false;
this.stopCountTime();
......@@ -144,7 +148,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
Game.getIns().state = GAME_STATE.RUNNING;
this.dbCat.active = true;
this.showQuestion();
pg.audio.playAudioByUrl(Game.getIns().getCurrentPage().audioUrl);
this.playLocalAudio("ding");
}
// private questions;
// private cardInfo;
......@@ -299,7 +303,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
onHomeworkFinish({});
} else {
console.log("over");
pg.audio.playAudioByUrl(Game.getIns().getCurrentPage().endAudio).then(() => {
this.playLocalAudio("huri").then(() => {
this.layout_word.children.forEach((ch) => {
ch.getComponent(cc.Label).string = "";
})
......@@ -307,8 +311,6 @@ export default class SceneComponent extends MyCocosSceneComponent {
});
return;
}
}
//根据两点获取距离
......
......@@ -151,6 +151,7 @@ export default class Game {
public beginAudio: string;
public endAudio: string;
public loadingAudio: string;
public waitAudio: string;
public finishAudioList;
public init(data) {
this.title = data.title;
......@@ -158,6 +159,7 @@ export default class Game {
this.beginAudio = data.guideBegin_audio_url || "";
this.endAudio = data.endAudio || "";
this.loadingAudio = data.startLoadingAudio || "";
this.waitAudio = data.waitAudio || "";
this.finishAudioList = data.finishAudioList || [];
this.lists = [];
this.data = data.questions;
......@@ -174,6 +176,9 @@ export default class Game {
let data = this.data[i];
this.lists.push(new Option(data, i + 1));
}
this.lists.sort(function () {
return (0.5 - Math.random());
});
this.state = GAME_STATE.WAIT;
this.total = this.lists.length;
}
......
......@@ -22,6 +22,7 @@ export const defaultData = {
],
"beginAudio": "http://staging-teach.cdn.ireadabc.com/e3921a16a8313df274d8bc4e3f2bedd8_l.mp3",
"endAudio": "http://staging-teach.cdn.ireadabc.com/fd8a2b8eeb4abbe7683d30e728ece184.mp3",
"waitAudio": "http://staging-teach.cdn.ireadabc.com/fd8a2b8eeb4abbe7683d30e728ece184.mp3",
"startLoadingAudio": "http://staging-teach.cdn.ireadabc.com/cdc41b6682e155c385093c52d2a4adff.mp3",
"guideRestart_audio_url": "",
"finishAudioList": [
......
......@@ -84,6 +84,10 @@
<app-audio-recorder style="margin-left: 10px; " [audioUrl]="item.endAudio"
(audioUploaded)="onAudioUploadSuccess($event, 'endAudio', item,'endAudioName')"></app-audio-recorder>
<span style="font-size: 20px;">猫咪待机音频:</span>
<app-audio-recorder style="margin-left: 10px; " [audioUrl]="item.waitAudio"
(audioUploaded)="onAudioUploadSuccess($event, 'waitAudio', item,'waitAudioName')"></app-audio-recorder>
<span style="font-size: 20px;">开始读条音频:</span>
<app-audio-recorder style="margin-left: 10px; " [audioUrl]="item.startLoadingAudio"
(audioUploaded)="onAudioUploadSuccess($event, 'startLoadingAudio', item,'loadAudioName')"></app-audio-recorder>
......@@ -139,7 +143,7 @@
</div>
</div> -->
<div class="option-audio">
<!-- <div class="option-audio">
<div class="word-input-title">
题目音频:
</div>
......@@ -151,12 +155,12 @@
</div>
<div style="margin: 5px">
<span>
<!-- {{ question.audioName}} -->
{{ question.audioName}}
</span>
</div>
</div>
</div>
<div class="option-audio">
</div> -->
<!-- <div class="option-audio">
<div class="word-input-title">
结束音频:
</div>
......@@ -168,13 +172,13 @@
</div>
<div style="margin: 5px">
<span>
<!-- {{ question.audioEndName}} -->
{{ question.audioEndName}}
</span>
</div>
</div>
</div>
</div> -->
<div >
<div>
<span style="font-size: 20px;">标题图片: </span>
<div style="width:300px">
<app-upload-image-with-preview [picUrl]="question.image"
......
......@@ -22,6 +22,7 @@ export class FormComponent extends ComponentBase implements OnInit, OnChanges, O
finishAudioList: [],
beginAudio: "",
endAudio: "",
waitAudio: "",
startLoadingAudio: "",
};
......
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