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

修复体验了小游戏关卡之后冒险博士关卡进度传递失败的bug

Browse Source
This commit is contained in:
星外之神 2022-05-02 22:16:13 +08:00
parent 217c3b608c
commit 1939f8b93b
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/component/plant.py
View File

@ -732,7 +732,6 @@ class Spikeweed(Plant):
self.loadFrames(self.frames, name, 0.9, c.WHITE) self.loadFrames(self.frames, name, 0.9, c.WHITE)
def setIdle(self): def setIdle(self):
print('spikeweed idle')
self.animate_interval = 70 self.animate_interval = 70
self.state = c.IDLE self.state = c.IDLE
@ -1161,7 +1160,7 @@ class StarFruit(Plant):
def attacking(self): def attacking(self):
if (self.current_time - self.shoot_timer) > 1400: if (self.current_time - self.shoot_timer) > 1400:
self.bullet_group.add(StarBullet(self.rect.left + 10, self.rect.y + 15, c.BULLET_DAMAGE_NORMAL, c.STAR_BACKWARD, self.level)) self.bullet_group.add(StarBullet(self.rect.left + 5, self.rect.y + 15, c.BULLET_DAMAGE_NORMAL, c.STAR_BACKWARD, self.level))
self.bullet_group.add(StarBullet(self.rect.centerx - 20, self.rect.bottom - self.rect.h + 5, c.BULLET_DAMAGE_NORMAL, c.STAR_UPWARD, self.level)) self.bullet_group.add(StarBullet(self.rect.centerx - 20, self.rect.bottom - self.rect.h + 5, c.BULLET_DAMAGE_NORMAL, c.STAR_UPWARD, self.level))
self.bullet_group.add(StarBullet(self.rect.centerx - 20, self.rect.bottom - 5, c.BULLET_DAMAGE_NORMAL, c.STAR_DOWNWARD, self.level)) self.bullet_group.add(StarBullet(self.rect.centerx - 20, self.rect.bottom - 5, c.BULLET_DAMAGE_NORMAL, c.STAR_DOWNWARD, self.level))
self.bullet_group.add(StarBullet(self.rect.right - 5, self.rect.bottom - 20, c.BULLET_DAMAGE_NORMAL, c.STAR_FORWARD_DOWN, self.level)) self.bullet_group.add(StarBullet(self.rect.right - 5, self.rect.bottom - 20, c.BULLET_DAMAGE_NORMAL, c.STAR_FORWARD_DOWN, self.level))

5
source/state/level.py
View File

@ -40,6 +40,7 @@ class Level(tool.State):
file_path = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))),'resources' , 'data', 'map', map_file) file_path = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))),'resources' , 'data', 'map', map_file)
# 最后一关之后应该结束了 # 最后一关之后应该结束了
try: try:
print(self.game_info[c.LEVEL_NUM])
f = open(file_path) f = open(file_path)
self.map_data = json.load(f) self.map_data = json.load(f)
f.close() f.close()
@ -242,7 +243,6 @@ class Level(tool.State):
return self.beforePauseTime return self.beforePauseTime
def initBowlingMap(self): def initBowlingMap(self):
print('initBowlingMap')
for x in range(3, self.map.width): for x in range(3, self.map.width):
for y in range(self.map.height): for y in range(self.map.height):
self.map.setMapGridType(x, y, c.MAP_STATE_UNAVAILABLE) # 将坚果保龄球红线右侧设置为不可种植任何植物 self.map.setMapGridType(x, y, c.MAP_STATE_UNAVAILABLE) # 将坚果保龄球红线右侧设置为不可种植任何植物
@ -1068,10 +1068,11 @@ class Level(tool.State):
def checkGameState(self): def checkGameState(self):
if self.checkVictory(): if self.checkVictory():
if c.LITTLEGAME_BUTTON in self.game_info: if (c.LITTLEGAME_BUTTON in self.game_info) and (self.game_info[c.LITTLEGAME_BUTTON]):
self.game_info[c.LITTLEGAME_NUM] += 1 self.game_info[c.LITTLEGAME_NUM] += 1
else: else:
self.game_info[c.LEVEL_NUM] += 1 self.game_info[c.LEVEL_NUM] += 1
print(self.game_info[c.LEVEL_NUM])
self.next = c.GAME_VICTORY self.next = c.GAME_VICTORY
self.done = True self.done = True
elif self.checkLose(): elif self.checkLose():

1
source/tool.py
View File

@ -89,7 +89,6 @@ class Control():
elif event.type == pg.MOUSEBUTTONDOWN: elif event.type == pg.MOUSEBUTTONDOWN:
self.mouse_pos = pg.mouse.get_pos() self.mouse_pos = pg.mouse.get_pos()
self.mouse_click[0], _, self.mouse_click[1] = pg.mouse.get_pressed() self.mouse_click[0], _, self.mouse_click[1] = pg.mouse.get_pressed()
print('pos:', self.mouse_pos, ' mouse:', self.mouse_click)
def run(self): def run(self):