From 71d7a847256ab4cfd295ea86e5f447f5240eadda Mon Sep 17 00:00:00 2001 From: Melbyj1125 <60886701+Melbyj1125@users.noreply.github.com> Date: Wed, 2 Mar 2022 15:08:49 -0600 Subject: [PATCH] can kick other players but there is a problem Recovering from ragdoll has problems & host can't kick others for some reason --- Assets/Scenes/Game-Mountain.unity | 73 ++----------------- .../OffenseState/OffenseStateManager.cs | 2 +- UserSettings/EditorUserSettings.asset | 18 ++--- 3 files changed, 18 insertions(+), 75 deletions(-) diff --git a/Assets/Scenes/Game-Mountain.unity b/Assets/Scenes/Game-Mountain.unity index 4384730..2997993 100644 --- a/Assets/Scenes/Game-Mountain.unity +++ b/Assets/Scenes/Game-Mountain.unity @@ -10530,7 +10530,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 23 + m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &215113614 GameObject: @@ -19483,63 +19483,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 460554693} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1001 &461844868 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2245335390844843017, guid: cb8332a22eb05c44686906967b43b48a, type: 3} - propertyPath: m_RootOrder - value: 16 - objectReference: {fileID: 0} - - target: {fileID: 2245335390844843017, guid: cb8332a22eb05c44686906967b43b48a, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2245335390844843017, guid: cb8332a22eb05c44686906967b43b48a, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2245335390844843017, guid: cb8332a22eb05c44686906967b43b48a, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2245335390844843017, guid: cb8332a22eb05c44686906967b43b48a, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2245335390844843017, guid: cb8332a22eb05c44686906967b43b48a, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2245335390844843017, guid: cb8332a22eb05c44686906967b43b48a, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2245335390844843017, guid: cb8332a22eb05c44686906967b43b48a, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2245335390844843017, guid: cb8332a22eb05c44686906967b43b48a, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2245335390844843017, guid: cb8332a22eb05c44686906967b43b48a, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2245335390844843017, guid: cb8332a22eb05c44686906967b43b48a, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6821539721215143733, guid: cb8332a22eb05c44686906967b43b48a, type: 3} - propertyPath: m_Name - value: WeatherWheel - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: cb8332a22eb05c44686906967b43b48a, type: 3} --- !u!1 &464218762 GameObject: m_ObjectHideFlags: 0 @@ -35040,7 +34983,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 22 + m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &778195138 PrefabInstance: @@ -61249,7 +61192,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 24 + m_RootOrder: 23 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1460369061 PrefabInstance: @@ -71471,7 +71414,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 21 + m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1622981765 PrefabInstance: @@ -88815,7 +88758,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1578817158580045979, guid: 4a2a13b757e0fa944a5e05e10b50f380, type: 3} propertyPath: m_RootOrder - value: 18 + value: 17 objectReference: {fileID: 0} - target: {fileID: 1578817158580045979, guid: 4a2a13b757e0fa944a5e05e10b50f380, type: 3} propertyPath: m_LocalRotation.w @@ -90135,7 +90078,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6676345594231214399, guid: 297bfc41790ca6e4b820035f34be2df4, type: 3} propertyPath: m_RootOrder - value: 17 + value: 16 objectReference: {fileID: 0} - target: {fileID: 6676345594231214399, guid: 297bfc41790ca6e4b820035f34be2df4, type: 3} propertyPath: m_LocalPosition.x @@ -90292,7 +90235,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 8044612620057779272, guid: 450b6dc6b2c449e4694a00bba05688d8, type: 3} propertyPath: m_RootOrder - value: 19 + value: 18 objectReference: {fileID: 0} - target: {fileID: 8044612620057779272, guid: 450b6dc6b2c449e4694a00bba05688d8, type: 3} propertyPath: m_LocalRotation.w @@ -90490,7 +90433,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 8977215705378820474, guid: ee0e0e34e2344ec46b9ee698f50ca58a, type: 3} propertyPath: m_RootOrder - value: 20 + value: 19 objectReference: {fileID: 0} - target: {fileID: 8977215705378820474, guid: ee0e0e34e2344ec46b9ee698f50ca58a, type: 3} propertyPath: m_LocalRotation.w diff --git a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/OffenseState/OffenseStateManager.cs b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/OffenseState/OffenseStateManager.cs index 6c27175..f571479 100644 --- a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/OffenseState/OffenseStateManager.cs +++ b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/OffenseState/OffenseStateManager.cs @@ -116,7 +116,7 @@ public class OffenseStateManager : NetworkBehaviour if(collision.transform.CompareTag("ArcherTarget") && myCollider == legHitbox.GetComponent()){ Vector3 direction = this.transform.forward; - ulong netObjID = collision.gameObject.GetComponent().NetworkObjectId; + ulong netObjID = collision.gameObject.transform.root.GetComponent().NetworkObjectId; ApplyKickServerRPC(direction, netObjID); } diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index d35e330..8227f52 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,34 +6,34 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c6b19021b1d192f2d2835633c133af6f9 - flags: 0 - RecentlyUsedScenePath-1: value: 22424703114646680e0b0227036c7b151b180b65093e273e12190f3cf6ef2021f2e225a7f234362820 flags: 0 - RecentlyUsedScenePath-2: + RecentlyUsedScenePath-1: value: 22424703114646680e0b0227036c7b151b180b652b3a27292f260573f1e33136e7a923e7ee2e26 flags: 0 - RecentlyUsedScenePath-3: + RecentlyUsedScenePath-2: value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 flags: 0 - RecentlyUsedScenePath-4: + RecentlyUsedScenePath-3: value: 22424703114646680e0b0227036c731f1415016439262f2434 flags: 0 + RecentlyUsedScenePath-4: + value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 + flags: 0 RecentlyUsedScenePath-5: value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 + value: 22424703114646680e0b0227036c7b151b180b652b3a27292f260573f1e33136e7a923e7ee2e26 flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c7b151b180b652b3a27292f260573f1e33136e7a923e7ee2e26 + value: 22424703114646680e0b0227036c7b151b180b650721283704240d14f0e12d3aedff78fce9332b25 flags: 0 RecentlyUsedScenePath-8: value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c7b151b180b650721283704240d14f0e12d3aedff78fce9332b25 + value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb flags: 0 vcSharedLogLevel: value: 0d5e400f0650