diff --git a/sample/Assets/Scripts/UnauthenticatedScript.cs b/sample/Assets/Scripts/UnauthenticatedScript.cs index 7b65ba6b..cff0c7ec 100644 --- a/sample/Assets/Scripts/UnauthenticatedScript.cs +++ b/sample/Assets/Scripts/UnauthenticatedScript.cs @@ -40,7 +40,7 @@ async void Start() #endif passport = await Passport.Init( -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) clientId, environment, redirectUri, logoutRedirectUri, 10000 #else clientId, environment, redirectUri, logoutRedirectUri diff --git a/src/Packages/Passport/Editor/PassportPostprocess.cs b/src/Packages/Passport/Editor/PassportPostprocess.cs index 188f0d8f..cdea39f7 100644 --- a/src/Packages/Passport/Editor/PassportPostprocess.cs +++ b/src/Packages/Passport/Editor/PassportPostprocess.cs @@ -19,7 +19,7 @@ internal class PassportPostprocess : IPostprocessBuildWithReport public void OnPostprocessBuild(BuildReport report) { - Debug.Log("Passport post-processing..."); + Debug.Log($"Passport post-processing..."); if (report.summary.result is BuildResult.Failed || report.summary.result is BuildResult.Cancelled) return; @@ -184,6 +184,6 @@ private void CopyFilesTo(string destinationPath) } } } -} - +} + #endif \ No newline at end of file diff --git a/src/Packages/Passport/Runtime/Scripts/Private/Core/BrowserCommunicationsManager.cs b/src/Packages/Passport/Runtime/Scripts/Private/Core/BrowserCommunicationsManager.cs index e0da0360..cba26a05 100644 --- a/src/Packages/Passport/Runtime/Scripts/Private/Core/BrowserCommunicationsManager.cs +++ b/src/Packages/Passport/Runtime/Scripts/Private/Core/BrowserCommunicationsManager.cs @@ -2,7 +2,7 @@ using System; using Cysharp.Threading.Tasks; using System.Collections.Generic; -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) using VoltstroStudios.UnityWebBrowser.Core; #else using Immutable.Browser.Gree; diff --git a/src/Packages/Passport/Runtime/Scripts/Public/Passport.cs b/src/Packages/Passport/Runtime/Scripts/Public/Passport.cs index 3a429548..5dde3ea4 100644 --- a/src/Packages/Passport/Runtime/Scripts/Public/Passport.cs +++ b/src/Packages/Passport/Runtime/Scripts/Public/Passport.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System; -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) using VoltstroStudios.UnityWebBrowser.Core; #else using Immutable.Browser.Gree; @@ -21,7 +21,7 @@ public class Passport public static Passport Instance { get; private set; } -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) private readonly IWebBrowserClient webBrowserClient = new WebBrowserClient(); #else private readonly IWebBrowserClient webBrowserClient = new GreeBrowserClient(); @@ -36,7 +36,7 @@ public class Passport private Passport() { -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) Application.quitting += OnQuit; #elif UNITY_IPHONE || UNITY_STANDALONE_OSX || UNITY_EDITOR_OSX Application.deepLinkActivated += OnDeepLinkActivated; @@ -57,7 +57,7 @@ private Passport() /// (Android, iOS and macOS only) The URL to which auth will redirect the browser after log out is complete /// (Windows only) Timeout time for waiting for the engine to start (in milliseconds) public static UniTask Init( -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) string clientId, string environment, string redirectUri = null, string logoutRedirectUri = null, int engineStartupTimeoutMs = 4000 #else string clientId, string environment, string redirectUri = null, string logoutRedirectUri = null @@ -70,7 +70,7 @@ public static UniTask Init( Instance = new Passport(); // Wait until we get a ready signal return Instance.Initialise( -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) engineStartupTimeoutMs #endif ) @@ -101,7 +101,7 @@ public static UniTask Init( } private async UniTask Initialise( -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) int engineStartupTimeoutMs #endif ) @@ -110,7 +110,7 @@ int engineStartupTimeoutMs { BrowserCommunicationsManager communicationsManager = new BrowserCommunicationsManager(webBrowserClient); communicationsManager.OnReady += () => readySignalReceived = true; -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) await ((WebBrowserClient)webBrowserClient).Init(engineStartupTimeoutMs); #endif passportImpl = new PassportImpl(communicationsManager); @@ -125,7 +125,7 @@ int engineStartupTimeoutMs } } -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) private void OnQuit() { // Need to clean up UWB resources when quitting the game in the editor diff --git a/src/Packages/Passport/Runtime/ThirdParty/Gree/Assets/Plugins/WebViewObject.cs b/src/Packages/Passport/Runtime/ThirdParty/Gree/Assets/Plugins/WebViewObject.cs index 640570bb..c6504f06 100644 --- a/src/Packages/Passport/Runtime/ThirdParty/Gree/Assets/Plugins/WebViewObject.cs +++ b/src/Packages/Passport/Runtime/ThirdParty/Gree/Assets/Plugins/WebViewObject.cs @@ -295,7 +295,7 @@ public void LaunchAuthURL(string url, string redirectUri) if (webView == IntPtr.Zero) return; _CWebViewPlugin_LaunchAuthURL(webView, url, redirectUri != null ? redirectUri : ""); -#elif UNITY_IPHONE +#elif UNITY_IPHONE && !UNITY_EDITOR_WIN if (webView == IntPtr.Zero) return; _CWebViewPlugin_LaunchAuthURL(webView, url); diff --git a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/AssemblyInfo.cs b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/AssemblyInfo.cs index c4dbe092..2e776636 100644 --- a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/AssemblyInfo.cs +++ b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/AssemblyInfo.cs @@ -1,4 +1,4 @@ -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) // UnityWebBrowser (UWB) // Copyright (c) 2021-2022 Voltstro-Studios diff --git a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Communication/CommunicationLayer.cs b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Communication/CommunicationLayer.cs index 2eae1a8b..c55d3601 100644 --- a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Communication/CommunicationLayer.cs +++ b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Communication/CommunicationLayer.cs @@ -1,4 +1,4 @@ -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) // UnityWebBrowser (UWB) // Copyright (c) 2021-2022 Voltstro-Studios diff --git a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Communication/TCPCommunicationLayer.cs b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Communication/TCPCommunicationLayer.cs index 1c64a189..b0f53d86 100644 --- a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Communication/TCPCommunicationLayer.cs +++ b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Communication/TCPCommunicationLayer.cs @@ -1,4 +1,4 @@ -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) // UnityWebBrowser (UWB) // Copyright (c) 2021-2022 Voltstro-Studios diff --git a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Core/BaseUwbClientManager.cs b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Core/BaseUwbClientManager.cs index 9c45fc14..b9832127 100644 --- a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Core/BaseUwbClientManager.cs +++ b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Core/BaseUwbClientManager.cs @@ -1,4 +1,4 @@ -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) // UnityWebBrowser (UWB) // Copyright (c) 2021-2022 Voltstro-Studios diff --git a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Core/Engines/Engine.cs b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Core/Engines/Engine.cs index 729df4e0..e8a0bf22 100644 --- a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Core/Engines/Engine.cs +++ b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Core/Engines/Engine.cs @@ -1,4 +1,4 @@ -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) // UnityWebBrowser (UWB) // Copyright (c) 2021-2022 Voltstro-Studios diff --git a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Core/Engines/EngineConfiguration.cs b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Core/Engines/EngineConfiguration.cs index df00788a..545cfc2b 100644 --- a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Core/Engines/EngineConfiguration.cs +++ b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Core/Engines/EngineConfiguration.cs @@ -1,4 +1,4 @@ -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) // UnityWebBrowser (UWB) // Copyright (c) 2021-2022 Voltstro-Studios diff --git a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Core/WebBrowserArgsBuilder.cs b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Core/WebBrowserArgsBuilder.cs index 8392f32f..40b6e3b5 100644 --- a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Core/WebBrowserArgsBuilder.cs +++ b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Core/WebBrowserArgsBuilder.cs @@ -1,4 +1,4 @@ -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) // UnityWebBrowser (UWB) // Copyright (c) 2021-2022 Voltstro-Studios diff --git a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Core/WebBrowserClient.cs b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Core/WebBrowserClient.cs index a95a3fb8..32571e94 100644 --- a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Core/WebBrowserClient.cs +++ b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Core/WebBrowserClient.cs @@ -1,4 +1,4 @@ -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) // UnityWebBrowser (UWB) // Copyright (c) 2021-2022 Voltstro-Studios @@ -248,6 +248,10 @@ public IWebBrowserLogger Logger public WebBrowserClient() { +#if (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) + UnityEngine.Debug.LogWarning("Native Android and iOS WebViews cannot run in the Editor, so the Windows WebView is currently used to save your development time." + + " Testing your game on an actual device or emulator is recommended to ensure proper functionality."); +#endif } /// @@ -312,7 +316,7 @@ public async UniTask Init(int engineStartupTimeout = 4000) #if UNITY_EDITOR filePath = Constants.SCHEME_FILE + Path.GetFullPath($"{PASSPORT_PACKAGE_RESOURCES_DIRECTORY}{Constants.PASSPORT_HTML_FILE_NAME}"); #else -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) filePath = Constants.SCHEME_FILE + Path.GetFullPath(Application.dataPath) + Constants.PASSPORT_DATA_DIRECTORY_NAME + Constants.PASSPORT_HTML_FILE_NAME; #endif #endif diff --git a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Core/WebBrowserCommunicationsManager.cs b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Core/WebBrowserCommunicationsManager.cs index e1dca79b..9e5dda5a 100644 --- a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Core/WebBrowserCommunicationsManager.cs +++ b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Core/WebBrowserCommunicationsManager.cs @@ -1,4 +1,4 @@ -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) // UnityWebBrowser (UWB) // Copyright (c) 2021-2022 Voltstro-Studios diff --git a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Editor/EngineManagement/EngineManager.cs b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Editor/EngineManagement/EngineManager.cs index b65d1c61..1c253909 100644 --- a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Editor/EngineManagement/EngineManager.cs +++ b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Editor/EngineManagement/EngineManager.cs @@ -3,7 +3,7 @@ // // This project is under the MIT license. See the LICENSE.md file for more details. -#if UNITY_EDITOR && UNITY_STANDALONE_WIN +#if UNITY_EDITOR && (UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN)) using System.IO; using System.Linq; diff --git a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Events/OnFullscreenChange.cs b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Events/OnFullscreenChange.cs index 78d07de9..772be935 100644 --- a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Events/OnFullscreenChange.cs +++ b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Events/OnFullscreenChange.cs @@ -1,4 +1,4 @@ -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) // UnityWebBrowser (UWB) // Copyright (c) 2021-2022 Voltstro-Studios diff --git a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Events/OnLoadFinish.cs b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Events/OnLoadFinish.cs index 1b06ff92..a2804777 100644 --- a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Events/OnLoadFinish.cs +++ b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Events/OnLoadFinish.cs @@ -1,4 +1,4 @@ -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) // UnityWebBrowser (UWB) // Copyright (c) 2021-2022 Voltstro-Studios diff --git a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Events/OnLoadStart.cs b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Events/OnLoadStart.cs index 35c2056f..8d39653a 100644 --- a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Events/OnLoadStart.cs +++ b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Events/OnLoadStart.cs @@ -1,4 +1,4 @@ -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) // UnityWebBrowser (UWB) // Copyright (c) 2021-2022 Voltstro-Studios diff --git a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Events/OnLoadingProgressChange.cs b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Events/OnLoadingProgressChange.cs index c8fb7d3f..7917884d 100644 --- a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Events/OnLoadingProgressChange.cs +++ b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Events/OnLoadingProgressChange.cs @@ -1,4 +1,4 @@ -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) // UnityWebBrowser (UWB) // Copyright (c) 2021-2022 Voltstro-Studios diff --git a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Events/OnTitleChange.cs b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Events/OnTitleChange.cs index e1f166d4..91eace61 100644 --- a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Events/OnTitleChange.cs +++ b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Events/OnTitleChange.cs @@ -1,4 +1,4 @@ -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) // UnityWebBrowser (UWB) // Copyright (c) 2021-2022 Voltstro-Studios diff --git a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Events/OnUrlChange.cs b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Events/OnUrlChange.cs index e9091615..0080ba17 100644 --- a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Events/OnUrlChange.cs +++ b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Events/OnUrlChange.cs @@ -1,4 +1,4 @@ -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) // UnityWebBrowser (UWB) // Copyright (c) 2021-2022 Voltstro-Studios diff --git a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Helper/ProcessExtensions.cs b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Helper/ProcessExtensions.cs index 91defc4d..2ab4afeb 100644 --- a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Helper/ProcessExtensions.cs +++ b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Helper/ProcessExtensions.cs @@ -1,4 +1,4 @@ -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) // UnityWebBrowser (UWB) // Copyright (c) 2021-2022 Voltstro-Studios diff --git a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Helper/WebBrowserUtils.cs b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Helper/WebBrowserUtils.cs index eb497566..b6882dd4 100644 --- a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Helper/WebBrowserUtils.cs +++ b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Helper/WebBrowserUtils.cs @@ -1,4 +1,4 @@ -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) // UnityWebBrowser (UWB) // Copyright (c) 2021-2022 Voltstro-Studios @@ -83,7 +83,7 @@ public static string GetBrowserEngineProcessPath(Engine engine) return EngineManager.GetEngineProcessFullPath(engine); #else string path = $"{GetBrowserEnginePath(null)}/{engine.GetEngineExecutableName()}"; -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) path += ".exe"; #endif return Path.GetFullPath(path); diff --git a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Input/WebBrowserInputHandler.cs b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Input/WebBrowserInputHandler.cs index 505138d8..806d5a5b 100644 --- a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Input/WebBrowserInputHandler.cs +++ b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Input/WebBrowserInputHandler.cs @@ -1,4 +1,4 @@ -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) // UnityWebBrowser (UWB) // Copyright (c) 2021-2022 Voltstro-Studios diff --git a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Input/WebBrowserInputHelper.cs b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Input/WebBrowserInputHelper.cs index 64ae0938..2509bb47 100644 --- a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Input/WebBrowserInputHelper.cs +++ b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Input/WebBrowserInputHelper.cs @@ -1,4 +1,4 @@ -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) // UnityWebBrowser (UWB) // Copyright (c) 2021-2022 Voltstro-Studios diff --git a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Input/WebBrowserInputSystemHandler.cs b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Input/WebBrowserInputSystemHandler.cs index d44f31ca..0794ae92 100644 --- a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Input/WebBrowserInputSystemHandler.cs +++ b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Input/WebBrowserInputSystemHandler.cs @@ -1,4 +1,4 @@ -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) // UnityWebBrowser (UWB) // Copyright (c) 2021-2022 Voltstro-Studios diff --git a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Input/WebBrowserOldInputHandler.cs b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Input/WebBrowserOldInputHandler.cs index ac3527eb..b56c08cb 100644 --- a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Input/WebBrowserOldInputHandler.cs +++ b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Input/WebBrowserOldInputHandler.cs @@ -1,4 +1,4 @@ -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) // UnityWebBrowser (UWB) // Copyright (c) 2021-2022 Voltstro-Studios diff --git a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Logging/DefaultUnityWebBrowserLogger.cs b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Logging/DefaultUnityWebBrowserLogger.cs index 83d19d68..1a2ffdc5 100644 --- a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Logging/DefaultUnityWebBrowserLogger.cs +++ b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Logging/DefaultUnityWebBrowserLogger.cs @@ -1,4 +1,4 @@ -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) // UnityWebBrowser (UWB) // Copyright (c) 2021-2022 Voltstro-Studios diff --git a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Logging/IWebBrowserLogger.cs b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Logging/IWebBrowserLogger.cs index 81620f59..37262595 100644 --- a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Logging/IWebBrowserLogger.cs +++ b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Logging/IWebBrowserLogger.cs @@ -1,4 +1,4 @@ -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) // UnityWebBrowser (UWB) // Copyright (c) 2021-2022 Voltstro-Studios diff --git a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Logging/JsonLogSeverityConverter.cs b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Logging/JsonLogSeverityConverter.cs index d0ad5070..d603ed9c 100644 --- a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Logging/JsonLogSeverityConverter.cs +++ b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Logging/JsonLogSeverityConverter.cs @@ -1,4 +1,4 @@ -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) // UnityWebBrowser (UWB) // Copyright (c) 2021-2022 Voltstro-Studios diff --git a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Logging/JsonLogStructure.cs b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Logging/JsonLogStructure.cs index 8f95f8be..a726b75f 100644 --- a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Logging/JsonLogStructure.cs +++ b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Logging/JsonLogStructure.cs @@ -1,4 +1,4 @@ -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) // UnityWebBrowser (UWB) // Copyright (c) 2021-2022 Voltstro-Studios diff --git a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Logging/ProcessLogHandler.cs b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Logging/ProcessLogHandler.cs index 36c88291..94ddb03f 100644 --- a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Logging/ProcessLogHandler.cs +++ b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/Logging/ProcessLogHandler.cs @@ -1,4 +1,4 @@ -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) // UnityWebBrowser (UWB) // Copyright (c) 2021-2022 Voltstro-Studios diff --git a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/UwbIsConnectedException.cs b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/UwbIsConnectedException.cs index b204b26d..0f1bb493 100644 --- a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/UwbIsConnectedException.cs +++ b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/UwbIsConnectedException.cs @@ -1,4 +1,4 @@ -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) // UnityWebBrowser (UWB) // Copyright (c) 2021-2022 Voltstro-Studios diff --git a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/UwbIsNotConnectedException.cs b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/UwbIsNotConnectedException.cs index ba1a7e98..1458c104 100644 --- a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/UwbIsNotConnectedException.cs +++ b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/UwbIsNotConnectedException.cs @@ -1,4 +1,4 @@ -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) // UnityWebBrowser (UWB) // Copyright (c) 2021-2022 Voltstro-Studios diff --git a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/UwbIsNotReadyException.cs b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/UwbIsNotReadyException.cs index 1d906d28..f767803e 100644 --- a/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/UwbIsNotReadyException.cs +++ b/src/Packages/Passport/Runtime/ThirdParty/UnityWebBrowser/Runtime/UwbIsNotReadyException.cs @@ -1,4 +1,4 @@ -#if UNITY_STANDALONE_WIN +#if UNITY_STANDALONE_WIN || (UNITY_ANDROID && UNITY_EDITOR_WIN) || (UNITY_IPHONE && UNITY_EDITOR_WIN) // UnityWebBrowser (UWB) // Copyright (c) 2021-2022 Voltstro-Studios