Update version code to v1.18.3

* Changes & Fixes
  - Fix unable to get controller button on OpenVR(SteamVR) platform
    - Seems latest Unity XR Plugin chages behaviour causes not actvating SteamVRv2Module correctly
  - Now recommanded settings button will show up in VIUSettings if there's ignored settings
  - Fix ViveColliderEventCaster button not working in some cases
  - Fix ControllerButton.BKeyTouch typo

Author: lawwong

Assets/HTC.UnityPlugin/VRModule/Modules/SteamVRv2Module.cs

@@ -209,10 +209,10 @@ public static ulong GetInputSourceHandleForDevice(uint deviceIndex)
         public override bool ShouldActiveModule()
         {
 #if UNITY_2019_3_OR_NEWER && VIU_XR_GENERAL_SETTINGS
-            return VIUSettings.activateSteamVRModule && (UnityXRModule.HasActiveLoader(OPENVR_XR_LOADER_NAME) ||
-                (XRSettings.enabled && XRSettings.loadedDeviceName == "OpenVR"));
+            return VIUSettings.activateSteamVRModule && (UnityXRModuleBase.HasActiveLoader(VRModuleKnownXRLoader.OpenVR) ||
+                (XRSettings.enabled && XRSettings.loadedDeviceName.Contains("OpenVR")));
 #elif UNITY_5_4_OR_NEWER
-            return VIUSettings.activateSteamVRModule && XRSettings.enabled && XRSettings.loadedDeviceName == "OpenVR";
+            return VIUSettings.activateSteamVRModule && XRSettings.enabled && XRSettings.loadedDeviceName.Contains("OpenVR");
 #else
             return VIUSettings.activateSteamVRModule && SteamVR.enabled;
 #endif

Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VIUSettingsEditor.cs

@@ -1045,7 +1045,7 @@ private static void ShowAddPackageButton(string displayName, string identifier,
 
         private static void ShowCheckRecommendedSettingsButton()
         {
-            if (VIUVersionCheck.notifiedSettingsCount <= 0) { return; }
+            if (VIUVersionCheck.notifiedSettingsCount == 0 && VIUVersionCheck.ignoredSettingsCount == 0) { return; }
 
             if (GUILayout.Button("View Recommended Settings", GUILayout.ExpandWidth(false)))
             {

Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/VIUVersion.cs

@@ -6,6 +6,6 @@ namespace HTC.UnityPlugin.Vive
 {
     public static class VIUVersion
     {
-        public static readonly Version current = new Version("1.18.2.0");
+        public static readonly Version current = new Version("1.18.3.0");
     }
 }

Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/ViveColliderEvent/ViveColliderEventCaster.cs

@@ -54,8 +54,8 @@ protected virtual void Start()
         {
             buttonEventDataList.Add(new ViveColliderButtonEventData(this, m_buttonTrigger, ColliderButtonEventData.InputButton.Trigger));
             if (m_buttonPadOrStick != ControllerButton.None) { buttonEventDataList.Add(new ViveColliderButtonEventData(this, m_buttonPadOrStick, ColliderButtonEventData.InputButton.PadOrStick)); }
-            if (m_buttonPadOrStick != ControllerButton.None) { buttonEventDataList.Add(new ViveColliderButtonEventData(this, m_buttonFunctionKey, ColliderButtonEventData.InputButton.FunctionKey)); }
-            if (m_buttonPadOrStick != ControllerButton.None) { buttonEventDataList.Add(new ViveColliderButtonEventData(this, m_buttonGripOrHandTrigger, ColliderButtonEventData.InputButton.GripOrHandTrigger)); }
+            if (m_buttonGripOrHandTrigger != ControllerButton.None) { buttonEventDataList.Add(new ViveColliderButtonEventData(this, m_buttonFunctionKey, ColliderButtonEventData.InputButton.FunctionKey)); }
+            if (m_buttonFunctionKey != ControllerButton.None) { buttonEventDataList.Add(new ViveColliderButtonEventData(this, m_buttonGripOrHandTrigger, ColliderButtonEventData.InputButton.GripOrHandTrigger)); }
 
             FilterOutAssignedButton();
 

Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/ViveInput/ViveInput.cs

@@ -58,7 +58,7 @@ public enum ControllerButton
 
         // button alias
         BKey = Menu,
-        BkeyTouch = MenuTouch,
+        BKeyTouch = MenuTouch,
         OuterFaceButton = Menu, // 7
         OuterFaceButtonTouch = MenuTouch, // 9
         InnerFaceButton = AKey, // 12
@@ -126,6 +126,9 @@ public enum ControllerButton
         [Obsolete]
         [HideInInspector]
         JoystickToucn = 48,
+        [Obsolete]
+        [HideInInspector]
+        BkeyTouch = BKeyTouch,
     }
 
     public enum ControllerAxis

Assets/HTC.UnityPlugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.htc.upm.vive-input-utility",
-  "version": "1.18.2",
+  "version": "1.18.3",
   "displayName": "VIVE Input Utility",
   "description": "The VIVE Input Utility (VIU) is a toolkit for developing VR experiences in Unity, especially with the VIVE/VIVE Pro but also targeting many platforms from a common code base including Oculus Rift, Rift S Go, Quest, Google Daydream, VIVE Wave SDK (e.g. VIVE Focus standalone) and additional VR platforms as supported by Unity such as Microsoft's 'Mixed Reality' VR headsets and more.\n\nCompatible with SteamVR 2.4.0+ and Oculus Integration 16.0+.\n\nView license:\nhttps://github.com/ViveSoftware/ViveInputUtility-Unity/blob/develop/LICENSE.md",
   "keywords": [

CHANGELOG.md

@@ -1,7 +1,17 @@
-# Vive Input Utility for Unity - v1.18.2
+# Vive Input Utility for Unity - v1.18.3
 Copyright (c) 2016-2023, HTC Corporation. All rights reserved.
 
 
+## Changes for v1.18.3:
+
+* Changes & Fixes
+  - Fix unable to get controller button on OpenVR(SteamVR) platform
+    - Seems latest Unity XR Plugin chages behaviour causes not actvating SteamVRv2Module correctly
+  - Now recommanded settings button will show up in VIUSettings if there's ignored settings
+  - Fix ViveColliderEventCaster button not working in some cases
+  - Fix ControllerButton.BKeyTouch typo
+
+
 ## Changes for v1.18.2:
 
 * Bug Fixes