Merge pull request #67 from AIO-GAME/1.x

1.x

Author: xinansky

.gitignore

@@ -22,4 +22,5 @@
 [Ll]ogs/
 [Bb]in/
 [Oo]bj/
-[Pp]ackages/
+[Pp]ackages/
+[Vv]env/

Extensions/YooAsset.CLI/Runtime/1.5.7/Downloader/YAssetProxy.Downloader.cs

@@ -326,7 +326,6 @@ private void CollectNeedBegin()
 
             private Dictionary<string, long> CurrentValueDict = new Dictionary<string, long>();
             private Dictionary<string, long> TotalValueDict = new Dictionary<string, long>();
-            private Dictionary<string, long> DownloadedFiles = new Dictionary<string, long>();
 
             private long FirstValue = -1;
 
@@ -335,8 +334,6 @@ private bool OnWaitBegin()
                 CurrentValueDict.Clear();
                 TotalValueDict.Clear();
 
-                CurrentValueDict[nameof(DownloadedFiles)] = DownloadedFiles.Sum(pair => pair.Value);
-
                 foreach (var pair in ResourceDownloaderOperations)
                 {
                     TotalValueDict[pair.Key] = pair.Value.TotalDownloadBytes;
@@ -346,6 +343,11 @@ private bool OnWaitBegin()
                 if (FirstValue < 0)
                 {
                     FirstValue = TotalValue = TotalValueDict.Sum(pair => pair.Value);
+                    CurrentValue = CurrentValueDict.Sum(pair => pair.Value);
+                }
+                else
+                {
+                    CurrentValueDict[nameof(FirstValue)] = FirstValue - TotalValueDict.Sum(pair => pair.Value);
                 }
 
                 CurrentValue = CurrentValueDict.Sum(pair => pair.Value);
@@ -505,14 +507,12 @@ protected override IEnumerator OnWaitCo()
 
             private void OnStartDownloadFileCallback(string filename, long sizeBytes)
             {
-                DownloadedFiles[filename] = sizeBytes;
                 CurrentInfo = $"Resource download : [{filename}:{sizeBytes}]";
                 AssetSystem.Log($"Resource download : [{filename}:{sizeBytes}]");
             }
 
             private void OnDownloadError(string filename, string error)
             {
-                DownloadedFiles.Remove(filename);
                 var ex = new SystemException($"{filename} : {error}");
                 if (Event.OnError is null) throw ex;
                 Event.OnError.Invoke(ex);

package.json

@@ -2,7 +2,7 @@
   "name": "com.aio.cli.asset",
   "displayName": "AIO Unity CLI Asset",
   "description": "unity3d resources management system.",
-  "version": "1.1.6-preview",
+  "version": "1.1.7-preview",
   "unity": "2019.4",
   "category": "Runtime",
   "unityRelease": "0f1",