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

修复地图路径错误

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

2
source/constants.py
View File

@ -18,7 +18,7 @@ JSON_PATH_PLANTS = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'res
# 游戏图片资源路径 # 游戏图片资源路径
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") PATH_MUSIC_DIR = os.path.join(os.path.dirname(os.path.dirname(__file__)), "resources","music")

28
source/state/level.py
View File

@ -536,25 +536,25 @@ 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.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 = font.render("+", True, c.YELLOWGREEN)
sign_rect = sign.get_rect() sign_rect = sign.get_rect()
sign_rect.x = 8 sign_rect.x = 8
sign_rect.y = -4 sign_rect.y = -4
self.volume_plus_button.blit(sign, sign_rect) self.sound_volume_plus_button.blit(sign, sign_rect)
self.volume_plus_button_rect = self.volume_plus_button.get_rect() self.sound_volume_plus_button_rect = self.sound_volume_plus_button.get_rect()
self.volume_plus_button_rect.x = 500 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 = font.render("-", True, c.YELLOWGREEN)
sign_rect = sign.get_rect() sign_rect = sign.get_rect()
sign_rect.x = 12 sign_rect.x = 12
sign_rect.y = -6 sign_rect.y = -8
self.volume_minus_button.blit(sign, sign_rect) self.sound_volume_minus_button.blit(sign, sign_rect)
self.volume_minus_button_rect = self.volume_minus_button.get_rect() self.sound_volume_minus_button_rect = self.sound_volume_minus_button.get_rect()
self.volume_minus_button_rect.x = 450 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): def pauseAndCheckLittleMenuOptions(self, mouse_pos, mouse_click):
# 设置暂停状态 # 设置暂停状态
@ -586,7 +586,7 @@ class Level(tool.State):
# 播放点击音效 # 播放点击音效
c.SOUND_BUTTON_CLICK.play() 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) 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.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.VOLUME])
@ -595,7 +595,7 @@ class Level(tool.State):
c.SOUND_BUTTON_CLICK.play() c.SOUND_BUTTON_CLICK.play()
# 将音量信息存档 # 将音量信息存档
self.saveUserData() 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) 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.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.VOLUME])
@ -1560,8 +1560,8 @@ class Level(tool.State):
surface.blit(self.return_button, self.return_button_rect) surface.blit(self.return_button, self.return_button_rect)
surface.blit(self.restart_button, self.restart_button_rect) surface.blit(self.restart_button, self.restart_button_rect)
surface.blit(self.mainMenu_button, self.mainMenu_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.sound_volume_minus_button, self.sound_volume_minus_button_rect)
surface.blit(self.volume_plus_button, self.volume_plus_button_rect) surface.blit(self.sound_volume_plus_button, self.sound_volume_plus_button_rect)
self.showCurrentVolumeImage(surface) self.showCurrentVolumeImage(surface)
if self.map_data[c.SPAWN_ZOMBIES] == c.SPAWN_ZOMBIES_AUTO: if self.map_data[c.SPAWN_ZOMBIES] == c.SPAWN_ZOMBIES_AUTO:

26
source/state/mainmenu.py
View File

@ -191,25 +191,25 @@ 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.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 = font.render("+", True, c.YELLOWGREEN)
sign_rect = sign.get_rect() sign_rect = sign.get_rect()
sign_rect.x = 8 sign_rect.x = 8
sign_rect.y = -4 sign_rect.y = -4
self.volume_plus_button.blit(sign, sign_rect) self.sound_volume_plus_button.blit(sign, sign_rect)
self.volume_plus_button_rect = self.volume_plus_button.get_rect() self.sound_volume_plus_button_rect = self.sound_volume_plus_button.get_rect()
self.volume_plus_button_rect.x = 500 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 = font.render("-", True, c.YELLOWGREEN)
sign_rect = sign.get_rect() sign_rect = sign.get_rect()
sign_rect.x = 12 sign_rect.x = 12
sign_rect.y = -6 sign_rect.y = -6
self.volume_minus_button.blit(sign, sign_rect) self.sound_volume_minus_button.blit(sign, sign_rect)
self.volume_minus_button_rect = self.volume_minus_button.get_rect() self.sound_volume_minus_button_rect = self.sound_volume_minus_button.get_rect()
self.volume_minus_button_rect.x = 450 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): def setupSunflowerTrophy(self):
# 设置金银向日葵图片信息 # 设置金银向日葵图片信息
@ -264,8 +264,8 @@ class Menu(tool.State):
elif self.option_button_clicked: elif self.option_button_clicked:
surface.blit(self.big_menu, self.big_menu_rect) surface.blit(self.big_menu, self.big_menu_rect)
surface.blit(self.return_button, self.return_button_rect) surface.blit(self.return_button, self.return_button_rect)
surface.blit(self.volume_plus_button, self.volume_plus_button_rect) surface.blit(self.sound_volume_plus_button, self.sound_volume_plus_button_rect)
surface.blit(self.volume_minus_button, self.volume_minus_button_rect) surface.blit(self.sound_volume_minus_button, self.sound_volume_minus_button_rect)
self.showCurrentVolumeImage(surface) self.showCurrentVolumeImage(surface)
if mouse_pos: if mouse_pos:
# 返回 # 返回
@ -273,7 +273,7 @@ class Menu(tool.State):
self.option_button_clicked = False self.option_button_clicked = False
c.SOUND_BUTTON_CLICK.play() 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) 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.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.VOLUME])
@ -282,7 +282,7 @@ class Menu(tool.State):
c.SOUND_BUTTON_CLICK.play() c.SOUND_BUTTON_CLICK.play()
self.saveUserData() 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) 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.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.VOLUME])