diff --git a/Assets/Models/Weapons/Crossbow/source/c93cd6fbaded4d81bc4282e2f7219d3d.fbx b/Assets/Models/Weapons/Crossbow/source/c93cd6fbaded4d81bc4282e2f7219d3d.fbx new file mode 100644 index 0000000000000000000000000000000000000000..4ff1a60da86e174ce109e24a42b12d13949bf562 --- /dev/null +++ b/Assets/Models/Weapons/Crossbow/source/c93cd6fbaded4d81bc4282e2f7219d3d.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:52263a8af69461f3cba6e3d0316cc2c913feaf376de0a15f7e58ad3a8c514afe +size 93276 diff --git a/Assets/Models/Weapons/Crossbow/source/obj.obj.meta b/Assets/Models/Weapons/Crossbow/source/c93cd6fbaded4d81bc4282e2f7219d3d.fbx.meta similarity index 98% rename from Assets/Models/Weapons/Crossbow/source/obj.obj.meta rename to Assets/Models/Weapons/Crossbow/source/c93cd6fbaded4d81bc4282e2f7219d3d.fbx.meta index 6f2f8d63c53260ba966655fa3ee8ec7e2d264427..5a812fbc46edcc08a34e794e6552698c5ec2ab8d 100644 --- a/Assets/Models/Weapons/Crossbow/source/obj.obj.meta +++ b/Assets/Models/Weapons/Crossbow/source/c93cd6fbaded4d81bc4282e2f7219d3d.fbx.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: feb04d480ff3a6d43a340d59b71d62fe +guid: abb0f8985aeba6042ab01fe6fafae663 ModelImporter: serializedVersion: 21300 internalIDToNameTable: [] diff --git a/Assets/Models/Weapons/Crossbow/source/obj.mtl b/Assets/Models/Weapons/Crossbow/source/obj.mtl deleted file mode 100644 index 3fa2798252c5d523fdfe040f51beb8daaa5cf488..0000000000000000000000000000000000000000 --- a/Assets/Models/Weapons/Crossbow/source/obj.mtl +++ /dev/null @@ -1,9 +0,0 @@ -newmtl phong1SG -illum 4 -Kd 0.00 0.00 0.00 -Ka 0.00 0.00 0.00 -Tf 1.00 1.00 1.00 -map_Kd textur2.tga -Ni 1.00 -Ks 0.50 0.50 0.50 -Ns 18.00 diff --git a/Assets/Models/Weapons/Crossbow/source/obj.mtl.meta b/Assets/Models/Weapons/Crossbow/source/obj.mtl.meta deleted file mode 100644 index 288830205ac0d9437711f8de16b7118d22b482b2..0000000000000000000000000000000000000000 --- a/Assets/Models/Weapons/Crossbow/source/obj.mtl.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 775400ff5f56d0644af9397c4b43c64e -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Models/Weapons/Crossbow/source/obj.obj b/Assets/Models/Weapons/Crossbow/source/obj.obj deleted file mode 100644 index 41b05da46077ee6caf9bddaec20bc2e53e8e7b13..0000000000000000000000000000000000000000 --- a/Assets/Models/Weapons/Crossbow/source/obj.obj +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8ff148d237e3bde3b00bacc26fcf4f0c6c4869d135eb4fc2ef7044b275dc6c31 -size 1331867 diff --git a/Assets/Models/Weapons/Crossbow/source/textur2.tga b/Assets/Models/Weapons/Crossbow/source/textur2.tga deleted file mode 100644 index 279080e21573309dd2c1d99307253417d782089c..0000000000000000000000000000000000000000 --- a/Assets/Models/Weapons/Crossbow/source/textur2.tga +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5842938d4dfa3ba736334f1351768685b18ea027ec1a1477d74a72fd0b6ef918 -size 3145772 diff --git a/Assets/Models/Weapons/Crossbow/textures/CrossBow_tex.png b/Assets/Models/Weapons/Crossbow/textures/CrossBow_tex.png new file mode 100644 index 0000000000000000000000000000000000000000..4e78be16dcfbcf7a7b96e456851e45cf2e640757 --- /dev/null +++ b/Assets/Models/Weapons/Crossbow/textures/CrossBow_tex.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8358b50644c67555a2246d60306e57188f1a024e67322541fd21665ca6b04a66 +size 3347865 diff --git a/Assets/Models/Weapons/Crossbow/source/textur2.tga.meta b/Assets/Models/Weapons/Crossbow/textures/CrossBow_tex.png.meta similarity index 98% rename from Assets/Models/Weapons/Crossbow/source/textur2.tga.meta rename to Assets/Models/Weapons/Crossbow/textures/CrossBow_tex.png.meta index 6367d9de8aabf34a0a39d9fcbc50b353a29ae08a..829a2ae58a8368bd8593cb5d4a7bc6306ceacda6 100644 --- a/Assets/Models/Weapons/Crossbow/source/textur2.tga.meta +++ b/Assets/Models/Weapons/Crossbow/textures/CrossBow_tex.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 07bb37110f7b1774cad944f1d92e9bc6 +guid: fe8d0a8b9d6ea464ba4c18cc7ee82791 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Models/Weapons/Crossbow/textures/CrossBow_tex_NRM.png b/Assets/Models/Weapons/Crossbow/textures/CrossBow_tex_NRM.png new file mode 100644 index 0000000000000000000000000000000000000000..8d218ed910d4d376337d8e8c034f677710f743bb --- /dev/null +++ b/Assets/Models/Weapons/Crossbow/textures/CrossBow_tex_NRM.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f2c157856d079109be8d436f68c3cdff254a26e92bc236253bf6ffcc016cfae +size 3468177 diff --git a/Assets/Models/Weapons/Crossbow/textures/CrossBow_tex_NRM.png.meta b/Assets/Models/Weapons/Crossbow/textures/CrossBow_tex_NRM.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..c43f77af1e3e7af95fa6cd8334dabf3afd3129dc --- /dev/null +++ b/Assets/Models/Weapons/Crossbow/textures/CrossBow_tex_NRM.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: ff545dce8142f184b9cf501bde593339 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + 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 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 1 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 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: Server + 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: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Weapons/Crossbow/textures/CrossBow_tex_spec.png b/Assets/Models/Weapons/Crossbow/textures/CrossBow_tex_spec.png new file mode 100644 index 0000000000000000000000000000000000000000..578edf6480771fe18b3e04d88390e0a35f66dca2 --- /dev/null +++ b/Assets/Models/Weapons/Crossbow/textures/CrossBow_tex_spec.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a4b6f29a89b46ece84ea4bdf5c1298c22064bc36951585517ddc3c3f323952a +size 909300 diff --git a/Assets/Models/Weapons/Crossbow/textures/textur2.png.meta b/Assets/Models/Weapons/Crossbow/textures/CrossBow_tex_spec.png.meta similarity index 98% rename from Assets/Models/Weapons/Crossbow/textures/textur2.png.meta rename to Assets/Models/Weapons/Crossbow/textures/CrossBow_tex_spec.png.meta index 8808c7cf4ece87980925039f1860a9ec7761eba1..9c44ae85fdf1c7fe98c1c9208b6f3b0b2ba24e88 100644 --- a/Assets/Models/Weapons/Crossbow/textures/textur2.png.meta +++ b/Assets/Models/Weapons/Crossbow/textures/CrossBow_tex_spec.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 55497a4b179ddcc4a8d1627f874f03ed +guid: 7189b1b91b582e54fb2bbd03113b4576 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Models/Weapons/Crossbow/textures/textur2.png b/Assets/Models/Weapons/Crossbow/textures/textur2.png deleted file mode 100644 index b165bda315e691d8ce5cccf4b50500f7f044c150..0000000000000000000000000000000000000000 --- a/Assets/Models/Weapons/Crossbow/textures/textur2.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8ffdab5282a9bbc11de93729c6b7aad7229c37ad91f777fc449d8e37aa47422a -size 780548 diff --git a/Assets/Scripts/Player/PlayerShooting.cs b/Assets/Scripts/Player/PlayerShooting.cs index 51929b11caebe69cf7b1e1e0b2efdc64c5a9dff7..db204b63a489e5d2d431594c486983b68c76768c 100644 --- a/Assets/Scripts/Player/PlayerShooting.cs +++ b/Assets/Scripts/Player/PlayerShooting.cs @@ -2,8 +2,6 @@ public class PlayerShooting : MonoBehaviour { - public GameObject linkedObject; - public int damagePerShot = 20; public float timeBetweenBullets = 0.15f; public float range = 100f; @@ -21,7 +19,6 @@ public class PlayerShooting : MonoBehaviour void Awake() { - Debug.Log("Linked object tag: " + linkedObject.tag); //GetMask shootableMask = LayerMask.GetMask("Shootable");