restructuring of detonate message & RPC response

Author: fernando-cortez

Assets/Prefabs/Game/ImpTossAttack.prefab

@@ -94,9 +94,11 @@ GameObject:
   - component: {fileID: 5473352307376472483}
   - component: {fileID: 5473352307376472480}
   - component: {fileID: 4016230363033547097}
+  - component: {fileID: 2473823525057555519}
   - component: {fileID: 3757530492134123977}
   - component: {fileID: 6563030650317158872}
   - component: {fileID: 6687170048049847228}
+  - component: {fileID: 646432022378958216}
   - component: {fileID: 5792943200133235216}
   m_Layer: 0
   m_Name: ImpTossAttack
@@ -154,6 +156,19 @@ Rigidbody:
   m_Interpolate: 0
   m_Constraints: 0
   m_CollisionDetection: 0
+--- !u!135 &2473823525057555519
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5473352307376472481}
+  m_Material: {fileID: 13400000, guid: 89c3353bce9e81340bee4236c92eb0d8, type: 2}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Radius: 0.56
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &3757530492134123977
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -211,6 +226,36 @@ MonoBehaviour:
   m_LayerMask:
     serializedVersion: 2
     m_Bits: 72
+  detonateAfterSeconds: 5
+  detonatedRpcCallback:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 646432022378958216}
+        m_TargetAssemblyTypeName: Unity.Multiplayer.Samples.BossRoom.Client.PrefabSpawner,
+          Unity.BossRoom.Gameplay
+        m_MethodName: Spawn
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+--- !u!114 &646432022378958216
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5473352307376472481}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5e816ae7f08713f44b144bb413e3e677, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Prefab: {fileID: 2518139487072021748, guid: 1b242eb1e81644e5e8c528509ba78cb4, type: 3}
 --- !u!114 &5792943200133235216
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Prefabs/Game/ImpTossAttackGraphics.prefab

@@ -11,7 +11,6 @@ GameObject:
   - component: {fileID: 5798640841212797410}
   - component: {fileID: 1929004020738845844}
   - component: {fileID: 6578595960882027409}
-  - component: {fileID: 6074465214437177532}
   m_Layer: 0
   m_Name: ImpTossAttackGraphics
   m_TagString: Untagged
@@ -84,16 +83,3 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
---- !u!135 &6074465214437177532
-SphereCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8381232259107055460}
-  m_Material: {fileID: 13400000, guid: 89c3353bce9e81340bee4236c92eb0d8, type: 2}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Radius: 0.56
-  m_Center: {x: 0, y: 0, z: 0}

Assets/Prefabs/NetworkingManager.prefab

@@ -162,6 +162,11 @@ MonoBehaviour:
       SourcePrefabToOverride: {fileID: 0}
       SourceHashToOverride: 0
       OverridingTargetPrefab: {fileID: 0}
+    - Override: 0
+      Prefab: {fileID: 5473352307376472481, guid: 3e5c32e5766633a4eaf9e7c393418b34, type: 3}
+      SourcePrefabToOverride: {fileID: 0}
+      SourceHashToOverride: 0
+      OverridingTargetPrefab: {fileID: 0}
     TickRate: 30
     ClientConnectionBufferTimeout: 1
     ConnectionApproval: 1

Assets/Scripts/Gameplay/GameplayObjects/PrefabSpawner.cs

@@ -0,0 +1,15 @@
+using UnityEngine;
+
+namespace Unity.Multiplayer.Samples.BossRoom.Client
+{
+    public class PrefabSpawner : MonoBehaviour
+    {
+        [SerializeField]
+        GameObject m_Prefab;
+
+        public void Spawn()
+        {
+            Instantiate(m_Prefab, transform.position, transform.rotation);
+        }
+    }
+}

Assets/Scripts/Gameplay/GameplayObjects/PrefabSpawner.cs.meta

@@ -1,5 +1,6 @@
 using Unity.Netcode;
 using UnityEngine;
+using UnityEngine.Events;
 
 namespace Unity.Multiplayer.Samples.BossRoom.Server
 {
@@ -23,20 +24,20 @@ public class ServerTossAttack : NetworkBehaviour
         bool m_Started;
 
         const int k_MaxCollisions = 16;
+
         Collider[] m_CollisionCache = new Collider[k_MaxCollisions];
 
         [SerializeField]
         float detonateAfterSeconds = 5f;
 
         float m_DetonateAfterSeconds;
 
-        [SerializeField]
-        float destroyAfterSeconds = 5.5f;
-
         float m_DestroyAfterSeconds;
 
         bool m_Detonated;
 
+        public UnityEvent detonatedRpcCallback;
+
         public override void OnNetworkSpawn()
         {
             if (!IsServer)
@@ -49,7 +50,6 @@ public override void OnNetworkSpawn()
             m_Detonated = false;
 
             m_DetonateAfterSeconds = Time.fixedTime + detonateAfterSeconds;
-            m_DestroyAfterSeconds = Time.fixedTime + destroyAfterSeconds;
         }
 
         public override void OnNetworkDespawn()
@@ -76,9 +76,18 @@ void Detonate()
                 }
             }
 
+            // send client RPC to detonate on clients
+            DetonateClientRpc();
+
             m_Detonated = true;
         }
 
+        [ClientRpc]
+        void DetonateClientRpc()
+        {
+            detonatedRpcCallback?.Invoke();
+        }
+
         void FixedUpdate()
         {
             if (!m_Started)
@@ -89,11 +98,8 @@ void FixedUpdate()
             if (!m_Detonated && m_DetonateAfterSeconds < Time.fixedTime)
             {
                 Detonate();
-            }
 
-            if (m_DestroyAfterSeconds < Time.fixedTime)
-            {
-                // Time to return to the pool from whence it came.
+                // despawn after sending detonate RPC
                 var networkObject = gameObject.GetComponent<NetworkObject>();
                 networkObject.Despawn();
             }