Fixed mouse zoom for WebGL (#82)

patches34 · Dec 7, 2023 · d771ace · d771ace
1 parent 328f8d6
commit d771ace
Show file tree

Hide file tree

Showing 29 changed files with 12 additions and 2,059 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,3 +32,5 @@ sysinfo.txt
 # Builds
 *.apk
 *.unitypackage
+
+Logs/
diff --git a/Assets/Scripts/Singletons/MenuManager.cs b/Assets/Scripts/Singletons/MenuManager.cs
@@ -1,4 +1,4 @@
-using UnityEngine;
+using UnityEngine;
 using System.Collections.Generic;
 using System.Collections;
 using UnityEngine.UI;
@@ -102,6 +102,7 @@ void AddScreen(UIMenu screen)
 	void Update()
 	{
 		#region Zooming
+#if UNITY_ANDROID
 		if(Input.touchCount >= 2)
 		{
 			// Store both touches.
@@ -121,24 +122,23 @@ void Update()
 
 			SetZoom(deltaMagnitudeDiff, zoomSpeed);
 		}
-
-		#if UNITY_EDITOR
+#else
 		if(Input.mouseScrollDelta.y != 0)
 		{
 			SetZoom(-Input.mouseScrollDelta.y, mouseWheelSpeed);
 		}
-		#endif
-		#endregion
+#endif
+#endregion
 
-		#region Game Buttons Activation Status
+#region Game Buttons Activation Status
 		playerPassBtn.interactable = GameManager.Instance.IsPlayerTurn();
 
 		playerForfeitBtn.interactable = GameManager.Instance.IsGameActive();
 
 		playerInputBlock.SetActive(!GameManager.Instance.IsPlayerTurn());
 
         playerRetryBtn.interactable = GameManager.Instance.IsGameActive();
-		#endregion
+#endregion
 	}
 
 	void SetZoom(float delta, float zoomSpeed)

diff --git a/Logs/AssetImportWorker0.log b/Logs/AssetImportWorker0.log
diff --git a/Logs/AssetImportWorker1.log b/Logs/AssetImportWorker1.log
diff --git a/Logs/AssetImportWorker2.log b/Logs/AssetImportWorker2.log
diff --git a/Logs/AssetImportWorker3.log b/Logs/AssetImportWorker3.log
diff --git a/Logs/Packages-Update.log b/Logs/Packages-Update.log
diff --git a/Logs/shadercompiler-AssetImportWorker0.log b/Logs/shadercompiler-AssetImportWorker0.log
diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe0.log b/Logs/shadercompiler-UnityShaderCompiler.exe0.log
diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe1.log b/Logs/shadercompiler-UnityShaderCompiler.exe1.log
diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe10.log b/Logs/shadercompiler-UnityShaderCompiler.exe10.log
diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe11.log b/Logs/shadercompiler-UnityShaderCompiler.exe11.log
diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe12.log b/Logs/shadercompiler-UnityShaderCompiler.exe12.log
diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe13.log b/Logs/shadercompiler-UnityShaderCompiler.exe13.log
diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe14.log b/Logs/shadercompiler-UnityShaderCompiler.exe14.log
diff --git a/Logs/shadercompiler-UnityShaderCompiler.exe15.log b/Logs/shadercompiler-UnityShaderCompiler.exe15.log
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,3 +32,5 @@ sysinfo.txt @@
     # Builds
     *.apk
     *.unitypackage
+    Logs/