diff --git a/Assets/IMG/Aseprite/Inv_Bag_One.aseprite b/Assets/IMG/Aseprite/Inv_Bag_One.aseprite index 067559d..718d887 100644 Binary files a/Assets/IMG/Aseprite/Inv_Bag_One.aseprite and b/Assets/IMG/Aseprite/Inv_Bag_One.aseprite differ diff --git a/Assets/IMG/Aseprite/Inv_Bag_Three.aseprite b/Assets/IMG/Aseprite/Inv_Bag_Three.aseprite index ecc9ee8..8b9a67f 100644 Binary files a/Assets/IMG/Aseprite/Inv_Bag_Three.aseprite and b/Assets/IMG/Aseprite/Inv_Bag_Three.aseprite differ diff --git a/Assets/IMG/Aseprite/Inv_Bag_Two.aseprite b/Assets/IMG/Aseprite/Inv_Bag_Two.aseprite index d80835b..ca7bbcf 100644 Binary files a/Assets/IMG/Aseprite/Inv_Bag_Two.aseprite and b/Assets/IMG/Aseprite/Inv_Bag_Two.aseprite differ diff --git a/Assets/IMG/Aseprite/Inv_Boots.aseprite b/Assets/IMG/Aseprite/Inv_Boots.aseprite new file mode 100644 index 0000000..457a452 Binary files /dev/null and b/Assets/IMG/Aseprite/Inv_Boots.aseprite differ diff --git a/Assets/IMG/Aseprite/Inv_Boots.aseprite.meta b/Assets/IMG/Aseprite/Inv_Boots.aseprite.meta new file mode 100644 index 0000000..7750b40 --- /dev/null +++ b/Assets/IMG/Aseprite/Inv_Boots.aseprite.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 75a2bc0119678dd42aa03840f90d3e59 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/Aseprite/Inv_Chest.aseprite b/Assets/IMG/Aseprite/Inv_Chest.aseprite new file mode 100644 index 0000000..189dcb1 Binary files /dev/null and b/Assets/IMG/Aseprite/Inv_Chest.aseprite differ diff --git a/Assets/IMG/Aseprite/Inv_Chest.aseprite.meta b/Assets/IMG/Aseprite/Inv_Chest.aseprite.meta new file mode 100644 index 0000000..8048c76 --- /dev/null +++ b/Assets/IMG/Aseprite/Inv_Chest.aseprite.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3929f3d74438c7a4e9ff780c1297cfaa +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/Aseprite/Inv_Dagger.aseprite b/Assets/IMG/Aseprite/Inv_Dagger.aseprite new file mode 100644 index 0000000..ed2fe47 Binary files /dev/null and b/Assets/IMG/Aseprite/Inv_Dagger.aseprite differ diff --git a/Assets/IMG/Aseprite/Inv_Dagger.aseprite.meta b/Assets/IMG/Aseprite/Inv_Dagger.aseprite.meta new file mode 100644 index 0000000..43d65d7 --- /dev/null +++ b/Assets/IMG/Aseprite/Inv_Dagger.aseprite.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 48605439fddb8724daf6b7fb466b5205 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/Aseprite/Inv_Hands.aseprite b/Assets/IMG/Aseprite/Inv_Hands.aseprite new file mode 100644 index 0000000..ed2fe47 Binary files /dev/null and b/Assets/IMG/Aseprite/Inv_Hands.aseprite differ diff --git a/Assets/IMG/Aseprite/Inv_Hands.aseprite.meta b/Assets/IMG/Aseprite/Inv_Hands.aseprite.meta new file mode 100644 index 0000000..60577fe --- /dev/null +++ b/Assets/IMG/Aseprite/Inv_Hands.aseprite.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 76aa898f58fef024890acf56a6a6b881 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/Aseprite/Inv_Helmet.aseprite b/Assets/IMG/Aseprite/Inv_Helmet.aseprite new file mode 100644 index 0000000..f705543 Binary files /dev/null and b/Assets/IMG/Aseprite/Inv_Helmet.aseprite differ diff --git a/Assets/IMG/Aseprite/Inv_Helmet.aseprite.meta b/Assets/IMG/Aseprite/Inv_Helmet.aseprite.meta new file mode 100644 index 0000000..6733acb --- /dev/null +++ b/Assets/IMG/Aseprite/Inv_Helmet.aseprite.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 59c7cfb2ad6d4af44853d3f2d59a0caf +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/Aseprite/Inv_Rarity.aseprite b/Assets/IMG/Aseprite/Inv_Rarity.aseprite new file mode 100644 index 0000000..c47947a Binary files /dev/null and b/Assets/IMG/Aseprite/Inv_Rarity.aseprite differ diff --git a/Assets/IMG/Aseprite/Inv_Rarity.aseprite.meta b/Assets/IMG/Aseprite/Inv_Rarity.aseprite.meta new file mode 100644 index 0000000..b043c87 --- /dev/null +++ b/Assets/IMG/Aseprite/Inv_Rarity.aseprite.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 44f25591d3b2c114ca33f428e316b7fc +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/Aseprite/Inv_Shield.aseprite b/Assets/IMG/Aseprite/Inv_Shield.aseprite new file mode 100644 index 0000000..ed2fe47 Binary files /dev/null and b/Assets/IMG/Aseprite/Inv_Shield.aseprite differ diff --git a/Assets/IMG/Aseprite/Inv_Shield.aseprite.meta b/Assets/IMG/Aseprite/Inv_Shield.aseprite.meta new file mode 100644 index 0000000..82fc9b1 --- /dev/null +++ b/Assets/IMG/Aseprite/Inv_Shield.aseprite.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2b961b1dc99c0354b95b02907a546231 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/Aseprite/Inv_Shoulders.aseprite b/Assets/IMG/Aseprite/Inv_Shoulders.aseprite new file mode 100644 index 0000000..fc45bf8 Binary files /dev/null and b/Assets/IMG/Aseprite/Inv_Shoulders.aseprite differ diff --git a/Assets/IMG/Aseprite/Inv_Shoulders.aseprite.meta b/Assets/IMG/Aseprite/Inv_Shoulders.aseprite.meta new file mode 100644 index 0000000..71984b8 --- /dev/null +++ b/Assets/IMG/Aseprite/Inv_Shoulders.aseprite.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4f16dd9875b9ae443a7e02ee1ad2ad17 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/Aseprite/Inv_Staff.aseprite b/Assets/IMG/Aseprite/Inv_Staff.aseprite new file mode 100644 index 0000000..ed2fe47 Binary files /dev/null and b/Assets/IMG/Aseprite/Inv_Staff.aseprite differ diff --git a/Assets/IMG/Aseprite/Inv_Staff.aseprite.meta b/Assets/IMG/Aseprite/Inv_Staff.aseprite.meta new file mode 100644 index 0000000..1a36792 --- /dev/null +++ b/Assets/IMG/Aseprite/Inv_Staff.aseprite.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 80e847c2f2c05e548a05d0bafb267ad1 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/Aseprite/Inv_Sword.aseprite b/Assets/IMG/Aseprite/Inv_Sword.aseprite new file mode 100644 index 0000000..ed2fe47 Binary files /dev/null and b/Assets/IMG/Aseprite/Inv_Sword.aseprite differ diff --git a/Assets/IMG/Aseprite/Inv_Sword.aseprite.meta b/Assets/IMG/Aseprite/Inv_Sword.aseprite.meta new file mode 100644 index 0000000..0da4620 --- /dev/null +++ b/Assets/IMG/Aseprite/Inv_Sword.aseprite.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ae41f2739f12956478ef69e1552340b4 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/Aseprite/Inv_Wand.aseprite b/Assets/IMG/Aseprite/Inv_Wand.aseprite new file mode 100644 index 0000000..ed2fe47 Binary files /dev/null and b/Assets/IMG/Aseprite/Inv_Wand.aseprite differ diff --git a/Assets/IMG/Aseprite/Inv_Wand.aseprite.meta b/Assets/IMG/Aseprite/Inv_Wand.aseprite.meta new file mode 100644 index 0000000..2c91245 --- /dev/null +++ b/Assets/IMG/Aseprite/Inv_Wand.aseprite.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9166d969aee35d54bb82621a83804e5a +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/Inventory/Inv_Amulet.png b/Assets/IMG/Inventory/Inv_Amulet.png new file mode 100644 index 0000000..e675952 Binary files /dev/null and b/Assets/IMG/Inventory/Inv_Amulet.png differ diff --git a/Assets/IMG/Inventory/Inv_Amulet.png.meta b/Assets/IMG/Inventory/Inv_Amulet.png.meta new file mode 100644 index 0000000..2d6886b --- /dev/null +++ b/Assets/IMG/Inventory/Inv_Amulet.png.meta @@ -0,0 +1,120 @@ +fileFormatVersion: 2 +guid: b78731a0b5ceec84e8b899d919c5ef7b +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/IMG/Inventory/Inv_Bag_One.png b/Assets/IMG/Inventory/Inv_Bag_One.png index d9c3908..6fdeafc 100644 Binary files a/Assets/IMG/Inventory/Inv_Bag_One.png and b/Assets/IMG/Inventory/Inv_Bag_One.png differ diff --git a/Assets/IMG/Inventory/Inv_Bag_Three.png b/Assets/IMG/Inventory/Inv_Bag_Three.png index 8add1df..88255d4 100644 Binary files a/Assets/IMG/Inventory/Inv_Bag_Three.png and b/Assets/IMG/Inventory/Inv_Bag_Three.png differ diff --git a/Assets/IMG/Inventory/Inv_Bag_Two.png b/Assets/IMG/Inventory/Inv_Bag_Two.png index 61aee37..a6f21e0 100644 Binary files a/Assets/IMG/Inventory/Inv_Bag_Two.png and b/Assets/IMG/Inventory/Inv_Bag_Two.png differ diff --git a/Assets/IMG/Inventory/Inv_Boots.png b/Assets/IMG/Inventory/Inv_Boots.png new file mode 100644 index 0000000..f9c9a33 Binary files /dev/null and b/Assets/IMG/Inventory/Inv_Boots.png differ diff --git a/Assets/IMG/Inventory/Inv_Boots.png.meta b/Assets/IMG/Inventory/Inv_Boots.png.meta new file mode 100644 index 0000000..21b02a5 --- /dev/null +++ b/Assets/IMG/Inventory/Inv_Boots.png.meta @@ -0,0 +1,120 @@ +fileFormatVersion: 2 +guid: 6329549321769d140a929bf8310a7609 +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/IMG/Inventory/Inv_Chest.png b/Assets/IMG/Inventory/Inv_Chest.png new file mode 100644 index 0000000..6999a29 Binary files /dev/null and b/Assets/IMG/Inventory/Inv_Chest.png differ diff --git a/Assets/IMG/Inventory/Inv_Chest.png.meta b/Assets/IMG/Inventory/Inv_Chest.png.meta new file mode 100644 index 0000000..9b38479 --- /dev/null +++ b/Assets/IMG/Inventory/Inv_Chest.png.meta @@ -0,0 +1,120 @@ +fileFormatVersion: 2 +guid: d457be01a799c0c4b9f8955ae40b8597 +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/IMG/Inventory/Inv_Helmet.png b/Assets/IMG/Inventory/Inv_Helmet.png new file mode 100644 index 0000000..98352cb Binary files /dev/null and b/Assets/IMG/Inventory/Inv_Helmet.png differ diff --git a/Assets/IMG/Inventory/Inv_Helmet.png.meta b/Assets/IMG/Inventory/Inv_Helmet.png.meta new file mode 100644 index 0000000..35925be --- /dev/null +++ b/Assets/IMG/Inventory/Inv_Helmet.png.meta @@ -0,0 +1,120 @@ +fileFormatVersion: 2 +guid: 3e22baa97538d6d4ea02a63cf7cebe6a +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/IMG/Inventory/Inv_Rarity.png b/Assets/IMG/Inventory/Inv_Rarity.png new file mode 100644 index 0000000..cbe1930 Binary files /dev/null and b/Assets/IMG/Inventory/Inv_Rarity.png differ diff --git a/Assets/IMG/Inventory/Inv_Rarity.png.meta b/Assets/IMG/Inventory/Inv_Rarity.png.meta new file mode 100644 index 0000000..7c5e204 --- /dev/null +++ b/Assets/IMG/Inventory/Inv_Rarity.png.meta @@ -0,0 +1,120 @@ +fileFormatVersion: 2 +guid: 9910b74e21817c14e9a433d9fa55b0ff +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: 1 + 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: 1 + 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/IMG/Inventory/Inv_Ring.png b/Assets/IMG/Inventory/Inv_Ring.png new file mode 100644 index 0000000..7eded0c Binary files /dev/null and b/Assets/IMG/Inventory/Inv_Ring.png differ diff --git a/Assets/IMG/Inventory/Inv_Ring.png.meta b/Assets/IMG/Inventory/Inv_Ring.png.meta new file mode 100644 index 0000000..efc7e12 --- /dev/null +++ b/Assets/IMG/Inventory/Inv_Ring.png.meta @@ -0,0 +1,120 @@ +fileFormatVersion: 2 +guid: 6f169adf814f78b4b93ddf3166588b01 +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/IMG/Inventory/Inv_Shoulders.png b/Assets/IMG/Inventory/Inv_Shoulders.png new file mode 100644 index 0000000..fa3b095 Binary files /dev/null and b/Assets/IMG/Inventory/Inv_Shoulders.png differ diff --git a/Assets/IMG/Inventory/Inv_Shoulders.png.meta b/Assets/IMG/Inventory/Inv_Shoulders.png.meta new file mode 100644 index 0000000..56025c9 --- /dev/null +++ b/Assets/IMG/Inventory/Inv_Shoulders.png.meta @@ -0,0 +1,120 @@ +fileFormatVersion: 2 +guid: 4ae569f6fd302ed4e9d803c2b173469b +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 b5676bf..6eac7a5 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -1002,7 +1002,6 @@ MonoBehaviour: feet: {fileID: 92541555} ring: {fileID: 1251735152} amulet: {fileID: 1144658891} - hands: {fileID: 398094560} leftHand: {fileID: 2074995250} rightHand: {fileID: 2051014505} bags: @@ -2574,7 +2573,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 206628748623723556, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} propertyPath: place - value: 7 + value: 6 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} @@ -5716,11 +5715,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 395851979} m_CullTransparentMesh: 1 ---- !u!1 &398094560 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 206628748623723552, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} - m_PrefabInstance: {fileID: 1367039801} - m_PrefabAsset: {fileID: 0} --- !u!1 &402242111 GameObject: m_ObjectHideFlags: 0 @@ -12316,7 +12310,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 206628748623723556, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} propertyPath: place - value: 8 + value: 7 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} @@ -17955,7 +17949,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 206628748623723556, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} propertyPath: place - value: 5 + value: 4 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} @@ -17964,112 +17958,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 206628748623723553, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} m_PrefabInstance: {fileID: 1365079343} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1367039801 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1730748811} - m_Modifications: - - target: {fileID: 206628748623723552, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} - propertyPath: m_Name - value: equipHands - objectReference: {fileID: 0} - - target: {fileID: 206628748623723553, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 206628748623723553, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 206628748623723553, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 206628748623723553, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} - propertyPath: m_AnchorMax.x - value: 0.25 - objectReference: {fileID: 0} - - target: {fileID: 206628748623723553, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} - propertyPath: m_AnchorMax.y - value: 0.9 - objectReference: {fileID: 0} - - target: {fileID: 206628748623723553, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} - propertyPath: m_AnchorMin.x - value: 0.1 - objectReference: {fileID: 0} - - target: {fileID: 206628748623723553, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} - propertyPath: m_AnchorMin.y - value: 0.1 - objectReference: {fileID: 0} - - target: {fileID: 206628748623723553, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 206628748623723553, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 206628748623723553, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 206628748623723553, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 206628748623723553, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 206628748623723553, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 206628748623723553, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 206628748623723553, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 206628748623723553, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 206628748623723553, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 206628748623723553, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 206628748623723553, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 206628748623723553, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 206628748623723553, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 206628748623723556, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} - propertyPath: place - value: 4 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} ---- !u!224 &1367039802 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 206628748623723553, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} - m_PrefabInstance: {fileID: 1367039801} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1368274939 PrefabInstance: m_ObjectHideFlags: 0 @@ -22433,7 +22321,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 864026983} - - {fileID: 1367039802} m_Father: {fileID: 822494757} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -26003,7 +25890,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 206628748623723556, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} propertyPath: place - value: 6 + value: 5 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6561ab2146fa2534cb13d1da79d00a97, type: 3} diff --git a/Assets/Scripts/Inventory.cs b/Assets/Scripts/Inventory.cs index 0e3347e..d8d485d 100644 --- a/Assets/Scripts/Inventory.cs +++ b/Assets/Scripts/Inventory.cs @@ -14,7 +14,6 @@ namespace Assets.Scripts public GameObject feet; public GameObject ring; public GameObject amulet; - public GameObject hands; public GameObject leftHand; public GameObject rightHand; @@ -97,7 +96,7 @@ namespace Assets.Scripts private void checkEquipColors() { GameObject slot = head; - for (int i = 0; i < 9; i++) + for (int i = 0; i < 8; i++) { switch (i) { @@ -111,21 +110,18 @@ namespace Assets.Scripts slot = leftHand; break; case 3: - slot = hands; - break; - case 4: slot = amulet; break; - case 5: + case 4: slot = feet; break; - case 6: + case 5: slot = shoulders; break; - case 7: + case 6: slot = chest; break; - case 8: + case 7: slot = ring; break; } @@ -170,8 +166,6 @@ namespace Assets.Scripts return ring.GetComponent().getEquip(); case ItemPlace.ARMOR: return chest.GetComponent().getEquip(); - case ItemPlace.GLOVES: - return hands.GetComponent().getEquip(); default: return null; } diff --git a/Assets/Scripts/Item.cs b/Assets/Scripts/Item.cs index dd6f8ec..e165af6 100644 --- a/Assets/Scripts/Item.cs +++ b/Assets/Scripts/Item.cs @@ -30,7 +30,7 @@ namespace Assets.Scripts numberOfAttributes = 0; } calculateAttributes(luck, numberOfAttributes); - place = (ItemPlace)rand.Next(9); + place = (ItemPlace)rand.Next(8); if (itemName != null) { itemName = rarity.ToString() + " " + place.ToString() + " of " + itemName; diff --git a/Assets/Scripts/Items/ItemPlace.cs b/Assets/Scripts/Items/ItemPlace.cs index 1400827..8879cd0 100644 --- a/Assets/Scripts/Items/ItemPlace.cs +++ b/Assets/Scripts/Items/ItemPlace.cs @@ -12,7 +12,6 @@ namespace Assets.Scripts SHOULDER, WEAPON, SHIELD, - GLOVES, RING, AMULET, ARMOR,