Feat: Pickup Ingredient Animation

Basic/ClientDriven/Assets/Prefabs/Dropzone.prefab

@@ -52,7 +52,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 25b7be589cd61419ca00249e2c87d8c7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_StartingIngredientType: 0
   currentIngredientType:
     m_InternalValue: 0
   m_ScoreTracker: {fileID: 11400000, guid: 9accfd676684d4f479855e480c5e372f, type: 2}
@@ -504,6 +503,18 @@ PrefabInstance:
       propertyPath: m_RootOrder
       value: 2
       objectReference: {fileID: 0}
+    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.6
+      objectReference: {fileID: 0}
+    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.6
+      objectReference: {fileID: 0}
+    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.6
+      objectReference: {fileID: 0}
     - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -544,6 +555,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: -45.299
       objectReference: {fileID: 0}
+    - target: {fileID: 4621998539424734916, guid: a6b33b41508134c09957e076f4d53415, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 5818429371130516787, guid: a6b33b41508134c09957e076f4d53415, type: 3}
       propertyPath: GlobalObjectIdHash
       value: 4010928100

Basic/ClientDriven/Assets/Prefabs/Ingredient.prefab

@@ -16,6 +16,7 @@ GameObject:
   - component: {fileID: 5818429371130516787}
   - component: {fileID: 5607146804455042385}
   - component: {fileID: 2549828380439460752}
+  - component: {fileID: 8102146958862450613}
   m_Layer: 6
   m_Name: Ingredient
   m_TagString: Untagged
@@ -31,8 +32,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8321201880322001125}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -11.03, y: 1.42, z: 7.558644}
-  m_LocalScale: {x: 0.75, y: 0.75, z: 0.75}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5073984626218265924}
@@ -156,6 +157,23 @@ MonoBehaviour:
   m_BlueMaterial: {fileID: 2100000, guid: b423dced7a4ac4f40a119b84a23cfc9b, type: 2}
   m_RedMaterial: {fileID: 2100000, guid: d1a9058ddc5c2461298f65541af6fcd9, type: 2}
   m_ColorMesh: {fileID: 6206319821543937579}
+--- !u!1818360608 &8102146958862450613
+PositionConstraint:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8321201880322001125}
+  m_Enabled: 1
+  m_Weight: 1
+  m_TranslationAtRest: {x: 0, y: 0, z: 0}
+  m_TranslationOffset: {x: 0, y: 0, z: 0}
+  m_AffectTranslationX: 1
+  m_AffectTranslationY: 1
+  m_AffectTranslationZ: 1
+  m_IsContraintActive: 0
+  m_IsLocked: 0
+  m_Sources: []
 --- !u!1001 &2596981318218469326
 PrefabInstance:
   m_ObjectHideFlags: 0

Basic/ClientDriven/Assets/Prefabs/PlayerArmature_Networked.prefab

@@ -1,5 +1,36 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &6707086203565642132
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7999395044045864920}
+  m_Layer: 0
+  m_Name: IngredientSocket
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7999395044045864920
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6707086203565642132}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -0.009, y: 0.307, z: 0.599}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7428674385873156833}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &7567938585585123398
 GameObject:
   m_ObjectHideFlags: 0
@@ -201,6 +232,7 @@ MonoBehaviour:
   isObjectPickedUp:
     m_InternalValue: 0
   m_LocalHeldPosition: {x: 0, y: 2.85, z: 0}
+  m_IngredientSocketTransform: {fileID: 7999395044045864920}
 --- !u!114 &5667156634780145037
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -313,3 +345,8 @@ Animator:
   m_CorrespondingSourceObject: {fileID: 6982812146204527121, guid: 64dce48905ffd9b4293e595fa6941544, type: 3}
   m_PrefabInstance: {fileID: 3616664937583670245}
   m_PrefabAsset: {fileID: 0}
+--- !u!4 &7428674385873156833 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 6135884457200830724, guid: 64dce48905ffd9b4293e595fa6941544, type: 3}
+  m_PrefabInstance: {fileID: 3616664937583670245}
+  m_PrefabAsset: {fileID: 0}

Basic/ClientDriven/Assets/Prefabs/Stove.prefab

@@ -107,7 +107,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 460129599546355757}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 1, z: 0}
+  m_LocalPosition: {x: 0, y: 0.6, z: 0}
   m_LocalScale: {x: 0.799936, y: 0.79490435, z: 0.799936}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -125,7 +125,8 @@ GameObject:
   - component: {fileID: 6565999940192035836}
   - component: {fileID: 5765646857848886134}
   - component: {fileID: 6747444258012977798}
-  m_Layer: 0
+  - component: {fileID: 4896843153810925154}
+  m_Layer: 7
   m_Name: WhiteOutside
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -197,6 +198,20 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
+--- !u!64 &4896843153810925154
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3136404555388527449}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: -5076798556035486163, guid: f6bf731373f0fc94e88c51cdddb568ec, type: 3}
 --- !u!1 &4898400489069481270
 GameObject:
   m_ObjectHideFlags: 0
@@ -208,7 +223,8 @@ GameObject:
   - component: {fileID: 1387113040238020593}
   - component: {fileID: 7869131191826614797}
   - component: {fileID: 8073109338512125780}
-  m_Layer: 0
+  - component: {fileID: 6629855978167643442}
+  m_Layer: 7
   m_Name: Clear
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -280,6 +296,20 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
+--- !u!64 &6629855978167643442
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4898400489069481270}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: -5076798556035486163, guid: f6bf731373f0fc94e88c51cdddb568ec, type: 3}
 --- !u!1 &5728885798115879677
 GameObject:
   m_ObjectHideFlags: 0
@@ -427,7 +457,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: cc801949a9a7a43eda0b39744dd74696, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  CurrentIngredientType:
+  currentIngredientType:
     m_InternalValue: 0
   m_CookingTime: 1
   m_IngredientCookingLocation: {fileID: 517486088071705859}

Basic/ClientDriven/Assets/Scripts/ClientPlayerMove.cs

@@ -73,6 +73,7 @@ void OnPickUp()
         if (m_ServerPlayerMove.isObjectPickedUp.Value)
         {
             m_ServerPlayerMove.DropObjectServerRpc();
+            m_ThirdPersonController.Holding = false;
         }
         else
         {
@@ -95,6 +96,7 @@ void OnPickUp()
                     // will be a delay between the button press and the reparenting.
                     // This delay could be hidden with some animations/sounds/VFX that would be triggered here.
                     m_ServerPlayerMove.PickupObjectServerRpc(netObj);
+                    m_ThirdPersonController.Holding = true;
                 }
             }
         }
@@ -108,4 +110,10 @@ public void SetSpawnClientRpc(Vector3 position, ClientRpcParams clientRpcParams
         m_CharacterController.enabled = true;
         gameObject.SetActive(true);
     }
+
+    [ClientRpc]
+    public void DropIngredientClientRpc(ClientRpcParams clientRpcParams = default)
+    {
+        m_ThirdPersonController.Holding = false;
+    }
 }

Basic/ClientDriven/Assets/Scripts/Dropzone.cs

@@ -1,4 +1,5 @@
 using System;
+using StarterAssets;
 using UnityEngine;
 
 public class Dropzone : ServerObjectWithIngredientType
@@ -33,5 +34,6 @@ void OnTriggerEnter(Collider other)
 
         m_ScoreTracker.Score += 1;
         ingredient.NetworkObject.Despawn(destroy: true);
+        other.GetComponentInParent<ClientPlayerMove>().DropIngredientClientRpc();
     }
 }

Basic/ClientDriven/Assets/Scripts/ServerIngredientSpawner.cs

@@ -52,7 +52,8 @@ void FixedUpdate()
             foreach (var spawnPoint in m_SpawnPoints)
             {
                 var newIngredientObject = Instantiate(m_IngredientPrefab, spawnPoint.transform.position, spawnPoint.transform.rotation);
-                newIngredientObject.transform.position = spawnPoint.transform.position;
+                newIngredientObject.transform.position = spawnPoint.transform.position +
+                    new Vector3(UnityEngine.Random.Range(-0.25f, 0.25f), 0, UnityEngine.Random.Range(-0.25f, 0.25f));
                 var ingredient = newIngredientObject.GetComponent<ServerIngredient>();
                 ingredient.NetworkObject.Spawn();
                 ingredient.currentIngredientType.Value = (IngredientType)m_RandomGenerator.Next((int)IngredientType.MAX);

Basic/ClientDriven/Assets/Scripts/ServerPlayerMove.cs

@@ -1,7 +1,9 @@
 using System;
+using StarterAssets;
 using Unity.Netcode;
 using Unity.Netcode.Components;
 using UnityEngine;
+using UnityEngine.Animations;
 
 /// <summary>
 /// Server side script to do some movements that can only be done server side with Netcode. In charge of spawning (which happens server side in Netcode)
@@ -18,7 +20,7 @@ public class ServerPlayerMove : NetworkBehaviour
     NetworkObject m_PickedUpObject;
 
     [SerializeField]
-    Vector3 m_LocalHeldPosition;
+    Transform m_IngredientSocketTransform;
 
     // DOC START HERE
     public override void OnNetworkSpawn()
@@ -55,15 +57,22 @@ public void PickupObjectServerRpc(ulong objToPickupID)
             pickUpObjectRigidbody.isKinematic = true;
             pickUpObjectRigidbody.interpolation = RigidbodyInterpolation.None;
             objectToPickup.GetComponent<NetworkTransform>().InLocalSpace = true;
-            objectToPickup.transform.localPosition = m_LocalHeldPosition;
             objectToPickup.GetComponent<ServerIngredient>().ingredientDespawned += IngredientDespawned;
             isObjectPickedUp.Value = true;
             m_PickedUpObject = objectToPickup;
+            var positionConstraint = objectToPickup.GetComponent<PositionConstraint>();
+            positionConstraint.AddSource(new ConstraintSource()
+            {
+                sourceTransform = m_IngredientSocketTransform,
+                weight = 1
+            });
+            positionConstraint.constraintActive = true;
         }
     }
 
     void IngredientDespawned()
     {
+        DropIngredient(m_PickedUpObject.gameObject);
         m_PickedUpObject = null;
         isObjectPickedUp.Value = false;
     }
@@ -79,10 +88,19 @@ public void DropObjectServerRpc()
             pickedUpObjectRigidbody.isKinematic = false;
             pickedUpObjectRigidbody.interpolation = RigidbodyInterpolation.Interpolate;
             m_PickedUpObject.GetComponent<NetworkTransform>().InLocalSpace = false;
+            DropIngredient(m_PickedUpObject.gameObject);
             m_PickedUpObject = null;
         }
 
         isObjectPickedUp.Value = false;
     }
+
+    void DropIngredient(GameObject ingredientToDrop)
+    {
+        var positionConstraint = ingredientToDrop.GetComponent<PositionConstraint>();
+        positionConstraint.RemoveSource(0);
+        positionConstraint.constraintActive = false;
+        GetComponent<ThirdPersonController>().Holding = false;
+    }
     // DOC END HERE
 }