From dd9a7b625c22dfdc2720854acfe46d6a6ed000e4 Mon Sep 17 00:00:00 2001 From: Julia Butenhoff Date: Fri, 10 Dec 2021 18:29:16 -0600 Subject: [PATCH] Beginning of KillZone work --- Assets/Prefabs/Environment/KillZone.prefab | 145 ++++++++++++++++++ .../Prefabs/Environment/KillZone.prefab.meta | 7 + Assets/Prefabs/Game/PlayerHUD.prefab | 2 +- Assets/Scenes/Preloader.unity | 2 + Assets/Scripts/Environment/Pitfall.cs | 36 ++++- .../PlayerItems/ItemScripts/Dash.cs | 2 +- UserSettings/EditorUserSettings.asset | 4 +- 7 files changed, 187 insertions(+), 11 deletions(-) create mode 100644 Assets/Prefabs/Environment/KillZone.prefab create mode 100644 Assets/Prefabs/Environment/KillZone.prefab.meta diff --git a/Assets/Prefabs/Environment/KillZone.prefab b/Assets/Prefabs/Environment/KillZone.prefab new file mode 100644 index 0000000..9bd5dc5 --- /dev/null +++ b/Assets/Prefabs/Environment/KillZone.prefab @@ -0,0 +1,145 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8778111956603343863 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8778111956603343862} + - component: {fileID: 8778111956603342858} + - component: {fileID: 8778111956603342859} + - component: {fileID: 8778111956603343860} + - component: {fileID: 8778111956603343861} + - component: {fileID: 3183774617664554809} + - component: {fileID: -2092087121947270153} + m_Layer: 0 + m_Name: KillZone + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8778111956603343862 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8778111956603343863} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 269, y: 20.1, z: 605.9} + m_LocalScale: {x: 28, y: 1, z: 10} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &8778111956603342858 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8778111956603343863} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &8778111956603342859 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8778111956603343863} + 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: 2100000, guid: d0196f4da525cff408fd51a91f95ae1d, type: 2} + 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!64 &8778111956603343860 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8778111956603343863} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &8778111956603343861 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8778111956603343863} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4fceb627d9e440c48bbffc81a9a734da, type: 3} + m_Name: + m_EditorClassIdentifier: + RespawnPoint: {x: 435, y: 26, z: 573} + runnerPrefab: {fileID: 7188906082087890177, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} +--- !u!114 &3183774617664554809 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8778111956603343863} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} + m_Name: + m_EditorClassIdentifier: + NetworkInstanceId: 0 + PrefabHash: 17610159028495342735 + PrefabHashGenerator: KillZone + AlwaysReplicateAsRoot: 0 + DontDestroyWithOwner: 0 +--- !u!114 &-2092087121947270153 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8778111956603343863} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 66519fc5420181e45850c591aa1179ec, type: 3} + m_Name: + m_EditorClassIdentifier: + allItems: [] diff --git a/Assets/Prefabs/Environment/KillZone.prefab.meta b/Assets/Prefabs/Environment/KillZone.prefab.meta new file mode 100644 index 0000000..45bc20e --- /dev/null +++ b/Assets/Prefabs/Environment/KillZone.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0e50603b66fe968418894499e023ec03 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Game/PlayerHUD.prefab b/Assets/Prefabs/Game/PlayerHUD.prefab index 75b0deb..7a6fa1b 100644 --- a/Assets/Prefabs/Game/PlayerHUD.prefab +++ b/Assets/Prefabs/Game/PlayerHUD.prefab @@ -197,7 +197,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 540bda985e7e4b549a804ff06b069af1, type: 3} m_Name: m_EditorClassIdentifier: - raceTimer: 10 + raceTimer: 60 countdown_text: {fileID: 8450380190165699611} spectating_text: {fileID: 9093490155705374174} --- !u!114 &4670258835641355805 diff --git a/Assets/Scenes/Preloader.unity b/Assets/Scenes/Preloader.unity index fab5d5d..f8e1e04 100644 --- a/Assets/Scenes/Preloader.unity +++ b/Assets/Scenes/Preloader.unity @@ -292,6 +292,8 @@ MonoBehaviour: PlayerPrefab: 0 - Prefab: {fileID: 7903050775825061804, guid: 3ec903bdbf186d042993c4adefa36fb2, type: 3} PlayerPrefab: 0 + - Prefab: {fileID: 8778111956603343863, guid: 0e50603b66fe968418894499e023ec03, type: 3} + PlayerPrefab: 0 PlayerPrefabHash: id: 0 CreatePlayerPrefab: 0 diff --git a/Assets/Scripts/Environment/Pitfall.cs b/Assets/Scripts/Environment/Pitfall.cs index 3d9690c..2ffec80 100644 --- a/Assets/Scripts/Environment/Pitfall.cs +++ b/Assets/Scripts/Environment/Pitfall.cs @@ -1,17 +1,39 @@ +using MLAPI; +using MLAPI.Messaging; using System.Collections; using System.Collections.Generic; using UnityEngine; -public class Pitfall : MonoBehaviour +public class Pitfall : NetworkBehaviour { - public Vector3 RespawnPoint; //Where player will respawn to, set in GUI + [SerializeField] private Vector3 RespawnPoint; //Where player will respawn to, set in GUI - private void OnTriggerEnter(Collider other) - { - if (other.CompareTag("Player")) //If runner enters the trigger cancel momentum, disable controls, and move to set respawn point + private void OnTriggerEnter(Collider other) { + if (other.transform.parent.gameObject.tag == "Player" && other.gameObject.transform.parent.gameObject.GetComponent().OwnerClientId == NetworkManager.Singleton.LocalClientId) { + RespawnPlayerServerRPC(); + } + } + + [ServerRpc] + private void RespawnPlayerServerRPC(ServerRpcParams serverRpcParams = default) { + RespawnPlayerClientRPC(serverRpcParams.Receive.SenderClientId); + } + + [ClientRpc] + private void RespawnPlayerClientRPC(ulong playerID) { + // Get all players in the scene + GameObject[] playableCharacters = GameObject.FindGameObjectsWithTag("Player"); + + // Find our player first + foreach (GameObject character in playableCharacters) { - other.transform.position = RespawnPoint; - other.GetComponent().CancelMomentum(); + if (character.GetComponent().OwnerClientId == playerID) + { + character.GetComponentInChildren().CancelMomentum(); + Debug.Log(character.transform.position); + character.transform.position = RespawnPoint; + Debug.Log(character.transform.position); + } } } } diff --git a/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/Dash.cs b/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/Dash.cs index e1c7030..0a47a43 100644 --- a/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/Dash.cs +++ b/Assets/Scripts/PlayerScripts/PlayerItems/ItemScripts/Dash.cs @@ -40,7 +40,7 @@ public class Dash : NetworkBehaviour { moveDirection = Vector3.zero; } - characterController.Move(moveDirection * Time.deltaTime * dashSpeed); + //characterController.Move(moveDirection * Time.deltaTime * dashSpeed); } private IEnumerator startCoolDown(){ diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 991b6af..35ad120 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -27,10 +27,10 @@ EditorUserSettings: value: 22424703114646680e0b0227036c7b151b180b650e3a233126281f3fe7c23837e1ec25a7f234362820 flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb + value: 22424703114646680e0b0227036c6f1f05033f2b212d68252320092a flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c6f1f05033f2b212d68252320092a + value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb flags: 0 RecentlyUsedScenePath-9: value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb