Skip to content

Commit 7ea3e37

Browse files
authored
Merge pull request #46 from AIO-GAME/1.x
1.x
2 parents ca7bb53 + ba8e46d commit 7ea3e37

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

Editor/Windows/AssetCollectWindow.cs.meta

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Editor/Windows/Data/AssetCollectItem.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,11 @@ public class AssetCollectItem : IEqualityComparer<AssetCollectItem>, IDisposable
5757
/// </summary>
5858
public string CollectPath;
5959

60+
/// <summary>
61+
/// 收集器全路径
62+
/// </summary>
63+
public string FullPath => System.IO.Path.Combine(EHelper.Path.Project, CollectPath).Replace("\\", "/");
64+
6065
/// <summary>
6166
/// 自定义数据
6267
/// </summary>
@@ -340,8 +345,7 @@ public async void CollectAssetTask(string package, string group,
340345
RuleCollects.Clear();
341346
PackageName = package;
342347
GroupName = group;
343-
if (string.IsNullOrEmpty(CollectPath)) return;
344-
if (!File.Exists(CollectPath) && !Directory.Exists(CollectPath)) return;
348+
if (!AHelper.IO.Exists(FullPath)) return;
345349
if (CollectPath.Contains("/Resources/") || CollectPath.EndsWith("Resources"))
346350
{
347351
Debug.LogWarningFormat("Resources 目录下的资源不允许打包 !!! 已自动过滤 !!! -> {0}", CollectPath);

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "com.aio.cli.asset",
33
"displayName": "AIO Unity CLI Asset",
44
"description": "AIO Unity CLI Asset",
5-
"version": "1.0.18-preview",
5+
"version": "1.0.19-preview",
66
"unity": "2019.4",
77
"unityRelease": "0f1",
88
"license": "MIT",
@@ -14,10 +14,10 @@
1414
"url": "https://github.com/AIO-GAME/Unity.Asset.CLI.git"
1515
},
1616
"dependencies": {
17-
"com.aio.package": "1.0.27-preview"
17+
"com.aio.package": "1.0.28-preview"
1818
},
1919
"relatedPackages": {
20-
"com.aio.package": "1.0.27-preview"
20+
"com.aio.package": "1.0.28-preview"
2121
},
2222
"keywords": ["Asset", "YooAsset", "Unity Asset", "Resource"],
2323
"author": {

0 commit comments

Comments
 (0)