Skip to content

Commit 53042d9

Browse files
committed
[重构]1. 优化UI包管理
1 parent 88240a7 commit 53042d9

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

Runtime/FairyGUIPackageComponent.cs

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,7 @@ public sealed class UIPackageData
4141
/// <summary>
4242
/// 获取UI包的名称。
4343
/// </summary>
44-
public string Name
45-
{
46-
get { return Package.name; }
47-
}
44+
public string Name { get; private set; }
4845

4946
/// <summary>
5047
/// 设置UI包实例。
@@ -55,10 +52,11 @@ public void SetPackage(UIPackage package)
5552
Package = package;
5653
}
5754

58-
public UIPackageData(string descFilePath, bool isLoadAsset)
55+
public UIPackageData(string descFilePath, string name, bool isLoadAsset)
5956
{
6057
DescFilePath = descFilePath;
6158
IsLoadAsset = isLoadAsset;
59+
Name = name;
6260
}
6361
}
6462

@@ -73,17 +71,17 @@ public UniTask<UIPackage> AddPackageAsync(string descFilePath, bool isLoadAsset
7371
if (!m_UIPackages.TryGetValue(descFilePath, out var packageData))
7472
{
7573
var tcs = new UniTaskCompletionSource<UIPackage>();
76-
packageData = new UIPackageData(descFilePath, isLoadAsset);
77-
m_UIPackages[descFilePath] = packageData;
7874

7975
void Complete(UIPackage uiPackage)
8076
{
77+
packageData = new UIPackageData(descFilePath, uiPackage.name, isLoadAsset);
8178
packageData.SetPackage(uiPackage);
8279
if (isLoadAsset)
8380
{
8481
packageData.Package.LoadAllAssets();
8582
}
8683

84+
m_UIPackages[descFilePath] = packageData;
8785
tcs.TrySetResult(packageData.Package);
8886
}
8987

@@ -103,11 +101,10 @@ public void AddPackageSync(string descFilePath, bool isLoadAsset = true)
103101
{
104102
if (!m_UIPackages.TryGetValue(descFilePath, out var packageData))
105103
{
106-
packageData = new UIPackageData(descFilePath, isLoadAsset);
107-
104+
var package = UIPackage.AddPackage(descFilePath);
105+
packageData = new UIPackageData(descFilePath, package.name, isLoadAsset);
106+
packageData.SetPackage(package);
108107
m_UIPackages[descFilePath] = packageData;
109-
packageData.SetPackage(UIPackage.AddPackage(descFilePath));
110-
111108
if (isLoadAsset)
112109
{
113110
packageData.Package.LoadAllAssets();

0 commit comments

Comments
 (0)