From 44a94e1ae39722321ab23accbd7fca75d0841401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=9F=E5=A4=96=E4=B9=8B=E7=A5=9E?= Date: Wed, 11 May 2022 19:10:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E9=80=89=E5=8D=A1=E6=97=B6=E4=B8=AD?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/state/level.py | 84 ++++++++++++++++++++++++---------------- source/state/mainmenu.py | 2 +- 2 files changed, 51 insertions(+), 35 deletions(-) diff --git a/source/state/level.py b/source/state/level.py index 6000e86..990fa28 100644 --- a/source/state/level.py +++ b/source/state/level.py @@ -349,6 +349,8 @@ class Level(tool.State): self.initPlay(card_pool) if self.bar_type == c.CHOSSEBAR_BOWLING: self.initBowlingMap() + + self.setupLittleMenu() def initChoose(self): self.state = c.CHOOSE @@ -360,10 +362,18 @@ class Level(tool.State): pg.mixer.music.play(-1, 0) def choose(self, mouse_pos, mouse_click): - if mouse_pos and mouse_click[0]: + # 如果暂停 + if self.showLittleMenu: + self.pauseAndCheckLittleMenuOptions(mouse_pos, mouse_click) + return + + elif mouse_pos and mouse_click[0]: self.panel.checkCardClick(mouse_pos) if self.panel.checkStartButtonClick(mouse_pos): self.initPlay(self.panel.getSelectedCards()) + elif self.checkLittleMenuClick(mouse_pos): + self.showLittleMenu = True + pg.mixer.Sound(os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))) ,"resources", "sound", "buttonclick.ogg")).play() def initPlay(self, card_list): @@ -450,8 +460,6 @@ class Level(tool.State): self.shovel_rect.x = self.shovel_box_rect.x = self.shovel_positon[0] self.shovel_rect.y = self.shovel_box_rect.y = self.shovel_positon[1] - self.setupLittleMenu() - self.setupLevelProgressBarImage() self.setupHugeWaveApprochingImage() @@ -520,6 +528,37 @@ class Level(tool.State): self.mainMenu_button_rect.x = 299 self.mainMenu_button_rect.y = 372 + def pauseAndCheckLittleMenuOptions(self, mouse_pos, mouse_click): + # 设置暂停状态 + self.pause = True + # 暂停播放音乐 + pg.mixer.music.pause() + if mouse_click[0]: + if self.checkReturnClick(mouse_pos): + # 终止暂停，停止显示菜单 + self.pause = False + self.showLittleMenu = False + # 继续播放音乐 + pg.mixer.music.unpause() + # 播放点击音效 + pg.mixer.Sound(os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))) ,"resources", "sound", "buttonclick.ogg")).play() + elif self.checkRestartClick(mouse_pos): + self.done = True + self.next = c.LEVEL + # 播放点击音效 + pg.mixer.Sound(os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))) ,"resources", "sound", "buttonclick.ogg")).play() + elif self.checkMainMenuClick(mouse_pos): + self.done = True + self.next = c.MAIN_MENU + #self.persist = {c.CURRENT_TIME:0, c.LEVEL_NUM:c.START_LEVEL_NUM} # 应该不能用c.LEVEL_NUM:c.START_LEVEL_NUM + self.persist = {c.CURRENT_TIME:0, c.LEVEL_NUM:self.persist[c.LEVEL_NUM], c.LITTLEGAME_NUM:self.persist[c.LITTLEGAME_NUM]} + pg.mixer.music.stop() + pg.mixer.music.load(os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))) ,"resources", "music", "intro.opus")) + pg.mixer.music.play(-1, 0) + # 播放点击音效 + pg.mixer.Sound(os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))) ,"resources", "sound", "buttonclick.ogg")).play() + + # 一大波僵尸来袭图片显示 def setupHugeWaveApprochingImage(self): frame_rect = (0, 0, 492, 80) @@ -625,37 +664,7 @@ class Level(tool.State): # 如果暂停 if self.showLittleMenu: - # 设置暂停状态 - self.pause = True - # 暂停播放音乐 - pg.mixer.music.pause() - if mouse_click[0]: - if self.checkReturnClick(mouse_pos): - # 终止暂停，停止显示菜单 - self.pause = False - self.showLittleMenu = False - # 继续播放音乐 - pg.mixer.music.unpause() - # 播放点击音效 - pg.mixer.Sound(os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))) ,"resources", "sound", "buttonclick.ogg")).play() - elif self.checkRestartClick(mouse_pos): - self.done = True - self.next = c.LEVEL - pg.mixer.music.stop() - pg.mixer.music.load(os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))) ,"resources", "music", self.bgm)) - pg.mixer.music.play(-1, 0) - # 播放点击音效 - pg.mixer.Sound(os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))) ,"resources", "sound", "buttonclick.ogg")).play() - elif self.checkMainMenuClick(mouse_pos): - self.done = True - self.next = c.MAIN_MENU - #self.persist = {c.CURRENT_TIME:0, c.LEVEL_NUM:c.START_LEVEL_NUM} # 应该不能用c.LEVEL_NUM:c.START_LEVEL_NUM - self.persist = {c.CURRENT_TIME:0, c.LEVEL_NUM:self.persist[c.LEVEL_NUM], c.LITTLEGAME_NUM:self.persist[c.LITTLEGAME_NUM]} - pg.mixer.music.stop() - pg.mixer.music.load(os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))) ,"resources", "music", "intro.opus")) - pg.mixer.music.play(-1, 0) - # 播放点击音效 - pg.mixer.Sound(os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))) ,"resources", "sound", "buttonclick.ogg")).play() + self.pauseAndCheckLittleMenuOptions(mouse_pos, mouse_click) return if (c.ZOMBIE_LIST in self.map_data.keys()) and self.map_data[c.SPAWN_ZOMBIES] == c.SPAWN_ZOMBIES_LIST: @@ -1425,6 +1434,13 @@ class Level(tool.State): surface.blit(self.level, (0,0), self.viewport) if self.state == c.CHOOSE: self.panel.draw(surface) + # 画小菜单 + surface.blit(self.little_menu, self.little_menu_rect) + if self.showLittleMenu: + surface.blit(self.big_menu, self.big_menu_rect) + 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) # 以后可能需要插入一个预备的状态（预览显示僵尸、返回战场） elif self.state == c.PLAY: if self.hasShovel: diff --git a/source/state/mainmenu.py b/source/state/mainmenu.py index fa0dc46..7e3265b 100644 --- a/source/state/mainmenu.py +++ b/source/state/mainmenu.py @@ -157,9 +157,9 @@ class Menu(tool.State): self.littleGame_image = self.littleGame_frames[self.littleGame_frame_index] if mouse_pos: - self.checkAdventureClick(mouse_pos) self.checkExitClick(mouse_pos) self.checkLittleGameClick(mouse_pos) + self.checkAdventureClick(mouse_pos) else: # 点到后播放动画 if(self.current_time - self.adventure_timer) > 150: