merge: upstream

2024-01-09 10:35:10 +01:00 · 2024-01-09 10:35:10 +01:00 · d974b30e56
commit d974b30e56
parent fbddcc559a 14aedc17ae
23 changed files with 325 additions and 143 deletions
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@ -468,6 +468,13 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'device',
 		default: false,
 	},
+	dropAndFusion: {
+		where: 'device',
+		default: {
+			bgmVolume: 0.25,
+			sfxVolume: 1,
+		},
+	},

 	sound_masterVolume: {
 		where: 'device',