From 70bc662d7ccb3b8c115ba632d6efed19d520f165 Mon Sep 17 00:00:00 2001 From: Cassius Pacheco Date: Thu, 5 Oct 2023 13:14:37 +1100 Subject: [PATCH] wip --- .../Assets/Scripts/UnauthenticatedScript.cs | 2 +- .../Runtime/Scripts/Public/Passport.cs | 7 +-- .../Gree/Assets/Plugins/GreeBrowserClient.cs | 2 + .../Gree/Assets/Plugins/WebView.bundle.meta | 49 ++++++++++++++++++- 4 files changed, 55 insertions(+), 5 deletions(-) diff --git a/sample/Assets/Scripts/UnauthenticatedScript.cs b/sample/Assets/Scripts/UnauthenticatedScript.cs index 4285ad4b..b5ff2bdb 100644 --- a/sample/Assets/Scripts/UnauthenticatedScript.cs +++ b/sample/Assets/Scripts/UnauthenticatedScript.cs @@ -32,7 +32,7 @@ async void Start() #endif passport = await Passport.Init( -#if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX +#if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN clientId, environment, redirectUri, 10000 #else clientId, environment, redirectUri diff --git a/src/Packages/Passport/Runtime/Scripts/Public/Passport.cs b/src/Packages/Passport/Runtime/Scripts/Public/Passport.cs index 7dc2f0c8..671f7e43 100644 --- a/src/Packages/Passport/Runtime/Scripts/Public/Passport.cs +++ b/src/Packages/Passport/Runtime/Scripts/Public/Passport.cs @@ -52,7 +52,7 @@ private Passport() /// (Currently, mobile only) The URL to which auth will redirect the browser after authorisation has been granted by the user /// (Windows only) Timeout time for waiting for the engine to start (in milliseconds) public static UniTask Init( -#if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX +#if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN string clientId, string environment, string? redirectUri = null, int engineStartupTimeoutMs = 4000 #else string clientId, string environment, string? redirectUri = null @@ -61,10 +61,11 @@ public static UniTask Init( { if (Instance == null) { + Debug.Log($"{TAG} Initialising Passport..."); Instance = new Passport(); // Wait until we get a ready signal return Instance.Initialise( -#if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX +#if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN engineStartupTimeoutMs #endif ) @@ -94,7 +95,7 @@ public static UniTask Init( } private async UniTask Initialise( -#if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN || UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX +#if UNITY_EDITOR_WIN || UNITY_STANDALONE_WIN int engineStartupTimeoutMs #endif ) diff --git a/src/Packages/Passport/Runtime/ThirdParty/Gree/Assets/Plugins/GreeBrowserClient.cs b/src/Packages/Passport/Runtime/ThirdParty/Gree/Assets/Plugins/GreeBrowserClient.cs index 96a83899..12da8813 100644 --- a/src/Packages/Passport/Runtime/ThirdParty/Gree/Assets/Plugins/GreeBrowserClient.cs +++ b/src/Packages/Passport/Runtime/ThirdParty/Gree/Assets/Plugins/GreeBrowserClient.cs @@ -26,10 +26,12 @@ public GreeBrowserClient() #if UNITY_ANDROID string filePath = Constants.SCHEME_FILE + ANDROID_DATA_DIRECTORY + Constants.PASSPORT_DATA_DIRECTORY_NAME + Constants.PASSPORT_HTML_FILE_NAME; #elif UNITY_EDITOR_OSX || UNITY_STANDALONE_OSX + Debug.Log($"Data: {Path.GetFullPath(Application.dataPath)}"); string filePath = Constants.SCHEME_FILE + Path.GetFullPath(Application.dataPath) + MAC_DATA_DIRECTORY + Constants.PASSPORT_DATA_DIRECTORY_NAME + Constants.PASSPORT_HTML_FILE_NAME; #else string filePath = Constants.SCHEME_FILE + Path.GetFullPath(Application.dataPath) + Constants.PASSPORT_DATA_DIRECTORY_NAME + Constants.PASSPORT_HTML_FILE_NAME; #endif + Debug.Log($"Loading URL: {filePath}"); webViewObject.LoadURL(filePath); } diff --git a/src/Packages/Passport/Runtime/ThirdParty/Gree/Assets/Plugins/WebView.bundle.meta b/src/Packages/Passport/Runtime/ThirdParty/Gree/Assets/Plugins/WebView.bundle.meta index 1165b4f0..a612f36b 100644 --- a/src/Packages/Passport/Runtime/ThirdParty/Gree/Assets/Plugins/WebView.bundle.meta +++ b/src/Packages/Passport/Runtime/ThirdParty/Gree/Assets/Plugins/WebView.bundle.meta @@ -6,11 +6,29 @@ PluginImporter: iconMap: {} executionOrder: {} defineConstraints: [] - isPreloaded: 0 + isPreloaded: 1 isOverridable: 1 isExplicitlyReferenced: 0 validateReferences: 1 platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Android: 1 + Exclude Editor: 0 + Exclude Linux64: 1 + Exclude OSXUniversal: 0 + Exclude Win: 1 + Exclude Win64: 1 + Exclude iOS: 1 + - first: + Android: Android + second: + enabled: 0 + settings: + CPU: ARMv7 - first: Any: second: @@ -21,13 +39,42 @@ PluginImporter: second: enabled: 1 settings: + CPU: AnyCPU DefaultValueInitialized: true + OS: AnyOS + - first: + Standalone: Linux64 + second: + enabled: 0 + settings: + CPU: x86_64 - first: Standalone: OSXUniversal second: enabled: 1 settings: CPU: AnyCPU + - first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: x86 + - first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: x86_64 + - first: + iPhone: iOS + second: + enabled: 0 + settings: + AddToEmbeddedBinaries: false + CPU: AnyCPU + CompileFlags: + FrameworkDependencies: userData: assetBundleName: assetBundleVariant: