summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2024-01-12 17:34:24 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2024-01-12 17:34:24 +0900
commitc2a9a7b69e24442bde33da57b7a94f381a4b903c (patch)
treecb48bc4ebd020f58636be97e415d3dcf7f8ab764
parentMerge branch 'develop' of https://github.com/misskey-dev/misskey into develop (diff)
downloadmisskey-c2a9a7b69e24442bde33da57b7a94f381a4b903c.tar.gz
misskey-c2a9a7b69e24442bde33da57b7a94f381a4b903c.tar.bz2
misskey-c2a9a7b69e24442bde33da57b7a94f381a4b903c.zip
enhance(drop-and-fusion): tweak sounds
-rw-r--r--packages/frontend/assets/drop-and-fusion/collision.mp3 (renamed from packages/frontend/assets/drop-and-fusion/poi1.mp3)bin18240 -> 18240 bytes
-rw-r--r--packages/frontend/assets/drop-and-fusion/collision_yen.mp3bin0 -> 7807 bytes
-rw-r--r--packages/frontend/assets/drop-and-fusion/fusion.mp3 (renamed from packages/frontend/assets/drop-and-fusion/bubble2.mp3)bin19328 -> 19328 bytes
-rw-r--r--packages/frontend/assets/drop-and-fusion/fusion_yen.mp3bin0 -> 7807 bytes
-rw-r--r--packages/frontend/src/pages/drop-and-fusion.game.vue39
5 files changed, 29 insertions, 10 deletions
diff --git a/packages/frontend/assets/drop-and-fusion/poi1.mp3 b/packages/frontend/assets/drop-and-fusion/collision.mp3
index 59dae90965..59dae90965 100644
--- a/packages/frontend/assets/drop-and-fusion/poi1.mp3
+++ b/packages/frontend/assets/drop-and-fusion/collision.mp3
Binary files differ
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
--- /dev/null
+++ b/packages/frontend/assets/drop-and-fusion/collision_yen.mp3
Binary files differ
diff --git a/packages/frontend/assets/drop-and-fusion/bubble2.mp3 b/packages/frontend/assets/drop-and-fusion/fusion.mp3
index 8b4f8df6e9..8b4f8df6e9 100644
--- a/packages/frontend/assets/drop-and-fusion/bubble2.mp3
+++ b/packages/frontend/assets/drop-and-fusion/fusion.mp3
Binary files differ
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
--- /dev/null
+++ b/packages/frontend/assets/drop-and-fusion/fusion_yen.mp3
Binary files differ
diff --git a/packages/frontend/src/pages/drop-and-fusion.game.vue b/packages/frontend/src/pages/drop-and-fusion.game.vue
index fa955806c0..e2aedc157c 100644
--- a/packages/frontend/src/pages/drop-and-fusion.game.vue
+++ b/packages/frontend/src/pages/drop-and-fusion.game.vue
@@ -1085,16 +1085,35 @@ function attachGameEvents() {
game.addListener('sfx', (type, params) => {
if (props.mute) return;
- const soundUrl =
- type === 'fusion' ? '/client-assets/drop-and-fusion/bubble2.mp3' :
- type === 'collision' ? '/client-assets/drop-and-fusion/poi1.mp3' :
- null as never;
-
- sound.playUrl(soundUrl, {
- volume: params.volume * sfxVolume.value,
- pan: params.pan,
- playbackRate: params.pitch * replayPlaybackRate.value,
- });
+ if (type === 'fusion') {
+ if (props.gameMode === 'yen') {
+ sound.playUrl('/client-assets/drop-and-fusion/fusion_yen.mp3', {
+ volume: 0.3 * params.volume * sfxVolume.value,
+ pan: params.pan,
+ playbackRate: (params.pitch / 4) * replayPlaybackRate.value,
+ });
+ } else {
+ sound.playUrl('/client-assets/drop-and-fusion/fusion.mp3', {
+ volume: params.volume * sfxVolume.value,
+ pan: params.pan,
+ playbackRate: params.pitch * replayPlaybackRate.value,
+ });
+ }
+ } else if (type === 'collision') {
+ if (props.gameMode === 'yen') {
+ sound.playUrl('/client-assets/drop-and-fusion/collision_yen.mp3', {
+ volume: params.volume * sfxVolume.value,
+ pan: params.pan,
+ playbackRate: params.pitch * replayPlaybackRate.value,
+ });
+ } else {
+ sound.playUrl('/client-assets/drop-and-fusion/collision.mp3', {
+ volume: params.volume * sfxVolume.value,
+ pan: params.pan,
+ playbackRate: params.pitch * replayPlaybackRate.value,
+ });
+ }
+ }
});
}