Compare commits
2 Commits
975ee6ea25
...
cc75ff1862
| Author | SHA1 | Date |
|---|---|---|
|
|
cc75ff1862 | |
|
|
27c13a57d4 |
|
|
@ -713,19 +713,26 @@ export default class GoFishGame extends Phaser.Scene {
|
||||||
const askerCard = beforeState.players[askerSeat].hand.find(c => c.rank === rank);
|
const askerCard = beforeState.players[askerSeat].hand.find(c => c.rank === rank);
|
||||||
if (!askerCard) { onComplete(); return; }
|
if (!askerCard) { onComplete(); return; }
|
||||||
|
|
||||||
const askerSprite = this.makeCardSprite(askerCard, askerLayout.handCenter.x, askerLayout.handCenter.y, {
|
const existingSprite = this.cardObjs.get(`hand-${askerSeat}-${askerCard.id}`);
|
||||||
faceUp: false, rotation: 0,
|
const askerSprite = existingSprite
|
||||||
});
|
?? this.makeCardSprite(askerCard, askerLayout.handCenter.x, askerLayout.handCenter.y, {
|
||||||
|
faceUp: askerLayout.handFaceUp, rotation: 0,
|
||||||
|
});
|
||||||
|
if (existingSprite) this.cardObjs.delete(`hand-${askerSeat}-${askerCard.id}`);
|
||||||
|
const origX = askerSprite.x;
|
||||||
|
const origY = askerSprite.y;
|
||||||
askerSprite.setDepth(D.banner - 4);
|
askerSprite.setDepth(D.banner - 4);
|
||||||
this.transientObjs.push(askerSprite);
|
this.transientObjs.push(askerSprite);
|
||||||
|
|
||||||
// Move asker card to show zone then flip it face-up.
|
// Move asker card to show zone then flip it face-up (skip flip if already face-up).
|
||||||
this.tweens.add({
|
this.tweens.add({
|
||||||
targets: askerSprite,
|
targets: askerSprite,
|
||||||
x: askerShow.x, y: askerShow.y,
|
x: askerShow.x, y: askerShow.y,
|
||||||
duration: 280,
|
duration: 280,
|
||||||
ease: 'Cubic.easeOut',
|
ease: 'Cubic.easeOut',
|
||||||
onComplete: () => this.flipCardFaceUp(askerSprite, askerCard),
|
onComplete: () => {
|
||||||
|
if (!askerLayout.handFaceUp) this.flipCardFaceUp(askerSprite, askerCard);
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
// After card is revealed, cast fishing line toward the target, then show result.
|
// After card is revealed, cast fishing line toward the target, then show result.
|
||||||
|
|
@ -739,9 +746,12 @@ export default class GoFishGame extends Phaser.Scene {
|
||||||
: targetShow.x + (i - (n - 1) / 2) * (CARD_W + 8);
|
: targetShow.x + (i - (n - 1) / 2) * (CARD_W + 8);
|
||||||
const ty = isTargetVert ? targetShow.y + (i - (n - 1) / 2) * (CARD_H + 8)
|
const ty = isTargetVert ? targetShow.y + (i - (n - 1) / 2) * (CARD_H + 8)
|
||||||
: targetShow.y;
|
: targetShow.y;
|
||||||
const sprite = this.makeCardSprite(card, targetLayout.handCenter.x, targetLayout.handCenter.y, {
|
const existingTargetSprite = this.cardObjs.get(`hand-${targetSeat}-${card.id}`);
|
||||||
faceUp: false, rotation: 0,
|
const sprite = existingTargetSprite
|
||||||
});
|
?? this.makeCardSprite(card, targetLayout.handCenter.x, targetLayout.handCenter.y, {
|
||||||
|
faceUp: targetLayout.handFaceUp, rotation: 0,
|
||||||
|
});
|
||||||
|
if (existingTargetSprite) this.cardObjs.delete(`hand-${targetSeat}-${card.id}`);
|
||||||
sprite.setDepth(D.banner - 4);
|
sprite.setDepth(D.banner - 4);
|
||||||
this.transientObjs.push(sprite);
|
this.transientObjs.push(sprite);
|
||||||
this.tweens.add({
|
this.tweens.add({
|
||||||
|
|
@ -750,7 +760,9 @@ export default class GoFishGame extends Phaser.Scene {
|
||||||
duration: 250,
|
duration: 250,
|
||||||
delay: i * 80,
|
delay: i * 80,
|
||||||
ease: 'Cubic.easeOut',
|
ease: 'Cubic.easeOut',
|
||||||
onComplete: () => this.flipCardFaceUp(sprite, card),
|
onComplete: () => {
|
||||||
|
if (!targetLayout.handFaceUp) this.flipCardFaceUp(sprite, card);
|
||||||
|
},
|
||||||
});
|
});
|
||||||
return { sprite, tx, ty };
|
return { sprite, tx, ty };
|
||||||
});
|
});
|
||||||
|
|
@ -782,12 +794,13 @@ export default class GoFishGame extends Phaser.Scene {
|
||||||
this.time.delayedCall(320, () => onComplete(allSprites));
|
this.time.delayedCall(320, () => onComplete(allSprites));
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
// Fish — flip card back face-down and return it to hand.
|
// Fish — flip card back face-down (if needed) and return it to hand.
|
||||||
this.flipCardFaceDown(askerSprite);
|
if (!askerLayout.handFaceUp) this.flipCardFaceDown(askerSprite);
|
||||||
this.time.delayedCall(340, () => {
|
const returnDelay = askerLayout.handFaceUp ? 80 : 340;
|
||||||
|
this.time.delayedCall(returnDelay, () => {
|
||||||
this.tweens.add({
|
this.tweens.add({
|
||||||
targets: askerSprite,
|
targets: askerSprite,
|
||||||
x: askerLayout.handCenter.x, y: askerLayout.handCenter.y,
|
x: origX, y: origY,
|
||||||
duration: 280, ease: 'Cubic.easeIn',
|
duration: 280, ease: 'Cubic.easeIn',
|
||||||
onComplete: () => { if (askerSprite.active) askerSprite.destroy(); },
|
onComplete: () => { if (askerSprite.active) askerSprite.destroy(); },
|
||||||
});
|
});
|
||||||
|
|
@ -1011,27 +1024,37 @@ export default class GoFishGame extends Phaser.Scene {
|
||||||
|
|
||||||
if (sprite) {
|
if (sprite) {
|
||||||
const revealCard = askerSeat === 0 ? after.lastAsk.drawnCard : null;
|
const revealCard = askerSeat === 0 ? after.lastAsk.drawnCard : null;
|
||||||
this.animateFishDraw(sprite, askerSeat, revealCard, continueAfterDraw);
|
const drawnCard = after.lastAsk.drawnCard;
|
||||||
|
const newHand = after.players[askerSeat].hand;
|
||||||
|
const cardIndex = newHand.findIndex(c => c.id === drawnCard.id);
|
||||||
|
const askerLayout = slotLayout(this.slotForSeat[askerSeat]);
|
||||||
|
let destX, destY;
|
||||||
|
if (askerLayout.handAxis === 'x') {
|
||||||
|
destX = askerLayout.handCenter.x + (cardIndex - (newHand.length - 1) / 2) * HAND_SPREAD;
|
||||||
|
destY = askerLayout.handCenter.y;
|
||||||
|
} else {
|
||||||
|
destX = askerLayout.handCenter.x;
|
||||||
|
destY = askerLayout.handCenter.y + (cardIndex - (newHand.length - 1) / 2) * HAND_SPREAD;
|
||||||
|
}
|
||||||
|
this.animateFishDraw(sprite, revealCard, destX, destY, continueAfterDraw);
|
||||||
} else {
|
} else {
|
||||||
this.time.delayedCall(50, continueAfterDraw);
|
this.time.delayedCall(50, continueAfterDraw);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
animateFishDraw(sprite, askerSeat, revealCard, onComplete) {
|
animateFishDraw(sprite, revealCard, destX, destY, onComplete) {
|
||||||
const layout = slotLayout(this.slotForSeat[askerSeat]);
|
|
||||||
sprite.setDepth(D.banner - 4);
|
sprite.setDepth(D.banner - 4);
|
||||||
|
this.transientObjs.push(sprite);
|
||||||
|
|
||||||
const flyToHand = () => {
|
const flyToHand = () => {
|
||||||
this.tweens.add({
|
this.tweens.add({
|
||||||
targets: sprite,
|
targets: sprite,
|
||||||
x: layout.handCenter.x, y: layout.handCenter.y,
|
x: destX, y: destY,
|
||||||
rotation: 0,
|
rotation: 0,
|
||||||
alpha: 0,
|
|
||||||
duration: 400,
|
duration: 400,
|
||||||
ease: 'Cubic.easeIn',
|
ease: 'Cubic.easeIn',
|
||||||
onComplete: () => { if (sprite.active) sprite.destroy(); },
|
onComplete: () => onComplete(),
|
||||||
});
|
});
|
||||||
this.time.delayedCall(450, onComplete);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
if (revealCard) {
|
if (revealCard) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue