From b107157232d354024d8b9e2aa8d1ad3ab23de0e9 Mon Sep 17 00:00:00 2001
From: ALEXTANG <574809918@qq.com>
Date: Thu, 4 Aug 2022 15:52:56 +0800
Subject: [PATCH] Update

Update
---
 .../Editor/About/TEnginePackageWindow.cs      | 38 ++++++++++++-------
 .../Runtime/HotUpdate/Editor/LoadStyle.cs     |  1 -
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/Assets/TEngine/Editor/About/TEnginePackageWindow.cs b/Assets/TEngine/Editor/About/TEnginePackageWindow.cs
index f8d5aef8..0ab0592e 100644
--- a/Assets/TEngine/Editor/About/TEnginePackageWindow.cs
+++ b/Assets/TEngine/Editor/About/TEnginePackageWindow.cs
@@ -5,6 +5,7 @@ using UnityEditor;
 using System.Collections;
 using System.Collections.Generic;
 using LitJson;
+using UnityEngine.Networking;
 
 namespace TEngine.Editor
 {
@@ -29,27 +30,27 @@ namespace TEngine.Editor
             /// <summary>
             /// 名称
             /// </summary>
-            public string name;
+            public string name = string.Empty;
             /// <summary>
             /// 作者
             /// </summary>
-            public string author;
+            public string author = string.Empty;
             /// <summary>
             /// 版本
             /// </summary>
-            public string version;
+            public string version = string.Empty;
             /// <summary>
             /// 发布日期
             /// </summary>
-            public string releasedDate;
+            public string releasedDate = string.Empty;
             /// <summary>
             /// 简介
             /// </summary>
-            public string description;
+            public string description = string.Empty;
             /// <summary>
             /// 依赖项
             /// </summary>
-            public string[] dependencies;
+            public string[] dependencies = null;
         }
 
         //资源包信息列表
@@ -240,12 +241,17 @@ namespace TEngine.Editor
         private IEnumerator GetPackagesInfo()
         {
             string url = $"{OnlineUrl}packages.json";
-            WWW www = new WWW(url);
-            yield return www;
+            UnityWebRequest www = UnityWebRequest.Get(url);
+            UnityWebRequestAsyncOperation request = www.SendWebRequest();
+            while (true)
+            {
+                if (request.isDone)
+                    break;
+            }
+            yield return request.isDone;
             if (www.error == null)
             {
-                //List<object> list = JsonUtility.FromJson<List<object>>(www.text);
-                List<PackageTemplate> list = JsonMapper.ToObject<List<PackageTemplate>>(www.text);
+                List<PackageTemplate> list = JsonMapper.ToObject<List<PackageTemplate>>(www.downloadHandler.text);
 
                 for (int i = 0; i < list.Count; i++)
                 {
@@ -276,11 +282,17 @@ namespace TEngine.Editor
         {
             string url = $"{OnlineUrl}packages/{package.name}/{package.version}/{package.name}.unitypackage";
             //Debug.Log(url);
-            WWW www = new WWW(url);
-            yield return www;
+            UnityWebRequest www = UnityWebRequest.Get(url);
+            UnityWebRequestAsyncOperation request = www.SendWebRequest();
+            while (true)
+            {
+                if (request.isDone)
+                    break;
+            }
+            yield return request.isDone;
             if (www.error == null)
             {
-                byte[] bytes = www.bytes;
+                byte[] bytes = www.downloadHandler.data;
                 string path = $"{Application.dataPath}/{package.name}-{package.version}.unitypackage";
                 //写入本地
                 using (FileStream fs = new FileStream(path, FileMode.Create))
diff --git a/Assets/TEngine/Runtime/HotUpdate/Editor/LoadStyle.cs b/Assets/TEngine/Runtime/HotUpdate/Editor/LoadStyle.cs
index c322499c..7dbac055 100644
--- a/Assets/TEngine/Runtime/HotUpdate/Editor/LoadStyle.cs
+++ b/Assets/TEngine/Runtime/HotUpdate/Editor/LoadStyle.cs
@@ -77,7 +77,6 @@ namespace TEngine.UIEditor
             string url = $"{Application.dataPath}/TResources/{ConfigPath}";
             if (!String.IsNullOrEmpty(url))
             {
-                string finalPath;
 #if UNITY_ANDROID
                 if (url.StartsWith(Application.persistentDataPath))
                     url = $"file://{url}";