From 73ace19d57f4c4cb96f6ebd99d5e84abea4b6921 Mon Sep 17 00:00:00 2001 From: marcmad Date: Thu, 19 Nov 2015 17:46:46 -0500 Subject: [PATCH] Add prefab player and put in the master scene with an enemy --- Assets/Prefabs/megaman.prefab | Bin 0 -> 12236 bytes Assets/Prefabs/megaman.prefab.meta | 8 ++++++++ Assets/Scenes/Master_Scene.unity | Bin 20340 -> 18564 bytes 3 files changed, 8 insertions(+) create mode 100644 Assets/Prefabs/megaman.prefab create mode 100644 Assets/Prefabs/megaman.prefab.meta diff --git a/Assets/Prefabs/megaman.prefab b/Assets/Prefabs/megaman.prefab new file mode 100644 index 0000000000000000000000000000000000000000..d0c7fa6597f3696f6db45dfbbde0e4685b46e476 GIT binary patch literal 12236 zcmeHNdvH|M9X^{7P^nTYwLVaSrV1)3_(H+B8xlxLLSn*0Yc+GTdy_0|cGtT%f#@)7 zAJPtOrIo1`oKi!r6lJRQ*uXQe%{w)Q?Yf>6B?xrnOI1hYlY;92pJZAPQ4H zoIZBZ8{!`{?f59w@1MXUyKrUu*j96^F*5Up?*!?oknyzg($29y^RG zO2i}T-cpr+2yG((v7g-huhdT9pTK7cZuX6!v>Q*Jj5_<52Jk818ISrgUYqofsFfuu z|BS~|7U&=385zKXJfjMDL|p=&9*>7(#0Hqpu>m~Db6f$BsJk)G8^FUiq#PqLc{j>o zE^xjV-`U8a6XU+=je9(BUd3`aL1Tgk$HnRucxu6aKX@qrPZH1T{*kGWCvV~>5|0uu z)p9-^&u~7UBChXJbq)G1#?AUk1w5k2f3e3umUy1el!W*{O*~3G%+K{4i2pMMJfbF| zdq?>VSmbrF1m&~Lq zRafimWXi6qMxn`aJ5kX6D&{*@I@g|Yx+<01nM`-&=4To*J+{haZ9Ad<2|51i#zPZU z?W>(znVwg>wsynbvgWy~?e(`DTD0&t7q`Auv4!*J`|zEQ+J#u^-O!(-b}>A=7^>dV zY5yoY>6iISety5RaYJJK(&zTp^)Jm&UH{S(W$M1s-`uw0Df;ThqdKXM`f7;?7dokaOUUsoVv}P{P;~D zbiH!Xx@Vs3dvEJc9@#%*)e~RMUAu#(G4H5p95oH34%C;AV;W3982YKwej0=H5_P5} zG#REb1En{98dIWz=?&8uraeOq2bSwv@g>>-yp(2+)nzxfEw#pha`Nbz zBOm|#2@^NH`)-x9c>35KOt6!oh&;a)mspKb4sMX>7s%l^#xG6Fj2cfc&GVl3N>FfX9rhjV*wiacOKpelsqO zEy&-5D*0(_!TyGyVJC@s%Gr{#?JOcrLnfhhHIqsud74#iyGZV+(QIgjmOkKGIgQ;r;+9KB#j)>NAzSL$$L6%isq&b*2Q!@tB=J9BwG>f%)BCz3Tv*9V$X2Ua7Z8ki`+H81+ zqRmq=cV<5WX|v%k)@H*W)Mk2%4v)vzX0ZyxLv6;gXsu;*H$2p4!6mx8sQcP1>qY1L zB@Y*E7MxbJ+IwEKIS($eqCOAT+8h;}Tcs_)sSjG4^Tfkh5xrqV_YY@9%%ZT1z#ZPo z=7l>iuX#ALCW1MK!o`AY0=DPHj#xIE>SbcnkTGeH4p9s3R3?saRF$&R3EA8% zvYa$o>|D<3VBD#-V7T75B(+J~v7C5kFDIEwWtQsrW2N0$sbsdr>dJBgjaf`Md9x&9 zJ0Ou;H_zWbCVu(8>;AO=gF9}k7{k2Eg-5x|ef1kS*3=Y}?3Wx4TA`fv0=?o^-b=yaQ$Oq=e~Y`3Rm zL!hArp5NA$SUTRR6D+;qs7vc7yR0mDnjAZ4J3aP-g&e02M_!H#Pd=v(wOF^CS+KCd zT2`IR0gN*a6fkUPuzA*RZ|IsV2dBPefN1^~*K#$;{Ps{Z8@E#yrZM19Qq9gK8 z%-BKF(WWf556*nixH0D)nzQ+x7n;XhJUKsO0rizOK;7C6eHu>uz#}?ora$8Ikv!M7 zMB6j%iS{7zgShykOMp?Icta&LPJ8Bti*co_fR`xx-`S{>U&oKU?jJgd*6~B*;!n*_ zGsq?UBdFhs{*FA1A2QD})rcbN=Pwv4D9-Jqi5xh*FEYok2U#Ee2 zwv7zUlkr3Bc9iBf^JM%Go>8Hnkoak!@UQUrbs9JTzm6YKa)tT*_z~v!iA^V%a0$jUi9yjgC9RiLvrxrM|i#b_%TAS3)hSDVf-+1W_oMZh4I7S z!F6H$5M1(-O{kM67(aqMe*6&sXx^(lz{8(7{nX=`P{1WFn)y)QW!x~&*#%tU(DPos zf}c?w$~kts)rQnE*`AC`nuncUxLQaV;Tq&5z4!+>;YV^{&17xI?F|tjA@0DwFzdDP zw>zrGN_E>Rqrc*U?}INE2i0tM;io%^!s$KTnv5T>Lx&AF_%L9M4sBQaJTD(%7=#s#v_zZc@9Y?EIsvm9HqPD+msn=~$IHV{_ z)ATLR)!ui5Zp)*My|~s_L0bt{Zhxf`_13R9`0MV@v^V) zZxr;o#B1(>Kdh?R)VAx+2~`_xL91KVojc)zzUqxN4~#p!sROZx*Yex{7MnXIS-X1S zuD2((?;q_6M7Me0NOEy3s}IH7}#@rrqc` z+h}>-`zl&!ll*psO-Eej9nEL3gLzM4K_B7w$zRR#?8go~DH!YK7R1O!Y6TTHRs9(p z$M~C22XL-i`_j|v*4F((@bVZe9e4g}GjFs0;pc`kp1jKo+v~Ap`KWo)@CSJZn(sjU z%rjRVx2SUU*6vEy2kIB(GjcBO7p%W^&GgE9?|Oz`HT+vXBhTRTe2z|N&&#V=JmQL= zb8&xm3eK~bm;H@T@(Hss>fb5f_u2fC-|M4zY2!!o`t}1)8Y9zidFg2e;vFsz?SCL1 zqxWA}y>&?IK9D?V$0g_C-;giSVRVNbK2#Na?4^k}t!JI_qP(=mdrf1j=JQB7QvSh< gxpwe3IBcJKX|PAQ%y%%q%3({fK7@NK6_mrj03~b}%>V!Z literal 0 HcmV?d00001 diff --git a/Assets/Prefabs/megaman.prefab.meta b/Assets/Prefabs/megaman.prefab.meta new file mode 100644 index 0000000..1357abc --- /dev/null +++ b/Assets/Prefabs/megaman.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 84b6e15a0584064428ba8f318da97379 +timeCreated: 1447972261 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Master_Scene.unity b/Assets/Scenes/Master_Scene.unity index 863334739456f3e445f620a7810f68ce0ddba8ea..32368b71da788684b6f7e3a98a33e39d77c95496 100644 GIT binary patch delta 3347 zcmbVOdu&rx82|2Vw{C;!<`^4gAXAW$jM8>1-KJw3xOLMxDl__z5iZ*u8(Vvq_KK?- z+nGU75|VKQqKOM;F-lY(nGf&}W1@dxq6EYxBqn52qk%{Qit!QL{JwK8x3_cM(370r zdw$>he2?23Bht{YbRR(V*8t5!0B|S1U&AN(Twa&A%L7x>)6-HO0#jpGvwoA~c$_A> zbsfL)%jl0C55@A^R^MM8dj5<9iB-5IgUJt&D7FYlNFkNu5+oKHe1u6L!zJWJhro_o z<}`u3Y>-$7kO^4`+77HM3J}L^QW+N9km5p_2Hx1&qid1I0bLD8d$cf{ym!smcMHmj z$Ih=VU%c|N4d7LH?xVNz_xu#Py6@s&()HncQ1T1h;emz)csz9Zirs zGMq&Q5}?3P7h<$+Jg`c9C%1*`0w))15u><->q5^s;!TK=e(rjL^GhDQAl&f;5$L8R zPOx(WOHqiFlQLo04v*veP81^kY{C;n%YYa<+KXp$G>34$GgBO0V8N}9E(DBU2xLGr z8jT<$8OSAp1ko~YdCCpnL3lmkjuc0+-V8kscodx^M@cW0hgCmaH|ftOJb_z=Om;H2 zXi2I%N{A41u*uw_xQKE$q7-GJNllG%u?4qAS!CieP&y9cnVg_n7FKL2K`t?IBO7re z9Zm~@uAQPJhnAXnM#{C9Sa7RD%S>E?J*ej>o=MMg6BiA1tIm4wwh*j}R+zX1t?0}t z<6KJ5dVpX=?NYWsqILFk^>ipYwh4r`&Nx06QNqzKEfNYU5jCu{6L%HHtt?U0qV=m0 zJ!VBgS0X!99r_JgP|>?#m(usN3flIaYKOi>?NU)+hl&=rs3C2a+PO&!^=o0Y5k*W` z6At3BB`RJyY}28LNgJZ^4^Mtc$%6q*Q#p1gb@gSNm|X828{)(0ZN%t>GU~-&%IG1# z-%WC#BCTYG+-~)S2Z%P20dN|hq5_1@JqGOvc4|2Q`*lO1d@hsa)H!Rg;0b~!`4;Ri z8SHMP4I{pYZ$W$6pq+8Br|O*9ZfxZslBd{UT|rF(Pb6TqJ@Hi^%?~KX=EhtC9cnQi z!X^z`cQ!j)=alnu*cEhX0NcGDsb0PXXZ!Hchw%ufkQST~d0u3Y`Wv!x+42Ubyf>HC zG&onev8Ou`6$1^m2&ae6%Kl9_MQ_v~7m z9h(c_hkY~x0cb9Swzg^=N?%Zm_E5#T1`xw&pu$yES?%$zucCM@Yd-lH^3niY>+!jK z6`u88AAZP^YbOr%xgB^G>0E)!;}*-46vwwT@>?{Ww;T_EF4fJXK*6e6LNz(b)!XAF zpKg!y8H3Y9)|cI~PVr!4YMQ<|(y2z0x=Qzsi|o?@D#_#JyFxu}A!eN4407S$p$FXCAy&f?EVY5FXSEUkA{R8`}m>6cvd$tSan ze|Wr25K(`a^S5=xIbPGPJjx0i{I@n;Kj0IclW7`_bWOlBljGYLS*=cek z+ltYf0SV{8-^~}K40gWdi8ysR6_H*t_cY*jQt5L0-Bo^XMQSt7C!bm;l@)$(HCp70 z{+!J3K)UNsW7tf0x;jb9p?%BzGX>MtNm6ijx&Q2F+?ZGC>cnbrwmRXTTz-e*hxkW+ zrmCPn{K;uT$qlJHl#mi8lDSGrpy`cc93TUVt}7kA?Yz85jfWQ(aq;3R4XkASo9!&C R?G;`|?UI9CZ;RWB;UDUEYU2O^ delta 2509 zcmZWq4Nz276uxiwAH~0SkhPHIDdlpSaGlZ+rU?F>6;- zR2)ON(|HGE8Ei1CdXZl$9y+ z()3lb;PGve?ygc)0tX#;pU3|y1?A_ zYafS^lTimRcAmqKr9F-Vy76FEK>i<$a{8pHUbj#$$`$DNc@pfI^_Q-9Hg8TysRDKX zsrI_G%6-TFwq5-v+dtZiPNO(N^mJ{;d@h3aB_?yJlrzM0X4;qWG^~d+a4i^c-OTXk zxF=KQf?Y1mXm!E|Dxf0+P=i!D79a0717d(Vl`+V2q!8BCFwqK5jE!+CkZ?0GFd-r4 zEmKbdnxE<8ILD&ksiQugF%I;P(RaZba6g&B;1E#^L=#gY#K`afGe8`U4c3IjBEBqy z+ad575TO%-afk;H*Kx4z08Yf?0p^&#o&`<@8wgCWnK)98270m*l()dd0Evu1oFf?c zB9jS8f-i{U_>hXT9)bWCkE=#dB$@skImges$+A^Y1UZ+~RE1WAq2;w6#Z@C}>Nd%v z$dcPFGQ|fHSlMdbZs@@h$ti-g+Upb)Q57s+ue-inl9UojaY-Jai(MX3kk^QAX`@Sd zq2B5iJx(wNrc#hS=tlJUglhC;7kuM=Zg+{YAaC4U54gqcmg*n_pCWh^o7?5B5Nf=b zL8%uqc5N3hRIg*^Q*nGMY@RkR^!ejQ3{$W!+n{u>s1@PhKoCn%xe?%;AY<8il}l8) z4LZ1?fakCovfCrRx)elm8n}<(i>IRbY*0C`o{$X4;k8Avx}$p9wkT77MM5hRR|GN6NWde)4^Wgwx!#MpzE+?Xc$4Y&<{LC7AJ z`w+Ov(Hm6G5JAW>u=|$Hpr0MXUX?rzq!);Z$FNW3Op%0OR`~c-X|+?iZNOnN_~6R$ zc;IMMxqjf5fjn`82UIR53ZAWeAn|RN;g;cuk$1}YT^mI&L!EwzqPL(a~T#EaJtr&&A25L{pyIW6A$&eGelt!v?dKT2s%_L7{D*7h*|oXPs` z@!iSpvyR%3s>Rp8rD5xxqQj2xpWcgV@Q2X+iniHl86Eju1>G})C#nZ@^kVjxTo`?0 z@em!(jxNT{VB$EmYr=X9WbJAohtFn>SS{2D9+S&g>M4|^T8}gIWUuxpLUpz1q&KpS zEw*$XuOfZNmS9-^!QD^Lm=4>FJf1%7vCM|BVIdW7A*e?iZm-PBJ^tqBOTgSj2W@=s zaGqI5`z#6c8EY1g2h5m&ou`Ma_aXO#wr}WBOBhYDK2A;fk+da$7VgE5zYlFMTCZUP z;?NpX+nd(J*e^J=K4LuqvUUM9dB56AnymE}_9+hN-&A&+P=E`i6^r1bRL1_Wu#31B zn|Zo+@6@&;I=a#tAFU+-SHl8jO6O6HdJ9d4oXE=Drt`JAh{jGfMkiR2qKIqem)b!f z;q-gq-$b%8cYiqsM*Vek?(-3B|5P~z1hkkHi571%j0xi5T9IHC`V4>{t|5j*