Utility.Unity.FindObjectOfType

UnityProject/Assets/TEngine/Runtime/Core/Utility/Utility.Unity.cs

@@ -322,6 +322,19 @@ namespace TEngine
 
                 _updateDriver = ModuleSystem.GetModule<IUpdateDriver>();
             }
+
+            #region FindObjectOfType
+            public static T FindObjectOfType<T>() where T : UnityEngine.Object
+            {
+#if UNITY_6000_0_OR_NEWER
+                return UnityEngine.Object.FindFirstObjectByType<T>();
+#else
+                return UnityEngine.Object.FindObjectOfType<T>();
+
+#endif
+            }
+
+            #endregion
         }
 
         public class GameCoroutine

UnityProject/Assets/TEngine/Runtime/Module/LocalizationModule/Core/Manager/LocalizationManager_Parameters.cs

@@ -25,7 +25,9 @@ namespace TEngine.Localization
 
         public static void AutoLoadGlobalParamManagers()
         {
+#pragma warning disable CS0618 // Type or member is obsolete
             foreach (var manager in Object.FindObjectsOfType<LocalizationParamsManager>())
+#pragma warning restore CS0618 // Type or member is obsolete
             {
                 if (manager._IsGlobalManager && !ParamManagers.Contains(manager))
                 {

UnityProject/Assets/TEngine/Runtime/Module/LocalizationModule/Core/Utils/ResourceManager.cs

@@ -20,7 +20,7 @@ namespace TEngine.Localization
 				bool changed = mInstance==null;
 
 				if (mInstance==null)
-					mInstance = (ResourceManager)FindObjectOfType(typeof(ResourceManager));
+					mInstance = Utility.Unity.FindObjectOfType<ResourceManager>();
 
 				if (mInstance==null)
 				{

UnityProject/Assets/TEngine/Runtime/Module/RootModule.cs

@@ -17,7 +17,7 @@ namespace TEngine
             {
                 if (_instance == null)
                 {
-                    _instance = FindObjectOfType<RootModule>();
+                    _instance = Utility.Unity.FindObjectOfType<RootModule>();
                 }
                 return _instance;
             }

UnityProject/Assets/TEngine/Runtime/Module/Settings/Settings.cs

@@ -12,7 +12,7 @@ namespace TEngine
             {
                 if (_instance == null)
                 {
-                    _instance = GameObject.FindObjectOfType<Settings>();
+                    _instance = Utility.Unity.FindObjectOfType<Settings>();
 
                     if (_instance != null)
                     {