From 438e0652fc92110b704db7c00c0ee5e30f34ca83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=8F=E9=93=AD?= <2436077353@qq.com>
Date: Fri, 31 May 2024 11:25:29 +0800
Subject: [PATCH] first commit

---
 pythonProject1/main.py                        |   1 +
 .../source/__pycache__/tools.cpython-312.pyc  | Bin 3832 -> 4012 bytes
 .../__pycache__/brick.cpython-312.pyc         | Bin 0 -> 1869 bytes
 .../__pycache__/info.cpython-312.pyc          | Bin 5147 -> 5484 bytes
 .../__pycache__/player.cpython-312.pyc        | Bin 11883 -> 12399 bytes
 pythonProject1/source/components/brick.py     |  27 +++++++++
 pythonProject1/source/components/info.py      |   8 ++-
 pythonProject1/source/components/player.py    |  20 ++++--
 .../states/__pycache__/level.cpython-312.pyc  | Bin 10138 -> 12387 bytes
 .../__pycache__/load_screen.cpython-312.pyc   | Bin 1504 -> 2095 bytes
 .../__pycache__/main_menu.cpython-312.pyc     | Bin 4827 -> 5429 bytes
 pythonProject1/source/states/level.py         |  57 +++++++++++++++---
 pythonProject1/source/states/load_screen.py   |  17 +++++-
 pythonProject1/source/states/main_menu.py     |  27 ++++++++-
 pythonProject1/source/tools.py                |   4 ++
 15 files changed, 142 insertions(+), 19 deletions(-)
 create mode 100644 pythonProject1/source/components/__pycache__/brick.cpython-312.pyc

diff --git a/pythonProject1/main.py b/pythonProject1/main.py
index fc41857..8afba18 100644
--- a/pythonProject1/main.py
+++ b/pythonProject1/main.py
@@ -10,6 +10,7 @@ def main():
         'main_menu':main_menu.MainMenu(),
         'load_screen':load_screen.LoadScreen(),
         'level':level.Level(),
+        'game_over':load_screen.GameOver()
     }
     game = tools.Game(state_dict,'main_menu')
     game.run()
diff --git a/pythonProject1/source/__pycache__/tools.cpython-312.pyc b/pythonProject1/source/__pycache__/tools.cpython-312.pyc
index 1a03e1b0a92016995aa12b1eecdf1f9cea027158..227cd4bf53c26587a43d9b65cf13f2a8c623c7e0 100644
GIT binary patch
delta 645
zcmXYvOK1~O6o%)_E0avdB+WEULY@SvlSXUA2Q4Z^Bqb3<+!Yrwn8Ze#q})tEN{TM6
zh*1tcii>WAy3r!K5Z6WBL<=cnRj_+$4cOvF?@hgnZ_fSifBt)BnBDO6sP;kA92{Mk
zoGNd>&=LYnV_G;2Gk9O{VbY<)Jhp`)d@1PsJdgK;{rJP_<y$<i3d8u@sjILIEP&&H
z>-W5tbZB7#2E`V4&5dc<i=(3ZrkxB>kEN6=wMt{URJ80@3)ND-QY+Uju~xca5)V6<
z8fJl*mfV~z7R(Z1vk^CiArLRCgUsY${ycS>rG`L-SS&^c*=d+!PMxH|hxP(oRA@9Q
zBDc78)zuzf81Jf)Pikb{A6jxOI=cQ;$Dg{L#aCj|<8-%k3%RZ{)NzKMOszSG@tb%8
zX3-~|h4*+#It2#)m81AZ3j0irhW6L;|0i&FvzV9SxGP<TJN;@-4#G3^$dm99zsir{
zI5uq;{cK3W+AYznT)A%Wdv6xU@3u%hK=sBu3Oet;fsH_PDYO{s28>R?_#7Dd#n~{T
z#FaJO*wFnCGk8YH$}XEWw&lkMN)qDuRyij3FEDUN8If($k)G~ZIbaX-kj9L9PMV<E
zsg*}+ikCCABu8;oi%aKeIfg&Ar}a@L+9)iU6l%qKm55B4U|=qCkYR{{eeyrb$!fjW
soGG0q7wDG#3XKHCmH+^ooPCqizHr)(n1I+eN72iH3VJUnfu|qx5AV^VDF6Tf

delta 536
zcmZ1@|3jAdG%qg~0}#xe?3Y%vkyn|Sk!`XevjL;^<UVHc$(78aj46|QnZ=dj89}N*
zpoSrf4Z=buYZxbgVOH1WL>7avf$G6FpvnM6c_!DfDA%(W2?1qpainGDWfo_orrcu5
zORXp=5(Ejdl@_EVmZTPe^cM*L2~DOVVUPqDNKJfk2~e__2`HeTP$UXcBMl^~xZM+T
zQ}rNP`GEq(AwZ&m;RZK<zg4Hzb#A#!+;TT0W#>!Hl$tL;*_~B!auur?W6b1@tS*cP
zCVykKWt5-1j$M9oFq<q>kNxCdKn2U$5*Qo6EKPPP#(9$uu(>lHn%u)aol$493P+Fx
z$lfAeAaRSOBr`c1>dYef$$cDhisB$Q?1Z?1Pw0-M{Ct_2GS?+FFG^}&mel^lz&80T
zha&S;5zWcpI6T>S*?28Kh)j0n)MAvKT)=6{1~yxL@@h_PHda=n&jS3L?{La8G3rnL
z#qG^%2Q*e=vlovJ6PpW=S!6W1hEI{z2go#?yohf$qwZuoelc#4sv?kJk@n<xehEgu
f$rb!E67q}+9~pqeXD3E(Mv>1_tc-$1Ah!Yl6!dxA

diff --git a/pythonProject1/source/components/__pycache__/brick.cpython-312.pyc b/pythonProject1/source/components/__pycache__/brick.cpython-312.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..4304f25f85eda089bf1049902424b0b1fcf05ee5
GIT binary patch
literal 1869
zcmZ`)O>7%Q6rQnnH|xYn)8Is@ah!k%(FRBf5)!H^B$_}-OQMMWNVslR#=CaBvAt$?
zEyb1Fa>&7v3Q<lL5)u`sRH5R^nG+J17*g39K!7;qR*`b)iTBnXuZ6<Me(!s4-h1=r
z&70XD2M7BJjQux1%6uOr<S!J&kUQWc1E5X}V$eKE5F=m&^Ry611PZ}KkfJPsEG1-0
z0%VC8@-{IPlUQL9$miCOj|Dn_b#Wxr3f20K5w0EwfNB9QySANoxa^p2xuj7ZO4~)p
zO%+`yjdo(7HI9=AkUB9*f*K?Nc^Y(^CW4iKCUN-^%cVEdVpC||2Y+1r<TeDT6Bl*f
zutY$i0B%V=LI+wH;Xk8F4rp6NNtITK-u0^nK<chv4T7WyXM-AnY~YRzDNDeWs^q9u
z87#Uh6#J@5ubd?yslvZXPAlyqxpj?@JAE)aEG&I)J?CSA+);t7F@b#Ujtgu>1@gHe
zp93LFt9@TnL)oKlOw3tvfqcG4A1R;r)aw2Xi5QTn-p%y%tU){FM-d2D2H&$n2CEkZ
z_PI6fV}TAj0KB{P0Pk*Pg&oGXUiKw{dd`<v-enRqZT>%A-9D%gO<mQbW85~wzGE1~
zBcOf#G_5yzJSEIJwrl_uc<KBITy=AKQ-|xL1>3>B6}m)=aHUkqrV1ukoD$2qz^}Hs
zs_VI8&ee5Jw>YhE$*q)3K9FHxtTQw1I$ZGt;Hgr{EE)_uorkiftLF--tjTbXTwVI`
zowfIu7p`);z|~7j`pWeWt}Tl|xuRiiaoMxyD!O85E+N%aE;(jC!$xpVcsRWOW4y$=
zmx`RW^ETrnpvrEv{q#;k!$yj2dXa>tzb9`z+NsWX_U^)k<aNhnPI9Y|T&tuvQmnAX
zYzsG-ELGeMyVw!ula5_xX)~F&3njZ~!XuRQ(wQq&7&hMRA@7Nq6NSUe?Z5*`J|(}Z
zL%V}JgH1KoP-9JXx}i=#Fpkt$T4zUU(tSm+NF1b4D?Yn_@o?g;Lp9opY5T7oJ`ZsG
z&ohzM<a}-MaX9wJ<oVj-5%95bupeke<IU)7BRcyxp`lG$yW9#7?_Sxt(hSEN;rN&3
zukL+u@0;?scOTyU&T5=rKAg<`Z~@5SjaxvE*7fH4Mq_>Br^(#ou=ON}A)Y8CHc^v~
z)bZBnx%$n$n-3z*7v>xA8+`*->~BTJ>zDT~HzPBR$jr|X&C7Z$TF>ldYSM0KCj?3L
zik}UfKrP6sMvw7rgx46ltB8%H^L||~*hU$;ROew`|D>GCw`aVXJ|t`gJQ!X)h6m>n
zY%B*~#%=O6Fe*>9ZE#u(G5o}E;x(h!feg=q;d{l-An`7m7wT0MyWyXy7u$)v&E{YN
q6Lnq!0wtmJ7c%%eiT*|=o=RhMqW0eI%FaqNJk<zK{X;<EMfn$B4RqZA

literal 0
HcmV?d00001

diff --git a/pythonProject1/source/components/__pycache__/info.cpython-312.pyc b/pythonProject1/source/components/__pycache__/info.cpython-312.pyc
index 3a3aa60c831171626f790fcf6646768812959afe..06657c45998ff598b1679ae40f96d6ad093142bb 100644
GIT binary patch
delta 1250
zcmZWpO>7%g5Pomh`{SQoJMmBABzCtbNxO9k3H_lc4WfcTqbmIgsG*i1xY>1OW5@8;
zDcBf=3y27$N<39mrJ{#kTA?1IoH!t=o<ObCv}x67kx-8f<$xS<L2AX!I+hB&!}n(9
zeKYfBcHVxw{f`~`4NVIWSO+pE@>c^(dOv+mM16A!u%o{5HNZEdK^tUd^N5g!02<{N
z{Apg%R7&}GVi!vMl4RgM0LOBhT_acMVN-D>r<$wUuK!f7Y|j+t@)iCoo#+x>pJSKu
zOanU80UXR~@I694whyFF$y&VU3*T3Pwd6Cf>HM<ritte65r2GH5YJQkfFF${_?Kda
z|K?lD7X9G!pVc5muhM^;tw<6K-_w@0y;~i5p)FHV#anr+sPiQ$%9~QE&+0@+D{958
zxRtQFs<BNDDJJ-1DHRB{^%{R7bSvHOZHLmHZC^8$Y{$2Hp3YSxHDdO1Qy!*Co|QAS
zhkq_V-?s&V)#bMg!}$0US1J`w+m0y|8gOlv<~QZt{dKRQLzUAutNUL+Fgb1<IX*sR
z3M>tt>pOvHYFtoE&6V>NR?bzuF7u2s))57UgAFhk*1*ENrljNuTF)(CP~y~3e+vH)
z{@Hg+|3zP!e&_bVnbm#ot`6o_X3HxBb9X}({-Zh)TGKktWEZpNM(=2Ye5=|W4XzHp
zdabxJaO_@a>Q9mA+gM`xFZH;vkb=-~`|Ei7Js`WjHzy{?!SVr&n`dFY9)<0OZT$tL
zh#w6PLp9q#W@umr0JuEBAZRc}H;CgjQ_7vROAa%Uv;$!T;OY8kgx?7E(JlO8@DWWc
z-wn-Dc@&AGd`zFFQGQn6Nyqqgy+7sk1B28%CLs3EEVE&FTPaK~hCibTz8HS{P$y7a
zdH#J1PXCv068(doe~U2;1_xbWs@2e$@M8GBn!c^3@2Li~Xe4rxF7(0aX1N6&Kc329
ze4tY&ONA<X5k%(YlnUkCDVrTagZFkYwkb0Frmo`5vwUvWX0L(PdQe8|8@oP><vy(Y
zy-T6E3mF#y@S!E|^CO+-p|sySUmlEuk%bX(B3d2Air5su6~YoI$N14`&w?ZkHFZsT
zgErHOG(k6FlGNMOskC)NR;9fyCO$zk!1lxD66QnaAq4zSFa<$H7z1#9g*hk|J=iot
jD-}q8tNY6pYrbT^#Im5`>^d33*P{d4F1oi#06g+Pcv=gP

delta 1021
zcmZWn%}Z2K6o2=9&)0kN^-{;tM)2#Y$(UxNeNafz6xC+X7KMzynRqd3-ZxUpfDr`+
zQH#3>riHmQS26!UM7tnp5yo4D5EN327+bZebKWQjy<vX$+;e~Dp7T5B{_K0vtGy3}
z{2Y8c-zSS-eXq4n(#PX|??YRF|Ly~T=UjzUxaqwkj;pY3zro&UszAWbYo09<uB<RS
zn#6+y(4~F;GPgmln6fK5<$Sroev@p3cSWaAD$)>e9L&XXd@(cx#y#${k$5CN@v{&7
z1fLOD-fz@;g(@NM*t&d{m4Z#IRjO*6q;b6!F7lg%t&{FxIoNP<+%1hQ3Nby>0uC!`
z#jLnxSch1L+|K6YfbI!L?lSz$CiYiOlV+Ay`bi7Bt{jcG!_kU#EtN_Qo4j3tOtg)?
zQbu?)z<AYU8THgi6gUpnkfJd_s$ooXcD}eUI7<tlbJ|loUCPfCN{)`~Tx~-&2&?*n
z?2B(m`Q_s@lNz=2{z-l{2?WUX7IR@6Trroud=5N|&>hc16CQ=8Vc9v36ya_<ZSp$<
z7&8nGde~#w+xreva050}v{wY}Mp6&L5rBi$6P+bPNz%r~LO+O6>(XY4oIzrSJ=Ld3
zlzr0&$T*9IJKH?9c*#oSpjuC756gug5`($n8<!$Lapk4k7WCr3d>1i3;Ker>gWzzm
zr!apt_)LGSZ>jAc)%H(n3R-kOvPM>0;nd{mF<5L3B$_Ji0^1d5N_Lr!f=Rucl0BEd
zS)dotf$xhB0GI;B+g-(3qQ(4dflk2A!50ow_9p0x7R}#T@p(m|iDPiq0Psn+Y_XTI
zDo8sKKhqrtr#Enlb8U1K7165z8yq#zj<NN4VpWs|>%oAuK<Y_F%97o<B(>HxB6aM_
zsx;bQ;&U|pbPN`kqap_PA;<^{f{HK>;EMJ<h{Xt+LujM|>yLVJZoyhA6;9JB*g}6e
Sr=MfvMptNvjMg~-kNgk(p4YPg

diff --git a/pythonProject1/source/components/__pycache__/player.cpython-312.pyc b/pythonProject1/source/components/__pycache__/player.cpython-312.pyc
index a7ea98128dacec5b11cdf2e24effa00893fd549d..94888331f205e4418e20057a53d2a98a325edc53 100644
GIT binary patch
delta 1052
zcmZvbUr19?9LIOIyE*UN{5N&(I^C8!uWo{rgkTZ`r7xpEqAZ;^@611Qv$L6Q3HD$$
zMVspcJ_I53kmgHtpQ4B8&zlc1F&t81PZfcY7C{fu?>D6aJKX!Z_xC%$^Sj@}`QFdx
zzjT{cj7DAsV`1@3Z-paiS|yR>`wJzxld6t<xlqoVBpn5EK17Al0@19rlQ()&&l-4#
zRVL#qpBmTVh^j=jmtrVtSQqcmZSb;Rl3A2LWGjX2RaM$n9_QBd*0kM$Pg~k5#JSmA
z<puvNi!>?M3QlRV2B9)srD9K=R^><02{osY`~9rVQr>kLX6Ptl3=u_CBhDfuL=U0^
zK>=aZVz<*`Ok4uQ%qIg<)KBaCq@Wz|`@#_^;tz+g^a)E@#&R21jrMd-UZQoXb*_EJ
z%g&WPAe1fF+VXm&pl@JgXxJB`zF;UasT{P1hzTVf&u9`2RALW>BT&92ILVZfU$&wp
zqwKAt+7QI=<5%b~Gda77#6nKjfqe?GS<JAfa8wEm&fk0N<g#(I?V=IdKd(Lt?O%yD
zEh>4bRJoSa``cjspEkWxAh5>1iVM63(s=LOX74ltTdi!?jjP7U0LSw6X4X<;X1^-4
zCjL20ilz`b>W2qyMKmH>5c{;_VZ``7?Qme55Qp6WICOnZB6})3VVE||MdoA4SW54h
zHDH#X=I7+~Vpj?-z3V1VOV}e_DQvNUFJyT&mh!*elGWfel%E;01|p7mbL?!~#!rCp
zIB)wW9n581A!bn*zBeH<qBG{G!f+U{VE|u7`h1c8AwQ+HkO>pOu2D907ehYSLCm<f
zo89mORy6=%LuN~yo5@ZWmCko2JL6pS44)Rt(9o82krk#OtXLP^DZw4*Uh6Hi1eWz^
z*=C*jR^5HFr7YH|3HipB-Oa?zKDv(`jzB@ipfrYWm5BejJ%JN95Z3`qtlMKH9qfun
z&}y`0+dRADspHk!nr)L->)A1}6;GS>E>@#}%wO<R-#iqOM*{v9y1?q|okCDUEb-Hc
S&Z*9Iqa$T>d{<#6v*0(@Mhi>;

delta 751
zcmZXSUue@%6vlJ2Mq}G_UH7l1>rA7x)aojt;zJcd5%fV6rp)3<)3ux3(xkh|Hrf{l
z4y_=_xZpp07>KZmZ+RD{_~IU<TcxE4&Ve8b3JzcPpx#r4q6_3lIQKhWPQH_GsV`SN
zOM>8J==CZ-Fx)H6dX|ws`yt)t%e2m*WLw5N!z6vhwrIPZMDKVckxHzcoOOC4MJCFg
z!z}HLvJGKM)y8uAh+^gPS={hiSk=v(l{0kmz<H?4M^)2IJ=j}zRC%#3h02b%e9->v
zT-=V1+RuC!TF|KdvvY)XIn$~+mbKEVrjeY#_u2&Q#FKz2ibiWeQ;W)94GzQ603ZcO
z11<x`DNLA7l5iIk3KXS|^Rz#U`>v{bM$0OurCM222kCQ)X=aso*Z7_a-*dme%FC-R
zvf&@{C6<Lq-R-TprHWgc>!`ZJMBDikjgwTY)8Dn}IHc;z=tRDt7+BE_>$-hPG>`|z
zKi!-^>cT0q7&u1Teg$Myw&k8B4o#A;p|C4YRT!qg2H7R2P>M{;k=<Lq0L)6R&G$jz
zcOSo&9XlYH{-{9hSHdT#{k$CHV3L>ik;nqO)duu`Y=&vjD}>!UC(<g@Lhp44#XY9T
zVE8Q-Xp*E`3<m!T{yjZ2ISRT~-c8o_y+CXBll?40pU8Y)0=1KmeJ2l_RL~3_7vX6S
z;NOkn64Y)2ZUAmG3{m1Dx=2d#0LOCjcb+_q$2i0Z>)Xhi_!*HZ7~BnjwQlf<ypfsE
hvd8fwa`1p0NVgz=`O=-iTZ1(rR1rcy7^pNGegplz&_DnH

diff --git a/pythonProject1/source/components/brick.py b/pythonProject1/source/components/brick.py
index e69de29..24dc415 100644
--- a/pythonProject1/source/components/brick.py
+++ b/pythonProject1/source/components/brick.py
@@ -0,0 +1,27 @@
+import pygame
+from .. import tools,setup
+from .. import constants as C
+
+class Brick(pygame.sprite.Sprite):
+    def __init__(self, x, y,brick_type,color=1):
+        pygame.sprite.Sprite.__init__(self)
+        self.x = x
+        self.y = y
+        self.type = brick_type
+        bright_rect_frames = [(16,0,16,16),(48,0,16,16)]
+        dark_rect_frames = [(16,32,16,16),(48,32,16,16)]  # 抠图
+
+        if not color:
+            self.frame_rects = bright_rect_frames
+        else:
+            self.frame_rects = dark_rect_frames
+
+        self.frames = []
+        for frame_rect in self.frame_rects:
+            self.frames.append(tools.get_image(setup.GRAPHICS['tile_set'],*frame_rect,(0,0,0),C.BG_MULTI))  # 遍历加载图片
+
+        self.frame_index = 0
+        self.image = self.frames[self.frame_index]
+        self.rect = self.image.get_rect()
+        self.rect.x = self.x
+        self.rect.y = self.y    # 设置坐标与图片
diff --git a/pythonProject1/source/components/info.py b/pythonProject1/source/components/info.py
index 69e4899..80b5a24 100644
--- a/pythonProject1/source/components/info.py
+++ b/pythonProject1/source/components/info.py
@@ -6,8 +6,9 @@ from .. import setup, tools
 pygame.font.init()
 
 class Info:
-    def __init__(self,state):
+    def __init__(self,state,game_info):
         self.state = state
+        self.game_info = game_info
         self.create_state_labels() # 创造某个阶段特有文字
         self.create_info_labels()  # 通用信息
         self.flash_coin = coin.FlashingCoin()
@@ -22,9 +23,10 @@ class Info:
         elif self.state == 'load_screen':
             self.state_labels.append((self.create_label('WORLD'), (280, 200)))
             self.state_labels.append((self.create_label('1 - 1'), (430, 200)))
-            self.state_labels.append((self.create_label('X   3'), (380, 280)))
+            self.state_labels.append((self.create_label('X   {}'.format(self.game_info['lives'])), (380, 280)))
             self.player_image = tools.get_image(setup.GRAPHICS['mario_bros'],178,32,12,16,(0,0,0), C.BG_MULTI)
-
+        elif self.state == 'game.over':
+            self.state_labels.append((self.create_label('GAME OVER'), (280, 300)))
 
     def create_info_labels(self):
         self.info_labels = []
diff --git a/pythonProject1/source/components/player.py b/pythonProject1/source/components/player.py
index b637fe8..053dd37 100644
--- a/pythonProject1/source/components/player.py
+++ b/pythonProject1/source/components/player.py
@@ -52,6 +52,7 @@ class Player(pygame.sprite.Sprite):
     def setup_timer(self):
         self.walking_timer = 0
         self.transition_timer = 0
+        self.dead_timer = 0
 
     def load_images(self):
         sheet = setup.GRAPHICS['mario_bros']
@@ -119,8 +120,8 @@ class Player(pygame.sprite.Sprite):
             self.jump(keys)
         elif self.state == 'fall':
             self.fall(keys)
-        elif self.state == 'basketball':
-            self.play_basketball(keys)
+        elif self.state == 'die':
+            self.die(keys)
 
         if self.face_right:
             self.image = self.right_frames[self.frame_index]
@@ -220,8 +221,19 @@ class Player(pygame.sprite.Sprite):
             self.x_vel = self.calc_vel(self.x_vel, self.x_accel, self.max_x_vel, False)
 
 
-    def play_basketball(self,keys):
-        pass
+    def die(self,keys):
+        self.rect.y += self.y_vel
+        self.y_vel += self.anti_gravity
+
+
+
+
+    def go_die(self):
+        self.dead = True
+        self.y_vel = self.jump_vel
+        self.frame_index = 6
+        self.state = 'die'
+        self.death_timer = self.current_time
 
     def calc_vel(self,vel,accel,max_vel,is_positive=True):  # 求速度
         if is_positive:
diff --git a/pythonProject1/source/states/__pycache__/level.cpython-312.pyc b/pythonProject1/source/states/__pycache__/level.cpython-312.pyc
index 98139136a5bed450fe0c4ea5735dc057f901263c..049ef8e6bf43b22b75b233b0dd9887f239b49852 100644
GIT binary patch
delta 3508
zcmZ`+TW}NC8Qxv3WLdkiBx@~8*2VJOqF_oe&Beiq6HG8<OhR}lZaj*tUE2cPIFiA3
zO-x&o!80`2b2<ewOfZ?I#6vr!!*qtpLmv9jKJ=k1*p+5U8_%>&AKIZ{rs+)k(*Hjz
zgUw83>EE;G@}2+um+$=k@Zg`{srjAL>EPfq(tTv~`M^SrpHDAzyt*ah7;^BODyWvU
zG$gU7JR}R;Yn)njhEwg=1zf~&L(YZyU0oK#mQN?9G-6l_#fi~T!#YAz$zw@#jw$)d
z%cIGKe~f9W`wTZ!t9n3s)mo6slsBdr*4MQYS~^()XDdXI7Wh4S4iGMIGyDt}uRw8}
zif`-4pf0>UUR$i952In;LLYj3^n+Hr69y58eP-wmTbTadZKY0OSe)UGdg)?S1M4`X
zG`7UV!M#THSR$jvb0_dvY1AtwRr*rd(Hxx;CYlVnpcN<badzB7OfbZPmL4T;*rR}o
zMCpHp{(dk@f)uAEcDOF~f;KNqfH=*S1I=f}b2Vju7#_~D(g=_0FBJcUfrWvKV~gsw
z?A7dDWfy(dvfH(6Zz|j6l0Bf?11t96&Ce~{dA@<(7uy?y07euL(_V9*bS|OBGl_g$
zO%xNpn>(%BEw(nCw1tk_KkjaTrXdn7Su{0`5{6KR2)>G@=GhX-V`C&YkyXRAxB5OG
zzPZh@o9{s=!<NYBwX8~d5%(n&FQe!K5fg~H1#Z7-3m^SNit?TGH_|kK^~pQ<{m;Py
zgP$~4_pC!0wvk-1n9D5j461;RuBcfL&FR{WYMKGKoqp#0HlTWIcJg)m80r*x1_5`0
zh}lUO{f?{STTFRNLRCpM&JhQSS|(<xD4Yei8)6E&3K%cZXk|}7z2yq?-SiKx_xLc~
z<_HLWo_5u|PQPE{6HjpD2>o34(Y&L2+g^@4#n14n5P<dYwBYlU<&*$zk+ntDI>W;n
z{#-rv_<i)FDuv#ziO$YgX2k22D7{_@Y@R!}PvoZHFJ>Dg7&!z_Mh=27#Nt$5Gpbnt
z#<LR{JR%Ohf#OY^A(><7!aQLC@D`3Cj$wTT^E75PPwp6*#a9+E8@6zm0Ju@X3ah{%
z>n6doY<2^iTR;~U=0Ke0z6ds5*?nnuDcGe4yY2?Rc~)Gu`&S*F`NJ267lw65b2-v{
zC37kB>1%qV`|UNZ%DI=Hca(k6Mejmx@#qcj)!cm3JYNoXd}`Cf+hNEXS=^#~x2`IF
z_?DDbU1=>Tox0Nbv$|gdmx4Fmym9<i!`;}P6{Y{73*jDEIH`q%>D%srP%D7T_S2<W
z)8?PJU9=x;|8kR8Aic~L=)~hqN@N-=r1Ho1fURa2v)JK0?6Xc6BF|-2dQgcXfz+=P
z2p@RdYM{T2dg+y_AR`u!U0HAQjkK>xp{ITFc+4`Gx+QVk;h39w4m_HI_^Te%it!?N
zqhQF%2|~0izGgInS{Sy8Jfsywsj4MZLjqYGH;0J_$KB?5oG}=(mEofg6yNiPD><%#
zhf|~Rv0PkDX-4hFnI}_OHFuI={E;EV5mk~niHSjnJ;7N<5F^k(Et{EVt{s4$!e<~(
zbAJgnUpa8;Kq<6C5AC=c+KJ8%0Arn(=A@FnLAN(t>|VA<S0&f^p1Gcq6uct^%Pw!p
z71dqQ#qMi8S9?k=FX-@fy>RRB9ampD+Bz@($XRwPCHHWf?rvLgcRa9hPESeh(B+P0
zIaZe4B{{0g(Pg=rwOe$#Wm#^6_W6Oifs!23<<PPmVPn`X$(0$apjY)=^?b*Qy#b=5
zPY&GtyXSo&w!{y{BxYyAsEE;sbutb&03$lXN>XFvMe-88toZqZ^jAuwXFu9t13!(@
zzbZ}qFs-Uv0j?OV574jcE;%zWD`u-CD81|p1`a`w;Yz4SCkn;5Nn!EHC7@1v+vm42
zgXigeUzk5e<@!Db^;L+$RBg!fBA}QGAEIyg+iOptHthbXP#2+R{bAd2?Cz(Y`knMo
zejl*pzx=cO;FB|oX>GJfatM|MfofnIsbmux-dodkW(Yi``bqlhh8!S26a1Rr$B;2P
z2<~iHin%-%2oSjB)YF(#{}*%WU78P5z!W1{{@L%rJm5G6jRd&C3dnW@4N90jet<K@
z$`R;NV_Oq5=QMP$D{m&l$y7QWA5EmwXX!s1i(q4ngj3NnKa1CrNrdbQ!PH}xVcQ#3
zNk~eKOqv#Bw;$ev>ldH3IG!TvCc};6-u{ibV`iwCck?h>_&Eru2{7KHbh-Jbpw4$&
z0{m_23WR7!tB?M+<qrK@>lS(=R3}{L>3r)EzLwEU&Zf`@^%4!W)oKp%0^k_pNIF#{
zTcJtVQ5bhvQ<=n=W?FCvhf*jo=PR0%qtM=@H_n)Ln0g~4{1_*ENIz&h5`bdFuiO14
zdsw%JFRG<TmmcX_wr^jhU$t$m4a3A_<r;$~#|bp!ZljTAFYOH|LeT~#TFAyYHVAcE
zJ@Vr$&+a->Nfu`GC+^+}Acp;|R}b~~561TyHj~E4)A=_B(>8ngG39*(Lj{BZGe71b
zT?&?@ur7sv!bh$-t~%~WTaZ8w%pEAn5nYa~$WgdO<Zl2^Kr#!99CZh}wvl=uei5La
z`l$S*Fv%`|RhWiSC22_tFVY1$0M&tQR<#`K1dH2MxHg_tq*EM}1e@OBwuizqbwVqU
z_h18p8<83ihQw;SLXv1&7DAkvD2bzP6tyUxHi!nDW?iSHyEbw@-VPtbVBr-I8%=`L
z3?>+y8@%}JUAblPxGs0X6K&Qz*L$%;mzoz7cchN8zvb+n9}cYg+weiq<%6+08fb5u
z4MCgLqy)=K;zNOz8}XyS;(_3GLPk;KQ4kc!F9ZpJV6u{N6f8*5s{~K7#Ib$Ml2yiD
z6xHx6yaVD4w<b8OAz{r=Z?uOb$-0+c3wf-;wN9$HH_fieHfwavEm)f#*=^Q#6AA%h
zHHIUZ%j9!e$n1i74`MZCa0Ck<Vnb1d0^`TDJ8o(gWsTTsLBTY-ge|lN)AB#|7c)6^
zBCYk3p3BgQNl}P_cwpgq{*PSv9_Rd$3qj*cZmZ61y~kDG<D`F!ae;4Nga2xHQ_cSY
DwZMQP

delta 2069
zcmZWqU2GIp6rQ^~vz_h!wB7#gZg;y|aJL;As8A79X#4|3u%i5xicY6H)9u>bo%PNv
zbT^t}f&>y0Y_17}=!<U+Z#MD87flQ=K2>QT1Edcc9u2l8B%;Q1?zDyKCi~5u`}3Xe
zoO{lhU&gMz75*_4Y82r2XvfIJwbt2iluXX{zLF(^?$N!)#?eOp42%Xm!fS%wa8A(W
z>mEEH2&2K-&v*8E9ABlV)eP!LmR+5g$hnIylGT@$iP?wweYIw##gPsfr;TE6Z3Q=Y
zSN|)2z~G9YlaB-y=lM?;;B9@kEwL9viMZ~$zB&bqt8xU`_<^5okEPf<$yRn)mYL!i
zZ>kB3cX+=e716BXXAeBp&>V3@%P3A*NW#v0_YKLaS|}H6Rjr4)zHMvo7#!;qz**sT
zG<iY16uR9Og@^xcTlC6-*#lSeKeuIBv$)s0DEG{t5(fzBWS69DDhg+43qZZqWh|PS
zu9mcls%y5^HoqVZczv62Q!n%RzlwIk&=IMTvn_Neou-^2!oKr&kuG-E{~L+3znWw7
zzcxNaPT@hvr&TIOS*I@`%N~Ti2txphhq{DlYy)8{tk%0+NtR((E2?E{)K)8|Rj><Y
z*~&6KSSRuMrQmk*`cByGkZG5A_Zqw78#is+EYS{_;Xzzg+lJ(kC&}I1*vdx3BfvQy
z9whDiIA@IxAl(iCMW+4iQB&`;+$*o9>(q~X!~?cbQoO64l(mxKhy|FkFk#Yb5o%{6
z%}KI@oo@aVB2;RPNngP771ooAvM-f3_IGQT4F-5Z_z31m1Lg?vvzMZ+>~ec(W{wOi
z5|z=SuUdhC8BT}$R9*G!v2h}+^Lfyso+*@d^Nb_vR6Db#vcam-2`vXgr;M7lQRp$S
zP!GDnae1DD8EXi`3fUzGF9$9LZprZlIezt-n{pavZpoV$<jptb3?HW!<kU^M2Y31}
z`akPkl;bqcmV&YQT<3YutMn)kDFN;Y<#)v+ElsPC`8-J+i5BvcHqR9&lAAPgQ|h#u
zGmFK7g;!4xvi^9g<-fOjoV^?GAuqCz<BJgCBVAuB+>(#>gF$)-z-hKB6t0F->4sLW
zxhjU)wnXR4JQD+XYF5j-$}jNA41XWa*Q0J&{x4}5R;}Hvr+ct*F}U@CR|s~3&p#yY
zC%A@&#~SE3s=;fd!|X;f8`1ITla|KVKglFH$`akfkc(5@Gi2~_n8cznVbk~UIF|dI
zTR_~q4J0|1OvlM6+nqKc7*pM``R~*B$W~6YA5UZJa=f-#!G;LQM5kb414SMvVxF4D
z?r&lsq`tXKcA2mV>VVT6M4I*3(l_xH<KTMuA?_4;QP4vymC5*`xHie&$i&GMGcq>l
z!lYQq+$L{h0aMHax7>Jm&_8a;X~-F6P&n=S&07dIleO+4*^>pTZ_s{%CHj)YV$b(|
z17?2ji%I99iLO;!2ivRs#7=HG%v!eeL2-rI(w3$%KivhSjyPT{*i=E|Totc4sZi4L
zhU+($H63|upPq#A2J5(3Z*+47%dUnS&axx@C)thu{)RZb4l5D%?Y7KJ492|w(g=>Q
z?NMw`v>o9X!f^ylKRSkhUoM(Qm_#^%fClFTio|X|4&Vp@JCt=8;GD4Rk)=(`ZK9+s
zhh<48%N?S`$^%W3D0MA|*@c0gnU$a@rCl04tc0A#oLQ=vWr)8;x#M`@jzA@NP#;1A
z!qW)+*3ckLAfyqvkWX;5F78ixPs!A)MPrDbg9ZG!Sy_MwUWE{HPe|SoLQ6sd21`Qr
Tj^Mu|1RjbuA?alSkrVw3d8z3g

diff --git a/pythonProject1/source/states/__pycache__/load_screen.cpython-312.pyc b/pythonProject1/source/states/__pycache__/load_screen.cpython-312.pyc
index 6d32d444ab9d6c48f0c7a730c7e1d7a722660b8d..7cca26d0cc98d3a1f553ee024dc37a7b71908b16 100644
GIT binary patch
literal 2095
zcmd5-&2Jk;6rcU_N8*hW;#P5zHYP-XbFk=*x)n$e5e0#%1gOHbSXn!3;;*%tUAJ8;
z2M#$nsFj02N;y$Z)XJg!A6y72s<jO#PPv5|gwzx7jd#~E3gW<pk@n4dGjHD4@6GHF
zsyabne7X8j=|m#rR}}oAc+B7pVD<<lRH%`<kQW3(MJm<AyeN`&Lgj5jm3?ujotOAp
z2-d=ev=26M<Yh-nM~+b^Ex2;oEH#dCJ*Ok}hu|@Ti@@v=gX9HD@*)+sNnWBNP?<_V
z6-Q1h?!-HdB7I+HhGFWSbADb1if#vAaVuNG7SZ?y5{i=V2hsp3I7=mvynsPd1_^EP
zVNd#8CFXOZnJQbPG7<yMFA7-li%A@k4&~l*m6~zWs2%?pCWN6Ecd`cQXco_>7j~nc
z6zhhDg>oaMvRSq^4eH9Kaoctyw8e^cxna7BU9KC9Va%?)0lGcWl`W%IVi=@_nWa+C
z*5Aw)KC}#G6>irH*BpJb$m-Wvqhjc`RcJc)X2bNvO9iXZV!BbV?4oU0g;ODAnvSc$
zGPB#$qrzwS3g%{A0rDB?Czm_&ovHrZ1(?)+VgaUTe{PXW=gz}4ag><b+xTMRUj4z^
z!(1<Sn7GoB??wl3oajOIK|mhAK?v~LBT(T0H(2$?may-w3aAla>F*=r)t8~hD|Uco
zB{bUgxk}XMM)SVM0(yaGhx`{iXT{fs3rNN48pIgq9T;@Vc&|FxIdYCS3&UtXNQYdR
zvf?c^4U!vbI@mI<j6DJEW7wKq)~gm%VK*(YSyT#JEmkV(pj9;-%fj-eQYn_;23k!D
zsJCZM!8=?+3)aU#0N+Tg8{LWSzVs+E-=B<kvpd;)GoQbHlwA5|;p>IR$;?4AbC`Uk
zvv&9GBXzcWW9P<Wb@@PDK2%rk+uyanZ6BzYzF+%EeYL-s>a5*)x1XFx-4lgOU1sOO
z#n@F2TA%<s&;r6)EkOUZ1u8*F!HhRfHx3k5%t48;Lq;SmxpJvotMTi_=3p-^@+z`L
z;JwSmOUF0c@l$m}Sk9pqzGPUncsI5a+r9oMa>1)$cWP&9_twvmC7yK-u#9M$iFaOe
zCp4|zpsgD6F-`llRjdtn7}{iLle_E@es~xIHZ?<nSy(ebw#id5q+ESE9a0ts)1s0Z
zYNL)0UoiaU9y|w2e}8rz5$X_Ghrr&uX|OSL&=J3&|Lcb~S}&GOt!|jD^8L7nZ=1ia
znFeIU@L^||`52;D==PMK_VAgTN2Rl$xut)8=Bf`?9%g!(!^CBL<~+1z_B^^>M)Cp@
z4(tkYcnOAxzK9%>BzzY9C;-s`AetTO;12!<^+vtfFb&hThMkJqyb<_WHg5D;<m#}s
qUSq4EhtOLX%84Wh!Y}0F6Qcep&kCvE2$0`b!$P*x{)528ef|ZfhK3#h

delta 620
zcmYjN&ubG=5Pom>y|^Y#laQ@eLhE{37F(fslj22CB1H=7MIuYgzO*U(L*Co|ND=Bm
z#e*Q>9V+-2hzAe;5gxo)yo6Oj@ajR*gHRBh*>=S_%zQKR%{TAOyZZNv`>|Rr6R_=r
zm40dv@&l8?*a<jX7`cmVXnLhle2-E+GVJ9C(Ay^geMJ0%P67imTBLyq8Au*mda6Jh
zmOe0=d+hBA6If=^8xoJ-x}Nb+Y>80f{;U!v-N08pDMak?%<2!~fm#<q#$vIPW;`84
zLP}J~SUc_~9?h5%VPB!Vb9Cd{mCjuyr0VQMoz-D)y(^<tnQZ7kbm^w$`=FNk{%&&x
zw%pE_Tq=qj1e6QzF&WR!J!dbfW4i_6^myhBgz{H=cE3GpzluKF3-6y9OSC@t1i!rF
zl`<B{?zWuLAIv!m@9UXzTK_a#w5BaKPb=DGYqX(Xve%cJ*f!)e1bG&m!jn0UtYHD0
zyS4w`hPq9CpSv*qlwaJdBkNp2eM4jeaXwo@gbvTBu>OQh48|8HQzhOytQ*`pW+TUA
zS-F=)50hBLsmjkOZK&r0@;st{%1736lmwfhxGLQX(7{8i8F0T$O6fN;|Akb4vj%l0
I1YAD%7n53vv;Y7A

diff --git a/pythonProject1/source/states/__pycache__/main_menu.cpython-312.pyc b/pythonProject1/source/states/__pycache__/main_menu.cpython-312.pyc
index ab866129acb6916b58e576cc5914531f966b3cce..0516e0eaac6baac6cf4a43e1e14fe8f75af43cfa 100644
GIT binary patch
delta 1482
zcmZWp&2Jk;6rWk|u6Nhojg#2L4Ys>+i4wbMs?ee~v;qPF39Pt~HlPLx%h;RNslPO9
zBgG0zBzj0CphP2-1N{Rq95_T&;#3KNgv5o2k6Md@kl<2@LvVx;aN)hRW7078{`Sqx
z`<mZ-vp<e}nl!%Fb&bGij9*!d`!<X_^uorMlQVhm4YHu-6+mrSO=ylXn=O=Qt#Um_
zQN24PczfX4I|Hyu@)UkT-jf$^i*HhH(j)xcfU(e&(o6t_`>5(jb}3sdCPWZ&6=peN
zu2LvFQnB!cWjp?AF}rNBj9tsttONy}T9(zCf+N~ianVt)W=mG4P+qLq=+NZP2}|?G
zL0Tg}2ScsFU<>f!`0uI|($>{oKT-8t+D+}fsqdBO9;lHVn(Yq}1ULH@2%BVuu8_?B
z9)FTf(-r=jCn{1>Q~77!h@1z7CBn0w!O^Z8FhD2n$O|x&dovHry!<OVDl04mt9+L}
ze~t};)JffBM?hu+01acG+zI!%xM9Bputr)(<Llzv2EQYmjDGmYClk$yZ-Y~?qPD_O
zc<HU+@VfYp%EJ7va&&9ZGwBI7DGQ<ltW!5ggug7u=rLZGf1s`=x4fSRra*yV`s@V4
z8GcqV$IpX!&@>A3M(Dr%tXjRA=@e;<zond~;jO#M7c~4d=p_V}gxCFR5ZVzYtBC+R
z#Xr!7hYv>rCH4$}BNa;7s}?)SceL2R9IQORO^oZlA$o$3`8MKV*nFUPSOK?q-#|1h
z9{)*+ZT;nwsB{U+)DLAEqLe?SkMpGNrz$_IPp_(A<c?*6zl5A-DVVbt036}bYT<ow
zb~&N3Q@9|eGV?F8G%8#|zyulA#gS8)nTxNa9VL~Sd-n4DT-xblmTlECz5Zk-=m8;E
z3P-$dE!%K3=nfM~!hh3~@@d$xKjIN%QS%4x`OR&=`JJDy8B?-KjN=SwHU6Q=S6%bh
zi-j5+2a%macpPB{!OiU=N^|_z!06Zlh&HlfVjNu00yO%1^{ZF&aIvQO>Hf{fTuR}*
zz2ODPr4)SwrO@pE8+@9ERuA6ukGmcy@X36j4~NEncO$dI?Q{ip8sT0#he(@+U3&xo
z8ej3>GHx38l<2k+#an&gZucG2{veX-V|ape!pFD!M^+yK*}Y9Hf)e&Eiy<I|on$b0
zlektLa<Cm3f&!0?1m7TS!7IhuLtZJ~9+0Ia+8&@%nYLwF8g2*t(nvd^N#<TymO9~G
z^MuM)+>YtqC;Tij{1h<!E;?GSQmR(UR=H*~<k+=g*HFR}xVikTTqsrY^`i9zyAEqe
fs%--7dMKs85PgRP-G6k4ME?|1l=|8P(e>~zRX#m0

delta 930
zcmZ8gO=uHQ5Z;&UZg$h`=5J%#Kx@(xO9IBWh*cDSX#I^%OKIpqXsGE{Q`0uQO~8oK
zf*yKkg)oQ*p+}(<M2L!B3!e0#2vXLYc=0AFUOYLICL(>yesA8q`R09ZcJ_7hTU`I3
zX>I{W=;QTyTdC=9*g)<5;E}2;q1ejUY+-54T&m<5g|vnfXL|Qu2{7i1z+;C7JH8;!
zNl)3;j#^N_?++%}c8hvn$PuYI<{Y?^{;iz2lHr82pSd9KysB+6TeQsLyhT)a%NFEO
zG*$)p;XE4tVkFnZb#=G18z*hoh^>hm>Yh+fiPxL~9>l;VEy_b^at+p9J<Jc=uCFW%
zDX|NlDLcMnv?UV62$Ha<M*Rn=I&7*D7J+x_>3wQlcW<-KVPqs6Jc`rL+bGa>43-i;
z9*55zvEsqRl>H=vEfp4LZ<)N0Y<AaXRa@j{zHCcYdA4j~K7&FpBUlcEXiL5q?R%m2
zS4dfAxl+pIE8JS<-7w>+p|D?`F7~qS){=~kzymQ1FLVP|bq`ZuL%*=1V20+X3iKr8
z3_p)+eh$HQ43!E`@D5W6mB+~;rgPZ|K0*Ok2uKjWL_2aiH#$C@v6Xag^5Rr>GQ<7o
zZV9)=J7(4TU%9PSN^^KKnDHK#DYdl;554p7+dJIh67)VEMql0u6Aq)E_I+o`aXLi2
zSuB)!FPc0>FhFpMpec#EfM15`Kz}fUrbYb}ZI>zwwSd8f;CbMwi;`y&Duj&q${`|Y
z1Udm#l+$56i?Ag$h3xl=N?ro0nMEod2@QuV^)`I6w7?nxCM~gsEK9M5uS1IOMch(!
zpH8H930sXt-OXkCQLw!}8Iisl<RD?q!~Q5|7MJHLMe{75K_4}`)dO0nOFPb@4FRDU
F`xltbztR8z

diff --git a/pythonProject1/source/states/level.py b/pythonProject1/source/states/level.py
index 0392de0..3ce37d8 100644
--- a/pythonProject1/source/states/level.py
+++ b/pythonProject1/source/states/level.py
@@ -2,20 +2,22 @@ from ..components import info
 import pygame
 from .. import  tools, setup
 from .. import constants as C
-from .. components import player,stuff
+from .. components import player,stuff,brick
 import os
 import json
 
 class Level:
-    def __init__(self):
+    def start(self,game_info):
+        self.game_info = game_info
         self.finished = False
-        self.next = None
-        self.info = info.Info('level')
+        self.next = 'game_over'
+        self.info = info.Info('level',self.game_info)
         self.load_map_data()
         self.setup_background()
         self.setup_start_positions()
         self.setup_player()
         self.setup_ground_items()
+        self.setup_bricks()
 
     def load_map_data(self):
         file_name = 'level_1.json'
@@ -54,10 +56,37 @@ class Level:
                 self.ground_items_group.add(stuff.Item(item['x'],item['y'],item['width'],item['height'],name))
 
 
+    def setup_bricks(self):
+        self.brick_group = pygame.sprite.Group()
+
+        if'brick' in self.map_data:
+            for brick_data in self.map_data['brick']:    # 遍历得到x，y坐标以及type
+                x,y = brick_data['x'],brick_data['y']
+                brick_type = brick_data['type']
+                if 'brick_num' in brick_data:
+                    #TODO Batch bricks
+                    pass
+                else:
+                    self.brick_group.add(brick.Brick(x,y,brick_type))
+
+
     def update(self, surface, keys):
+
+        self.current_time = pygame.time.get_ticks()
         self.player.update(keys)
-        self.update_player_position()
-        self.update_game_window()
+
+        if self.player.dead:
+            if self.current_time - self.player.death_timer > 3000:
+                self.finished = True
+                self.update_game_info()
+
+        else:
+            self.update_player_position()
+            self.check_if_go_die()
+            self.update_game_window()
+            self.info.update()
+            self.brick_group.update()
+
         self.draw(surface)
 
 
@@ -121,5 +150,19 @@ class Level:
     def draw(self, surface):
         self.game_ground.blit(self.background,self.game_window,self.game_window)
         self.game_ground.blit(self.player.image,self.player.rect)     # 将背景与人物化境
+        self.brick_group.draw(self.game_ground)
+
         surface.blit(self.game_ground,(0,0), self.game_window)   # 渲染
-        self.info.draw(surface)
\ No newline at end of file
+        self.info.draw(surface)
+
+    def check_if_go_die(self):
+        if self.player.rect.y > C.SCREEN_H:
+            self.player.go_die()           # 判断是否掉落屏幕外
+
+    def update_game_info(self):
+        if self.player.dead:
+            self.game_info['lives'] -= 1
+        if self.game_info['lives'] == 0:
+            self.next = 'game_over'
+        else:
+            self.next = 'load_screen'
\ No newline at end of file
diff --git a/pythonProject1/source/states/load_screen.py b/pythonProject1/source/states/load_screen.py
index 2f7244b..bd2280f 100644
--- a/pythonProject1/source/states/load_screen.py
+++ b/pythonProject1/source/states/load_screen.py
@@ -2,11 +2,13 @@ from .. components import info
 import pygame
 
 class LoadScreen:
-    def __init__(self):
+    def start(self,game_info):
+        self.game_info = game_info
         self.finished = False
         self.next = 'level'
+        self.duration = 2000  # 持续时间
         self.timer = 0
-        self.info = info.Info('load_screen')
+        self.info = info.Info('load_screen',self.game_info)
 
     def update(self,surface,keys):
         self.draw(surface)
@@ -18,4 +20,13 @@ class LoadScreen:
 
     def draw(self,surface):
         surface.fill((0,0,0))
-        self.info.draw(surface)
\ No newline at end of file
+        self.info.draw(surface)
+
+class GameOver(LoadScreen):
+    def start(self,game_info):
+        self.game_info = game_info
+        self.finished = False
+        self.next = 'main_menu'
+        self.duration = 4000
+        self.timer = 0
+        self.info = info.Info('game.over',self.game_info)
\ No newline at end of file
diff --git a/pythonProject1/source/states/main_menu.py b/pythonProject1/source/states/main_menu.py
index bf5d9d3..42ee015 100644
--- a/pythonProject1/source/states/main_menu.py
+++ b/pythonProject1/source/states/main_menu.py
@@ -7,10 +7,24 @@ from ..components import info
 
 class MainMenu:
     def __init__(self):
+        game_info = {
+            'score':0,
+            'coin':0,
+            'lives':3,
+            'player_state':'small'
+        }
+        self.start(game_info)
+
+
+
+
+
+    def start(self,game_info):      # 使其可以重复调用实现重置效果
+        self.game_info = game_info
         self.setup_background()  # 设置底图
         self.setup_player()  # 设置玩家
         self.setup_cursor()  # 设置光标
-        self.info = info.Info('main_menu')
+        self.info = info.Info('main_menu',self.game_info)
         self.finished = False
         self.next = 'load_screen'
 
@@ -42,6 +56,7 @@ class MainMenu:
             self.cursor.state = '2p'
             self.cursor.rect.y = 405
         elif keys[pygame.K_RETURN]:
+            self.reset_game_info()    # 按下回车重置
             if self.cursor.state == '1p':
                 self.finished = True
             elif self.cursor.state == '2p':
@@ -57,4 +72,12 @@ class MainMenu:
         surface.blit(self.cursor.image,self.cursor.rect)
 
         self.info.update()
-        self.info.draw(surface)
\ No newline at end of file
+        self.info.draw(surface)
+
+    def reset_game_info(self):   # 按下回车重置
+        self.game_info.update({
+            'score':0,
+            'coin':0,
+            'lives':3,
+            'player_state':'small'
+        })
\ No newline at end of file
diff --git a/pythonProject1/source/tools.py b/pythonProject1/source/tools.py
index 11eca67..173cac4 100644
--- a/pythonProject1/source/tools.py
+++ b/pythonProject1/source/tools.py
@@ -14,9 +14,11 @@ class Game:
 
     def update(self):
         if self.state.finished:
+            game_info = self.state.game_info
             next_state = self.state.next
             self.state.finished = False
             self.state = self.state_dict[next_state]
+            self.state.start(game_info)
         self.state.update(self.screen, self.keys)
 
 
@@ -25,6 +27,7 @@ class Game:
             for event in pygame.event.get():  # 获取鼠标键盘事件
                 if event.type == pygame.QUIT:
                     pygame.display.quit()   # 退出游戏
+                    quit()
                 elif event.type == pygame.KEYDOWN:   # 按键按下
                     self.keys = pygame.key.get_pressed()   # 按键状态
                 elif event.type == pygame.KEYUP:
@@ -32,6 +35,7 @@ class Game:
 
 
 
+
             self.update()
 
             pygame.display.update()  # 更新屏幕