{teamPaintRates.map((rate, index) => (
@@ -77,7 +82,7 @@
>
■
- {`${Math.round(rate)}%`}
+ {shouldMaskPaintRate ? "???%" : `${Math.round(rate)}%`}
))}
@@ -94,12 +99,23 @@
onJoystickInput,
onPlaceBomb,
}: Props) => {
+ const remainingSeconds = parseRemainingSeconds(timeLeft);
+ const isFeverTime =
+ remainingSeconds <= config.GAME_CONFIG.BOMB_FEVER_START_REMAINING_SEC;
+
return (
-
+
{/* タイマーUIの表示 */}
-
+
+
+ {remainingSeconds === 60 && (
+
！Fever Tieme！
+ )}
{startCountdownText && (
{startCountdownText}
@@ -111,6 +127,7 @@
{/* 入力UI レイヤー */}
diff --git a/apps/client/src/scenes/game/application/lifecycle/GameSessionFacade.ts b/apps/client/src/scenes/game/application/lifecycle/GameSessionFacade.ts
index 7a5debe..46b8089 100644
--- a/apps/client/src/scenes/game/application/lifecycle/GameSessionFacade.ts
+++ b/apps/client/src/scenes/game/application/lifecycle/GameSessionFacade.ts
@@ -4,10 +4,7 @@
* タイマーと入力ゲートの操作窓口を統一する
*/
import { GameTimer } from "@client/scenes/game/application/GameTimer";
-import {
- InputGate,
- type JoystickInput,
-} from "./InputGate";
+import { InputGate, type JoystickInput } from "./InputGate";
/** ゲーム進行状態と入力可否の窓口を提供する */
export class GameSessionFacade {
@@ -17,6 +14,7 @@
constructor() {
this.inputGate = new InputGate({
isStartedProvider: () => this.timer.isStarted(),
+ isPlayableTimeProvider: () => this.timer.getRemainingTime() > 0,
});
}
@@ -59,4 +57,4 @@
public reset(): void {
this.inputGate.reset();
}
-}
\ No newline at end of file
+}
diff --git a/apps/client/src/scenes/game/application/lifecycle/InputGate.ts b/apps/client/src/scenes/game/application/lifecycle/InputGate.ts
index 360e56e..8f54944 100644
--- a/apps/client/src/scenes/game/application/lifecycle/InputGate.ts
+++ b/apps/client/src/scenes/game/application/lifecycle/InputGate.ts
@@ -13,20 +13,27 @@
/** InputGate の初期化入力 */
export type InputGateOptions = {
isStartedProvider: () => boolean;
+ isPlayableTimeProvider?: () => boolean;
};
/** ゲーム入力の受付可否とロック状態を管理する */
export class InputGate {
private readonly isStartedProvider: () => boolean;
+ private readonly isPlayableTimeProvider: () => boolean;
private inputLockCount = 0;
- constructor({ isStartedProvider }: InputGateOptions) {
+ constructor({ isStartedProvider, isPlayableTimeProvider }: InputGateOptions) {
this.isStartedProvider = isStartedProvider;
+ this.isPlayableTimeProvider = isPlayableTimeProvider ?? (() => true);
}
/** 現在入力を受け付け可能かを返す */
public canAcceptInput(): boolean {
- return this.inputLockCount === 0 && this.isStartedProvider();
+ return (
+ this.inputLockCount === 0 &&
+ this.isStartedProvider() &&
+ this.isPlayableTimeProvider()
+ );
}
/** 入力ロックを取得し，解除関数を返す */
@@ -57,4 +64,4 @@
public reset(): void {
this.inputLockCount = 0;
}
-}
\ No newline at end of file
+}
diff --git a/apps/client/src/scenes/game/application/runtime/GameSceneRuntime.ts b/apps/client/src/scenes/game/application/runtime/GameSceneRuntime.ts
index f337f81..260d65c 100644
--- a/apps/client/src/scenes/game/application/runtime/GameSceneRuntime.ts
+++ b/apps/client/src/scenes/game/application/runtime/GameSceneRuntime.ts
@@ -177,6 +177,10 @@
}
public tick(ticker: Ticker): void {
+ if (!this.sessionFacade.canAcceptInput()) {
+ this.clearJoystickInput();
+ }
+
this.gameLoop?.tick(ticker);
}
diff --git a/apps/client/src/scenes/game/entities/bomb/services/BombPlacementService.ts b/apps/client/src/scenes/game/entities/bomb/services/BombPlacementService.ts
index 616d416..098ff3b 100644
--- a/apps/client/src/scenes/game/entities/bomb/services/BombPlacementService.ts
+++ b/apps/client/src/scenes/game/entities/bomb/services/BombPlacementService.ts
@@ -37,7 +37,13 @@
private readonly bombIdRegistry: BombIdRegistry;
private lastBombPlacedElapsedMs = Number.NEGATIVE_INFINITY;
- constructor({ players, myId, getElapsedMs, appearanceResolver, bombIdRegistry }: BombPlacementServiceOptions) {
+ constructor({
+ players,
+ myId,
+ getElapsedMs,
+ appearanceResolver,
+ bombIdRegistry,
+ }: BombPlacementServiceOptions) {
this.players = players;
this.myId = myId;
this.getElapsedMs = getElapsedMs;
@@ -53,13 +59,27 @@
}
const elapsedMs = this.getElapsedMs();
- const { BOMB_COOLDOWN_MS, BOMB_FUSE_MS } = config.GAME_CONFIG;
- if (elapsedMs - this.lastBombPlacedElapsedMs < BOMB_COOLDOWN_MS) {
+ const {
+ BOMB_COOLDOWN_MS,
+ BOMB_NORMAL_COOLDOWN_MS,
+ BOMB_FEVER_COOLDOWN_MS,
+ BOMB_FEVER_START_REMAINING_SEC,
+ BOMB_FUSE_MS,
+ GAME_DURATION_SEC,
+ } = config.GAME_CONFIG;
+ const remainingSec = Math.max(0, GAME_DURATION_SEC - elapsedMs / 1000);
+ const isFeverTime = remainingSec <= BOMB_FEVER_START_REMAINING_SEC;
+ const cooldownMs = isFeverTime
+ ? BOMB_FEVER_COOLDOWN_MS
+ : (BOMB_NORMAL_COOLDOWN_MS ?? BOMB_COOLDOWN_MS);
+
+ if (elapsedMs - this.lastBombPlacedElapsedMs < cooldownMs) {
return null;
}
const position = me.getPosition();
- const { requestId, tempBombId } = this.bombIdRegistry.issuePendingOwnBombId();
+ const { requestId, tempBombId } =
+ this.bombIdRegistry.issuePendingOwnBombId();
const payload: PlaceBombPayload = {
requestId,
x: position.x,
@@ -107,4 +127,4 @@
return playerController.getSnapshot().teamId;
}
-}
\ No newline at end of file
+}
diff --git a/apps/client/src/scenes/game/input/GameInputOverlay.tsx b/apps/client/src/scenes/game/input/GameInputOverlay.tsx
index 654daa8..4c8dd51 100644
--- a/apps/client/src/scenes/game/input/GameInputOverlay.tsx
+++ b/apps/client/src/scenes/game/input/GameInputOverlay.tsx
@@ -12,6 +12,7 @@
/** 入力UIレイヤーの入力プロパティ */
type GameInputOverlayProps = {
isInputEnabled: boolean;
+ isFeverTime: boolean;
onJoystickInput: (x: number, y: number) => void;
onPlaceBomb: () => boolean;
};
@@ -19,10 +20,13 @@
/** 入力UIレイヤーを描画する */
export const GameInputOverlay = ({
isInputEnabled,
+ isFeverTime,
onJoystickInput,
onPlaceBomb,
}: GameInputOverlayProps) => {
- const bombCooldownMs = config.GAME_CONFIG.BOMB_COOLDOWN_MS;
+ const bombCooldownMs = isFeverTime
+ ? config.GAME_CONFIG.BOMB_FEVER_COOLDOWN_MS
+ : config.GAME_CONFIG.BOMB_NORMAL_COOLDOWN_MS;
const { cooldownState, markTriggered } = useBombCooldownClock(bombCooldownMs);
const layerStyle = buildGameInputOverlayLayerStyle();
@@ -49,6 +53,7 @@
onPress={handlePressBomb}
cooldownProgress={cooldownState.progress}
isReady={isInputEnabled && cooldownState.isReady}
+ isFeverTime={isFeverTime}
remainingSecText={cooldownState.remainingSecText}
/>