修复下载

Author: AnyaCoder

Assets/Live2D/Cubism/Framework/Expression/CubismExpressionData.cs

@@ -74,8 +74,13 @@ public static CubismExpressionData CreateInstance(CubismExpressionData expressio
             expressionData.Type = json.Type;
             expressionData.FadeInTime = json.FadeInTime;
             expressionData.FadeOutTime = json.FadeOutTime;
-            expressionData.Parameters = new SerializableExpressionParameter[json.Parameters.Length];
-
+            if (json.Parameters != null) {
+                expressionData.Parameters = new SerializableExpressionParameter[json.Parameters.Length];
+            }
+            else {
+                return expressionData;
+            }
+            
             for(var i = 0; i < json.Parameters.Length; ++i)
             {
                 expressionData.Parameters[i].Id = json.Parameters[i].Id;

Assets/Scenes/SampleScene.unity

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:309d7dcaec187662a0657dc5a35fa6f2a06aacceba01173ef0aa9f431bf8cac4
-size 418487
+oid sha256:d94453170ccc59a5cbce3bf8178b82cd0a138f2922a98ae48bc6f704e9f5a3ac
+size 428328

Assets/Scripts/Http/AvatarManager.cs

@@ -9,87 +9,12 @@ public class AvatarManager : MonoBehaviour
     public Image avatarImage; // 在 Inspector 中绑定的 Image 组件
     public int width = 128;
     public int height = 128;
-    // 静态字典，存储人名和对应的 URL
-    private static Dictionary<string, string> avatarUrls = new Dictionary<string, string>();
+    private object lockObj = new ();
 
-    /// <summary>
-    /// 添加或更新人名和 URL
-    /// </summary>
-    public static void AddOrUpdateAvatarUrl(string name, string url)
-    {
-        if (avatarUrls.ContainsKey(name))
-        {
-            avatarUrls[name] = url; // 更新已有条目
-        }
-        else
-        {
-            avatarUrls.Add(name, url); // 添加新条目
-        }
-    }
-
-    /// <summary>
-    /// 删除人名和 URL
-    /// </summary>
-    public static void RemoveAvatarUrl(string name)
-    {
-        if (avatarUrls.ContainsKey(name))
-        {
-            avatarUrls.Remove(name);
-        }
-    }
-
-    /// <summary>
-    /// 获取人名对应的 URL
-    /// </summary>
-    public static string GetAvatarUrl(string name)
-    {
-        if (avatarUrls.TryGetValue(name, out string url))
-        {
-            return url;
-        }
-        return null; // 未找到则返回 null
-    }
-
-    /// <summary>
-    /// 根据人名下载并设置头像图片
-    /// </summary>
-    public void SetAvatarByName(string name)
-    {
-        string url = GetAvatarUrl(name);
-        if (url != null)
-        {
-            SetAvatar(url); // 使用 URL 下载并设置头像
-        }
-        else
-        {
-            Debug.LogError("未找到人名对应的 URL: " + name);
-        }
-    }
-
-    /// <summary>
-    /// 下载并设置头像图片
-    /// </summary>
-    public void SetAvatar(string url, string folderPath = null)
-    {
-        
-        HttpDownloader.Instance.Download(url, result =>
-        {
-            if (result.Success)
-            {
-                var targetPath = result.FilePath;
-                if (folderPath != null) {
-                    Directory.CreateDirectory(folderPath ?? "");
-                    targetPath = Path.Combine(folderPath, Path.GetFileName(result.FilePath));
-                    MoveFile(result.FilePath, targetPath);
-                }
-                StartCoroutine(LoadAndProcessImage(targetPath));
-            }
-            else
-            {
-                var err = "下载avatar失败: " + result.ErrorMessage;
-                DebugWrapper.Instance.Log(err, Color.red);
-                Debug.LogError(err);
-            }
+    public void SetAvatar(string url, string absolutePath)
+    {   
+        HttpDownloader.Instance.Download(url, absolutePath, r => {
+            StartCoroutine(LoadAndProcessImage(absolutePath));
         });
     }
 
@@ -98,16 +23,19 @@ public void SetAvatar(string url, string folderPath = null)
     /// </summary>
     private IEnumerator LoadAndProcessImage(string filePath)
     {
-        Texture2D texture = LoadTextureFromFile(filePath);
-        if (texture == null)
-        {
-            Debug.LogError("无法加载图片: " + filePath);
-            yield break;
-        }
+        lock (lockObj) {
+            Texture2D texture = LoadTextureFromFile(filePath);
+            if (texture == null)
+            {
+                Debug.LogError("无法加载图片: " + filePath);
+                yield break;
+            }
 
-        Texture2D resizedTexture = ResizeTexture(texture, width, height);
-        Sprite sprite = TextureToSprite(resizedTexture);
-        avatarImage.sprite = sprite;
+            Texture2D resizedTexture = ResizeTexture(texture, width, height);
+            Sprite sprite = TextureToSprite(resizedTexture);
+            avatarImage.sprite = sprite;
+        }
+        
     }
 
     /// <summary>

Assets/Scripts/Http/HttpDownloader.cs

@@ -8,27 +8,15 @@ public class HttpDownloader : InitOnceSingleton<HttpDownloader>
 {
 
     // 下载方法，接受 URL 和回调函数
-    public void Download(string url, Action<DownloadResult> callback)
+    public void Download(string url, string absolutePath, Action<DownloadResult> callback = null)
     {
-        StartCoroutine(DownloadCoroutine(url, callback: callback));
-    }
-
-    public void Download(string url, string fileName, Action<DownloadResult> callback)
-    {
-        StartCoroutine(DownloadCoroutine(url, fileName, callback));
+        StartCoroutine(DownloadCoroutine(url, absolutePath, callback));
     }
 
     // 下载协程，处理异步下载逻辑
-    private IEnumerator DownloadCoroutine(string url, string fileName = null, Action<DownloadResult> callback = null)
+    private IEnumerator DownloadCoroutine(string url, string absolutePath, Action<DownloadResult> callback = null)
     {
-        // 从 URL 中提取文件名，并组合保存路径
-        if (fileName == null) {
-            fileName = Path.GetFileName(url);
-        }
-        // 下载结果存在临时文件夹
-        string filePath = Path.Combine(Application.temporaryCachePath, "tmp", fileName);
-        // 确保目录存在
-        string directory = Path.GetDirectoryName(filePath);
+        string directory = Path.GetDirectoryName(absolutePath);
         if (!Directory.Exists(directory))
         {
             Directory.CreateDirectory(directory);
@@ -37,13 +25,13 @@ private IEnumerator DownloadCoroutine(string url, string fileName = null, Action
         // 创建下载结果对象
         DownloadResult result = new DownloadResult();
 
-        // 如果文件存在，先(删除) 跳过, unity读取图片时会占用，删不掉
-        if (File.Exists(filePath))
+        // 如果文件存在，跳过, unity读取图片时会占用，删不掉
+        if (File.Exists(absolutePath))
         {
             result.Success = true;
-            result.FilePath = filePath;
-            result.FileSize = new FileInfo(filePath).Length; // 获取文件大小
-            // 调用回调函数，返回结果
+            result.FilePath = absolutePath;
+            result.FileSize = new FileInfo(absolutePath).Length; // 获取文件大小
+            result.CompletionTime = DateTime.Now;           // 记录完成时间
             callback?.Invoke(result);
             yield break;
         }
@@ -52,15 +40,15 @@ private IEnumerator DownloadCoroutine(string url, string fileName = null, Action
         using (UnityWebRequest www = UnityWebRequest.Get(url))
         {
             // 设置下载处理器，直接保存到文件
-            www.downloadHandler = new DownloadHandlerFile(filePath);
+            www.downloadHandler = new DownloadHandlerFile(absolutePath);
             yield return www.SendWebRequest();
 
             // 检查下载是否成功
             if (www.result == UnityWebRequest.Result.Success)
             {
                 result.Success = true;
-                result.FilePath = filePath;
-                result.FileSize = new FileInfo(filePath).Length; // 获取文件大小
+                result.FilePath = absolutePath;
+                result.FileSize = new FileInfo(absolutePath).Length; // 获取文件大小
                 result.CompletionTime = DateTime.Now;           // 记录完成时间
             }
             else

Assets/Scripts/Live2D/DynamicExpressionSetup.cs

@@ -44,7 +44,11 @@ private void LoadExpressions()
 
                 for (int i = 0; i < expressions.Length; i++)
                 {
-                    var exp3JsonString = File.ReadAllText(Path.Combine(modelJsonDir, expressions[i].File));
+                    var expJsonPath = Path.Combine(modelJsonDir, expressions[i].File);
+                    if (!File.Exists(expJsonPath)) {
+                        continue;
+                    }
+                    var exp3JsonString = File.ReadAllText(expJsonPath);
                     CubismExp3Json cubismExp3Json = CubismExp3Json.LoadFrom(exp3JsonString);
                     var exp3Instance = CubismExpressionData.CreateInstance(cubismExp3Json);
                     tempExpressionList.Add(exp3Instance);   

Assets/Scripts/Live2D/DynamicFadeMotionSetup.cs

@@ -120,6 +120,9 @@ private void LoadFadeMotions()
                     for (int j = 0; j < motionArray.Length; j++)
                     {
                         string motionFilePath = Path.Combine(modelJsonDir, motionArray[j].File);
+                        if (!File.Exists(motionFilePath)) {
+                            continue;
+                        }
                         var motion3JsonString = File.ReadAllText(motionFilePath);
                         CubismMotion3Json motion3Json = CubismMotion3Json.LoadFrom(motion3JsonString);
                         var clip = motion3Json.ToAnimationClip(poseJson: null);