From 1611a2f61d6c1c0122b09715e62159c46e764c5b Mon Sep 17 00:00:00 2001
From: LordGedelicious <34541559+LordGedelicious@users.noreply.github.com>
Date: Fri, 14 Apr 2023 15:57:43 +0700
Subject: [PATCH] fix: add missing weapons + no debug
---
.../c93cd6fbaded4d81bc4282e2f7219d3d.fbx | 3 +
...c93cd6fbaded4d81bc4282e2f7219d3d.fbx.meta} | 2 +-
Assets/Models/Weapons/Crossbow/source/obj.mtl | 9 --
.../Weapons/Crossbow/source/obj.mtl.meta | 7 -
Assets/Models/Weapons/Crossbow/source/obj.obj | 3 -
.../Weapons/Crossbow/source/textur2.tga | 3 -
.../Crossbow/textures/CrossBow_tex.png | 3 +
.../CrossBow_tex.png.meta} | 2 +-
.../Crossbow/textures/CrossBow_tex_NRM.png | 3 +
.../textures/CrossBow_tex_NRM.png.meta | 123 ++++++++++++++++++
.../Crossbow/textures/CrossBow_tex_spec.png | 3 +
...r2.png.meta => CrossBow_tex_spec.png.meta} | 2 +-
.../Weapons/Crossbow/textures/textur2.png | 3 -
Assets/Scripts/Player/PlayerShooting.cs | 3 -
14 files changed, 138 insertions(+), 31 deletions(-)
create mode 100644 Assets/Models/Weapons/Crossbow/source/c93cd6fbaded4d81bc4282e2f7219d3d.fbx
rename Assets/Models/Weapons/Crossbow/source/{obj.obj.meta => c93cd6fbaded4d81bc4282e2f7219d3d.fbx.meta} (98%)
delete mode 100644 Assets/Models/Weapons/Crossbow/source/obj.mtl
delete mode 100644 Assets/Models/Weapons/Crossbow/source/obj.mtl.meta
delete mode 100644 Assets/Models/Weapons/Crossbow/source/obj.obj
delete mode 100644 Assets/Models/Weapons/Crossbow/source/textur2.tga
create mode 100644 Assets/Models/Weapons/Crossbow/textures/CrossBow_tex.png
rename Assets/Models/Weapons/Crossbow/{source/textur2.tga.meta => textures/CrossBow_tex.png.meta} (98%)
create mode 100644 Assets/Models/Weapons/Crossbow/textures/CrossBow_tex_NRM.png
create mode 100644 Assets/Models/Weapons/Crossbow/textures/CrossBow_tex_NRM.png.meta
create mode 100644 Assets/Models/Weapons/Crossbow/textures/CrossBow_tex_spec.png
rename Assets/Models/Weapons/Crossbow/textures/{textur2.png.meta => CrossBow_tex_spec.png.meta} (98%)
delete mode 100644 Assets/Models/Weapons/Crossbow/textures/textur2.png
diff --git a/Assets/Models/Weapons/Crossbow/source/c93cd6fbaded4d81bc4282e2f7219d3d.fbx b/Assets/Models/Weapons/Crossbow/source/c93cd6fbaded4d81bc4282e2f7219d3d.fbx
new file mode 100644
index 0000000..4ff1a60
--- /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 6f2f8d6..5a812fb 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 3fa2798..0000000
--- 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 2888302..0000000
--- 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 41b05da..0000000
--- 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 279080e..0000000
--- 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 0000000..4e78be1
--- /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 6367d9d..829a2ae 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 0000000..8d218ed
--- /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 0000000..c43f77a
--- /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 0000000..578edf6
--- /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 8808c7c..9c44ae8 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 b165bda..0000000
--- 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 51929b1..db204b6 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");
--
GitLab