diff --git a/locales/index.d.ts b/locales/index.d.ts index fb0f332ec1..dafbdd3559 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -1201,6 +1201,7 @@ export interface Locale { "replaying": string; "ranking": string; "lastNDays": string; + "backToTitle": string; "_bubbleGame": { "howToPlay": string; "_howToPlay": { diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 68c148da4c..58952894b3 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1198,6 +1198,7 @@ replay: "リプレイ" replaying: "リプレイ中" ranking: "ランキング" lastNDays: "直近{n}日" +backToTitle: "タイトルへ" _bubbleGame: howToPlay: "遊び方" diff --git a/packages/frontend/assets/drop-and-fusion/10000yen.png b/packages/frontend/assets/drop-and-fusion/10000yen.png index 69b0dc926a..bda777719d 100644 Binary files a/packages/frontend/assets/drop-and-fusion/10000yen.png and b/packages/frontend/assets/drop-and-fusion/10000yen.png differ diff --git a/packages/frontend/assets/drop-and-fusion/poi1.mp3 b/packages/frontend/assets/drop-and-fusion/collision.mp3 similarity index 100% rename from packages/frontend/assets/drop-and-fusion/poi1.mp3 rename to packages/frontend/assets/drop-and-fusion/collision.mp3 diff --git a/packages/frontend/assets/drop-and-fusion/collision_yen.mp3 b/packages/frontend/assets/drop-and-fusion/collision_yen.mp3 new file mode 100644 index 0000000000..6737357f62 Binary files /dev/null and b/packages/frontend/assets/drop-and-fusion/collision_yen.mp3 differ diff --git a/packages/frontend/assets/drop-and-fusion/bubble2.mp3 b/packages/frontend/assets/drop-and-fusion/fusion.mp3 similarity index 100% rename from packages/frontend/assets/drop-and-fusion/bubble2.mp3 rename to packages/frontend/assets/drop-and-fusion/fusion.mp3 diff --git a/packages/frontend/assets/drop-and-fusion/fusion_yen.mp3 b/packages/frontend/assets/drop-and-fusion/fusion_yen.mp3 new file mode 100644 index 0000000000..e8d203fb5d Binary files /dev/null and b/packages/frontend/assets/drop-and-fusion/fusion_yen.mp3 differ diff --git a/packages/frontend/src/components/MkPlusOneEffect.vue b/packages/frontend/src/components/MkPlusOneEffect.vue index e5e5a9edf4..06b966dbcd 100644 --- a/packages/frontend/src/components/MkPlusOneEffect.vue +++ b/packages/frontend/src/components/MkPlusOneEffect.vue @@ -16,7 +16,7 @@ import * as os from '@/os.js'; const props = withDefaults(defineProps<{ x: number; y: number; - value?: number; + value?: number | string; }>(), { value: 1, }); diff --git a/packages/frontend/src/pages/drop-and-fusion.game.vue b/packages/frontend/src/pages/drop-and-fusion.game.vue index fa955806c0..9161e08fc8 100644 --- a/packages/frontend/src/pages/drop-and-fusion.game.vue +++ b/packages/frontend/src/pages/drop-and-fusion.game.vue @@ -8,141 +8,135 @@ SPDX-License-Identifier: AGPL-3.0-only
Loading...
- -
-
-
-
- BUBBLE GAME -
- {{ gameMode }} -
-
-
-
-
- HOLD - -
-
- - - -
+ +
+
+
+
+ BUBBLE GAME +
- {{ gameMode }} -
-
- - - - -
{{ comboPrev }} Chain!
-
-
- - +
+ HOLD + +
+
+ - - - -
-
-
- -
SCORE: {{ gameMode === 'yen' ? '円' : 'pt' }}
-
MAX CHAIN:
-
-
-
{{ i18n.ts.replaying }}
-
-
-
-
-
-
-
-
-
- END - x4 - x16 -
-
-
-
-
-
- {{ i18n.ts.done }} - {{ i18n.ts.showReplay }} - {{ i18n.ts.share }} - Copy replay data -
-
-
-
-
-
-
SCORE: {{ gameMode === 'yen' ? '円' : 'pt' }}
-
HIGH SCORE: {{ gameMode === 'yen' ? '円' : 'pt' }}-
-
-
-
-
-
-
-
-
-
-
-
- - - - - - -
-
-
-
-
- Surrender - Retry + +
- +
+ + + + +
{{ comboPrev }} Chain!
+
+
+ + + + + +
+
+
+ +
SCORE: {{ gameMode === 'yen' ? '円' : 'pt' }}
+
MAX CHAIN:
+
TOTAL EARNINGS:
+
+
+
{{ i18n.ts.replaying }}
+
+
+
+
+
+
+
+
+
+ END + x4 + x16 +
+
+
+
+
+
+ {{ i18n.ts.backToTitle }} + {{ i18n.ts.showReplay }} + {{ i18n.ts.share }} + Copy replay data +
+
+
+
+
+
+
SCORE: {{ gameMode === 'yen' ? '円' : 'pt' }}
+
HIGH SCORE: {{ gameMode === 'yen' ? '円' : 'pt' }}-
+
TOTAL EARNINGS: -
+
+
+
+
+
+
+
+
+
+
+
+ + + + + + +
+
+
+
+
+ Surrender + Retry +
+
+