From 04b4bd140a0e375ad98138d52482ac1f9149df02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=9F=E5=A4=96=E4=B9=8B=E7=A5=9E?= Date: Thu, 28 Jul 2022 18:42:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=B0=E5=9B=BE=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/constants.py | 4 ++-- source/state/level.py | 28 ++++++++++++++-------------- source/state/mainmenu.py | 26 +++++++++++++------------- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/source/constants.py b/source/constants.py index f455ef6..09901ce 100755 --- a/source/constants.py +++ b/source/constants.py @@ -16,9 +16,9 @@ JSON_PATH_ZOMBIE = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'res # 植物显示特殊定义文件路径 JSON_PATH_PLANTS = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'resources', 'data', 'entity', 'plant.json') # 游戏图片资源路径 -PATH_IMG_DIR = os.path.join(os.path.dirname(os.path.dirname(__file__)), "resources","graphics") +PATH_IMG_DIR = os.path.join(os.path.dirname(os.path.dirname(__file__)), "resources", "graphics") # 游戏关卡地图文件夹路径 -PATH_MAP_DIR = os.path.join(os.path.dirname(os.path.dirname(__file__)), "resources","map") +PATH_MAP_DIR = os.path.join(os.path.dirname(os.path.dirname(__file__)), "resources", 'data', "map") # 游戏音乐文件夹路径 PATH_MUSIC_DIR = os.path.join(os.path.dirname(os.path.dirname(__file__)), "resources","music") diff --git a/source/state/level.py b/source/state/level.py index a09eb05..2af72ac 100644 --- a/source/state/level.py +++ b/source/state/level.py @@ -536,25 +536,25 @@ class Level(tool.State): font = pg.font.Font(c.FONT_PATH, 35) font.bold = True # 音量+ - self.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.VOLUME_BUTTON], *frame_rect, c.BLACK) sign = font.render("+", True, c.YELLOWGREEN) sign_rect = sign.get_rect() sign_rect.x = 8 sign_rect.y = -4 - self.volume_plus_button.blit(sign, sign_rect) - self.volume_plus_button_rect = self.volume_plus_button.get_rect() - self.volume_plus_button_rect.x = 500 + self.sound_volume_plus_button.blit(sign, sign_rect) + self.sound_volume_plus_button_rect = self.sound_volume_plus_button.get_rect() + self.sound_volume_plus_button_rect.x = 500 # 音量- - self.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.VOLUME_BUTTON], *frame_rect, c.BLACK) sign = font.render("-", True, c.YELLOWGREEN) sign_rect = sign.get_rect() sign_rect.x = 12 - sign_rect.y = -6 - self.volume_minus_button.blit(sign, sign_rect) - self.volume_minus_button_rect = self.volume_minus_button.get_rect() - self.volume_minus_button_rect.x = 450 + sign_rect.y = -8 + self.sound_volume_minus_button.blit(sign, sign_rect) + self.sound_volume_minus_button_rect = self.sound_volume_minus_button.get_rect() + self.sound_volume_minus_button_rect.x = 450 # 音量+、-应当处于同一高度 - self.volume_minus_button_rect.y = self.volume_plus_button_rect.y = 250 + self.sound_volume_minus_button_rect.y = self.sound_volume_plus_button_rect.y = 250 def pauseAndCheckLittleMenuOptions(self, mouse_pos, mouse_click): # 设置暂停状态 @@ -586,7 +586,7 @@ class Level(tool.State): # 播放点击音效 c.SOUND_BUTTON_CLICK.play() # 音量+ - elif self.inArea(self.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) # 一般不会有人想把音乐和音效分开设置，故pg.mixer.Sound.set_volume()和pg.mixer.music.set_volume()需要一起用 pg.mixer.music.set_volume(self.game_info[c.VOLUME]) @@ -595,7 +595,7 @@ class Level(tool.State): c.SOUND_BUTTON_CLICK.play() # 将音量信息存档 self.saveUserData() - elif self.inArea(self.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) # 一般不会有人想把音乐和音效分开设置，故pg.mixer.Sound.set_volume()和pg.mixer.music.set_volume()需要一起用 pg.mixer.music.set_volume(self.game_info[c.VOLUME]) @@ -1560,8 +1560,8 @@ class Level(tool.State): surface.blit(self.return_button, self.return_button_rect) surface.blit(self.restart_button, self.restart_button_rect) surface.blit(self.mainMenu_button, self.mainMenu_button_rect) - surface.blit(self.volume_minus_button, self.volume_minus_button_rect) - surface.blit(self.volume_plus_button, self.volume_plus_button_rect) + surface.blit(self.sound_volume_minus_button, self.sound_volume_minus_button_rect) + surface.blit(self.sound_volume_plus_button, self.sound_volume_plus_button_rect) self.showCurrentVolumeImage(surface) if self.map_data[c.SPAWN_ZOMBIES] == c.SPAWN_ZOMBIES_AUTO: diff --git a/source/state/mainmenu.py b/source/state/mainmenu.py index e9fed35..db5291d 100644 --- a/source/state/mainmenu.py +++ b/source/state/mainmenu.py @@ -191,25 +191,25 @@ class Menu(tool.State): font = pg.font.Font(c.FONT_PATH, 35) font.bold = True # 音量+ - self.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.VOLUME_BUTTON], *frame_rect, c.BLACK) sign = font.render("+", True, c.YELLOWGREEN) sign_rect = sign.get_rect() sign_rect.x = 8 sign_rect.y = -4 - self.volume_plus_button.blit(sign, sign_rect) - self.volume_plus_button_rect = self.volume_plus_button.get_rect() - self.volume_plus_button_rect.x = 500 + self.sound_volume_plus_button.blit(sign, sign_rect) + self.sound_volume_plus_button_rect = self.sound_volume_plus_button.get_rect() + self.sound_volume_plus_button_rect.x = 500 # 音量- - self.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.VOLUME_BUTTON], *frame_rect, c.BLACK) sign = font.render("-", True, c.YELLOWGREEN) sign_rect = sign.get_rect() sign_rect.x = 12 sign_rect.y = -6 - self.volume_minus_button.blit(sign, sign_rect) - self.volume_minus_button_rect = self.volume_minus_button.get_rect() - self.volume_minus_button_rect.x = 450 + self.sound_volume_minus_button.blit(sign, sign_rect) + self.sound_volume_minus_button_rect = self.sound_volume_minus_button.get_rect() + self.sound_volume_minus_button_rect.x = 450 # 音量+、-应当处于同一高度 - self.volume_minus_button_rect.y = self.volume_plus_button_rect.y = 250 + self.sound_volume_minus_button_rect.y = self.sound_volume_plus_button_rect.y = 250 def setupSunflowerTrophy(self): # 设置金银向日葵图片信息 @@ -264,8 +264,8 @@ class Menu(tool.State): elif self.option_button_clicked: surface.blit(self.big_menu, self.big_menu_rect) surface.blit(self.return_button, self.return_button_rect) - surface.blit(self.volume_plus_button, self.volume_plus_button_rect) - surface.blit(self.volume_minus_button, self.volume_minus_button_rect) + surface.blit(self.sound_volume_plus_button, self.sound_volume_plus_button_rect) + surface.blit(self.sound_volume_minus_button, self.sound_volume_minus_button_rect) self.showCurrentVolumeImage(surface) if mouse_pos: # 返回 @@ -273,7 +273,7 @@ class Menu(tool.State): self.option_button_clicked = False c.SOUND_BUTTON_CLICK.play() # 音量+ - elif self.inArea(self.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) # 一般不会有人想把音乐和音效分开设置，故pg.mixer.Sound.set_volume()和pg.mixer.music.set_volume()需要一起用 pg.mixer.music.set_volume(self.game_info[c.VOLUME]) @@ -282,7 +282,7 @@ class Menu(tool.State): c.SOUND_BUTTON_CLICK.play() self.saveUserData() # 音量- - elif self.inArea(self.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) # 一般不会有人想把音乐和音效分开设置，故pg.mixer.Sound.set_volume()和pg.mixer.music.set_volume()需要一起用 pg.mixer.music.set_volume(self.game_info[c.VOLUME])