Commit b35ff84d authored by yu's avatar yu

1

parent 90ea4c4f
...@@ -444,7 +444,7 @@ ...@@ -444,7 +444,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 150.74, "width": 150.74,
"height": 63 "height": 50
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -945,7 +945,7 @@ ...@@ -945,7 +945,7 @@
"_N$verticalAlign": 1, "_N$verticalAlign": 1,
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 2,
"_id": "" "_id": ""
}, },
{ {
...@@ -961,7 +961,7 @@ ...@@ -961,7 +961,7 @@
"_alignFlags": 9, "_alignFlags": 9,
"_left": 274.52700000000004, "_left": 274.52700000000004,
"_right": 0, "_right": 0,
"_top": 67.39999999999998, "_top": 73.89999999999998,
"_bottom": 0, "_bottom": 0,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
......
...@@ -45,15 +45,24 @@ export default class LayerEnding extends cc.Component { ...@@ -45,15 +45,24 @@ export default class LayerEnding extends cc.Component {
onTouchNext() { onTouchNext() {
pg.view.visible(this.layer_center, false) pg.view.visible(this.layer_center, false)
const middleLayer = cc.find('middleLayer'); const middleLayer = cc.find('middleLayer');
if (!middleLayer) return console.log("middleLayer "); if (!middleLayer) return this.log("no middleLayer ");
const middleLayerComponent = middleLayer.getComponent('middleLayer'); const middleLayerComponent = middleLayer.getComponent('middleLayer');
const { index, length } = middleLayerComponent.getPageInfo(); // 返回 length:有多少页; index: 当前第几页(从0开始) const { index, length } = middleLayerComponent.getPageInfo(); // 返回 length:有多少页; index: 当前第几页(从0开始)
this.log("跳转到下一页 ");
if (index == length - 1) { if (index == length - 1) {
middleLayerComponent.goNextCross(); // 跳转到下一关卡 middleLayerComponent.goNextCross(); // 跳转到下一关卡
} else { } else {
middleLayerComponent.goNextPage(); // 跳转到下一页 middleLayerComponent.goNextPage(); // 跳转到下一页
} }
} }
log(str) {
const node = cc.find('middleLayer');
if (node) {
node.getComponent('middleLayer').log(str);
} else {
cc.log(str);
}
}
} }
......
...@@ -70,6 +70,7 @@ export default class PuzzleJigsaw extends MyCocosSceneComponent { ...@@ -70,6 +70,7 @@ export default class PuzzleJigsaw extends MyCocosSceneComponent {
GameJigsaw.getIns().reset(); GameJigsaw.getIns().reset();
this.cardBgs = []; this.cardBgs = [];
this.coin = 0; this.coin = 0;
this.roundOver = false;
} }
initView() { initView() {
...@@ -308,7 +309,6 @@ export default class PuzzleJigsaw extends MyCocosSceneComponent { ...@@ -308,7 +309,6 @@ export default class PuzzleJigsaw extends MyCocosSceneComponent {
// rightBg0.active = true; // rightBg0.active = true;
// rightBg1.active = true; // rightBg1.active = true;
itemBg.isChecked = true; itemBg.isChecked = true;
this.playLocalAudio("right");
// setTimeout(() => { // setTimeout(() => {
// rightBg0.active = false; // rightBg0.active = false;
// rightBg1.active = false; // rightBg1.active = false;
...@@ -323,9 +323,11 @@ export default class PuzzleJigsaw extends MyCocosSceneComponent { ...@@ -323,9 +323,11 @@ export default class PuzzleJigsaw extends MyCocosSceneComponent {
// itemBg.getChildByName("layer_candy").active = false; // itemBg.getChildByName("layer_candy").active = false;
// }, 1000); // }, 1000);
this.playLocalAudio("right").then(() => {
if (this.checkRoundEnd()) { if (this.checkRoundEnd()) {
this.checkGameOver(); this.checkGameOver();
} }
});
} else { } else {
this.playLocalAudio("error"); this.playLocalAudio("error");
} }
...@@ -361,8 +363,10 @@ export default class PuzzleJigsaw extends MyCocosSceneComponent { ...@@ -361,8 +363,10 @@ export default class PuzzleJigsaw extends MyCocosSceneComponent {
if (this.currentCards.length != this.cards.length) return false; if (this.currentCards.length != this.cards.length) return false;
return this.currentCards.every(card => !!card); return this.currentCards.every(card => !!card);
} }
private roundOver;
private checkGameOver() { private checkGameOver() {
if (this.roundOver) return;
this.roundOver = true;
let audio = GameJigsaw.getIns().getCurrentPage().audio; let audio = GameJigsaw.getIns().getCurrentPage().audio;
let over = GameJigsaw.getIns().addPage(); let over = GameJigsaw.getIns().addPage();
pg.audio.playAudioByUrl(audio).then(async () => { pg.audio.playAudioByUrl(audio).then(async () => {
...@@ -373,6 +377,7 @@ export default class PuzzleJigsaw extends MyCocosSceneComponent { ...@@ -373,6 +377,7 @@ export default class PuzzleJigsaw extends MyCocosSceneComponent {
pg.event.once('layer_right_show_excellent_end', () => { pg.event.once('layer_right_show_excellent_end', () => {
this.coin += 3; this.coin += 3;
pg.event.emit('layer_coin_show_coin', this.coin) //1 2 3硬币数量 pg.event.emit('layer_coin_show_coin', this.coin) //1 2 3硬币数量
this.roundOver = false;
}) })
pg.event.emit("layer_right_show_excellent"); pg.event.emit("layer_right_show_excellent");
} }
......
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