yaclty/pypvz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复初始时未应用存档内的音效音量设定的bug

Browse Source
This commit is contained in:
星外之神 2022-07-28 18:58:52 +08:00
parent 04b4bd140a
commit be5309f328
3 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/constants.py
View File

@ -84,7 +84,7 @@ RESTART_BUTTON = 'restartButton'
MAINMENU_BUTTON = 'mainMenuButton' MAINMENU_BUTTON = 'mainMenuButton'
LITTLEGAME_BUTTON = 'littleGameButton' LITTLEGAME_BUTTON = 'littleGameButton'
OPTION_BUTTON = 'optionButton' OPTION_BUTTON = 'optionButton'
VOLUME_BUTTON = 'volumeButton' SOUND_VOLUME_BUTTON = 'volumeButton'
# 金银向日葵奖杯 # 金银向日葵奖杯
TROPHY_SUNFLOWER = 'sunflowerTrophy' TROPHY_SUNFLOWER = 'sunflowerTrophy'
# 小铲子 # 小铲子
@ -105,7 +105,7 @@ LITTLEGAME_NUM = 'littleGame num'
LEVEL_COMPLETIONS = 'level completions' LEVEL_COMPLETIONS = 'level completions'
LITTLEGAME_COMPLETIONS = 'littleGame completions' LITTLEGAME_COMPLETIONS = 'littleGame completions'
GAME_RATE = 'game rate' GAME_RATE = 'game rate'
VOLUME = 'volume' SOUND_VOLUME = 'volume'
# 整个游戏的状态 # 整个游戏的状态
MAIN_MENU = 'main menu' MAIN_MENU = 'main menu'
@ -667,7 +667,7 @@ INIT_USERDATA = {
LEVEL_COMPLETIONS: 0, LEVEL_COMPLETIONS: 0,
LITTLEGAME_COMPLETIONS: 0, LITTLEGAME_COMPLETIONS: 0,
GAME_RATE: 1, GAME_RATE: 1,
VOLUME: 1.0, SOUND_VOLUME: 1,
} }
# 无穷大常量 # 无穷大常量

22
source/state/level.py
View File

@ -381,7 +381,7 @@ class Level(tool.State):
pg.mixer.music.stop() pg.mixer.music.stop()
pg.mixer.music.load(os.path.join(c.PATH_MUSIC_DIR, "chooseYourSeeds.opus")) pg.mixer.music.load(os.path.join(c.PATH_MUSIC_DIR, "chooseYourSeeds.opus"))
pg.mixer.music.play(-1, 0) pg.mixer.music.play(-1, 0)
pg.mixer.music.set_volume(self.game_info[c.VOLUME]) pg.mixer.music.set_volume(self.game_info[c.SOUND_VOLUME])
def choose(self, mouse_pos, mouse_click): def choose(self, mouse_pos, mouse_click):
# 如果暂停 # 如果暂停
@ -403,7 +403,7 @@ class Level(tool.State):
pg.mixer.music.stop() pg.mixer.music.stop()
pg.mixer.music.load(os.path.join(c.PATH_MUSIC_DIR, self.bgm)) pg.mixer.music.load(os.path.join(c.PATH_MUSIC_DIR, self.bgm))
pg.mixer.music.play(-1, 0) pg.mixer.music.play(-1, 0)
pg.mixer.music.set_volume(self.game_info[c.VOLUME]) pg.mixer.music.set_volume(self.game_info[c.SOUND_VOLUME])
self.state = c.PLAY self.state = c.PLAY
if self.bar_type == c.CHOOSEBAR_STATIC: if self.bar_type == c.CHOOSEBAR_STATIC:
@ -536,7 +536,7 @@ class Level(tool.State):
font = pg.font.Font(c.FONT_PATH, 35) font = pg.font.Font(c.FONT_PATH, 35)
font.bold = True font.bold = True
# 音量+ # 音量+
self.sound_volume_plus_button = tool.get_image_menu(tool.GFX[c.VOLUME_BUTTON], *frame_rect, c.BLACK) self.sound_volume_plus_button = tool.get_image_menu(tool.GFX[c.SOUND_VOLUME_BUTTON], *frame_rect, c.BLACK)
sign = font.render("+", True, c.YELLOWGREEN) sign = font.render("+", True, c.YELLOWGREEN)
sign_rect = sign.get_rect() sign_rect = sign.get_rect()
sign_rect.x = 8 sign_rect.x = 8
@ -545,7 +545,7 @@ class Level(tool.State):
self.sound_volume_plus_button_rect = self.sound_volume_plus_button.get_rect() self.sound_volume_plus_button_rect = self.sound_volume_plus_button.get_rect()
self.sound_volume_plus_button_rect.x = 500 self.sound_volume_plus_button_rect.x = 500
# 音量- # 音量-
self.sound_volume_minus_button = tool.get_image_menu(tool.GFX[c.VOLUME_BUTTON], *frame_rect, c.BLACK) self.sound_volume_minus_button = tool.get_image_menu(tool.GFX[c.SOUND_VOLUME_BUTTON], *frame_rect, c.BLACK)
sign = font.render("-", True, c.YELLOWGREEN) sign = font.render("-", True, c.YELLOWGREEN)
sign_rect = sign.get_rect() sign_rect = sign.get_rect()
sign_rect.x = 12 sign_rect.x = 12
@ -587,20 +587,20 @@ class Level(tool.State):
c.SOUND_BUTTON_CLICK.play() c.SOUND_BUTTON_CLICK.play()
# 音量+ # 音量+
elif self.inArea(self.sound_volume_plus_button_rect, *mouse_pos): elif self.inArea(self.sound_volume_plus_button_rect, *mouse_pos):
self.game_info[c.VOLUME] = min(self.game_info[c.VOLUME] + 0.1, 1) self.game_info[c.SOUND_VOLUME] = round(min(self.game_info[c.SOUND_VOLUME] + 0.05, 1), 2)
# 一般不会有人想把音乐和音效分开设置，故pg.mixer.Sound.set_volume()和pg.mixer.music.set_volume()需要一起用 # 一般不会有人想把音乐和音效分开设置，故pg.mixer.Sound.set_volume()和pg.mixer.music.set_volume()需要一起用
pg.mixer.music.set_volume(self.game_info[c.VOLUME]) pg.mixer.music.set_volume(self.game_info[c.SOUND_VOLUME])
for i in c.SOUNDS: for i in c.SOUNDS:
i.set_volume(self.game_info[c.VOLUME]) i.set_volume(self.game_info[c.SOUND_VOLUME])
c.SOUND_BUTTON_CLICK.play() c.SOUND_BUTTON_CLICK.play()
# 将音量信息存档 # 将音量信息存档
self.saveUserData() self.saveUserData()
elif self.inArea(self.sound_volume_minus_button_rect, *mouse_pos): elif self.inArea(self.sound_volume_minus_button_rect, *mouse_pos):
self.game_info[c.VOLUME] = max(self.game_info[c.VOLUME] - 0.1, 0) self.game_info[c.SOUND_VOLUME] = round(max(self.game_info[c.SOUND_VOLUME] - 0.05, 0), 2)
# 一般不会有人想把音乐和音效分开设置，故pg.mixer.Sound.set_volume()和pg.mixer.music.set_volume()需要一起用 # 一般不会有人想把音乐和音效分开设置，故pg.mixer.Sound.set_volume()和pg.mixer.music.set_volume()需要一起用
pg.mixer.music.set_volume(self.game_info[c.VOLUME]) pg.mixer.music.set_volume(self.game_info[c.SOUND_VOLUME])
for i in c.SOUNDS: for i in c.SOUNDS:
i.set_volume(self.game_info[c.VOLUME]) i.set_volume(self.game_info[c.SOUND_VOLUME])
c.SOUND_BUTTON_CLICK.play() c.SOUND_BUTTON_CLICK.play()
# 将音量信息存档 # 将音量信息存档
self.saveUserData() self.saveUserData()
@ -1509,7 +1509,7 @@ class Level(tool.State):
def showCurrentVolumeImage(self, surface): def showCurrentVolumeImage(self, surface):
# 由于音量可变，因此这一内容不能在一开始就结束加载，而应当不断刷新不断显示 # 由于音量可变，因此这一内容不能在一开始就结束加载，而应当不断刷新不断显示
font = pg.font.Font(c.FONT_PATH, 30) font = pg.font.Font(c.FONT_PATH, 30)
volume_tips = font.render(f"音量：{round(self.game_info[c.VOLUME]*100):3}%", True, c.LIGHTGRAY) volume_tips = font.render(f"音量：{round(self.game_info[c.SOUND_VOLUME]*100):3}%", True, c.LIGHTGRAY)
volume_tips_rect = volume_tips.get_rect() volume_tips_rect = volume_tips.get_rect()
volume_tips_rect.x = 275 volume_tips_rect.x = 275
volume_tips_rect.y = 247 volume_tips_rect.y = 247

22
source/state/mainmenu.py
View File

@ -21,7 +21,9 @@ class Menu(tool.State):
pg.mixer.music.load(os.path.join(c.PATH_MUSIC_DIR, "intro.opus")) pg.mixer.music.load(os.path.join(c.PATH_MUSIC_DIR, "intro.opus"))
pg.mixer.music.play(-1, 0) pg.mixer.music.play(-1, 0)
pg.display.set_caption(c.ORIGINAL_CAPTION) pg.display.set_caption(c.ORIGINAL_CAPTION)
pg.mixer.music.set_volume(self.game_info[c.VOLUME]) pg.mixer.music.set_volume(self.game_info[c.SOUND_VOLUME])
for i in c.SOUNDS:
i.set_volume(self.game_info[c.SOUND_VOLUME])
def saveUserData(self): def saveUserData(self):
with open(c.USERDATA_PATH, "w") as f: with open(c.USERDATA_PATH, "w") as f:
@ -191,7 +193,7 @@ class Menu(tool.State):
font = pg.font.Font(c.FONT_PATH, 35) font = pg.font.Font(c.FONT_PATH, 35)
font.bold = True font.bold = True
# 音量+ # 音量+
self.sound_volume_plus_button = tool.get_image_menu(tool.GFX[c.VOLUME_BUTTON], *frame_rect, c.BLACK) self.sound_volume_plus_button = tool.get_image_menu(tool.GFX[c.SOUND_VOLUME_BUTTON], *frame_rect, c.BLACK)
sign = font.render("+", True, c.YELLOWGREEN) sign = font.render("+", True, c.YELLOWGREEN)
sign_rect = sign.get_rect() sign_rect = sign.get_rect()
sign_rect.x = 8 sign_rect.x = 8
@ -200,7 +202,7 @@ class Menu(tool.State):
self.sound_volume_plus_button_rect = self.sound_volume_plus_button.get_rect() self.sound_volume_plus_button_rect = self.sound_volume_plus_button.get_rect()
self.sound_volume_plus_button_rect.x = 500 self.sound_volume_plus_button_rect.x = 500
# 音量- # 音量-
self.sound_volume_minus_button = tool.get_image_menu(tool.GFX[c.VOLUME_BUTTON], *frame_rect, c.BLACK) self.sound_volume_minus_button = tool.get_image_menu(tool.GFX[c.SOUND_VOLUME_BUTTON], *frame_rect, c.BLACK)
sign = font.render("-", True, c.YELLOWGREEN) sign = font.render("-", True, c.YELLOWGREEN)
sign_rect = sign.get_rect() sign_rect = sign.get_rect()
sign_rect.x = 12 sign_rect.x = 12
@ -233,7 +235,7 @@ class Menu(tool.State):
def showCurrentVolumeImage(self, surface): def showCurrentVolumeImage(self, surface):
# 由于音量可变，因此这一内容不能在一开始就结束加载，而应当不断刷新不断显示 # 由于音量可变，因此这一内容不能在一开始就结束加载，而应当不断刷新不断显示
font = pg.font.Font(c.FONT_PATH, 30) font = pg.font.Font(c.FONT_PATH, 30)
volume_tips = font.render(f"音量：{round(self.game_info[c.VOLUME]*100):3}%", True, c.LIGHTGRAY) volume_tips = font.render(f"音量：{round(self.game_info[c.SOUND_VOLUME]*100):3}%", True, c.LIGHTGRAY)
volume_tips_rect = volume_tips.get_rect() volume_tips_rect = volume_tips.get_rect()
volume_tips_rect.x = 275 volume_tips_rect.x = 275
volume_tips_rect.y = 247 volume_tips_rect.y = 247
@ -274,20 +276,20 @@ class Menu(tool.State):
c.SOUND_BUTTON_CLICK.play() c.SOUND_BUTTON_CLICK.play()
# 音量+ # 音量+
elif self.inArea(self.sound_volume_plus_button_rect, *mouse_pos): elif self.inArea(self.sound_volume_plus_button_rect, *mouse_pos):
self.game_info[c.VOLUME] = min(self.game_info[c.VOLUME] + 0.1, 1) self.game_info[c.SOUND_VOLUME] = round(min(self.game_info[c.SOUND_VOLUME] + 0.05, 1), 2)
# 一般不会有人想把音乐和音效分开设置，故pg.mixer.Sound.set_volume()和pg.mixer.music.set_volume()需要一起用 # 一般不会有人想把音乐和音效分开设置，故pg.mixer.Sound.set_volume()和pg.mixer.music.set_volume()需要一起用
pg.mixer.music.set_volume(self.game_info[c.VOLUME]) pg.mixer.music.set_volume(self.game_info[c.SOUND_VOLUME])
for i in c.SOUNDS: for i in c.SOUNDS:
i.set_volume(self.game_info[c.VOLUME]) i.set_volume(self.game_info[c.SOUND_VOLUME])
c.SOUND_BUTTON_CLICK.play() c.SOUND_BUTTON_CLICK.play()
self.saveUserData() self.saveUserData()
# 音量- # 音量-
elif self.inArea(self.sound_volume_minus_button_rect, *mouse_pos): elif self.inArea(self.sound_volume_minus_button_rect, *mouse_pos):
self.game_info[c.VOLUME] = max(self.game_info[c.VOLUME] - 0.1, 0) self.game_info[c.SOUND_VOLUME] = round(max(self.game_info[c.SOUND_VOLUME] - 0.05, 0), 2)
# 一般不会有人想把音乐和音效分开设置，故pg.mixer.Sound.set_volume()和pg.mixer.music.set_volume()需要一起用 # 一般不会有人想把音乐和音效分开设置，故pg.mixer.Sound.set_volume()和pg.mixer.music.set_volume()需要一起用
pg.mixer.music.set_volume(self.game_info[c.VOLUME]) pg.mixer.music.set_volume(self.game_info[c.SOUND_VOLUME])
for i in c.SOUNDS: for i in c.SOUNDS:
i.set_volume(self.game_info[c.VOLUME]) i.set_volume(self.game_info[c.SOUND_VOLUME])
c.SOUND_BUTTON_CLICK.play() c.SOUND_BUTTON_CLICK.play()
self.saveUserData() self.saveUserData()
# 没有点到前两者时常规行检测所有按钮的点击和高亮 # 没有点到前两者时常规行检测所有按钮的点击和高亮