fix: UnmaskRaycastFilter not working anymore

close #29
mob-sakai · Oct 25, 2023 · 14ab505 · 14ab505
1 parent a276ef6
commit 14ab505
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/Scripts/Editor/MenuOptions.cs b/Scripts/Editor/MenuOptions.cs
@@ -23,9 +23,6 @@ private static void CreateTutorialButton2(MenuCommand menuCommand)
             unmask.fitTarget = button.transform as RectTransform;
             unmask.fitOnLateUpdate = true;
 
-            var screen = unmaskedPanel.transform.Find("Screen").GetComponent<Image>();
-            screen.gameObject.AddComponent<UnmaskRaycastFilter>().targetUnmask = unmask;
-
             Selection.activeGameObject = button.gameObject;
         }
 
@@ -37,6 +34,12 @@ private static void CreateTransition(MenuCommand menuCommand)
             Selection.activeGameObject = unmaskedPanel;
         }
 
+        [MenuItem("GameObject/UI/Unmask/Unmasked Panel")]
+        private static GameObject CreateUnmaskedPanel(MenuCommand menuCommand)
+        {
+            return CreateUnmaskedPanel(AssetDatabase.GetBuiltinExtraResource<Sprite>("UI/Skin/UISprite.psd"), Image.Type.Sliced);
+        }
+
         private static GameObject CreateUnmaskedPanel(Sprite unmaskSprite, Image.Type spriteType)
         {
             EditorApplication.ExecuteMenuItem("GameObject/UI/Panel");
@@ -51,6 +54,8 @@ private static GameObject CreateUnmaskedPanel(Sprite unmaskSprite, Image.Type sp
             unmask.transform.SetParent(mask.transform);
             unmask.GetComponent<Image>().sprite = AssetDatabase.GetBuiltinExtraResource<Sprite>("UI/Skin/UISprite.psd");
 
+            mask.gameObject.AddComponent<UnmaskRaycastFilter>().targetUnmask = unmask;
+
             var image = unmask.GetComponent<Image>();
             image.sprite = unmaskSprite;
             image.type = spriteType;
@@ -65,4 +70,4 @@ private static GameObject CreateUnmaskedPanel(Sprite unmaskSprite, Image.Type sp
             return mask.gameObject;
         }
     }
-}
+}