From 28be25e5728654ad4513f6e98618a68cc4597f4d Mon Sep 17 00:00:00 2001 From: Julia Butenhoff Date: Mon, 25 Oct 2021 14:17:58 -0500 Subject: [PATCH] Spawn in players - Need to fix errors --- Assets/Prefabs/King.meta | 8 + Assets/Prefabs/King/KingPrefab.prefab | 164 ++++++++++++++++++ Assets/Prefabs/King/KingPrefab.prefab.meta | 7 + Assets/Scenes/Game-Mountain.unity | 85 ++++++++- Assets/Scenes/Preloader.unity | 14 +- Assets/Scripts/Network/ServerGameNetPortal.cs | 6 +- .../PlayerScripts/ItemScripts/SpecialItem.cs | 10 +- 7 files changed, 281 insertions(+), 13 deletions(-) create mode 100644 Assets/Prefabs/King.meta create mode 100644 Assets/Prefabs/King/KingPrefab.prefab create mode 100644 Assets/Prefabs/King/KingPrefab.prefab.meta diff --git a/Assets/Prefabs/King.meta b/Assets/Prefabs/King.meta new file mode 100644 index 0000000..c19101d --- /dev/null +++ b/Assets/Prefabs/King.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d8e7b2cdd55022b449e68b18ee51a977 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/King/KingPrefab.prefab b/Assets/Prefabs/King/KingPrefab.prefab new file mode 100644 index 0000000..20eb0a5 --- /dev/null +++ b/Assets/Prefabs/King/KingPrefab.prefab @@ -0,0 +1,164 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7758200544476425999 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7758200544476426229} + - component: {fileID: 7758200544476426228} + - component: {fileID: 7758200544476425995} + - component: {fileID: 7758200544476425994} + - component: {fileID: 7758200544476425993} + - component: {fileID: 7758200544476425992} + m_Layer: 0 + m_Name: KingPrefab + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7758200544476426229 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7758200544476425999} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -8.473417, y: 14.03985, z: -9.079439} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &7758200544476426228 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7758200544476425999} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &7758200544476425995 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7758200544476425999} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &7758200544476425994 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7758200544476425999} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &7758200544476425993 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7758200544476425999} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} + m_Name: + m_EditorClassIdentifier: + NetworkInstanceId: 0 + PrefabHash: 2743578195845057962 + PrefabHashGenerator: KingPrefab + AlwaysReplicateAsRoot: 0 + DontDestroyWithOwner: 0 +--- !u!114 &7758200544476425992 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7758200544476425999} + 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 diff --git a/Assets/Prefabs/King/KingPrefab.prefab.meta b/Assets/Prefabs/King/KingPrefab.prefab.meta new file mode 100644 index 0000000..3fbc14a --- /dev/null +++ b/Assets/Prefabs/King/KingPrefab.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 31aeb41a00441214ca42c9eb5647395e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Game-Mountain.unity b/Assets/Scenes/Game-Mountain.unity index 380473a..36ef7c0 100644 --- a/Assets/Scenes/Game-Mountain.unity +++ b/Assets/Scenes/Game-Mountain.unity @@ -214,8 +214,91 @@ Transform: m_GameObject: {fileID: 1567091938} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 2, y: 2, z: 2} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1664207029 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1664207032} + - component: {fileID: 1664207031} + - component: {fileID: 1664207030} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &1664207030 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1664207029} + m_Enabled: 1 +--- !u!20 &1664207031 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1664207029} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1664207032 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1664207029} + m_LocalRotation: {x: -0, y: -0.9939013, z: 0.1102735, w: 0} + m_LocalPosition: {x: 0, y: 10.4, z: 23} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 12.662, y: -180, z: 0} diff --git a/Assets/Scenes/Preloader.unity b/Assets/Scenes/Preloader.unity index 0d25e83..f96a380 100644 --- a/Assets/Scenes/Preloader.unity +++ b/Assets/Scenes/Preloader.unity @@ -210,9 +210,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: runnerSpawnPoints: - - {x: 0, y: 0, z: 0} - - {x: 2, y: 0, z: 2} - kingSpawnPoint: {x: 5, y: 5, z: 5} + - {x: 0, y: 2, z: 0} + - {x: 2, y: 2, z: 2} + kingSpawnPoint: {x: 5, y: 7, z: 5} --- !u!1 &1494071116 GameObject: m_ObjectHideFlags: 0 @@ -280,7 +280,11 @@ MonoBehaviour: - Lobby - Game-Mountain AllowRuntimeSceneChanges: 0 - NetworkPrefabs: [] + NetworkPrefabs: + - Prefab: {fileID: 7188906082087890184, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} + PlayerPrefab: 0 + - Prefab: {fileID: 7758200544476425999, guid: 31aeb41a00441214ca42c9eb5647395e, type: 3} + PlayerPrefab: 0 PlayerPrefabHash: id: 0 CreatePlayerPrefab: 0 @@ -356,6 +360,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: maxPlayers: 3 + runnerPrefab: {fileID: 7188906082087890184, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} + kingPrefab: {fileID: 7758200544476425999, guid: 31aeb41a00441214ca42c9eb5647395e, type: 3} --- !u!114 &1566574284 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Network/ServerGameNetPortal.cs b/Assets/Scripts/Network/ServerGameNetPortal.cs index bab87de..5d8ab33 100644 --- a/Assets/Scripts/Network/ServerGameNetPortal.cs +++ b/Assets/Scripts/Network/ServerGameNetPortal.cs @@ -121,15 +121,15 @@ public class ServerGameNetPortal : MonoBehaviour { // Spawn in the prefab for the player based on king or runner GameObject go = null; if (pData.IsKing) { - go = Instantiate(runnerPrefab, kingSpawnPoint, Quaternion.identity); + go = Instantiate(kingPrefab, kingSpawnPoint, Quaternion.identity); } else { go = Instantiate(runnerPrefab, runnersSpawnPoints[runnerSpawnIndex], Quaternion.identity); } // Disable the character controller - go.GetComponent().enabled = false; - go.GetComponent().enabled = true; + //go.GetComponent().enabled = false; + //go.GetComponent().enabled = true; // Spawn the player on network and assign the owner go.GetComponent().Spawn(); diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/SpecialItem.cs b/Assets/Scripts/PlayerScripts/ItemScripts/SpecialItem.cs index ac74a2e..539298c 100644 --- a/Assets/Scripts/PlayerScripts/ItemScripts/SpecialItem.cs +++ b/Assets/Scripts/PlayerScripts/ItemScripts/SpecialItem.cs @@ -13,7 +13,7 @@ public class SpecialItem : Item public bool hasNitroM; public bool hasDashM; public float cooldownM; - public MonoScript scriptM; + //public MonoScript scriptM; public override void Equip(PlayerStats p, GameObject player){ if(maxVelM != 0){ @@ -61,9 +61,9 @@ public class SpecialItem : Item if(hasDashM != false){ p.HasDash = hasDashM; } - if(scriptM != null){ + /*if(scriptM != null){ player.AddComponent(scriptM.GetClass()); - } + }*/ } public override void Unequip(PlayerStats p, GameObject player){ @@ -112,9 +112,9 @@ public class SpecialItem : Item if(hasDashM != false){ p.HasDash = false; } - if(scriptM != null){ + /*if(scriptM != null){ Destroy(player.GetComponent(scriptM.GetClass())); - } + }*/ } }