From 015d67f490f81edabfe60216e44208e656752ca6 Mon Sep 17 00:00:00 2001 From: darrelmarek Date: Thu, 19 Apr 2018 14:16:03 -0500 Subject: [PATCH] More inventory --- MoCha/Assets/Items.meta | 10 ++++++++++ MoCha/Assets/Items/circle_eye.asset | Bin 0 -> 4188 bytes MoCha/Assets/Items/circle_eye.asset.meta | 10 ++++++++++ MoCha/Assets/Items/circle_head.asset | Bin 0 -> 4188 bytes MoCha/Assets/Items/circle_head.asset.meta | 10 ++++++++++ MoCha/Assets/Items/crazy_hair.asset | Bin 0 -> 4188 bytes MoCha/Assets/Items/crazy_hair.asset.meta | 10 ++++++++++ MoCha/Assets/Items/crown.asset | Bin 0 -> 4184 bytes MoCha/Assets/Items/crown.asset.meta | 10 ++++++++++ MoCha/Assets/Items/gap_mouth.asset | Bin 0 -> 4188 bytes MoCha/Assets/Items/gap_mouth.asset.meta | 10 ++++++++++ MoCha/Assets/Items/pig_nose.asset | Bin 0 -> 4184 bytes MoCha/Assets/Items/pig_nose.asset.meta | 10 ++++++++++ MoCha/Assets/Prefabs/ItemSlot.prefab | Bin 8184 -> 8184 bytes MoCha/Assets/Scenes/MonsterCreator.unity | Bin 48440 -> 61744 bytes MoCha/Assets/Scripts/Inventory.cs | 2 +- MoCha/Assets/Scripts/MonsterManager.cs | 11 +++++++++++ MoCha/ProjectSettings/ProjectVersion.txt | 2 +- 18 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 MoCha/Assets/Items.meta create mode 100644 MoCha/Assets/Items/circle_eye.asset create mode 100644 MoCha/Assets/Items/circle_eye.asset.meta create mode 100644 MoCha/Assets/Items/circle_head.asset create mode 100644 MoCha/Assets/Items/circle_head.asset.meta create mode 100644 MoCha/Assets/Items/crazy_hair.asset create mode 100644 MoCha/Assets/Items/crazy_hair.asset.meta create mode 100644 MoCha/Assets/Items/crown.asset create mode 100644 MoCha/Assets/Items/crown.asset.meta create mode 100644 MoCha/Assets/Items/gap_mouth.asset create mode 100644 MoCha/Assets/Items/gap_mouth.asset.meta create mode 100644 MoCha/Assets/Items/pig_nose.asset create mode 100644 MoCha/Assets/Items/pig_nose.asset.meta diff --git a/MoCha/Assets/Items.meta b/MoCha/Assets/Items.meta new file mode 100644 index 0000000..8a326d8 --- /dev/null +++ b/MoCha/Assets/Items.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 49f84355758f7f74bbe780ac2fd1e574 +folderAsset: yes +timeCreated: 1524164591 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Items/circle_eye.asset b/MoCha/Assets/Items/circle_eye.asset new file mode 100644 index 0000000000000000000000000000000000000000..19fb32fbbb0b97935579241476c0a31c0050b9af GIT binary patch literal 4188 zcmeH~OKTKC6oqe18>8`U;xqUF72G&vj3x*=OfaK~0iEDh2_d$VmSiHGR?Mze2EmoT zz>O|^AjD-rNECm7FT{nq5JVSlf?L~jZg-mLfO{8JaHqPyd+Suy>7GT2c%velFNw$& z^yoy6c9nXI-Nn+?lKhF|*ch--GjibLp|-t?-@iSopPhZ)*Z=9>JNsp!tG)hve$SH+ zcIZJT%1$9TrPYY-6|s8W8I(Wx*NdRR_=eJGON6K-Ax%cGJtg-Lx=wJ#Tu(R zrUXA3?p4aF5#8l&!D9^JA5{8%G*1&fCE|$7hG* z6D_~^rHYi_yuJJK^^bx1`nd}|9h0XMswwy59B>Xe2b=@W0q1~oz&YR?a1J;J{!a&Z e=V4>NeDC2UcPt3UCj1e9#%DIUxbOF>TK*RR+>eF; literal 0 HcmV?d00001 diff --git a/MoCha/Assets/Items/circle_eye.asset.meta b/MoCha/Assets/Items/circle_eye.asset.meta new file mode 100644 index 0000000..b484390 --- /dev/null +++ b/MoCha/Assets/Items/circle_eye.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 239bd48fa71b8fb44b79bb456aaf0807 +timeCreated: 1524164723 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Items/circle_head.asset b/MoCha/Assets/Items/circle_head.asset new file mode 100644 index 0000000000000000000000000000000000000000..0777c27fbb575fc0e60eae7b4c96734477564b92 GIT binary patch literal 4188 zcmeH~OKTKC6oqe18>8`Ud6B-;*hkNmN?N)``XpYAh_}u zxY30Vgy_y7DEr~b0o<)gxb&-wdL}U|s zbRvg)O8v#&V(DT@{={)?3|Occ+5h2S$DTLezdf2fHT!&U=;OV2_VeqW&dJ{|cRyLM zBM-Vzb^^gE?M7_Bh=oL~vn{!iho0Cu>6e1gU{j9Kp~x5yQw z2%WtcuS#>6syep|V&A4ZZCX#Qyw1vh=(K0t$PwsVPj$G)pyu*At6O;MemXL4gtn$`%H)Pz%X{`GgI`p3})>zds zCHTo8$2%8OCim3mF3jP6Hj`_3QbX+}1jn5jPxO0J{Vn9yaz8o!t>k6$yguJ2rYdjM z-=1+J-FQBVpf@`ZY|DMvsf;@L?_pQUtJNqxUYQ7@>9BG$@|!ckbaOy1kDUyr{NW)y zRO?X#4_bF%^hy{+{(#JA4^ffwuc!D;8vi70i7_HyZavd6KUSH$cBuL4j2*tyH(QI3 zwf*FmD&k)a`WEVoXJ1^nJAb3r{WYPQazD-i=YVs-Ip7>{4mby#1I_{GfOFvgbbxmr eHug*R9$se0gK&JxA8Yva38rxk6WQlgwEQogZ;&1U literal 0 HcmV?d00001 diff --git a/MoCha/Assets/Items/circle_head.asset.meta b/MoCha/Assets/Items/circle_head.asset.meta new file mode 100644 index 0000000..b0717b6 --- /dev/null +++ b/MoCha/Assets/Items/circle_head.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: a921d1e60d69f1a498ba263cdfde04c7 +timeCreated: 1524164686 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Items/crazy_hair.asset b/MoCha/Assets/Items/crazy_hair.asset new file mode 100644 index 0000000000000000000000000000000000000000..9e3ed70948f80c5c50186b9eb8d1d61ae0aaf33a GIT binary patch literal 4188 zcmeI0y=xRf7{=eZHAZ8Mn)n_302ORJaz+h;h707>7?3+`4dKvBZbdJ$w~DbEEDW~d zA7G<}8iWWof}o^KsUjjOC2*uHO9oh{P`RF0Tpa=v*xf$y=l!AA zpY6z8C(8QJIHl2u?G>?*h;+6kH}b+4JCEF!q>i=Zj8EV@(0gbx_v9Ni_F~L>U%5rj zlN@x8V7x8KVXEpp^2B~jbQ-jtT3MZ~|IlenxslV*nMriG#(?IsI!$%Fem~7AH}V|& zyb2wjXFD|@wBf@DIM2m1$LBRNiFJP^>+S?+Y~KGaWmb9py1P?u1s(d&7i+BQ zm^}PsBgZ=zQy}-%=T6Mwe%i>j`7(;yTWB1&r##m0N%T9&t>u0)`g_O=JpkH*;S!vST~$$k$96J9EX!TI8iN>~eu_rr2^x>Bq5%ha`@%I)&- zARbEN;Upfk?)cc9pc0n*WmdNABOf}_xoCD4Q=YVs-Ip7>{4mby#1I_{G!2jt0 b?>r3l8}}YwuCE8RdsQY7yayfii(0x4scVlo literal 0 HcmV?d00001 diff --git a/MoCha/Assets/Items/crown.asset.meta b/MoCha/Assets/Items/crown.asset.meta new file mode 100644 index 0000000..4268a6f --- /dev/null +++ b/MoCha/Assets/Items/crown.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: e10fc574df6c4744cbee17e84374f524 +timeCreated: 1524164707 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Items/gap_mouth.asset b/MoCha/Assets/Items/gap_mouth.asset new file mode 100644 index 0000000000000000000000000000000000000000..e48c07517ff776557b19e7904eb219085f42e457 GIT binary patch literal 4188 zcmeH~&1(}u7{=epTC4S=+WKA8f>pdUG*&HwmJ}LoDN2ghN(mT~h)qhmEqWUeEnfQ% zv=;@x5ULjuq*bqaQV|d8p&)qhB3@me=iTj+EqM1ZFHC0V_rCMY%(I)rh>2S+|SKn72l+MjQ9T@yP_uhV8?rAUmezE`2 zM>}%217&B>IHlQ$?Gv$(2z0h3H*(JtyNKMnsE)Pdj1S?d; zl%%0^5aSI|4pUXW3`ota37YYb>Esk5i+Dco*H7mzSNvK%cik^mrz*8-zf6putz0V( z58@$T@XL76x~_|p^@?BYmnrQbDw6&67{6igPr?X|5&3rGiH`ZP%Hni)_2mUSeCNdM zXmG0OC%;sY`K9x(kKBJZ^n7mS*0YtjH$$o^_v0LJ4mby#1I_{GfOEh(;2dxcI0ybu g2YBaUuwT9R@bX(KOpZ^~ru{OL2;PM{y_}Z+1u%e+*#H0l literal 0 HcmV?d00001 diff --git a/MoCha/Assets/Items/gap_mouth.asset.meta b/MoCha/Assets/Items/gap_mouth.asset.meta new file mode 100644 index 0000000..321cdb3 --- /dev/null +++ b/MoCha/Assets/Items/gap_mouth.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: e59e525161ea38242a90fd6ef67f4b63 +timeCreated: 1524164715 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Items/pig_nose.asset b/MoCha/Assets/Items/pig_nose.asset new file mode 100644 index 0000000000000000000000000000000000000000..ae4916906988abeb13774594a36d57df4a276014 GIT binary patch literal 4184 zcmeH~%}Z2K7{=c-H?y>Ftt{ySG6(TSYx&h=({vbmc%`5T6zF<>>#$cZl}TaLc}@qNC0W$tDFz}H8g?8>|Dw({DW zBhQxX$dgW#T}E(9vk}`XVj&UgY)fwBsV8<3xh-)WYsuL@gYQ6}K}0+w%g{K0G3!0$ z7P*XMp>qu5ZE+4$Rp&uQ?1xyVN$aVV*4g?Wo#uoaIR~A)u@2Yh*IZg>djoIWPfNm$ zJjOn+Lx<;Sr3Qr7eHa1fxp?O2yhbLm?$3DLo#1R6_rFV-Ro=Mn?t~i|!nzC4q5pib z#;T6V!A}M`-np1Oxu-sNVh;DSk6go(QPkc-aNL&gNWUl6Zzs2w`$_5VC(o0o_4z(A zRe7WS!Gs$*h35+hdeebm+vvj~Wz$1006XDV;6+Tn-i z=SIVeO~3f1ima|Kt^GM|hh8mA-yeKE|1qMPazD-i=YVs-Ip7>{4mby#1I_{GfOBAT eI>0**8~gQp4==@2etEo7t(TbNJ?OYs(9(YmdXX^z literal 0 HcmV?d00001 diff --git a/MoCha/Assets/Items/pig_nose.asset.meta b/MoCha/Assets/Items/pig_nose.asset.meta new file mode 100644 index 0000000..55b7adc --- /dev/null +++ b/MoCha/Assets/Items/pig_nose.asset.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 9c001483399829349bae2c3bf3743bc0 +timeCreated: 1524164756 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Prefabs/ItemSlot.prefab b/MoCha/Assets/Prefabs/ItemSlot.prefab index 141dc69335e7543ccf232f99f8736a054ba19442..0c05dbfe60a5bbcaeae1e5c060067ad54c038dbe 100644 GIT binary patch delta 46 ocmexi|HFR6A~{wMCk6(O$@cP^lP}0+!Fj9sz~VqT273?&09|wo&Hw-a delta 46 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 VHN4Pc!2g#0`sD>t;#*b4{{X=9P=o*g delta 1642 zcmYL}ZETZO6vxk9pKi}OHYyA(TPKgKgANBQLYyJKOeIF6#3e+tOhkMM6o^_4#_0y_ z5=i`j%65#FWZBwe34@3ZFPWg5F-rX6Oe)*V;#+2|$zqJk*w{4q^1tnQ?1%H5=l{F6 z=YP+=x6e?8qs#tGvmR9Lh^Qv-X>yNhgd6ieU z?P&6-65aENV=GJRT^nsxsxy1$%al(~y|CU^9_{JS%k@251D3jrC*S%YcKP$Em8eeb z#Y8D&3o$FqDIscrE=61s)*{RYHYY3&_9k>0VqRFlCW=BYL0lE~D%dvYa>PQO#V8H< zAV3A;+Cwj2k3Tr_DKKN4>rU8xXv=h0iKyLwM;#I! z2Xh+<2@9apG{#mS>S6+C0NsLXg|(tpQ_!5xI$=q$W6)-suHIRDGZHoWiJnKc5DUTv z!4lA><3(Z3*pdcC6af2ESS*TG!vHu1YIu76El89AJBn-yZV=|6eRtIxh5Z5ME_#!& z-Duxkbfd6AuqcdIq24Q}hPNV70A0Z&mNV%Pm;`i9I)z2is%vsc*ff}Ha#&axZOw?u zH@4J5RSKq2>)=(3Ts@8-NA0{!(W$v7TCP5a2Jl<-_?O3ih#M7>osB1VD9C5 zU06FVQ5Xfy<$6O{vc6ESjGyVdi3j?2s&X#x-^sE52Y9+a#cwBTcsThnK3*@Tp7QeU zQHziKwvC;WejfUL86VF2bmu$0R?lgRM>1iK&xCdFuvNs(13?bHXY;S;6RL!3#vV5_ z;$x1sKWz0VFF!H*68lGrIhm@+&Aaxg%u}U&Xsnh47u)#B><#+(#kArRsY>qrBAGA5 z*$W|^96N|Fsj16zpM`WHy+x@d{N-0ox#wygIUB&+?U#%`b7?g