From 4e44bea6df3f98d97aa97dd577a7465cc36dfbd4 Mon Sep 17 00:00:00 2001 From: Nicola Sovic Date: Thu, 7 Jul 2022 12:36:14 +0200 Subject: [PATCH] Added item trashcan and mechanic for it, fixed audio bug, v1.3.1 --- Assets/IMG/Aseprite/Inv_Trash.aseprite | Bin 0 -> 1560 bytes Assets/IMG/Aseprite/Inv_Trash.aseprite.meta | 7 + Assets/IMG/Aseprite/Inv_Trash_Open.aseprite | Bin 0 -> 1622 bytes .../IMG/Aseprite/Inv_Trash_Open.aseprite.meta | 7 + Assets/IMG/Inventory/Inv_Trash.png | Bin 0 -> 965 bytes Assets/IMG/Inventory/Inv_Trash.png.meta | 120 ++++++++++++++ Assets/IMG/Inventory/Inv_Trash_Open.png | Bin 0 -> 986 bytes Assets/IMG/Inventory/Inv_Trash_Open.png.meta | 120 ++++++++++++++ Assets/Scenes/GameScene.unity | 150 ++++++++++++++++++ Assets/Scripts/AudioHandler.cs | 2 +- Assets/Scripts/FileHandler.cs | 2 + Assets/Scripts/InventoryTrash.cs | 51 ++++++ Assets/Scripts/InventoryTrash.cs.meta | 11 ++ Assets/Scripts/UIHandler.cs | 1 + 14 files changed, 470 insertions(+), 1 deletion(-) create mode 100644 Assets/IMG/Aseprite/Inv_Trash.aseprite create mode 100644 Assets/IMG/Aseprite/Inv_Trash.aseprite.meta create mode 100644 Assets/IMG/Aseprite/Inv_Trash_Open.aseprite create mode 100644 Assets/IMG/Aseprite/Inv_Trash_Open.aseprite.meta create mode 100644 Assets/IMG/Inventory/Inv_Trash.png create mode 100644 Assets/IMG/Inventory/Inv_Trash.png.meta create mode 100644 Assets/IMG/Inventory/Inv_Trash_Open.png create mode 100644 Assets/IMG/Inventory/Inv_Trash_Open.png.meta create mode 100644 Assets/Scripts/InventoryTrash.cs create mode 100644 Assets/Scripts/InventoryTrash.cs.meta diff --git a/Assets/IMG/Aseprite/Inv_Trash.aseprite b/Assets/IMG/Aseprite/Inv_Trash.aseprite new file mode 100644 index 0000000000000000000000000000000000000000..fdd3785c01e088b458c72954a7e214cf82ac70e8 GIT binary patch literal 1560 zcmeH_|4S2L9LFDPOM)n)5G8C^R0a}rVwt5L6=me2Qks<563f^k#Sqt+Zcsv`uo0Q7 zTqZOIs*S#X0VBDq0eY6-_Niu8JE&A5T$#c6h6vEVnEn zyQx(0BwYY%L`Ok;`99FxTmt_3_zYa~9s-{_&x6w5WH7D16wHzE!Q7lZU`j?h zNYfQy^3}UwLFpt|+{l9BZ&RRYJP5KVLK@q;z#8R!P$HFrmqfW>sDTACLQFC&OLgpHm_)V z%~0#z(pMU?)EVl2SlU(g@|m!urBJXamvwH-qFn>Fs?Z0QMY1CtGW56G9@vec zCGXq5Q?xtoW}r%2?9LR5)a?&t!?D@~jgD*I+Eb`L_+2&@t-n{<^!`(UCqXiKaXMpg z9=G1e%oK+73U(mm_nAgos(Txlp+Vk+YskT`*BaWg798*N*$4Qlf@<$)v0QWcO1N`z zN@MWu?9c~q`HVc3GgB&G7@vJahrcL>z22^oL{;!H^V;bwYdIGVBzZ2FOm@+W;9S1# pWy9JB*Us=i{cU=CXph5YmiZYbFrURdufCyD@qc>KHu4j#zX4d85)=Rc literal 0 HcmV?d00001 diff --git a/Assets/IMG/Aseprite/Inv_Trash.aseprite.meta b/Assets/IMG/Aseprite/Inv_Trash.aseprite.meta new file mode 100644 index 0000000..5a6d37c --- /dev/null +++ b/Assets/IMG/Aseprite/Inv_Trash.aseprite.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3dc2c73725727d14593d56a2a72af5e1 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/Aseprite/Inv_Trash_Open.aseprite b/Assets/IMG/Aseprite/Inv_Trash_Open.aseprite new file mode 100644 index 0000000000000000000000000000000000000000..18878f6f953491165e22f6bc82bdbc4a7f764ab0 GIT binary patch literal 1622 zcmeH`ZAep57{|}dr3O(!SwZNf7gvNiHC)SyRD_U)CZsG~C7R1gj+QUkWKk%U1QHI$ zGGl${1QNLGWmputh zIYPEm`@y5TC18m-5p2v&1?fw1pxICY&b_+_vW^r`Ka&kAx`d!eTMlNHCV)AaJHaH0 z7)(#E0EOpnfcfQ9U{Ny%p6#=Oy`w&mLlM&4+5y&SZi1x>1t`tU0jmx-fX|bXKyzLZ z_(lB&Y}6eC8M3Cc!HRn}S;)!rV_!Qd3i{`?Xwiw7qa^=2#?2uw( z;g-57@!hYd3L+;sYQyF=QIW}y1v2I09*^$&Y+Fp&K8rnWopq*PpemlL?0&dS&sBCC zjG~O;>Fk(3*#k|$6PO)mFUR`gKlKcnm;+kcdm-=6nFM+2l=Gli?Q{vct*_V8flM#*aRW4)(ocfdE= znN{Hy`05uO9hF%D&tB%_w_bWE%{$#@%xF!xmhZMUnjA6hUA~LsP3eIT>dz}1SB~eu g`6yVkzecB)+rBeykMjlF-;dv^-tP}PGPsNV1rnx7FaQ7m literal 0 HcmV?d00001 diff --git a/Assets/IMG/Aseprite/Inv_Trash_Open.aseprite.meta b/Assets/IMG/Aseprite/Inv_Trash_Open.aseprite.meta new file mode 100644 index 0000000..b6e2b44 --- /dev/null +++ b/Assets/IMG/Aseprite/Inv_Trash_Open.aseprite.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1ed5dd1334483d748be6db189ff6747f +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/Inventory/Inv_Trash.png b/Assets/IMG/Inventory/Inv_Trash.png new file mode 100644 index 0000000000000000000000000000000000000000..4f229910169a00d0ff23544926b9237146194df7 GIT binary patch literal 965 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G!U;i$lZxy-8q?;3=GWmo-U3d z6?5L+a?HEpAmDJZWwXMO$_Rx*Cl#?d?27LuEr_NC$*Yr%@;t@qRQlw?W{UpiWUw#MfiGzrXJHzAw*b&+N1~Q~Bnv^#AxX=U8MO{k5*z_&sIcyE)9e_`~Bq>7KcN zQs%(NRj2n&nQ1d&w(Ysh?ti}+@5hDNXxy1?DSM>%?z;`H@>_3ITUiJ_D_1rznEUW_ zU90N-M++Qgyl%a-Vmoi_kDJqLS28b3IQRch?@rT{hq}M2ninU$tJl8Yad-ONMg8Um zJSSr{_GIqA%FNc9`0MYCx4eA6&*VK^f7HDrHLXJV-^MoM*sAt>b88t7RI)G}0wTS? zKU3As&kJ0$d-MC_=j&&$%iHhSf93UctKU`I_x+K~IDA5qe8|lRn+0T4Xl#4IMpX1$8AEN-pWmd7<<-S{|UklK^TKfL~SLTIz zc|dcJLBrymcYm|oxbphY<2T(L+;=yWe6ZhSua@5U{M-KK|I=)Z47;t@o3{Petxk0k zE4Axp`~UFYyStB%FMqzY{{Fm~9Y^OJzxDpd|D^Xm2bARQUu)j0_WSh%oePF@Do?CW z{Qve0Q_gy;H{LfVOBZcCelz!i{l5d-r*YS5#LTX>>fo;4dzP*CO2Ycg#~wHKhZiyG z8`s=8Z}8;$4Gn>BU!C->Ja6Os^XBlrD{O%q&i_BuTA6?1fb^HsynRiz|J{E&t+9K< zR=cM$(c_%cL)YqXehHDbm(P>8iCes}-rZ;~9$ECiNypsI2={qOGZ$SnQ zVPwxEvn8Hi*=`!u8Qr~gY5IX)M+F}S5PI|ao_c`^|Mzln+5exfpWc1keqX)y)zA7{ zzyFN;{RbEd-F@@t`ZEZqjiO-`0%g0ubIKe5M*V?xmy90>GqiAm5Ft?W$b7~L*Tl5l R6-PiyJzf1=);T3K0RYme_{#tQ literal 0 HcmV?d00001 diff --git a/Assets/IMG/Inventory/Inv_Trash_Open.png.meta b/Assets/IMG/Inventory/Inv_Trash_Open.png.meta new file mode 100644 index 0000000..d7ef3a4 --- /dev/null +++ b/Assets/IMG/Inventory/Inv_Trash_Open.png.meta @@ -0,0 +1,120 @@ +fileFormatVersion: 2 +guid: 6dad388ac0c58f642886f30b03b9b1fb +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + 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 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + 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: 5e97eb03825dee720800000000000000 + 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 ad8ab9b..c43d723 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -22229,6 +22229,155 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1675736206} m_CullTransparentMesh: 1 +--- !u!1 &1676212443 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1676212444} + - component: {fileID: 1676212446} + - component: {fileID: 1676212445} + - component: {fileID: 1676212448} + - component: {fileID: 1676212447} + m_Layer: 5 + m_Name: itemTrash + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1676212444 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1676212443} + 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: 1730748811} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.075, y: 0.1} + m_AnchorMax: {x: 0.225, y: 0.9} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1676212445 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1676212443} + 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: 2800000, guid: 1bc0fabbe21286346b3f16a2b5924770, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &1676212446 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1676212443} + m_CullTransparentMesh: 1 +--- !u!114 &1676212447 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1676212443} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 53ed28f6f59b2f4439ae0a7ee60258a2, type: 3} + m_Name: + m_EditorClassIdentifier: + close: {fileID: 2800000, guid: 1bc0fabbe21286346b3f16a2b5924770, type: 3} + open: {fileID: 2800000, guid: 6dad388ac0c58f642886f30b03b9b1fb, type: 3} +--- !u!114 &1676212448 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1676212443} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 0 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1676212447} + m_TargetAssemblyTypeName: Assets.Scripts.InventoryTrash, Assembly-CSharp + m_MethodName: onMouseEnter + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - eventID: 1 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1676212447} + m_TargetAssemblyTypeName: Assets.Scripts.InventoryTrash, Assembly-CSharp + m_MethodName: onMouseLeave + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - eventID: 6 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1676212447} + m_TargetAssemblyTypeName: Assets.Scripts.InventoryTrash, Assembly-CSharp + m_MethodName: deleteItem + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1001 &1685588278 PrefabInstance: m_ObjectHideFlags: 0 @@ -23019,6 +23168,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 864026983} + - {fileID: 1676212444} m_Father: {fileID: 822494757} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/AudioHandler.cs b/Assets/Scripts/AudioHandler.cs index 67dedd4..9c72fa6 100644 --- a/Assets/Scripts/AudioHandler.cs +++ b/Assets/Scripts/AudioHandler.cs @@ -23,7 +23,7 @@ public class AudioHandler : MonoBehaviour string filepath = "./audiosettings.txt"; // Start is called before the first frame update - void Start() + public void Start() { cameraAudio = GameObject.Find("Main Camera").GetComponent(); playerAudio = GameObject.Find("Player").GetComponent(); diff --git a/Assets/Scripts/FileHandler.cs b/Assets/Scripts/FileHandler.cs index 8f52522..13d6406 100644 --- a/Assets/Scripts/FileHandler.cs +++ b/Assets/Scripts/FileHandler.cs @@ -45,6 +45,7 @@ namespace Assets.Scripts sw.WriteLine("Music:" + music); sw.WriteLine("Effects:" + effects); sw.Flush(); + sw.Close(); } public static void loadAudio(string path, AudioSource cameraAudio, AudioSource playerAudio) @@ -61,6 +62,7 @@ namespace Assets.Scripts sw.WriteLine("Music:0.5"); sw.WriteLine("Effects:0.5"); sw.Flush(); + sw.Close(); } } diff --git a/Assets/Scripts/InventoryTrash.cs b/Assets/Scripts/InventoryTrash.cs new file mode 100644 index 0000000..de6b7d7 --- /dev/null +++ b/Assets/Scripts/InventoryTrash.cs @@ -0,0 +1,51 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +namespace Assets.Scripts +{ + public class InventoryTrash : MonoBehaviour + { + public Texture close; + public Texture open; + + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } + + public void onMouseEnter() + { + gameObject.GetComponent().texture = open; + } + + public void onMouseLeave() + { + gameObject.GetComponent().texture = close; + } + + public void deleteItem() + { + InventorySlot toDelete = GameObject.Find("Inventory").GetComponent().getDrag().GetComponent(); + if (toDelete.place == ItemPlace.BAG) + { + toDelete.removeItem(); + } + else + { + toDelete.removeEquip(); + } + GameObject.Find("Inventory").GetComponent().dragImage.GetComponent().color = new Color(0, 0, 0, 0); + GameObject.Find("Inventory").GetComponent().dragImage.GetComponent().texture = null; + GameObject.Find("Inventory").GetComponent().dragImage.transform.position = new Vector3(0, 0, 0); + } + } +} diff --git a/Assets/Scripts/InventoryTrash.cs.meta b/Assets/Scripts/InventoryTrash.cs.meta new file mode 100644 index 0000000..6175ec0 --- /dev/null +++ b/Assets/Scripts/InventoryTrash.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 53ed28f6f59b2f4439ae0a7ee60258a2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UIHandler.cs b/Assets/Scripts/UIHandler.cs index 9a991bf..d834cf2 100644 --- a/Assets/Scripts/UIHandler.cs +++ b/Assets/Scripts/UIHandler.cs @@ -506,6 +506,7 @@ namespace Assets.Scripts public void openIntroduction() { + GameObject.Find("AudioHandler").GetComponent().Start(); if (PlayerPrefs.GetInt("isLoad") == 0) { GameObject.Find("WorldGenerator").GetComponent().resetGame(PlayerPrefs.GetInt("cityAmount"));