From af690289ba565f2296e0030baac560fd418ac83d Mon Sep 17 00:00:00 2001 From: sebastianhampel1 Date: Thu, 15 Jun 2023 12:25:31 -0400 Subject: [PATCH] RPC call made --- .../StylizedLobbyScene.unity | 43 +++++++++++++++++++ .../Player/PlayerInteractionHandler.cs | 7 +-- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/Assets/Scenes/Experimentation/MultiplayerScenes/StylizedLobbyScene.unity b/Assets/Scenes/Experimentation/MultiplayerScenes/StylizedLobbyScene.unity index 32a4518..d88da8b 100644 --- a/Assets/Scenes/Experimentation/MultiplayerScenes/StylizedLobbyScene.unity +++ b/Assets/Scenes/Experimentation/MultiplayerScenes/StylizedLobbyScene.unity @@ -1381,6 +1381,17 @@ Transform: m_CorrespondingSourceObject: {fileID: 6960644867054158483, guid: 231880aae7c09254dac056505dfab7f9, type: 3} m_PrefabInstance: {fileID: 1073158888} m_PrefabAsset: {fileID: 0} +--- !u!114 &1053039779 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1874859957734831241, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + m_PrefabInstance: {fileID: 1163429556} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 26b716c41e9b56b4baafaf13a523ba2e, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1055848585 GameObject: m_ObjectHideFlags: 0 @@ -1737,6 +1748,30 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 1874859957734831241, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + propertyPath: _scenePathHash + value: 1572940557 + objectReference: {fileID: 0} + - target: {fileID: 1874859957734831241, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + propertyPath: k__BackingField + value: 6755728251985842163 + objectReference: {fileID: 0} + - target: {fileID: 1874859957734831241, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + propertyPath: k__BackingField + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1874859957734831241, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + propertyPath: _sceneNetworkObjects.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1874859957734831241, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + propertyPath: _sceneNetworkObjects.Array.data[0] + value: + objectReference: {fileID: 1823754982} + - target: {fileID: 1874859957734831241, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + propertyPath: k__BackingField + value: + objectReference: {fileID: 1823754982} - target: {fileID: 2278651747416643762, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} propertyPath: _scenePathHash value: 1572940557 @@ -1865,6 +1900,14 @@ PrefabInstance: propertyPath: _sceneNetworkObjects.Array.data[0] value: objectReference: {fileID: 1823754982} + - target: {fileID: 5498159848629933595, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + propertyPath: k__BackingField.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5498159848629933595, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} + propertyPath: k__BackingField.Array.data[0] + value: + objectReference: {fileID: 1053039779} - target: {fileID: 6195543837284837351, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3} propertyPath: m_Enabled value: 0 diff --git a/Assets/Scripts/Player/PlayerInteractionHandler.cs b/Assets/Scripts/Player/PlayerInteractionHandler.cs index a3ff2f1..60393ce 100644 --- a/Assets/Scripts/Player/PlayerInteractionHandler.cs +++ b/Assets/Scripts/Player/PlayerInteractionHandler.cs @@ -198,13 +198,14 @@ public class PlayerInteractionHandler : NetworkBehaviour if (Input.GetButtonDown("Fire3")&&inputEnbaled) if (!IsCarrying) { - SwitchWeaponMode(); - GunEnabled = !GunEnabled; + + SwitchWeaponMode(); + /*GunEnabled = !GunEnabled; if (!GunEnabled) pistol.Disable(); pistol.gameObject.SetActive(GunEnabled); if (GunEnabled) - pistol.Enable(); + pistol.Enable();*/ } if (GunEnabled)