diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 5a96ca8a..057c661a 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -3,16 +3,31 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 5 + serializedVersion: 7 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} m_DeferredReflections: m_Mode: 1 m_Shader: {fileID: 74, guid: 0000000000000000f000000000000000, type: 0} + m_ScreenSpaceShadows: + m_Mode: 1 + m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0} m_LegacyDeferred: m_Mode: 1 m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0} + m_DepthNormals: + m_Mode: 1 + m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0} + m_MotionVectors: + m_Mode: 1 + m_Shader: {fileID: 75, guid: 0000000000000000f000000000000000, type: 0} + m_LightHalo: + m_Mode: 1 + m_Shader: {fileID: 105, guid: 0000000000000000f000000000000000, type: 0} + m_LensFlare: + m_Mode: 1 + m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0} m_AlwaysIncludedShaders: - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0} @@ -21,8 +36,23 @@ GraphicsSettings: - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10782, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] - m_ShaderSettings: - useScreenSpaceShadows: 1 + m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, + type: 0} + m_ShaderSettings_Tier1: + useCascadedShadowMaps: 1 + standardShaderQuality: 2 + useReflectionProbeBoxProjection: 1 + useReflectionProbeBlending: 1 + m_ShaderSettings_Tier2: + useCascadedShadowMaps: 1 + standardShaderQuality: 2 + useReflectionProbeBoxProjection: 1 + useReflectionProbeBlending: 1 + m_ShaderSettings_Tier3: + useCascadedShadowMaps: 1 + standardShaderQuality: 2 + useReflectionProbeBoxProjection: 1 + useReflectionProbeBlending: 1 m_BuildTargetShaderSettings: [] m_LightmapStripping: 0 m_FogStripping: 0 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 3e69da49..5dbf360a 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -4,6 +4,7 @@ PlayerSettings: m_ObjectHideFlags: 0 serializedVersion: 8 + productGUID: 47d9f350ed27d4ecaa6699f3ebe641c8 AndroidProfiler: 0 defaultScreenOrientation: 2 targetDevice: 2 @@ -13,6 +14,7 @@ PlayerSettings: productName: Sherlock defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} + m_SplashScreenStyle: 0 m_ShowUnitySplashScreen: 1 m_VirtualRealitySplashScreen: {fileID: 0} defaultScreenWidth: 2000 @@ -24,7 +26,7 @@ PlayerSettings: m_ActiveColorSpace: 0 m_MTRendering: 1 m_MobileMTRendering: 0 - m_Stereoscopic3D: 0 + m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 iosAppInBackgroundBehavior: 0 @@ -50,6 +52,7 @@ PlayerSettings: resizableWindow: 0 useMacAppStoreValidation: 0 gpuSkinning: 0 + graphicsJobs: 0 xboxPIXTextureCapture: 0 xboxEnableAvatar: 0 xboxEnableKinect: 0 @@ -70,6 +73,7 @@ PlayerSettings: uiUse16BitDepthBuffer: 0 ignoreAlphaClear: 0 xboxOneResolution: 0 + xboxOneMonoLoggingLevel: 0 ps3SplashScreen: {fileID: 0} videoMemoryForVertexBuffers: 0 psp2PowerMode: 0 @@ -93,10 +97,9 @@ PlayerSettings: bundleVersion: 1.0 preloadedAssets: [] metroEnableIndependentInputSource: 0 - metroEnableLowLatencyPresentationAPI: 0 xboxOneDisableKinectGpuReservation: 0 - virtualRealitySupported: 0 - productGUID: 47d9f350ed27d4ecaa6699f3ebe641c8 + singlePassStereoRendering: 0 + protectGraphicsMemory: 0 AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 9 AndroidPreferredInstallLocation: 1 @@ -157,6 +160,7 @@ PlayerSettings: iOSLaunchScreeniPadSize: 100 iOSLaunchScreeniPadCustomXibPath: iOSDeviceRequirements: [] + iOSURLSchemes: [] AndroidTargetDevice: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} @@ -201,7 +205,6 @@ PlayerSettings: wiiUSystemHeapSize: 128 wiiUTVStartupScreen: {fileID: 0} wiiUGamePadStartupScreen: {fileID: 0} - wiiUDrcBufferDisabled: 0 wiiUProfilerLibPath: actionOnDotNetUnhandledException: 1 enableInternalProfiler: 0 @@ -261,6 +264,7 @@ PlayerSettings: ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 ps4RemotePlayKeyMappingDir: + ps4PlayTogetherPlayerCount: 0 ps4EnterButtonAssignment: 1 ps4ApplicationParam1: 0 ps4ApplicationParam2: 0 @@ -287,6 +291,8 @@ PlayerSettings: ps4attribMoveSupport: 0 ps4attrib3DSupport: 0 ps4attribShareSupport: 0 + ps4attribExclusiveVR: 0 + ps4disableAutoHideSplash: 0 ps4IncludedModules: [] monoEnv: psp2Splashimage: {fileID: 0} @@ -364,24 +370,6 @@ PlayerSettings: metroFTAFileTypes: [] metroProtocolName: metroCompilationOverrides: 1 - blackberryDeviceAddress: - blackberryDevicePassword: - blackberryTokenPath: - blackberryTokenExires: - blackberryTokenAuthor: - blackberryTokenAuthorId: - blackberryCskPassword: - blackberrySaveLogPath: - blackberrySharedPermissions: 0 - blackberryCameraPermissions: 0 - blackberryGPSPermissions: 0 - blackberryDeviceIDPermissions: 0 - blackberryMicrophonePermissions: 0 - blackberryGamepadSupport: 0 - blackberryBuildId: 0 - blackberryLandscapeSplashScreen: {fileID: 0} - blackberryPortraitSplashScreen: {fileID: 0} - blackberrySquareSplashScreen: {fileID: 0} tizenProductDescription: tizenProductURL: tizenSigningProfileName: @@ -451,12 +439,31 @@ PlayerSettings: WebGL::dataCaching: 0 WebGL::useEmbeddedResources: 0 stringPropertyNames: + - Analytics_ServiceEnabled::Analytics_ServiceEnabled + - Build_ServiceEnabled::Build_ServiceEnabled + - Collab_ServiceEnabled::Collab_ServiceEnabled + - ErrorHub_ServiceEnabled::ErrorHub_ServiceEnabled + - Game_Performance_ServiceEnabled::Game_Performance_ServiceEnabled + - Hub_ServiceEnabled::Hub_ServiceEnabled + - Purchasing_ServiceEnabled::Purchasing_ServiceEnabled + - UNet_ServiceEnabled::UNet_ServiceEnabled + - Unity_Ads_ServiceEnabled::Unity_Ads_ServiceEnabled - WebGL::emscriptenArgs - WebGL::template - additionalIl2CppArgs::additionalIl2CppArgs + Analytics_ServiceEnabled::Analytics_ServiceEnabled: False + Build_ServiceEnabled::Build_ServiceEnabled: False + Collab_ServiceEnabled::Collab_ServiceEnabled: False + ErrorHub_ServiceEnabled::ErrorHub_ServiceEnabled: False + Game_Performance_ServiceEnabled::Game_Performance_ServiceEnabled: False + Hub_ServiceEnabled::Hub_ServiceEnabled: False + Purchasing_ServiceEnabled::Purchasing_ServiceEnabled: False + UNet_ServiceEnabled::UNet_ServiceEnabled: False + Unity_Ads_ServiceEnabled::Unity_Ads_ServiceEnabled: False WebGL::emscriptenArgs: WebGL::template: APPLICATION:Default additionalIl2CppArgs::additionalIl2CppArgs: + vectorPropertyNames: [] cloudProjectId: projectName: organizationId: diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 558807b2..069bc88e 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.3.5f1 +m_EditorVersion: 5.4.0f3 m_StandardAssetsVersion: 0