Wickedness/heros_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up final unit command prompt

Browse Source
This commit is contained in:
Wickedness
2026-07-02 23:33:38 +09:00
parent 85b1f23ec2
commit 136766e676
1 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/game/scenes/BattleScene.ts
View File

@@ -3812,24 +3812,28 @@ export class BattleScene extends Phaser.Scene {
if (!stayingInPlace) {
this.moveUnitView(unit, x, y, view, 260, fromX, fromY);
}
this.showCommandMenu(unit, pointer?.x ?? targetX, pointer?.y ?? targetY);
const commandX = pointer?.x ?? targetX;
const commandY = pointer?.y ?? targetY;
const isFinalAlly = this.remainingAllyCount() === 1;
const finalAllyHint = isFinalAlly ? '\n마지막 미행동 장수입니다. 바로 턴 종료 확인을 선택할 수 있습니다.' : '';
this.renderUnitDetail(unit, `공격, 책략, 도구, 대기 중 하나를 선택하세요.\n우클릭하면 이동을 취소합니다.${finalAllyHint}`);
if (isFinalAlly) {
this.showPostMoveTurnEndPrompt(unit);
this.hideCommandMenu();
this.renderUnitDetail(unit, '마지막 미행동 장수입니다.\n바로 턴을 종료하거나 명령을 선택할 수 있습니다.');
this.showPostMoveTurnEndPrompt(unit, commandX, commandY);
return;
}
this.showCommandMenu(unit, commandX, commandY);
this.renderUnitDetail(unit, '공격, 책략, 도구, 대기 중 하나를 선택하세요.\n우클릭하면 이동을 취소합니다.');
this.hideTurnEndPrompt();
}
private showPostMoveTurnEndPrompt(unit: UnitData) {
private showPostMoveTurnEndPrompt(unit: UnitData, commandX = this.tileCenterX(unit.x), commandY = this.tileCenterY(unit.y)) {
this.hideCommandMenu();
this.showTurnEndPrompt(undefined, {
mode: 'post-move',
title: '마지막 장수 이동 완료',
body: '대기로 행동을 마치고 턴을 종료할까요?',
body: '대기로 턴을 끝낼까요?',
primaryLabel: '대기 후 턴 종료',
secondaryLabel: '명령 선택',
primaryAction: () => {
@@ -3843,7 +3847,18 @@ export class BattleScene extends Phaser.Scene {
this.endAllyTurn();
}
},
secondaryAction: () => this.hideTurnEndPrompt()
secondaryAction: () => {
if (this.phase !== 'command' || this.selectedUnit?.id !== unit.id || this.actedUnitIds.has(unit.id)) {
this.hideTurnEndPrompt();
return;
}
this.suppressNextLeftClick = true;
this.hideTurnEndPrompt();
this.showCommandMenu(unit, commandX, commandY);
this.renderUnitDetail(unit, '공격, 책략, 도구, 대기 중 하나를 선택하세요.\n우클릭하면 이동을 취소합니다.');
soundDirector.playSelect();
}
});
}
@@ -4244,14 +4259,29 @@ export class BattleScene extends Phaser.Scene {
}
private commandMenuPosition(pointerX: number, pointerY: number, width: number, height: number) {
const margin = 14;
const margin = 12;
const offset = 18;
const preferredLeft = pointerX + offset + width > this.scale.width - margin ? pointerX - offset - width : pointerX + offset;
const preferredTop = pointerY + height > this.scale.height - margin ? this.scale.height - margin - height : pointerY;
const minLeft = this.layout.mapX + margin;
const maxLeft = this.layout.mapX + this.layout.mapWidth - margin - width;
const minTop = this.layout.mapY + margin;
const maxTop = this.layout.mapY + this.layout.mapHeight - margin - height;
if (maxLeft < minLeft || maxTop < minTop) {
const preferredLeft = pointerX + offset + width > this.scale.width - margin ? pointerX - offset - width : pointerX + offset;
const preferredTop = pointerY + height > this.scale.height - margin ? this.scale.height - margin - height : pointerY;
return {
left: Phaser.Math.Clamp(preferredLeft, margin, this.scale.width - margin - width),
top: Phaser.Math.Clamp(preferredTop, margin, this.scale.height - margin - height)
};
}
const preferredLeft = pointerX + offset + width <= maxLeft ? pointerX + offset : pointerX - offset - width;
const preferredTop = pointerY - height / 2;
return {
left: Phaser.Math.Clamp(preferredLeft, margin, this.scale.width - margin - width),
top: Phaser.Math.Clamp(preferredTop, margin, this.scale.height - margin - height)
left: Phaser.Math.Clamp(preferredLeft, minLeft, maxLeft),
top: Phaser.Math.Clamp(preferredTop, minTop, maxTop)
};
}