wip

immutable · Oct 5, 2023 · 70bc662 · 70bc662
1 parent 7531833
commit 70bc662
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 5 deletions.
diff --git 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
@@ -52,7 +52,7 @@ private Passport()
         /// <param name="redirectUri">(Currently, mobile only) The URL to which auth will redirect the browser after authorisation has been granted by the user</param>
         /// <param name="engineStartupTimeoutMs">(Windows only) Timeout time for waiting for the engine to start (in milliseconds)</param>
         public static UniTask<Passport> 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<Passport> 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<Passport> 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
@@ -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