From 43f06cef96a33b018a5de016ef76a8530fe627c4 Mon Sep 17 00:00:00 2001 From: wcb_dell <497649129@qq.com> Date: Tue, 1 Dec 2020 11:07:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=9E=E5=88=B0=E4=B8=BB?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=90=8E=E7=9A=84=E8=B7=B3=E8=BD=ACbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/data/map/level_1.json | 34 ++++++++++++++++----------------- source/state/level.py | 3 ++- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/resources/data/map/level_1.json b/resources/data/map/level_1.json index ac5c4d4..575c4e2 100644 --- a/resources/data/map/level_1.json +++ b/resources/data/map/level_1.json @@ -1,20 +1,20 @@ { - "background_type":0, - "init_sun_value":5000, - "shovel":1, - "zombie_list":[ - {"time":20000, "map_y":0, "name":"Zombie"}, - {"time":40000, "map_y":2, "name":"FlagZombie"}, - {"time":50000, "map_y":4, "name":"Zombie"}, - {"time":70000, "map_y":3, "name":"Zombie"}, - {"time":72000, "map_y":1, "name":"FlagZombie"}, - {"time":74000, "map_y":2, "name":"Zombie"}, - {"time":90000, "map_y":0, "name":"Zombie"}, - {"time":91000, "map_y":1, "name":"FlagZombie"}, - {"time":92000, "map_y":2, "name":"Zombie"}, - {"time":93000, "map_y":3, "name":"FlagZombie"}, - {"time":94000, "map_y":0, "name":"Zombie"}, - {"time":95000, "map_y":4, "name":"FlagZombie"}, - {"time":96000, "map_y":1, "name":"Zombie"} + "background_type": 0, + "init_sun_value": 50, + "shovel": 1, + "zombie_list": [ + { "time": 20000, "map_y": 0, "name": "Zombie" }, + { "time": 40000, "map_y": 2, "name": "FlagZombie" }, + { "time": 50000, "map_y": 4, "name": "Zombie" }, + { "time": 70000, "map_y": 3, "name": "Zombie" }, + { "time": 72000, "map_y": 1, "name": "FlagZombie" }, + { "time": 74000, "map_y": 2, "name": "Zombie" }, + { "time": 90000, "map_y": 0, "name": "Zombie" }, + { "time": 91000, "map_y": 1, "name": "FlagZombie" }, + { "time": 92000, "map_y": 2, "name": "Zombie" }, + { "time": 93000, "map_y": 3, "name": "FlagZombie" }, + { "time": 94000, "map_y": 0, "name": "Zombie" }, + { "time": 95000, "map_y": 4, "name": "FlagZombie" }, + { "time": 96000, "map_y": 1, "name": "Zombie" } ] } \ No newline at end of file diff --git a/source/state/level.py b/source/state/level.py index 1392207..682ffd4 100644 --- a/source/state/level.py +++ b/source/state/level.py @@ -223,7 +223,7 @@ class Level(tool.State): return True return False - # 检查小菜单的重新开始有没有被点击 + # 检查小菜单的主菜单有没有被点击 def checkMainMenuClick(self, mouse_pos): x, y = mouse_pos if(x >= self.mainMenu_button_rect.x and x <= self.mainMenu_button_rect.right and @@ -263,6 +263,7 @@ class Level(tool.State): elif self.checkMainMenuClick(mouse_pos): self.done = True self.next = c.MAIN_MENU + self.persist = {c.CURRENT_TIME:0.0, c.LEVEL_NUM:c.START_LEVEL_NUM} return if self.zombie_start_time == 0: