diff --git a/source/constants.py b/source/constants.py index 634f654..5283118 100755 --- a/source/constants.py +++ b/source/constants.py @@ -7,6 +7,7 @@ START_LITTLE_GAME_NUM = 1 ORIGINAL_CAPTION = 'pypvz' # 游戏模式 +GAME_MODE = 'mode' MODE_ADVENTURE = 'adventure' MODE_LITTLEGAME = 'littleGame' diff --git a/source/state/level.py b/source/state/level.py index 5fe84c5..3f7fb4f 100644 --- a/source/state/level.py +++ b/source/state/level.py @@ -31,10 +31,10 @@ class Level(tool.State): self.initState() def loadMap(self): - if c.LITTLEGAME_BUTTON in self.game_info and self.game_info[c.LITTLEGAME_BUTTON]: + if self.game_info[c.GAME_MODE] == c.MODE_LITTLEGAME: map_file = 'littleGame_' + str(self.game_info[c.LITTLEGAME_NUM]) + '.json' self.mode = c.MODE_LITTLEGAME - else: + elif self.game_info[c.GAME_MODE] == c.MODE_ADVENTURE: map_file = 'level_' + str(self.game_info[c.LEVEL_NUM]) + '.json' self.mode = c.MODE_ADVENTURE file_path = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))),'resources' , 'data', 'map', map_file) @@ -1069,9 +1069,9 @@ class Level(tool.State): def checkGameState(self): if self.checkVictory(): - if (c.LITTLEGAME_BUTTON in self.game_info) and (self.game_info[c.LITTLEGAME_BUTTON]): + if self.game_info[c.GAME_MODE] == c.MODE_LITTLEGAME: self.game_info[c.LITTLEGAME_NUM] += 1 - else: + elif self.game_info[c.GAME_MODE] == c.MODE_ADVENTURE: self.game_info[c.LEVEL_NUM] += 1 self.next = c.GAME_VICTORY self.done = True diff --git a/source/state/mainmenu.py b/source/state/mainmenu.py index 157effa..54e7958 100644 --- a/source/state/mainmenu.py +++ b/source/state/mainmenu.py @@ -107,7 +107,7 @@ class Menu(tool.State): if self.inAreaAdventure(x, y): self.option_clicked = True self.option_timer = self.option_start = self.current_time - self.persist[c.LITTLEGAME_BUTTON] = False + self.persist[c.GAME_MODE] = c.MODE_ADVENTURE return False # 点击到按钮,修改转态的done属性 @@ -125,7 +125,7 @@ class Menu(tool.State): self.done = True # 确实小游戏还是用的level # 因为目前暂时没有生存模式和解谜模式,所以暂时设置为这样 - self.persist[c.LITTLEGAME_BUTTON] = True + self.persist[c.GAME_MODE] = c.MODE_LITTLEGAME def update(self, surface, current_time, mouse_pos, mouse_click): self.current_time = self.game_info[c.CURRENT_TIME] = current_time