From 9462e80517a49d7c1afef0ca92a22940dcea05da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E9=93=AE?= <834207172@qq.com> Date: Fri, 31 Oct 2025 12:24:49 +0800 Subject: [PATCH] 11 --- .../Editor/ArtBuild/BuildArtAssetWindow.cs | 24 +++++++++---------- .../00.BuildOriginality/Editor/BuildType.cs | 2 +- Assets/00.BuildOriginality/package.json | 2 +- .../Editor/BuildAsset/IBuildPipelineViewer.cs | 4 ++-- Assets/00.StaryEvoTools/package.json | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Assets/00.BuildOriginality/Editor/ArtBuild/BuildArtAssetWindow.cs b/Assets/00.BuildOriginality/Editor/ArtBuild/BuildArtAssetWindow.cs index cf36ca8..222d75b 100644 --- a/Assets/00.BuildOriginality/Editor/ArtBuild/BuildArtAssetWindow.cs +++ b/Assets/00.BuildOriginality/Editor/ArtBuild/BuildArtAssetWindow.cs @@ -62,18 +62,18 @@ namespace Stary.Evo.Editor GetBuildPackageNames(); if (string.IsNullOrEmpty(ip)) { - buildAssetType = BuildAssetType.Login; + buildAssetType = Stary.Evo.BuildOriginality.BuildAssetType.Login; return; } bool isValidateToken = await WebRequestSystem.GetValidateToken(ip + "/Authentication/validateToken"); if (isValidateToken) { - buildAssetType = BuildAssetType.Build; + buildAssetType = Stary.Evo.BuildOriginality.BuildAssetType.Build; } else { - buildAssetType = BuildAssetType.Login; + buildAssetType = Stary.Evo.BuildOriginality.BuildAssetType.Login; } @@ -92,16 +92,16 @@ namespace Stary.Evo.Editor window.Close(); } - [EnumToggleButtons, HideLabel] public BuildAssetType buildAssetType; + [EnumToggleButtons, HideLabel] public Stary.Evo.BuildOriginality.BuildAssetType buildAssetType; #region BuildAssetLogin - [ShowIf("@ buildAssetType== BuildAssetType.Login")] + [ShowIf("@ buildAssetType== Stary.Evo.BuildOriginality.BuildAssetType.Login")] [BoxGroup("Login", showLabel: false)] [OnValueChanged("SetWebRequestInfo")] public string ip, userName, password; - [ShowIf("@ buildAssetType== BuildAssetType.Login")] + [ShowIf("@ buildAssetType== Stary.Evo.BuildOriginality.BuildAssetType.Login")] [BoxGroup("Login", showLabel: false)] [Button("登录", ButtonSizes.Large)] [InfoBox("@ message", InfoMessageType.Info)] @@ -142,7 +142,7 @@ namespace Stary.Evo.Editor message = "当前登录状态为：" + islogin; if (islogin) { - buildAssetType = BuildAssetType.Build; + buildAssetType = Stary.Evo.BuildOriginality.BuildAssetType.Build; } } @@ -156,7 +156,7 @@ namespace Stary.Evo.Editor } [BoxGroup("Build", showLabel: false)] - [ShowIf("@ buildAssetType== BuildAssetType.Build")] + [ShowIf("@ buildAssetType== Stary.Evo.BuildOriginality.BuildAssetType.Build")] [Title("包裹列表", titleAlignment: TitleAlignments.Centered)] [HorizontalGroup("Build/BuildPipeline"), HideLabel] [ValueDropdown("GetBuildPackageNames")] @@ -164,7 +164,7 @@ namespace Stary.Evo.Editor public string selectedPackageNames; [BoxGroup("Build", showLabel: false)] - [ShowIf("@ buildAssetType== BuildAssetType.Build")] + [ShowIf("@ buildAssetType== Stary.Evo.BuildOriginality.BuildAssetType.Build")] [Title("当前打包平台", titleAlignment: TitleAlignments.Centered)] [ReadOnly] [HorizontalGroup("Build/BuildPipeline"), HideLabel] @@ -175,7 +175,7 @@ namespace Stary.Evo.Editor [Title("版本号", titleAlignment: TitleAlignments.Centered)] [HorizontalGroup("Build/PackageVersion"), HideLabel] - [ShowIf("@ buildAssetType== BuildAssetType.Build")] + [ShowIf("@ buildAssetType== Stary.Evo.BuildOriginality.BuildAssetType.Build")] [OnValueChanged("OnPackageValueChanged")] public string _packageVersion; @@ -253,13 +253,13 @@ namespace Stary.Evo.Editor #region Update [BoxGroup("Build", showLabel: false)] - [ShowIf("@ buildAssetType== BuildAssetType.Build")] + [ShowIf("@ buildAssetType== Stary.Evo.BuildOriginality.BuildAssetType.Build")] [Title("打包本地资源", titleAlignment: TitleAlignments.Centered)] [HideLabel] public BuildAssetEntity onBuildPipelineEntity; [BoxGroup("Build", showLabel: false)] - [ShowIf("@ buildAssetType== BuildAssetType.Build")] + [ShowIf("@ buildAssetType== Stary.Evo.BuildOriginality.BuildAssetType.Build")] [Title("上传资源", titleAlignment: TitleAlignments.Centered)] [HideLabel] public BuildAssetEntity onUpdateBuildPipelineEntity; diff --git a/Assets/00.BuildOriginality/Editor/BuildType.cs b/Assets/00.BuildOriginality/Editor/BuildType.cs index 1bedcce..df1c1f9 100644 --- a/Assets/00.BuildOriginality/Editor/BuildType.cs +++ b/Assets/00.BuildOriginality/Editor/BuildType.cs @@ -1,4 +1,4 @@ -namespace Stary.Evo +namespace Stary.Evo.BuildOriginality { public enum BuildAssetType { diff --git a/Assets/00.BuildOriginality/package.json b/Assets/00.BuildOriginality/package.json index 775199d..bcbe2d7 100644 --- a/Assets/00.BuildOriginality/package.json +++ b/Assets/00.BuildOriginality/package.json @@ -1,6 +1,6 @@ { "name": "com.staryevo.buildoriginality", - "version": "1.0.1", + "version": "1.0.2", "displayName": "00.StaryEvo.BuildOriginality", "description": "美术打包工具", "unity": "2021.3", diff --git a/Assets/00.StaryEvoTools/Editor/BuildAsset/IBuildPipelineViewer.cs b/Assets/00.StaryEvoTools/Editor/BuildAsset/IBuildPipelineViewer.cs index 4214d46..7df4b6e 100644 --- a/Assets/00.StaryEvoTools/Editor/BuildAsset/IBuildPipelineViewer.cs +++ b/Assets/00.StaryEvoTools/Editor/BuildAsset/IBuildPipelineViewer.cs @@ -16,9 +16,9 @@ namespace Stary.Evo.Editor #region 打包相关参数 - public string packageName; + protected string packageName; protected string selectedBuildPipelines; - public string packageVersion; + protected string packageVersion; #endregion // protected bool isSimulate; diff --git a/Assets/00.StaryEvoTools/package.json b/Assets/00.StaryEvoTools/package.json index bf653d6..6b17ef9 100644 --- a/Assets/00.StaryEvoTools/package.json +++ b/Assets/00.StaryEvoTools/package.json @@ -1,6 +1,6 @@ { "name": "com.staryevo.tools", - "version": "1.1.9", + "version": "1.1.10", "displayName": "00.StaryEvo.Tools", "description": "This is an Framework package(后台服务器版本，端口9527)", "unity": "2021.3",