Remove recommended settings for disabling resolution dialog in Unity 2019.3

lawwong · lawwong · commit f5f0d9fc3b23 · 2019-12-08T04:39:23.000+08:00
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VIUVersionCheck.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VIUVersionCheck.cs
@@ -1,5 +1,5 @@
 ﻿//========= Copyright 2016-2019, HTC Corporation. All rights reserved. ===========
-
+#pragma warning disable 0649
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/OpenVRSettings.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/OpenVRSettings.cs
@@ -256,6 +256,7 @@ public OpenVRRecommendedSettings()
                 recommendedValue = true,
             });
 
+#if !UNITY_2019_3_OR_NEWER
             Add(new VIUVersionCheck.RecommendedSetting<ResolutionDialogSetting>()
             {
                 settingTitle = "Display Resolution Dialog",
@@ -264,6 +265,7 @@ public OpenVRRecommendedSettings()
                 setValueFunc = v => PlayerSettings.displayResolutionDialog = v,
                 recommendedValue = ResolutionDialogSetting.HiddenByDefault,
             });
+#endif
 
             Add(new VIUVersionCheck.RecommendedSetting<bool>()
             {

Original file line number	Diff line number	Diff line change
`@@ -256,6 +256,7 @@ public OpenVRRecommendedSettings()`
`256`	`256`	`recommendedValue = true,`
`257`	`257`	`});`
`258`	`258`
	`259`	`+#if !UNITY_2019_3_OR_NEWER`
`259`	`260`	`Add(new VIUVersionCheck.RecommendedSetting<ResolutionDialogSetting>()`
`260`	`261`	`{`
`261`	`262`	`settingTitle = "Display Resolution Dialog",`
`@@ -264,6 +265,7 @@ public OpenVRRecommendedSettings()`
`264`	`265`	`setValueFunc = v => PlayerSettings.displayResolutionDialog = v,`
`265`	`266`	`recommendedValue = ResolutionDialogSetting.HiddenByDefault,`
`266`	`267`	`});`
	`268`	`+#endif`
`267`	`269`
`268`	`270`	`Add(new VIUVersionCheck.RecommendedSetting<bool>()`
`269`	`271`	`{`