From 3507eb59721248577ad6f80c88e8883e401e6144 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=9F=E5=A4=96=E4=B9=8B=E7=A5=9E?= <wszqkzqk@qq.com>
Date: Sun, 24 Apr 2022 00:45:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=B0=E8=B1=8C=E8=B1=86=E7=88=86=E7=82=B8?=
 =?UTF-8?q?=E6=97=B6=E4=BD=BF=E7=94=A8=E7=8B=AC=E7=AB=8B=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Bullets/PeaIceExplode/PeaIceExplode_0.png    | Bin 0 -> 1007 bytes
 source/component/plant.py                        |   2 ++
 source/component/zombie.py                       |   1 -
 source/state/level.py                            |   8 +-------
 4 files changed, 3 insertions(+), 8 deletions(-)
 create mode 100644 resources/graphics/Bullets/PeaIceExplode/PeaIceExplode_0.png

diff --git a/resources/graphics/Bullets/PeaIceExplode/PeaIceExplode_0.png b/resources/graphics/Bullets/PeaIceExplode/PeaIceExplode_0.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ec793f933be29d538dd198d24493e4a22cc232b
GIT binary patch
literal 1007
zcmV<L0}%X)P)<h;3K|Lk000e1NJLTq001-q001rs1^@s6XEiz&000BFNkl<Zc%0pt
zEo>A)6vux{5Qq~iD!0isX+;U*NDf!g8j=b`#R*7GAWnd*fP^;4RzOfB6;xDQ0tqJ&
zhzi72R8a(i1Odry=*fx=Ie{P<#GASOxZcO^-t1lZCzH8(-JQ;VKK}2$9S0P-;6*xE
z23CM=-M)#Fuk-Y9auM=Sl!02r_60Zx4!B~3%*q@93qUFIx7WHpES}J{TyH;#{O$p+
zE_L8XuAVa^A0dMaz#}A7o=UHoFdae*iMBtLUNa#(p-n^p41!3RA+i(N2HHR;V)J#`
zAx^eHT+j9PCa??KM?_!|AsGO@;uQ|^tdIx10zOA<ZCzJ$j3_7aIo3HuzAZNjbv;vU
zWNU()JIm37y%q9Myhr@fg|6Gc2jIjiDP^zJm10dPeksLoUDuVe`9G)QSTBQzq6(}=
zY%Z_|tl2xb_6U`A{an{wUAss?+sHv`9mV?P@7oiFQyi91eFyst<DZ1=LjY8&h}=Z@
zi;;FW{=Pjz08Jb`6dOo-;Uc22h4`^QDf%+~G;}-AbvsVV-j++k4B$2rUF?$10SEf|
ziY{g1iKT|!6$0quaE_t}905z(-o&Aqq90e+!RW{A6EZl;`TjD{(!cK@zO6O**la?d
zMoKX-SV!?U()J-K3Zn^`k08EocV`npr@?4ZC<9M{x5$!T0gP8U7fG>KY!78R7{BE<
zfE&O&W|p)Kg@@{^UKKdO8BZvRc{)R8vW+j(er>$U8B+5^1|;9A5q@zx19m6zL-R%?
zin1;~upy?&9cy&^%>&5}@zMKIO-3kr!w{hQp~$SreFZ)tQNtPVQp}T`A#+VqkJt~9
z$Qfp*en#b7WTGchxiYYi>{VCW17wMtz%lc&1vN%H)&L37-GtpFX}2tlC?`e}a*_Nc
zi4sC~iJ5=PP9jdoL&XZv&sn<2Hv5Jg$R6SYwh9{Qga}p69I%RRn?&pwNtGWVO48AP
z>mY$^o4G<rC_rZ0gc62Om3X>bL$=`#@M1`>B@`9ihap^$aEQtoY2HUN!6aIUL|1?}
z`k4n@e#@|iVxRCf&nJ}l0^~hhp+({szfshXnf8IZ+7>W4z!Hj8LNYEg344S-%Q8Yy
zsOkZDky-{BqKnfn!)E&)A{ar!UeFcGVCdr#_d5abal+nQ!W+E{gxIiEw}fzo%$5jr
z-6j2<X%~kUgQOk<KeG=q4Z_gJBuvT3Aj^Snp!iNG@2ACuM)6qAIMZd~Gn!R$vwp71
df&cDG@*lcbC#X2g@M8b~002ovPDHLkV1h7a#Qy*Q

literal 0
HcmV?d00001

diff --git a/source/component/plant.py b/source/component/plant.py
index a74b8c2..debbac6 100755
--- a/source/component/plant.py
+++ b/source/component/plant.py
@@ -76,6 +76,8 @@ class Bullet(pg.sprite.Sprite):
         fly_name = self.name
         if self.name == c.BULLET_MUSHROOM:
             explode_name = 'BulletMushRoomExplode'
+        elif self.name == c.BULLET_PEA_ICE:
+            explode_name = 'PeaIceExplode'
         else:
             explode_name = 'PeaNormalExplode'
 
diff --git a/source/component/zombie.py b/source/component/zombie.py
index fba96c9..f7b1f29 100755
--- a/source/component/zombie.py
+++ b/source/component/zombie.py
@@ -202,7 +202,6 @@ class Zombie(pg.sprite.Sprite):
 
     def setDamage(self, damage, effect=False, damageType=c.ZOMBIE_COMMON_DAMAGE):
         # 冰冻减速效果
-        print(damage, effect, damageType)
         if effect == c.BULLET_EFFECT_ICE:
             if damageType == c.ZOMBIE_DEAFULT_DAMAGE:   # 寒冰射手不能穿透二类防具进行减速
                 if not self.helmetType2:
diff --git a/source/state/level.py b/source/state/level.py
index 643f89d..d117b81 100644
--- a/source/state/level.py
+++ b/source/state/level.py
@@ -638,7 +638,7 @@ class Level(tool.State):
 
 
     def checkGlobalBulletCollision(self):
-        collided_func = pg.sprite.collide_circle_ratio(0.7)
+        collided_func = pg.sprite.collide_circle_ratio(0.6)
         for i in range(self.map_y_len):
             for globalBullet in self.global_bullet_group:
                 if globalBullet.state == c.FLY:
@@ -841,12 +841,6 @@ class Level(tool.State):
         elif plant.name == c.STARFRUIT:
             can_attack = False
             if (plant.state == c.IDLE):
-                '''
-                totalZombie = 0
-                for zombieColumn in range(self.map_y_len):
-                    totalZombie += len(self.zombie_groups[zombieColumn])
-                if totalZombie > 0:   # 只要场上有僵尸就需要判断
-                '''
                 for zombie_group in self.zombie_groups: # 遍历循环所有僵尸
                     for zombie in zombie_group:
                         if plant.canAttack(zombie):