From 63cbf887d119ec079f342ff593c891631edc9dde Mon Sep 17 00:00:00 2001 From: Gregory Campbell Date: Tue, 21 Jul 2020 18:50:17 -0400 Subject: [PATCH] Minor bug fixes I can fix now that the voting is finished --- Assets/Scenes/Game.unity | 4 ++-- Assets/Scenes/Main Menu.unity | 4 ++-- Assets/Scripts/EnemyScript.cs | 12 ++++++++++-- Assets/Sprites/Enemy/EnemyWalkLeft.png | Bin 1453 -> 1458 bytes Assets/Sprites/Enemy/EnemyWalkLeft.xcf | Bin 14165 -> 14165 bytes Assets/Sprites/Enemy/EnemyWalkRight.png | Bin 1376 -> 1370 bytes Assets/Sprites/Enemy/EnemyWalkRight.xcf | Bin 13990 -> 13990 bytes 7 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index b8e4219..0e605cd 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -896,10 +896,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1920, y: 1080} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 diff --git a/Assets/Scenes/Main Menu.unity b/Assets/Scenes/Main Menu.unity index bb5feca..6f124ae 100644 --- a/Assets/Scenes/Main Menu.unity +++ b/Assets/Scenes/Main Menu.unity @@ -956,10 +956,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1920, y: 1080} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 diff --git a/Assets/Scripts/EnemyScript.cs b/Assets/Scripts/EnemyScript.cs index 96cca45..fdd568d 100644 --- a/Assets/Scripts/EnemyScript.cs +++ b/Assets/Scripts/EnemyScript.cs @@ -16,6 +16,9 @@ public class EnemyScript : MonoBehaviour private AudioSource audioSource; + private Vector3 previousPosition; + private Vector3 currentMovementDirection; + void Start() { rb = GetComponent(); @@ -39,8 +42,13 @@ public class EnemyScript : MonoBehaviour transform.position, player.transform.position, speed * Time.deltaTime); } - animator.SetFloat("Horizontal", movement.x); - animator.SetFloat("Vertical", movement.y); + if(previousPosition != transform.position) { + currentMovementDirection = (transform.position - previousPosition); + previousPosition = transform.position; + } + + animator.SetFloat("Horizontal", currentMovementDirection.y); + animator.SetFloat("Vertical", currentMovementDirection.x); animator.SetBool("Speed", true); } diff --git a/Assets/Sprites/Enemy/EnemyWalkLeft.png b/Assets/Sprites/Enemy/EnemyWalkLeft.png index b141e4b1c1e7499c70058ac5d92da159e65e3a95..db08e410cd5a8278421b19c4f057697ef26681fa 100644 GIT binary patch delta 1356 zcmV-S1+)6C3$hE4QwS9nEjDA_m_3nOD1RDBL_t(|+U=dcP83lT#?MTqFcykJA_`d{ zA)%oVVzOR8Svop(lzkANPf95U`1VIo4K@g-)0d9d=v+XJCW81Ua06>G$5`hR{W`A|! z073xMb%PMVc-;`N1z@R7*Vkz3r097%Ti;Jz-ZwUVEsy{~#I@zG5uH?Jt}8e$P#^+S z5caDyzG!stEeb?1|I9R-b6bCg6bNn;(Pu<}iU7zm-^O6aRFFFo_!I>~DPsU>=8sKZ ztIYhO=U-}53jkDXevNtG`g8T8*?)^!>Y@hl!2FrT`P|ptm|HMj)3#1P5m<9;EX#No zKz;5Wh8oSES)4Cye%kx%Ogo4Gj^=0S*`wzdURzmTCaDSuIy2s6ei>1~RHyhdml0_) z*<_fF>G5NvMFSQ9q_vi0%X;_re6Q-^(^g^gZJ;vs2#^A5)=~Gkwp8I#kAE~hKOq)? zqwcYj`DL{Jyz+56m@NQBZe|na8#IU-prMwuvcBvLL7pPeG%^_b>^%U`VCZy#K;n1+ z+Z3?WrlB$*D0(dC9srSmRl$#6wNBHDz<4(>tt(ihuWw_1JO!-1?gjv$Wb@OyfJyUh zAjl)zmhU?NA$RkMh;Fq8tbfceBV=#PEwB&!?0W%awO*TOAjxboDInhZlie=ggcMMd z`H=7wU^1TL5-daj2mq8JZcDF_0!j}52>nO_5CDKwq=2mcb9^qK|1)bO5JCii001Nk zfaGKlB&-I=0|CYdkOI6Bhp~!C@=b3l8gLq<60uV#hZ#a2r-H=*V1EO_=IYH-ulL}| z*9+(EzsALUQ2>}gDBJYBaQJMzSOAEKZj9b*JSBYF|G?tj1{#eY93FGNM(?mA3W7+B z`9(~>>^ym(001?cUzYJUP;dl6>_E`q@K`P8XTjz}Eg~KO(@n11c+LtXwtUUkR}FxV zH{bU(pzhJIc%g<=p?_>Pu&yed6Ic<w^HvUwRY1001>?; z`dCKmcQs!!G*}bZU~d5c)Mz3?zajvNv|w%Eum+%x1t5q3iu1PyaKsmZc}&z){ILfh z8UBm5R*mM1j{rrW&{8*u2Ee9O_YOO%yNsdqmaa9l+lu9M@PFT@f8vi}{r`RZ-_Q6{ zLA}F{^>S`)UB-x?@pei+r?=G&lfTX7G4Ar_X&-SM;Z11DWuaCFU z^!P~T-?#P-MEswT^wxiwk=likKmedOj6=czsJr+B0DlkwfB*pUKLCIL00aOa00031 z2mn9;00ICI0FWsuYXJa&a`TCVEeWe~F-V&6oR@=%2fzh_^`jqF$6fh(%-(z=1#1Fr z4b3YF=8LNVlBWE+I)I`@TM^iY0Ol)B0cqw>PEK0Ae`jaM_`c-p0Kh{{OiY{>F+cCI zNC6C_$vIHf5g^(6%QRkM_*WAFV7}6E0LjK70yL=I-Q55Y0LDWQfBgYj%@Tg)c3XD< O0000JkL@gc1ppe1mIy=uGs_bP5Pt%g zt{a2^#_NWFEdZ+>y0=BsmwC_AJ@|Fy^1fDkD3Aa_$hGBf5nYyLt}8e$P#^-75cbP7 zK5umJEeeD%|JpR0b6bCg1PC4x(RW0Ek^o3E-^O6aRFF9m_!I>iQpNz1%x|@aN;5z2 z`ByvC1OO$QUt!+2{#=7-_I81KsDA-GFn@MsDf4xA7nhCKw5=0R1XkP{i!$B?P@lVp z4UOi{t}Nv?Kk5BdrX558NAuJ4`uUq%udVN_kyJGZx;EZqei2c?RHyhdml0|**<_fF z>Ct1PMFSQ9B(;`!%i8;NvsX3qs+rq-8>mb@0;GV7b=JG6ELFJFBX!SDh<^p(tassL zei5xdt9+aeW(z=`n^}kX292NwsHr8b@2ojPkfjJTjSNOUdmjMQ7&=`bkT@Q|HU+G9 zXtW3j@*c~%2S6lXRq%`V&8ws$Fxm}F>I&xR>)V(gO#xdUdI10^*!-j}VBCBg2(rkw z<@*jmgS+`eL=T(8R^}HGvVV6Mm)VDX_Pv0jTCYtskYu))6cBCw@otxILJFwJd`Nf- zFd5Hr2^Jy%1OSQ^9bfdJzJNCDo6!&pTq`KH$u4LA)_iP$NW!wjL1Q^8^Yuz_HI<9|V+*L(Kz{MLB~ zuW>P76aXd=iZ(qf96lQ_762lm`x8%UPYFMdzp%Ksfkxv;##+wT=%02)K@e&&Kac5m zohJ(v0H9*?i!$B@3XUL%9S9m3YgJ-?8f-q)BH{rs-Q=o`=d6armaqBxssZrv=KG!o z)IAy&E!2=Il+6ZKRez;(0xN|1cE?MN77eZDBm64?0Okt-;3Ltb)@~XAAfk6fM@6)L zSMw!9gEfIQ_7(s@g(f2OD*_--3)Th>YXGWP0D=ghIDcyZM|=^O#Y9cTAA11e;XiL{ z)o8x>2#^N~Ep>xv0Bl-y|Fo;R%h-_K(zS+mTd|xD{`>S#^nWp||G!WD`x$*IsDIkE zUe2wp%NX)A-cIr7^!7JynhW!p0Z_yfz(@x|Qoull@8(O52x$+CY8@?PyHluX^M@=z zz(o1OOlv0A$&M4c{q%2vCbS4LGscBPc!=kXGTF zTK?hZr?r{y^M77JY)1kICPzW=G35KcQ536P!d&MAs%ZU5VIKh02ti#NMRGBpB>*-c zxEeqH``GDyCyfaJP^aPxL|u(^RU7~=yM&4XAg<}hqm}N<^Yz;gw)aux*T>taJvE;C z_k+U|5&vf>z4hN^q;_E>5CG^6WSq#zPQ){Q;|;4v}S6CC~r>002ov JPDHLkV1jpUN!I`X diff --git a/Assets/Sprites/Enemy/EnemyWalkLeft.xcf b/Assets/Sprites/Enemy/EnemyWalkLeft.xcf index 1c3abcfc00cf1799cfe7c4b4f2dadce54d3dc5f1..c81094656e3b7cf042ea0c530e06fb37c1086f83 100644 GIT binary patch delta 524 zcmcbbcQtRrJV9L*V+JN24iyuI|2mvNl2ye5h%FgdfS6gu8jN{Vj2Iwz^J&3AMz9ts zuofvIw0H_bwTOVVh!COWxX4To{bpwXaKH)l<)CGC5BtcJpza GJ}v-vH(56T delta 524 zcmcbbcQtRrJV9M=V+JN24sR2N|2mvNlGWP+h%FgdfSB3a8jN|ojTj(!^J&3AMz9ts zuofvIw0H_bwTOVVh!COWxX4To{bpwXaKH)l<)CGC5BtcJpza GJ}v;>3~ZkO diff --git a/Assets/Sprites/Enemy/EnemyWalkRight.png b/Assets/Sprites/Enemy/EnemyWalkRight.png index cae32103dd41f5b2bfa60a99f9e29843c73910ae..26affed7205c95ae9dcfa77c459326fa950545af 100644 GIT binary patch delta 1241 zcmV;~1Sb373fc;gQwS9nEiVVQF#VBRD1X99L_t(|+U=Y@PZUuUhR<#&j3z4z2?%6e z5)zs%+{8%y0kqOt+HJ!RqM6Q;PFsF~iE$~mAt70=Ep|eKHQcLKpw*Zh9UsUFdond0Dpj+ z@fu;M!F<~w%xN)y(7PV{yjQE!2)+rnseeBr`i2CU5dgks`zjA4(vqMi$^2Ox?+bz? z2si@ph={&~nBVF&vXl%!z^w=PbNA;mKa1Hu&r1Si(7PTN(Km2Wz3LCJA5qiSKwtAi zU%%>7qzZtST^dfS{c#t&Oyje@mwy%r>e4>&EX}t70c!v_UEnIfLjo`}K_dipf=ole z0)V&%(2aks5exvJN;QW|kgj)chPVE|)SSPSRB;nS-KZ^MHjrfkaF74<;T1|iS&}k` zem=ZX0Rk5Q79?Lp$-9E)m|Vb-^kG-j?Tg#RgeDM4fMH+}+K*@vCBUGTnt$_jus5t7 zpb6Bit)1j83){O*(JO)gz!QSW$soxP0084+xwmcdj^a2BOxiDaus5tB0SrrGDF6V0 zauaHMw>g#s0st^B08l~-002W8^sZx@LMdec0H6dwmW8!|9E#f-CUNYK1b_el1OS3G zxfp~Vz=*bXn%)OXAOQl#*?*An1h|2qsu?%U5V9S@NSH~JJ_KY9z%&TnzkT@k>!&Zi z{`b8ibo08J&1VmQ3qsK*`@o>Zcu@cl5j|LYQh7x@_wJu*}xnK zq5%joI}`>j5QqezOyl!_paFt9%ug>Vvwlwiz)*1zaA-_T0Z{dwsDCjDSOdWE4$}q! zRs)?zPjkH&T>@rhOxC#oB!Hm1Ixj$@vw@i;z$hRA4l79j0E|Nb07~jJUK2eA00PZ) zpXZwbuZTVY0LD!rgc4AC3IG5_Mrwrs2@u#rNM8`D!${jHU@igjm}p@(&}0b+y^~!q zB$ojb0EFDh+Ec(x0)NDf2(l!B_W1*h0zA#vk_@bOwNBR7qAqxxsaY0+(*9J8NakM+ znFAmT1f#P-Cc`y=fD+*J1Vz+*Nk_$++!MI4+?r~1+THJ-Qy}^L0J8~@r=+wxja&cH zfRK~|rgsG=Ly*7zw>k}xNq`<8gRx~i763p100ICI0N|}Wjei}Qz!HT`o#jZ(RItzZ zJw)rzKIH21-Me4PbTI3AfXkD^8mG+`aVM5aKSh*1rBxgdH7y0QNYY}Ex?|$XP@a`R zX-mSQ0a*Qc;`Mr`^|iu5ka~iss1NOe;0u7STyQiT6DRr?Xs;~Jv^4ZTU#L4OR?TW) zXMJ_*&wC$FF&XIBoB(M6_{s%GTMA$**th^dU}*sW#x(1bj|3loZ(+S32>=K@Bz|*4 z(&}81)3=&8g{b&N+AE9WA9v?7J@)z1z2H;<01UOUu~Eu8{hjYussX?#AVqGnU{9c7 z2(T?&h&DGjiHPXv=qUF4X>yNz zX`m?u)FwbughK`>nm|BcFafkRXXpV6><0iF1SRMf#Uj(t>e#@500000NkvXXu0mjf DMW`RG delta 1273 zcmVPa8oLh3{I_4gn-cK*sbg zvQiWpS}LT_rA+6BA4IcVO1eaHMN1PYiYeU3u?ztT1K|h6DH0+xS$lV8_A&R~bEHTF z{9@0y=iYfRL=Xf)5ClPxIz^m6d^hRjer(bmz-{gT*cc8l1OZTn@qmT_0HGN#5r2jV z=IaJwNs9Ty{=?Mez1nfp`zF|@!Lx+uCla6{09?&>l?^1^k|5$_e$~dig1`xa5CM2W zL_d7YZ^z9%B?AzI)&u;#`>o8+W46ol<^eM7KTM108$wZ|?hkO1P|MXoSMz;ezwS~b z3V?TA8ZD~*X&1XpPXdh-AE*7B32N}Cw!CLI>Dfk7rf=<$C&x-qN4%qEtLKBE2z%Z}~og}n|5};7)tz|kr9)CrrXaZ$x z_i+A}h5e%z>lHx&;0VF&WDsWv0Dy7@xwmchjtX%YIB&n;>G3E+0w@;8QUCxvWhT`A zQESQx1OT910HA~v004?K>_4P7gMoNVM3E_F2f~&fD&Nz1Vz+*PDjP6+!MIE(OzhD*4=NOQ^5KB0JRBVQ&QS-^U1#~AULIf z>RrL}A+WFi?YPM@3D5)NFt&`x0ssgAKmY&&0Ab6fu|pGBqJOZdvmCLR3U(R4`)KFQ zSF0}Hy!*LK2M0Y5a5p}WLfUMRc48^_Q$&NOw2lL!7NtNQaas%#cT8LvvRN7Awj|6N zfX!cHr`Nk^Y!way*AqlpeP|N|R{&gPf+OLWIM%;F=jB?ZrD1S+BkrhJF{^>`&gR0O z_rG0W&@VXwvVQ<@l?jft6u?xlasdF((gFaKsp`fP06+i$0s!a(000C4AOHXX00;m; z000625CDJxz#n0~9|-^m9K?Qe!@SkGBByU9Zwe9di*#PDO}FFST#sG3AA6ZE4FC~) z0tc5j(RNI^*6DATZMTHWE-M%XWXMbw>9uX0pot>qAKTGEG9w8W9 z_Am+vRR;$LQ(L2LAs`~^^?E1)8dL;C0H7w#yL(+AFhQ728UUaG0_hTcQYau$lmOD2 jGmHWX8W8|C2wI@uAWYJW!$Dch00000NkvXXu0mjf5(gTH diff --git a/Assets/Sprites/Enemy/EnemyWalkRight.xcf b/Assets/Sprites/Enemy/EnemyWalkRight.xcf index 69c5b8f5e92168ca6a800ad0fc670b51b51e9dff..ff2b5a974b8daaf1bd2aeb096c3c05aa8341e714 100644 GIT binary patch delta 519 zcmZ3MyDWFZUjaiEQwClYLpWwqVPs%dF=Jp-u>oUd6>A0-6)T{;5d)8k2?LkPW<5bw zMl!Uu2$7}jmhf*TeH9iRBL)r?CLLo2PL=;UmJF;wCxI{v(3v17GJ~B5av}(CW)b&i z1Zt83Ymx$Mk|L<7Ndl}%1guE}tVx8BrcF}5+>+kFVDUC);6}mqj0_BuH_C}ju2c1x zd`PuY6sxMq0ctm~%WSq&|G_BgZNb3qZO*{yZHk09duwtrN??_$XEd8!s3kkOOY0SG S1rxMoCl{!&Y+kGVlM4WI?NWIF delta 519 zcmZ3MyDWFZUjajJQwCmdLpWygW@KRYHe+D&wgF>iZ)*k?Z!4g@5d)962?Lk+W<5bw zMl!Uu2$7}jmhf*TeQy>WBL)s{CLLo2PVfIZmJF;wCxI{v(3v17GJ~B5av}(CW)b&i z1Zt83Ymx$Mk|L<7Ndl}%1guE}tVx8BrcF}5+>-6UU}-mI;6}mqj0_BuH_C}ju2c1x zd`PuY6sxMq0ctm~%WSq&|G_BQZo$CbZqC5jZi<9AduwtrN??_$XEd8!s3kkOOY0SG S1rxMoCl{!&Y+kGVlM4V7vt{7`