Merge remote-tracking branch 'origin/dev'

VirtueSky · Aug 12, 2024 · 41b5e31 · 41b5e31
2 parents fcd13a6 + 2367d1f
commit 41b5e31
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/VirtueSky/ControlPanel/ConstantPackage.cs b/VirtueSky/ControlPanel/ConstantPackage.cs
@@ -36,7 +36,7 @@ public class ConstantPackage
             "com.google.external-dependency-manager";
 
         public const string MaxVersionGGExternalDependencyManager =
-            "https://github.com/google-unity/external-dependency-manager.git#1.2.181";
+            "https://github.com/google-unity/external-dependency-manager.git#1.2.182";
 
         public const string PackageNameGGPlayReview = "com.google.play.review";
 

diff --git a/VirtueSky/RemoteConfig/FirebaseRemoteConfigManager.cs b/VirtueSky/RemoteConfig/FirebaseRemoteConfigManager.cs
@@ -25,6 +25,7 @@ public class FirebaseRemoteConfigManager : MonoBehaviour
 #endif
 
         [Space, SerializeField] private BooleanVariable isFetchRemoteConfigCompleted;
+        [Space, SerializeField] private BooleanVariable firebaseDependencyAvailable;
         [Space, SerializeField] private List<FirebaseRemoteConfigData> listRemoteConfigData;
 
         private void Awake()
@@ -51,11 +52,21 @@ private void InitRemoteConfig()
                 isFetchRemoteConfigCompleted.Value = false;
             }
 
+            if (firebaseDependencyAvailable != null)
+            {
+                firebaseDependencyAvailable.Value = false;
+            }
+
             FirebaseApp.CheckAndFixDependenciesAsync().ContinueWithOnMainThread(task =>
             {
                 dependencyStatus = task.Result;
                 if (dependencyStatus == DependencyStatus.Available)
                 {
+                    var app = FirebaseApp.DefaultInstance;
+                    if (firebaseDependencyAvailable != null)
+                    {
+                        firebaseDependencyAvailable.Value = true;
+                    }
 #if VIRTUESKY_FIREBASE_REMOTECONFIG
                     FetchDataAsync();
 #endif

diff --git a/VirtueSky/Utils/Editor/UnityPackage/Note_Package.txt b/VirtueSky/Utils/Editor/UnityPackage/Note_Package.txt
@@ -1,4 +1,4 @@
-- Version Max Sdk: 6.6.1
+- Version Max Sdk: 6.6.2
 - Version Admob Sdk: v9.2.0
 - Version IronSource (UnityLevelPlay) Skd: 8.1.0
 - Version Google Game Play Service: v11.01
diff --git a/VirtueSky/Utils/Editor/UnityPackage/max-sdk.unitypackage b/VirtueSky/Utils/Editor/UnityPackage/max-sdk.unitypackage