From d5d50634530e422dbfe4e98cf064539a777d2bbe Mon Sep 17 00:00:00 2001 From: hevinci Date: Tue, 17 Oct 2023 19:03:11 +0800 Subject: [PATCH] update editor windows --- .../AssetBundleBuilderWindow.cs | 5 +- .../AssetBundleBuilder/BuildBundleInfo.cs | 2 +- .../BaseTasks/TaskCreateReport.cs | 6 +- .../VisualViewers/BuildPipelineViewerBase.cs | 17 +--- .../BuildPipelineViewerBase.uxml | 14 +-- .../AssetBundleCollectorWindow.cs | 51 ++-------- .../AssetBundleCollectorWindow.uxml | 44 ++++----- .../AssetBundleDebuggerWindow.cs | 2 +- .../AssetBundleDebuggerWindow.uxml | 6 +- .../AssetBundleReporterWindow.cs | 2 +- .../AssetBundleReporterWindow.uxml | 2 +- .../AssetBundleReporter/ReportSummary.cs | 30 ++---- .../ReporterAssetListViewer.uxml | 6 +- .../ReporterBundleListViewer.uxml | 4 +- .../VisualViewers/ReporterSummaryViewer.cs | 47 +++++----- .../VisualViewers/ReporterSummaryViewer.uxml | 4 +- Assets/YooAsset/Editor/Localization.meta | 8 -- .../Editor/Localization/ILocalization.cs | 8 -- .../Editor/Localization/ILocalization.cs.meta | 11 --- .../Editor/Localization/LanguageKey.cs | 55 ----------- .../Editor/Localization/LanguageKey.cs.meta | 11 --- .../YooAsset/Editor/Localization/Locales.meta | 8 -- .../Localization/Locales/ChineseSimplified.cs | 70 -------------- .../Locales/ChineseSimplified.cs.meta | 11 --- .../Editor/Localization/Locales/English.cs | 70 -------------- .../Localization/Locales/English.cs.meta | 11 --- .../Editor/Localization/Localization.cs | 93 ------------------- .../Editor/Localization/Localization.cs.meta | 11 --- .../Editor/UIElements/UIElementsLocalize.cs | 61 ------------ .../UIElements/UIElementsLocalize.cs.meta | 11 --- 30 files changed, 92 insertions(+), 589 deletions(-) delete mode 100644 Assets/YooAsset/Editor/Localization.meta delete mode 100644 Assets/YooAsset/Editor/Localization/ILocalization.cs delete mode 100644 Assets/YooAsset/Editor/Localization/ILocalization.cs.meta delete mode 100644 Assets/YooAsset/Editor/Localization/LanguageKey.cs delete mode 100644 Assets/YooAsset/Editor/Localization/LanguageKey.cs.meta delete mode 100644 Assets/YooAsset/Editor/Localization/Locales.meta delete mode 100644 Assets/YooAsset/Editor/Localization/Locales/ChineseSimplified.cs delete mode 100644 Assets/YooAsset/Editor/Localization/Locales/ChineseSimplified.cs.meta delete mode 100644 Assets/YooAsset/Editor/Localization/Locales/English.cs delete mode 100644 Assets/YooAsset/Editor/Localization/Locales/English.cs.meta delete mode 100644 Assets/YooAsset/Editor/Localization/Localization.cs delete mode 100644 Assets/YooAsset/Editor/Localization/Localization.cs.meta delete mode 100644 Assets/YooAsset/Editor/UIElements/UIElementsLocalize.cs delete mode 100644 Assets/YooAsset/Editor/UIElements/UIElementsLocalize.cs.meta diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.cs index 349c1ba..e46a764 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/AssetBundleBuilderWindow.cs @@ -14,8 +14,7 @@ namespace YooAsset.Editor [MenuItem("YooAsset/AssetBundle Builder", false, 102)] public static void OpenWindow() { - string windowName = Localization.Language(ELanguageKey.ABB_WindowTitle); - AssetBundleBuilderWindow window = GetWindow(windowName, true, WindowsDefine.DockedWindowTypes); + AssetBundleBuilderWindow window = GetWindow("AssetBundle Builder", true, WindowsDefine.DockedWindowTypes); window.minSize = new Vector2(800, 600); } @@ -48,7 +47,7 @@ namespace YooAsset.Editor if (packageNames.Count == 0) { var label = new Label(); - label.text = Localization.Language(ELanguageKey.AAB_NoPackageTips); + label.text = "Not found any package"; label.style.width = 100; _toolbar.Add(label); return; diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildBundleInfo.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildBundleInfo.cs index e6d9ac3..cfb5e7b 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildBundleInfo.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildBundleInfo.cs @@ -85,7 +85,7 @@ namespace YooAsset.Editor public void PackAsset(BuildAssetInfo assetInfo) { if (IsContainsAsset(assetInfo.AssetPath)) - throw new System.Exception($"Asset is existed : {assetInfo.AssetPath}"); + throw new System.Exception($"Should never get here ! Asset is existed : {assetInfo.AssetPath}"); MainAssets.Add(assetInfo); } diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateReport.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateReport.cs index 9593321..b462c73 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateReport.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/BuildPipeline/BaseTasks/TaskCreateReport.cs @@ -31,11 +31,13 @@ namespace YooAsset.Editor buildReport.Summary.BuildMode = buildParameters.BuildMode; buildReport.Summary.BuildPackageName = buildParameters.PackageName; buildReport.Summary.BuildPackageVersion = buildParameters.PackageVersion; + buildReport.Summary.UniqueBundleName = buildMapContext.Command.UniqueBundleName; buildReport.Summary.EnableAddressable = buildMapContext.Command.EnableAddressable; buildReport.Summary.LocationToLower = buildMapContext.Command.LocationToLower; buildReport.Summary.IncludeAssetGUID = buildMapContext.Command.IncludeAssetGUID; - buildReport.Summary.UniqueBundleName = buildMapContext.Command.UniqueBundleName; - buildReport.Summary.EncryptionServicesClassName = buildParameters.EncryptionServices == null ? + buildReport.Summary.IgnoreDefaultType = buildMapContext.Command.IgnoreDefaultType; + buildReport.Summary.AutoCollectShaders = buildMapContext.Command.AutoCollectShaders; + buildReport.Summary.EncryptionClassName = buildParameters.EncryptionServices == null ? "null" : buildParameters.EncryptionServices.GetType().FullName; // 构建参数 diff --git a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuildPipelineViewerBase.cs b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuildPipelineViewerBase.cs index 0e2ab2a..cb16086 100644 --- a/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuildPipelineViewerBase.cs +++ b/Assets/YooAsset/Editor/AssetBundleBuilder/VisualViewers/BuildPipelineViewerBase.cs @@ -66,7 +66,7 @@ namespace YooAsset.Editor var buildModeList = GetSupportBuildModes(); int defaultIndex = buildModeList.FindIndex(x => x.Equals(buildMode)); _buildModeField = new PopupField(buildModeList, defaultIndex); - _buildModeField.label = "ABB_BuildMode"; + _buildModeField.label = "Build Mode"; _buildModeField.style.width = StyleWidth; _buildModeField.RegisterValueChangedCallback(evt => { @@ -84,7 +84,7 @@ namespace YooAsset.Editor var encyptionClassName = AssetBundleBuilderSetting.GetPackageEncyptionClassName(PackageName, BuildPipeline); int defaultIndex = encryptionClassTypes.FindIndex(x => x.FullName.Equals(encyptionClassName)); _encryptionField = new PopupField(encryptionClassTypes, defaultIndex); - _encryptionField.label = "ABB_Encryption"; + _encryptionField.label = "Encryption"; _encryptionField.style.width = StyleWidth; _encryptionField.RegisterValueChangedCallback(evt => { @@ -95,7 +95,7 @@ namespace YooAsset.Editor else { _encryptionField = new PopupField(); - _encryptionField.label = "ABB_Encryption"; + _encryptionField.label = "Encryption"; _encryptionField.style.width = StyleWidth; encryptionContainer.Add(_encryptionField); } @@ -147,17 +147,6 @@ namespace YooAsset.Editor // 构建按钮 var buildButton = Root.Q