Commit 54dac053 authored by Tt's avatar Tt

Merge branch 'master' of http://vcs.ireadabc.com/template/OP05 into master

parents 548bdb21 4c38f03b
...@@ -490,7 +490,6 @@ cc.Class({ ...@@ -490,7 +490,6 @@ cc.Class({
// pg.view.visible(btn_picture, true); // pg.view.visible(btn_picture, true);
pg.view.visible(btn_record, false); pg.view.visible(btn_record, false);
console.log('this.resultArr: ', JSON.stringify(this.resultArr));
onHomeworkFinish && onHomeworkFinish({ result: this.resultArr }); onHomeworkFinish && onHomeworkFinish({ result: this.resultArr });
}, },
...@@ -747,6 +746,7 @@ cc.Class({ ...@@ -747,6 +746,7 @@ cc.Class({
recrodEnd(data) { recrodEnd(data) {
let score = data.result.overall; let score = data.result.overall;
this._stageData.curScore = score; this._stageData.curScore = score;
this._stageData.audio_url = data.audioUrl;
// score = (score / 100) * 40 + (100 - 40); // score = (score / 100) * 40 + (100 - 40);
// score = 40; // score = 40;
if (score >= 80) { if (score >= 80) {
...@@ -819,7 +819,8 @@ cc.Class({ ...@@ -819,7 +819,8 @@ cc.Class({
console.log(' in pushResultData'); console.log(' in pushResultData');
const word = this._stageData.word; const word = this._stageData.word;
const score = this._stageData.curScore; const score = this._stageData.curScore;
this.resultArr.push({ word, score }); const audio_url = this._stageData.audio_url;
this.resultArr.push({ word, score, audio_url });
}, },
...@@ -880,6 +881,7 @@ cc.Class({ ...@@ -880,6 +881,7 @@ cc.Class({
//显示replay //显示replay
showRestartBtn() { showRestartBtn() {
return;
const btn = cc.find('Canvas/btn_replay'); const btn = cc.find('Canvas/btn_replay');
if (btn.canClick) { if (btn.canClick) {
return; return;
...@@ -898,6 +900,7 @@ cc.Class({ ...@@ -898,6 +900,7 @@ cc.Class({
}, },
hideRestartBtn() { hideRestartBtn() {
return;
console.log('hideRestartBtn'); console.log('hideRestartBtn');
const btn = cc.find('Canvas/btn_replay'); const btn = cc.find('Canvas/btn_replay');
if (!btn.canClick) { if (!btn.canClick) {
...@@ -931,7 +934,7 @@ cc.Class({ ...@@ -931,7 +934,7 @@ cc.Class({
this.playSFX("audio_sahua"); this.playSFX("audio_sahua");
this.createFireworkAni().then(() => { this.createFireworkAni().then(() => {
// 游戏结束时需要调用这个方法通知系统作业完成 // 游戏结束时需要调用这个方法通知系统作业完成
onHomeworkFinish(); // onHomeworkFinish(this.resultArr);
}) })
}, },
......
...@@ -338,13 +338,11 @@ export function showTrebleFirework(baseNode, rabbonList) { ...@@ -338,13 +338,11 @@ export function showTrebleFirework(baseNode, rabbonList) {
showFireworks(right); showFireworks(right);
} }
export function onHomeworkFinish() { export function onHomeworkFinish(data) {
const middleLayer = cc.find('middleLayer'); const middleLayer = cc.find('middleLayer');
if (middleLayer) { if (middleLayer) {
const middleLayerComponent = middleLayer.getComponent('middleLayer'); const middleLayerComponent = middleLayer.getComponent('middleLayer');
if (middleLayerComponent.role == 'student') { middleLayerComponent.onHomeworkFinish(data);
middleLayerComponent.onHomeworkFinish(() => { });
}
} else { } else {
console.log('onHomeworkFinish'); console.log('onHomeworkFinish');
} }
......
This diff is collapsed.
This diff is collapsed.
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