From dd37d130da670c527c57631f69f8a5f7cdab3500 Mon Sep 17 00:00:00 2001
From: chengshengfei <pandashow@foxmail.com>
Date: Tue, 28 May 2024 19:16:45 +0800
Subject: [PATCH] =?UTF-8?q?[opt]=20=EF=BC=88=E7=BC=96=E8=BE=91=E5=99=A8?=
 =?UTF-8?q?=E4=B8=8B=EF=BC=89=E5=A6=82=E6=9E=9C=E6=9C=89=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=9A=84Package=EF=BC=8C=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=8F=90=E4=BE=9B=E4=B8=80=E4=B8=AA=E4=B8=8B=E6=8B=89=EF=BC=8C?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8Yoo=E6=94=B6=E9=9B=86=E5=99=A8=E7=9A=84?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Inspector/ResourceModuleInspector.cs      | 33 ++++++++++++++++++-
 .../Modules/ResourceModule/ResourceModule.cs  | 11 ++++++-
 2 files changed, 42 insertions(+), 2 deletions(-)

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();
         }
+
+        /// <summary>
+        /// 获取构建包名称列表，用于下拉可选择
+        /// </summary>
+        /// <returns></returns>
+        private List<string> GetBuildPackageNames()
+        {
+            List<string> result = new List<string>();
+            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
         /// <summary>
         /// 资源包名称。
         /// </summary>
-        public string PackageName = "DefaultPackage";
+        [SerializeField] private string packageName = "DefaultPackage";
+
+        /// <summary>
+        /// 资源包名称。
+        /// </summary>
+        public string PackageName
+        {
+            get => packageName;
+            set => packageName = value;
+        }
 
         /// <summary>
         /// 资源系统运行模式。