Commit 123f50a1 authored by Tt's avatar Tt

上传测试

parent 19e71838
...@@ -25,11 +25,11 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -25,11 +25,11 @@ export default class SceneComponent extends MyCocosSceneComponent {
addPreloadAudio() { addPreloadAudio() {
// TODO 根据自己的配置预加载音频资源 // TODO 根据自己的配置预加载音频资源
this._audioResList.push({ url: this.data.gameStartAudio }); this.data.gameStartAudio && this._audioResList.push({ url: this.data.gameStartAudio });
this._audioResList.push({ url: this.data.gameLoadingAudio }); this.data.gameLoadingAudio && this._audioResList.push({ url: this.data.gameLoadingAudio });
this._audioResList.push({ url: this.data.waitingWheel }); this.data.waitingWheel && this._audioResList.push({ url: this.data.waitingWheel });
this._audioResList.push({ url: this.data.waitingPiece }); this.data.waitingPiece && this._audioResList.push({ url: this.data.waitingPiece });
this._audioResList.push({ url: this.data.waitingTurn }); this.data.waitingTurn && this._audioResList.push({ url: this.data.waitingTurn });
} }
addPreloadAnima() { } addPreloadAnima() { }
...@@ -924,6 +924,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -924,6 +924,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
if (this._status.current == playerMe.color) { if (this._status.current == playerMe.color) {
// let rightBlock = this.getRightBlock(); // let rightBlock = this.getRightBlock();
let rightBlock = this.getCurrentBlock(); let rightBlock = this.getCurrentBlock();
let idx = this.getNextRightIdx();
const pieceRed = cc.find("Canvas/bg/chessBoard/pieceRed"); const pieceRed = cc.find("Canvas/bg/chessBoard/pieceRed");
const pieceBlue = cc.find("Canvas/bg/chessBoard/pieceBlue"); const pieceBlue = cc.find("Canvas/bg/chessBoard/pieceBlue");
const riData = rightBlock.getComponent("BoardGame2_ItemData"); const riData = rightBlock.getComponent("BoardGame2_ItemData");
...@@ -933,6 +934,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -933,6 +934,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
await this.pieceFindRightBlock(rightBlock, idx); await this.pieceFindRightBlock(rightBlock, idx);
} }
this.updateProgress(idx);
pieceRed["cantMove"] = true; pieceRed["cantMove"] = true;
pieceBlue["cantMove"] = true; pieceBlue["cantMove"] = true;
this._status.letter = ""; this._status.letter = "";
......
...@@ -3,7 +3,7 @@ import { asyncPlayDragonBoneAnimation } from "./util"; ...@@ -3,7 +3,7 @@ import { asyncPlayDragonBoneAnimation } from "./util";
const { ccclass, property } = cc._decorator; const { ccclass, property } = cc._decorator;
@ccclass @ccclass
export default class SceneComponent extends cc.Component { export default class L2_boardgame2_treeSceneComponent extends cc.Component {
ctor() { ctor() {
} }
......
...@@ -192,6 +192,11 @@ export class MyCocosSceneComponent extends cc.Component { ...@@ -192,6 +192,11 @@ export class MyCocosSceneComponent extends cc.Component {
}); });
} }
}); });
} else {
resolve(0);
if (cb) {
cb();
}
} }
}); });
} }
......
export const defaultData = { export const defaultData = {
gameStartAudio: gameStartAudio:
"http://staging-teach.cdn.ireadabc.com/7c18e0838dcf0707f885842ed09e1579.mp3", "",
gameLoadingAudio: gameLoadingAudio:
"http://staging-teach.cdn.ireadabc.com/6b3846cee6afa2ae450234aeec835beb.mp3", "",
waitingWheel: waitingWheel:
"http://staging-teach.cdn.ireadabc.com/23376490a9ba0f4a3fe0618fc1c935e1.mp3", "",
waitingPiece: waitingPiece:
"http://staging-teach.cdn.ireadabc.com/b44fa51172b19b555fda30717c773027.mp3", "",
waitingTurn: waitingTurn:
"http://staging-teach.cdn.ireadabc.com/a6a5c388c636bc6d063946e91b4bd21a.mp3", "",
}; };
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