adjust warning information about load resouces

This commit is contained in:
Santy-Wang
2019-09-26 14:18:05 +08:00
parent b027bb3a3f
commit d9c903de5b
2 changed files with 10 additions and 24 deletions
+4
View File
@@ -1806,6 +1806,10 @@ Since v1.10, for any atlas ("%s") in the "resources" directory, it is not possib
Download Font [ %s ] failed, using Arial or system default font instead
### 4934
Please assure that the full path of sub asset is correct!
### 5000
object already destroyed
+6 -24
View File
@@ -1016,18 +1016,7 @@ export class CCLoader extends Pipeline {
mount = mount || 'assets';
let uuid = '';
if (CC_EDITOR) {
let info = EditorExtends.Asset.getAssetInfoFromUrl(`db://${mount}/resources/${url}`);
if (!info && type) {
if (isChildClassOf(type, SpriteFrame)) {
info = EditorExtends.Asset.getAssetInfoFromUrl(`db://${mount}/resources/${url}/spriteFrame`);
}
else if (isChildClassOf(type, Texture2D)) {
info = EditorExtends.Asset.getAssetInfoFromUrl(`db://${mount}/resources/${url}/texture`);
}
else if (isChildClassOf(type, TextureCube)) {
info = EditorExtends.Asset.getAssetInfoFromUrl(`db://${mount}/resources/${url}/textureCube`);
}
}
const info = EditorExtends.Asset.getAssetInfoFromUrl(`db://${mount}/resources/${url}`);
uuid = info ? info.uuid : '';
}
else {
@@ -1050,20 +1039,13 @@ export class CCLoader extends Pipeline {
}
}
}
if (!uuid && type) {
if (isChildClassOf(type, SpriteFrame)) {
uuid = assetTable.getUuid(url + '/spriteFrame', type);
}
else if (isChildClassOf(type, Texture2D)) {
uuid = assetTable.getUuid(url + '/texture', type);
}
else if (isChildClassOf(type, TextureCube)) {
uuid = assetTable.getUuid(url + '/textureCube', type);
}
}
}
}
if (!uuid && type) {
if (isChildClassOf(type, SpriteFrame) || isChildClassOf(type, Texture2D) || isChildClassOf(type, TextureCube)) {
cc.warnID(4934);
}
}
return uuid;
}