From 25b295c44358ae06ce527fbb4eb6a53fa176ff56 Mon Sep 17 00:00:00 2001 From: Chris Gregan Date: Sat, 29 Dec 2018 23:33:59 +0000 Subject: [PATCH] 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. --- .../EditorResources/FungusEditorResources.asset | 5 +++-- .../Thirdparty/FungusLua/Scripts/Editor/MenuItems.cs | 2 +- .../TestRunner/TestComponent.cs | 2 +- Packages/manifest.json | 9 +++++---- ProjectSettings/ProjectVersion.txt | 2 +- ProjectSettings/VFXManager.asset | 11 +++++++++++ 6 files changed, 22 insertions(+), 9 deletions(-) create mode 100644 ProjectSettings/VFXManager.asset diff --git a/Assets/Fungus/EditorResources/FungusEditorResources.asset b/Assets/Fungus/EditorResources/FungusEditorResources.asset index 0e6ef67d..6cda160a 100644 --- a/Assets/Fungus/EditorResources/FungusEditorResources.asset +++ b/Assets/Fungus/EditorResources/FungusEditorResources.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Editor/MenuItems.cs b/Assets/Fungus/Thirdparty/FungusLua/Scripts/Editor/MenuItems.cs index b61be8ad..14299fd7 100644 --- a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Editor/MenuItems.cs +++ b/Assets/Fungus/Thirdparty/FungusLua/Scripts/Editor/MenuItems.cs @@ -77,7 +77,7 @@ namespace Fungus } GameObject go = PrefabUtility.InstantiatePrefab(prefab) as GameObject; - PrefabUtility.DisconnectPrefabInstance(go); + PrefabUtility.UnpackPrefabInstance(go, PrefabUnpackMode.Completely, InteractionMode.AutomatedAction); if (centerInScene) { diff --git a/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/TestComponent.cs b/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/TestComponent.cs index 7895102a..944c646d 100644 --- a/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/TestComponent.cs +++ b/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/TestComponent.cs @@ -276,7 +276,7 @@ namespace UnityTest { var tests = Resources.FindObjectsOfTypeAll (typeof(TestComponent)).Cast (); #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 return tests.ToList (); diff --git a/Packages/manifest.json b/Packages/manifest.json index 1342d0a7..16819bf7 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,10 +1,11 @@ { "dependencies": { - "com.unity.ads": "2.0.8", - "com.unity.analytics": "2.0.16", - "com.unity.package-manager-ui": "1.9.11", + "com.unity.ads": "2.3.1", + "com.unity.analytics": "3.2.2", + "com.unity.collab-proxy": "1.2.15", + "com.unity.package-manager-ui": "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.animation": "1.0.0", "com.unity.modules.assetbundle": "1.0.0", diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 29eae9e0..ca32b1e0 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2018.1.6f1 +m_EditorVersion: 2018.3.0f2 diff --git a/ProjectSettings/VFXManager.asset b/ProjectSettings/VFXManager.asset new file mode 100644 index 00000000..6e0eaca4 --- /dev/null +++ b/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