@@ -41,10 +41,7 @@ public sealed class UIPackageData
41
41
/// <summary>
42
42
/// 获取UI包的名称。
43
43
/// </summary>
44
- public string Name
45
- {
46
- get { return Package . name ; }
47
- }
44
+ public string Name { get ; private set ; }
48
45
49
46
/// <summary>
50
47
/// 设置UI包实例。
@@ -55,10 +52,11 @@ public void SetPackage(UIPackage package)
55
52
Package = package ;
56
53
}
57
54
58
- public UIPackageData ( string descFilePath , bool isLoadAsset )
55
+ public UIPackageData ( string descFilePath , string name , bool isLoadAsset )
59
56
{
60
57
DescFilePath = descFilePath ;
61
58
IsLoadAsset = isLoadAsset ;
59
+ Name = name ;
62
60
}
63
61
}
64
62
@@ -73,17 +71,17 @@ public UniTask<UIPackage> AddPackageAsync(string descFilePath, bool isLoadAsset
73
71
if ( ! m_UIPackages . TryGetValue ( descFilePath , out var packageData ) )
74
72
{
75
73
var tcs = new UniTaskCompletionSource < UIPackage > ( ) ;
76
- packageData = new UIPackageData ( descFilePath , isLoadAsset ) ;
77
- m_UIPackages [ descFilePath ] = packageData ;
78
74
79
75
void Complete ( UIPackage uiPackage )
80
76
{
77
+ packageData = new UIPackageData ( descFilePath , uiPackage . name , isLoadAsset ) ;
81
78
packageData . SetPackage ( uiPackage ) ;
82
79
if ( isLoadAsset )
83
80
{
84
81
packageData . Package . LoadAllAssets ( ) ;
85
82
}
86
83
84
+ m_UIPackages [ descFilePath ] = packageData ;
87
85
tcs . TrySetResult ( packageData . Package ) ;
88
86
}
89
87
@@ -103,11 +101,10 @@ public void AddPackageSync(string descFilePath, bool isLoadAsset = true)
103
101
{
104
102
if ( ! m_UIPackages . TryGetValue ( descFilePath , out var packageData ) )
105
103
{
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 ) ;
108
107
m_UIPackages [ descFilePath ] = packageData ;
109
- packageData . SetPackage ( UIPackage . AddPackage ( descFilePath ) ) ;
110
-
111
108
if ( isLoadAsset )
112
109
{
113
110
packageData . Package . LoadAllAssets ( ) ;
0 commit comments