From d9c903de5bcebe1eba2c47a3fa439b248e1dddbe Mon Sep 17 00:00:00 2001 From: Santy-Wang Date: Thu, 26 Sep 2019 14:18:05 +0800 Subject: [PATCH] adjust warning information about load resouces --- EngineErrorMap.md | 4 ++++ cocos/core/load-pipeline/CCLoader.ts | 30 ++++++---------------------- 2 files changed, 10 insertions(+), 24 deletions(-) diff --git a/EngineErrorMap.md b/EngineErrorMap.md index 0b02e262c0..2d6c2816b8 100644 --- a/EngineErrorMap.md +++ b/EngineErrorMap.md @@ -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 diff --git a/cocos/core/load-pipeline/CCLoader.ts b/cocos/core/load-pipeline/CCLoader.ts index a7ac173e75..e5091a65ee 100644 --- a/cocos/core/load-pipeline/CCLoader.ts +++ b/cocos/core/load-pipeline/CCLoader.ts @@ -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; }