From c9224a602ae926b182426317d30608796a52b0b5 Mon Sep 17 00:00:00 2001 From: tanghai Date: Fri, 15 Sep 2017 10:21:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=93=E5=8C=85=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E4=B8=80=E4=B8=AAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Unity/Assets/Scripts/Helper/ResourceHelper.cs | 4 +++- Unity/ProjectSettings/GraphicsSettings.asset | 23 +++++++++---------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/Unity/Assets/Scripts/Helper/ResourceHelper.cs b/Unity/Assets/Scripts/Helper/ResourceHelper.cs index ea9e296d..4ed6c94a 100644 --- a/Unity/Assets/Scripts/Helper/ResourceHelper.cs +++ b/Unity/Assets/Scripts/Helper/ResourceHelper.cs @@ -1,4 +1,6 @@ -using UnityEditor; +#if UNITY_EDITOR +using UnityEditor; +#endif using UnityEngine; namespace Model diff --git a/Unity/ProjectSettings/GraphicsSettings.asset b/Unity/ProjectSettings/GraphicsSettings.asset index 7016a0e2..93ca4308 100644 --- a/Unity/ProjectSettings/GraphicsSettings.asset +++ b/Unity/ProjectSettings/GraphicsSettings.asset @@ -3,7 +3,7 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 12 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} @@ -35,29 +35,28 @@ GraphicsSettings: - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10782, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_TierSettings_Tier1: - renderingPath: 1 - useCascadedShadowMaps: 1 - m_TierSettings_Tier2: - renderingPath: 1 - useCascadedShadowMaps: 1 - m_TierSettings_Tier3: - renderingPath: 1 - useCascadedShadowMaps: 1 + m_CustomRenderPipeline: {fileID: 0} + m_TransparencySortMode: 0 + m_TransparencySortAxis: {x: 0, y: 0, z: 1} m_DefaultRenderingPath: 1 m_DefaultMobileRenderingPath: 1 m_TierSettings: [] m_LightmapStripping: 0 m_FogStripping: 0 + m_InstancingStripping: 0 m_LightmapKeepPlain: 1 m_LightmapKeepDirCombined: 1 - m_LightmapKeepDirSeparate: 1 m_LightmapKeepDynamicPlain: 1 m_LightmapKeepDynamicDirCombined: 1 - m_LightmapKeepDynamicDirSeparate: 1 + m_LightmapKeepShadowMask: 1 + m_LightmapKeepSubtractive: 1 m_FogKeepLinear: 1 m_FogKeepExp: 1 m_FogKeepExp2: 1 + m_AlbedoSwatchInfos: [] + m_LightsUseLinearIntensity: 0 + m_LightsUseColorTemperature: 0 -- GitLab