diff --git a/Assets/Prefabs/Player/PlayerPrefab.prefab b/Assets/Prefabs/Player/PlayerPrefab.prefab index b601afb..8a25bf6 100644 --- a/Assets/Prefabs/Player/PlayerPrefab.prefab +++ b/Assets/Prefabs/Player/PlayerPrefab.prefab @@ -14,8 +14,6 @@ GameObject: - component: {fileID: 5086810605069144388} - component: {fileID: 3725107173017604129} - component: {fileID: 508183713705064073} - - component: {fileID: 6646742430777996202} - - component: {fileID: 6946259593417347243} - component: {fileID: 273103334658887749} - component: {fileID: 1952443820573609623} - component: {fileID: 4323471435859684389} @@ -141,71 +139,6 @@ MonoBehaviour: minAngle: -30 maxAngle: 45 sensitivity: 301 ---- !u!114 &6646742430777996202 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4814433541978696327} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} - m_Name: - m_EditorClassIdentifier: - NetworkInstanceId: 0 - PrefabHash: 8672539184207985188 - PrefabHashGenerator: PlayerPrefab - AlwaysReplicateAsRoot: 0 - DontDestroyWithOwner: 0 ---- !u!114 &6946259593417347243 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4814433541978696327} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e96cb6065543e43c4a752faaa1468eb1, type: 3} - m_Name: - m_EditorClassIdentifier: - FixedSendsPerSecond: 20 - AssumeSyncedSends: 1 - InterpolatePosition: 1 - SnapDistance: 10 - InterpolateServer: 1 - MinMeters: 0.15 - MinDegrees: 1.5 - ExtrapolatePosition: 0 - MaxSendsToExtrapolate: 5 - Channel: - EnableRange: 0 - EnableNonProvokedResendChecks: 0 - DistanceSendrate: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 20 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 500 - value: 20 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 --- !u!114 &273103334658887749 MonoBehaviour: m_ObjectHideFlags: 0 @@ -362,6 +295,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7188906082087890177} + - component: {fileID: 5368328878093455966} + - component: {fileID: 701079060217590907} m_Layer: 3 m_Name: PlayerPrefab m_TagString: Player @@ -385,6 +320,71 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5368328878093455966 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7188906082087890184} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} + m_Name: + m_EditorClassIdentifier: + NetworkInstanceId: 0 + PrefabHash: 8672539184207985188 + PrefabHashGenerator: PlayerPrefab + AlwaysReplicateAsRoot: 0 + DontDestroyWithOwner: 0 +--- !u!114 &701079060217590907 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7188906082087890184} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e96cb6065543e43c4a752faaa1468eb1, type: 3} + m_Name: + m_EditorClassIdentifier: + FixedSendsPerSecond: 20 + AssumeSyncedSends: 1 + InterpolatePosition: 1 + SnapDistance: 10 + InterpolateServer: 1 + MinMeters: 0.15 + MinDegrees: 1.5 + ExtrapolatePosition: 0 + MaxSendsToExtrapolate: 5 + Channel: + EnableRange: 0 + EnableNonProvokedResendChecks: 0 + DistanceSendrate: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 20 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 500 + value: 20 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &7188906082643956521 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Network/ServerGameNetPortal.cs b/Assets/Scripts/Network/ServerGameNetPortal.cs index 8a2530c..a1fee40 100644 --- a/Assets/Scripts/Network/ServerGameNetPortal.cs +++ b/Assets/Scripts/Network/ServerGameNetPortal.cs @@ -13,10 +13,6 @@ public class ServerGameNetPortal : MonoBehaviour { [Header("Settings")] [SerializeField] private int maxPlayers = 3; - [Header("Prefabs")] - [SerializeField] private NetworkObject runnerPrefab; - [SerializeField] private NetworkObject kingPrefab; - public static ServerGameNetPortal Instance => instance; private static ServerGameNetPortal instance; diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index f2e4115..73ebd13 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -30,10 +30,10 @@ EditorUserSettings: value: 22424703114646680e0b0227036c731f1415016439262f2434 flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb + value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb + value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb flags: 0 UnityRemoteCompression: value: 337f73