From c91adf2ef2e486d716252722034b80c9ade31db7 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, 4 May 2022 19:05:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A9=84=E6=A6=84=E7=90=83?= =?UTF-8?q?=E7=AD=89=E7=BA=A7=E8=BF=87=E4=BD=8E=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/state/level.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/source/state/level.py b/source/state/level.py index dd7f28b..14015ad 100644 --- a/source/state/level.py +++ b/source/state/level.py @@ -142,7 +142,10 @@ class Level(tool.State): if volume < 0: print('警告：第{}波中手动设置的僵尸级别总数超过上限！'.format(wave)) - while (volume > 0) and (len(zombieList) < 50): + # 防止因为僵尸最小等级过大，使得总容量无法完全利用，造成死循环的检查机制 + minCost = self.createZombieInfo[min(useableZombies, key=lambda x:self.createZombieInfo[x][0])][0] + + while (volume >= minCost) and (len(zombieList) < 50): newZombie = choices(useableZombies, weights)[0] # 普通僵尸、路障僵尸、铁桶僵尸有概率生成水中变种 if self.background_type in {c.BACKGROUND_POOL, c.BACKGROUND_FOG}: @@ -158,6 +161,7 @@ class Level(tool.State): zombieList.append(newZombie) volume -= self.createZombieInfo[newZombie][0] waves.append(zombieList) + print(wave, zombieList, len(zombieList)) self.waves = waves @@ -322,7 +326,7 @@ class Level(tool.State): c.CONEHEAD_ZOMBIE:(2, 4000), c.BUCKETHEAD_ZOMBIE:(4, 3000), c.NEWSPAPER_ZOMBIE:(2, 1000), - c.FOOTBALL_ZOMBIE:(2, 2000), + c.FOOTBALL_ZOMBIE:(7, 2000), c.DUCKY_TUBE_ZOMBIE:(1, 0), # 作为变种，不主动生成 c.CONEHEAD_DUCKY_TUBE_ZOMBIE:(2, 0), # 作为变种，不主动生成 c.BUCKETHEAD_DUCKY_TUBE_ZOMBIE:(4, 0), # 作为变种，不主动生成