From 0bc71ab340bee33188bba51ab80dbc06786f8fc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=9F=E5=A4=96=E4=B9=8B=E7=A5=9E?= Date: Fri, 22 Apr 2022 23:20:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E6=80=A7=E6=9B=B4=E6=94=B9=EF=BC=9A?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E5=8E=9F=E7=89=88=E8=AE=BE=E5=AE=9A=E5=9C=9F?= =?UTF-8?q?=E8=B1=86=E9=9B=B7=E4=B9=9F=E4=B8=8D=E8=83=BD=E5=9C=A8=E7=9D=A1?= =?UTF-8?q?=E8=8E=B2=E4=B8=8A=E7=A7=8D=E6=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- source/component/map.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d28246f..a05200d 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ 植物大战僵尸游戏的Python实现,基于[marblexu的项目进行创作](https://github.com/marblexu/PythonPlantsVsZombies),部分代码也整合自[callmebg的项目](https://github.com/callmebg/PythonPlantsVsZombies) **本项目为个人python语言学习的练习项目,仅供个人学习和研究使用,不得用于其他用途。如果这个游戏侵犯了版权,请联系我删除** - + * 已有的植物:向日葵,豌豆射手,坚果墙,寒冰射手,樱桃炸弹,三线射手,大嘴花,小喷菇,土豆雷,地刺,胆小菇,倭瓜,火爆辣椒,阳光菇,寒冰菇,魅惑菇,火炬树桩,睡莲 * 已有的僵尸:普通僵尸,旗帜僵尸,路障僵尸,铁桶僵尸,读报僵尸 * 使用 JSON 格式的文件存储进度数据 (例如僵尸出现的位置和时间,背景信息) diff --git a/source/component/map.py b/source/component/map.py index d2e1d52..12c9875 100755 --- a/source/component/map.py +++ b/source/component/map.py @@ -73,7 +73,7 @@ class Map(): if c.LILYPAD in self.map[map_y][map_x][c.MAP_PLANT]: if ((self.map[map_y][map_x][c.MAP_PLANT] | {c.LILYPAD, '南瓜头(未实现)'} == {c.LILYPAD, '南瓜头(未实现)'}) and (plantName not in self.map[map_y][map_x][c.MAP_PLANT])): # 例外植物:集合中填花盆和南瓜头,只要这里没有这种植物就能种植;判断方法:并集 - if plantName in {c.SPIKEWEED, '花盆(未实现)'}: # 不能在睡莲上种植的植物 + if plantName in {c.SPIKEWEED, c.POTATOMINE,'花盆(未实现)'}: # 不能在睡莲上种植的植物 return False else: return True