Fix issue with micro gamepads that could sometimes cause an exception…

… to be thrown when using tvOS controllers
noodlecake · May 25, 2023 · ca63daf · ca63daf
1 parent da15ae6
commit ca63daf
Show file tree

Hide file tree

Showing 14 changed files with 460 additions and 20 deletions.
diff --git a/GameControllerWrapper/Source/GameControllerWrapper.m b/GameControllerWrapper/Source/GameControllerWrapper.m
@@ -187,10 +187,10 @@ BOOL NCRegisterInputCallback(void (*unity_callback)(int, float, float)) {
                     elemId = Dpad;
                 }
 
-                if (elemId <= ButtonThumbstickRight) {
+                if ([element isKindOfClass:[GCControllerButtonInput class]]) {
                     val1 = ((GCControllerButtonInput*)element).value;
                     val2 = ((GCControllerButtonInput*)element).pressed;
-                } else if (elemId <= ThumbstickRight) {
+                } else if ([element isKindOfClass:[GCControllerDirectionPad class]]) {
                     val1 = ((GCControllerDirectionPad*)element).xAxis.value;
                     val2 = ((GCControllerDirectionPad*)element).yAxis.value;
                 }

diff --git a/NCGameControllerUnity.unitypackage b/NCGameControllerUnity.unitypackage
diff --git a/UnityProject/Assets/Plugins/NCGameControllerUnity/iOS/libGameControllerWrapperiOS.a b/UnityProject/Assets/Plugins/NCGameControllerUnity/iOS/libGameControllerWrapperiOS.a
diff --git a/UnityProject/Assets/Plugins/NCGameControllerUnity/iOS/libGameControllerWrapperiOS.a.meta b/UnityProject/Assets/Plugins/NCGameControllerUnity/iOS/libGameControllerWrapperiOS.a.meta
diff --git a/.../Plugins/NCGameControllerUnity/macOSX/GameControllerWrapperMac.bundle/Contents/Info.plist b/.../Plugins/NCGameControllerUnity/macOSX/GameControllerWrapperMac.bundle/Contents/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>20C69</string>
+	<string>22A400</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -27,19 +27,19 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>12C33</string>
+	<string></string>
 	<key>DTPlatformName</key>
 	<string>macosx</string>
 	<key>DTPlatformVersion</key>
-	<string>11.1</string>
+	<string>13.3</string>
 	<key>DTSDKBuild</key>
-	<string>20C63</string>
+	<string>22E245</string>
 	<key>DTSDKName</key>
-	<string>macosx11.1</string>
+	<string>macosx13.3</string>
 	<key>DTXcode</key>
-	<string>1230</string>
+	<string>1430</string>
 	<key>DTXcodeBuild</key>
-	<string>12C33</string>
+	<string>14E222b</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>11.0</string>
 	<key>NSHumanReadableCopyright</key>

diff --git a/...ollerUnity/macOSX/GameControllerWrapperMac.bundle/Contents/MacOS/GameControllerWrapperMac b/...ollerUnity/macOSX/GameControllerWrapperMac.bundle/Contents/MacOS/GameControllerWrapperMac
diff --git a/UnityProject/Assets/Plugins/NCGameControllerUnity/tvOS/libGameControllerWrappertvOS.a b/UnityProject/Assets/Plugins/NCGameControllerUnity/tvOS/libGameControllerWrappertvOS.a
diff --git a/UnityProject/Assets/Resources.meta b/UnityProject/Assets/Resources.meta
diff --git a/UnityProject/Assets/Resources/BillingMode.json b/UnityProject/Assets/Resources/BillingMode.json
@@ -0,0 +1 @@
+{"androidStore":"GooglePlay"}
diff --git a/UnityProject/Assets/Resources/BillingMode.json.meta b/UnityProject/Assets/Resources/BillingMode.json.meta
diff --git a/UnityProject/Packages/manifest.json b/UnityProject/Packages/manifest.json
@@ -1,13 +1,20 @@
 {
   "dependencies": {
-    "com.unity.ads": "2.0.8",
-    "com.unity.analytics": "3.3.2",
-    "com.unity.collab-proxy": "1.2.16",
-    "com.unity.package-manager-ui": "2.1.2",
-    "com.unity.purchasing": "2.0.6",
-    "com.unity.textmeshpro": "2.0.0",
-    "com.unity.timeline": "1.0.0",
+    "com.unity.2d.sprite": "1.0.0",
+    "com.unity.2d.tilemap": "1.0.0",
+    "com.unity.ads": "3.7.5",
+    "com.unity.analytics": "3.6.12",
+    "com.unity.collab-proxy": "1.14.16",
+    "com.unity.ide.rider": "1.2.1",
+    "com.unity.ide.visualstudio": "2.0.15",
+    "com.unity.ide.vscode": "1.2.5",
+    "com.unity.purchasing": "4.1.4",
+    "com.unity.test-framework": "1.1.31",
+    "com.unity.textmeshpro": "2.1.4",
+    "com.unity.timeline": "1.2.18",
+    "com.unity.ugui": "1.0.0",
     "com.unity.modules.ai": "1.0.0",
+    "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
     "com.unity.modules.assetbundle": "1.0.0",
     "com.unity.modules.audio": "1.0.0",