From cd1b718e85d7c38e0c7c1265b8c42d5433108a52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E9=93=AE?= <834207172@qq.com> Date: Fri, 30 May 2025 14:52:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9main?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Main/Config.meta | 8 --- Assets/Main/Config/DomainConfig.asset | 18 ----- Assets/Main/Config/DomainConfig.asset.meta | 8 --- .../Main/Resources/HotfixMainResDomain.asset | 10 ++- Assets/Main/Script/Runtime/HotUpdate/Res.cs | 2 + .../Runtime/LasterDoMain/ProgressBarPanel.cs | 68 +++++++++++++++++++ .../LasterDoMain/ProgressBarPanel.cs.meta | 11 +++ .../Script/Runtime/Tools/WebRequestTools.cs | 2 +- Assets/Main/Script/Runtime/Tools/ZipTool.cs | 44 ++++-------- .../kkController/DigitalHumanSystem.cs | 2 +- Assets/Main/main.unity | 2 +- 11 files changed, 101 insertions(+), 74 deletions(-) delete mode 100644 Assets/Main/Config.meta delete mode 100644 Assets/Main/Config/DomainConfig.asset delete mode 100644 Assets/Main/Config/DomainConfig.asset.meta create mode 100644 Assets/Main/Script/Runtime/LasterDoMain/ProgressBarPanel.cs create mode 100644 Assets/Main/Script/Runtime/LasterDoMain/ProgressBarPanel.cs.meta diff --git a/Assets/Main/Config.meta b/Assets/Main/Config.meta deleted file mode 100644 index bc261eb..0000000 --- a/Assets/Main/Config.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cffabde4e6a86aa4abfd2686fcbfb3b3 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Main/Config/DomainConfig.asset b/Assets/Main/Config/DomainConfig.asset deleted file mode 100644 index 7d5a0ff..0000000 --- a/Assets/Main/Config/DomainConfig.asset +++ /dev/null @@ -1,18 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 03dc1bf5b95446838cce6d0fefed81fe, type: 3} - m_Name: DomainConfig - m_EditorClassIdentifier: - domain: - mainPrefab: Prefabs_UI - className: Hello - methodName: Run diff --git a/Assets/Main/Config/DomainConfig.asset.meta b/Assets/Main/Config/DomainConfig.asset.meta deleted file mode 100644 index 93725f5..0000000 --- a/Assets/Main/Config/DomainConfig.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d3b6d9514b4a312439b12cc9c5f52969 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Main/Resources/HotfixMainResDomain.asset b/Assets/Main/Resources/HotfixMainResDomain.asset index 65eae46..04cdda1 100644 --- a/Assets/Main/Resources/HotfixMainResDomain.asset +++ b/Assets/Main/Resources/HotfixMainResDomain.asset @@ -13,9 +13,7 @@ MonoBehaviour: m_Name: HotfixMainResDomain m_EditorClassIdentifier: com.stary.evo.runtime:Stary.Evo:HotfixMainResDomain hotfixMainResDomainEntity: - domain: MainDomain - ipconfig: http://192.168.31.100:5005/HotRefresh - pathconfig: - packageVersion: - username: UnityHot - password: Unity1234 + ipconfig: http://192.168.31.67:9527 + username: admin2023 + password: admin@2023 + productName: XOSMOPlug_inLibrary diff --git a/Assets/Main/Script/Runtime/HotUpdate/Res.cs b/Assets/Main/Script/Runtime/HotUpdate/Res.cs index cb528f2..243e60b 100644 --- a/Assets/Main/Script/Runtime/HotUpdate/Res.cs +++ b/Assets/Main/Script/Runtime/HotUpdate/Res.cs @@ -12,6 +12,7 @@ namespace R } public static class audios { + public const string au_effect_element_pop_mp3 = "Audios_au_effect_element_pop"; public const string au_x_07_ending1_wav = "Audios_au_X_07_ending1"; public const string au_x_07_ending2_wav = "Audios_au_X_07_ending2"; public const string au_x_07_ending3_wav = "Audios_au_X_07_ending3"; @@ -42,6 +43,7 @@ namespace R public const string guideball_zone_prefab = "Prefabs_GuideBall_Zone"; public const string kkcontroller_prefab = "Prefabs_KKController"; public const string main_prefab = "Prefabs_Main"; + public const string progressbarpanel_prefab = "Prefabs_ProgressBarPanel"; public const string videopanel_prefab = "Prefabs_VideoPanel"; public const string watermark_prefab = "Prefabs_Watermark"; } diff --git a/Assets/Main/Script/Runtime/LasterDoMain/ProgressBarPanel.cs b/Assets/Main/Script/Runtime/LasterDoMain/ProgressBarPanel.cs new file mode 100644 index 0000000..094fbc6 --- /dev/null +++ b/Assets/Main/Script/Runtime/LasterDoMain/ProgressBarPanel.cs @@ -0,0 +1,68 @@ +using System; +using Cysharp.Threading.Tasks; +using Stary.Evo; +using Stary.Evo.AudioCore; +using Stary.Evo.InformationSave; +using Stary.Evo.UIFarme; +using UnityEngine; +using UnityEngine.UI; +using YooAsset; + +namespace Main +{ + public class ProgressBarPanel : BasePanel + { + static readonly string path = "ProgressBarPanel"; + + private Image _fill; + private Text _fillText; + private Text _fillMessage; + public ProgressBarPanel() + { + } + + + public override void Initialize(GameObject panelGo) + { + base.Initialize(panelGo); + + _fill = activePanel.transform.Find("Fill").GetComponent(); + _fillText = _fill.transform.Find("FillText").GetComponent(); + _fillMessage= _fill.transform.Find("FillMessage").GetComponent(); + _fill.fillAmount = 0; + _fillText.text = "0%"; + } + + public override void OnEnter() + { + base.OnEnter(); + + this.RegisterEvent(ProgressBarType.Add, SetProgressBarValue); + } + + public override void OnExit(float delay = 0) + { + base.OnExit(delay); + _fill.fillAmount = 0; + _fillText.text = "0%"; + this.UnRegisterEvent(ProgressBarType.Add, SetProgressBarValue); + } + + public async void SetProgressBarValue(string message,float value) + { + _fill.fillAmount = value; + _fillMessage.text = message; + _fillText.text = $"{value:P0}"; + if (value >= 1) + { + this.PanelSystem.PopQueue(); + } + } + + + public enum ProgressBarType + { + Add, + } + } +} \ No newline at end of file diff --git a/Assets/Main/Script/Runtime/LasterDoMain/ProgressBarPanel.cs.meta b/Assets/Main/Script/Runtime/LasterDoMain/ProgressBarPanel.cs.meta new file mode 100644 index 0000000..518b1f2 --- /dev/null +++ b/Assets/Main/Script/Runtime/LasterDoMain/ProgressBarPanel.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c1795353bee11314b950ef806ab8458f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Main/Script/Runtime/Tools/WebRequestTools.cs b/Assets/Main/Script/Runtime/Tools/WebRequestTools.cs index 44c6ee4..ae110d5 100644 --- a/Assets/Main/Script/Runtime/Tools/WebRequestTools.cs +++ b/Assets/Main/Script/Runtime/Tools/WebRequestTools.cs @@ -2,6 +2,6 @@ { public class WebRequestTools { - + } } \ No newline at end of file diff --git a/Assets/Main/Script/Runtime/Tools/ZipTool.cs b/Assets/Main/Script/Runtime/Tools/ZipTool.cs index b44de28..dce9d49 100644 --- a/Assets/Main/Script/Runtime/Tools/ZipTool.cs +++ b/Assets/Main/Script/Runtime/Tools/ZipTool.cs @@ -11,33 +11,19 @@ namespace Stary.Evo public class ZipTool { // 新增：带进度回调的下载解压方法 - public static async UniTask DownloadAndUnzipAsync(string url, string extractPath, + public static async UniTask DownloadAndUnzipAsync(string fildId, string extractPath, Action downloadProgress = null, Action unzipProgress = null) { string tempPath = Path.Combine(Application.persistentDataPath, "temp.zip"); - + try { - // 下载ZIP文件 - using( UnityWebRequest request =WebRequester(url)) - { - request.downloadHandler = new DownloadHandlerFile(tempPath); - var operation = request.SendWebRequest(); - - while (!operation.isDone) - { - downloadProgress?.Invoke(request.downloadProgress); - await UniTask.Yield(); - } - - if (request.result != UnityWebRequest.Result.Success) - { - throw new Exception($"下载失败：{request.error}"); - } - } + string url = $"{AppConfig.IpConfig}/FileLoad/Download/{fildId}"; + await WebRequestSystem.GetFile(url, tempPath,downloadProgress); // 解压下载的文件 - return await UnzipAsync(tempPath, extractPath, unzipProgress); + await UnzipAsync(tempPath, extractPath, unzipProgress); + File.Delete(tempPath); } finally { @@ -50,40 +36,37 @@ namespace Stary.Evo } // 修改：添加进度回调参数 - public static async UniTask UnzipAsync(string zipPath, string extractPath, + public static async UniTask UnzipAsync(string zipPath, string extractPath, Action progressCallback = null) { try { - List pathList = new List(); + using (ZipArchive archive = ZipFile.OpenRead(zipPath)) { float totalEntries = archive.Entries.Count; float processed = 0; - + foreach (ZipArchiveEntry entry in archive.Entries) { string filePath = Path.Combine(extractPath, entry.FullName); Directory.CreateDirectory(Path.GetDirectoryName(filePath)); - + if (!string.IsNullOrEmpty(entry.Name)) { using (Stream inputStream = entry.Open()) using (FileStream outputStream = File.Create(filePath)) { await inputStream.CopyToAsync(outputStream); - pathList.Add(outputStream.Name); } } - + processed++; float progress = processed / totalEntries; progressCallback?.Invoke(progress); - Debug.Log($"解压进度: {progress:P0}"); } } Debug.Log($"解压完成: {extractPath}"); - return pathList.ToArray(); } catch (Exception ex) { @@ -91,6 +74,7 @@ namespace Stary.Evo throw; } } + /// /// 自定义网络请求器需要登录 /// @@ -99,7 +83,7 @@ namespace Stary.Evo private static UnityWebRequest WebRequester(string url) { var request = new UnityWebRequest(url, UnityWebRequest.kHttpVerbGET); - var authorization = GetAuthorization(AppConfig.USERNAME, AppConfig.PASSWORD); + var authorization = GetAuthorization(AppConfig.UserName, AppConfig.PassWord); request.SetRequestHeader("AUTHORIZATION", authorization); return request; } @@ -111,6 +95,4 @@ namespace Stary.Evo return "Basic " + System.Convert.ToBase64String(bytes); } } - - } \ No newline at end of file diff --git a/Assets/Main/Script/Runtime/kkController/DigitalHumanSystem.cs b/Assets/Main/Script/Runtime/kkController/DigitalHumanSystem.cs index e480c47..fc1d0c4 100644 --- a/Assets/Main/Script/Runtime/kkController/DigitalHumanSystem.cs +++ b/Assets/Main/Script/Runtime/kkController/DigitalHumanSystem.cs @@ -108,7 +108,7 @@ namespace Main int index = -1; for (int i = 0; i < points.Count; i++) { - if (AppConfig.ASSETPACKGENAME == points[i].Name) + if (AppConfig.PackageDomainName == points[i].Name) { index = i; break; diff --git a/Assets/Main/main.unity b/Assets/Main/main.unity index 36d6095..53f2002 100644 --- a/Assets/Main/main.unity +++ b/Assets/Main/main.unity @@ -646,7 +646,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 467bc10b56c272043a89b12cbf23b3ef, type: 3} m_Name: m_EditorClassIdentifier: - domain: X_02_01 + domain: Main --- !u!4 &1829387361 Transform: m_ObjectHideFlags: 0