From b3732e2aab832a2f38e11bb522cda5458feb70b5 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 7 Nov 2015 01:27:21 -0500 Subject: [PATCH 1/2] t --- Assets/Animations/megaman.controller | Bin 9944 -> 10288 bytes Assets/Scenes/XavierScene.unity | Bin 19188 -> 19188 bytes Assets/Scripts/Animations.cs | 1 + ProjectSettings/ProjectSettings.asset | Bin 41793 -> 41925 bytes ProjectSettings/ProjectVersion.txt | 2 +- 5 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Assets/Animations/megaman.controller b/Assets/Animations/megaman.controller index 483473e393eec0c529e59ce46adedfd3123d073c..4769ef162266f4e512186ed0a88235598f7b5ef2 100644 GIT binary patch delta 490 zcmZ9IKS%;$6u{qice*4g8695f-FK&AijLyeeZkEmHv7Hz~}+w3IGr#e?S(N^TmAeCUKWy z)A*F)*^bf;i~J+$5otvcIv$JMchs*r41ZG^A2NV?04eSGh%He&CUvzuATLNAT>4Z& z251B(xbr980v9qibWMsW*wVGKOKZ49R>@ZX*EuYndL)DZnt|GtC2yEkz zu1ei7&KVuNHVX3lOAFtOMRa%sXZbFZaNATF!w(~lL(9ZtV@75SaD#7=KZP-_-~->J z|6tCv3IE~~{L}Psw9T3*pPT!_M68Awf^Dnj*^yPEuBCKbrYqxWCW%gZL5#g^rfsHD mizkx{h=A^i_n8&!8jAP+C{x$Y)&TZMed+c6dx;3$tn&x?18+tE delta 419 zcmdlGaKl%UfkB~&fkEvC0|Ns;kUarNGnncb=^1X6+$qP%Gx@TdBG)(m32Y$o3k;K` zSszjX0gxC0GO-z_L=XS~fIw2XHo?uz%)R`GmO``8L?i|oBoE~P delta 36 ucmV+<0Nelcl>zjX0gxC0F|iq^L=bU3%0E)LHo?uz%)O>(1VOXVL?i|zY!A@@ diff --git a/Assets/Scripts/Animations.cs b/Assets/Scripts/Animations.cs index ef4ed7b..a7b1a34 100644 --- a/Assets/Scripts/Animations.cs +++ b/Assets/Scripts/Animations.cs @@ -36,4 +36,5 @@ public class Animations : MonoBehaviour { anim.SetBool("isShooting", isShooting); } + } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 2ca7e66652723e05e32c33f3229aa3c9019ebf5f..490011e9858618e2499f738442d73b84144429be 100644 GIT binary patch literal 41925 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 P6gmk0-8k<8#DDxBL;>j6 literal 41793 zcmd6w2b^40-S_V%flx%6N>hn6DS~OVh&Wr4u&_y%?4}?kOlD`ZLuO}&DM>cA0Tcuq zh)7e4AcBZW5djsjfTChS6tNe?MzJASd4Iq2|KI=IbLSqP=XpQR=l#4FW_RX$&;6c$ z?m1^>CsB0ChA6tGH;SU|qv(?J@jE*7khzD<8J`pV`}yae@96t#zj?=uDEh^IQ8bfR;5a;r+6e!=d(n=f9{hLR^r(GHPt-{(Jvs8}E-N8p+&z4MTz<^&-P5A>We7v}4tVfD`dvD&$8)B0N5_O8g7n;s z*Ualq#(Sb4f#0QkXZ(($SW6hA`w9w~l|@|ULgDav1#;A}sqgX90` zwe{X2{!(O^1V}h<}~r_li-YZPjFlk z?VIBBm7|NgBTnbA@>iz#2Ic#w_$A5@Nbx(BADH4_Q+`m2|6KX2$a9@?dtUj$sqi~v z0ARijN%4b~zdFTVt9*8fAFmw!*d1{>6qV0S@wX_Sm*VeHK0n1jp#0Dj|D^K6Qv6HG zFg_GoM@x7VcjEagX~_#EZ0P4T75k52JZmA{TW zC+Xz)+yuw}MDAev$%@fE`PYBR$?8=a}&1c#E{T_~Y_9R{cvT z!4dOuOE#@;=NXj(3*wRfM@tIu8eDIj<(i!SKg{t;PdUL?;lo$)~yW*VOZRavU*l zDnC)M@lDE4O7S-R$)W1LfwWe?o9q`b!Buh4#;R4%)vc>cJCe+xMd zhA01r^0uSGnf_h3lJuWJj+5#3b|!FE`p+VF4?q2HH7@PsK=>K%ZFumA)8D83Y{AA? zD?ca2CzQWE#WyQIH^t9Yeja%)LaXYDaBpp21I~8!4sslEd%IWpI~~ip^swB%to&Ur zw4|T>`^w*);2gJ~0%v~Tlj70V!p~3f-IQOD;s+^zZ-O)4*MKwq7bZCGcSGRp@9#72 zuP-hFm-?FK_4oH1mvzb-^;{hATw>vU&!xu2Go_x(0-nn)yzlvdaq(QNo(~2*S6F!8 zbER?dd|W+O1w2<#mj z0-ldrc;9oQaq;Y@o{t4QH(7Y!^Ks+i$*JcP0naBbyzjZ$xQthMc-YQwF^~9L>c7>v z-_CC{kMIAKaq+xMJ+}uupSJM6=MLo@PcV0CU#IE3GvVR=>ptaonWra08*6`6`DZM= z@SiLHY=U!qeg>TPm(P*6*@yl4z}>)EB>Le*ZK~*du-|LYdvgyhMP}riArR=-vyWS`~L44_x+EM z<6yjh#FcUSzfagEpXsIZQR7>A>HGmXjvnl0VK2lyKO}6EZ|%wf_XAfxKQg|J=l?Od zl*6{3ANNE!_}JDfho2f3|2AkVEQgAs z>@hre#PhCwmH$ex>*{%i>@?Z+Q~W|BLYE%V@c#e+PgU7@z6xgKKb(^|+mJ8Q(Y$V|#cZI8SkW zOWp^!H$KzV`#3xdzk_+C{3kX2JCe8Q@ymZF<9_+?Y@X@SS(<*<2`%hZFgIxrO)hyQgtKzq7!z^2_%tcnR-!$0KEI&wRa?acOT)X!`f&NgO?q@88F` z-`@63ar)UF_A@T!_Gc}(SCZ%GmvQ)cjdy?YHo0GJ2Y_dd!v~V%686(%z78_pV} zzEH-2S21vg|6t>Oy&OW0gZ||G{nZv;>LtFv&o=It+Z^z$dYMb^{C>U6GcNx4{yv|9 z+q}m2AIk7Ka=%^7s$bKUtJAa{O0 zJqwLXemAIpQNX`A;OF~w7rzW$qCN+)xO}oFZ2Cj zDIb6Svj$w!Ui$&hWeU^K;@!uD|N$@yn-ST>O7he>323F?@!9gL!=aM&sh2j>#d* zXH&pG74UC1kMDnjajD$t?do=LmfPFN+w}YG>TK|=dO3$2 zm!#X(+l@=TJfQw_892j#9>eFvlWbS-Fppm^?=&v{AE^Ib0sp%L{`Z*2_n&WE{J&TK z1p)ti1O5xmSr1|3v}+`vd-q&ExwoF)rwp-TwZs4r<%gEd0 ze!X8#Pp-ROK45-7-VYiV{{ia1BH+I=;J?Z|zW-|D;$Nix4+Z?!1pL>U$M=8OxRl$8 zT5i|Tk0UO(DUJ6dvQzvy5qgu{C>Rm7?*g<8t=XIc21GzdzvrvUz;}SBy)(F4lZKKtGN+UmwzVze?Wj&ezxI$#v)J>*n|4ebBhXdyB^V z4f=5~Ubcq^lz%h9*=~QT>G>9UyE{GKra#x6o`=Yt-%rnXj7vE`tNw=>IK%&4hR^VS z&pf{W5#!?DerM@--w*g74fuax9^d~%{XYu$e;n}t#5}(Lr^dya@p_mp-vs=>4fua&9^e0ayX|4BcNcpQ6FkzZ-OvA(^7md<nd`S5gDV|rpWs0|y^Yhd^;&M0#ocH~$$lK(8IcyD{ zRSw&bJC9!u+Zva3&4utY+zaT(!Fahox?1^mDgFuNFHG^zD&IcEzomSK6#u329aH@8 z%6Cffon9>I+&RTxsr*GLzCihl$#aq~?iUS%vpioyelNLSp1Y8@$^CY)8w-q+&& zqTMXKzhAUFxYUckU$h6g^Z5HkFEuXxuAu3B8U6S28b6&cH@~0G_;dH^`QEIApX=!L z@N*sg3i@%t@4ZjAmxcG&(R&-0biP5;xeq<VBUGImc{7uz>&Yfd2^d_~}2=xTJr^OQe4-2>4$U@E>I! z-~U?U;@?^QM+f|`3;1*9@%_EV#lMgG`vU&{fPcU|zJH-{@y}ELqJV#Kz<-Q+eE*OjA2W~dFB+F|`={`8+#aVNM?CL(R{6RVpT3KPpGfhYm6sBn_vL-Td4E5Ryxl$i zuLsW>|I6eqJ%0KpjZ66)uKr5EUk&(c=JEZf8yEke`s)FIBj9hE$M?64i~l6`^Y7}i z%4cK1zsWqlAAfV9Ld|haM zKi>Bl7yq`q$~bUQ!2kY$|6=p_{!5HYzIKP7^>``$IO2LdK>1|}&h=D3IP2r`6dzUo zffQe_{DUdJS@{(y{!Zmrrudc0uS)UTlwVDrll0$>b-{h$To-)ExW6vA23*>ezb?4e zxRn3H@NgXdFgKTG|01^k~0 z_&;kN-~Tz|;-9a6v{mG=yL|2m`0q83@Bh4U@gJl9F9iHw4EVof9^ZeTaq*v|{`&*| zF9-ZzF^}(mz_|Ep>i=rM|FwYs>*n$O4;mN$+tmM!fd88T|F_KJ`@d~m{8y;|p@9E8 z0sq71@%`U5F8KR1u>|Ale!@1p)+2KkMIATaq;KW|NDUdiGcq}^Z5R!jEjGz`kxN?{}Ay1(LBEYPsYVx zRsWv@{=WqL&zQ&e|JAto&sP7l0snIW|KH5x`~PlS{8y>}9|8YA1O9)R$M^r+xcKi< z|MLMqZkL(;tA`w2GQBS`&A9j&OE;Vg~r9dm-@F4_;(2ScQlXh-^sZ6k5E6qe|AEHE{~7fk6!5<);E%u8 zCp|vkZ(h9q^^p2s9q`W%_~)3%PybxwlK!XEKQG{)AMhV)9^ZeMaq(~WQW+l(5BQG= z_>VM??_XeC{I62~YXbhG0{-~>lhWmXbjp9U`d=6D=K}s-^Z4oSGcM^LQGb8HKM?RQ zG>`9JWL*3c>R%l2V=pN4{xxVG-+!!e@xM|1#|8XD0sj*7`2MBF#ebptmj(R80e}2G zSn2v*p7MWG{UZVYXu!Y1JbwCD8kh9nqyAL^|LTDM1oQa**BclABkDgf;6EwgKiNFK z{}kime_H)(0{&A2{=9j7|61eXpY}2t9|{5gSim2DpIN$o$5Z}Y)xR#_p9uI%=JC^i znsG`0A?jZr@RtMrN%Q#rigEEDtNv=hUkmt8H;?bH8y9~`{f&UX8SuBv{r%XB zzYZiDw=nEp$^C7r(iQsch=GIAV@H<|v+E&NRH`yW1F zd@Jwo&OQj_FOZt8P)eN8E|B!in|24*? zU*D?rdo8&5{rded!#lrUzt@?^@7EtOE`K+DullbC&+^}3-1mQ!90%LaLvY0V{5M*7 zX+OVI|Hq8`^?MU|PmUhHem_p`{C@lSgmLjdt^QAfOZt8P%?zL6zr{Sh|5oEt{?DoZ zHt?+S`4q!Dzh6GLo5wHzPaBtUb(=k9+`9uj?$?-$w)X*NzqpgU&9d<8{VsYk;{6Oc zE=kV^K5Ja^b(H!)2cG4>o8dG3_n61e*S*HYze4?=2hZ|m(+hB zc$WWuhR^VS**w1gE5^nD7WF>>p5^~4!)N%vW**=Fb>rf{Nc|6jXZgRu@EQJZn#cEl z%eeS&QvbKXv-}S+e1`u!=JEXx8yEi<)&E`aEdTcyKEwZrd3^u(jm!P+QTW-89|h+T z&o`b?{(}_Xah8PtVTvE9{6{H%jPf6+_=NJGkmn@cpCE^4fX@K>X(Bw|&%F?w@8|x^ zxc`3c&%vcX`tRrd!npjs@U80kWx(^8h4($bGA^En)bn`2^J@$5dwyeF>i21QIR5;W zo;LH~k3YX-_#C-E?)~08e*HdST>LX%A^s=9v;0pne1`vN^Z5Qh7#II8>i;8nmj6!- zpW*+rd3^t0j7$4`HT__t;F4F3zvWc$DFH-}9Z}-@!b-e@Elu-%I^F1^hcR ze1`u;=JEY6HZJ}n)c=xzf0uxNSM&J(-HeNWQ2o0H{CfoaFEx+vf0=RduTlTY1O7b& z{#oYn{jV@C{jLH()qC*=4)#0ti!(Idy~*3;e!tiUJgZ*zC3hY_-u;Y=|GnyeC3uwK z-=E=gbou@60Q30%1C5LS8ucFp9%cAn#qb&agU#dn4>2zO+tmMR@F>GSo8dG3@%P-P z$Bnru|9$G87x2#y_zyLYpZ>#)OZp#H|KS1u5dr^^=JEXtjEnzg>VHkZe^kK#TJ!k+ zqm7II@9KYDz@H2Fd(Gqf`;3c!m%U}&>ks$`0{(^O@%@X8OTRk|eySJq2M+c-&g+&b zKPJK1AFG<4LGm`k`~C4)@SYsG-(QX+cYZ%TL&jzPa3=f=w*)+L9^scM=fA@cbMEup zuIX7uelM@}(=$xo?oQ9~G#(!HRH0cbu>Io=jrscd5zy+>c;*4+aSlm{=#t} z-q&hcc>nJZTi{a8{@)>PAa@@B?+`Z{mwzW~)jm?ro4|Q+T-p)wPJuK1Q{-)OKmD7H z`{{oJIgWJt-)Q0e^uGx_EB$XKcOF0eZ!s?8=Xv```duS+;e}tT{0xNW5s$Z@ReolQ zKdSt!6n|RzTT^`Iz7p@-QhZ51v(z7mz!TUytuKF87^pBb^L)A^kX5 zUwnV(x60p_;{Q~BQHt-npLpI+o)ZttVLxz|!^Pxna=#odG47YcrQ|r$<#3sW_sijO z@T_w90J-z{Ab@Hembu-zn{*l%;VqpuQo3JVfB9~;J+r|zt%jy|HH<` zf2#VgqyOISa{frbf4zBp{|&~aU%vx>sz1sfIr=5u8#Ue=$=luWehggd#V@y;$Z-kl zH~G2xj~f^NUF!b?c$DG)B*W*#!+BjiPq^7UzW)~E;=f=0w}M9*{@WNn!~ZGs`2O3C zOF#N9{LJU4!Fddq^Hat8NU_;0Rn|44-pW|LS{fU!SI0}`Vm%rwj^|tD=18GlELN7) zOT|hv-z-%tQ8Qm(S8NUxHRa(G&q1K!};a} zo)p}PW2((Yt=fz>MN>F6GEv>QqEc#3jnvBd#)Kr>&%~S#AGCD0q5nwZTeXzOa5>z1pgb z^%W=b8%ikNu~GviHr1)Zfl|I)UB{?<%jN3EV@5}Z2dWz@WkeX|Ns42=Eu^7}_D~$H z4p-~VdcM^BPv=(D8l|x!Em@(4kcUPgUn?$mm5~vLg%~Q1HzPK&5laG_B*?tEeWm7r z_ zqqTOj)a3LPA)1nE5$}5+JMBv<`vsyzQE#cxItw} zb*vbT%^N$i8_k)MVvKvFRxB1K2Ko{SIi{E&OO8#QBra|h8_lRPZ>)hv!CWPK*2+?G zqdO-l9+^NDjSZC=&1E&YM)=B+sY=1cwyctD47J8QZTT4}K$f$qH88Mg{1_*aeEx!Y(V+|GM{^EaFlRP@9vLlbP892n zXf4JgG?X#iVoKvBWI_N6lFc8th9UKer+A}AuWQbQOJi#3kMmF8fj)@qKp8%{FB zP<7)F#wpxx&=ni;O{{l#Fs@f^9@3;2*IKBJVjVqzF>ffU-oSxQxki?ODNvSe2wm#0QLZlTV7#gMP z>E-fJ6~jJLl&`Xl;u&tLwNgKCpv@BQK1kkBaYL~jHJbHOZDC~{x~z+(G(1tQpz(v& z&`%|h!UABkALA{RlNd-`6mqh!RVt4yZB4F4b)Zof(2sFzsuY{U#rk9kjSh)%d}N>> z%_~9s>qQj!DrjpM)9X?1@No+_;Xcnxcqebf6^d?$+h`+liCa;@*fqwXj+sJ|E2wGd zO8pc0N~KsPM-{peG2d8^c7_qZ5oumJMJQm@%~F<)#0A?LM48szjT@y}Kkd7%REcl6fzx)cOr6h<1uo2wX)=Q6!%Dp}5MbHJ zP@aR93?QRZH58Q3;waPHgy|EV35=UqMfG)S^XV{XWaVMpuTpW1ls0$8-`{F9tCOos zYu!vPbwLTEa8{zp2PgCEx@tll8MNAv64T-&{r0Y%3i={Y*TSC(u`BZWL#d|v0B$u_Eik1I~0RO?0O?=Xy^ zc}%P@*H<>W(i^{GJlNnJFpfaR`96*STngx=^4by|s#0^p)uKS&4cYFz3;OcS!UQKx z35hXWz=c*J0S2Zj`ALr?E?ivC*CsH5#4XKBsK-%oJdIzNvrSSTZ7i;p`Q~VG5|!9w z8sn$Z+|Wd1elS{Ux&@eea$5u-fR?eWzP~w-IEiK_F--)NM+GwQX@!8nevI^FKSX~YdNXnPwOO??H z+>kK)$3)dG=jy3g&pI=Lwp*OUys~D2M_1xvOay8=&u5Z!lGc49UOx}%n3BgTuv)>A zxY}G=Y_6!_UWU2O*uqT(EK7J3ExI|k++FkK`0@x#uw`pc>t9hR#jq8*|Uyz_q%#$qjfsiM6RcUtB~lLsI~A zfw6QdSEpoZ6ptefcP2R?B-?}O0^OkFDZQrYDVAv)u7OfXlhjKwdO4)?ArasrE9$tdd8+Qbxw zr%AL+yk1)4^HzncZ{%qhv+mjiY5@Bdao}OJFO+>O?5kFr{S(E)`X%{I>8kF zolEE(DY*zONEy2t5(3L`T{FyE=`ApNTVtgv!{{odSYKPky3egYICi+}S2T(v!z(cU zub5n0&v!yEsiL>aC`hQY-+^j*?bO0bq3V{VwZ?qEJn+&L`bZHAwqOy#x2!tx(qza=2U!YyB!wQMd(X%m`jHhM*Sh4!A+ zTFv3oreYbn!&pXPjM+$aBZ?Q-s};;YO0LdUFB!6gCi%$V;+S{Zi0dUW)=us-ROtX_ z{yrRAAMXJ$QCQ)bf-6i;em%gz*n06C!}ZdJd|_&F3zKT^#M0p=hhan-JC>uyn{Lwp z11r`>rF9j~1Q@k1fA_(}f8x^wwdaIbOBUj$?-h>sf|&L#!rKhucPDBX-mrlZj`=buIG9(Gyr?Oq&QZ}W3wY)z?#}w(l?jd-1Ob0Hn%f$SkjaC7hK}sQDWfVHCXyC zTb;f0j!s9M<6GEx)gti6TjXT|(*ZY9y8y}Yw>CF10JBp45g6N2$sriYTgf|^l~`!h zU_iZxESzk)Slyn{=*ChLq5qeg6RYxdwVus*-i%$ zn*vthSa{0>%w4Ha)_=9eWU^y5YV{JEWnn!=f+~iYsYs_nm30Hfacqi=Oiiw>mURiboJfq~$+@As$n6x5;?~4W$Jz0qI6P!!;nS|m@m@-{ zH$IVa$GF>XXS(7TnZ#C8X5#HkDi-72(R5CE@i@#v%BBgwh4kGW>=}l*OV#Byn(!L) zy&dd%lhboIi%6Kd&iTgf)3Mp@B%&#~-80vAlEf@Y*y#&y7m_u_+)8R>XEJ8~^;TZK zfrE2vGNtH1-_hZ|giR@>h>NoIOfR8g^qRXeXz9AF#u%b@({WmrpT1@(o{ScUu-5Quqqf?4rDB$hV9-Y3SVZ zbT2N#8&^?Y0wlAV4k+VJqNp$rONZf>#5m^nyc4_q?GooxOwyv!-cAnjf(667cOzP& zr(=RQnB4-z-P^}Cm`JcRXjTi=a>s} z)=3l%7CxnMyo;Q5TIYq>GO15>HrkjQCoM`Ium@Xdm9gQDm4rr`Yj{hi`koqR^kvQyvC49L0HsP3 z;cJ))yN~|ZF8+cA*kI+hWn~@j27IH<3ksGZ)(8; zsbFjx)ZP9=9-mFYn+h5Q5-?bvTd36}Y**2&tyZ~PoG3<36ZSL8Q=5z8(v&d|=u}wO z${Pg#|=O-)xMuXjRv=h9YkhcwB z73syCW=8@PzRIyO?kE;QdpS+4I~HKIbf+F~2y3J5*BCeK{+t=89} zo61|)IORf0xsJI{yU7pv#9MUpHu&d2@%#*Y5L8juFMc|1T7n*h=lBY!Rt}GEIJQtr*gYPN~zum$PtY(P2mSZtg4RH_hu`G;iU+(uv7=jp|U}@WkPBPAG0_m4X+C zPV6t$KNIJ%12qdDE_U@XxRRxQaBpA#z?`}B<{#?n!#z9f@FR{SUbu+LWE~`*^Bl*M z|J1hrr{ghoS;zmDC(Hf+im~BzH=g$E{P@$a#)|*WH~R&n3*FMe`Q9<^l45f4KJZ-?*Ip3E$)$e;OrYHYfMW(9{&)(uYs9g{P?&T)w{lH#=2wY`oyd?itw$Y|8efh>$>N!QFKtu|C_T| z=G%F?a)uK);`-rlwn2`&t}SYVjL*mCIA00Pc=0dB#^;i=-Z-zEre;okx5IV1e$nYK q0FuG^kE=Ib4fqq^DB2$9)6?Gr!Lla1fhjOTN6~+}$GZT@AO8o@Owhmp diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 8a062e6..b11ab9b 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.2.1f1 +m_EditorVersion: 5.2.2f1 m_StandardAssetsVersion: 0 From a201fdc3453cff1c0734c4f2dee142d107f33911 Mon Sep 17 00:00:00 2001 From: Xavier314 Date: Sat, 7 Nov 2015 20:35:49 -0500 Subject: [PATCH 2/2] new file: Assets/Animations/Jump0.anim new file: Assets/Animations/Jump0.anim.meta renamed: Assets/Sprites/Shooting.anim -> Assets/Animations/Shooting.anim renamed: Assets/Sprites/Shooting.anim.meta -> Assets/Animations/Shooting.anim.meta modified: Assets/Animations/megaman.controller modified: Assets/Scenes/XavierScene.unity modified: Assets/Scripts/Animations.cs modified: Assets/Scripts/Control.cs modified: Assets/Scripts/Gravity.cs modified: Assets/Scripts/Jump.cs new file: Assets/Scripts/MainCamera.cs new file: Assets/Scripts/MainCamera.cs.meta modified: Assets/Sprites/mm.png.meta modified: ProjectSettings/TagManager.asset --- Assets/Animations/Jump0.anim | Bin 0 -> 9152 bytes Assets/Animations/Jump0.anim.meta | 8 ++ Assets/{Sprites => Animations}/Shooting.anim | Bin .../Shooting.anim.meta | 0 Assets/Animations/megaman.controller | Bin 10288 -> 10288 bytes Assets/Scenes/XavierScene.unity | Bin 19188 -> 20340 bytes Assets/Scripts/Animations.cs | 7 +- Assets/Scripts/Control.cs | 30 +++---- Assets/Scripts/Gravity.cs | 1 + Assets/Scripts/Jump.cs | 58 ++++++++---- Assets/Scripts/MainCamera.cs | 29 ++++++ Assets/Scripts/MainCamera.cs.meta | 12 +++ Assets/Sprites/mm.png.meta | 83 +++++++----------- ProjectSettings/TagManager.asset | Bin 4340 -> 4348 bytes 14 files changed, 142 insertions(+), 86 deletions(-) create mode 100644 Assets/Animations/Jump0.anim create mode 100644 Assets/Animations/Jump0.anim.meta rename Assets/{Sprites => Animations}/Shooting.anim (100%) rename Assets/{Sprites => Animations}/Shooting.anim.meta (100%) create mode 100644 Assets/Scripts/MainCamera.cs create mode 100644 Assets/Scripts/MainCamera.cs.meta diff --git a/Assets/Animations/Jump0.anim b/Assets/Animations/Jump0.anim new file mode 100644 index 0000000000000000000000000000000000000000..7c479fe34c7aa5483a9e54e6893942237aac24c2 GIT binary patch literal 9152 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 literal 0 HcmV?d00001 diff --git a/Assets/Animations/Jump0.anim.meta b/Assets/Animations/Jump0.anim.meta new file mode 100644 index 0000000..12e486b --- /dev/null +++ b/Assets/Animations/Jump0.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a078ad8c97314a34d9ecd3e37dae2156 +timeCreated: 1446945210 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Shooting.anim b/Assets/Animations/Shooting.anim similarity index 100% rename from Assets/Sprites/Shooting.anim rename to Assets/Animations/Shooting.anim diff --git a/Assets/Sprites/Shooting.anim.meta b/Assets/Animations/Shooting.anim.meta similarity index 100% rename from Assets/Sprites/Shooting.anim.meta rename to Assets/Animations/Shooting.anim.meta diff --git a/Assets/Animations/megaman.controller b/Assets/Animations/megaman.controller index 4769ef162266f4e512186ed0a88235598f7b5ef2..effaa31fa9abf404e159275853e71383a16fb6b3 100644 GIT binary patch delta 119 zcmdlGupwXrkK*JD3LKL~6jdf0DDiA|QQW}FeD=(l$=}tc`%QCZV7TGL00oO8Cb2=7 jVlK$yw~CR)Q-FFPVAY0+Q1u{lQk*9rRFIndP2CCrY6BbC delta 102 zcmdlGupwXrk0SGfTV0d+6*VV!DDrG}QQW}F%)rnv`McV5GX@~|-~=K;U{S;*HVA8) bGqU)tVr20G=g9%eVoX5lpn}xoZ|YV6m@yfz diff --git a/Assets/Scenes/XavierScene.unity b/Assets/Scenes/XavierScene.unity index 974c0287c7013a1634ca90c17cefed20073b9558..863334739456f3e445f620a7810f68ce0ddba8ea 100644 GIT binary patch delta 1352 zcmZWoe@t6-5Wn{*-2=+NiJ_|_l-MPjFqC#vW=s2Cfzpm&o%=~b7P_@IC@W2eZYUd7 zvkgn!(3{EHWy^+(GxHC?M&qV4%pb%!*t%>cF4-7L49@V6kw2E8)cd~osst~&-22|= zdv~9Aci;KAx7Zs0j9Cit31 z&jCc84lD9hktjMzsFo_hj6E_ClFE1mT(~8Zw2C&?mhb8^{0DV zS6*Lp((vpY6d!YV1CwRv+i$Eskv(qg*RqVxf2%q0lah71rJ0lW1e2L7Mc(>qU-3gh z%Lp9c01lERLz+%ApI*ftlG9IT##W2WTXJwX90q;lLpq9bts9OJtYkJfdRZ zEP!$V{J{Dce>Mv*TMd0F#RY8?(x#SqTfNR|zf1liS(P#|6+21Ta(V-qxNHC~#jv)~ zKFD%^vXij|FJUaFN)Mm2 ze+9tJ|1!(Xe6uTmC%K?q0N6^FEn!5i4RBb+J|}E>^&=`Kvxcgo$)E%c}g)fQl970o0P8J&_2|WJn4lZ^%8| znTOY_4g61e_&b@X4z>1%RlV;uPdOI0Hw{ac8Dl}t$}GSpyCHedzJqUMWf?annWd6P zK3kCyztaKD%yJXU^%|+WLy~g#~ zpI0!oNsoS4If@RAf=qkZHJvcGxyt_Gsc)?mXXLc_qqrp}vj_vpGO3cw6`gDY0H#H3 zb9UHq)$ delta 1032 zcmY+Cdq~q!6vxl~wdLB3X05WRwQ9(WkTojIv^|>5O=ly;A_@%FB2t^n9)Cpn$eIki6d0#P>S&s3@3Aqf<@SIk-4S-xGB!xL;?}^zOOiwTxcc6>n2wp6q$%? zs<~__ey5||lLDA1%^+B$MCI=3o5+P>VnZ}fE>R`2fvErm#Q5j&@yRr*MW&Adu#(Sz z2%n$^I3ltG#CRS5M|{B1C!$d!!cYuuHmTD!^k5AX?iVa_rek7C4>32z>4tw>;*Zvy zhIdHrpY~q~N(49|rVJAMcQk4t4W+MAxPeZN^UZ3mNsj3>xfEDv&PjgyV$RW!D#>#0 zS({bkemNx~xq0(^|Kqm#S(g(6IcNPll)-NER*p$=YgT@+GiwQxdo6s^eh=(2 0.0) { - thingsToMove.Translate(new Vector2(mouvement * speed, 0)); - transform.eulerAngles = new Vector2(0, 0); + thingsToMove.Translate(new Vector2(mouvement * speed, 0)); // bouger le player + eulerAngle = 0; } // if @@ -40,11 +36,11 @@ public class Control : MonoBehaviour { if (mouvement < 0.0) { - thingsToMove.Translate(new Vector2(-(mouvement * speed), 0)); - transform.eulerAngles = new Vector2(0, 180); + thingsToMove.Translate(new Vector2(-(mouvement * speed), 0)); // bouger le player + eulerAngle = 180; } // if - + transform.eulerAngles = new Vector3(0, eulerAngle, 0); // gauche = sprite effet miroir, droite = sprite normal } } diff --git a/Assets/Scripts/Gravity.cs b/Assets/Scripts/Gravity.cs index 3d73f18..c96c1db 100644 --- a/Assets/Scripts/Gravity.cs +++ b/Assets/Scripts/Gravity.cs @@ -4,6 +4,7 @@ using System.Collections; public class Gravity : MonoBehaviour { public Character player; + void Start() { player = new Character(1, 10, 10, false); diff --git a/Assets/Scripts/Jump.cs b/Assets/Scripts/Jump.cs index 617a8f5..0b6b140 100644 --- a/Assets/Scripts/Jump.cs +++ b/Assets/Scripts/Jump.cs @@ -3,34 +3,58 @@ using System.Collections; public class Jump : MonoBehaviour { - public int timeJump; + public Rigidbody2D player; // le player + + public float playerSpeedY; // la vitesse de saut + + private bool isOnGround; // somme nous sur le sol? - public Transform player; - private bool isJumping; // Use this for initialization void Start () { - isJumping = false; - timeJump = 0; + isOnGround = false; } // Update is called once per frame void Update () { - if (Input.GetButton("Fire1") && isJumping == false) + if (Input.GetButton("Fire1") && isOnGround == true) { - timeJump = 10; - isJumping = true; + player.velocity = new Vector2(player.velocity.x, playerSpeedY); } - if (timeJump > 0) { - player.Translate(0, 0.4f, 0); - timeJump--; - } - else - { - isJumping = false; - } - } + + + void OnTriggerStay2D(Collider2D other) + { + if (other.gameObject.tag == "Floor") + { + isOnGround = true; + } + + } + + + void OnTriggerEnter2D(Collider2D other) + { + if (other.gameObject.tag == "Floor") + { + isOnGround = true; + } + } + + + void OnTriggerExit2D(Collider2D other) + { + if (other.gameObject.tag == "Floor") + { + + isOnGround = false; + } + + } + + + } diff --git a/Assets/Scripts/MainCamera.cs b/Assets/Scripts/MainCamera.cs new file mode 100644 index 0000000..072bf89 --- /dev/null +++ b/Assets/Scripts/MainCamera.cs @@ -0,0 +1,29 @@ +using UnityEngine; +using System.Collections; + +public class MainCamera : MonoBehaviour { + + // le player + public Rigidbody2D player; + + private float positionPlayerX; // position du player en X + private float positionPlayerY; // // position du player en Y + + + // Use this for initialization + void Start () { + + } + + // Update is called once per frame + void Update () { + + // definir la position du player + positionPlayerX = player.GetComponent().position.x; + positionPlayerY = player.GetComponent().position.y; + + // ajuster la camera selon la position du player + transform.position = new Vector3(positionPlayerX, positionPlayerY + 3.5F, -10); + + } +} diff --git a/Assets/Scripts/MainCamera.cs.meta b/Assets/Scripts/MainCamera.cs.meta new file mode 100644 index 0000000..784dd5e --- /dev/null +++ b/Assets/Scripts/MainCamera.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: c729e4edf3bf65d4fa14333e02f090e0 +timeCreated: 1446932586 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/mm.png.meta b/Assets/Sprites/mm.png.meta index d08f2e5..c7b9908 100644 --- a/Assets/Sprites/mm.png.meta +++ b/Assets/Sprites/mm.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 14370da66867eeb479e470bd4bb068f7 -timeCreated: 1446690230 +timeCreated: 1446945412 licenseType: Free TextureImporter: fileIDToRecycleName: @@ -22,6 +22,7 @@ TextureImporter: 21300030: Jumping3 21300032: Jumping4 21300034: Shooting + 21300036: Jump3 serializedVersion: 2 mipmaps: mipMapMode: 0 @@ -148,56 +149,6 @@ TextureImporter: alignment: 0 pivot: {x: .5, y: .5} border: {x: 0, y: 0, z: 0, w: 0} - - name: Jumping0 - rect: - serializedVersion: 2 - x: 261 - y: 13 - width: 16 - height: 24 - alignment: 0 - pivot: {x: .5, y: .5} - border: {x: 0, y: 0, z: 0, w: 0} - - name: Jumping1 - rect: - serializedVersion: 2 - x: 313 - y: 13 - width: 12 - height: 24 - alignment: 0 - pivot: {x: .5, y: .5} - border: {x: 0, y: 0, z: 0, w: 0} - - name: Jumping2 - rect: - serializedVersion: 2 - x: 361 - y: 13 - width: 17 - height: 24 - alignment: 0 - pivot: {x: .5, y: .5} - border: {x: 0, y: 0, z: 0, w: 0} - - name: Jumping3 - rect: - serializedVersion: 2 - x: 408 - y: 13 - width: 21 - height: 24 - alignment: 0 - pivot: {x: .5, y: .5} - border: {x: 0, y: 0, z: 0, w: 0} - - name: Jumping4 - rect: - serializedVersion: 2 - x: 458 - y: 13 - width: 21 - height: 24 - alignment: 0 - pivot: {x: .5, y: .5} - border: {x: 0, y: 0, z: 0, w: 0} - name: Shooting rect: serializedVersion: 2 @@ -208,6 +159,36 @@ TextureImporter: alignment: 0 pivot: {x: .5, y: .5} border: {x: 0, y: 0, z: 0, w: 0} + - name: Jump0 + rect: + serializedVersion: 2 + x: 357 + y: 107 + width: 25 + height: 30 + alignment: 0 + pivot: {x: .5, y: .5} + border: {x: 0, y: 0, z: 0, w: 0} + - name: Jump1 + rect: + serializedVersion: 2 + x: 412 + y: 123 + width: 16 + height: 17 + alignment: 0 + pivot: {x: .5, y: .5} + border: {x: 0, y: 0, z: 0, w: 0} + - name: Jump3 + rect: + serializedVersion: 2 + x: 461 + y: 112 + width: 16 + height: 22 + alignment: 0 + pivot: {x: .5, y: .5} + border: {x: 0, y: 0, z: 0, w: 0} spritePackingTag: userData: assetBundleName: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 071b29be008372a4be6261a4d5d64d187377f276..10ae0c190bf3e64d966a05268299e6a2a3ad6f00 100644 GIT binary patch delta 60 zcmeyO_(xHafr0541B1XH1_lOxAPuA#7)