Browse Source

Fixed #723 Unity 2018.3 Warnings

Changed the Create menu items to use new PrefabUtility API. Matches the previous behaviour of disconnecting the prefab instance.
master
Chris Gregan 6 years ago
parent
commit
25b295c443
  1. 5
      Assets/Fungus/EditorResources/FungusEditorResources.asset
  2. 2
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Editor/MenuItems.cs
  3. 2
      Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/TestComponent.cs
  4. 9
      Packages/manifest.json
  5. 2
      ProjectSettings/ProjectVersion.txt
  6. 11
      ProjectSettings/VFXManager.asset

5
Assets/Fungus/EditorResources/FungusEditorResources.asset

@ -3,8 +3,9 @@
--- !u!114 &11400000 --- !u!114 &11400000
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0} m_GameObject: {fileID: 0}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0

2
Assets/Fungus/Thirdparty/FungusLua/Scripts/Editor/MenuItems.cs vendored

@ -77,7 +77,7 @@ namespace Fungus
} }
GameObject go = PrefabUtility.InstantiatePrefab(prefab) as GameObject; GameObject go = PrefabUtility.InstantiatePrefab(prefab) as GameObject;
PrefabUtility.DisconnectPrefabInstance(go); PrefabUtility.UnpackPrefabInstance(go, PrefabUnpackMode.Completely, InteractionMode.AutomatedAction);
if (centerInScene) if (centerInScene)
{ {

2
Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/TestComponent.cs

@ -276,7 +276,7 @@ namespace UnityTest
{ {
var tests = Resources.FindObjectsOfTypeAll (typeof(TestComponent)).Cast<TestComponent> (); var tests = Resources.FindObjectsOfTypeAll (typeof(TestComponent)).Cast<TestComponent> ();
#if UNITY_EDITOR #if UNITY_EDITOR
tests = tests.Where( t => {var p = PrefabUtility.GetPrefabType(t); return p != PrefabType.Prefab && p != PrefabType.ModelPrefab;} ); tests = tests.Where( t => {var p = PrefabUtility.GetPrefabAssetType(t); return p == PrefabAssetType.NotAPrefab;} );
#endif #endif
return tests.ToList (); return tests.ToList ();

9
Packages/manifest.json

@ -1,10 +1,11 @@
{ {
"dependencies": { "dependencies": {
"com.unity.ads": "2.0.8", "com.unity.ads": "2.3.1",
"com.unity.analytics": "2.0.16", "com.unity.analytics": "3.2.2",
"com.unity.package-manager-ui": "1.9.11", "com.unity.collab-proxy": "1.2.15",
"com.unity.package-manager-ui": "2.0.3",
"com.unity.purchasing": "2.0.3", "com.unity.purchasing": "2.0.3",
"com.unity.textmeshpro": "1.2.4", "com.unity.textmeshpro": "1.3.0",
"com.unity.modules.ai": "1.0.0", "com.unity.modules.ai": "1.0.0",
"com.unity.modules.animation": "1.0.0", "com.unity.modules.animation": "1.0.0",
"com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.assetbundle": "1.0.0",

2
ProjectSettings/ProjectVersion.txt

@ -1 +1 @@
m_EditorVersion: 2018.1.6f1 m_EditorVersion: 2018.3.0f2

11
ProjectSettings/VFXManager.asset

@ -0,0 +1,11 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!937362698 &1
VFXManager:
m_ObjectHideFlags: 0
m_IndirectShader: {fileID: 0}
m_CopyBufferShader: {fileID: 0}
m_SortShader: {fileID: 0}
m_RenderPipeSettingsPath:
m_FixedTimeStep: 0.016666668
m_MaxDeltaTime: 0.05
Loading…
Cancel
Save