This repository was archived by the owner on Jul 11, 2023. It is now read-only.

Commit 5c98207

author

wanderer

committed

下载失败的时候就停止下载,并返回错误

1 parent 2963ab6 commit 5c98207Copy full SHA for 5c98207

File tree

+22

-5

lines changed

GameFramework/Runtime
- Resource
  - ResourceVersion.cs
- WebRequest
  - FileDownloader.cs

+22

-5

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -358,11 +358,14 @@ private void DownloadFiles(List<AssetHashInfo> needDownloadFiles,Action<float, d`
`358`	`358`	`else`
`359`	`359`	`{`
`360`	`360`	`File.Delete(localPath);`
	`361`	`+ _webRequest.FileDownloader.StopDownload();`
`361`	`362`	`//throw new GameException($"File integrity verification failed. {localPath}");`
`362`	`363`	`errorCallback?.Invoke(localPath, "File integrity verification failed.");`
	`364`	`+`
`363`	`365`	`}`
`364`	`366`	`}, (localPath, error) =>`
`365`	`367`	`{`
	`368`	`+ _webRequest.FileDownloader.StopDownload();`
`366`	`369`	`errorCallback?.Invoke(localPath, error);`
`367`	`370`	`});`
`368`	`371`	`}`

Lines changed: 19 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -79,11 +79,7 @@ public void OnUpdate()`
`79`	`79`	`{`
`80`	`80`	`if (_downloadingFiles.Count == 0)`
`81`	`81`	`{`
`82`		`- Downloading = false;`
`83`		`- //下载回调`
`84`		`- _downloadCallback = null;`
`85`		`- _downloadCompleteCallback = null;`
`86`		`- _downloadErrorCallback = null;`
	`82`	`+ StopDownload();`
`87`	`83`	`}`
`88`	`84`	`}`
`89`	`85`	`}`
`@@ -123,6 +119,24 @@ public bool StartDownload(Action<string, double, float, double> downloadCallback`
`123`	`119`	`return true;`
`124`	`120`	`}`
`125`	`121`
	`122`	`+`
	`123`	`+ /// <summary>`
	`124`	`+ /// 停止下载`
	`125`	`+ /// </summary>`
	`126`	`+ public void StopDownload()`
	`127`	`+ {`
	`128`	`+ if (Downloading)`
	`129`	`+ {`
	`130`	`+ //下载回调`
	`131`	`+ _downloadCallback = null;`
	`132`	`+ _downloadCompleteCallback = null;`
	`133`	`+ _downloadErrorCallback = null;`
	`134`	`+ _downloadingFiles.Clear();`
	`135`	`+ _remainingFiles.Clear();`
	`136`	`+ Downloading = false;`
	`137`	`+ }`
	`138`	`+ }`
	`139`	`+`
`126`	`140`	`#endregion`
`127`	`141`
`128`	`142`	`#region 事件回调`

Comments

(0)