Merge branch 'develop' of misskey-dev into merge-upstream

2024-01-10 03:10:45 +09:00 · 2024-01-10 03:10:45 +09:00 · abe95d9b67
commit abe95d9b67
parent 83a2b947f0 7e52ea4818
376 changed files with 5293 additions and 2636 deletions
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@ -424,6 +424,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',