feat: Use generic type instead

jcs090218 · jcs090218 · commit da9e0da75705 · 2025-11-27T20:41:23.000+08:00
diff --git a/Assets/JCSUnity/Editor/JCSUnity_EditorWindow.cs b/Assets/JCSUnity/Editor/JCSUnity_EditorWindow.cs
@@ -549,7 +549,8 @@ private static GameObject Create3DCurosr()
         /// </summary>
         private static GameObject CreateBasePanel()
         {
-            var canvas = JCS_Util.FindObjectByType(typeof(JCS_Canvas)) as JCS_Canvas;
+            var canvas = JCS_Util.FindObjectByType<JCS_Canvas>();
+
             if (canvas == null)
             {
                 Debug.Log("Can't find JCS_Canvas in hierarchy. Plz create canvas before creating new panel.");
@@ -577,7 +578,8 @@ private static GameObject CreateBasePanel()
         /// </summary>
         private static GameObject CreateDialoguePanel()
         {
-            var canvas = JCS_Util.FindObjectByType(typeof(JCS_Canvas)) as JCS_Canvas;
+            var canvas = JCS_Util.FindObjectByType<JCS_Canvas>();
+
             if (canvas == null)
             {
                 Debug.Log("Can't find JCS_Canvas in hierarchy. Plz create canvas before creating new panel.");
@@ -605,7 +607,7 @@ private static GameObject CreateDialoguePanel()
         /// </summary>
         private static void CreateSlidePanel()
         {
-            var canvas = JCS_Util.FindObjectByType(typeof(JCS_Canvas)) as JCS_Canvas;
+            var canvas = JCS_Util.FindObjectByType<JCS_Canvas>();
 
             if (canvas == null)
             {
@@ -680,7 +682,7 @@ private static void CreateSlidePanel()
         /// </summary>
         private static GameObject CreateTweenPanel()
         {
-            var canvas = JCS_Util.FindObjectByType(typeof(JCS_Canvas)) as JCS_Canvas;
+            var canvas = JCS_Util.FindObjectByType<JCS_Canvas>();
 
             if (canvas == null)
             {
@@ -810,7 +812,7 @@ private static GameObject CreateHierarchyObjectUnderCanvas(string settingPath)
         {
             // since this will be in the editing time.
             // so we don't worry to much about the performance.
-            var canvas = JCS_Util.FindObjectByType(typeof(JCS_Canvas)) as JCS_Canvas;
+            var canvas = JCS_Util.FindObjectByType<JCS_Canvas>();
 
             return CreateHierarchyObjectUnderCanvas(settingPath, canvas);
         }
diff --git a/Assets/JCSUnity/Scripts/Interactive/2D/Camera/JCS_2DMultiTrackCamera.cs b/Assets/JCSUnity/Scripts/Interactive/2D/Camera/JCS_2DMultiTrackCamera.cs
@@ -85,7 +85,7 @@ protected void Awake()
             mAudioListener = GetComponent<AudioListener>();
 
             // find the camera in the scene first
-            mCamera = JCS_Util.FindObjectByType(typeof(JCS_2DCamera)) as JCS_2DCamera;
+            mCamera = JCS_Util.FindObjectByType<JCS_2DCamera>();
 
             if (mCamera == null)
                 return;
diff --git a/Assets/JCSUnity/Scripts/Managers/JCS_PlayerManager.cs b/Assets/JCSUnity/Scripts/Managers/JCS_PlayerManager.cs
@@ -382,7 +382,7 @@ public JCS_Player FindPlayerByDirectionUsingList(JCS_2D4Direction direction, Lis
         public void AddAllPlayerToMultiTrack()
         {
             // find the object in the scene.
-            var mtc = JCS_Util.FindObjectByType(typeof(JCS_2DMultiTrackCamera)) as JCS_2DMultiTrackCamera;
+            var mtc = JCS_Util.FindObjectByType<JCS_2DMultiTrackCamera>();
 
             foreach (JCS_Player p in mPlayers)
             {
@@ -396,7 +396,7 @@ public void AddAllPlayerToMultiTrack()
         public void RemoveAllPlayerFromMultiTrack()
         {
             // find the object in the scene.
-            var mtc = JCS_Util.FindObjectByType(typeof(JCS_2DMultiTrackCamera)) as JCS_2DMultiTrackCamera;
+            var mtc = JCS_Util.FindObjectByType<JCS_2DMultiTrackCamera>();
 
             foreach (JCS_Player p in mPlayers)
             {
diff --git a/Assets/JCSUnity/Scripts/UI/Button/Scene/JCS_SlideScreenButton.cs b/Assets/JCSUnity/Scripts/UI/Button/Scene/JCS_SlideScreenButton.cs
@@ -84,7 +84,7 @@ protected override void Awake()
                 mSoundPlayer = GetComponent<JCS_SoundPlayer>();
 
             // try to get it from the scene by type.
-            mSlideCameras = JCS_Util.FindObjectsByType(typeof(JCS_2DSlideScreenCamera)) as JCS_2DSlideScreenCamera[];
+            mSlideCameras = JCS_Util.FindObjectsByType<JCS_2DSlideScreenCamera>();
         }
 
 #if JCS_USE_GAMEPAD
diff --git a/Assets/JCSUnity/Scripts/Util/JCS_Util.cs b/Assets/JCSUnity/Scripts/Util/JCS_Util.cs
@@ -794,13 +794,15 @@ public static string RemoveCloneString(string name)
         /// <summary>
         /// Retrieves the first active loaded object of Type type.
         /// </summary>
-        public static Object FindObjectByType(System.Type type)
+        public static T FindObjectByType<T>()
+            where T : Object
         {
-            return Object.FindFirstObjectByType(type);
+            return Object.FindFirstObjectByType<T>();
         }
-        public static Object FindObjectByType(System.Type type, Scene scene)
+        public static T FindObjectByType<T>(Scene scene)
+            where T : Object
         {
-            Object[] objects = FindObjectsByType(type, scene);
+            T[] objects = FindObjectsByType<T>(scene);
 
             if (objects.Length == 0)
                 return null;
@@ -811,13 +813,17 @@ public static Object FindObjectByType(System.Type type, Scene scene)
         /// <summary>
         /// Retrieves a list of all loaded objects of Type type.
         /// </summary>
-        public static Object[] FindObjectsByType(System.Type type)
+        public static T[] FindObjectsByType<T>()
+            where T : Object
         {
-            return Object.FindObjectsByType(type, FindObjectsSortMode.None);
+            return Object.FindObjectsByType<T>(
+                FindObjectsInactive.Include,
+                FindObjectsSortMode.None);
         }
-        public static Object[] FindObjectsByType(System.Type type, Scene scene)
+        public static T[] FindObjectsByType<T>(Scene scene)
+            where T : Object
         {
-            Object[] objects = FindObjectsByType(type);
+            T[] objects = FindObjectsByType<T>();
 
             return objects.Where((obj) =>
             {
diff --git a/Assets/_RunningCrush/Scripts/RC_WebcamHandler.cs b/Assets/_RunningCrush/Scripts/RC_WebcamHandler.cs
@@ -42,7 +42,7 @@ private void Start()
 
         // try to get the object
         if (mWebcam == null)
-            mWebcam = JCS_Util.FindObjectByType(typeof(JCS_Webcam)) as JCS_Webcam;
+            mWebcam = JCS_Util.FindObjectByType<JCS_Webcam>();
     }
 
     private void Update()

Original file line number	Diff line number	Diff line change
`@@ -549,7 +549,8 @@ private static GameObject Create3DCurosr()`
`549`	`549`	`/// </summary>`
`550`	`550`	`private static GameObject CreateBasePanel()`
`551`	`551`	`{`
`552`		`- var canvas = JCS_Util.FindObjectByType(typeof(JCS_Canvas)) as JCS_Canvas;`
	`552`	`+ var canvas = JCS_Util.FindObjectByType<JCS_Canvas>();`
	`553`	`+`
`553`	`554`	`if (canvas == null)`
`554`	`555`	`{`
`555`	`556`	`Debug.Log("Can't find JCS_Canvas in hierarchy. Plz create canvas before creating new panel.");`
`@@ -577,7 +578,8 @@ private static GameObject CreateBasePanel()`
`577`	`578`	`/// </summary>`
`578`	`579`	`private static GameObject CreateDialoguePanel()`
`579`	`580`	`{`
`580`		`- var canvas = JCS_Util.FindObjectByType(typeof(JCS_Canvas)) as JCS_Canvas;`
	`581`	`+ var canvas = JCS_Util.FindObjectByType<JCS_Canvas>();`
	`582`	`+`
`581`	`583`	`if (canvas == null)`
`582`	`584`	`{`
`583`	`585`	`Debug.Log("Can't find JCS_Canvas in hierarchy. Plz create canvas before creating new panel.");`
`@@ -605,7 +607,7 @@ private static GameObject CreateDialoguePanel()`
`605`	`607`	`/// </summary>`
`606`	`608`	`private static void CreateSlidePanel()`
`607`	`609`	`{`
`608`		`- var canvas = JCS_Util.FindObjectByType(typeof(JCS_Canvas)) as JCS_Canvas;`
	`610`	`+ var canvas = JCS_Util.FindObjectByType<JCS_Canvas>();`
`609`	`611`
`610`	`612`	`if (canvas == null)`
`611`	`613`	`{`
`@@ -680,7 +682,7 @@ private static void CreateSlidePanel()`
`680`	`682`	`/// </summary>`
`681`	`683`	`private static GameObject CreateTweenPanel()`
`682`	`684`	`{`
`683`		`- var canvas = JCS_Util.FindObjectByType(typeof(JCS_Canvas)) as JCS_Canvas;`
	`685`	`+ var canvas = JCS_Util.FindObjectByType<JCS_Canvas>();`
`684`	`686`
`685`	`687`	`if (canvas == null)`
`686`	`688`	`{`
`@@ -810,7 +812,7 @@ private static GameObject CreateHierarchyObjectUnderCanvas(string settingPath)`
`810`	`812`	`{`
`811`	`813`	`// since this will be in the editing time.`
`812`	`814`	`// so we don't worry to much about the performance.`
`813`		`- var canvas = JCS_Util.FindObjectByType(typeof(JCS_Canvas)) as JCS_Canvas;`
	`815`	`+ var canvas = JCS_Util.FindObjectByType<JCS_Canvas>();`
`814`	`816`
`815`	`817`	`return CreateHierarchyObjectUnderCanvas(settingPath, canvas);`
`816`	`818`	`}`
Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,7 @@ public JCS_Player FindPlayerByDirectionUsingList(JCS_2D4Direction direction, Lis`
`382`	`382`	`public void AddAllPlayerToMultiTrack()`
`383`	`383`	`{`
`384`	`384`	`// find the object in the scene.`
`385`		`- var mtc = JCS_Util.FindObjectByType(typeof(JCS_2DMultiTrackCamera)) as JCS_2DMultiTrackCamera;`
	`385`	`+ var mtc = JCS_Util.FindObjectByType<JCS_2DMultiTrackCamera>();`
`386`	`386`
`387`	`387`	`foreach (JCS_Player p in mPlayers)`
`388`	`388`	`{`
`@@ -396,7 +396,7 @@ public void AddAllPlayerToMultiTrack()`
`396`	`396`	`public void RemoveAllPlayerFromMultiTrack()`
`397`	`397`	`{`
`398`	`398`	`// find the object in the scene.`
`399`		`- var mtc = JCS_Util.FindObjectByType(typeof(JCS_2DMultiTrackCamera)) as JCS_2DMultiTrackCamera;`
	`399`	`+ var mtc = JCS_Util.FindObjectByType<JCS_2DMultiTrackCamera>();`
`400`	`400`
`401`	`401`	`foreach (JCS_Player p in mPlayers)`
`402`	`402`	`{`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ protected override void Awake()`
`84`	`84`	`mSoundPlayer = GetComponent<JCS_SoundPlayer>();`
`85`	`85`
`86`	`86`	`// try to get it from the scene by type.`
`87`		`- mSlideCameras = JCS_Util.FindObjectsByType(typeof(JCS_2DSlideScreenCamera)) as JCS_2DSlideScreenCamera[];`
	`87`	`+ mSlideCameras = JCS_Util.FindObjectsByType<JCS_2DSlideScreenCamera>();`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`#if JCS_USE_GAMEPAD`
Original file line number	Diff line number	Diff line change
`@@ -794,13 +794,15 @@ public static string RemoveCloneString(string name)`
`794`	`794`	`/// <summary>`
`795`	`795`	`/// Retrieves the first active loaded object of Type type.`
`796`	`796`	`/// </summary>`
`797`		`- public static Object FindObjectByType(System.Type type)`
	`797`	`+ public static T FindObjectByType<T>()`
	`798`	`+ where T : Object`
`798`	`799`	`{`
`799`		`- return Object.FindFirstObjectByType(type);`
	`800`	`+ return Object.FindFirstObjectByType<T>();`
`800`	`801`	`}`
`801`		`- public static Object FindObjectByType(System.Type type, Scene scene)`
	`802`	`+ public static T FindObjectByType<T>(Scene scene)`
	`803`	`+ where T : Object`
`802`	`804`	`{`
`803`		`- Object[] objects = FindObjectsByType(type, scene);`
	`805`	`+ T[] objects = FindObjectsByType<T>(scene);`
`804`	`806`
`805`	`807`	`if (objects.Length == 0)`
`806`	`808`	`return null;`
`@@ -811,13 +813,17 @@ public static Object FindObjectByType(System.Type type, Scene scene)`
`811`	`813`	`/// <summary>`
`812`	`814`	`/// Retrieves a list of all loaded objects of Type type.`
`813`	`815`	`/// </summary>`
`814`		`- public static Object[] FindObjectsByType(System.Type type)`
	`816`	`+ public static T[] FindObjectsByType<T>()`
	`817`	`+ where T : Object`
`815`	`818`	`{`
`816`		`- return Object.FindObjectsByType(type, FindObjectsSortMode.None);`
	`819`	`+ return Object.FindObjectsByType<T>(`
	`820`	`+ FindObjectsInactive.Include,`
	`821`	`+ FindObjectsSortMode.None);`
`817`	`822`	`}`
`818`		`- public static Object[] FindObjectsByType(System.Type type, Scene scene)`
	`823`	`+ public static T[] FindObjectsByType<T>(Scene scene)`
	`824`	`+ where T : Object`
`819`	`825`	`{`
`820`		`- Object[] objects = FindObjectsByType(type);`
	`826`	`+ T[] objects = FindObjectsByType<T>();`
`821`	`827`
`822`	`828`	`return objects.Where((obj) =>`
`823`	`829`	`{`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ private void Start()`
`42`	`42`
`43`	`43`	`// try to get the object`
`44`	`44`	`if (mWebcam == null)`
`45`		`- mWebcam = JCS_Util.FindObjectByType(typeof(JCS_Webcam)) as JCS_Webcam;`
	`45`	`+ mWebcam = JCS_Util.FindObjectByType<JCS_Webcam>();`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`private void Update()`