From f668a66bb9c0d0eb2f5053ab333ed548f9ca84d4 Mon Sep 17 00:00:00 2001 From: sebastianhampel1 Date: Thu, 15 Jun 2023 11:52:51 -0400 Subject: [PATCH] Gun Fix Multiplayer --- Assets/Materials/Levels/Level0/CeilLightMaterial.mat | 2 +- Assets/Scripts/Item/Pistol/PistolComponent.cs | 10 +++++++++- ...XGraph_Muzzle_2020.3_HDRP_v1.0.1.unitypackage.meta} | 2 +- ...VFXGraph_Muzzle_2020.3_URP_v1.0.1.unitypackage.meta | 7 +++++++ 4 files changed, 18 insertions(+), 3 deletions(-) rename Assets/{Packages/FishNet/Plugins/FishySteamworks/SteamManager.unitypackage.meta => VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_HDRP_v1.0.1.unitypackage.meta} (74%) create mode 100644 Assets/VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_URP_v1.0.1.unitypackage.meta diff --git a/Assets/Materials/Levels/Level0/CeilLightMaterial.mat b/Assets/Materials/Levels/Level0/CeilLightMaterial.mat index 354b23f..715777f 100644 --- a/Assets/Materials/Levels/Level0/CeilLightMaterial.mat +++ b/Assets/Materials/Levels/Level0/CeilLightMaterial.mat @@ -206,7 +206,7 @@ Material: - _StencilWriteMask: 6 - _StencilWriteMaskDepth: 8 - _StencilWriteMaskGBuffer: 14 - - _StencilWriteMaskMV: 40 + - _StencilWriteMaskMV: 42 - _SubsurfaceMask: 1 - _SupportDecals: 1 - _SurfaceType: 0 diff --git a/Assets/Scripts/Item/Pistol/PistolComponent.cs b/Assets/Scripts/Item/Pistol/PistolComponent.cs index 5fe4518..3746dc3 100644 --- a/Assets/Scripts/Item/Pistol/PistolComponent.cs +++ b/Assets/Scripts/Item/Pistol/PistolComponent.cs @@ -50,10 +50,18 @@ namespace Item public bool IsLightOn => targetingLight.gameObject.activeSelf; //private Dictionary projectiles = new Dictionary(); - + public override void OnStartClient() + { + base.OnStartClient(); + if (!IsOwner) + { + this.enabled = false; + } + } // Start is called before the first frame update private void Start() { + } // Update is called once per frame diff --git a/Assets/Packages/FishNet/Plugins/FishySteamworks/SteamManager.unitypackage.meta b/Assets/VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_HDRP_v1.0.1.unitypackage.meta similarity index 74% rename from Assets/Packages/FishNet/Plugins/FishySteamworks/SteamManager.unitypackage.meta rename to Assets/VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_HDRP_v1.0.1.unitypackage.meta index 7890e6c..a4d019d 100644 --- a/Assets/Packages/FishNet/Plugins/FishySteamworks/SteamManager.unitypackage.meta +++ b/Assets/VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_HDRP_v1.0.1.unitypackage.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a9c34549a246d47439b106bb23f71dff +guid: 96a44475794fb6445a6f3c4b9ee13966 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_URP_v1.0.1.unitypackage.meta b/Assets/VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_URP_v1.0.1.unitypackage.meta new file mode 100644 index 0000000..e4693ea --- /dev/null +++ b/Assets/VFXGraph/GabrielAguiarProductions/VFXGraph_Muzzle_2020.3_URP_v1.0.1.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0957b521a08374f4aa508231735153bc +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: