diff --git a/Experimental/DistributedAuthoritySample/Assets/Prefabs/Avatar.prefab b/Experimental/DistributedAuthoritySample/Assets/Prefabs/Avatar.prefab index 9d1ff17f0..5ffbe80b0 100644 --- a/Experimental/DistributedAuthoritySample/Assets/Prefabs/Avatar.prefab +++ b/Experimental/DistributedAuthoritySample/Assets/Prefabs/Avatar.prefab @@ -1,202 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &2971605785670457434 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 370971123281630519} - - component: {fileID: 3081239909905841813} - - component: {fileID: 5988919140179887555} - m_Layer: 0 - m_Name: Cube - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &370971123281630519 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2971605785670457434} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.5, z: 0.5} - m_LocalScale: {x: 0.5, y: 0.2, z: 0.54218} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 527982249900556139} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &3081239909905841813 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2971605785670457434} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &5988919140179887555 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2971605785670457434} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, 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!1 &3998769334658168242 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 527982249900556139} - - component: {fileID: 5867719757342769277} - - component: {fileID: 8689654737478668655} - - component: {fileID: 817796967242824188} - m_Layer: 0 - m_Name: Capsule - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &527982249900556139 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3998769334658168242} - 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} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 370971123281630519} - m_Father: {fileID: 378099091213283077} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &5867719757342769277 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3998769334658168242} - m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &8689654737478668655 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3998769334658168242} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, 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!136 &817796967242824188 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3998769334658168242} - 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: 1 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.5 - m_Height: 2 - m_Direction: 1 - m_Center: {x: 0, y: 0, z: 0} --- !u!1 &5478015027486214707 GameObject: m_ObjectHideFlags: 0 @@ -214,6 +17,7 @@ GameObject: - component: {fileID: 8197190117666738524} - component: {fileID: 539700041658036575} - component: {fileID: 4655812346339390596} + - component: {fileID: 7543523986693376117} m_Layer: 0 m_Name: Avatar m_TagString: Untagged @@ -234,7 +38,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 527982249900556139} + - {fileID: 4085133075368149463} - {fileID: 3820763517226122587} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -250,7 +54,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} m_Name: m_EditorClassIdentifier: - GlobalObjectIdHash: 3001504883 + GlobalObjectIdHash: 2473698027 InScenePlacedSourceGlobalObjectIdHash: 0 DeferredDespawnTick: 0 Ownership: 0 @@ -298,7 +102,7 @@ MonoBehaviour: m_DebugCollisions: 0 m_DebugDamage: 0 m_Colliders: - - {fileID: 817796967242824188} + - {fileID: 36137897785899347} m_MaxAngularVelocity: 10 m_MaxVelocity: 10 m_PlayerInput: {fileID: 4903152183366241606} @@ -408,7 +212,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b47efef44cef74d9ca00f4913607f988, type: 3} m_Name: m_EditorClassIdentifier: - m_MainCollider: {fileID: 817796967242824188} + m_MainCollider: {fileID: 36137897785899347} m_AvatarInputs: {fileID: 8197190117666738524} m_NetworkRigidbody: {fileID: -8100831418301897270} m_HoldTransform: {fileID: 3820763517226122587} @@ -429,6 +233,64 @@ MonoBehaviour: m_EditorClassIdentifier: m_Rigidbody: {fileID: 4745766379562620470} m_PhysicsPlayerControllerSettings: {fileID: 11400000, guid: 1dd99ce80f3e54d03b20bf78d6ff2a40, type: 2} +--- !u!114 &7543523986693376117 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5478015027486214707} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: df477f8da5cc5436fb68de2bde7515aa, type: 3} + m_Name: + m_EditorClassIdentifier: + TransitionStateInfoList: + - IsCrossFadeExit: 0 + Layer: 0 + OriginatingState: 2081823275 + DestinationState: 125937960 + TransitionDuration: 0.1 + TriggerNameHash: 125937960 + TransitionIndex: 0 + - IsCrossFadeExit: 0 + Layer: 0 + OriginatingState: 765711723 + DestinationState: 125937960 + TransitionDuration: 0.1 + TriggerNameHash: 125937960 + TransitionIndex: 1 + - IsCrossFadeExit: 0 + Layer: 1 + OriginatingState: 753088835 + DestinationState: 1177697483 + TransitionDuration: 0.1 + TriggerNameHash: 1177697483 + TransitionIndex: 0 + - IsCrossFadeExit: 0 + Layer: 1 + OriginatingState: 961424176 + DestinationState: -802706916 + TransitionDuration: 0.1 + TriggerNameHash: -802706916 + TransitionIndex: 0 + - IsCrossFadeExit: 0 + Layer: 1 + OriginatingState: 961424176 + DestinationState: -1413593168 + TransitionDuration: 0.1 + TriggerNameHash: -1907200461 + TransitionIndex: 1 + - IsCrossFadeExit: 0 + Layer: 1 + OriginatingState: -1413593168 + DestinationState: -1907200461 + TransitionDuration: 0.1 + TriggerNameHash: -1243957561 + TransitionIndex: 0 + m_Animator: {fileID: 7006295767383679619} + m_PhysicsPlayerController: {fileID: 4655812346339390596} + m_AvatarInputs: {fileID: 8197190117666738524} --- !u!1 &9009864878170659705 GameObject: m_ObjectHideFlags: 0 @@ -455,7 +317,7 @@ Transform: m_GameObject: {fileID: 9009864878170659705} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 1.1} + m_LocalPosition: {x: 0, y: 0.65, z: 1.1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -482,3 +344,81 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!1001 &4617738848981348068 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 378099091213283077} + m_Modifications: + - target: {fileID: 4653874547743315895, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3} + propertyPath: m_ProvidesContacts + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8353930243667998089, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3} + propertyPath: m_Name + value: PigChef_RigSetup + objectReference: {fileID: 0} + - target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 4634949050256877846, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3} + - {fileID: 363683212551861616, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3} +--- !u!136 &36137897785899347 stripped +CapsuleCollider: + m_CorrespondingSourceObject: {fileID: 4653874547743315895, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3} + m_PrefabInstance: {fileID: 4617738848981348068} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4085133075368149463 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8693301772691271475, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3} + m_PrefabInstance: {fileID: 4617738848981348068} + m_PrefabAsset: {fileID: 0} +--- !u!95 &7006295767383679619 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 2391092429025954919, guid: d1d89ad5a0ed99e499fe819ca87ae4c8, type: 3} + m_PrefabInstance: {fileID: 4617738848981348068} + m_PrefabAsset: {fileID: 0} diff --git a/Experimental/DistributedAuthoritySample/Assets/Prefabs/Characters/PigChef.prefab b/Experimental/DistributedAuthoritySample/Assets/Prefabs/Characters/PigChef.prefab index b74eb8a56..e4941d5ec 100644 --- a/Experimental/DistributedAuthoritySample/Assets/Prefabs/Characters/PigChef.prefab +++ b/Experimental/DistributedAuthoritySample/Assets/Prefabs/Characters/PigChef.prefab @@ -9,7 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6742437446004126022} - m_Layer: 9 + m_Layer: 0 m_Name: LeftHandAttachment m_TagString: Untagged m_Icon: {fileID: 0} @@ -40,7 +40,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2229996005663935112} - m_Layer: 9 + m_Layer: 0 m_Name: Effects m_TagString: Untagged m_Icon: {fileID: 0} @@ -91,11 +91,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8864485096250524089, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8859834626810513326, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_RootOrder @@ -143,7 +143,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8634498408454645704, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8595871017191866967, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Enabled @@ -211,11 +211,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8207781756351287759, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8087935136301679807, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8054471524138817576, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalPosition.x @@ -287,23 +287,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -7877829953566039679, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -7684811895978977798, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -7529902317233869180, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -7511880600814054273, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -7395622424998844145, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -7312718130499789952, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -319,7 +319,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -7217930113704295683, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -7156605088127885149, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalPosition.x @@ -371,11 +371,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -6893600215050593578, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -6802729035612990765, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -6788698156879991829, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalPosition.y @@ -415,7 +415,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -6494264300979779702, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -6352306480771544293, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalPosition.x @@ -463,19 +463,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -6280525358800087612, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -6270319127326746130, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -6104642206456078300, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -6079840536405464303, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -6061108676553290627, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalPosition.x @@ -535,7 +535,7 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 5285a70e903b34942981547f69ec915b, type: 2} - target: {fileID: -5948828724568103663, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -5942939723840012475, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalRotation.w @@ -567,7 +567,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -5793421214491646943, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -5758755827412709853, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalPosition.x @@ -607,7 +607,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -5507272473414031603, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -5436760431573913131, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalRotation.w @@ -631,11 +631,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -5416993795312722452, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -5250245229191305180, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -5170437905352857731, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalRotation.w @@ -667,7 +667,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -5052730190080593058, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -4424524600484927649, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalRotation.w @@ -743,7 +743,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -4331607745720669868, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -4215639240221346515, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalPosition.x @@ -823,7 +823,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -4163726706130929188, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -4093735697823429422, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalRotation.w @@ -855,7 +855,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -3974474534433086152, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -3853004972517743296, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalPosition.x @@ -899,15 +899,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -3773912109450703981, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -3434859151203246420, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -3233172432077908933, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -3100100789999247472, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -915,19 +915,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -2790930696411478435, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -2789690856279759596, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -2785774523018559695, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -2762790855309533942, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -2670401387866497475, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalRotation.w @@ -959,7 +959,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -2659884902512990011, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -2481878564107924521, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Enabled @@ -971,7 +971,7 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 5285a70e903b34942981547f69ec915b, type: 2} - target: {fileID: -2466431279027601768, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -2428247613635587810, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalRotation.w @@ -1027,7 +1027,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -2300079869063629948, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -2121169907620178914, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalRotation.w @@ -1059,19 +1059,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -1878753385288514550, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -1876732564560850082, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -1771422745994024322, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -1728393411205085496, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -1576657136440373988, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalRotation.w @@ -1275,7 +1275,7 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: c1070bb593ecfde43bcb2ed51882c38f, type: 2} - target: {fileID: -630374115359065275, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -552033998009847853, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalPosition.y @@ -1347,7 +1347,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -156381494106281070, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: -94429984831856546, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalRotation.w @@ -1379,19 +1379,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -3380320323921502, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 48844973712467362, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 60025588278772846, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 100146220822221015, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 182470111581875476, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalRotation.w @@ -1459,7 +1459,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 286350555669655418, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 318866306700684825, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1543,7 +1543,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 520727278711501504, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 538991392088845589, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalPosition.x @@ -1567,7 +1567,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 548790613035615007, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 556640056399269889, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalRotation.w @@ -1635,7 +1635,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 660010860171475284, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Name @@ -1643,7 +1643,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_TagString @@ -1751,11 +1751,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1925426021639299269, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1951313122020409289, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1958356815571363377, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalRotation.w @@ -1787,19 +1787,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2038938815852994918, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2211365547753050000, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2328302122890637470, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2364711149812875644, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2419873259462771723, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalRotation.w @@ -1831,7 +1831,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2436349407949768019, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2490414302447971945, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: 'm_Materials.Array.data[0]' @@ -1847,7 +1847,7 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 5285a70e903b34942981547f69ec915b, type: 2} - target: {fileID: 2742891811965840690, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3060741017273451050, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1887,11 +1887,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3663076822349108321, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3726363064395837810, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4136077574930157727, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalRotation.w @@ -1935,7 +1935,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4238760908122972696, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4293376491740842094, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1979,7 +1979,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4975621476257019038, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5115573190726694332, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2015,7 +2015,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5159096369432368453, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5178407201426131324, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalRotation.w @@ -2055,27 +2055,27 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 5285a70e903b34942981547f69ec915b, type: 2} - target: {fileID: 5324172423425752238, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5332809968238436118, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5336565446662175910, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5403185158347335256, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5470293762181260107, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5664983914035411373, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5666266140867998930, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer @@ -2087,23 +2087,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5854939651966795017, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5873521796828919212, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5896563555756233989, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5920405325250982052, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6036829302101604272, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6294103071620228737, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalRotation.w @@ -2191,19 +2191,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6431915746059402383, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6469361237610124149, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6526721965983217365, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6548940402762072305, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6782355879607981421, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2219,7 +2219,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6835851363977336837, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7076459916969680095, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2295,7 +2295,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7504956452768825846, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7535686175401523409, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalRotation.w @@ -2331,7 +2331,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7714907142603424343, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7819885032995985139, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalRotation.w @@ -2511,15 +2511,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8355777335771727063, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8476617705210172908, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8486762730995365446, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8509855438106808077, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalRotation.w @@ -2587,7 +2587,7 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: c1070bb593ecfde43bcb2ed51882c38f, type: 2} - target: {fileID: 9060900421649665895, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_Layer - value: 9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9153124993310210414, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3} propertyPath: m_LocalRotation.w diff --git a/Experimental/DistributedAuthoritySample/Assets/Prefabs/RigidbodyContactEventManager.prefab b/Experimental/DistributedAuthoritySample/Assets/Prefabs/RigidbodyContactEventManager.prefab new file mode 100644 index 000000000..aa53d6613 --- /dev/null +++ b/Experimental/DistributedAuthoritySample/Assets/Prefabs/RigidbodyContactEventManager.prefab @@ -0,0 +1,46 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7886687282606479239 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2368799713959205404} + - component: {fileID: 7075381266502622120} + m_Layer: 0 + m_Name: RigidbodyContactEventManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2368799713959205404 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7886687282606479239} + 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} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7075381266502622120 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7886687282606479239} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 739e5cee846b6384988f9a47e4691836, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Experimental/DistributedAuthoritySample/Assets/Scenes/HubScene.unity.meta b/Experimental/DistributedAuthoritySample/Assets/Prefabs/RigidbodyContactEventManager.prefab.meta similarity index 63% rename from Experimental/DistributedAuthoritySample/Assets/Scenes/HubScene.unity.meta rename to Experimental/DistributedAuthoritySample/Assets/Prefabs/RigidbodyContactEventManager.prefab.meta index 9531828bc..bbc0ec192 100644 --- a/Experimental/DistributedAuthoritySample/Assets/Scenes/HubScene.unity.meta +++ b/Experimental/DistributedAuthoritySample/Assets/Prefabs/RigidbodyContactEventManager.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 99c9720ab356a0642a771bea13969a05 -DefaultImporter: +guid: 15daa314851264c32b345bc49f64b2b3 +PrefabImporter: externalObjects: {} userData: assetBundleName: diff --git a/Experimental/DistributedAuthoritySample/Assets/Scenes/HubScene.unity b/Experimental/DistributedAuthoritySample/Assets/Scenes/HubScene.unity deleted file mode 100644 index a39ad0a8f..000000000 --- a/Experimental/DistributedAuthoritySample/Assets/Scenes/HubScene.unity +++ /dev/null @@ -1,929 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!29 &1 -OcclusionCullingSettings: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_OcclusionBakeSettings: - smallestOccluder: 5 - smallestHole: 0.25 - backfaceThreshold: 100 - m_SceneGUID: 00000000000000000000000000000000 - m_OcclusionCullingData: {fileID: 0} ---- !u!104 &2 -RenderSettings: - m_ObjectHideFlags: 0 - serializedVersion: 10 - m_Fog: 0 - m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_FogMode: 3 - m_FogDensity: 0.01 - m_LinearFogStart: 0 - m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} - m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} - m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 1 - m_AmbientMode: 0 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} - m_HaloStrength: 0.5 - m_FlareStrength: 1 - m_FlareFadeSpeed: 3 - m_HaloTexture: {fileID: 0} - m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} - m_DefaultReflectionMode: 0 - m_DefaultReflectionResolution: 128 - m_ReflectionBounces: 1 - m_ReflectionIntensity: 1 - m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} - m_UseRadianceAmbientProbe: 0 ---- !u!157 &3 -LightmapSettings: - m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GISettings: - serializedVersion: 2 - m_BounceScale: 1 - m_IndirectOutputScale: 1 - m_AlbedoBoost: 1 - m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 0 - m_LightmapEditorSettings: - serializedVersion: 12 - m_Resolution: 2 - m_BakeResolution: 40 - m_AtlasSize: 1024 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_ExtractAmbientOcclusion: 0 - m_Padding: 2 - m_LightmapParameters: {fileID: 0} - m_LightmapsBakeMode: 1 - m_TextureCompression: 1 - m_ReflectionCompression: 2 - m_MixedBakeMode: 2 - m_BakeBackend: 1 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 512 - m_PVRBounces: 2 - m_PVREnvironmentSampleCount: 256 - m_PVREnvironmentReferencePointCount: 2048 - m_PVRFilteringMode: 1 - m_PVRDenoiserTypeDirect: 1 - m_PVRDenoiserTypeIndirect: 1 - m_PVRDenoiserTypeAO: 1 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVREnvironmentMIS: 1 - m_PVRCulling: 1 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} - m_LightingSettings: {fileID: 0} ---- !u!196 &4 -NavMeshSettings: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_BuildSettings: - serializedVersion: 3 - agentTypeID: 0 - agentRadius: 0.5 - agentHeight: 2 - agentSlope: 45 - agentClimb: 0.4 - ledgeDropHeight: 0 - maxJumpAcrossDistance: 0 - minRegionArea: 2 - manualCellSize: 0 - cellSize: 0.16666667 - manualTileSize: 0 - tileSize: 256 - buildHeightMesh: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 - debug: - m_Flags: 0 - m_NavMeshData: {fileID: 0} ---- !u!1001 &43234386 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalPosition.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalPosition.z - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1499607153087855347, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: GlobalObjectIdHash - value: 3505677855 - objectReference: {fileID: 0} - - target: {fileID: 1499607153087855347, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: InScenePlacedSourceGlobalObjectIdHash - value: 882396614 - objectReference: {fileID: 0} - - target: {fileID: 4843296344903462454, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_Name - value: SessionOwnerNetworkObjectSpawner (1) - objectReference: {fileID: 0} - - target: {fileID: 8817259292813230997, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_NetworkObjectToSpawn - value: - objectReference: {fileID: 5499784127695994160, guid: 1c6ec0a7b92244c349d83ba9b4a1c8ab, type: 3} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e54d55fa193a2495ea1270535da81837, type: 3} ---- !u!1001 &373304902 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalPosition.x - value: -2 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalPosition.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalPosition.z - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1499607153087855347, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: GlobalObjectIdHash - value: 910008014 - objectReference: {fileID: 0} - - target: {fileID: 1499607153087855347, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: InScenePlacedSourceGlobalObjectIdHash - value: 882396614 - objectReference: {fileID: 0} - - target: {fileID: 4843296344903462454, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_Name - value: SessionOwnerNetworkObjectSpawner (3) - objectReference: {fileID: 0} - - target: {fileID: 8817259292813230997, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_NetworkObjectToSpawn - value: - objectReference: {fileID: 5499784127695994160, guid: 1c6ec0a7b92244c349d83ba9b4a1c8ab, type: 3} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e54d55fa193a2495ea1270535da81837, type: 3} ---- !u!1 &410087039 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 410087041} - - component: {fileID: 410087040} - - component: {fileID: 410087042} - m_Layer: 0 - m_Name: Directional Light - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!108 &410087040 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 410087039} - m_Enabled: 1 - serializedVersion: 11 - m_Type: 1 - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 2 - m_Range: 10 - m_SpotAngle: 30 - m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 - m_Shadows: - m_Type: 2 - m_Resolution: -1 - m_CustomResolution: -1 - m_Strength: 1 - m_Bias: 0.05 - m_NormalBias: 0.4 - m_NearPlane: 0.2 - m_CullingMatrixOverride: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_UseCullingMatrixOverride: 0 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingLayerMask: 1 - m_Lightmapping: 4 - m_LightShadowCasterMode: 0 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ColorTemperature: 5000 - m_UseColorTemperature: 1 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} - m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 - m_ForceVisible: 0 - m_ShadowRadius: 0 - m_ShadowAngle: 0 - m_LightUnit: 1 - m_LuxAtDistance: 1 - m_EnableSpotReflector: 1 ---- !u!4 &410087041 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 410087039} - serializedVersion: 2 - m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} - m_LocalPosition: {x: 0, y: 3, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!114 &410087042 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 410087039} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Version: 3 - m_UsePipelineSettings: 1 - m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 - m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 - m_LightCookieSize: {x: 1, y: 1} - m_LightCookieOffset: {x: 0, y: 0} - m_SoftShadowQuality: 1 ---- !u!1 &832575517 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 832575519} - - component: {fileID: 832575518} - m_Layer: 0 - m_Name: Global Volume - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &832575518 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 832575517} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IsGlobal: 1 - priority: 0 - blendDistance: 0 - weight: 1 - sharedProfile: {fileID: 11400000, guid: 10fc4df2da32a41aaa32d77bc913491c, type: 2} ---- !u!4 &832575519 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 832575517} - 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} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &961771512 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalPosition.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalPosition.z - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1499607153087855347, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: GlobalObjectIdHash - value: 3782993129 - objectReference: {fileID: 0} - - target: {fileID: 1499607153087855347, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: InScenePlacedSourceGlobalObjectIdHash - value: 882396614 - objectReference: {fileID: 0} - - target: {fileID: 4843296344903462454, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_Name - value: SessionOwnerNetworkObjectSpawner (4) - objectReference: {fileID: 0} - - target: {fileID: 8817259292813230997, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_NetworkObjectToSpawn - value: - objectReference: {fileID: 5499784127695994160, guid: 1c6ec0a7b92244c349d83ba9b4a1c8ab, type: 3} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e54d55fa193a2495ea1270535da81837, type: 3} ---- !u!1 &1305680749 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1305680751} - - component: {fileID: 1305680750} - m_Layer: 0 - m_Name: RigidbodyContactEventManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1305680750 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1305680749} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 739e5cee846b6384988f9a47e4691836, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!4 &1305680751 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1305680749} - 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} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1329704198 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalPosition.x - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalPosition.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalPosition.z - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1499607153087855347, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: GlobalObjectIdHash - value: 1417850551 - objectReference: {fileID: 0} - - target: {fileID: 1499607153087855347, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: InScenePlacedSourceGlobalObjectIdHash - value: 882396614 - objectReference: {fileID: 0} - - target: {fileID: 4843296344903462454, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_Name - value: SessionOwnerNetworkObjectSpawner (5) - objectReference: {fileID: 0} - - target: {fileID: 8817259292813230997, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_NetworkObjectToSpawn - value: - objectReference: {fileID: 5499784127695994160, guid: 1c6ec0a7b92244c349d83ba9b4a1c8ab, type: 3} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e54d55fa193a2495ea1270535da81837, type: 3} ---- !u!1 &1888825843 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1888825847} - - component: {fileID: 1888825846} - - component: {fileID: 1888825845} - - component: {fileID: 1888825844} - m_Layer: 0 - m_Name: Plane - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!64 &1888825844 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1888825843} - 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: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &1888825845 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1888825843} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, 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!33 &1888825846 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1888825843} - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &1888825847 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1888825843} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 100, y: 1, z: 100} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1947161561 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalPosition.x - value: -2 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalPosition.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalPosition.z - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1499607153087855347, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: GlobalObjectIdHash - value: 2143928463 - objectReference: {fileID: 0} - - target: {fileID: 1499607153087855347, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: InScenePlacedSourceGlobalObjectIdHash - value: 882396614 - objectReference: {fileID: 0} - - target: {fileID: 4843296344903462454, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_Name - value: SessionOwnerNetworkObjectSpawner - objectReference: {fileID: 0} - - target: {fileID: 8817259292813230997, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_NetworkObjectToSpawn - value: - objectReference: {fileID: 5499784127695994160, guid: 1c6ec0a7b92244c349d83ba9b4a1c8ab, type: 3} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e54d55fa193a2495ea1270535da81837, type: 3} ---- !u!1001 &2024073102 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 8944336655422409498, guid: eb439f24fcad44d48b8231b7418345d0, type: 3} - propertyPath: m_Name - value: MainCamera - objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: eb439f24fcad44d48b8231b7418345d0, type: 3} - propertyPath: m_LocalPosition.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: eb439f24fcad44d48b8231b7418345d0, type: 3} - propertyPath: m_LocalPosition.y - value: 1.375 - objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: eb439f24fcad44d48b8231b7418345d0, type: 3} - propertyPath: m_LocalPosition.z - value: -4 - objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: eb439f24fcad44d48b8231b7418345d0, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: eb439f24fcad44d48b8231b7418345d0, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: eb439f24fcad44d48b8231b7418345d0, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: eb439f24fcad44d48b8231b7418345d0, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: eb439f24fcad44d48b8231b7418345d0, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: eb439f24fcad44d48b8231b7418345d0, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8944336655422409503, guid: eb439f24fcad44d48b8231b7418345d0, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: eb439f24fcad44d48b8231b7418345d0, type: 3} ---- !u!1001 &2029928583 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalPosition.x - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalPosition.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalPosition.z - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1258953842080244886, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1499607153087855347, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: GlobalObjectIdHash - value: 4096214831 - objectReference: {fileID: 0} - - target: {fileID: 1499607153087855347, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: InScenePlacedSourceGlobalObjectIdHash - value: 882396614 - objectReference: {fileID: 0} - - target: {fileID: 4843296344903462454, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_Name - value: SessionOwnerNetworkObjectSpawner (2) - objectReference: {fileID: 0} - - target: {fileID: 8817259292813230997, guid: e54d55fa193a2495ea1270535da81837, type: 3} - propertyPath: m_NetworkObjectToSpawn - value: - objectReference: {fileID: 5499784127695994160, guid: 1c6ec0a7b92244c349d83ba9b4a1c8ab, type: 3} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e54d55fa193a2495ea1270535da81837, type: 3} ---- !u!1660057539 &9223372036854775807 -SceneRoots: - m_ObjectHideFlags: 0 - m_Roots: - - {fileID: 410087041} - - {fileID: 832575519} - - {fileID: 2024073102} - - {fileID: 1888825847} - - {fileID: 1305680751} - - {fileID: 1947161561} - - {fileID: 43234386} - - {fileID: 2029928583} - - {fileID: 373304902} - - {fileID: 961771512} - - {fileID: 1329704198} diff --git a/Experimental/DistributedAuthoritySample/Assets/Scenes/HubScene_TownMarket.unity b/Experimental/DistributedAuthoritySample/Assets/Scenes/HubScene_TownMarket.unity index e54d88811..34cb84d76 100644 --- a/Experimental/DistributedAuthoritySample/Assets/Scenes/HubScene_TownMarket.unity +++ b/Experimental/DistributedAuthoritySample/Assets/Scenes/HubScene_TownMarket.unity @@ -908,6 +908,63 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 0 +--- !u!1001 &1654236494 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2368799713959205404, guid: 15daa314851264c32b345bc49f64b2b3, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2368799713959205404, guid: 15daa314851264c32b345bc49f64b2b3, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2368799713959205404, guid: 15daa314851264c32b345bc49f64b2b3, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2368799713959205404, guid: 15daa314851264c32b345bc49f64b2b3, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2368799713959205404, guid: 15daa314851264c32b345bc49f64b2b3, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2368799713959205404, guid: 15daa314851264c32b345bc49f64b2b3, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2368799713959205404, guid: 15daa314851264c32b345bc49f64b2b3, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2368799713959205404, guid: 15daa314851264c32b345bc49f64b2b3, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2368799713959205404, guid: 15daa314851264c32b345bc49f64b2b3, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2368799713959205404, guid: 15daa314851264c32b345bc49f64b2b3, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7886687282606479239, guid: 15daa314851264c32b345bc49f64b2b3, type: 3} + propertyPath: m_Name + value: RigidbodyContactEventManager + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 15daa314851264c32b345bc49f64b2b3, type: 3} --- !u!1 &1707098245 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1250008963122337650, guid: 4353311a03fb2472fbb8f97f805bd1bd, type: 3} @@ -1106,8 +1163,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1980210465} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalRotation: {x: 0.3268269, y: -0.017009942, z: 0.0058833873, w: 0.9449128} + m_LocalPosition: {x: 53.11175, y: 16.357758, z: -18.331333} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -301208,3 +301265,4 @@ SceneRoots: - {fileID: 371548743} - {fileID: 5998245310533533758} - {fileID: 816051787} + - {fileID: 1654236494} diff --git a/Experimental/DistributedAuthoritySample/Assets/Scripts/Physics/PhysicsPlayerController.cs b/Experimental/DistributedAuthoritySample/Assets/Scripts/Physics/PhysicsPlayerController.cs index df68b2b8a..d8f1710ea 100644 --- a/Experimental/DistributedAuthoritySample/Assets/Scripts/Physics/PhysicsPlayerController.cs +++ b/Experimental/DistributedAuthoritySample/Assets/Scripts/Physics/PhysicsPlayerController.cs @@ -1,4 +1,5 @@ using UnityEngine; +using System; namespace Unity.Multiplayer.Samples.SocialHub.Physics { @@ -12,7 +13,8 @@ class PhysicsPlayerController : MonoBehaviour PhysicsPlayerControllerSettings m_PhysicsPlayerControllerSettings; // cached grounded check - bool m_IsGrounded; + internal bool Grounded { get; private set; } + RaycastHit[] m_RaycastHits = new RaycastHit[1]; Ray m_Ray; @@ -20,6 +22,8 @@ class PhysicsPlayerController : MonoBehaviour bool m_Jump; bool m_Sprint; + internal event Action PlayerJumped; + internal void OnFixedUpdate() { if (m_Rigidbody != null && m_Rigidbody.isKinematic) @@ -40,7 +44,7 @@ internal void OnFixedUpdate() void UpdateGroundedStatus() { - m_IsGrounded = IsGrounded(); + Grounded = IsGrounded(); } bool IsGrounded() @@ -63,7 +67,7 @@ void ApplyMovement() var targetVelocity = new Vector3(desiredVelocity.x, velocity.y, desiredVelocity.z); var velocityChange = targetVelocity - velocity; - if (m_IsGrounded) + if (Grounded) { // Apply force proportional to acceleration while grounded var force = velocityChange * m_PhysicsPlayerControllerSettings.Acceleration; @@ -87,9 +91,10 @@ void ApplyMovement() void ApplyJump() { - if (m_Jump && m_IsGrounded) + if (m_Jump && Grounded) { m_Rigidbody.AddForce(Vector3.up * m_PhysicsPlayerControllerSettings.JumpImpusle, ForceMode.Impulse); + PlayerJumped?.Invoke(); } m_Jump = false; } diff --git a/Experimental/DistributedAuthoritySample/Assets/Scripts/Player/AvatarInteractions.cs b/Experimental/DistributedAuthoritySample/Assets/Scripts/Player/AvatarInteractions.cs index e5daee9a8..a7251bb57 100644 --- a/Experimental/DistributedAuthoritySample/Assets/Scripts/Player/AvatarInteractions.cs +++ b/Experimental/DistributedAuthoritySample/Assets/Scripts/Player/AvatarInteractions.cs @@ -48,6 +48,9 @@ void Awake() public override void OnNetworkSpawn() { base.OnNetworkSpawn(); + + m_InteractCollider.enabled = HasAuthority; + if (!HasAuthority) { return; diff --git a/Experimental/DistributedAuthoritySample/Assets/Scripts/Player/AvatarNetworkAnimator.cs b/Experimental/DistributedAuthoritySample/Assets/Scripts/Player/AvatarNetworkAnimator.cs new file mode 100644 index 000000000..e235c0eef --- /dev/null +++ b/Experimental/DistributedAuthoritySample/Assets/Scripts/Player/AvatarNetworkAnimator.cs @@ -0,0 +1,59 @@ +using Unity.Multiplayer.Samples.SocialHub.Input; +using Unity.Multiplayer.Samples.SocialHub.Physics; +using Unity.Netcode.Components; +using UnityEngine; + +namespace Unity.Multiplayer.Samples.SocialHub.Player +{ + [RequireComponent(typeof(PhysicsPlayerController))] + class AvatarNetworkAnimator : NetworkAnimator + { + [SerializeField] + PhysicsPlayerController m_PhysicsPlayerController; + + [SerializeField] + AvatarInputs m_AvatarInputs; + + static readonly int k_GroundedId = Animator.StringToHash("Grounded"); + static readonly int k_MoveId = Animator.StringToHash("Move"); + static readonly int k_JumpId = Animator.StringToHash("Jump"); + + protected override bool OnIsServerAuthoritative() + { + return false; + } + + public override void OnNetworkSpawn() + { + base.OnNetworkSpawn(); + + m_PhysicsPlayerController.PlayerJumped += OnPlayerJumped; + } + + public override void OnNetworkDespawn() + { + base.OnNetworkDespawn(); + + if (m_PhysicsPlayerController) + { + m_PhysicsPlayerController.PlayerJumped -= OnPlayerJumped; + } + } + + void OnPlayerJumped() + { + SetTrigger(k_JumpId); + } + + void LateUpdate() + { + if (!HasAuthority) + { + return; + } + + Animator.SetBool(k_GroundedId, m_PhysicsPlayerController.Grounded); + Animator.SetFloat(k_MoveId, m_AvatarInputs.Move.magnitude * (m_AvatarInputs.Sprint ? 2f : 1f)); + } + } +} diff --git a/Experimental/DistributedAuthoritySample/Assets/Scripts/Player/AvatarNetworkAnimator.cs.meta b/Experimental/DistributedAuthoritySample/Assets/Scripts/Player/AvatarNetworkAnimator.cs.meta new file mode 100644 index 000000000..17467aafe --- /dev/null +++ b/Experimental/DistributedAuthoritySample/Assets/Scripts/Player/AvatarNetworkAnimator.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: df477f8da5cc5436fb68de2bde7515aa \ No newline at end of file diff --git a/Experimental/DistributedAuthoritySample/Assets/Scripts/Player/AvatarTransform.cs b/Experimental/DistributedAuthoritySample/Assets/Scripts/Player/AvatarTransform.cs index 67b9e2b17..e6fe04bd6 100644 --- a/Experimental/DistributedAuthoritySample/Assets/Scripts/Player/AvatarTransform.cs +++ b/Experimental/DistributedAuthoritySample/Assets/Scripts/Player/AvatarTransform.cs @@ -39,10 +39,9 @@ public override void OnNetworkSpawn() // Freeze rotation on the x and z axes to prevent toppling Rigidbody.freezeRotation = true; - - var spawnPosition = new Vector3(0f, 1.5f, 0f); - transform.SetPositionAndRotation(position: spawnPosition, rotation: Quaternion.identity); - Rigidbody.position = spawnPosition; + // TODO: MTT-8899 fetch spawn point + var spawnPosition = new Vector3(51.4228516f,8.88483906f,-11.031064f); + Teleport(spawnPosition, Quaternion.identity, Vector3.one); Rigidbody.linearVelocity = Vector3.zero; this.RegisterNetworkUpdate(updateStage: NetworkUpdateStage.Update); diff --git a/Experimental/DistributedAuthoritySample/Assets/Scripts/Temp/ServicesHelper.cs b/Experimental/DistributedAuthoritySample/Assets/Scripts/Temp/ServicesHelper.cs index 56cbdd84a..aca9e2d2f 100644 --- a/Experimental/DistributedAuthoritySample/Assets/Scripts/Temp/ServicesHelper.cs +++ b/Experimental/DistributedAuthoritySample/Assets/Scripts/Temp/ServicesHelper.cs @@ -68,7 +68,7 @@ void LoadMenuScene() void LoadHubScene() { - SceneManager.LoadScene("HubScene"); + SceneManager.LoadScene("HubScene_TownMarket"); } async void Login() diff --git a/Experimental/DistributedAuthoritySample/ProjectSettings/EditorBuildSettings.asset b/Experimental/DistributedAuthoritySample/ProjectSettings/EditorBuildSettings.asset index 9987862b0..c6e221f80 100644 --- a/Experimental/DistributedAuthoritySample/ProjectSettings/EditorBuildSettings.asset +++ b/Experimental/DistributedAuthoritySample/ProjectSettings/EditorBuildSettings.asset @@ -12,8 +12,8 @@ EditorBuildSettings: path: Assets/Scenes/MainMenu.unity guid: 00dfb9d65b7674d4cae5dfd318611cbe - enabled: 1 - path: Assets/Scenes/HubScene.unity - guid: 99c9720ab356a0642a771bea13969a05 + path: Assets/Scenes/HubScene_TownMarket.unity + guid: ae62e5a72be626748a06596073ba9b0a m_configObjects: com.unity.input.settings: {fileID: 11400000, guid: 9e7be553448fa2546aea5752021cbcf7, type: 2} com.unity.input.settings.actions: {fileID: -944628639613478452, guid: dcd1b4eb76b964f40afe6c0a3ca65c82, type: 3}