UnityLayerとPhysicsLayerのCollision設定が正常に行われないバグを修正

Author: a3geek

Assets/PhysicsLayers/Example/PhysicsLayers.unity

@@ -24,8 +24,8 @@ public abstract class AbstractCollisionCallbacks : MonoBehaviour
         protected virtual void Awake()
         {
             this.ignoreLayers = LayersManager.Instance
-                .GetIgnoreLayers(this.LayerID)
-                .Values
+                .GetIgnoreLayerIDs(this.LayerID)
+                .Select(layerID => LayersManager.Instance.LayerToName(layerID))
                 .ToList();
         }
 

Assets/PhysicsLayers/Example/Scripts/Abstracts/AbstractCollisionCallbacks.cs

@@ -44,7 +44,7 @@ public IEnumerable<LayerCollision> GetEnumerable()
                 yield return this.collisions[i];
             }
         }
-
+        
         public bool DeleteLayerCollision(int layerID)
         {
             return this.collisions.Remove(this[layerID]);

Assets/PhysicsLayers/Scripts/Components/PhysicsLayer.cs

@@ -76,12 +76,10 @@ public override int NameToLayer(string layerName)
 
         public override IEnumerable<UnityLayer> GetEnumerable()
         {
-            for(var i = 0; i < this.layers.Count; i++)
+            var layers = this.ValidateLayers;
+            foreach(var layer in layers)
             {
-                if(string.IsNullOrEmpty(this.layers[i].LayerName) == false)
-                {
-                    yield return this.layers[i];
-                }
+                yield return layer;
             }
         }
 

Assets/PhysicsLayers/Scripts/Components/UnityLayerInfos.cs

@@ -82,26 +82,15 @@ private int SetIgnoreCollisions<T1, T2>(T1 layer, Dictionary<int, List<T2>> laye
 
             this.CheckDicKey(layerID);
 
-            if(layerID < UnityLayerCount)
-            {
-                return layerID;
-            }
-
-            var physicsLayer = this.PhysicsLayerInfos[layerID];
-            if(physicsLayer == null)
-            {
-                return -1;
-            }
-
-            var ignoreLayers = this.GetIgnoreLayers(layerID);
-            if(ignoreLayers.Count <= 0)
+            var ignoreLayers = this.GetIgnoreLayerIDs(layerID);
+            if(ignoreLayers.Count() <= 0)
             {
                 return layerID;
             }
 
             foreach(var pair in layersDic)
             {
-                if(ignoreLayers.ContainsKey(pair.Key) == false)
+                if(ignoreLayers.Contains(pair.Key) == false)
                 {
                     continue;
                 }

Assets/PhysicsLayers/Scripts/LayersManager.Managements.cs

@@ -77,13 +77,23 @@ public IEnumerable<string> UnityLayerNames
         private UnityLayerInfos unityLayerInfos = new UnityLayerInfos();
 
 
-        public Dictionary<int, string> GetIgnoreLayers(int layerID)
+        public IEnumerable<int> GetIgnoreLayerIDs(int layerID)
         {
-            var infos = this.PhysicsLayerInfos[layerID];
+            if(layerID >= 0 && layerID < UnityLayerCount)
+            {
+                return this.PhysicsLayerInfos.GetEnumerable()
+                    .Where(layer =>
+                    {
+                        var layerCollision = layer[layerID];
+                        return layerCollision != null && layerCollision.Collision == false;
+                    })
+                    .Select(layer => layer.LayerID);
+            }
 
-            return infos == null ? new Dictionary<int, string>() : infos.GetEnumerable()
-                .Where(info => info.Collision == false)
-                .ToDictionary(info => info.LayerID, info => this.LayerToName(info.LayerID));
+            var physicsLayer = this.PhysicsLayerInfos[layerID];
+            return physicsLayer == null ? new List<int>() : physicsLayer.GetEnumerable()
+                .Where(layerCollision => layerCollision.Collision == false)
+                .Select(layerCollision => layerCollision.LayerID);
         }
 
         public bool IsPhysicsLayer(int layerID)

Assets/PhysicsLayers/Scripts/LayersManager.cs

@@ -1 +1 @@
-2.3.0
+2.3.1