修改 Inspector 以兼容 2018.3 版本

Jiang Yin · Jiang Yin · commit 8ea1ccd5e73b · 2018-12-17T10:57:54.000+08:00
diff --git a/Scripts/Editor/Inspector/ConfigComponentInspector.cs b/Scripts/Editor/Inspector/ConfigComponentInspector.cs
@@ -39,7 +39,7 @@ public override void OnInspectorGUI()
             }
             EditorGUI.EndDisabledGroup();
 
-            if (EditorApplication.isPlaying && PrefabUtility.GetPrefabType(t.gameObject) != PrefabType.Prefab)
+            if (EditorApplication.isPlaying && IsPrefabInHierarchy(t.gameObject))
             {
                 EditorGUILayout.LabelField("Config Count", t.ConfigCount.ToString());
             }
diff --git a/Scripts/Editor/Inspector/DataNodeComponentInspector.cs b/Scripts/Editor/Inspector/DataNodeComponentInspector.cs
@@ -26,7 +26,7 @@ public override void OnInspectorGUI()
 
             DataNodeComponent t = (DataNodeComponent)target;
 
-            if (PrefabUtility.GetPrefabType(t.gameObject) != PrefabType.Prefab)
+            if (IsPrefabInHierarchy(t.gameObject))
             {
                 DrawDataNode(t.Root);
             }
diff --git a/Scripts/Editor/Inspector/DataTableComponentInspector.cs b/Scripts/Editor/Inspector/DataTableComponentInspector.cs
@@ -41,7 +41,7 @@ public override void OnInspectorGUI()
             }
             EditorGUI.EndDisabledGroup();
 
-            if (EditorApplication.isPlaying && PrefabUtility.GetPrefabType(t.gameObject) != PrefabType.Prefab)
+            if (EditorApplication.isPlaying && IsPrefabInHierarchy(t.gameObject))
             {
                 EditorGUILayout.LabelField("Data Table Count", t.Count.ToString());
 
diff --git a/Scripts/Editor/Inspector/DebuggerComponentInspector.cs b/Scripts/Editor/Inspector/DebuggerComponentInspector.cs
@@ -28,7 +28,7 @@ public override void OnInspectorGUI()
 
             EditorGUILayout.PropertyField(m_Skin);
 
-            if (EditorApplication.isPlaying && PrefabUtility.GetPrefabType(t.gameObject) != PrefabType.Prefab)
+            if (EditorApplication.isPlaying && IsPrefabInHierarchy(t.gameObject))
             {
                 bool activeWindow = EditorGUILayout.Toggle("Active Window", t.ActiveWindow);
                 if (activeWindow != t.ActiveWindow)
diff --git a/Scripts/Editor/Inspector/DownloadComponentInspector.cs b/Scripts/Editor/Inspector/DownloadComponentInspector.cs
@@ -62,7 +62,7 @@ public override void OnInspectorGUI()
                 }
             }
 
-            if (EditorApplication.isPlaying && PrefabUtility.GetPrefabType(t.gameObject) != PrefabType.Prefab)
+            if (EditorApplication.isPlaying && IsPrefabInHierarchy(t.gameObject))
             {
                 EditorGUILayout.LabelField("Total Agent Count", t.TotalAgentCount.ToString());
                 EditorGUILayout.LabelField("Free Agent Count", t.FreeAgentCount.ToString());
diff --git a/Scripts/Editor/Inspector/EntityComponentInspector.cs b/Scripts/Editor/Inspector/EntityComponentInspector.cs
@@ -49,7 +49,7 @@ public override void OnInspectorGUI()
             }
             EditorGUI.EndDisabledGroup();
 
-            if (EditorApplication.isPlaying && PrefabUtility.GetPrefabType(t.gameObject) != PrefabType.Prefab)
+            if (EditorApplication.isPlaying && IsPrefabInHierarchy(t.gameObject))
             {
                 EditorGUILayout.LabelField("Entity Group Count", t.EntityGroupCount.ToString());
                 EditorGUILayout.LabelField("Entity Count (Total)", t.EntityCount.ToString());
diff --git a/Scripts/Editor/Inspector/EventComponentInspector.cs b/Scripts/Editor/Inspector/EventComponentInspector.cs
@@ -25,7 +25,7 @@ public override void OnInspectorGUI()
 
             EventComponent t = (EventComponent)target;
 
-            if (PrefabUtility.GetPrefabType(t.gameObject) != PrefabType.Prefab)
+            if (IsPrefabInHierarchy(t.gameObject))
             {
                 EditorGUILayout.LabelField("Event Handler Count", t.EventHandlerCount.ToString());
                 EditorGUILayout.LabelField("Event Count", t.EventCount.ToString());
diff --git a/Scripts/Editor/Inspector/FsmComponentInspector.cs b/Scripts/Editor/Inspector/FsmComponentInspector.cs
@@ -27,7 +27,7 @@ public override void OnInspectorGUI()
 
             FsmComponent t = (FsmComponent)target;
 
-            if (PrefabUtility.GetPrefabType(t.gameObject) != PrefabType.Prefab)
+            if (IsPrefabInHierarchy(t.gameObject))
             {
                 EditorGUILayout.LabelField("FSM Count", t.Count.ToString());
 
diff --git a/Scripts/Editor/Inspector/GameFrameworkInspector.cs b/Scripts/Editor/Inspector/GameFrameworkInspector.cs
@@ -48,5 +48,19 @@ protected virtual void OnCompileComplete()
         {
 
         }
+
+        protected bool IsPrefabInHierarchy(UnityEngine.Object obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+
+#if UNITY_2018_3_OR_NEWER
+            return true;
+#else
+            return PrefabUtility.GetPrefabType(obj) != PrefabType.Prefab;
+#endif
+        }
     }
 }
diff --git a/Scripts/Editor/Inspector/LocalizationComponentInspector.cs b/Scripts/Editor/Inspector/LocalizationComponentInspector.cs
@@ -39,7 +39,7 @@ public override void OnInspectorGUI()
             }
             EditorGUI.EndDisabledGroup();
 
-            if (EditorApplication.isPlaying && PrefabUtility.GetPrefabType(t.gameObject) != PrefabType.Prefab)
+            if (EditorApplication.isPlaying && IsPrefabInHierarchy(t.gameObject))
             {
                 EditorGUILayout.LabelField("Language", t.Language.ToString());
                 EditorGUILayout.LabelField("System Language", t.SystemLanguage.ToString());
diff --git a/Scripts/Editor/Inspector/NetworkComponentInspector.cs b/Scripts/Editor/Inspector/NetworkComponentInspector.cs
@@ -28,7 +28,7 @@ public override void OnInspectorGUI()
 
             NetworkComponent t = (NetworkComponent)target;
 
-            if (PrefabUtility.GetPrefabType(t.gameObject) != PrefabType.Prefab)
+            if (IsPrefabInHierarchy(t.gameObject))
             {
                 EditorGUILayout.LabelField("Network Channel Count", t.NetworkChannelCount.ToString());
 
diff --git a/Scripts/Editor/Inspector/ObjectPoolComponentInspector.cs b/Scripts/Editor/Inspector/ObjectPoolComponentInspector.cs
@@ -31,7 +31,7 @@ public override void OnInspectorGUI()
 
             ObjectPoolComponent t = (ObjectPoolComponent)target;
 
-            if (PrefabUtility.GetPrefabType(t.gameObject) != PrefabType.Prefab)
+            if (IsPrefabInHierarchy(t.gameObject))
             {
                 EditorGUILayout.LabelField("Object Pool Count", t.Count.ToString());
 
diff --git a/Scripts/Editor/Inspector/ReferencePoolComponentInspector.cs b/Scripts/Editor/Inspector/ReferencePoolComponentInspector.cs
@@ -26,7 +26,7 @@ public override void OnInspectorGUI()
 
             ReferencePoolComponent t = (ReferencePoolComponent)target;
 
-            if (PrefabUtility.GetPrefabType(t.gameObject) != PrefabType.Prefab)
+            if (IsPrefabInHierarchy(t.gameObject))
             {
                 EditorGUILayout.LabelField("Reference Pool Count", ReferencePool.Count.ToString());
 
diff --git a/Scripts/Editor/Inspector/ResourceComponentInspector.cs b/Scripts/Editor/Inspector/ResourceComponentInspector.cs
@@ -54,7 +54,7 @@ public override void OnInspectorGUI()
 
             EditorGUI.BeginDisabledGroup(EditorApplication.isPlayingOrWillChangePlaymode);
             {
-                if (EditorApplication.isPlaying && PrefabUtility.GetPrefabType(t.gameObject) != PrefabType.Prefab)
+                if (EditorApplication.isPlaying && IsPrefabInHierarchy(t.gameObject))
                 {
                     EditorGUILayout.EnumPopup("Resource Mode", t.ResourceMode);
                 }
@@ -231,7 +231,7 @@ public override void OnInspectorGUI()
             }
             EditorGUI.EndDisabledGroup();
 
-            if (EditorApplication.isPlaying && PrefabUtility.GetPrefabType(t.gameObject) != PrefabType.Prefab)
+            if (EditorApplication.isPlaying && IsPrefabInHierarchy(t.gameObject))
             {
                 EditorGUILayout.LabelField("Read Only Path", t.ReadOnlyPath.ToString());
                 EditorGUILayout.LabelField("Read Write Path", t.ReadWritePath.ToString());
diff --git a/Scripts/Editor/Inspector/SceneComponentInspector.cs b/Scripts/Editor/Inspector/SceneComponentInspector.cs
@@ -38,7 +38,7 @@ public override void OnInspectorGUI()
 
             serializedObject.ApplyModifiedProperties();
 
-            if (EditorApplication.isPlaying && PrefabUtility.GetPrefabType(t.gameObject) != PrefabType.Prefab)
+            if (EditorApplication.isPlaying && IsPrefabInHierarchy(t.gameObject))
             {
                 EditorGUILayout.LabelField("Loaded Scene Asset Names", GetSceneNameString(t.GetLoadedSceneAssetNames()));
                 EditorGUILayout.LabelField("Loading Scene Asset Names", GetSceneNameString(t.GetLoadingSceneAssetNames()));
diff --git a/Scripts/Editor/Inspector/SoundComponentInspector.cs b/Scripts/Editor/Inspector/SoundComponentInspector.cs
@@ -49,7 +49,7 @@ public override void OnInspectorGUI()
             }
             EditorGUI.EndDisabledGroup();
 
-            if (EditorApplication.isPlaying && PrefabUtility.GetPrefabType(t.gameObject) != PrefabType.Prefab)
+            if (EditorApplication.isPlaying && IsPrefabInHierarchy(t.gameObject))
             {
                 EditorGUILayout.LabelField("Sound Group Count", t.SoundGroupCount.ToString());
             }
diff --git a/Scripts/Editor/Inspector/UIComponentInspector.cs b/Scripts/Editor/Inspector/UIComponentInspector.cs
@@ -103,7 +103,7 @@ public override void OnInspectorGUI()
             }
             EditorGUI.EndDisabledGroup();
 
-            if (EditorApplication.isPlaying && PrefabUtility.GetPrefabType(t.gameObject) != PrefabType.Prefab)
+            if (EditorApplication.isPlaying && IsPrefabInHierarchy(t.gameObject))
             {
                 EditorGUILayout.LabelField("UI Group Count", t.UIGroupCount.ToString());
             }
diff --git a/Scripts/Editor/Inspector/WebRequestComponentInspector.cs b/Scripts/Editor/Inspector/WebRequestComponentInspector.cs
@@ -50,7 +50,7 @@ public override void OnInspectorGUI()
                 }
             }
 
-            if (EditorApplication.isPlaying && PrefabUtility.GetPrefabType(t.gameObject) != PrefabType.Prefab)
+            if (EditorApplication.isPlaying && IsPrefabInHierarchy(t.gameObject))
             {
                 EditorGUILayout.LabelField("Total Agent Count", t.TotalAgentCount.ToString());
                 EditorGUILayout.LabelField("Free Agent Count", t.FreeAgentCount.ToString());

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public override void OnInspectorGUI()`
`39`	`39`	`}`
`40`	`40`	`EditorGUI.EndDisabledGroup();`
`41`	`41`
`42`		`- if (EditorApplication.isPlaying && PrefabUtility.GetPrefabType(t.gameObject) != PrefabType.Prefab)`
	`42`	`+ if (EditorApplication.isPlaying && IsPrefabInHierarchy(t.gameObject))`
`43`	`43`	`{`
`44`	`44`	`EditorGUILayout.LabelField("Config Count", t.ConfigCount.ToString());`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public override void OnInspectorGUI()`
`26`	`26`
`27`	`27`	`DataNodeComponent t = (DataNodeComponent)target;`
`28`	`28`
`29`		`- if (PrefabUtility.GetPrefabType(t.gameObject) != PrefabType.Prefab)`
	`29`	`+ if (IsPrefabInHierarchy(t.gameObject))`
`30`	`30`	`{`
`31`	`31`	`DrawDataNode(t.Root);`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public override void OnInspectorGUI()`
`41`	`41`	`}`
`42`	`42`	`EditorGUI.EndDisabledGroup();`
`43`	`43`
`44`		`- if (EditorApplication.isPlaying && PrefabUtility.GetPrefabType(t.gameObject) != PrefabType.Prefab)`
	`44`	`+ if (EditorApplication.isPlaying && IsPrefabInHierarchy(t.gameObject))`
`45`	`45`	`{`
`46`	`46`	`EditorGUILayout.LabelField("Data Table Count", t.Count.ToString());`
`47`	`47`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public override void OnInspectorGUI()`
`28`	`28`
`29`	`29`	`EditorGUILayout.PropertyField(m_Skin);`
`30`	`30`
`31`		`- if (EditorApplication.isPlaying && PrefabUtility.GetPrefabType(t.gameObject) != PrefabType.Prefab)`
	`31`	`+ if (EditorApplication.isPlaying && IsPrefabInHierarchy(t.gameObject))`
`32`	`32`	`{`
`33`	`33`	`bool activeWindow = EditorGUILayout.Toggle("Active Window", t.ActiveWindow);`
`34`	`34`	`if (activeWindow != t.ActiveWindow)`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public override void OnInspectorGUI()`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`
`65`		`- if (EditorApplication.isPlaying && PrefabUtility.GetPrefabType(t.gameObject) != PrefabType.Prefab)`
	`65`	`+ if (EditorApplication.isPlaying && IsPrefabInHierarchy(t.gameObject))`
`66`	`66`	`{`
`67`	`67`	`EditorGUILayout.LabelField("Total Agent Count", t.TotalAgentCount.ToString());`
`68`	`68`	`EditorGUILayout.LabelField("Free Agent Count", t.FreeAgentCount.ToString());`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public override void OnInspectorGUI()`
`49`	`49`	`}`
`50`	`50`	`EditorGUI.EndDisabledGroup();`
`51`	`51`
`52`		`- if (EditorApplication.isPlaying && PrefabUtility.GetPrefabType(t.gameObject) != PrefabType.Prefab)`
	`52`	`+ if (EditorApplication.isPlaying && IsPrefabInHierarchy(t.gameObject))`
`53`	`53`	`{`
`54`	`54`	`EditorGUILayout.LabelField("Entity Group Count", t.EntityGroupCount.ToString());`
`55`	`55`	`EditorGUILayout.LabelField("Entity Count (Total)", t.EntityCount.ToString());`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public override void OnInspectorGUI()`
`25`	`25`
`26`	`26`	`EventComponent t = (EventComponent)target;`
`27`	`27`
`28`		`- if (PrefabUtility.GetPrefabType(t.gameObject) != PrefabType.Prefab)`
	`28`	`+ if (IsPrefabInHierarchy(t.gameObject))`
`29`	`29`	`{`
`30`	`30`	`EditorGUILayout.LabelField("Event Handler Count", t.EventHandlerCount.ToString());`
`31`	`31`	`EditorGUILayout.LabelField("Event Count", t.EventCount.ToString());`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public override void OnInspectorGUI()`
`27`	`27`
`28`	`28`	`FsmComponent t = (FsmComponent)target;`
`29`	`29`
`30`		`- if (PrefabUtility.GetPrefabType(t.gameObject) != PrefabType.Prefab)`
	`30`	`+ if (IsPrefabInHierarchy(t.gameObject))`
`31`	`31`	`{`
`32`	`32`	`EditorGUILayout.LabelField("FSM Count", t.Count.ToString());`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -48,5 +48,19 @@ protected virtual void OnCompileComplete()`
`48`	`48`	`{`
`49`	`49`
`50`	`50`	`}`
	`51`	`+`
	`52`	`+ protected bool IsPrefabInHierarchy(UnityEngine.Object obj)`
	`53`	`+ {`
	`54`	`+ if (obj == null)`
	`55`	`+ {`
	`56`	`+ return false;`
	`57`	`+ }`
	`58`	`+`
	`59`	`+#if UNITY_2018_3_OR_NEWER`
	`60`	`+ return true;`
	`61`	`+#else`
	`62`	`+ return PrefabUtility.GetPrefabType(obj) != PrefabType.Prefab;`
	`63`	`+#endif`
	`64`	`+ }`
`51`	`65`	`}`
`52`	`66`	`}`