Station_Obscurum/station_obscurum_unity
Archived
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RPC call made

Browse Source
This commit is contained in:
sebastianhampel1 2023-06-15 12:25:31 -04:00
parent db50852ac9
commit af690289ba
2 changed files with 47 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Assets/Scenes/Experimentation/MultiplayerScenes/StylizedLobbyScene.unity
View File

@ -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: <SceneId>k__BackingField
value: 6755728251985842163
objectReference: {fileID: 0}
- target: {fileID: 1874859957734831241, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3}
propertyPath: <ComponentIndex>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: <ParentNetworkObject>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: <ChildNetworkObjects>k__BackingField.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5498159848629933595, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3}
propertyPath: <ChildNetworkObjects>k__BackingField.Array.data[0]
value:
objectReference: {fileID: 1053039779}
- target: {fileID: 6195543837284837351, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3}
propertyPath: m_Enabled
value: 0

7
Assets/Scripts/Player/PlayerInteractionHandler.cs
View File

@ -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)