Skip to content

Commit 5f7c820

Browse files
committed
⭐[update] 资源管理工具 进行Unity版本适配
1 parent 26d1b25 commit 5f7c820

File tree

3 files changed

+63
-12
lines changed

3 files changed

+63
-12
lines changed

Editor/Windows/AssetCollectWindow.Data.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -510,8 +510,8 @@ partial void GCInit()
510510

511511
GC_LookMode_Page_Right = EditorGUIUtility.IconContent("ArrowNavigationRight");
512512
GC_LookMode_Page_Right.tooltip = "下一页";
513-
514-
GC_LookMode_Page_Size = EditorGUIUtility.IconContent("d_ToolSettings");
513+
514+
GC_LookMode_Page_Size = EditorGUIUtility.IconContent("d_CustomSorting");
515515
GC_LookMode_Page_Size.tooltip = "设置页面大小";
516516

517517
LookDataPageSizeMenu = new GenericMenu();

Editor/Windows/AssetCollectWindow.OnDrawBuild.cs

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,13 @@ private void UpdateDataBuild()
3636
CurrentPackageIndex = BuildConfig.PackageName == null
3737
? 0
3838
: Array.IndexOf(LookModeDisplayPackages, BuildConfig.PackageName);
39+
40+
if (BuildConfig.BuildTarget == 0 ||
41+
BuildConfig.BuildTarget == BuildTarget.NoTarget
42+
)
43+
{
44+
BuildConfig.BuildTarget = EditorUserBuildSettings.activeBuildTarget;
45+
}
3946
}
4047

4148
private void OnDrawBuildBuild()
@@ -62,11 +69,13 @@ private void OnDrawBuildBuild()
6269
return;
6370
}
6471

72+
#if SUPPORT_YOOASSET
6573
if (GUILayout.Button("生成配置", GP_Width_75))
6674
{
6775
MenuItem_YooAssets.CreateConfig(BuildConfig.BuildOutputPath);
6876
return;
6977
}
78+
#endif
7079
}
7180

7281
using (GELayout.VHorizontal())
@@ -90,8 +99,8 @@ private void OnDrawBuildBuild()
9099
BuildConfig.ValidateBuild =
91100
GELayout.ToggleLeft("验证构建结果", BuildConfig.ValidateBuild, GP_Width_100);
92101

93-
#if SUPPORT_YOOASSET
94102
GELayout.Separator();
103+
#if SUPPORT_YOOASSET
95104
if (GUILayout.Button("构建 Yoo", GP_Width_75))
96105
{
97106
var BuildCommand = new YooAssetBuildCommand
@@ -106,6 +115,11 @@ private void OnDrawBuildBuild()
106115
YooAssetBuild.ArtBuild(BuildCommand);
107116
BuildConfig.BuildVersion = DateTime.Now.ToString("yyyy-MM-dd-HHmmss");
108117
}
118+
#else
119+
if (GUILayout.Button("构建", GP_Width_50))
120+
{
121+
EditorUtility.DisplayDialog("提示", "请先导入 YooAsset Or Other TrdTools", "确定");
122+
}
109123
#endif
110124
}
111125

@@ -184,7 +198,9 @@ private void OnDrawBuildFTP()
184198
using (GELayout.VHorizontal())
185199
{
186200
EditorGUILayout.LabelField("地址", GP_Width_100);
187-
BuildConfig.FTPServerIP = GELayout.Field(BuildConfig.FTPServerIP);
201+
BuildConfig.FTPServerIP = GELayout.FieldDelayed(BuildConfig.FTPServerIP);
202+
if (string.IsNullOrEmpty(BuildConfig.FTPServerIP)) return;
203+
188204
if (GUILayout.Button("校验", GP_Width_50))
189205
{
190206
GUI.FocusControl(null);
@@ -201,31 +217,31 @@ private void OnDrawBuildFTP()
201217
using (GELayout.VHorizontal())
202218
{
203219
EditorGUILayout.LabelField("端口", GP_Width_100);
204-
BuildConfig.FTPServerPort = GELayout.Field(BuildConfig.FTPServerPort);
220+
BuildConfig.FTPServerPort = GELayout.FieldDelayed(BuildConfig.FTPServerPort);
205221
}
206222

207223
using (GELayout.VHorizontal())
208224
{
209225
EditorGUILayout.LabelField("用户名", GP_Width_100);
210-
BuildConfig.FTPUser = GELayout.Field(BuildConfig.FTPUser);
226+
BuildConfig.FTPUser = GELayout.FieldDelayed(BuildConfig.FTPUser);
211227
}
212228

213229
using (GELayout.VHorizontal())
214230
{
215231
EditorGUILayout.LabelField("密码", GP_Width_100);
216-
BuildConfig.FTPPassword = GELayout.Field(BuildConfig.FTPPassword);
232+
BuildConfig.FTPPassword = GELayout.FieldDelayed(BuildConfig.FTPPassword);
217233
}
218234

219235
using (GELayout.VHorizontal())
220236
{
221237
EditorGUILayout.LabelField("远程路径", GP_Width_100);
222-
BuildConfig.FTPRemotePath = GELayout.Field(BuildConfig.FTPRemotePath);
238+
BuildConfig.FTPRemotePath = GELayout.FieldDelayed(BuildConfig.FTPRemotePath);
223239
}
224240

225241
using (GELayout.VHorizontal())
226242
{
227243
EditorGUILayout.LabelField("本地路径", GP_Width_100);
228-
BuildConfig.FTPLocalPath = GELayout.Field(BuildConfig.FTPLocalPath);
244+
BuildConfig.FTPLocalPath = GELayout.FieldDelayed(BuildConfig.FTPLocalPath);
229245

230246
if (GUILayout.Button("选择", GP_Width_50))
231247
{
@@ -265,7 +281,6 @@ private void OnDrawBuildFTP()
265281
{
266282
GUI.FocusControl(null);
267283
PrPlatform.Open.Path(BuildConfig.FTPLocalPath).Async();
268-
return;
269284
}
270285
}
271286
}

Editor/Windows/Data/ASBuildConfig.cs

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,46 @@ public enum EBuildPipeline
1616
/// </summary>
1717
[InspectorName("内置打包管线")] BuiltinBuildPipeline,
1818

19+
#if UNITY_2018_1_OR_NEWER
20+
21+
/*
22+
01 Setup - 平台环境初始化
23+
SwitchToBuildPlatform
24+
RebuildSpriteAtlasCache
25+
26+
02 玩家 Scripts - 工程源代码编译
27+
BuildPlayerScripts、PostScriptsCallback
28+
29+
03 Dependency
30+
CalculateSceneDependencyData
31+
CalculateCustomDependencyData (UNITY_2019_3_OR_NEWER)
32+
CalculateAssetDependencyData
33+
StripUnusedSpriteSources
34+
PostDependencyCallback
35+
36+
04 Packing
37+
GenerateBundlePacking
38+
GenerateBundleCommands
39+
GenerateSubAssetPathMaps
40+
GenerateBundleMaps
41+
PostPackingCallback
42+
43+
05 Writing
44+
45+
WriteSerializedFiles
46+
ArchiveAndCompressBundles
47+
AppendBundleHash
48+
GenerateLinkXml
49+
PostWritingCallback
50+
51+
06 Generate manifest files
52+
*/
53+
1954
/// <summary>
2055
/// 自定义打包管线
2156
/// </summary>
2257
[InspectorName("自定义打包管线(需安装)")] ScriptableBuildPipeline,
58+
#endif
2359
}
2460

2561
/// <summary>
@@ -106,7 +142,7 @@ public class ASBuildConfig : ScriptableObject
106142
/// FTP 远程路径
107143
/// </summary>
108144
public string FTPRemotePath;
109-
145+
110146
/// <summary>
111147
/// FTP 本地需要上传的资源包地址
112148
/// </summary>
@@ -131,7 +167,7 @@ public class ASBuildConfig : ScriptableObject
131167
/// 构建平台
132168
/// </summary>
133169
public BuildTarget BuildTarget;
134-
170+
135171
/// <summary>
136172
/// 获取本地资源包地址
137173
/// </summary>

0 commit comments

Comments
 (0)