Skip to content

Commit e92b7a4

Browse files
committed
fix(client): play bgm not stop old bgm
1 parent b72476f commit e92b7a4

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

packages/client/composables/useAdvBgm.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,17 @@ export function useAdvBgm($adv: AdvContext) {
2929
playBgm: (bgmId: string) => {
3030
const bgmLibrary = $adv.gameConfig.value.bgm?.library || {}
3131
const bgm = (bgmLibrary as Record<string, AdvMusic>)[bgmId]
32+
33+
/**
34+
* 停止 bgmId 之外的所有背景音乐
35+
*/
36+
for (const [name, sound] of bgmMap.entries()) {
37+
if (name !== bgm.name && sound.playing()) {
38+
sound.stop()
39+
bgmMap.delete(name)
40+
}
41+
}
42+
3243
if (bgm) {
3344
if (bgmMap.has(bgm.name)) {
3445
const sound = bgmMap.get(bgm.name)

packages/client/composables/useAdvLogic.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ export function useAdvLogic($adv: AdvContext) {
112112
$adv.pixiGame?.SceneSystem.load(sceneId)
113113
}
114114
if (bgmThemeId) {
115-
$adv.$bgm.stop()
116115
$adv.$bgm.playBgm(bgmThemeId)
117116
}
118117
break

packages/gui/client/components/loading/AGUILoading.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const show = defineModel('show', {
1111
enter-active-class="animate-fade-in"
1212
leave-active-class="animate-fade-out"
1313
>
14-
<div v-if="show" class="size-full flex items-center justify-center bg-black/80">
14+
<div v-if="show" class="size-full flex items-center justify-center bg-white">
1515
<div i-svg-spinners:3-dots-scale class="text-4xl" />
1616
</div>
1717
</Transition>

0 commit comments

Comments
 (0)