From e002a76690ab55c4cb8fa309329319673114c603 Mon Sep 17 00:00:00 2001 From: Nicola Sovic Date: Sun, 3 Jul 2022 15:06:05 +0200 Subject: [PATCH] Added images for left and right hand, added new item-hover display, added item drag animation, v1.3.0 --- Assets/IMG/Aseprite/Inv_Dagger.aseprite | Bin 631 -> 870 bytes Assets/IMG/Aseprite/Inv_Orb.aseprite | Bin 631 -> 837 bytes Assets/IMG/Aseprite/Inv_Shield.aseprite | Bin 631 -> 980 bytes Assets/IMG/Aseprite/Inv_SmallShield.aseprite | Bin 631 -> 1071 bytes Assets/IMG/Aseprite/Inv_Staff.aseprite | Bin 631 -> 0 bytes Assets/IMG/Aseprite/Inv_Staff.aseprite.meta | 7 - Assets/IMG/Aseprite/Inv_Sword.aseprite | Bin 631 -> 941 bytes Assets/IMG/Aseprite/Inv_Wand.aseprite | Bin 631 -> 709 bytes Assets/Prefabs/slot.prefab | 2 +- .../Resources/Equipment/Mage/Inv_LeftHand.png | Bin 0 -> 646 bytes .../Equipment/Mage/Inv_LeftHand.png.meta | 96 ++++ .../Equipment/Mage/Inv_RightHand.png | Bin 0 -> 428 bytes .../Equipment/Mage/Inv_RightHand.png.meta | 96 ++++ .../Equipment/Thief/Inv_LeftHand.png | Bin 0 -> 1000 bytes .../Equipment/Thief/Inv_LeftHand.png.meta | 96 ++++ .../Equipment/Thief/Inv_RightHand.png | Bin 0 -> 574 bytes .../Equipment/Thief/Inv_RightHand.png.meta | 96 ++++ .../Equipment/Warrior/Inv_LeftHand.png | Bin 0 -> 765 bytes .../Equipment/Warrior/Inv_LeftHand.png.meta | 96 ++++ .../Equipment/Warrior/Inv_RightHand.png | Bin 0 -> 642 bytes .../Equipment/Warrior/Inv_RightHand.png.meta | 96 ++++ Assets/Scenes/GameScene.unity | 534 +++++++++++++++--- Assets/Scripts/Inventory.cs | 62 +- Assets/Scripts/InventorySlot.cs | 110 ++-- Assets/Scripts/Item.cs | 57 +- 25 files changed, 1224 insertions(+), 124 deletions(-) delete mode 100644 Assets/IMG/Aseprite/Inv_Staff.aseprite delete mode 100644 Assets/IMG/Aseprite/Inv_Staff.aseprite.meta create mode 100644 Assets/Resources/Equipment/Mage/Inv_LeftHand.png create mode 100644 Assets/Resources/Equipment/Mage/Inv_LeftHand.png.meta create mode 100644 Assets/Resources/Equipment/Mage/Inv_RightHand.png create mode 100644 Assets/Resources/Equipment/Mage/Inv_RightHand.png.meta create mode 100644 Assets/Resources/Equipment/Thief/Inv_LeftHand.png create mode 100644 Assets/Resources/Equipment/Thief/Inv_LeftHand.png.meta create mode 100644 Assets/Resources/Equipment/Thief/Inv_RightHand.png create mode 100644 Assets/Resources/Equipment/Thief/Inv_RightHand.png.meta create mode 100644 Assets/Resources/Equipment/Warrior/Inv_LeftHand.png create mode 100644 Assets/Resources/Equipment/Warrior/Inv_LeftHand.png.meta create mode 100644 Assets/Resources/Equipment/Warrior/Inv_RightHand.png create mode 100644 Assets/Resources/Equipment/Warrior/Inv_RightHand.png.meta diff --git a/Assets/IMG/Aseprite/Inv_Dagger.aseprite b/Assets/IMG/Aseprite/Inv_Dagger.aseprite index ed2fe4764d783f2b78cfc00495409079e9db7e2c..af8a7b6e3dcfa394b9f9f470d9e77efa44906753 100644 GIT binary patch delta 369 zcmey)@{Elsjd>zd9n&+WjZN*0^|6c$46F(a3}Qg|pNRnqLKs3AD(1Ys=E&D%Am9+V z{>dfonJ1>&G-vlO&z3S;dS-pXPy3moCeHV}P9N2(l{)_DOUmWRzUQ|&&42z{_S~VF zo0qH4o|jYgEbG&y&9i`vO)qD9+nd?m1S&HYf3;{kN%|7u}cs zSsUmIe>2Usx_qyHZ zmeuh6=$i*|srHxEzLjzDwhw_CHn06qZ}mF-w)ukfV9AqWRns;fT%WmrUX>WgebJMj cAA0lG*4-OySBmwl=ldaEZ>nXy@Ym`e0DzIjZvX%Q delta 69 zcmaFH_ML^PoM|Fc9n*KljZN*0T6qi%46F)30to&yL1+es1|Y1M^Y$PkBT%Ga!oT(J QIJhPn+OuXc@G~$10AKeI=l}o! diff --git a/Assets/IMG/Aseprite/Inv_Orb.aseprite b/Assets/IMG/Aseprite/Inv_Orb.aseprite index ed2fe4764d783f2b78cfc00495409079e9db7e2c..0ea9ae5a5dd01e8b6608f88b88364f3cd3da06a0 100644 GIT binary patch delta 336 zcmV-W0k8h|1jPmdMFWunegee;v4V#Ie>?#I00kfb03ZM$0RI92000000000$06+kE zobA_54uU`ohGFi11<&Bx4$Kf)k@TxjeZ}lEl?#vyw`#zp8 z(Z%^~ckTD6n}sb>xV6oK79n;oH?zYCdq9I!ZbpYOcH;&m>_!br*_9iVv@10ze{EN2 zP~J{781w9f??5ZNpg}u3(E$EIc4mXg{+8$7#(%E-(K`mc1MtuFkFgUC;D;Z6_`~;t zAAb1ZhaZ0U;dk?H&C*dY@lo}KGnd;UZR1qec2#Ght*C-_H+#b>|_Ja4%Gdf?As0& iEw1hr;QpN5ZdT?D_TS;|eD}&eQ{B|0^}YfA$L5I7>8MTs delta 69 zcmX@g_ML^PoM|Fc9n*KljZN*0T6qi%46F)30to&yL1+es1|Y1M^Y$PkBT%Ga!oT(J QIJhPn+OuXc@G~$109O(a#{d8T diff --git a/Assets/IMG/Aseprite/Inv_Shield.aseprite b/Assets/IMG/Aseprite/Inv_Shield.aseprite index ed2fe4764d783f2b78cfc00495409079e9db7e2c..e2d56a7003d79c9ad68c3f86092a58a791762eca 100644 GIT binary patch delta 480 zcmey)a)q7g3iCv!I;IfjjZN*0^`{vb7+4h;7z7yD82&RcKtTdS2}8x4x0k*14jb^e z2EMQ7j&(jB8)wZmLG0hri7r>)3+%Xj#ENBl>d!b8&yTe=bt{wq{8T?azrKi6igX=F zR+K-#h0Uw+YwxE&czDZ`FM}XXZC=7u>tY_X;R{xopE@gQP{} z8@~T@{I}71#u2+B_Q^Nx)son&-|Gbax7~d|Jooy=TDITE@8q$&=W7|*%{rXF&d)6O ziQVGA$$quDGw^x3B>-(+nWBq%Z haNn};mtK@lUN%+o`}g*rF^6l;?VS3V|Ns2BO#s1z4e$T} delta 69 zcmcb@{+)%XoM|Fc9n*KljZN*0T6qi%46F)30to&yL1+es1|Y1M^Y$PkBT%Ga!oT(J QIJhPn+OuXc@G~$109#=Y*8l(j diff --git a/Assets/IMG/Aseprite/Inv_SmallShield.aseprite b/Assets/IMG/Aseprite/Inv_SmallShield.aseprite index ed2fe4764d783f2b78cfc00495409079e9db7e2c..5c87e3c558b83a6ca902de7765b9b6206083a379 100644 GIT binary patch delta 572 zcmV-C0>l0H1g{7JF9eYSegdxpv4V#IeKVH3@zRBXAa(Sy#36^WX8`U3i+Ye_CGxhV%EM5~9*d!j z_cR^8K0l_bcWuI4y#qHi7_T0aRu|U47#k?MCp0lnE-|T_h+dWUK>q54$fA7i& z(*<0i&z&gKiY+@X&+%x}L~GVY1e+ zU2o~>?0Q?zf~!39x!(GoZf63I{G_5E5Jlf!z(vvH_4Mv* zWW1JXw*FbJqvO>~nd>5x>CBiim8nc+DpQ%RW_sp&9-i4uXB@QWxAjx{tbUu~E3@f{ zE4$B%Y1;q$7WPbQx>CthrYlszRIYeWnaVU(^-SeD?b&=^lHKP@)$x?6e~+nL@t!jE zF_kOc^JyyAuIGrU*6KOa(P*uiJot+NLz;KaV{j!*FasPO}AW@uYs-EDAQxl zM7vhPTyNs}8i=ij=dm}UD$#7-=79PRG&-(mc}#I$1jj2_9@Cnum*G_{YdK>vTgskG K82$m6Tz!|T3oKIr delta 69 zcmZ3_@tuXKoM|Fc9n*KljZN*0T6qi%46F)30to&yL1+es1|Y1M^Y$PkBT%Ga!oT(J QIJhPn+OuXc@G~$108y+Evj6}9 diff --git a/Assets/IMG/Aseprite/Inv_Staff.aseprite b/Assets/IMG/Aseprite/Inv_Staff.aseprite deleted file mode 100644 index ed2fe4764d783f2b78cfc00495409079e9db7e2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 631 zcmcJNPbdUY9LIlyY30I6Iqgf5o7qXU+1gSr)LpLz3pHQ&#h-b#bW{edAFh7v z<3H++ufM;TeyT}8J2RmC$hx>2)*VXybb@s|{!)u{sy;Z}6M?C42<8)m@NS_SmiJSz za z!0g5rOgj#oNW|gtP!1m2HY|@P;r03{%oj#rZr;)k2WayCyJEp1I05>&BaSu7_#%rb znm8he9cp+Xg%LWQi`H16KtACl6H6w6q!AVLl2jwC6$%oN(V4ZmMHO;+F;#U-b1ACj bU5nMd=X3uOWVXMKE6pvny+1x3X%*ueAOG?LWc~S#x2|MY)-AV|*93ZF%j4oTa=+@! zmRrw-a4)}l^>^?7y>Vwheddgl>IVCDOVrmL=BJ-m`u0P(vtAXx|6R!oGP$fK%Jx?B zi|>_xJ0WtnZYO8#SN{TW!`fGJ&c8oD++0|5OZ{V}`4gb)AK&|5ntgohN{HrLbKlyf OLo8|e&01GGT>=24xbgS^ delta 69 zcmZ3>{+)%XoM|Fc9n*KljZN*0T6qi%46F)30to&yL1+es1|Y1M^Y$PkBT%Ga!oT(J QIJhPn+OuXc@G~$108ri#umAu6 diff --git a/Assets/IMG/Aseprite/Inv_Wand.aseprite b/Assets/IMG/Aseprite/Inv_Wand.aseprite index ed2fe4764d783f2b78cfc00495409079e9db7e2c..37244d2897f1209380bdb36e09770db9ba93dfbc 100644 GIT binary patch delta 206 zcmey)a+HSs|3b^R+P}EY|M~mt zFR!o1-@2b3cER@2{tZs=1kdh&GWW*)OY7%9Szc-U_m^kgEc44?jx7ogFXwCVo|$!j Se_7u1*vrcXaU~=$uaSW-L z^Y*Ueq{|LGtN{n#MijI89hHnIwuzXT6?4);<>0?pb@{f&s$2h^@Y|`ijtOW2GPqQ` zYgfbMKUJT;FSDN?DP2?cz9+){RUf7OR-^QH@ra-u~dA0ED6!sA%ecs1q6>^#K|y>+vA>o04vY-|m^{4jr4 zi^8TAS$2PX+XZU&?P^etZI8dY_}dYNIbR)~a~1Agx^{_X*#EdsOBD*4L$2B!UVrMH zsu{x^{usXgwf@u_T|I_5-V9>X z3)HRt-u)kUX*r{GLLt)z3&w~!3_5-cV(JXt!VO0`4?JQ)5uX0RWJA_M^(Ie$rqwwO zPl57}m_9rR-@J9ojc6|hz5QZwU`q-nc8KsT`)e|x?EC(WjAG)_4M(JxrK^4y+T6t! zTbJgY@_k@@~On>sVa*6ZX!cLhj`$U$k|L2<$*gQ?~h0&i?4-T=d zb-IxGBlO`>-l&!Zw?C|w60zvub3Fbq+*GsZL91Z?wPhC^eK>aU?_U+Uky*dDYH}It z`-z@qLn`LH zy=%zVbMsmT`sFd55AIgQzcOa54w0%hD}CM{n#sf~u+D|6dfS(C^4WJ;q!i{bv)n_^JSKs2?-?$q<^HR!(D`-g+WY_VQVKDhB4XQLtgK(fx$4eO5PzkK*v7Bb zbuY8mFdpJ`uwdi}ubTf)CF}EX6A(w8;o+`Zt9xDY|IJ_naaa^$uKzZjeD=Q+)P}t9 z>ThYE#V>%QfNr>bc;C%GqA;yhcdTdcSL7A&V*nbxL+;!8Xa6U_j5%t%>P)Px&qDe$SRCt{2-LZAsKn%ulC@%}8aFK;FfvXJQDidU(6e&ECQbhEl=o3YXI^e_M z|114$`3QjEounhp00000000000000000000^G_&qBHkusJk2W^eS?@9X0>s#~Ze}DblHHaI< zkSeCB25XDNKXRtuO8#VT5lkAzkRrAz25C=7yxINaPaZ7-vwVf{C3*lGJSF*F8sqD^ zB0219^Z@So2%dW4=ccjFy205*JArBkI9t->&n?D%bxbN0J3#uxY;^5+`e zK!Qvqnp5(7Ed#e&tP;ZGA3lH!*E9cFZv;I`sR$GbVA!_5Mx_X%3!r53CkjO%F$t`g zd^3&Xj_d$uGmRibn{@*Bd_;8snPrd|_qarKfYR6fTcYLzVRHbIe=RB=-UUGG-^MLY zAsv9Tzbzszo^t?Z{Tq3%3MAeKKpd|Qz}df(R~MiI6z5R@%>0k(8b7xVK>OdvD_&dz zilYFE>%9tK_J2_C)c_r!I0~RR3ZS^2a{$@vfAm+w_v$$hDAxhD>=53%i+BX33SduS zs}zCz-oU6$8IL6N<@K%GxS}_wOk6v_S`vDmaYtUe$GD>6(Bf7ATzmghi$ke706wDt zilYFEqX3Gd0E%-ffGz7=wYOk

X|W2Ut6>o(Fy8wR?;!Dh@5BJ`CEszEHg3 zdlIUW{N74_B`nj&!M(o{rg)>s?vxT7t<)s|pHTqCd29}qoCjp!u|bp$P#gtNoLd2G zc>Ee>yyE3i0MWOj&5j#HpdW4$C5W3u!HxIznJ#dL_l=`NIshwzwurcR7XT}QZN|S@ zG+p3YR6L^2NNyQF6Zzk3pm;3axeug^D?nf$TG<{)9V0}lMT=f8fU#!^360mz+B31pnlfR$qsDc>ai(D zilFy0FjMl)#0S^#ltSq7Mo_lIPf`rB;nRbZA}$R#<|e6Pnrg5O%_nO0EQXZ{Y06lp z9CX9#qt%WS#D*0}>KLXT{ED8>+8ZinLmkYDBLz_KXs3%q%K=D7Z+s961v?l<`uIn)^*mTl$#(C=IJ=k@L1PxS5Y+!wVyW2oj} z0hW8i@brsS{kq4|iA*iR4FyaB=e9PS7Jd6?;`hI+_n5&{)$kSU^4)iSelkqabB5!( zw|;KD_nm(x!$TH@ISehEng4XW_@gKcVgn8G{Su%$ajty|RKvQHaZw%T8Xp1=+uMu0O^C3I!I07;oDfum2psJ^LPi zyq#Tjy!Z{ysH%5YXFz?B{p>$u+g$tOegSQq0)7lYt9GbX=YOhWsDJzC-S?Z`@zxzT zIDJ521e6TD&Di$L?)Uq1_OCB}SN`~ literal 0 HcmV?d00001 diff --git a/Assets/Resources/Equipment/Thief/Inv_RightHand.png.meta b/Assets/Resources/Equipment/Thief/Inv_RightHand.png.meta new file mode 100644 index 0000000..b686061 --- /dev/null +++ b/Assets/Resources/Equipment/Thief/Inv_RightHand.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 8a9eb9ae934891242a4d2be76a715c8c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Equipment/Warrior/Inv_LeftHand.png b/Assets/Resources/Equipment/Warrior/Inv_LeftHand.png new file mode 100644 index 0000000000000000000000000000000000000000..c932a077025519bdfe83d3290a6636ebe6314a72 GIT binary patch literal 765 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-HD>VA}5K;uumf z=j{#Kpw|up3=bcQPFH@$GpEZ~pxA~(Ze0?&a-Bi!+1b)kP}PUKYaT& zsn+xFiWzIc4o+qHFr|Q3_Vb4~-enBu8Go)yd!@{Oc8^qy9bo`*`z*$LAg&`xd_`>>WdaFY^b3iul)(p==Kl4g7EF%(iE`!+IGJQJng)8Et@ z7hV6Ee^(NVeU*OQ5eIwL%jcLE*W8z5yrWYyWnqZ)%j$17bJp5%DV_Ukv19X(v)31Y ze<>q+Fr)kaTW4_r!JZvIV(lv)rm+YXw{Lh@dB2p`jZ@)Ki(t>bAI^6U9GWlaaz^mb zvEY9Ko8=#=iM?|ZFihjHj(guW^S6QdrleT{X)!;#ALeBw2D1p(I^Fo$d~U*KxlhZ& za`+S%*|iz#{5g8Te0x$jhj>3*;fLk7HPft*`mVDOIdsXWXUY8+%V)g|G2gAE+M*JC zuISY4eGA=rE}zf;rT?LQm4ct?=HS|yz1!Lx=k%(0PFiyLH(T}8_V6yRaaSW-L z^Y*T9-sJ?5)`tx@1e~WGm|@!BA|9f$i|v?BqoQ|{q=uTx%Gc-1KG~gLlclx$)J0qK z`g0F~Mlmql*&iM~pCSDB*E6@{OYiTSSEzJHkg-F!VTUB&8hPhtY8U^r4Kmtg5^UBB}9-(Z+F*@S(w-~7=O1}SGzILBA8clQeN!&%43*;pfALZ+iFJ*!9^=4=(w~3AN`=n)QJz z4Raly#~+0HK>B8M_InnqdN!!ld1vLKtJEzPeSU5Tb^W$CTV2bW_QurzzcvGEW%a9_ zq2*0k2sc!}+q-bRtjxE+`_~_X8hksLU#|4u^78!tx}RTC-x z!{u}PkN9oifmyuyJnNn1FE`n>${xZA*idObJ!(nbl9MN1IIf9 b!@EoQDJOe(e<*8`28npO`njxgN@xNA&TkTZ literal 0 HcmV?d00001 diff --git a/Assets/Resources/Equipment/Warrior/Inv_RightHand.png.meta b/Assets/Resources/Equipment/Warrior/Inv_RightHand.png.meta new file mode 100644 index 0000000..8727e8a --- /dev/null +++ b/Assets/Resources/Equipment/Warrior/Inv_RightHand.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: ce4916623c299ba469b676f135be5ef8 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 3eed825..ad8ab9b 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -938,6 +938,8 @@ RectTransform: - {fileID: 1521636294} - {fileID: 822494757} - {fileID: 349908981} + - {fileID: 1991779060} + - {fileID: 125253396} m_Father: {fileID: 1456932137} m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1004,6 +1006,8 @@ MonoBehaviour: amulet: {fileID: 1144658891} leftHand: {fileID: 2074995250} rightHand: {fileID: 2051014505} + dragImage: {fileID: 1991779059} + itemDisplay: {fileID: 125253395} bags: - {fileID: 188567431} - {fileID: 1446002923} @@ -1943,6 +1947,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 123765786} m_CullTransparentMesh: 1 +--- !u!1 &125253395 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 125253396} + - component: {fileID: 125253398} + - component: {fileID: 125253397} + m_Layer: 5 + m_Name: itemDisplay + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &125253396 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 125253395} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1841765046} + - {fileID: 472316756} + - {fileID: 1419201682} + - {fileID: 1674772567} + m_Father: {fileID: 66523172} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -12.5, y: -25} + m_SizeDelta: {x: -375, y: -250} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &125253397 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 125253395} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.78431374} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &125253398 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 125253395} + m_CullTransparentMesh: 1 --- !u!1001 &134850915 PrefabInstance: m_ObjectHideFlags: 0 @@ -4343,7 +4426,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 206628748623723553, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} propertyPath: m_AnchorMax.x - value: 0.9 + value: 0.925 objectReference: {fileID: 0} - target: {fileID: 206628748623723553, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} propertyPath: m_AnchorMax.y @@ -4351,7 +4434,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 206628748623723553, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} propertyPath: m_AnchorMin.x - value: 0.75 + value: 0.775 objectReference: {fileID: 0} - target: {fileID: 206628748623723553, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} propertyPath: m_AnchorMin.y @@ -6647,6 +6730,78 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 463065572} m_CullTransparentMesh: 1 +--- !u!1 &472316755 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 472316756} + - component: {fileID: 472316758} + - component: {fileID: 472316757} + m_Layer: 5 + m_Name: itemImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &472316756 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 472316755} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 125253396} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.675} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -2.5} + m_SizeDelta: {x: -80, y: -5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &472316757 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 472316755} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &472316758 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 472316755} + m_CullTransparentMesh: 1 --- !u!1 &476405302 GameObject: m_ObjectHideFlags: 0 @@ -18827,7 +18982,6 @@ RectTransform: - {fileID: 319341376} - {fileID: 1365079344} - {fileID: 2147336495} - - {fileID: 1494783048} m_Father: {fileID: 822494757} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -18874,6 +19028,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1400711198} m_CullTransparentMesh: 1 +--- !u!1 &1419201681 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1419201682} + - component: {fileID: 1419201684} + - component: {fileID: 1419201683} + m_Layer: 5 + m_Name: itemName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1419201682 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1419201681} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 125253396} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.675} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -10, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1419201683 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1419201681} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: New Text +--- !u!222 &1419201684 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1419201681} + m_CullTransparentMesh: 1 --- !u!1 &1420067069 GameObject: m_ObjectHideFlags: 0 @@ -19807,78 +20040,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1489889202} m_CullTransparentMesh: 1 ---- !u!1 &1494783047 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1494783048} - - component: {fileID: 1494783050} - - component: {fileID: 1494783049} - m_Layer: 5 - m_Name: equipStats - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1494783048 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1494783047} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1400711199} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.925, y: 0.7} - m_AnchorMax: {x: 0.975, y: 0.95} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1494783049 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1494783047} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Texture: {fileID: 0} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!222 &1494783050 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1494783047} - m_CullTransparentMesh: 1 --- !u!1 &1501111747 GameObject: m_ObjectHideFlags: 0 @@ -21911,6 +22072,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1666134055} m_CullTransparentMesh: 1 +--- !u!1 &1674772566 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1674772567} + - component: {fileID: 1674772569} + - component: {fileID: 1674772568} + m_Layer: 5 + m_Name: itemStats + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1674772567 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1674772566} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 125253396} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -10, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1674772568 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1674772566} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: New Text +--- !u!222 &1674772569 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1674772566} + m_CullTransparentMesh: 1 --- !u!1 &1675736206 GameObject: m_ObjectHideFlags: 0 @@ -23498,6 +23738,78 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1820018527} m_CullTransparentMesh: 1 +--- !u!1 &1841765045 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1841765046} + - component: {fileID: 1841765048} + - component: {fileID: 1841765047} + m_Layer: 5 + m_Name: itemImageBackground + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1841765046 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1841765045} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 125253396} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.675} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -2.5} + m_SizeDelta: {x: -80, y: -5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1841765047 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1841765045} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &1841765048 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1841765045} + m_CullTransparentMesh: 1 --- !u!1 &1849127265 GameObject: m_ObjectHideFlags: 0 @@ -25134,6 +25446,78 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1964336710} m_CullTransparentMesh: 1 +--- !u!1 &1991779059 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1991779060} + - component: {fileID: 1991779062} + - component: {fileID: 1991779061} + m_Layer: 5 + m_Name: dragImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1991779060 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1991779059} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 66523172} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1991779061 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1991779059} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &1991779062 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1991779059} + m_CullTransparentMesh: 1 --- !u!1 &2025004927 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Inventory.cs b/Assets/Scripts/Inventory.cs index e0799c2..eb552c6 100644 --- a/Assets/Scripts/Inventory.cs +++ b/Assets/Scripts/Inventory.cs @@ -16,17 +16,34 @@ namespace Assets.Scripts public GameObject amulet; public GameObject leftHand; public GameObject rightHand; + public GameObject dragImage; + public GameObject itemDisplay; public GameObject[] bags; public GameObject[] slots; + Dictionary statBoost; + public int currentBag = -1; GameObject startDrag; + TooltipHandler tooltip; + // Start is called before the first frame update void Start() { + statBoost = new Dictionary(); + statBoost.Add("HP", 0); + statBoost.Add("MP", 0); + statBoost.Add("HPR", 0); + statBoost.Add("MPR", 0); + statBoost.Add("STR", 0); + statBoost.Add("DEX", 0); + statBoost.Add("INT", 0); + statBoost.Add("LCK", 0); + tooltip = GameObject.Find("TooltipHandler").GetComponent(); + itemDisplay.transform.localScale = new Vector3(0,0,0); changeCurrentBag(0); } @@ -41,15 +58,14 @@ namespace Assets.Scripts { if (item != null) { - GameObject.Find("UIHandler").GetComponent().showMessage("SUCCESS;You got an item!"); bool itemAdded = false; for (int i = 0; i < bags.Length; i++) { for (int j = 0; j < slots.Length; j++) { - if (slots[j].GetComponent().getItem() == null) + if (slots[j].GetComponent().getItem(i) == null) { - slots[j].GetComponent().setItem(item); + slots[j].GetComponent().setItem(item, i); itemAdded = true; slots[j].GetComponent().color = item.rarityColor; slots[j].GetComponent().texture = item.image; @@ -58,9 +74,14 @@ namespace Assets.Scripts } if (itemAdded) { + GameObject.Find("UIHandler").GetComponent().showMessage("SUCCESS;You got an item!"); break; } } + if (!itemAdded) + { + GameObject.Find("UIHandler").GetComponent().showMessage("ERROR;No inventory space left."); + } } } @@ -84,7 +105,7 @@ namespace Assets.Scripts Item item; for (int i = 0; i < slots.Length; i++) { - item = slots[i].GetComponent().getItem(); + item = slots[i].GetComponent().getItem(currentBag); if (item != null) { slots[i].GetComponent().color = item.rarityColor; @@ -178,6 +199,37 @@ namespace Assets.Scripts return null; } } - } + public void calculateStatBoost(Dictionary attributes, bool isAddition) + { + foreach (string key in attributes.Keys) + { + if (isAddition) + { + statBoost[key] = statBoost[key] + attributes[key]; + } + else + { + statBoost[key] = statBoost[key] - attributes[key]; + } + } + } + + public Dictionary getEquipmentBonus() + { + if (statBoost == null) + { + statBoost = new Dictionary(); + statBoost.Add("HP", 0); + statBoost.Add("MP", 0); + statBoost.Add("HPR", 0); + statBoost.Add("MPR", 0); + statBoost.Add("STR", 0); + statBoost.Add("DEX", 0); + statBoost.Add("INT", 0); + statBoost.Add("LCK", 0); + } + return statBoost; + } + } } \ No newline at end of file diff --git a/Assets/Scripts/InventorySlot.cs b/Assets/Scripts/InventorySlot.cs index b006b5a..cfb331b 100644 --- a/Assets/Scripts/InventorySlot.cs +++ b/Assets/Scripts/InventorySlot.cs @@ -14,10 +14,12 @@ namespace Assets.Scripts int currentBag = 0; public ItemPlace place; Item equip; + Inventory inventory; private void Start() { tooltip = GameObject.Find("TooltipHandler").GetComponent(); + inventory = GameObject.Find("Inventory").GetComponent(); loadImages(); } @@ -26,15 +28,15 @@ namespace Assets.Scripts this.currentBag = currentBag; } - public void setItem(Item item) + public void setItem(Item item, int bag) { - items[currentBag] = item; - itemRemoved[currentBag] = false; + items[bag] = item; + itemRemoved[bag] = false; } - public Item getItem() + public Item getItem(int bag) { - return items[currentBag]; + return items[bag]; } public void removeItem() @@ -45,52 +47,82 @@ namespace Assets.Scripts public void showTooltip() { + Item item = getItemForTooltip(); + if (item != null) + { + inventory.itemDisplay.transform.Find("itemImage").GetComponent().texture = item.image; + inventory.itemDisplay.transform.Find("itemImage").GetComponent().color = item.rarityColor; + inventory.itemDisplay.transform.Find("itemName").GetComponent().text = item.getName(); + string text = "Stats:\r\n"; + Dictionary attributes = item.getAttributes(); + foreach (string key in attributes.Keys) + { + text = text + key + ": " + attributes[key] + "\r\n"; + } + inventory.itemDisplay.transform.Find("itemStats").GetComponent().text = text; + int changeY = 0; + if (inventory.itemDisplay.transform.localScale == new Vector3(0,0,0)) + { + if (Input.mousePosition.y < Screen.height / 2) + { + changeY = -150; + } + inventory.itemDisplay.transform.position = new Vector3(Input.mousePosition.x - 175, Input.mousePosition.y - changeY, 0); + } + inventory.itemDisplay.transform.localScale = new Vector3(1, 1, 1); + } + } + + private Item getItemForTooltip() + { + Item item = null; if (place == ItemPlace.BAG) { - if (items[currentBag] != null) - { - string text = items[currentBag].getDisplayText(); - Item equip = GameObject.Find("Inventory").GetComponent().getEquip(items[currentBag].getPlace()); - if (equip != null) - { - text = "(Current)\r\n" + equip.getDisplayText() + "----------\r\n" + text; - } - tooltip.showTooltip(text); - } + item = items[currentBag]; } else { - if (equip != null) - { - tooltip.showTooltip(equip.getDisplayText()); - } + item = equip; } + return item; } public void hideTooltip() { - tooltip.hideToolTip(); - } - - public void onClick() - { - removeItem(); - tooltip.hideToolTip(); + inventory.itemDisplay.transform.localScale = new Vector3(0,0,0); } public void OnMouseDrag() { - GameObject.Find("Inventory").GetComponent().setDrag(gameObject); + inventory.setDrag(gameObject); + Item toMove; + if (place == ItemPlace.BAG) + { + toMove = items[currentBag]; + } + else + { + toMove = equip; + } + if (toMove != null) + { + inventory.dragImage.GetComponent().color = toMove.rarityColor; + inventory.dragImage.GetComponent().texture = toMove.image; + inventory.dragImage.transform.position = new Vector3(Input.mousePosition.x - 50, Input.mousePosition.y - 50, 0); + } } public void OnMouseUp() { - GameObject startDrag = GameObject.Find("Inventory").GetComponent().getDrag(); + inventory.dragImage.GetComponent().color = new Color(0,0,0,0); + inventory.dragImage.GetComponent().texture = null; + inventory.dragImage.transform.position = new Vector3(0,0,0); + GameObject startDrag = inventory.getDrag(); Item item; bool isSwap = false; if (startDrag.GetComponent().place == ItemPlace.BAG) { - item = startDrag.GetComponent().getItem(); + item = startDrag.GetComponent().getItem(currentBag); } else { @@ -106,10 +138,19 @@ namespace Assets.Scripts { if (items[currentBag] != null) { - startDrag.GetComponent().setItem(items[currentBag]); + if (startDrag.GetComponent().place == ItemPlace.BAG) + { + startDrag.GetComponent().setItem(items[currentBag], currentBag); + } + else + { + startDrag.GetComponent().setEquip(items[currentBag]); + inventory.calculateStatBoost(item.getAttributes(), false); + inventory.calculateStatBoost(items[currentBag].getAttributes(), true); + } isSwap = true; } - setItem(item); + setItem(item, currentBag); } else { @@ -117,20 +158,23 @@ namespace Assets.Scripts { if (startDrag.GetComponent().place == ItemPlace.BAG) { - startDrag.GetComponent().setItem(equip); + startDrag.GetComponent().setItem(equip, currentBag); isSwap = true; + inventory.calculateStatBoost(equip.getAttributes(), false); } else { return; } } + inventory.calculateStatBoost(item.getAttributes(), true); setEquip(item); } if (!isSwap) { if (startDrag.GetComponent().place != ItemPlace.BAG) { + inventory.calculateStatBoost(startDrag.GetComponent().getEquip().getAttributes(), false); startDrag.GetComponent().removeEquip(); } else @@ -174,7 +218,7 @@ namespace Assets.Scripts image = Resources.Load("Equipment/Inv_Boots"); break; case ItemPlace.SHOULDER: - image = Resources.Load("Equipment/Inv_Shoulder"); + image = Resources.Load("Equipment/Inv_Shoulders"); break; case ItemPlace.AMULET: image = Resources.Load("Equipment/Inv_Amulet"); diff --git a/Assets/Scripts/Item.cs b/Assets/Scripts/Item.cs index b382e16..75a4353 100644 --- a/Assets/Scripts/Item.cs +++ b/Assets/Scripts/Item.cs @@ -33,13 +33,59 @@ namespace Assets.Scripts } calculateAttributes(luck, numberOfAttributes); place = (ItemPlace)rand.Next(8); + string replacement = ""; + if (place == ItemPlace.LEFTHAND) + { + switch (GameObject.Find("Player").GetComponent().getClass().classname) + { + case "Warrior": + replacement = "greatshield"; + break; + case "Thief": + replacement = "shield"; + break; + case "Mage": + replacement = "orb"; + break; + } + } + else if (place == ItemPlace.RIGHTHAND) + { + switch (GameObject.Find("Player").GetComponent().getClass().classname) + { + case "Warrior": + replacement = "sword"; + break; + case "Thief": + replacement = "dagger"; + break; + case "Mage": + replacement = "wand"; + break; + } + } if (itemName != null) { - itemName = rarity.ToString() + " " + place.ToString() + " of " + itemName; + if (replacement.Length > 0) + { + itemName = rarity.ToString() + " " + replacement + " of " + itemName; + } + else + { + itemName = rarity.ToString() + " " + place.ToString() + " of " + itemName; + } + } else { - itemName = rarity.ToString() + " " + place.ToString(); + if (replacement.Length > 0) + { + itemName = rarity.ToString() + " " + replacement; + } + else + { + itemName = rarity.ToString() + " " + place.ToString(); + } } itemName = itemName.ToLower(); itemName = char.ToUpper(itemName[0]) + itemName.Substring(1); @@ -224,7 +270,7 @@ namespace Assets.Scripts image = Resources.Load("Equipment/Inv_Boots"); break; case ItemPlace.SHOULDER: - image = Resources.Load("Equipment/Inv_Shoulder"); + image = Resources.Load("Equipment/Inv_Shoulders"); break; case ItemPlace.AMULET: image = Resources.Load("Equipment/Inv_Amulet"); @@ -237,6 +283,11 @@ namespace Assets.Scripts break; } } + + public Dictionary getAttributes() + { + return attributes; + } } } \ No newline at end of file