fix: addressables new version bug - duplicate load

Author: serg.morozov

Assets/AddressableAssetsData/Android/addressables_content_state.bin

@@ -55,7 +55,14 @@ public static async Task InitAsync(Action<float>? onProgress, Action? onComplete
 #pragma warning restore 4014
             var resourceLocations = await loadHandler.Task;
 
-            var loadTasks = resourceLocations.ToDictionary(resourceLocation => resourceLocation.PrimaryKey.Substring(SODatabaseSettings.Path.Length), resourceLocation => Addressables.LoadAssetAsync<DataNode>(resourceLocation).Task);
+            var loadTasks = new Dictionary<string, Task<DataNode>>();
+            foreach (var resourceLocation in resourceLocations)
+            {
+                var key = resourceLocation.PrimaryKey.Substring(SODatabaseSettings.Path.Length);
+                if (!resourceLocation.ResourceType.IsSubclassOf(typeof(DataNode)) || loadTasks.ContainsKey(key))
+                    continue;
+                loadTasks.Add(key, Addressables.LoadAssetAsync<DataNode>(resourceLocation).Task);
+            }
             await Task.WhenAll(loadTasks.Values);
             root = new FolderHolder();
             foreach (var loadTask in loadTasks)
@@ -71,7 +78,7 @@ public static async Task InitAsync(Action<float>? onProgress, Action? onComplete
                     curFolder = curFolder.FolderHolders[pathElements[i]];
                 }
 
-                var dataNodeName = pathElements[pathElements.Length - 1];
+                var dataNodeName = pathElements[^1];
                 dataNodeName = dataNodeName.Substring(0, dataNodeName.IndexOf(".asset", StringComparison.Ordinal));
                 curFolder.DataNodes.Add(dataNodeName, loadTask.Value.Result);
             }

Assets/com.nuclearband.sodatabase/Runtime/SODatabase.cs

@@ -1,13 +1,13 @@
 {
   "dependencies": {
-    "com.unity.addressables": "1.19.17",
-    "com.unity.ide.rider": "3.0.9",
-    "com.unity.ide.visualstudio": "2.0.12",
-    "com.unity.ide.vscode": "1.2.4",
+    "com.unity.addressables": "1.19.19",
+    "com.unity.ide.rider": "3.0.13",
+    "com.unity.ide.visualstudio": "2.0.14",
+    "com.unity.ide.vscode": "1.2.5",
     "com.unity.nuget.newtonsoft-json": "2.0.2",
-    "com.unity.test-framework": "1.1.30",
+    "com.unity.test-framework": "1.1.31",
     "com.unity.textmeshpro": "3.0.6",
-    "com.unity.timeline": "1.6.3",
+    "com.unity.timeline": "1.6.4",
     "com.unity.ugui": "1.0.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",

Packages/manifest.json

@@ -1,11 +1,11 @@
 {
   "dependencies": {
     "com.unity.addressables": {
-      "version": "1.19.17",
+      "version": "1.19.19",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.scriptablebuildpipeline": "1.19.5",
+        "com.unity.scriptablebuildpipeline": "1.19.6",
         "com.unity.modules.assetbundle": "1.0.0",
         "com.unity.modules.imageconversion": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0",
@@ -22,7 +22,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "3.0.9",
+      "version": "3.0.13",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -31,7 +31,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.12",
+      "version": "2.0.14",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -40,7 +40,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.vscode": {
-      "version": "1.2.4",
+      "version": "1.2.5",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
@@ -54,14 +54,14 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.scriptablebuildpipeline": {
-      "version": "1.19.5",
+      "version": "1.19.6",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
-      "version": "1.1.30",
+      "version": "1.1.31",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -81,7 +81,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.timeline": {
-      "version": "1.6.3",
+      "version": "1.6.4",
       "depth": 0,
       "source": "registry",
       "dependencies": {

Packages/packages-lock.json

@@ -753,7 +753,7 @@ PlayerSettings:
   webGLThreadsSupport: 0
   webGLDecompressionFallback: 0
   scriptingDefineSymbols:
-    Android: ODIN_INSPECTOR
+    Android: ODIN_INSPECTOR;ODIN_INSPECTOR_3
     Standalone: ODIN_INSPECTOR
   additionalCompilerArguments: {}
   platformArchitecture: {}
@@ -799,6 +799,7 @@ PlayerSettings:
   metroFTAName: 
   metroFTAFileTypes: []
   metroProtocolName: 
+  vcxProjDefaultLanguage: 
   XboxOneProductId: 
   XboxOneUpdateKey: 
   XboxOneSandboxId: 

ProjectSettings/ProjectSettings.asset

@@ -1,2 +1,2 @@
-m_EditorVersion: 2021.2.6f1
-m_EditorVersionWithRevision: 2021.2.6f1 (8c4e826ba445)
+m_EditorVersion: 2021.2.19f1
+m_EditorVersionWithRevision: 2021.2.19f1 (602ecdbb2fb0)