diff --git a/Assets/Game Objects/Player.prefab b/Assets/Game Objects/Player.prefab index 3462ed15..ad4fd4cf 100644 --- a/Assets/Game Objects/Player.prefab +++ b/Assets/Game Objects/Player.prefab @@ -237,6 +237,7 @@ MonoBehaviour: canJump: 1 canCrouch: 1 canUseHeadbob: 1 + canLean: 1 sprintKey: 304 jumpKey: 32 crouchKey: 99 @@ -250,8 +251,13 @@ MonoBehaviour: lookSpeedY: 2 upperLookLimit: 80 lowerLookLimit: 80 + toggleLeaning: 1 + leanLeftKey: 113 + leanRightKey: 101 + maxLeaningAngle: 30 jumpForce: 8 gravity: 30 + crouchHeightInterval: 0.1 crouchHeight: 0.5 standingHeight: 2 timeToCrouch: 0.25 diff --git a/Assets/Inventory System/2D Assets/Icons/5.56x45 AP Bullet_icon.png b/Assets/Inventory System/2D Assets/Icons/5.56x45 AP Bullet_icon.png index accba14c..374b7137 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/5.56x45 AP Bullet_icon.png and b/Assets/Inventory System/2D Assets/Icons/5.56x45 AP Bullet_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/5.56x45 AP_icon.png b/Assets/Inventory System/2D Assets/Icons/5.56x45 AP_icon.png index 5bf473fb..25634960 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/5.56x45 AP_icon.png and b/Assets/Inventory System/2D Assets/Icons/5.56x45 AP_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/5.56x45 Casing_icon.png b/Assets/Inventory System/2D Assets/Icons/5.56x45 Casing_icon.png index 307ba1b9..965fb05f 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/5.56x45 Casing_icon.png and b/Assets/Inventory System/2D Assets/Icons/5.56x45 Casing_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/5.56x45 FMJ Bullet_icon.png b/Assets/Inventory System/2D Assets/Icons/5.56x45 FMJ Bullet_icon.png index fa8b7afa..301861d8 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/5.56x45 FMJ Bullet_icon.png and b/Assets/Inventory System/2D Assets/Icons/5.56x45 FMJ Bullet_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/5.56x45 FMJ_icon.png b/Assets/Inventory System/2D Assets/Icons/5.56x45 FMJ_icon.png index 230d35f3..e2d919c5 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/5.56x45 FMJ_icon.png and b/Assets/Inventory System/2D Assets/Icons/5.56x45 FMJ_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/5.56x45 HP Bullet_icon.png b/Assets/Inventory System/2D Assets/Icons/5.56x45 HP Bullet_icon.png index 3f79a8c1..eae275d9 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/5.56x45 HP Bullet_icon.png and b/Assets/Inventory System/2D Assets/Icons/5.56x45 HP Bullet_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/5.56x45 HP_icon.png b/Assets/Inventory System/2D Assets/Icons/5.56x45 HP_icon.png index 5287eed9..40f2d5bf 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/5.56x45 HP_icon.png and b/Assets/Inventory System/2D Assets/Icons/5.56x45 HP_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/7.62x39 AP Bullet_icon.png b/Assets/Inventory System/2D Assets/Icons/7.62x39 AP Bullet_icon.png index 2ac8e685..81e19b06 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/7.62x39 AP Bullet_icon.png and b/Assets/Inventory System/2D Assets/Icons/7.62x39 AP Bullet_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/7.62x39 AP_icon.png b/Assets/Inventory System/2D Assets/Icons/7.62x39 AP_icon.png index d4818721..bba831d5 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/7.62x39 AP_icon.png and b/Assets/Inventory System/2D Assets/Icons/7.62x39 AP_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/7.62x39 Casing_icon.png b/Assets/Inventory System/2D Assets/Icons/7.62x39 Casing_icon.png index cc6a35d7..4d040b2d 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/7.62x39 Casing_icon.png and b/Assets/Inventory System/2D Assets/Icons/7.62x39 Casing_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/7.62x39 FMJ Bullet_icon.png b/Assets/Inventory System/2D Assets/Icons/7.62x39 FMJ Bullet_icon.png index ea962e6c..d31b4d74 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/7.62x39 FMJ Bullet_icon.png and b/Assets/Inventory System/2D Assets/Icons/7.62x39 FMJ Bullet_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/7.62x39 FMJ_icon.png b/Assets/Inventory System/2D Assets/Icons/7.62x39 FMJ_icon.png index 8fef16a9..5af73a8f 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/7.62x39 FMJ_icon.png and b/Assets/Inventory System/2D Assets/Icons/7.62x39 FMJ_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/7.62x39 HP Bullet_icon.png b/Assets/Inventory System/2D Assets/Icons/7.62x39 HP Bullet_icon.png index 59df8a07..1d7e6632 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/7.62x39 HP Bullet_icon.png and b/Assets/Inventory System/2D Assets/Icons/7.62x39 HP Bullet_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/7.62x39 HP_icon.png b/Assets/Inventory System/2D Assets/Icons/7.62x39 HP_icon.png index 45e0a594..dd11203a 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/7.62x39 HP_icon.png and b/Assets/Inventory System/2D Assets/Icons/7.62x39 HP_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Acid_icon.png b/Assets/Inventory System/2D Assets/Icons/Acid_icon.png index 88d4ac4d..c2111dc6 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Acid_icon.png and b/Assets/Inventory System/2D Assets/Icons/Acid_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Adaptive First Aid Kit_icon.png b/Assets/Inventory System/2D Assets/Icons/Adaptive First Aid Kit_icon.png index 9ff64dd3..25a382f4 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Adaptive First Aid Kit_icon.png and b/Assets/Inventory System/2D Assets/Icons/Adaptive First Aid Kit_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Adhesive_icon.png b/Assets/Inventory System/2D Assets/Icons/Adhesive_icon.png index d714243f..63236307 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Adhesive_icon.png and b/Assets/Inventory System/2D Assets/Icons/Adhesive_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Aluminum_icon.png b/Assets/Inventory System/2D Assets/Icons/Aluminum_icon.png index f2371df2..ebf9b505 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Aluminum_icon.png and b/Assets/Inventory System/2D Assets/Icons/Aluminum_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Antiseptic_icon.png b/Assets/Inventory System/2D Assets/Icons/Antiseptic_icon.png index f7594bbd..d74caea3 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Antiseptic_icon.png and b/Assets/Inventory System/2D Assets/Icons/Antiseptic_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Arma Plate Carrier_icon.png b/Assets/Inventory System/2D Assets/Icons/Arma Plate Carrier_icon.png index c0818e38..cb8ad471 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Arma Plate Carrier_icon.png and b/Assets/Inventory System/2D Assets/Icons/Arma Plate Carrier_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Armored Plate Carrier_icon.png b/Assets/Inventory System/2D Assets/Icons/Armored Plate Carrier_icon.png index c1233c35..5b922747 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Armored Plate Carrier_icon.png and b/Assets/Inventory System/2D Assets/Icons/Armored Plate Carrier_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Armored Vest_icon.png b/Assets/Inventory System/2D Assets/Icons/Armored Vest_icon.png index e64d3f32..27183d79 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Armored Vest_icon.png and b/Assets/Inventory System/2D Assets/Icons/Armored Vest_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Assault Backpack_icon.png b/Assets/Inventory System/2D Assets/Icons/Assault Backpack_icon.png index f1bdf406..90ca9eaa 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Assault Backpack_icon.png and b/Assets/Inventory System/2D Assets/Icons/Assault Backpack_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Assault Rig_icon.png b/Assets/Inventory System/2D Assets/Icons/Assault Rig_icon.png index 3059a08e..6fa2f66e 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Assault Rig_icon.png and b/Assets/Inventory System/2D Assets/Icons/Assault Rig_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Bandage_icon.png b/Assets/Inventory System/2D Assets/Icons/Bandage_icon.png index 51d3ebff..d05e0d82 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Bandage_icon.png and b/Assets/Inventory System/2D Assets/Icons/Bandage_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Basic Plate Carrier_icon.png b/Assets/Inventory System/2D Assets/Icons/Basic Plate Carrier_icon.png index f9df9100..d91c1dae 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Basic Plate Carrier_icon.png and b/Assets/Inventory System/2D Assets/Icons/Basic Plate Carrier_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Battle Backpack_icon.png b/Assets/Inventory System/2D Assets/Icons/Battle Backpack_icon.png index e18fc18b..425f2e5a 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Battle Backpack_icon.png and b/Assets/Inventory System/2D Assets/Icons/Battle Backpack_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Belt Rig_icon.png b/Assets/Inventory System/2D Assets/Icons/Belt Rig_icon.png index ce2b5e0b..80d40b90 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Belt Rig_icon.png and b/Assets/Inventory System/2D Assets/Icons/Belt Rig_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Brass_icon.png b/Assets/Inventory System/2D Assets/Icons/Brass_icon.png index 7dbd8403..81e24491 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Brass_icon.png and b/Assets/Inventory System/2D Assets/Icons/Brass_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Bullet Proof Vest_icon.png b/Assets/Inventory System/2D Assets/Icons/Bullet Proof Vest_icon.png index 28b43c04..475ccd35 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Bullet Proof Vest_icon.png and b/Assets/Inventory System/2D Assets/Icons/Bullet Proof Vest_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Chest Rig_icon.png b/Assets/Inventory System/2D Assets/Icons/Chest Rig_icon.png index bc4815da..ab5a41b2 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Chest Rig_icon.png and b/Assets/Inventory System/2D Assets/Icons/Chest Rig_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Class III Armor Plate_icon.png b/Assets/Inventory System/2D Assets/Icons/Class III Armor Plate_icon.png new file mode 100644 index 00000000..2b235c76 Binary files /dev/null and b/Assets/Inventory System/2D Assets/Icons/Class III Armor Plate_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Class III Armor Plate_icon.png.meta b/Assets/Inventory System/2D Assets/Icons/Class III Armor Plate_icon.png.meta new file mode 100644 index 00000000..efc6bffc --- /dev/null +++ b/Assets/Inventory System/2D Assets/Icons/Class III Armor Plate_icon.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 5fb2b09c0fa814d41a42973ec86ea610 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + 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: 1 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/2D Assets/Icons/Class IV Armor Plate_icon.png b/Assets/Inventory System/2D Assets/Icons/Class IV Armor Plate_icon.png new file mode 100644 index 00000000..d1dca17e Binary files /dev/null and b/Assets/Inventory System/2D Assets/Icons/Class IV Armor Plate_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Class IV Armor Plate_icon.png.meta b/Assets/Inventory System/2D Assets/Icons/Class IV Armor Plate_icon.png.meta new file mode 100644 index 00000000..e74ebcc7 --- /dev/null +++ b/Assets/Inventory System/2D Assets/Icons/Class IV Armor Plate_icon.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 33a86a447577d77478f3a329c2536781 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + 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: 1 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/2D Assets/Icons/Class IV+ Armor Plate_icon.png b/Assets/Inventory System/2D Assets/Icons/Class IV+ Armor Plate_icon.png new file mode 100644 index 00000000..d1dca17e Binary files /dev/null and b/Assets/Inventory System/2D Assets/Icons/Class IV+ Armor Plate_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Class IV+ Armor Plate_icon.png.meta b/Assets/Inventory System/2D Assets/Icons/Class IV+ Armor Plate_icon.png.meta new file mode 100644 index 00000000..16cc6337 --- /dev/null +++ b/Assets/Inventory System/2D Assets/Icons/Class IV+ Armor Plate_icon.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 6b7100b35f3da694c8fad552d617a233 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + 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: 1 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/2D Assets/Icons/Cloth_icon.png b/Assets/Inventory System/2D Assets/Icons/Cloth_icon.png index f06cfe22..3d8a77bc 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Cloth_icon.png and b/Assets/Inventory System/2D Assets/Icons/Cloth_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Coal_icon.png b/Assets/Inventory System/2D Assets/Icons/Coal_icon.png index 92218744..ba1f64e9 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Coal_icon.png and b/Assets/Inventory System/2D Assets/Icons/Coal_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Copper_icon.png b/Assets/Inventory System/2D Assets/Icons/Copper_icon.png index a9964c0b..ac740acd 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Copper_icon.png and b/Assets/Inventory System/2D Assets/Icons/Copper_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Damaged Plate Carrier_icon.png b/Assets/Inventory System/2D Assets/Icons/Damaged Plate Carrier_icon.png index 36e40368..b38d0113 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Damaged Plate Carrier_icon.png and b/Assets/Inventory System/2D Assets/Icons/Damaged Plate Carrier_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Drawstring Bag_icon.png b/Assets/Inventory System/2D Assets/Icons/Drawstring Bag_icon.png index e999e843..a126a205 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Drawstring Bag_icon.png and b/Assets/Inventory System/2D Assets/Icons/Drawstring Bag_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Dual First Aid Kit_icon.png b/Assets/Inventory System/2D Assets/Icons/Dual First Aid Kit_icon.png index e7b4aebe..962ca476 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Dual First Aid Kit_icon.png and b/Assets/Inventory System/2D Assets/Icons/Dual First Aid Kit_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Duffle Bag_icon.png b/Assets/Inventory System/2D Assets/Icons/Duffle Bag_icon.png index 41f9c22a..a94529fd 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Duffle Bag_icon.png and b/Assets/Inventory System/2D Assets/Icons/Duffle Bag_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Glass_icon.png b/Assets/Inventory System/2D Assets/Icons/Glass_icon.png index c356f99a..a86e5873 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Glass_icon.png and b/Assets/Inventory System/2D Assets/Icons/Glass_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Group First Aid Kit_icon.png b/Assets/Inventory System/2D Assets/Icons/Group First Aid Kit_icon.png index 713eadde..b90c309f 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Group First Aid Kit_icon.png and b/Assets/Inventory System/2D Assets/Icons/Group First Aid Kit_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Gunpowder_icon.png b/Assets/Inventory System/2D Assets/Icons/Gunpowder_icon.png index 1a6b45a2..7c05177d 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Gunpowder_icon.png and b/Assets/Inventory System/2D Assets/Icons/Gunpowder_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Heavy Chest Rig_icon.png b/Assets/Inventory System/2D Assets/Icons/Heavy Chest Rig_icon.png index 0f1d6092..d3bfb309 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Heavy Chest Rig_icon.png and b/Assets/Inventory System/2D Assets/Icons/Heavy Chest Rig_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Heavy Vest_icon.png b/Assets/Inventory System/2D Assets/Icons/Heavy Vest_icon.png index ecab3322..4031b3f9 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Heavy Vest_icon.png and b/Assets/Inventory System/2D Assets/Icons/Heavy Vest_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/High Capacity Rig_icon.png b/Assets/Inventory System/2D Assets/Icons/High Capacity Rig_icon.png index e9a28c46..b50bdb08 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/High Capacity Rig_icon.png and b/Assets/Inventory System/2D Assets/Icons/High Capacity Rig_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Hiking Backpack_icon.png b/Assets/Inventory System/2D Assets/Icons/Hiking Backpack_icon.png index e3428261..9ff5476a 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Hiking Backpack_icon.png and b/Assets/Inventory System/2D Assets/Icons/Hiking Backpack_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Hunting Vest_icon.png b/Assets/Inventory System/2D Assets/Icons/Hunting Vest_icon.png index a45ec56c..1f63c8a8 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Hunting Vest_icon.png and b/Assets/Inventory System/2D Assets/Icons/Hunting Vest_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Individual First Aid Kit_icon.png b/Assets/Inventory System/2D Assets/Icons/Individual First Aid Kit_icon.png index 944296df..2129a9a6 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Individual First Aid Kit_icon.png and b/Assets/Inventory System/2D Assets/Icons/Individual First Aid Kit_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Lead_icon.png b/Assets/Inventory System/2D Assets/Icons/Lead_icon.png index dcf317d1..4a79bb0e 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Lead_icon.png and b/Assets/Inventory System/2D Assets/Icons/Lead_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Leather_icon.png b/Assets/Inventory System/2D Assets/Icons/Leather_icon.png index df18e849..03acab83 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Leather_icon.png and b/Assets/Inventory System/2D Assets/Icons/Leather_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Light Body Armor_icon.png b/Assets/Inventory System/2D Assets/Icons/Light Body Armor_icon.png index 5198141d..9c732ae3 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Light Body Armor_icon.png and b/Assets/Inventory System/2D Assets/Icons/Light Body Armor_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Light First Aid Kit_icon.png b/Assets/Inventory System/2D Assets/Icons/Light First Aid Kit_icon.png index f3620765..8d4c61d4 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Light First Aid Kit_icon.png and b/Assets/Inventory System/2D Assets/Icons/Light First Aid Kit_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Load Bearing Rig_icon.png b/Assets/Inventory System/2D Assets/Icons/Load Bearing Rig_icon.png index 319bdcf3..3cecd2e2 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Load Bearing Rig_icon.png and b/Assets/Inventory System/2D Assets/Icons/Load Bearing Rig_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/MIlitary Helmet Class 4 Full_icon.png b/Assets/Inventory System/2D Assets/Icons/MIlitary Helmet Class 4 Full_icon.png index eb4e24c1..99b40361 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/MIlitary Helmet Class 4 Full_icon.png and b/Assets/Inventory System/2D Assets/Icons/MIlitary Helmet Class 4 Full_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/MIlitary Helmet Class 4 High Cut_icon.png b/Assets/Inventory System/2D Assets/Icons/MIlitary Helmet Class 4 High Cut_icon.png index 561a1f38..17e1686b 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/MIlitary Helmet Class 4 High Cut_icon.png and b/Assets/Inventory System/2D Assets/Icons/MIlitary Helmet Class 4 High Cut_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/MIlitary Helmet Class 4+ Full_icon.png b/Assets/Inventory System/2D Assets/Icons/MIlitary Helmet Class 4+ Full_icon.png index ec348de5..8b29986f 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/MIlitary Helmet Class 4+ Full_icon.png and b/Assets/Inventory System/2D Assets/Icons/MIlitary Helmet Class 4+ Full_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/MIlitary Helmet Class 4+ High Cut_icon.png b/Assets/Inventory System/2D Assets/Icons/MIlitary Helmet Class 4+ High Cut_icon.png index 71bf27c1..bbd938a5 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/MIlitary Helmet Class 4+ High Cut_icon.png and b/Assets/Inventory System/2D Assets/Icons/MIlitary Helmet Class 4+ High Cut_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Micro Chest Rig_icon.png b/Assets/Inventory System/2D Assets/Icons/Micro Chest Rig_icon.png index a6225dd6..78671d88 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Micro Chest Rig_icon.png and b/Assets/Inventory System/2D Assets/Icons/Micro Chest Rig_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Mini Bag_icon.png b/Assets/Inventory System/2D Assets/Icons/Mini Bag_icon.png index e24cfec2..4257b5a4 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Mini Bag_icon.png and b/Assets/Inventory System/2D Assets/Icons/Mini Bag_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Minimalist Harness_icon.png b/Assets/Inventory System/2D Assets/Icons/Minimalist Harness_icon.png index 5facec3d..df04815f 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Minimalist Harness_icon.png and b/Assets/Inventory System/2D Assets/Icons/Minimalist Harness_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Multi Mission Plate Carrier_icon.png b/Assets/Inventory System/2D Assets/Icons/Multi Mission Plate Carrier_icon.png index 0accac04..b9d76595 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Multi Mission Plate Carrier_icon.png and b/Assets/Inventory System/2D Assets/Icons/Multi Mission Plate Carrier_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Oil_icon.png b/Assets/Inventory System/2D Assets/Icons/Oil_icon.png index 3e658a6e..4aa0f900 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Oil_icon.png and b/Assets/Inventory System/2D Assets/Icons/Oil_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Plastic_icon.png b/Assets/Inventory System/2D Assets/Icons/Plastic_icon.png index 8f7e615a..bdd20415 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Plastic_icon.png and b/Assets/Inventory System/2D Assets/Icons/Plastic_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Pouch 1x1_icon.png b/Assets/Inventory System/2D Assets/Icons/Pouch 1x1_icon.png index 067ded8b..0d243fcd 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Pouch 1x1_icon.png and b/Assets/Inventory System/2D Assets/Icons/Pouch 1x1_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Pouch 1x2_icon.png b/Assets/Inventory System/2D Assets/Icons/Pouch 1x2_icon.png index 7ab9c2f8..a73e8e5a 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Pouch 1x2_icon.png and b/Assets/Inventory System/2D Assets/Icons/Pouch 1x2_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Pouch 1x3_icon.png b/Assets/Inventory System/2D Assets/Icons/Pouch 1x3_icon.png index a6102675..0df07809 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Pouch 1x3_icon.png and b/Assets/Inventory System/2D Assets/Icons/Pouch 1x3_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Pouch 2x2_icon.png b/Assets/Inventory System/2D Assets/Icons/Pouch 2x2_icon.png index 0931ee60..e3ce2633 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Pouch 2x2_icon.png and b/Assets/Inventory System/2D Assets/Icons/Pouch 2x2_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Precision Plate Carrier_icon.png b/Assets/Inventory System/2D Assets/Icons/Precision Plate Carrier_icon.png index 9b44f5d6..a8000e7e 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Precision Plate Carrier_icon.png and b/Assets/Inventory System/2D Assets/Icons/Precision Plate Carrier_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Raid Backpack_icon.png b/Assets/Inventory System/2D Assets/Icons/Raid Backpack_icon.png index 7a7f79f3..2b4e4734 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Raid Backpack_icon.png and b/Assets/Inventory System/2D Assets/Icons/Raid Backpack_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Ranger Plate Carrier_icon.png b/Assets/Inventory System/2D Assets/Icons/Ranger Plate Carrier_icon.png index a4c7ebaa..c6543cec 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Ranger Plate Carrier_icon.png and b/Assets/Inventory System/2D Assets/Icons/Ranger Plate Carrier_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Rucksack_icon.png b/Assets/Inventory System/2D Assets/Icons/Rucksack_icon.png index a5d357fd..414427e7 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Rucksack_icon.png and b/Assets/Inventory System/2D Assets/Icons/Rucksack_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Sling Bag_icon.png b/Assets/Inventory System/2D Assets/Icons/Sling Bag_icon.png index 7e584c42..168494a0 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Sling Bag_icon.png and b/Assets/Inventory System/2D Assets/Icons/Sling Bag_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Standard Backpack_icon.png b/Assets/Inventory System/2D Assets/Icons/Standard Backpack_icon.png index 64e35a9f..14cd8497 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Standard Backpack_icon.png and b/Assets/Inventory System/2D Assets/Icons/Standard Backpack_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Steel_icon.png b/Assets/Inventory System/2D Assets/Icons/Steel_icon.png index a21a1140..54642f22 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Steel_icon.png and b/Assets/Inventory System/2D Assets/Icons/Steel_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Surgical Kit_icon.png b/Assets/Inventory System/2D Assets/Icons/Surgical Kit_icon.png index d71226d8..59ca9978 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Surgical Kit_icon.png and b/Assets/Inventory System/2D Assets/Icons/Surgical Kit_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Surgical Rollup Kit_icon.png b/Assets/Inventory System/2D Assets/Icons/Surgical Rollup Kit_icon.png index 793f207d..e658cebc 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Surgical Rollup Kit_icon.png and b/Assets/Inventory System/2D Assets/Icons/Surgical Rollup Kit_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Thread_icon.png b/Assets/Inventory System/2D Assets/Icons/Thread_icon.png index 3d71b0a3..f85a69eb 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Thread_icon.png and b/Assets/Inventory System/2D Assets/Icons/Thread_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Tourniquet UI_icon.png b/Assets/Inventory System/2D Assets/Icons/Tourniquet UI_icon.png index 2d36e2b7..81d218b1 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Tourniquet UI_icon.png and b/Assets/Inventory System/2D Assets/Icons/Tourniquet UI_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Upgraded Plate Carrier_icon.png b/Assets/Inventory System/2D Assets/Icons/Upgraded Plate Carrier_icon.png index 28d2728d..55ff8e03 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Upgraded Plate Carrier_icon.png and b/Assets/Inventory System/2D Assets/Icons/Upgraded Plate Carrier_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Wood_icon.png b/Assets/Inventory System/2D Assets/Icons/Wood_icon.png index 0c994c03..df3b5089 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Wood_icon.png and b/Assets/Inventory System/2D Assets/Icons/Wood_icon.png differ diff --git a/Assets/Inventory System/2D Assets/Icons/Zinc_icon.png b/Assets/Inventory System/2D Assets/Icons/Zinc_icon.png index e12d9427..06019663 100644 Binary files a/Assets/Inventory System/2D Assets/Icons/Zinc_icon.png and b/Assets/Inventory System/2D Assets/Icons/Zinc_icon.png differ diff --git a/Assets/Inventory System/Scenes.meta b/Assets/Inventory System/Scenes.meta deleted file mode 100644 index 0ff00151..00000000 --- a/Assets/Inventory System/Scenes.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 82fca1cd2ecc8f843b671f2cd615bd26 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Inventory System/Scripts/Inventory/MouseOrbitImproved.cs b/Assets/Inventory System/Scripts/Inventory/MouseOrbitImproved.cs index 3c7a835a..900fa7de 100644 --- a/Assets/Inventory System/Scripts/Inventory/MouseOrbitImproved.cs +++ b/Assets/Inventory System/Scripts/Inventory/MouseOrbitImproved.cs @@ -22,7 +22,7 @@ public class MouseOrbitImproved : MonoBehaviour public float distanceMin = .5f; public float distanceMax = 15f; - private Rigidbody rigidbody; + private new Rigidbody rigidbody; float x = 0.0f; float y = 0.0f; @@ -74,7 +74,7 @@ public class MouseOrbitImproved : MonoBehaviour Quaternion rotation = Quaternion.Euler(y, x, 0); - distance = Mathf.Clamp(distance - Input.GetAxis("Mouse ScrollWheel") *Time.deltaTime, distanceMin, distanceMax); + distance = Mathf.Clamp(distance - Input.GetAxis("Mouse ScrollWheel") * Time.deltaTime, distanceMin, distanceMax); RaycastHit hit; if (Physics.Linecast(target.position, transform.position, out hit)) diff --git a/Assets/Inventory System/Scripts/Photoshoot.cs b/Assets/Inventory System/Scripts/Photoshoot.cs index 20c3963d..b16d578a 100644 --- a/Assets/Inventory System/Scripts/Photoshoot.cs +++ b/Assets/Inventory System/Scripts/Photoshoot.cs @@ -1,4 +1,4 @@ -#if (UNITY_EDITOR) +#if (UNITY_EDITOR) using System; using System.Collections; @@ -11,7 +11,7 @@ using UnityEngine.UI; public class Photoshoot : MonoBehaviour { public string OutputPath; - public Camera camera; + public new Camera camera; public GameObject items; private void Awake() diff --git a/Assets/Inventory System/Scripts/UI/GridUI.cs b/Assets/Inventory System/Scripts/UI/GridUI.cs index 831612b2..d3e5c009 100644 --- a/Assets/Inventory System/Scripts/UI/GridUI.cs +++ b/Assets/Inventory System/Scripts/UI/GridUI.cs @@ -8,7 +8,7 @@ using static SimpleInventorySystem.InventorySystem; namespace SimpleInventorySystem { - [RequireComponent(typeof (GridLayoutGroup))] + [RequireComponent(typeof(GridLayoutGroup))] public class GridUI : MonoBehaviour { private LayoutElement layoutElement; @@ -35,7 +35,7 @@ namespace SimpleInventorySystem private void Awake() { - if(cells == null) + if (cells == null) { SetUpCellsArray(); } @@ -262,7 +262,7 @@ namespace SimpleInventorySystem return true; } i++; - if(i == limit) + if (i == limit) { //Debug.Log("Limit reached"); } @@ -369,7 +369,7 @@ namespace SimpleInventorySystem internal void HideSlotsOfItem(ItemUI itemDrop) { - if(itemDrop != null) + if (itemDrop != null) { itemDrop.HideSlots(); } @@ -390,10 +390,10 @@ namespace SimpleInventorySystem //else // return false; } - else if (cells != null) + else if (cells != null) { List oCells = new List(); - if(occupiedCells != null) + if (occupiedCells != null) { oCells = occupiedCells; } @@ -404,7 +404,7 @@ namespace SimpleInventorySystem { for (int w = 0; w < size.Width; w++) { - if(slot.cell.Y + h >= gridSize.Height || slot.cell.X + w >= gridSize.Width) + if (slot.cell.Y + h >= gridSize.Height || slot.cell.X + w >= gridSize.Width) { //Debug.Log("GridUI: CanMoveInCells(): " + slot.gameObject.name + ": D"); return false; diff --git a/Assets/Inventory System/Scripts/UI/ItemUI.cs b/Assets/Inventory System/Scripts/UI/ItemUI.cs index ac710621..9b034d7b 100644 --- a/Assets/Inventory System/Scripts/UI/ItemUI.cs +++ b/Assets/Inventory System/Scripts/UI/ItemUI.cs @@ -70,7 +70,8 @@ namespace SimpleInventorySystem private RectTransform rectTransform; public RectTransform RectTransform { get { return rectTransform; } } private CanvasGroup canvasGroup; - private float scale = 1f; + //TO-DO Add Scaling Image + //private float scale = 1f; private SlotUI slot; private Cell[] cells; private bool isDragging; @@ -137,7 +138,7 @@ namespace SimpleInventorySystem private void InitializeRectTransform() { - rectTransform.rotation = Quaternion.Euler(new Vector3(0,0,0)); + rectTransform.rotation = Quaternion.Euler(new Vector3(0, 0, 0)); eulerAngle = Mathf.Abs(Mathf.CeilToInt(transform.rotation.eulerAngles.z)); switch (eulerAngle) { @@ -255,10 +256,10 @@ namespace SimpleInventorySystem public void FindTextMeshProUGUI() { - if(titleText == null) + if (titleText == null) { Transform titleGameObject = transform.Find("Title"); - if(titleGameObject != null) + if (titleGameObject != null) { titleText = titleGameObject.GetComponent(); } @@ -288,7 +289,7 @@ namespace SimpleInventorySystem //Debug.Log($"Set Item name: {itemName}"); titleText.text = (displayName != null && !string.IsNullOrEmpty(displayName)) ? displayName : itemName; } - if(stackText != null) + if (stackText != null) { stackText.text = Count.ToString(); } @@ -356,7 +357,7 @@ namespace SimpleInventorySystem public bool Store() { bool stored = false; - foreach (TagSlotGridPairing tsgp in InventorySystem.instance.TagSlotGridPairings) + foreach (TagSlotGridPairing tsgp in InventorySystem.instance.TagSlotGridPairings) { Debug.Log($"Store: {tsgp.itemTag}, {tsgp.ReferencedGrid}"); if (tsgp.CanStore(this)) @@ -371,7 +372,7 @@ namespace SimpleInventorySystem else { // TODO: see if this is needed - if(container != null) + if (container != null) container.SetActive(false); break; } @@ -409,7 +410,7 @@ namespace SimpleInventorySystem ShowEmptyGrid(); else HideEmptyGrid(); - + InventorySystem.instance.DraggedItem = null; if (slot == null) @@ -504,7 +505,7 @@ namespace SimpleInventorySystem { if (slot != null) { - if(slot.grid != null) + if (slot.grid != null) { slot.grid.RemoveItemFromGrid(this); } @@ -532,7 +533,7 @@ namespace SimpleInventorySystem cells = null; } } - + public void AddToContainedItems(ItemUI item) { NestedItems.Add(item); @@ -547,11 +548,11 @@ namespace SimpleInventorySystem public void FitImageInSlot(Vector2 size) { //Debug.Log("FitImageInSlot: " + image.transform.name); - float ratio = size.y / image.rectTransform.sizeDelta.y; - rectTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, size.x); - rectTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, size.y); - image.rectTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, size.x); - image.rectTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, size.y); + float ratio = size.y / image.rectTransform.sizeDelta.y; + rectTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, size.x); + rectTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, size.y); + image.rectTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, size.x); + image.rectTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, size.y); backdropImage.rectTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, size.x); backdropImage.rectTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, size.y); emptyGridContainer.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, size.x); @@ -735,7 +736,7 @@ namespace SimpleInventorySystem { if (Stackable && Count < StackLimit) { - Count+=value; + Count += value; return true; } return false; @@ -745,12 +746,12 @@ namespace SimpleInventorySystem { if (Stackable && Count > 0) { - Count-= value; + Count -= value; return true; } return false; } - + void FixedUpdate() { @@ -808,7 +809,7 @@ namespace SimpleInventorySystem image.maskable = false; } - if(Count <= 0) + if (Count <= 0) { Destroy(gameObject); } @@ -858,7 +859,7 @@ namespace SimpleInventorySystem pivot = rectTransform.pivot = new Vector2(0, 0); rectTransform.Rotate(new Vector3(0, 0, 1), -90); // title rect transform - if(titleText != null) + if (titleText != null) { titleText.rectTransform.pivot = new Vector2(1, 0); titleText.rectTransform.Rotate(new Vector3(0, 0, 1), 90); @@ -949,19 +950,19 @@ namespace SimpleInventorySystem public void ShowStorageWindow() { - if(IsStorageContainer() && (StorageWindow == null || !StorageWindow.gameObject.activeSelf)) + if (IsStorageContainer() && (StorageWindow == null || !StorageWindow.gameObject.activeSelf)) { //Debug.Log("Opening Window"); StorageWindow = InventorySystem.instance.OpenWindow(nameof(StorageWindowUI)).GetComponent(); - if(StorageWindow != null && containerUIPrefab != null && !Equipped) + if (StorageWindow != null && containerUIPrefab != null && !Equipped) { //Debug.Log("Opening Window"); - if(container.transform.parent != StorageWindow.StorageContainer.transform) - container.transform.SetParent(StorageWindow.StorageContainer.transform, false); - container.SetActive(true); - StorageWindow.ItemUI = this; - StorageWindow.gameObject.SetActive(true); + if (container.transform.parent != StorageWindow.StorageContainer.transform) + container.transform.SetParent(StorageWindow.StorageContainer.transform, false); + container.SetActive(true); + StorageWindow.ItemUI = this; + StorageWindow.gameObject.SetActive(true); } } } @@ -1021,10 +1022,10 @@ namespace SimpleInventorySystem public void SetOverrideSortingCanvasEnabled(bool value) { - /* if(overrideSortingCanvas != null) - { - overrideSortingCanvas.enabled = value; - }*/ + /* if(overrideSortingCanvas != null) + { + overrideSortingCanvas.enabled = value; + }*/ } public void SetInteractable(bool value) diff --git a/Assets/Scenes/Items.unity b/Assets/Scenes/Items.unity index f9e0be4b..07878bb1 100644 --- a/Assets/Scenes/Items.unity +++ b/Assets/Scenes/Items.unity @@ -20690,12 +20690,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ca43743b90308104aa0ce8f04d1692b8, type: 3} ---- !u!224 &1005383685 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1877044253, guid: 9f005685dc17f4643b4a1156970fe2f6, - type: 3} - m_PrefabInstance: {fileID: 2770326605231792848} - m_PrefabAsset: {fileID: 0} --- !u!4 &1008424396 stripped Transform: m_CorrespondingSourceObject: {fileID: 4597676352484500, guid: fa9977b69f980364989f85633bee4aa6, @@ -41078,33 +41072,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 614559560, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} - propertyPath: m_LocalPosition.x - value: -13.46 - objectReference: {fileID: 0} - - target: {fileID: 614559560, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} - propertyPath: m_LocalPosition.y - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 614559560, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} - propertyPath: m_LocalPosition.z - value: -0.98 - objectReference: {fileID: 0} - - target: {fileID: 1082071285, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} - propertyPath: _displayAnchor - value: - objectReference: {fileID: 1005383685} - - target: {fileID: 1284900580, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} - propertyPath: m_LocalPosition.x - value: -873.89 - objectReference: {fileID: 0} - - target: {fileID: 1284900580, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} - propertyPath: m_LocalPosition.y - value: -532.72 - objectReference: {fileID: 0} - - target: {fileID: 1284900580, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} - propertyPath: m_LocalPosition.z - value: -63.63 + - target: {fileID: 51727583602948897, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_Value + value: 0 objectReference: {fileID: 0} - target: {fileID: 52681282418728116, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} @@ -41241,11 +41212,6 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2770326605036912737, guid: 9f005685dc17f4643b4a1156970fe2f6, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2770326605244884164, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchorMax.y @@ -41456,11 +41422,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2770326605623600441, guid: 9f005685dc17f4643b4a1156970fe2f6, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2770326605625768898, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchorMax.y @@ -41526,11 +41487,6 @@ PrefabInstance: propertyPath: m_Name value: Inventory System objectReference: {fileID: 0} - - target: {fileID: 2770326605790841686, guid: 9f005685dc17f4643b4a1156970fe2f6, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 2770326605790841686, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_LocalPosition.x @@ -41581,56 +41537,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2770326605790841687, guid: 9f005685dc17f4643b4a1156970fe2f6, - type: 3} - propertyPath: TagSlotGridPairings.Array.size - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 2770326605790841687, guid: 9f005685dc17f4643b4a1156970fe2f6, - type: 3} - propertyPath: TagSlotGridPairings.Array.data[1].referenceType - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2770326605790841687, guid: 9f005685dc17f4643b4a1156970fe2f6, - type: 3} - propertyPath: TagSlotGridPairings.Array.data[5].referenceType - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2770326605790841687, guid: 9f005685dc17f4643b4a1156970fe2f6, - type: 3} - propertyPath: TagSlotGridPairings.Array.data[1].ReferencedGrid - value: - objectReference: {fileID: 2770326605231792853} - - target: {fileID: 2770326605790841687, guid: 9f005685dc17f4643b4a1156970fe2f6, - type: 3} - propertyPath: TagSlotGridPairings.Array.data[2].ReferencedGrid - value: - objectReference: {fileID: 2770326605231792852} - - target: {fileID: 2770326605790841687, guid: 9f005685dc17f4643b4a1156970fe2f6, - type: 3} - propertyPath: TagSlotGridPairings.Array.data[3].ReferencedGrid - value: - objectReference: {fileID: 2770326605231792851} - - target: {fileID: 2770326605790841687, guid: 9f005685dc17f4643b4a1156970fe2f6, - type: 3} - propertyPath: TagSlotGridPairings.Array.data[4].ReferencedGrid - value: - objectReference: {fileID: 2770326605231792850} - - target: {fileID: 2770326605790841687, guid: 9f005685dc17f4643b4a1156970fe2f6, - type: 3} - propertyPath: TagSlotGridPairings.Array.data[5].ReferencedGrid - value: - objectReference: {fileID: 2770326605231792849} - - target: {fileID: 2770326605790841688, guid: 9f005685dc17f4643b4a1156970fe2f6, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2770326605790841688, guid: 9f005685dc17f4643b4a1156970fe2f6, - type: 3} - propertyPath: pauseMenu - value: - objectReference: {fileID: 0} - target: {fileID: 2770326605801885315, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchorMax.y @@ -41774,7 +41680,7 @@ PrefabInstance: - target: {fileID: 2770326606141421692, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.000061035156 + value: 0.000061035156 objectReference: {fileID: 0} - target: {fileID: 2770326606150301029, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} @@ -42146,6 +42052,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 2770326606805154120, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_Size + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2770326606810438967, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchorMax.y @@ -42156,6 +42067,11 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3684466523276116297, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: m_Size + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4508597830310062939, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: m_AnchorMax.y @@ -42176,36 +42092,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} ---- !u!1 &2770326605231792849 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2770326605807543572, guid: 9f005685dc17f4643b4a1156970fe2f6, - type: 3} - m_PrefabInstance: {fileID: 2770326605231792848} - m_PrefabAsset: {fileID: 0} ---- !u!1 &2770326605231792850 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2770326604921404281, guid: 9f005685dc17f4643b4a1156970fe2f6, - type: 3} - m_PrefabInstance: {fileID: 2770326605231792848} - m_PrefabAsset: {fileID: 0} ---- !u!1 &2770326605231792851 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2770326605995264619, guid: 9f005685dc17f4643b4a1156970fe2f6, - type: 3} - m_PrefabInstance: {fileID: 2770326605231792848} - m_PrefabAsset: {fileID: 0} ---- !u!1 &2770326605231792852 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2770326606686766473, guid: 9f005685dc17f4643b4a1156970fe2f6, - type: 3} - m_PrefabInstance: {fileID: 2770326605231792848} - m_PrefabAsset: {fileID: 0} ---- !u!1 &2770326605231792853 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2770326604769037581, guid: 9f005685dc17f4643b4a1156970fe2f6, - type: 3} - m_PrefabInstance: {fileID: 2770326605231792848} - m_PrefabAsset: {fileID: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/Inventory System/Scenes/itemIconSnapshot.unity b/Assets/Scenes/itemIconSnapshot.unity similarity index 100% rename from Assets/Inventory System/Scenes/itemIconSnapshot.unity rename to Assets/Scenes/itemIconSnapshot.unity diff --git a/Assets/Inventory System/Scenes/itemIconSnapshot.unity.meta b/Assets/Scenes/itemIconSnapshot.unity.meta similarity index 100% rename from Assets/Inventory System/Scenes/itemIconSnapshot.unity.meta rename to Assets/Scenes/itemIconSnapshot.unity.meta diff --git a/Assets/Scripts/FirstPersonController.cs b/Assets/Scripts/FirstPersonController.cs index 8617c91c..f3fa0d37 100644 --- a/Assets/Scripts/FirstPersonController.cs +++ b/Assets/Scripts/FirstPersonController.cs @@ -75,7 +75,7 @@ public class FirstPersonController : MonoBehaviour private float currentCrouchHeight; private float minCrouchHeight = 0.5f; // Minimum crouch height private bool isCrouchKeyHeld; - private bool crouchHeightAdjustmentEnabled; // Flag to enable crouch height adjustment + //private bool crouchHeightAdjustmentEnabled; // Flag to enable crouch height adjustment [Header("Headbob Parameters")] [SerializeField] private float walkBobSpeed = 14f; @@ -165,7 +165,7 @@ public class FirstPersonController : MonoBehaviour { isCrouchKeyHeld = true; tempCrouchHeight = currentCrouchHeight; - crouchHeightAdjustmentEnabled = true; // Enable crouch height adjustment + //crouchHeightAdjustmentEnabled = true; // Enable crouch height adjustment } if (Input.GetKeyUp(crouchKey) && isCrouchKeyHeld)