From 7e26573abbd196c5b9c8fd10758f1f3a26e68877 Mon Sep 17 00:00:00 2001 From: Antonio Date: Thu, 27 Feb 2020 19:14:02 +0100 Subject: [PATCH] updated to unity 2019.3.2f1, fix missing UNITY_EDITOR preprocessor --- Assets/UniRx.Async/PlayerLoopHelper.cs | 10 ++++++---- ProjectSettings/EditorSettings.asset | 20 +++++++++++++++++--- ProjectSettings/ProjectVersion.txt | 4 ++-- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/Assets/UniRx.Async/PlayerLoopHelper.cs b/Assets/UniRx.Async/PlayerLoopHelper.cs index 5171469..978d356 100644 --- a/Assets/UniRx.Async/PlayerLoopHelper.cs +++ b/Assets/UniRx.Async/PlayerLoopHelper.cs @@ -69,17 +69,19 @@ namespace UniRx.Async static PlayerLoopSystem[] InsertRunner(PlayerLoopSystem loopSystem, Type loopRunnerYieldType, ContinuationQueue cq, Type loopRunnerType, PlayerLoopRunner runner) { +#if UNITY_EDITOR EditorApplication.playModeStateChanged += (state) => { - if (state==PlayModeStateChange.EnteredEditMode || state==PlayModeStateChange.EnteredPlayMode) return; - + if (state == PlayModeStateChange.EnteredEditMode || + state == PlayModeStateChange.EnteredPlayMode) return; + if (runner != null) runner.Clear(); if (cq != null) cq.Clear(); }; - - +#endif + var yieldLoop = new PlayerLoopSystem { type = loopRunnerYieldType, diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset index 8d9e83b..14e45f0 100644 --- a/ProjectSettings/EditorSettings.asset +++ b/ProjectSettings/EditorSettings.asset @@ -3,19 +3,33 @@ --- !u!159 &1 EditorSettings: m_ObjectHideFlags: 0 - serializedVersion: 7 + serializedVersion: 9 m_ExternalVersionControlSupport: Visible Meta Files m_SerializationMode: 2 m_LineEndingsForNewScripts: 2 m_DefaultBehaviorMode: 1 + m_PrefabRegularEnvironment: {fileID: 0} + m_PrefabUIEnvironment: {fileID: 0} m_SpritePackerMode: 4 m_SpritePackerPaddingPower: 1 m_EtcTextureCompressorBehavior: 1 m_EtcTextureFastCompressor: 1 m_EtcTextureNormalCompressor: 2 m_EtcTextureBestCompressor: 4 - m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd + m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmref m_ProjectGenerationRootNamespace: - m_UserGeneratedProjectSuffix: m_CollabEditorSettings: inProgressEnabled: 1 + m_EnableTextureStreamingInEditMode: 1 + m_EnableTextureStreamingInPlayMode: 1 + m_AsyncShaderCompilation: 1 + m_EnterPlayModeOptionsEnabled: 0 + m_EnterPlayModeOptions: 3 + m_ShowLightmapResolutionOverlay: 1 + m_UseLegacyProbeSampleCount: 1 + m_AssetPipelineMode: 1 + m_CacheServerMode: 0 + m_CacheServerEndpoint: + m_CacheServerNamespacePrefix: default + m_CacheServerEnableDownload: 1 + m_CacheServerEnableUpload: 1 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 83a1801..f04fc72 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.3.0a2 -m_EditorVersionWithRevision: 2019.3.0a2 (fa7740529556) +m_EditorVersion: 2019.3.2f1 +m_EditorVersionWithRevision: 2019.3.2f1 (c46a3a38511e)