feat: distributed authority sample collisions + damage [MTT-9026]

Experimental/DistributedAuthoritySample/Assets/Prefabs/Avatar.prefab

@@ -190,7 +190,7 @@ CapsuleCollider:
     m_Bits: 0
   m_LayerOverridePriority: 0
   m_IsTrigger: 0
-  m_ProvidesContacts: 0
+  m_ProvidesContacts: 1
   m_Enabled: 1
   serializedVersion: 2
   m_Radius: 0.5
@@ -213,6 +213,7 @@ GameObject:
   - component: {fileID: 4903152183366241606}
   - component: {fileID: 8197190117666738524}
   - component: {fileID: 539700041658036575}
+  - component: {fileID: 4655812346339390596}
   m_Layer: 0
   m_Name: Avatar
   m_TagString: Untagged
@@ -292,18 +293,18 @@ MonoBehaviour:
   InLocalSpace: 0
   Interpolate: 1
   SlerpPosition: 0
-  m_Rigidbody: {fileID: 4745766379562620470}
+  m_CollisionType: 1
+  m_CollisionDamage: 0
+  m_DebugCollisions: 0
+  m_DebugDamage: 0
+  m_Colliders:
+  - {fileID: 817796967242824188}
+  m_MaxAngularVelocity: 10
+  m_MaxVelocity: 10
   m_PlayerInput: {fileID: 4903152183366241606}
   m_AvatarInputs: {fileID: 8197190117666738524}
-  m_WalkSpeed: 6
-  m_SprintSpeed: 10
-  m_Acceleration: 50
-  m_DragCoefficient: 4
-  m_AirControlFactor: 0.5
-  m_JumpImpusle: 7
-  m_CustomGravityMultiplier: 2
-  m_RotationSpeed: 700
-  m_GroundCheckDistance: 1.1
+  m_AvatarInteractions: {fileID: 539700041658036575}
+  m_PhysicsPlayerController: {fileID: 4655812346339390596}
 --- !u!54 &4745766379562620470
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -312,7 +313,7 @@ Rigidbody:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5478015027486214707}
   serializedVersion: 4
-  m_Mass: 1
+  m_Mass: 10
   m_Drag: 0
   m_AngularDrag: 0.05
   m_CenterOfMass: {x: 0, y: 0, z: 0}
@@ -330,7 +331,7 @@ Rigidbody:
   m_IsKinematic: 1
   m_Interpolate: 0
   m_Constraints: 0
-  m_CollisionDetection: 0
+  m_CollisionDetection: 2
 --- !u!114 &-8100831418301897270
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -358,8 +359,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Actions: {fileID: -944628639613478452, guid: dcd1b4eb76b964f40afe6c0a3ca65c82,
-    type: 3}
+  m_Actions: {fileID: -944628639613478452, guid: dcd1b4eb76b964f40afe6c0a3ca65c82, type: 3}
   m_NotificationBehavior: 0
   m_UIInputModule: {fileID: 0}
   m_DeviceLostEvent:
@@ -389,23 +389,21 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7e9f71718dd134b14b300e378e98c718, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_InteractActionReference: {fileID: 1781555164194001046, guid: dcd1b4eb76b964f40afe6c0a3ca65c82, type: 3}
   Move: {x: 0, y: 0}
   Look: {x: 0, y: 0}
-  Jump: 0
   Sprint: 0
   AnalogMovement: 0
   CursorLocked: 1
   CursorInputForLook: 1
-  m_InteractActionReference: {fileID: 1781555164194001046, guid: dcd1b4eb76b964f40afe6c0a3ca65c82,
-    type: 3}
 --- !u!114 &539700041658036575
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5478015027486214707}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: b47efef44cef74d9ca00f4913607f988, type: 3}
   m_Name: 
@@ -415,8 +413,22 @@ MonoBehaviour:
   m_NetworkRigidbody: {fileID: -8100831418301897270}
   m_HoldTransform: {fileID: 3820763517226122587}
   m_InteractCollider: {fileID: 4881592427634173612}
-  m_MinTossForce: 5
-  m_MaxTossForce: 10
+  m_MinTossForce: 500
+  m_MaxTossForce: 1000
+--- !u!114 &4655812346339390596
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5478015027486214707}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e222c86e1ae554b699fe6d68d3cf4ba9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Rigidbody: {fileID: 4745766379562620470}
+  m_PhysicsPlayerControllerSettings: {fileID: 11400000, guid: 1dd99ce80f3e54d03b20bf78d6ff2a40, type: 2}
 --- !u!1 &9009864878170659705
 GameObject:
   m_ObjectHideFlags: 0

Experimental/DistributedAuthoritySample/Assets/Prefabs/DistributableTransferableObject.prefab

@@ -16,6 +16,7 @@ GameObject:
   - component: {fileID: -7368379283164171724}
   - component: {fileID: 6039897070700006726}
   - component: {fileID: 6689110374311511483}
+  - component: {fileID: 6961888493949678523}
   m_Layer: 7
   m_Name: DistributableTransferableObject
   m_TagString: Untagged
@@ -107,7 +108,7 @@ BoxCollider:
     m_Bits: 0
   m_LayerOverridePriority: 0
   m_IsTrigger: 0
-  m_ProvidesContacts: 0
+  m_ProvidesContacts: 1
   m_Enabled: 1
   serializedVersion: 3
   m_Size: {x: 1, y: 1, z: 1}
@@ -122,8 +123,8 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
+  m_Name:
+  m_EditorClassIdentifier:
   GlobalObjectIdHash: 2069120471
   InScenePlacedSourceGlobalObjectIdHash: 0
   DeferredDespawnTick: 0
@@ -143,7 +144,7 @@ Rigidbody:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 893974733110552042}
   serializedVersion: 4
-  m_Mass: 1
+  m_Mass: 25
   m_Drag: 0
   m_AngularDrag: 0.05
   m_CenterOfMass: {x: 0, y: 0, z: 0}
@@ -158,10 +159,10 @@ Rigidbody:
   m_ImplicitCom: 1
   m_ImplicitTensor: 1
   m_UseGravity: 1
-  m_IsKinematic: 0
+  m_IsKinematic: 1
   m_Interpolate: 0
   m_Constraints: 0
-  m_CollisionDetection: 0
+  m_CollisionDetection: 2
 --- !u!114 &6039897070700006726
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -172,8 +173,35 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 54937e94f00ab46c8ae43b81027f342c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
+  m_Name:
+  m_EditorClassIdentifier:
+--- !u!114 &6689110374311511483
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 893974733110552042}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f6c0be61502bb534f922ebb746851216, type: 3}
+  m_Name:
+  m_EditorClassIdentifier:
+  UseRigidBodyForMotion: 1
+  AutoUpdateKinematicState: 1
+  AutoSetKinematicOnDespawn: 1
+--- !u!114 &6961888493949678523
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 893974733110552042}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 496a933d305aa4e1c926bd7d19b42f46, type: 3}
+  m_Name:
+  m_EditorClassIdentifier:
   AuthorityMode: 1
   UseUnreliableDeltas: 0
   SyncPositionX: 1
@@ -194,18 +222,13 @@ MonoBehaviour:
   InLocalSpace: 0
   Interpolate: 1
   SlerpPosition: 0
---- !u!114 &6689110374311511483
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 893974733110552042}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f6c0be61502bb534f922ebb746851216, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  UseRigidBodyForMotion: 1
-  AutoUpdateKinematicState: 1
-  AutoSetKinematicOnDespawn: 1
+  m_CollisionType: 2
+  m_CollisionDamage: 5
+  m_DebugCollisions: 0
+  m_DebugDamage: 0
+  m_Colliders:
+  - {fileID: 7690746213975220858}
+  m_MaxAngularVelocity: 10
+  m_MaxVelocity: 10
+  m_StartingHealth: 100
+  m_IntangibleDurationAfterDamage: 2

Experimental/DistributedAuthoritySample/Assets/ScriptableObjects/AvatarPhysicsPlayerControllerSettings.asset

@@ -0,0 +1,23 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 48976c2ba473849eab61b8e1398b8644, type: 3}
+  m_Name: AvatarPhysicsPlayerControllerSettings
+  m_EditorClassIdentifier: 
+  WalkSpeed: 6
+  SprintSpeed: 10
+  Acceleration: 50
+  DragCoefficient: 4
+  AirControlFactor: 0.5
+  JumpImpusle: 80
+  CustomGravityMultiplier: 2
+  RotationSpeed: 13
+  GroundCheckDistance: 1.1

Experimental/DistributedAuthoritySample/Assets/Scripts/Editor/AvatarTransformEditor.cs

@@ -7,7 +7,7 @@
 namespace Unity.Multiplayer.Samples.SocialHub.Editor
 {
     [CustomEditor(typeof(AvatarTransform))]
-    class DerivedComponentEditor : UnityEditor.Editor
+    class AvatarTransformEditor : UnityEditor.Editor
     {
         public override VisualElement CreateInspectorGUI()
         {

Experimental/DistributedAuthoritySample/Assets/Scripts/Editor/DestructibleObjectEditor.cs

@@ -0,0 +1,32 @@
+using Unity.Multiplayer.Samples.SocialHub.Gameplay;
+using UnityEditor;
+using UnityEditor.UIElements;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace Unity.Multiplayer.Samples.SocialHub.Editor
+{
+    [CustomEditor(typeof(DestructibleObject))]
+    class DestructibleObjectEditor : UnityEditor.Editor
+    {
+        public override VisualElement CreateInspectorGUI()
+        {
+            // Create a new VisualElement to be the root of the inspector UI
+            var root = new VisualElement();
+
+            // Generate default inspector for AvatarTransform
+            serializedObject.Update();
+            SerializedProperty property = serializedObject.GetIterator();
+            property.NextVisible(true); // Skip the script field
+            while (property.NextVisible(false))
+            {
+                var propertyField = new PropertyField(property);
+                root.Add(propertyField);
+            }
+
+            serializedObject.ApplyModifiedProperties();
+
+            return root;
+        }
+    }
+}

Experimental/DistributedAuthoritySample/Assets/Scripts/Editor/PhysicsObjectMotionEditor.cs

@@ -0,0 +1,32 @@
+using Unity.Multiplayer.Samples.SocialHub.Physics;
+using UnityEngine;
+using UnityEditor;
+using UnityEditor.UIElements;
+using UnityEngine.UIElements;
+
+namespace Unity.Multiplayer.Samples.SocialHub.Editor
+{
+    [CustomEditor(typeof(PhysicsObjectMotion))]
+    class PhysicsObjectMotionEditor : UnityEditor.Editor
+    {
+        public override VisualElement CreateInspectorGUI()
+        {
+            // Create a new VisualElement to be the root of the inspector UI
+            var root = new VisualElement();
+
+            // Generate default inspector for AvatarTransform
+            serializedObject.Update();
+            SerializedProperty property = serializedObject.GetIterator();
+            property.NextVisible(true); // Skip the script field
+            while (property.NextVisible(false))
+            {
+                var propertyField = new PropertyField(property);
+                root.Add(propertyField);
+            }
+
+            serializedObject.ApplyModifiedProperties();
+
+            return root;
+        }
+    }
+}

Experimental/DistributedAuthoritySample/Assets/Scripts/Editor/Unity.Multiplayer.Samples.SocialHub.Editor.asmdef

@@ -2,7 +2,9 @@
     "name": "Unity.Multiplayer.Samples.SocialHub.Editor",
     "rootNamespace": "Unity.Multiplayer.Samples.SocialHub",
     "references": [
-        "GUID:8314b31eee3cc495ca4a4f078575802d"
+        "GUID:8314b31eee3cc495ca4a4f078575802d",
+        "GUID:ae1323dabfa6440b3956d4cc5239e361",
+        "GUID:9ff2150ce7d7c415a8af1fbff3dc3e6c"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Experimental/DistributedAuthoritySample/Assets/Scripts/Gameplay/AssemblyInfo.cs

@@ -1,2 +1,3 @@
 using System.Runtime.CompilerServices;
 [assembly: InternalsVisibleTo("Unity.Multiplayer.Samples.SocialHub.Player")]
+[assembly: InternalsVisibleTo("Unity.Multiplayer.Samples.SocialHub.Editor")]