diff --git a/Assets/Scripts/UmaDatabase/UmaDataTypes.cs b/Assets/Scripts/UmaDatabase/UmaDataTypes.cs index fb701c6..b0b2aeb 100644 --- a/Assets/Scripts/UmaDatabase/UmaDataTypes.cs +++ b/Assets/Scripts/UmaDatabase/UmaDataTypes.cs @@ -18,17 +18,17 @@ public class UmaDatabaseEntry var path = $"{Config.Instance.MainPath}\\dat\\{Url.Substring(0, 2)}\\{Url}"; if (!File.Exists(path) && Config.Instance.WorkMode == WorkMode.Standalone) { - UmaViewerMain.Instance.StartCoroutine(DownloadAsset(this)); + DownloadAsset(this); } return path; } } - - public static IEnumerator DownloadAsset(UmaDatabaseEntry entry) + //TODO Make it async + public static void DownloadAsset(UmaDatabaseEntry entry) { var path = $"{Config.Instance.MainPath}\\dat\\{entry.Url.Substring(0, 2)}\\{entry.Url}"; - yield return UmaViewerDownload.DownloadAsset(entry, path , delegate(string msg) + UmaViewerDownload.DownloadAssetSync(entry, path , delegate(string msg) { UmaViewerUI.Instance.MessagePannel.SetActive(true); UmaViewerUI.Instance.MessageText.text = msg; diff --git a/Assets/Scripts/UmaViewerDownload.cs b/Assets/Scripts/UmaViewerDownload.cs index cd2ec5d..99eb7a5 100644 --- a/Assets/Scripts/UmaViewerDownload.cs +++ b/Assets/Scripts/UmaViewerDownload.cs @@ -28,7 +28,7 @@ public class UmaViewerDownload : MonoBehaviour } } - public static IEnumerator DownloadAsset(UmaDatabaseEntry entry,string path, Action callback = null) + public static void DownloadAssetSync(UmaDatabaseEntry entry,string path, Action callback = null) { string baseurl = GetAssetRequestUrl(entry.Url); if (!string.IsNullOrEmpty(Path.GetExtension(entry.Name))) @@ -37,8 +37,8 @@ public class UmaViewerDownload : MonoBehaviour } using UnityWebRequest www = UnityWebRequest.Get(baseurl); - callback?.Invoke($"Downloading missing asset : {Path.GetFileName(entry.Name)}\n"); - yield return www.SendWebRequest(); + www.SendWebRequest(); + while (!www.isDone) { } if (www.result != UnityWebRequest.Result.Success) { Debug.LogError(www.error); @@ -49,7 +49,6 @@ public class UmaViewerDownload : MonoBehaviour Debug.Log("saving " + entry.Url); Directory.CreateDirectory(Path.GetDirectoryName(path)); File.WriteAllBytes(path, www.downloadHandler.data); - callback?.Invoke($"Downloading missing asset : {Path.GetFileName(entry.Name)}\ncompleted, please load again"); } }