arrows working with layer change

Author: fernando-cortez

Assets/BossRoom/Scripts/Server/Game/Entity/ServerProjectileLogic.cs

@@ -1,45 +1,42 @@
 using System.Collections.Generic;
-using System.IO;
 using Unity.Netcode;
 using UnityEngine;
-using BossRoom.Scripts.Shared.Net.NetworkObjectPool;
 
 namespace Unity.Multiplayer.Samples.BossRoom.Server
 {
-
     public class ServerProjectileLogic : NetworkBehaviour
     {
-        private bool m_Started = false;
+        bool m_Started;
 
         [SerializeField]
-        private NetworkProjectileState m_NetState;
+        NetworkProjectileState m_NetState;
 
         [SerializeField]
-        private SphereCollider m_OurCollider;
+        SphereCollider m_OurCollider;
 
         /// <summary>
         /// The character that created us. Can be 0 to signal that we were created generically by the server.
         /// </summary>
-        private ulong m_SpawnerId;
+        ulong m_SpawnerId;
 
         /// <summary>
         /// The data for our projectile. Indicates speed, damage, etc.
         /// </summary>
-        private ActionDescription.ProjectileInfo m_ProjectileInfo;
+        ActionDescription.ProjectileInfo m_ProjectileInfo;
 
-        private const int k_MaxCollisions = 4;
-        private const float k_WallLingerSec = 2f; //time in seconds that arrows linger after hitting a target.
-        private const float k_EnemyLingerSec = 0.2f; //time after hitting an enemy that we persist.
-        private Collider[] m_CollisionCache = new Collider[k_MaxCollisions];
+        const int k_MaxCollisions = 4;
+        const float k_WallLingerSec = 2f; //time in seconds that arrows linger after hitting a target.
+        const float k_EnemyLingerSec = 0.2f; //time after hitting an enemy that we persist.
+        Collider[] m_CollisionCache = new Collider[k_MaxCollisions];
 
         /// <summary>
         /// Time when we should destroy this arrow, in Time.time seconds.
         /// </summary>
-        private float m_DestroyAtSec;
+        float m_DestroyAtSec;
 
-        private int m_CollisionMask;  //mask containing everything we test for while moving
-        private int m_BlockerMask;    //physics mask for things that block the arrow's flight.
-        private int m_NPCLayer;
+        int m_CollisionMask;  //mask containing everything we test for while moving
+        int m_BlockerMask;    //physics mask for things that block the arrow's flight.
+        int m_NPCLayer;
 
         /// <summary>
         /// List of everyone we've hit and dealt damage to.
@@ -49,12 +46,12 @@ public class ServerProjectileLogic : NetworkBehaviour
         /// But that's fine by us! We use <c>m_HitTargets.Count</c> to tell us how many total enemies we've hit,
         /// so those nulls still count as hits.
         /// </remarks>
-        private List<GameObject> m_HitTargets = new List<GameObject>();
+        List<GameObject> m_HitTargets = new List<GameObject>();
 
         /// <summary>
         /// Are we done moving?
         /// </summary>
-        private bool m_IsDead;
+        bool m_IsDead;
 
         /// <summary>
         /// Set everything up based on provided projectile information.
@@ -80,12 +77,12 @@ public override void OnNetworkSpawn()
 
             m_DestroyAtSec = Time.fixedTime + (m_ProjectileInfo.Range / m_ProjectileInfo.Speed_m_s);
 
-            m_CollisionMask = LayerMask.GetMask(new[] { "NPCs", "Default", "Ground" });
-            m_BlockerMask = LayerMask.GetMask(new[] { "Default", "Ground" });
+            m_CollisionMask = LayerMask.GetMask(new[] { "NPCs", "Default", "Environment" });
+            m_BlockerMask = LayerMask.GetMask(new[] { "Default", "Environment" });
             m_NPCLayer = LayerMask.NameToLayer("NPCs");
         }
 
-        private void FixedUpdate()
+        void FixedUpdate()
         {
             if (!m_Started) { return; } //don't do anything before OnNetworkSpawn has run.
 
@@ -105,13 +102,13 @@ private void FixedUpdate()
             }
         }
 
-        private void DetectCollisions()
+        void DetectCollisions()
         {
-            Vector3 position = transform.localToWorldMatrix.MultiplyPoint(m_OurCollider.center);
-            int numCollisions = Physics.OverlapSphereNonAlloc(position, m_OurCollider.radius, m_CollisionCache, m_CollisionMask);
+            var position = transform.localToWorldMatrix.MultiplyPoint(m_OurCollider.center);
+            var numCollisions = Physics.OverlapSphereNonAlloc(position, m_OurCollider.radius, m_CollisionCache, m_CollisionMask);
             for (int i = 0; i < numCollisions; i++)
             {
-                int layerTest = 1 << m_CollisionCache[i].gameObject.layer;
+                var layerTest = 1 << m_CollisionCache[i].gameObject.layer;
                 if ((layerTest & m_BlockerMask) != 0)
                 {
                     //hit a wall; leave it for a couple of seconds.
@@ -139,15 +136,16 @@ private void DetectCollisions()
                         m_NetState.RecvHitEnemyClientRPC(targetNetObj.NetworkObjectId);
 
                         //retrieve the person that created us, if he's still around.
-                        NetworkObject spawnerNet;
-                        NetworkManager.Singleton.SpawnManager.SpawnedObjects.TryGetValue(m_SpawnerId, out spawnerNet);
-                        ServerCharacter spawnerObj = spawnerNet != null ? spawnerNet.GetComponent<ServerCharacter>() : null;
+                        NetworkManager.Singleton.SpawnManager.SpawnedObjects.TryGetValue(m_SpawnerId, out var spawnerNet);
+                        var spawnerObj = spawnerNet != null ? spawnerNet.GetComponent<ServerCharacter>() : null;
 
                         m_CollisionCache[i].GetComponent<IDamageable>().ReceiveHP(spawnerObj, -m_ProjectileInfo.Damage);
                     }
 
                     if (m_IsDead)
+                    {
                         return; // don't keep examining collisions since we can't damage anybody else
+                    }
                 }
             }
         }