diff --git a/Assets/Materials/Levels/Level0/CeilLightMaterial.mat b/Assets/Materials/Levels/Level0/CeilLightMaterial.mat index 715777f..354b23f 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: 42 + - _StencilWriteMaskMV: 40 - _SubsurfaceMask: 1 - _SupportDecals: 1 - _SurfaceType: 0 diff --git a/Assets/Scenes/Experimentation/MultiplayerScenes/StylizedLobbyScene.unity b/Assets/Scenes/Experimentation/MultiplayerScenes/StylizedLobbyScene.unity index d88da8b..98b65d7 100644 --- a/Assets/Scenes/Experimentation/MultiplayerScenes/StylizedLobbyScene.unity +++ b/Assets/Scenes/Experimentation/MultiplayerScenes/StylizedLobbyScene.unity @@ -1630,7 +1630,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _steamAppID: 480 - _serverBindAddress: 76561198308605766 + _serverBindAddress: 76561199343328028 _port: 7770 _maximumClients: 3188 _peerToPeer: 1 diff --git a/Assets/Scripts/Item/Pistol/PistolComponent.cs b/Assets/Scripts/Item/Pistol/PistolComponent.cs index f75fb55..b7c9e3f 100644 --- a/Assets/Scripts/Item/Pistol/PistolComponent.cs +++ b/Assets/Scripts/Item/Pistol/PistolComponent.cs @@ -138,15 +138,17 @@ namespace Item shootLight.gameObject.SetActive(true); // var projectile = Instantiate(projectilePrefab, bulletSpawnPoint); - var projectile = Instantiate(projectilePrefab, bulletSpawnPoint); + var projectile = Instantiate(projectilePrefab); + projectile.transform.position = bulletSpawnPoint.transform.position; + projectile.transform.rotation = bulletSpawnPoint.transform.rotation; + projectile.transform.localScale =bulletSpawnPoint.transform.localScale; InstanceFinder.ServerManager.Spawn(projectile); //var projectile = Instantiate(projectilePrefab, bulletSpawnPoint); //InstanceFinder.ServerManager.Spawn(projectile); - - projectile.transform.localPosition = Vector3.zero; + /*projectile.transform.localPosition = Vector3.zero; projectile.transform.localEulerAngles = Vector3.zero; - projectile.transform.localScale = Vector3.one; + projectile.transform.localScale = Vector3.one;*/ var pRigid = projectile.GetComponent(); /*Modified targeting system @@ -181,6 +183,7 @@ namespace Item pRigid.AddForce(launchVector, ForceMode.Impulse); projectile.transform.parent = null; + shootEffect.Play(); }