diff --git a/UnityProject/Assets/TEngine/Editor/Inspector/ResourceModuleInspector.cs b/UnityProject/Assets/TEngine/Editor/Inspector/ResourceModuleInspector.cs index 1a70d5d0..bfc0af29 100644 --- a/UnityProject/Assets/TEngine/Editor/Inspector/ResourceModuleInspector.cs +++ b/UnityProject/Assets/TEngine/Editor/Inspector/ResourceModuleInspector.cs @@ -1,5 +1,7 @@ using System; +using System.Collections.Generic; using UnityEditor; +using YooAsset.Editor; namespace TEngine.Editor.Inspector { @@ -34,10 +36,12 @@ namespace TEngine.Editor.Inspector private SerializedProperty m_AssetPriority = null; private SerializedProperty m_DownloadingMaxNum = null; private SerializedProperty m_FailedTryAgain = null; - + private SerializedProperty m_PackageName = null; private int m_ResourceModeIndex = 0; private int m_VerifyIndex = 0; + private int m_PackageNameIndex = 0; + private string[] m_PackageNames; public override void OnInspectorGUI() { base.OnInspectorGUI(); @@ -77,6 +81,18 @@ namespace TEngine.Editor.Inspector EditorGUI.EndDisabledGroup(); + m_PackageNames = GetBuildPackageNames().ToArray(); + m_PackageNameIndex = Array.IndexOf(m_PackageNames, m_PackageName.stringValue); + if (m_PackageNameIndex < 0) + { + m_PackageNameIndex = 0; + } + m_PackageNameIndex = EditorGUILayout.Popup("Package Name", m_PackageNameIndex, m_PackageNames); + if (m_PackageName.stringValue != m_PackageNames[m_PackageNameIndex]) + { + m_PackageName.stringValue = m_PackageNames[m_PackageNameIndex]; + } + int milliseconds = EditorGUILayout.DelayedIntField("Milliseconds", m_Milliseconds.intValue); if (milliseconds != m_Milliseconds.intValue) { @@ -236,6 +252,7 @@ namespace TEngine.Editor.Inspector m_AssetPriority = serializedObject.FindProperty("m_AssetPriority"); m_DownloadingMaxNum = serializedObject.FindProperty("m_DownloadingMaxNum"); m_FailedTryAgain = serializedObject.FindProperty("m_FailedTryAgain"); + m_PackageName = serializedObject.FindProperty("packageName"); RefreshModes(); RefreshTypeNames(); @@ -251,5 +268,19 @@ namespace TEngine.Editor.Inspector { serializedObject.ApplyModifiedProperties(); } + + /// + /// 获取构建包名称列表,用于下拉可选择 + /// + /// + private List GetBuildPackageNames() + { + List result = new List(); + foreach (var package in AssetBundleCollectorSettingData.Setting.Packages) + { + result.Add(package.PackageName); + } + return result; + } } } \ No newline at end of file diff --git a/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/ResourceModule.cs b/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/ResourceModule.cs index 1d70231c..72b21d92 100644 --- a/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/ResourceModule.cs +++ b/UnityProject/Assets/TEngine/Runtime/Modules/ResourceModule/ResourceModule.cs @@ -40,7 +40,16 @@ namespace TEngine /// /// 资源包名称。 /// - public string PackageName = "DefaultPackage"; + [SerializeField] private string packageName = "DefaultPackage"; + + /// + /// 资源包名称。 + /// + public string PackageName + { + get => packageName; + set => packageName = value; + } /// /// 资源系统运行模式。