From 76fe0a60f4ab8f1ef6f910736a2106bf9437a33b Mon Sep 17 00:00:00 2001 From: Pascal Serrarens Date: Fri, 19 Apr 2024 10:56:26 +0200 Subject: [PATCH] Pose sync is working, but grabbing fails (see https://discord.com/channels/1176121669895589899/1219195189743194164/1230803953109827655) --- .../Networking/HumanoidPlayer_Editor.cs | 14 ---- .../Netcode/HumanoidNetcode_Editor.cs | 2 +- Editor/PasserVR.HumanoidControl.Editor.asmdef | 3 +- .../Networking/NetworkedTransform_Editor.cs | 43 +++++------ .../Networking/NetworkingStarter_Editor.cs | 6 +- .../Resources/HumanoidPlayer.prefab | 5 +- .../Scripts/Networking/HumanoidNetworking.cs | 2 +- .../Netcode/HumanoidPlayerNetcode.cs | 14 +++- .../Networking/Netcode/NetcodeStarter.cs | 75 ------------------- .../Scripts/Physics/HandSocket.cs | 3 +- .../Prefabs/Objects/FrontDoor.prefab | 37 +-------- .../GroceryStore/Prefabs/Objects/Sword.prefab | 56 ++------------ 12 files changed, 55 insertions(+), 205 deletions(-) diff --git a/Editor/HumanoidControl/Networking/HumanoidPlayer_Editor.cs b/Editor/HumanoidControl/Networking/HumanoidPlayer_Editor.cs index 85f51b3..d5033ab 100644 --- a/Editor/HumanoidControl/Networking/HumanoidPlayer_Editor.cs +++ b/Editor/HumanoidControl/Networking/HumanoidPlayer_Editor.cs @@ -47,20 +47,6 @@ namespace Passer.Humanoid { [CustomEditor(typeof(HumanoidPlayer))] public class HumanoidPlayer_Editor : HumanoidNetworking_Editor { -#if hNW_UNET - public override void OnInspectorGUI() { - serializedObject.Update(); - - SendRateInspector(); - DebugLevelInspector(); - SmoothingInspector(); - SyncFingerSwingInspector(); - CreateLocalRemotesInspector(); - SyncTrackingInspector(); - - serializedObject.ApplyModifiedProperties(); - } -#endif public static Stack prefabsToSave = new Stack(); public static Stack prefabPaths = new Stack(); diff --git a/Editor/HumanoidControl/Networking/Netcode/HumanoidNetcode_Editor.cs b/Editor/HumanoidControl/Networking/Netcode/HumanoidNetcode_Editor.cs index 57a1f8b..22a5976 100644 --- a/Editor/HumanoidControl/Networking/Netcode/HumanoidNetcode_Editor.cs +++ b/Editor/HumanoidControl/Networking/Netcode/HumanoidNetcode_Editor.cs @@ -19,7 +19,7 @@ namespace Passer.Humanoid { Unity.Netcode.NetworkConfig nwConfig = nwManager.NetworkConfig; if (nwConfig.NetworkTransport == null) { - Unity.Netcode.Transports.UTP.UnityTransport unityTransport = new(); + Unity.Netcode.Transports.UTP.UnityTransport unityTransport = nwManager.gameObject.AddComponent(); nwConfig.NetworkTransport = unityTransport; } if (nwConfig.PlayerPrefab == null) diff --git a/Editor/PasserVR.HumanoidControl.Editor.asmdef b/Editor/PasserVR.HumanoidControl.Editor.asmdef index 22bccfc..6b2994b 100644 --- a/Editor/PasserVR.HumanoidControl.Editor.asmdef +++ b/Editor/PasserVR.HumanoidControl.Editor.asmdef @@ -10,7 +10,8 @@ "PhotonRealtime", "PhotonVoice.API", "SteamVR", - "Unity.Netcode.Runtime" + "Unity.Netcode.Runtime", + "Unity.Netcode.Components" ], "includePlatforms": [ "Editor" diff --git a/Editor/Tools/Networking/NetworkedTransform_Editor.cs b/Editor/Tools/Networking/NetworkedTransform_Editor.cs index c69b8e7..7e52dec 100644 --- a/Editor/Tools/Networking/NetworkedTransform_Editor.cs +++ b/Editor/Tools/Networking/NetworkedTransform_Editor.cs @@ -20,7 +20,7 @@ namespace Passer { public static void CheckForNetworkTransform(GameObject gameObject) { CheckNetworkTransformNone(gameObject); - CheckNetworkTransformUnet(gameObject); + CheckNetworkTransformNetcode(gameObject); CheckNetworkTransformPun(gameObject); CheckNetworkTransformBolt(gameObject); CheckNetworkTransformMirror(gameObject); @@ -29,8 +29,8 @@ namespace Passer { #region None protected static void CheckNetworkTransformNone(GameObject gameObject) { -#if !hNW_UNET && !hNW_PHOTON && !hNW_MIRROR - CleanupNetworkTransformUnet(gameObject); +#if !hNW_NETCODE && !hNW_PHOTON && !hNW_MIRROR + CleanupNetworkTransformNetcode(gameObject); CleanupNetworkTransformPun(gameObject); CleanupNetworkTransformMirror(gameObject); #endif @@ -38,40 +38,37 @@ namespace Passer { #endregion - #region Unet + #region Netcode - protected static void CheckNetworkTransformUnet(GameObject gameObject) { -#if hNW_UNET && !UNITY_2019_1_OR_NEWER -#pragma warning disable 0618 - UnityEngine.Networking.NetworkIdentity networkIdentity = gameObject.GetComponent(); + protected static void CheckNetworkTransformNetcode(GameObject gameObject) { +#if hNETCODE + Unity.Netcode.NetworkObject networkIdentity = gameObject.GetComponent(); if (networkIdentity == null) - networkIdentity = gameObject.AddComponent(); + networkIdentity = gameObject.AddComponent(); - UnityEngine.Networking.NetworkTransform networkTransform = gameObject.GetComponent(); + Unity.Netcode.Components.NetworkTransform networkTransform = gameObject.GetComponent(); if (networkTransform == null) - networkTransform = gameObject.AddComponent(); + networkTransform = gameObject.AddComponent(); CleanupNetworkTransformPun(gameObject); CleanupNetworkTransformMirror(gameObject); -#pragma warning restore 0618 #endif } - protected static void CleanupNetworkTransformUnet(GameObject gameObject) { -#if !UNITY_2019_1_OR_NEWER -#pragma warning disable 0618 - UnityEngine.Networking.NetworkTransform networkTransform = gameObject.GetComponent(); + protected static void CleanupNetworkTransformNetcode(GameObject gameObject) { +#if !hNETCODE + Unity.Netcode.Components.NetworkTransform networkTransform = gameObject.GetComponent(); if (networkTransform != null) DestroyComponent(networkTransform); - UnityEngine.Networking.NetworkIdentity networkIdentity = gameObject.GetComponent(); + Unity.Netcode.NetworkObject networkIdentity = gameObject.GetComponent(); if (networkIdentity != null) DestroyComponent(networkIdentity); -#pragma warning restore 0618 #endif } - #endregion + + #endregion Netcode #region Photon PUN @@ -92,7 +89,7 @@ namespace Passer { photonView.ObservedComponents.Add(transformView); } - CleanupNetworkTransformUnet(gameObject); + CleanupNetworkTransformNetcode(gameObject); CleanupNetworkTransformMirror(gameObject); #elif hPHOTON2 Photon.Pun.PhotonView photonView = gameObject.GetComponent(); @@ -111,7 +108,7 @@ namespace Passer { photonView.ObservedComponents.Add(transformView); } - CleanupNetworkTransformUnet(gameObject); + CleanupNetworkTransformNetcode(gameObject); CleanupNetworkTransformMirror(gameObject); #endif #endif @@ -143,7 +140,7 @@ namespace Passer { protected static void CheckNetworkTransformBolt(GameObject gameObject) { #if hNW_BOLT && hBOLT - CleanupNetworkTransformUnet(gameObject); + CleanupNetworkTransformNetcode(gameObject); CleanupNetworkTransformPun(gameObject); CleanupNetworkTransformMirror(gameObject); #endif @@ -163,7 +160,7 @@ namespace Passer { if (networkTransform == null) networkTransform = gameObject.AddComponent(); - CleanupNetworkTransformUnet(gameObject); + CleanupNetworkTransformNetcode(gameObject); CleanupNetworkTransformPun(gameObject); #endif } diff --git a/Editor/Tools/Networking/NetworkingStarter_Editor.cs b/Editor/Tools/Networking/NetworkingStarter_Editor.cs index c039ad2..aca74d2 100644 --- a/Editor/Tools/Networking/NetworkingStarter_Editor.cs +++ b/Editor/Tools/Networking/NetworkingStarter_Editor.cs @@ -87,14 +87,16 @@ namespace Passer.Humanoid { } private void ServerTypeInspector() { -#if !hNETCODE SerializedProperty serverTypeProp = serializedObject.FindProperty("serverType"); +#if !hNETCODE serverTypeProp.intValue = (int)(NetworkingStarter.ServerType)EditorGUILayout.EnumPopup("Server Type", (NetworkingStarter.ServerType)serverTypeProp.intValue); if ((NetworkingStarter.ServerType)serverTypeProp.intValue == NetworkingStarter.ServerType.CloudServer) CloudServerInspector(); else +#else + serverTypeProp.intValue = (int)NetworkingStarter.ServerType.OwnServer; #endif - OwnServerInspector(); + OwnServerInspector(); } private void CloudServerInspector() { diff --git a/Runtime/HumanoidControl/Prefabs/Networking/Resources/HumanoidPlayer.prefab b/Runtime/HumanoidControl/Prefabs/Networking/Resources/HumanoidPlayer.prefab index d2e4210..02e0007 100644 --- a/Runtime/HumanoidControl/Prefabs/Networking/Resources/HumanoidPlayer.prefab +++ b/Runtime/HumanoidControl/Prefabs/Networking/Resources/HumanoidPlayer.prefab @@ -69,6 +69,7 @@ MonoBehaviour: _syncFingerSwing: 0 _syncFace: 0 _syncTracking: 0 - _debug: 0 + _debug: 1 _sendRate: 25 - _createLocalRemotes: 0 + _createLocalRemotes: 1 + _localRemotePosition: {x: 0, y: 0, z: 1} diff --git a/Runtime/HumanoidControl/Scripts/Networking/HumanoidNetworking.cs b/Runtime/HumanoidControl/Scripts/Networking/HumanoidNetworking.cs index 1181175..e629262 100644 --- a/Runtime/HumanoidControl/Scripts/Networking/HumanoidNetworking.cs +++ b/Runtime/HumanoidControl/Scripts/Networking/HumanoidNetworking.cs @@ -1739,7 +1739,7 @@ namespace Passer.Humanoid { } public static void DisableNetworkSync(GameObject obj) { -#if hNW_UNET || hNW_PHOTON || hNW_BOLT || hNW_MIRROR +#if hNETCODE || hNW_PHOTON || hNW_BOLT || hNW_MIRROR HumanoidPlayer.DisableNetworkSync(obj); #endif } diff --git a/Runtime/HumanoidControl/Scripts/Networking/Netcode/HumanoidPlayerNetcode.cs b/Runtime/HumanoidControl/Scripts/Networking/Netcode/HumanoidPlayerNetcode.cs index 3bceb28..4e9b0fe 100644 --- a/Runtime/HumanoidControl/Scripts/Networking/Netcode/HumanoidPlayerNetcode.cs +++ b/Runtime/HumanoidControl/Scripts/Networking/Netcode/HumanoidPlayerNetcode.cs @@ -92,7 +92,7 @@ namespace Passer.Humanoid { get { return _createLocalRemotes; } set { _createLocalRemotes = value; } } - protected Vector3 _localRemotePosition = new(0, 0, -1); + public Vector3 _localRemotePosition = new(0, 0, -1); public Vector3 localRemotePosition { get { return _localRemotePosition; } } @@ -373,7 +373,7 @@ namespace Passer.Humanoid { ReceiveDestroyHumanoidRpc(data); } - [Rpc(SendTo.NotServer)] + [Rpc(SendTo.NotOwner)] private void ReceiveDestroyHumanoidRpc(byte[] data) { this.ReceiveDestroy(data); } @@ -423,7 +423,7 @@ namespace Passer.Humanoid { ulong objIdentity = GetObjectIdentity(obj); if (objIdentity == 0) { if (debug <= HumanoidNetworking.DebugLevel.Error) - Debug.LogError("Grabbed object " + obj + " does not have a network identity"); + Debug.LogError("Grabbed object " + obj + " does not have a NetworkObject"); return; } @@ -483,7 +483,7 @@ namespace Passer.Humanoid { ReceiveChangeAvatarRpc(data); } - [Rpc(SendTo.NotServer)] + [Rpc(SendTo.NotOwner)] protected virtual void ReceiveChangeAvatarRpc(byte[] data) { this.ReceiveChangeAvatar(data); } @@ -529,6 +529,9 @@ namespace Passer.Humanoid { if (networkTransform != null) { networkTransform.enabled = true; } + if (obj.TryGetComponent(out Unity.Netcode.NetworkObject networkObject)) + networkObject.enabled = true; + //obj.AddComponent(); } public static void DisableNetworkSync(GameObject obj) { @@ -536,6 +539,9 @@ namespace Passer.Humanoid { if (networkTransform != null) { networkTransform.enabled = false; } + if (obj.TryGetComponent(out Unity.Netcode.NetworkObject networkObject)) + //DestroyImmediate(networkObject, true); + networkObject.enabled = false; } #endregion Network Sync diff --git a/Runtime/HumanoidControl/Scripts/Networking/Netcode/NetcodeStarter.cs b/Runtime/HumanoidControl/Scripts/Networking/Netcode/NetcodeStarter.cs index 14b4d7d..c32e56f 100644 --- a/Runtime/HumanoidControl/Scripts/Networking/Netcode/NetcodeStarter.cs +++ b/Runtime/HumanoidControl/Scripts/Networking/Netcode/NetcodeStarter.cs @@ -6,15 +6,8 @@ using Unity.Netcode.Transports.UTP; namespace Passer { public class NetcodeStarter : INetworkingStarter { - private string roomName; - private int gameVersion; - public ushort serverPort; - bool matchCreated; - private NetworkManager networkManager; - //private NetworkMatch networkMatch; - GameObject INetworkingStarter.GetHumanoidPrefab() { GameObject humanoidPrefab = Resources.Load("HumanoidPlayer"); return humanoidPrefab; @@ -28,100 +21,32 @@ namespace Passer { return; } - //networkManager.StartHost(); NetworkManager.Singleton.StartHost(); } void INetworkingStarter.StartClient(NetworkingStarter nwStarter) { Debug.Log("start Netcode Client"); - //NetworkManager networkManager = nwStarter.GetComponent(); NetworkManager.Singleton.GetComponent().SetConnectionData( nwStarter.serverIpAddress, nwStarter.serverPort ); - //NetworkClient nwClient = NetworkManager.Singleton.StartClient(); } public static void StartClient(string serverIpAddress, ushort serverPort) { Debug.Log("start Netcode Client"); - //NetworkManager networkManager = Object.FindObjectOfType(); - //NetworkClient nwClient = NetworkManager.Singleton.StartClient(); NetworkManager.Singleton.GetComponent().SetConnectionData( serverIpAddress, serverPort ); - } void INetworkingStarter.StartClient(NetworkingStarter networking, string _roomName, int _gameVersion) { - roomName = _roomName; - gameVersion = _gameVersion; - - //networkMatch = networking.gameObject.AddComponent(); - //networkManager = networking.GetComponent(); - - //networkMatch.ListMatches(0, 10, "", true, 0, gameVersion, OnMatchList); } public void StopClient() {; } -#region Events - /* - public void OnMatchList(bool success, string extendedInfo, List matches) { - if (success && matches != null) { - int foundRoom = -1; - for (int i = 0; i < matches.Count; i++) { - if (matches[i].name == roomName) - foundRoom = i; - } - - if (foundRoom == -1) { - networkMatch.CreateMatch(roomName, 1000, true, "", "", "", 0, gameVersion, OnMatchCreated); - } - else { - networkMatch.JoinMatch(matches[foundRoom].networkId, "", "", "", 0, 0, OnMatchJoined); - - } - } - else if (!success) { - Debug.LogError("List match failed: " + extendedInfo); - } - } - - public void OnMatchCreated(bool success, string extendedInfo, MatchInfo matchInfo) { - if (success) { - matchCreated = true; - networkManager.StartHost(matchInfo); - } - else { - Debug.LogError("Create match failed: " + extendedInfo); - } - } - - //bool joined; - public void OnMatchJoined(bool success, string extendedInfo, MatchInfo matchInfo) { - if (success) { - if (matchCreated) { - Debug.LogWarning("Match already set up, aborting..."); - return; - } - //joined = true; - NetworkClient nwClient = networkManager.StartClient(matchInfo); -#if UNITY_WSA_10_0 && !UNITY_EDITOR - //nwClient.Connect(matchInfo); not supported on WSA... -#else - nwClient.Connect(matchInfo); -#endif - } - else { - Debug.LogError("Join match failed " + extendedInfo); - } - } - */ -#endregion } } -#pragma warning restore 0618 #endif diff --git a/Runtime/HumanoidControl/Scripts/Physics/HandSocket.cs b/Runtime/HumanoidControl/Scripts/Physics/HandSocket.cs index 7993853..0857c8f 100644 --- a/Runtime/HumanoidControl/Scripts/Physics/HandSocket.cs +++ b/Runtime/HumanoidControl/Scripts/Physics/HandSocket.cs @@ -208,9 +208,10 @@ namespace Passer.Humanoid { if (thisRigidbody != null) MassRedistribution(thisRigidbody, objRigidbody); + HumanoidNetworking.DisableNetworkSync(attachedTransform.gameObject); + RigidbodyDisabled.ParentRigidbody(this.transform, objRigidbody); - HumanoidNetworking.DisableNetworkSync(attachedTransform.gameObject); if (!handTarget.humanoid.isRemote) { //Debug.Log("Take Ownership"); HumanoidNetworking.TakeOwnership(attachedTransform.gameObject); diff --git a/Samples~/GroceryStore/Prefabs/Objects/FrontDoor.prefab b/Samples~/GroceryStore/Prefabs/Objects/FrontDoor.prefab index 7fe47a8..6cd89cb 100644 --- a/Samples~/GroceryStore/Prefabs/Objects/FrontDoor.prefab +++ b/Samples~/GroceryStore/Prefabs/Objects/FrontDoor.prefab @@ -25,7 +25,6 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7892756138826494427} - serializedVersion: 2 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} @@ -33,6 +32,7 @@ Transform: m_Children: - {fileID: 973431165103374093} m_Father: {fileID: 0} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &7892756138826494428 Rigidbody: @@ -41,21 +41,10 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7892756138826494427} - serializedVersion: 4 + serializedVersion: 2 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 m_UseGravity: 0 m_IsKinematic: 0 m_Interpolate: 0 @@ -74,7 +63,6 @@ HingeJoint: m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 m_ConnectedAnchor: {x: 0, y: 0, z: 0} - serializedVersion: 2 m_UseSpring: 1 m_Spring: spring: 1 @@ -86,8 +74,6 @@ HingeJoint: force: 0 freeSpin: 0 m_UseLimits: 1 - m_ExtendedLimits: 0 - m_UseAcceleration: 0 m_Limits: min: 0 max: 90 @@ -105,7 +91,6 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 7892756138826494426} m_Modifications: - target: {fileID: 100000, guid: 1dfbc40e43d24cf48b6be677c0d37af3, type: 3} @@ -157,12 +142,6 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 100008, guid: 1dfbc40e43d24cf48b6be677c0d37af3, type: 3} - insertIndex: -1 - addedObject: {fileID: 3866825236529853122} m_SourcePrefab: {fileID: 100100000, guid: 1dfbc40e43d24cf48b6be677c0d37af3, type: 3} --- !u!1 &973431165102875429 stripped GameObject: @@ -177,18 +156,10 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 973431165102875429} m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 m_IsTrigger: 0 - m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1.3, y: 2.9, z: 0.03} + serializedVersion: 2 + m_Size: {x: 1.3, y: 2.9, z: 0.04} m_Center: {x: -0.6417, y: 1.4585041, z: -0.015} --- !u!4 &973431165103374093 stripped Transform: diff --git a/Samples~/GroceryStore/Prefabs/Objects/Sword.prefab b/Samples~/GroceryStore/Prefabs/Objects/Sword.prefab index 91963a7..fa474b6 100644 --- a/Samples~/GroceryStore/Prefabs/Objects/Sword.prefab +++ b/Samples~/GroceryStore/Prefabs/Objects/Sword.prefab @@ -31,7 +31,6 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1637081267702634} - serializedVersion: 2 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} @@ -40,6 +39,7 @@ Transform: - {fileID: 1327642859812167675} - {fileID: 1825897792794241923} m_Father: {fileID: 0} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &54046747442775926 Rigidbody: @@ -48,21 +48,10 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1637081267702634} - serializedVersion: 4 + serializedVersion: 2 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 1 @@ -185,19 +174,11 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1637081267702634} m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 m_IsTrigger: 0 - m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 0.05, y: 0.02, z: 0.54} - m_Center: {x: 0, y: 0, z: 0.39} + serializedVersion: 2 + m_Size: {x: 0.04, y: 0.02, z: 0.54} + m_Center: {x: 0, y: 0, z: 0.38} --- !u!65 &65239915906408070 BoxCollider: m_ObjectHideFlags: 0 @@ -206,18 +187,10 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1637081267702634} m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 m_IsTrigger: 0 - m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 0.1799081, y: 0.04, z: 0.04} + serializedVersion: 2 + m_Size: {x: 0.18, y: 0.04, z: 0.02} m_Center: {x: 0, y: 0, z: 0.1} --- !u!136 &136455234883199966 CapsuleCollider: @@ -227,17 +200,8 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1637081267702634} m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 m_IsTrigger: 0 - m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 m_Radius: 0.02 m_Height: 0.15 m_Direction: 2 @@ -315,13 +279,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4775405205646088714} - serializedVersion: 2 m_LocalRotation: {x: 0.5, y: -0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4776878667147238} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: -90, z: -90} --- !u!114 &3673428933149702084 MonoBehaviour: @@ -548,7 +512,6 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 4776878667147238} m_Modifications: - target: {fileID: 100008, guid: d2b6307262acf2143b2c42bd655c4e4f, type: 3} @@ -600,9 +563,6 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d2b6307262acf2143b2c42bd655c4e4f, type: 3} --- !u!4 &1327642859812167675 stripped Transform: