diff --git a/Assets/DefaultPrefabObjects.asset b/Assets/DefaultPrefabObjects.asset index ce40c6f..06382b8 100644 --- a/Assets/DefaultPrefabObjects.asset +++ b/Assets/DefaultPrefabObjects.asset @@ -17,8 +17,10 @@ MonoBehaviour: - {fileID: 2567458756038211005, guid: 6e7c21afe51065e4aae8fa80f880f1e5, type: 3} - {fileID: 1069525110278255243, guid: 5e611af8f39b09a4f9b479a29f3460ff, type: 3} - {fileID: 6649839674135743142, guid: 396e7ba93ef9d4147a6a6c09b1abe39d, type: 3} + - {fileID: 7886096758448646968, guid: 5a1eee87959b5f24ba6a8d27b8ba733f, type: 3} - {fileID: -5190615940012992767, guid: 52ba61e86784ff5458c6685514d6d6c8, type: 3} - {fileID: -3690528308152583234, guid: 148456ca1eee0994eb0165cb943e8322, type: 3} + - {fileID: -5266359988799061826, guid: c20ce53979ccfc34582e98753869a95b, type: 3} - {fileID: 4512293259955182956, guid: 300370bdf7819da41937e0beac65b32c, type: 3} - {fileID: 233110740096973419, guid: e05b94df3e7783a48ac1ed2d12a71774, type: 3} - {fileID: 611616139817875448, guid: bf5f023b4017a5e41a9815ec5745df3d, type: 3} diff --git a/Assets/Prefabs/Items/Item.prefab b/Assets/Prefabs/Items/Item.prefab index eaa82b1..bb82e84 100644 --- a/Assets/Prefabs/Items/Item.prefab +++ b/Assets/Prefabs/Items/Item.prefab @@ -364,6 +364,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ebc98b4f9e53f6841830816aa1064d6f, type: 3} m_Name: m_EditorClassIdentifier: + _componentIndexCache: 255 + _addedNetworkObject: {fileID: 0} + _networkObjectCache: {fileID: 0} itemName: itemSize: 1 interactionCanvas: {fileID: 1932605483634455635} diff --git a/Assets/Prefabs/World/Doors/Reciptical_0.1.prefab b/Assets/Prefabs/World/Doors/Reciptical_0.1.prefab index 3a15f2c..f6ea318 100644 --- a/Assets/Prefabs/World/Doors/Reciptical_0.1.prefab +++ b/Assets/Prefabs/World/Doors/Reciptical_0.1.prefab @@ -347,6 +347,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1f575b137603a4b4282a6551120c979a, type: 3} m_Name: m_EditorClassIdentifier: + _componentIndexCache: 255 + _addedNetworkObject: {fileID: 0} + _networkObjectCache: {fileID: 0} itemName: Door1Recepticle itemSize: 1 interactionCanvas: {fileID: 5300587138128522443} diff --git a/Assets/Scripts/Item/CarryableItem.cs b/Assets/Scripts/Item/CarryableItem.cs index afe40df..a48e7f8 100644 --- a/Assets/Scripts/Item/CarryableItem.cs +++ b/Assets/Scripts/Item/CarryableItem.cs @@ -1,10 +1,12 @@ using UnityEngine; +using FishNet.Connection; +using FishNet.Object; namespace Item { [RequireComponent(typeof(Collider))] [RequireComponent(typeof(Rigidbody))] - public abstract class CarryableItem : MonoBehaviour + public abstract class CarryableItem : NetworkBehaviour { [SerializeField] private string itemName; diff --git a/Assets/Scripts/Item/InteractableItem.cs b/Assets/Scripts/Item/InteractableItem.cs index 5402795..99abb5a 100644 --- a/Assets/Scripts/Item/InteractableItem.cs +++ b/Assets/Scripts/Item/InteractableItem.cs @@ -49,7 +49,7 @@ namespace Item public abstract bool Interact(); - [ServerRpc] + public abstract bool Interact(ref Inventory inventory, ref HeavyInteractableItem heavyInvent); protected void BaseAwake() diff --git a/Assets/Scripts/Player/NoiseVisibilitySettingsManager.cs b/Assets/Scripts/Player/NoiseVisibilitySettingsManager.cs index 664c8e5..2ce7135 100644 --- a/Assets/Scripts/Player/NoiseVisibilitySettingsManager.cs +++ b/Assets/Scripts/Player/NoiseVisibilitySettingsManager.cs @@ -1,9 +1,10 @@ using FishNet.Object; +using FishNet.Connection; using UnityEngine; namespace Player { - public class NoiseVisibilitySettingsManager : MonoBehaviour + public class NoiseVisibilitySettingsManager : NetworkBehaviour { [SerializeField] private float sneakNoiseDistance = 5f;