From 30f6623a5e4d44705b66c903f6d74b4bdf3d472d Mon Sep 17 00:00:00 2001 From: FredTheNoob Date: Fri, 23 Apr 2021 14:38:42 +0200 Subject: [PATCH] Added outline for selecting shop items, added more items to the shop. --- .../Items/Consumerables/Bottle_o_whisky_1.png | 3 + .../Consumerables/Bottle_o_whisky_1.png.meta | 116 ++++++++++++++++++ .../Sprites/Items/Consumerables/Steak.png | 3 + .../Items/Consumerables/Steak.png.meta | 116 ++++++++++++++++++ Assets/Assets/Sprites/Items/Quest.meta | 8 ++ .../Assets/Sprites/Items/Quest/Bear_skin.png | 3 + .../Sprites/Items/Quest/Bear_skin.png.meta | 116 ++++++++++++++++++ Assets/Prefabs/Shop/ItemBox.prefab | 78 +++++++++++- .../Items/Ammo Types/40.asset | 20 +++ .../Items/Ammo Types/40.asset.meta | 8 ++ .../Items/Ammo Types/44.asset | 6 +- .../Items/Consumerables/Steak.asset | 21 ++++ .../Items/Consumerables/Steak.asset.meta | 8 ++ .../Items/Consumerables/Whiskey.asset | 21 ++++ .../Items/Consumerables/Whiskey.asset.meta | 8 ++ Assets/Scriptable Objects/Items/Quest.meta | 8 ++ .../Items/Quest/Bear Rug.asset | 20 +++ .../Items/Quest/Bear Rug.asset.meta | 8 ++ .../Items/Weapons/Carbine.asset | 4 +- .../Items/Weapons/Revolver.asset | 4 +- Assets/Scriptable Objects/Money/Money.asset | 2 +- .../Items/Item Types/Derived/QuestItem.cs | 1 + .../Item Types/Derived/RangedWeaponItem.cs | 6 +- Assets/Scripts/Shop/ShopVendor.cs | 5 +- Assets/Scripts/Shop/UIBuyItem.cs | 21 +++- Assets/Scripts/Shop/UISelectItem.cs | 11 +- 26 files changed, 603 insertions(+), 22 deletions(-) create mode 100644 Assets/Assets/Sprites/Items/Consumerables/Bottle_o_whisky_1.png create mode 100644 Assets/Assets/Sprites/Items/Consumerables/Bottle_o_whisky_1.png.meta create mode 100644 Assets/Assets/Sprites/Items/Consumerables/Steak.png create mode 100644 Assets/Assets/Sprites/Items/Consumerables/Steak.png.meta create mode 100644 Assets/Assets/Sprites/Items/Quest.meta create mode 100644 Assets/Assets/Sprites/Items/Quest/Bear_skin.png create mode 100644 Assets/Assets/Sprites/Items/Quest/Bear_skin.png.meta create mode 100644 Assets/Scriptable Objects/Items/Ammo Types/40.asset create mode 100644 Assets/Scriptable Objects/Items/Ammo Types/40.asset.meta create mode 100644 Assets/Scriptable Objects/Items/Consumerables/Steak.asset create mode 100644 Assets/Scriptable Objects/Items/Consumerables/Steak.asset.meta create mode 100644 Assets/Scriptable Objects/Items/Consumerables/Whiskey.asset create mode 100644 Assets/Scriptable Objects/Items/Consumerables/Whiskey.asset.meta create mode 100644 Assets/Scriptable Objects/Items/Quest.meta create mode 100644 Assets/Scriptable Objects/Items/Quest/Bear Rug.asset create mode 100644 Assets/Scriptable Objects/Items/Quest/Bear Rug.asset.meta diff --git a/Assets/Assets/Sprites/Items/Consumerables/Bottle_o_whisky_1.png b/Assets/Assets/Sprites/Items/Consumerables/Bottle_o_whisky_1.png new file mode 100644 index 0000000..1ce4006 --- /dev/null +++ b/Assets/Assets/Sprites/Items/Consumerables/Bottle_o_whisky_1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd89c4d1c91e69b2312efdd399f82fdca57860dbb5130ca1878849cc1972902d +size 363 diff --git a/Assets/Assets/Sprites/Items/Consumerables/Bottle_o_whisky_1.png.meta b/Assets/Assets/Sprites/Items/Consumerables/Bottle_o_whisky_1.png.meta new file mode 100644 index 0000000..3175366 --- /dev/null +++ b/Assets/Assets/Sprites/Items/Consumerables/Bottle_o_whisky_1.png.meta @@ -0,0 +1,116 @@ +fileFormatVersion: 2 +guid: 02b37d31eb050cb4495b6163daf90e84 +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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + 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: 16 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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/Assets/Sprites/Items/Consumerables/Steak.png b/Assets/Assets/Sprites/Items/Consumerables/Steak.png new file mode 100644 index 0000000..18ac4d5 --- /dev/null +++ b/Assets/Assets/Sprites/Items/Consumerables/Steak.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d3555c73c475b7460db7f600081f05a188516ce1443c25bdc1a6f942e4ccf7c +size 531 diff --git a/Assets/Assets/Sprites/Items/Consumerables/Steak.png.meta b/Assets/Assets/Sprites/Items/Consumerables/Steak.png.meta new file mode 100644 index 0000000..8c8e1ac --- /dev/null +++ b/Assets/Assets/Sprites/Items/Consumerables/Steak.png.meta @@ -0,0 +1,116 @@ +fileFormatVersion: 2 +guid: c4f4493d88a24e642bf770f0722004e5 +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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + 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: 16 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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/Assets/Sprites/Items/Quest.meta b/Assets/Assets/Sprites/Items/Quest.meta new file mode 100644 index 0000000..6935672 --- /dev/null +++ b/Assets/Assets/Sprites/Items/Quest.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2114047bab5165f49b2bec1c0a3cc5f1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Assets/Sprites/Items/Quest/Bear_skin.png b/Assets/Assets/Sprites/Items/Quest/Bear_skin.png new file mode 100644 index 0000000..8fd9a34 --- /dev/null +++ b/Assets/Assets/Sprites/Items/Quest/Bear_skin.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f4816d89557655a120f8f1105aaea8a83689ccab2ae7af11fb7c07588e4671f9 +size 1572 diff --git a/Assets/Assets/Sprites/Items/Quest/Bear_skin.png.meta b/Assets/Assets/Sprites/Items/Quest/Bear_skin.png.meta new file mode 100644 index 0000000..fc1fc45 --- /dev/null +++ b/Assets/Assets/Sprites/Items/Quest/Bear_skin.png.meta @@ -0,0 +1,116 @@ +fileFormatVersion: 2 +guid: a8f67ae2c9192c64e8c43b48b0b7e7b1 +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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + 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: 16 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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/Prefabs/Shop/ItemBox.prefab b/Assets/Prefabs/Shop/ItemBox.prefab index e3d3d82..18f5c47 100644 --- a/Assets/Prefabs/Shop/ItemBox.prefab +++ b/Assets/Prefabs/Shop/ItemBox.prefab @@ -1,5 +1,79 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1842724965 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1842724966} + - component: {fileID: 1842724968} + - component: {fileID: 1842724967} + m_Layer: 5 + m_Name: outline + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1842724966 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1842724965} + 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: 4346921439750350513} + m_RootOrder: 2 + 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: -1.01, y: -1.29} + m_SizeDelta: {x: 315.84604, y: 67.01825} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1842724968 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1842724965} + m_CullTransparentMesh: 0 +--- !u!114 &1842724967 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1842724965} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: e22b3063c7de6f54fadb4e77b1e3d9fd, type: 3} + m_Type: 0 + 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!1 &4346921439750350526 GameObject: m_ObjectHideFlags: 0 @@ -29,6 +103,7 @@ RectTransform: m_Children: - {fileID: 4346921440232125267} - {fileID: 4346921440275405481} + - {fileID: 1842724966} m_Father: {fileID: 4346921440786638806} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -264,7 +339,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &4346921440786638806 RectTransform: m_ObjectHideFlags: 0 @@ -388,4 +463,3 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0b8c792cd6939846926d88ded220471, type: 3} m_Name: m_EditorClassIdentifier: - btnBuyItem: {fileID: 0} diff --git a/Assets/Scriptable Objects/Items/Ammo Types/40.asset b/Assets/Scriptable Objects/Items/Ammo Types/40.asset new file mode 100644 index 0000000..2e2b07f --- /dev/null +++ b/Assets/Scriptable Objects/Items/Ammo Types/40.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f57d1f685fc12ec4094c9e0baae4bbae, type: 3} + m_Name: 40 + m_EditorClassIdentifier: + k__BackingField: .40 + k__BackingField: An ammotype for a revolver + k__BackingField: 150 + k__BackingField: {fileID: 21300000, guid: c0d4f68cd50606740b9070213a66a126, + type: 3} + k__BackingField: 64 diff --git a/Assets/Scriptable Objects/Items/Ammo Types/40.asset.meta b/Assets/Scriptable Objects/Items/Ammo Types/40.asset.meta new file mode 100644 index 0000000..1f5552e --- /dev/null +++ b/Assets/Scriptable Objects/Items/Ammo Types/40.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4bc8a77023b7f254eb5d9bd52c7de1b4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptable Objects/Items/Ammo Types/44.asset b/Assets/Scriptable Objects/Items/Ammo Types/44.asset index ec5cd6a..5b88c28 100644 --- a/Assets/Scriptable Objects/Items/Ammo Types/44.asset +++ b/Assets/Scriptable Objects/Items/Ammo Types/44.asset @@ -13,8 +13,8 @@ MonoBehaviour: m_Name: 44 m_EditorClassIdentifier: k__BackingField: .44 - k__BackingField: An ammotype for a revolver - k__BackingField: 150 - k__BackingField: {fileID: 21300000, guid: c0d4f68cd50606740b9070213a66a126, + k__BackingField: An ammotype for a carbine + k__BackingField: 200 + k__BackingField: {fileID: 21300000, guid: 082fbc0c866c73246a7f33ca74b024ae, type: 3} k__BackingField: 64 diff --git a/Assets/Scriptable Objects/Items/Consumerables/Steak.asset b/Assets/Scriptable Objects/Items/Consumerables/Steak.asset new file mode 100644 index 0000000..71a125c --- /dev/null +++ b/Assets/Scriptable Objects/Items/Consumerables/Steak.asset @@ -0,0 +1,21 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b3226df8692d7024d8b16855af67c01d, type: 3} + m_Name: Steak + m_EditorClassIdentifier: + k__BackingField: Steak + k__BackingField: Very tasty meat + k__BackingField: 175 + k__BackingField: {fileID: 21300000, guid: c4f4493d88a24e642bf770f0722004e5, + type: 3} + k__BackingField: 5 + healthRegen: 50 diff --git a/Assets/Scriptable Objects/Items/Consumerables/Steak.asset.meta b/Assets/Scriptable Objects/Items/Consumerables/Steak.asset.meta new file mode 100644 index 0000000..53ffaab --- /dev/null +++ b/Assets/Scriptable Objects/Items/Consumerables/Steak.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ae057701aa7cbdc489648d6e169fafea +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptable Objects/Items/Consumerables/Whiskey.asset b/Assets/Scriptable Objects/Items/Consumerables/Whiskey.asset new file mode 100644 index 0000000..14d8950 --- /dev/null +++ b/Assets/Scriptable Objects/Items/Consumerables/Whiskey.asset @@ -0,0 +1,21 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b3226df8692d7024d8b16855af67c01d, type: 3} + m_Name: Whiskey + m_EditorClassIdentifier: + k__BackingField: Whiskey + k__BackingField: Over 15 years old + k__BackingField: 250 + k__BackingField: {fileID: 21300000, guid: 02b37d31eb050cb4495b6163daf90e84, + type: 3} + k__BackingField: 1 + healthRegen: 10 diff --git a/Assets/Scriptable Objects/Items/Consumerables/Whiskey.asset.meta b/Assets/Scriptable Objects/Items/Consumerables/Whiskey.asset.meta new file mode 100644 index 0000000..61742e7 --- /dev/null +++ b/Assets/Scriptable Objects/Items/Consumerables/Whiskey.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: be29b96926536c84aadefa77171d894e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptable Objects/Items/Quest.meta b/Assets/Scriptable Objects/Items/Quest.meta new file mode 100644 index 0000000..2eedb7c --- /dev/null +++ b/Assets/Scriptable Objects/Items/Quest.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 35de0c25c683f6547b13e0dcbf44c30d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptable Objects/Items/Quest/Bear Rug.asset b/Assets/Scriptable Objects/Items/Quest/Bear Rug.asset new file mode 100644 index 0000000..ff7f6a6 --- /dev/null +++ b/Assets/Scriptable Objects/Items/Quest/Bear Rug.asset @@ -0,0 +1,20 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 408f3cac3577fcb4eb942518f294ff40, type: 3} + m_Name: Bear Rug + m_EditorClassIdentifier: + k__BackingField: Bear Rug + k__BackingField: A rug from a bear + k__BackingField: 165 + k__BackingField: {fileID: 21300000, guid: a8f67ae2c9192c64e8c43b48b0b7e7b1, + type: 3} + k__BackingField: 1 diff --git a/Assets/Scriptable Objects/Items/Quest/Bear Rug.asset.meta b/Assets/Scriptable Objects/Items/Quest/Bear Rug.asset.meta new file mode 100644 index 0000000..71f080a --- /dev/null +++ b/Assets/Scriptable Objects/Items/Quest/Bear Rug.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cedffd5d71c218649a1e293f99580616 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scriptable Objects/Items/Weapons/Carbine.asset b/Assets/Scriptable Objects/Items/Weapons/Carbine.asset index b73626a..f2ca697 100644 --- a/Assets/Scriptable Objects/Items/Weapons/Carbine.asset +++ b/Assets/Scriptable Objects/Items/Weapons/Carbine.asset @@ -19,8 +19,8 @@ MonoBehaviour: type: 3} k__BackingField: 1 k__BackingField: 12 - k__BackingField: 2147483571 - k__BackingField: 40 + k__BackingField: 12 + k__BackingField: 44 k__BackingField: 0 k__BackingField: 4 k__BackingField: {fileID: 7463538146015067466, guid: 14d5eee96d854224bb68571e5a36f48b, diff --git a/Assets/Scriptable Objects/Items/Weapons/Revolver.asset b/Assets/Scriptable Objects/Items/Weapons/Revolver.asset index 22f20f3..2334b53 100644 --- a/Assets/Scriptable Objects/Items/Weapons/Revolver.asset +++ b/Assets/Scriptable Objects/Items/Weapons/Revolver.asset @@ -19,8 +19,8 @@ MonoBehaviour: type: 3} k__BackingField: 1 k__BackingField: 6 - k__BackingField: 399 - k__BackingField: 44 + k__BackingField: 3 + k__BackingField: 40 k__BackingField: 0 k__BackingField: 4 k__BackingField: {fileID: 7463538146015067466, guid: 14d5eee96d854224bb68571e5a36f48b, diff --git a/Assets/Scriptable Objects/Money/Money.asset b/Assets/Scriptable Objects/Money/Money.asset index c4e3a06..14b106b 100644 --- a/Assets/Scriptable Objects/Money/Money.asset +++ b/Assets/Scriptable Objects/Money/Money.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 726edc2ae52695244a441317220c9386, type: 3} m_Name: Money m_EditorClassIdentifier: - currMoney: 0 + currMoney: 20000 diff --git a/Assets/Scripts/Inventory/Items/Item Types/Derived/QuestItem.cs b/Assets/Scripts/Inventory/Items/Item Types/Derived/QuestItem.cs index 387aa48..d50e49e 100644 --- a/Assets/Scripts/Inventory/Items/Item Types/Derived/QuestItem.cs +++ b/Assets/Scripts/Inventory/Items/Item Types/Derived/QuestItem.cs @@ -4,6 +4,7 @@ namespace Inventory { + [CreateAssetMenu(fileName = "QuestItem", menuName = "Items/QuestItem")] public class QuestItem : Item { public override void Use(InputMaster _playerInput, GameObject _caller) diff --git a/Assets/Scripts/Inventory/Items/Item Types/Derived/RangedWeaponItem.cs b/Assets/Scripts/Inventory/Items/Item Types/Derived/RangedWeaponItem.cs index 3a26362..856a278 100644 --- a/Assets/Scripts/Inventory/Items/Item Types/Derived/RangedWeaponItem.cs +++ b/Assets/Scripts/Inventory/Items/Item Types/Derived/RangedWeaponItem.cs @@ -69,7 +69,7 @@ public override void ControllerUse(InputMaster _playerInput, GameObject _caller) Vector2 controllerDir = _playerInput.Player.ControllerAim.ReadValue(); if (controllerDir == new Vector2(0,0)) return; - GameObject g = Instantiate(bulletPrefab, firePointPos, Quaternion.identity); + GameObject g = Instantiate(bulletPrefab, firePointPos + new Vector2(0f, 0.4f), Quaternion.identity); currAmmo--; Inventory.Controller.instance.UpdateAmmo(currAmmo.ToString(), chamberSize.ToString()); g.GetComponent().MoveBullet(controllerDir.normalized); @@ -88,8 +88,8 @@ public void Reload() public enum AmmoType { - Revolver = 44, - Carbine = 40, + Revolver = 40, + Carbine = 44, } } } diff --git a/Assets/Scripts/Shop/ShopVendor.cs b/Assets/Scripts/Shop/ShopVendor.cs index f13d26c..1fd5b40 100644 --- a/Assets/Scripts/Shop/ShopVendor.cs +++ b/Assets/Scripts/Shop/ShopVendor.cs @@ -46,8 +46,9 @@ public void OpenShop(Rigidbody2D _rb) GameObject g = Instantiate(itemBox, itemBoxParent); g.SetActive(true); spawnedButtons.Add(g); - - g.GetComponent().Setup(item, selectItemSprite, selectItemName, selectItemDescription, btnBuy); + + GameObject outline = g.transform.GetChild(0).GetChild(2).gameObject; + g.GetComponent().Setup(item, selectItemSprite, selectItemName, selectItemDescription, btnBuy, outline); g.transform.GetChild(0).GetChild(0).gameObject.GetComponent().text = item.name; g.transform.GetChild(0).GetChild(1).gameObject.GetComponent().sprite = item.sprite; diff --git a/Assets/Scripts/Shop/UIBuyItem.cs b/Assets/Scripts/Shop/UIBuyItem.cs index 213caa1..c32ddef 100644 --- a/Assets/Scripts/Shop/UIBuyItem.cs +++ b/Assets/Scripts/Shop/UIBuyItem.cs @@ -4,8 +4,9 @@ using UnityEngine; using UnityEngine.UI; using TMPro; +using UnityEngine.EventSystems; -public class UIBuyItem : MonoBehaviour +public class UIBuyItem : MonoBehaviour, ISelectHandler, IDeselectHandler { private Item item; @@ -16,7 +17,21 @@ public void Setup(Item _item) public void Buy() { - Inventory.Controller.instance.AddItem(item); - Inventory.Controller.instance.RefreshUI(); + if (MoneyManager.instance.canAfford(item.goldValue) == true) + { + Inventory.Controller.instance.AddItem(item); + MoneyManager.instance.RemoveMoney(item.goldValue); + Inventory.Controller.instance.RefreshUI(); + } + } + + public void OnSelect(BaseEventData eventData) + { + this.transform.GetChild(0).GetComponent().color = new Color32(0,85,64,100); + } + + public void OnDeselect(BaseEventData eventData) + { + this.transform.GetChild(0).GetComponent().color = new Color32(0,0,0,100); } } diff --git a/Assets/Scripts/Shop/UISelectItem.cs b/Assets/Scripts/Shop/UISelectItem.cs index 0f2b3df..a02899e 100644 --- a/Assets/Scripts/Shop/UISelectItem.cs +++ b/Assets/Scripts/Shop/UISelectItem.cs @@ -16,6 +16,7 @@ public class UISelectItem : MonoBehaviour, ISelectHandler, IDeselectHandler private TextMeshProUGUI selectItemName; private TextMeshProUGUI selectItemDescription; private Button btnBuy; + private GameObject outline; // Internal item references private Sprite itemSprite; @@ -24,7 +25,7 @@ public class UISelectItem : MonoBehaviour, ISelectHandler, IDeselectHandler private int itemGoldValue; private Item item; - public void Setup(Item _item, Image _itmSprite, TextMeshProUGUI _itmName, TextMeshProUGUI _itmDescription, Button _btnBuy) + public void Setup(Item _item, Image _itmSprite, TextMeshProUGUI _itmName, TextMeshProUGUI _itmDescription, Button _btnBuy, GameObject _outline) { item = _item; // ITEM SETUP @@ -38,7 +39,7 @@ public void Setup(Item _item, Image _itmSprite, TextMeshProUGUI _itmName, TextMe selectItemName = _itmName; selectItemDescription = _itmDescription; btnBuy = _btnBuy; - + outline = _outline; } public void RefreshSelected() @@ -54,12 +55,14 @@ public void RefreshSelected() public void OnSelect(BaseEventData eventData) { - gameObject.transform.localScale = new Vector3(gameObject.transform.localScale.x * 1.1f, gameObject.transform.localScale.y * 1.1f); + outline.SetActive(true); + //gameObject.transform.localScale = new Vector3(gameObject.transform.localScale.x * 1.1f, gameObject.transform.localScale.y * 1.1f); RefreshSelected(); } public void OnDeselect(BaseEventData eventData) { - gameObject.transform.localScale = new Vector3(gameObject.transform.localScale.x / 1.1f, gameObject.transform.localScale.y / 1.1f); + outline.SetActive(false); + //gameObject.transform.localScale = new Vector3(gameObject.transform.localScale.x / 1.1f, gameObject.transform.localScale.y / 1.1f); } }