From 0da2608930f430c37ef1be97921985bd5ab0c5d7 Mon Sep 17 00:00:00 2001 From: Jian Hu Date: Tue, 28 Jun 2022 09:33:50 +0800 Subject: [PATCH] correct --- docs/坦克大战笔记.docx | Bin 78631 -> 78639 bytes .../course7/abstractFactory/CircleTank.java | 5 ++--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/坦克大战笔记.docx b/docs/坦克大战笔记.docx index e73a90215bc365d9b8794ff315becdf49f48c3a1..bfe337db16ff8462006b195558d2a1d8eb1f2571 100644 GIT binary patch delta 12579 zcmZ9TV{j!**rs!0ClgL=pV&4hnb@{%p4hf+YvN37Ol*5%8$0i}yR}u@zq;$G{?T2H z>%O1vvLnd4BglFtIJm-RWED~{upI0pZa91kiL9$HgmZUd#DjePERC+D+f@(Y1QpIs zOFZ(wZ+l=c8Z&6NXJTkj39(5GSoQNWoLPurFCD9U@^u?L5hW);v(2;;(*cw_-o zO-7E8u!i82L`c!uiUUhSzv*}0rx~YOcto>>#|_yS59EEl~$g%xv~MLLUk305s2WTUOm zU12b!$z!Q+WTwDOSES?7Qm1zbs0BRNnpqZQYMQuc6zS;~wHdjpqf@ZS#NZ>t>KDf} zEZEsL3@n1&%+$$aMfZziJNSfB0yp?{j2WV>XozXh69QPtq{(WKhJ>TQ_+Wc?gL%QP z^?RwWcT6e-PBQ%9y#^lW-z`{XkO^z)a;T-rn*Yg+=^_f88j>*!a)mv2HYHAKRVZC zTQRE%Dx|SEZ8Qdr(C@g9(>Cx)yzILYZi}f*DX=>r86yP zHU*6kLJL^7LHJ2;56kDnVxLF9KK$pAuelltzuLR^Ab{W%kzM5uBLJ)x&R&tu50DKK zlgxK8TrDVLl9VMmeqYTiyy91yLS$IB0^Oj;NeJGi#XX7Oc`XrpM?9yVjSB@!6^?8K z!MAu;mGoqCCD=tq^J!s(Bo&cBYG}M~0{X%*yr1g6CtSsGblx*4a0^HL3YHAmwN*qB zBl*UMV@%Kc@89pOH&O{Y@$dMOltApt)O76S4+jn-@y8f9y z<8mTswYw;f-Ntt=D!8F(AE2*?Vhq`l@Qifj0?en93FGwZo0|`Btjf@hW)^CC24%Tg zcdD+eSk@@`>!!dTG>~(UuHH{aHo{cB4e7tE=EB_2+Z4i0F{?MdWI7*0!9ZQ8Z&*Ki z^pgF0`2j86AMYvMzjs8T=UA$)NmTn;P$zork^-=eu{Z$U8n8U_rS7>en%)M~p^0K@ zgCeL1eRk-9$F8i8^p7FlDyTe9OXovry=2p7dIv3EM?l|u66AJbaVYMBfD#QLas!vm ze5^?Aa^Y;xaH68|yUk?tJ*YT$n5Ci2r0`C_c-tp1dSD~y>S9RWS4uPzxw3Mc`r(IY z*V0yo^#$8*Eh{<=5|eS&@@CHA6!MU{CZk`^K7&wGl#&=IvWGINj)>ZWZ|ITkHSEGCCFYzP2L9I#U1yW2w5 zigV=2wHvGsNTof@D_khmRcMG6x(gYQbrd zMi;hz`Cn(p5NY*eB7ZdIHotz|UVYt6aqF`UvWBk^Zky(x56c0I>*K9j;*}6YWL{qD z^bMIqhEz6 zy;sK%CMxo0pjqd&a6*~0HHs(kqxMq!nxiG2#-+IKd5d&($;mg zCY4uSy#4QNf%Uc;_It)X zaebTWJ|D*O{*d@QB%eFl;l6fp+c*3iqPqSLgp?O}PS47LmIpWP?G}?XTNRv4$<2q7 zC(8STSVOqWAMWQxpRSV+kVdA<)Rc@10!0dl5`}%$+O7RL-YveH>~Ov!qXz1SR3Pb6 zj?U<$TM@$}ieihl>J~&L%D2NU0$?K=R8*So{|GRytgl{Rf=Sp{pkbPE+OIak?B71 z!W?pI<@9_qKvE71oS4fRCXn98-w1U{){Q9r<;c{r!va-~atQY=CSyrleXX}j;pWul z23|&IrXK@!T#JRps#q5qq(CE-^WI`IWeH;d22&hK7?6z%CW^2U0t(jw^ygq{ zgn~ba)dr?40sJH%{J9?QRGu!k;N-AtDx3b1eAZ{PNOus=Jgdrqb{8H zJvRDg4Xi;gzpDrsRZr{2zpX6|++2c|kdc|jP540xDKm!;W`%785bBGLK82e)=T!1S z+rSIe>IWB`Cj-QpMR@pAf}{oF!Elj%Ho&6e@nRoYx`(M(Vp$om@7n<9FX!*Z4#o$OfX>0ZPsRDnv;?mE9Fhy?y25V)Zf4n^%WDGNQz^55jlFl$^}a=lbFJN~>2aC*?g zv%+U&G15q3T3}k}ki;a(F@7w22zJ!`n#7IC@LT$#0VNuyIK=lE^ctKLR%C4J^DbjM zE&GcE_~eUAxKkcqtaHK!$DTjJ&yb25lTpE$Te7y^ueJAdur`1b{u2C5?Cd_0jDQ8l zOdJ{*+VOJVKu%Hrqm)fvAC}F$S>~0is3Fdm&DrAq5M9oMF+wn%zS-#&srrISCF;*n z4^e4XJC!f1R?2ekd>9s6){WH#h z`hYLN>r($Wi=}&y{e`JI)AJBh49E*n6R?NkaS;5vaX`jO9(TAV?|PmvX(_Ueo1VMx zLF#Kq6`aD_yq^J+I6}eS;E!ENZ#Mz(YTBkR>P2I9ma%ZVG0Cz>-mDnnk!<#6i$%aC z{|F|3azZT;@lKZ=uJPY+h74>Vu?$+?1NX%I>SX8p8~fY-gMc9V02|p&7x9iNTDEK( zFX)1fNNIn2IFUJu?EHoIalw6h+x~F*9p7w9DH6!UrMP-Y?LJXGM67HHB2Z0w=kT|i zd%~lXE|Vo&;mkV_^bvx?wUVW57DbnDNp0mZBUcQr*oGrX-78lpPw1ufQ4(Rq;e2N5 zfQUHkSpIOROXMX|CBeDoc3DB8zo5(QXPcfv3)_e4N9Vw|O@Ha5h$# ziO9s?R=wxa@YrL8+SmlG#&~)=A~#6K+(9ul5gRS;%eiuBKW`zAH;`7uD?uoCXv`Xk zuVbRQxc2AvBV9%w~+c2J3nG2n&J{%vdWVwB2fm3nW8+9XUP zcKZ*kgV^Fo{i+88`G)H*#~@_yKtCrd;}(DHUT$Pe*x9}apk1nimOw}tAq5bD-6 zm=msK(0ioL>5cY9qAH#iXKA+~M=Y;K2e8l?{k*nD>%;ft$DlH{|1J7AR{_^{lInLE zRz3zvmve)cWM*4HrJj}R(~bbq63&p6iWH?|E}TvHgV4%klk0KV$n+odY0!4Vhw8*9 zF7XaC$4-UEVQn~rS>!))fWU5hQ!KE>+p@&=IPtg}vb77rnaT1rzkQDKXRUPJBRVb! zY>RtU`D#rY5+8vc?B$^u&IZu5++MgAV8iHUfuxDtGxnP<1FC&zw9nzPW;Kd2VM0+N zO-N2MTTwKySOLkzdU%3-1;l$rc!f`B(BpwOp#yZLdnp?J6q>|&bC6&wb$>C6Ac{F> zXg4aonP9sdhug{C`bPJ%7}t(cb>hMBZ>)X8UZXj4k(uQc zIhm%Ytr|2{nnUU#(povEAPC6+s`{h+i-_;qJ(qR@mX;tf(|d*YpGTo%qf$6+Ezi-k zcwEuaRif9H?);?oIZ!u!q3$p*ekXs(g@JRXg~Uflx;CHj4_L*xOsHS{1*sgJH1df} z>dAtNjF3Tl2h(@Ti zCuX1XLH`(&eD3^Z`yzy0kcK)vK0j2{2ZDQ*37;9i^Ly;$8}{SE+dpWBz*+W+_CGN> zv9H$Hz%J>ypIk4B094bL(8$2v2{#5j8v#oil0lcqB+9ski0Ap|OH~_l@+Ih_`3jOr zeUtzQ99RRvRb@t4dt`T8*00A3A{dHl+QxiByA~{CB;%T(hNBw2>7QIE<`bzxejX5M zCThp|WJ=H+jOnEU=7T3Ihsfn&s{D=Dc(W(*yKiq;E&oq%{;p68&+NiQ-C# zAs}3?A8_&|L=!3lwJTqVvW1<;3!32O7`a5_ydIr-y7gUCgk$6C-Si5;IX~FlZdO zT(EzfZlx?xv#Lu^zD?hEefSWH-(lThq4Bz_yXS7cIeQQJX=Jcq|G1Ya4BaT={i#nM0P>gPICyw6Z;|&vrSXI9Ns2Q1SAU@VvlluGja@zGE2$6ZS znormm#dd-Y1C#GSy2JzFO;OuR68@E+51^_x<^b!4c7-IEnQ+?Py}MdN0rDQ;&PxIQa^CbGm|m~BiV zlOeNxkvj$W`C_j3lJ4BFMtlD8BJ2)IzVGqlWQVWuxSuo1MQh{o_F7dOVDh5fG&vrj zfN}yt@H>&|=v& zer?9X`LM0`4aH6@sVFzdeY;(j?RXN1r8yQBUfS-Eu3Ex`HLD@^WYhM1k0So<;-CG) zmrXrfjr!QH_1TG{>9D^GOzdS!-oWgq&W>cNqa-V`B*S@Ai$j~v$=JB~dp=x~^L8gN zGg28i2=9~RJfQo2d*03lDJIec+|RGh-GZy(fC3o)x;C@$W|~1l z9cQ24=lmcK>?6@JyE>1<5O{;e0{N#Ls;i5|k@oeo-X8!5i9gRm)S=$(H##pBEK(4ojXs1hof1dmd2Fc0d7%Kl4%@Z>zv6>sdmZS*E{r zZ_wk^$c}&)N0w&jF_GFI3Rm8%1ve|ftIMKgUk8;6rUq>L0aZu~y+4cGf2C+-xu`n~ zUpWk!SpNq~|0P z{yiXYAQa=mASM|*TW+FNYBAo*5FxAg0#!ocjkLU_q&=xUP2X3qGG%7?5zc$pJ6U7)kLMKln4<_t zqt|@Y$m5|l(CeDG^9BKtP3!$PnmljP-Qxw`31K9CK*W!vS1v$nihzd#WEPPsRv@!4 zNp=^8agBLHs{X_Z!bAy9bHw|_Q+~ON8~Bk?#(U?TBsBjqj24hAQnq~0$4p5TQgf%k zX&}jpfVqNW^eOEM8T>05Id@#akoz2jJj={M+pE&@*8^{c`E6>er`}%wj=yyjj&11H zDa2Y5q8?J*{TO>GOoNC}o$74=m25t&eG$(4^Cyi1boj=cHe=fYy~ITBW6bu&BBl#G z0UJN)9f~i>n>}yS%k+yY!#gWLal$STooEzYq>$E`t(p4={VefV0tvq;q0FR1gSlsj05#-|bUBl<9>~Q<7BG;Qvw(tETd!}YApc_wF)L(!#x&^Ap}H% zz^Rc)EV?xYv~O$iPo0t-9jzdq5^uenB}&=$Sl67ilDuB=&v`c4{s>o_&c7>54e*Zb z%k8_@te{Pqp!pQB-ZDgWnM6AE+Ix&5#L!>irp0xSl5-tqs_-){{DvIR%5cJ&$rK8-F-Av zeKZug^lHLSFt~QY=iouWp+HQ8B?ifO=R1h#cUmOmf&bcQeLMi21^89?dxuA3&vF@C zxF4ZGB3#sJ>9zQDio2+)0_!88P?5+>iS=6qt!_ZWhTsbWxTr@;V*oFgKSgyG6BOmu zwjS}!r@)n@-I2uQTBx)6u;=?s9OlGq;-KodMrcuRKCa0)$Q1Yofx@U&Ww?;n?m}bO zttGlT8h=%+Ie6{oZfQ`gspuq#pYytkbO>kf{&*lVtmtP zXL!^%IS+PMuCC-r7Rf2HP}6J(5vf*F37^dQv87!4weWTxMl>rXQvm@+U} zq48T!CaQ}Z6FXmqLgt0Q-Ey36O?lL1WKP8wwH&Yo&aB;r&rE&43`jC#Gx)<-;*oG9 zwRDxq))mu=vetLWGpBbDJeaH*nxw#I@&ivBL`LH&{(~YS!SeS5{ibt6Qx0wfG+{`{ z%Z$7~Tp;<7>IoGOKALA}$ji37_vole{MP0l1zaAIxoVZ>5Z#Xh{w^xQN^kXH^eE@I zS)T8un9xuNi|UM8>f$ewbY#@l^I;^an#mRLuM3mGL`ELsYpQ>xOfKY_Z%61N)D#SU zgF0cd^q;jik#f^4QpxDl!mZu*g;VLG74Wl|c|vFsBc9i=nsd~%g+&%g97MSwvfyP>1Q%Iig+Ay^Mn?CG zg*HnXL+Rp17Sbp0XA1H)^b;f%?y-r<(0;Q5-HYuGlEw`xQTD~h6hZgT~ z@xE<8#U}$fKQ^R!*0Hnt!<-!)E{UH9;_{XkXUk^XOqKJ9n#^Z!6w9%v8msN6DPg{Niu)XFthnHEos)K$jz!^6Lr-h;o}X<8rOXEuU2zusRnRKCex3 zK3eK;p6{N=+g`ZXF#cZMdt?C!3Ltd?|ja^&{uZ<=2g z$#%~_Wbi*@;&$)21WtCJxevn`<(dRKc-Mp7gabt2BqT=4AW)a?>a#c9eKp=nFFPIM zeOlUcAH?N-{&dKdS282fS1QDR2f3Sb+BTFzHWJ}jrtWsEsC}q1=RHh?Qu@+bv?g9H zX|@azFni9XPUwrSr$rTJ+D1YlU6iqulvTLiO|3O)X&=TP5u{`!5czE6of)5&lkzPw%wJZ(lAx>&cxq%^ke+__sG z@@@L~cu#vsl(p@gpwDP40nuN|-bqn3RXD|ipBWKQA_=GjMVaA18{4nnuKR+B)2nHS z&OXmVa4TI7;0#rIt9$DDcYK;|f7CzRVp>*^$0k92bwGkBh04QHK&3mK9ovvZ@QrAy z3q9ryv!uUiIk8RGIWA1nd#stA!k*YNoZ^X>bv8=nwmHx8E;;GeKzColMP+gOma9NN z`nAjJ=av7SZKZI3r>N5yxdEVT}d43$d`?TH`J(MeJ3Gj8%*dD(bh1p!u0?@5Rv0W=hc?X> z`jkW$_94_by89tjgA~+}8Y)S%5$7^4eX=~)ggBCYAL`hqj5#(ayo$luFOr2;$U+@3 zM|!6Kev4AE^OFWI9e+)Qn_-^{_0VxkQI7?MzAR&`LEoB?!b4CC_RQe@M68&3ftq4A zdH{AQ))JW?q<5VB#uQUl9;C*EF#vspI$#>?YHM@|DFI~V!i_l$6xPjRi);u>S7}3> zkhnn~c#fbM(>l4i+38^l++R6Zao-a=fgHywD^{_X=OSC|%Tbb1gO|xsV6&ih?Z>Eq zAx%`Y5GLOr7Lu18MKPjgC;8c%-sHj+KU138M0J`C!c06?0H;%l?F6ICh$%p>-bH?k z{YAPzBS4-W!E|d9mYAq-s9Pq&i|~+2$#OJP8vO6|30u*J0o*9`N}aNKaOk77GY!&Y zcSYG8QbM#iR$Y>G0dP_(qYw+~Xizqa>NQB#`U6trXn0dX0zuQ_0vP85c^8|6p{Zb1 zHi-Tkv_D$aM1`7S(e;y58Jd5Kf@eg{!E(?cxou&P>y4L6DH~n4)_7x}V`Gpj(7BJV zR@SqcZTiNOw8FtiOcJNG;WXkjJIT%=EYbTR7}Lq#1@fDGZqcqEAGW-S0HgRpzFXHW zv}FCC;9CV40rd)rhF*&gj3Wa2k^{K$q6Op$5XPe_vv`a2x7J`~<22Gtv5HaNWW%Hl zM~YcLYF%X@aou=P_Ay%ZK>4&~9RR5aOO1;9im4*m5bY#Jx+p}906vNP!3~)ta%oJF ztx@9;DEi_*v=B9hp^-HtfK9j>rc_>NN8rKu!)e_9+n$-T z%Fb;5?#ixW2wBt!hw4OkiJs3XjfNL%6g$0^87tU}9??q|w1p-mI$Y2Ni^_9&gV@~{ z?*e{6<251Ss_2j-GC0B`mjIa&UbFyaJptThIVKL18lkx<7)_j376^}DQ1LEQA$jx2 za*kUnXv#K*k2?5Dy^%p^esI#W^e7@bP+SH>)8ua8n%5YRQ7m18R}F{PN~f0jp&;9jw@#zs=s$2qxF|51>y zb)sEET!c#TCh3MjI|*<6ffnG(7FEt4FT^ngY0M47GXs>)P!-}3aUx^|89-SfI}wn) zSyZmgmGuf};feG7Gt}kCDSWhxV;)&5$&Y}&M?B6QLn-t9A1C7nCXeHB`n52P5hQFCPdHFNYE zn2xIg?M`PRnecyTVO?B28~Y8oenw&--`QdXye)gXREr@dOU&>H}LGLtU9Hu@#)h0#l%Kq*wyH($yj;85+4N25`StW z{2iWtxshh5m>4&CxqLV91oMY-uJZg*rObK^47@@Y<;7%XflP^8SK~4suh8~`1AyH zu1CKUoXC8KUMlqNB#lhcW5sCn#pt9f5b+CfX}vDEOW@;6Rn{3~i-q8U-zzR=liN$4 z`yQKx9>*xr~qnjGZPm%#5L^> z!sHb(;=KLfZHN#M5`(B9hD%ekiTj?KP1POtvjm5Lm&elg97E~5`$lWcti#!ZGYs-e z7m$&=i?|IsGl~hWQPI(}w>6SO@9A^S*cY*wN*siwTMsYnclFiWG;B=uJQ%rF)cEVK zkQ(NVGC7A8jI@3x` zk)xmngBPIh4nuf(CD1PxIxbP>py1gGpSxTDPJr|lYmuR{UjEkD-XU^OjSj*3)ZZpW zju`Z;FR~GETGpvp%IVR22w;2FAis+`;x!*aNy)!jk0elG8z;e=A2#UaAdhb3u#onS zgh?+uTmhP}lcRFU;|KOZ>^i%PhPZ6cZC+zGsoJ?+GignoA58yb|5Vg{W1yBqIzlgm z{*py0cx?S}d;h!3oiX(>w&RDFT$(XihsCP?0&OB`^aIGoHfKqVPI7qyKl=!EqTd>H zl>84*dz9n$gHjd`tBdV53ehFAn7YYd@Y04E0qg(o+d*0-6F?qNoc78D5CL$c@iPOc z@&12h`A=N_pR$tX&kP{P`=8AQ00T<`|KHN{|AxW9p3{1m0Rn)yv`=P$AfP`@fCV4~ uphyF;0E7V{X?-jJQoR3JNdG$TK!Aav{=c68YTap{EC4d-1;&3-u>S=b3}4>> delta 12506 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 kK>>W1$ua>V1zqH!E8>^%G659;M1& diff --git a/src/com/demo/tank/course7/abstractFactory/CircleTank.java b/src/com/demo/tank/course7/abstractFactory/CircleTank.java index 2bf992c..af4c51c 100644 --- a/src/com/demo/tank/course7/abstractFactory/CircleTank.java +++ b/src/com/demo/tank/course7/abstractFactory/CircleTank.java @@ -23,7 +23,6 @@ public class CircleTank extends BaseTank{ public static final int WIDTH = ResourceManager.tankD.getWidth(); public static final int HEIGHT = ResourceManager.tankD.getHeight(); private Random random = new Random(); - public Rectangle rect = new Rectangle(); FireStrategy fireStrategy; @@ -58,8 +57,8 @@ public class CircleTank extends BaseTank{ if(!living) tankFrame.enemyTanks.remove(this); //根据方向绘制坦克 Color c = g.getColor(); - g.setColor(this.group == Group.BAD ? Color.RED : Color.YELLOW); - g.fillOval(x,y, 40, 40); + g.setColor(this.group == Group.BAD ? Color.PINK : Color.YELLOW); + g.fillOval(x,y, 50, 50); g.setColor(c); move(); }