From 1095918444d5d24300bbc33b497374a52415836b Mon Sep 17 00:00:00 2001 From: Andrew Date: Thu, 21 Feb 2019 12:30:25 +0300 Subject: [PATCH] A few warnings about obsolete things were removed --- Extensions/EditorExtensions/MyEditor.cs | 13 +++++++++++-- .../JsonDataSettingsTransfer.cs | 3 +++ Types/GUID/GuidComponent.cs | 2 ++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Extensions/EditorExtensions/MyEditor.cs b/Extensions/EditorExtensions/MyEditor.cs index 0ff85f4..4a0e9a2 100644 --- a/Extensions/EditorExtensions/MyEditor.cs +++ b/Extensions/EditorExtensions/MyEditor.cs @@ -9,6 +9,7 @@ namespace MyBox.EditorTools { public static class MyEditor { +#pragma warning disable 618 #region Hierarchy Management /// @@ -67,8 +68,13 @@ private static void ObjectRename() EditorApplication.update -= ObjectRename; var type = typeof(EditorWindow).Assembly.GetType("UnityEditor.SceneHierarchyWindow"); var hierarchyWindow = EditorWindow.GetWindow(type); - var rename = type.GetMethod("RenameGO", BindingFlags.Instance | BindingFlags.NonPublic); - rename.Invoke(hierarchyWindow, null); + var renameMethod = type.GetMethod("RenameGO", BindingFlags.Instance | BindingFlags.NonPublic); + if (renameMethod == null) + { + Debug.LogError("RenameGO method is obsolete?"); + return; + } + renameMethod.Invoke(hierarchyWindow, null); } } @@ -85,6 +91,7 @@ private static void ObjectRename() public static void ApplyPrefab(GameObject instance) { var instanceRoot = PrefabUtility.FindRootGameObjectWithSameParentPrefab(instance); + var targetPrefab = PrefabUtility.GetCorrespondingObjectFromSource(instanceRoot); if (instanceRoot == null || targetPrefab == null) @@ -94,6 +101,7 @@ public static void ApplyPrefab(GameObject instance) } PrefabUtility.ReplacePrefab(instanceRoot, targetPrefab, ReplacePrefabOptions.ConnectToPrefab); + } /// @@ -147,6 +155,7 @@ private static GUIContent[] GetTextures(string baseName, string postFix, int sta } #endregion +#pragma warning restore 618 } } #endif \ No newline at end of file diff --git a/Tools/Undone/JsonDataManager/JsonDataManagerEditor/JsonDataSettingsTransfer.cs b/Tools/Undone/JsonDataManager/JsonDataManagerEditor/JsonDataSettingsTransfer.cs index 1407827..47743b9 100644 --- a/Tools/Undone/JsonDataManager/JsonDataManagerEditor/JsonDataSettingsTransfer.cs +++ b/Tools/Undone/JsonDataManager/JsonDataManagerEditor/JsonDataSettingsTransfer.cs @@ -7,6 +7,7 @@ namespace MyBox.Internal { +#pragma warning disable 618 public class JsonDataSettingsTransfer : IPostprocessBuild { public int callbackOrder @@ -30,6 +31,7 @@ private void OnBuild(string path) foreach (var setting in settings) { var filename = Path.GetFileName(setting); + if (filename == null) continue; var newFilepath = Path.Combine(buildPath, filename); File.Copy(setting, newFilepath); } @@ -57,6 +59,7 @@ private string[] SettingsFileNames(string path) return Directory.GetFiles(path).Where(p => p.EndsWith(".json")).ToArray(); } } +#pragma warning restore 618 } #endif \ No newline at end of file diff --git a/Types/GUID/GuidComponent.cs b/Types/GUID/GuidComponent.cs index 488c326..6d7a0e0 100644 --- a/Types/GUID/GuidComponent.cs +++ b/Types/GUID/GuidComponent.cs @@ -13,6 +13,7 @@ namespace MyBox { +#pragma warning disable 618 // This component gives a GameObject a stable, non-replicatable Globally Unique IDentifier. // It can be used to reference a specific instance of an object no matter where it is. // This can also be used for other systems, such as Save/Load game @@ -142,4 +143,5 @@ public void OnDestroy() GuidManager.Remove(guid); } } +#pragma warning restore 618 } \ No newline at end of file