From 671a01cc16fde0ff682f2522812e12e57752bb98 Mon Sep 17 00:00:00 2001
From: Melbyj1125 <60886701+Melbyj1125@users.noreply.github.com>
Date: Mon, 21 Feb 2022 12:23:43 -0600
Subject: [PATCH] fixed respawn and knockback respawn

---
 Assets/Prefabs/Environment/KillZone.prefab    | 14 ++++++
 .../Player/NetworkSMPlayerPrefab.prefab       | 48 ++++++++++++++++++-
 UserSettings/EditorUserSettings.asset         | 16 +++----
 3 files changed, 69 insertions(+), 9 deletions(-)

diff --git a/Assets/Prefabs/Environment/KillZone.prefab b/Assets/Prefabs/Environment/KillZone.prefab
index 5354d69..dc87a39 100644
--- a/Assets/Prefabs/Environment/KillZone.prefab
+++ b/Assets/Prefabs/Environment/KillZone.prefab
@@ -13,6 +13,7 @@ GameObject:
   - component: {fileID: 8778111956603342859}
   - component: {fileID: 8778111956603343860}
   - component: {fileID: 8778111956603343861}
+  - component: {fileID: 2777707544055662971}
   - component: {fileID: 3183774617664554809}
   m_Layer: 0
   m_Name: KillZone
@@ -112,6 +113,19 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   RespawnPoint: {x: 435, y: 26, z: 573}
   runnerPrefab: {fileID: 3669633515805984294, guid: 1e178f956ddfe5143b2b9e77e76db7f0, type: 3}
+--- !u!114 &2777707544055662971
+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: []
 --- !u!114 &3183774617664554809
 MonoBehaviour:
   m_ObjectHideFlags: 0
diff --git a/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab b/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab
index 1b0ee6c..8f14b21 100644
--- a/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab
+++ b/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab
@@ -4170,6 +4170,51 @@ Transform:
   m_Father: {fileID: 6274103983836682456}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &6791187335779425766
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5981285733375990595}
+  - component: {fileID: 5804161043832888973}
+  m_Layer: 0
+  m_Name: TriggerHitbox
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5981285733375990595
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6791187335779425766}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.0379, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 7059700519020685704}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!136 &5804161043832888973
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6791187335779425766}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  m_Radius: 0.01
+  m_Height: 0.09
+  m_Direction: 1
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &6873715991476134738
 GameObject:
   m_ObjectHideFlags: 0
@@ -4574,6 +4619,7 @@ Transform:
   - {fileID: 5911456903690389451}
   - {fileID: 3290243446330099996}
   - {fileID: 347685973298016132}
+  - {fileID: 5981285733375990595}
   m_Father: {fileID: 3669633515805984294}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4743,7 +4789,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7688428083034862386}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 201caa2b2f1776a46af6bdfd52456028, type: 3}
   m_Name: 
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
index bd6e9ab..bd1e872 100644
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -12,28 +12,28 @@ EditorUserSettings:
       value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26
       flags: 0
     RecentlyUsedScenePath-2:
-      value: 22424703114646680e0b0227036c731f1415016439262f2434
-      flags: 0
-    RecentlyUsedScenePath-3:
       value: 22424703114646680e0b0227036c6b19021b1d192f2d2835633c133af6f9
       flags: 0
-    RecentlyUsedScenePath-4:
+    RecentlyUsedScenePath-3:
       value: 22424703114646680e0b0227036c7b151b180b65093e273e12190f3cf6ef2021f2e225a7f234362820
       flags: 0
-    RecentlyUsedScenePath-5:
+    RecentlyUsedScenePath-4:
       value: 22424703114646680e0b0227036c7b151b180b652b3a27292f260573f1e33136e7a923e7ee2e26
       flags: 0
+    RecentlyUsedScenePath-5:
+      value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26
+      flags: 0
     RecentlyUsedScenePath-6:
-      value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb
+      value: 22424703114646680e0b0227036c731f1415016439262f2434
       flags: 0
     RecentlyUsedScenePath-7:
-      value: 22424703114646680e0b0227036c731f1415016439262f2434
+      value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb
       flags: 0
     RecentlyUsedScenePath-8:
       value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb
       flags: 0
     RecentlyUsedScenePath-9:
-      value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26
+      value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650