From 3be4d9dfbf9568c5bb808064fc7efda8240fbaf9 Mon Sep 17 00:00:00 2001 From: Santy-Wang Date: Tue, 3 Nov 2020 16:31:39 +0800 Subject: [PATCH] refine d.ts (#7684) * refine d.ts * refine --- cocos/core/asset-manager/bundle.ts | 18 +++++++++--------- cocos/core/asset-manager/deprecated.ts | 2 +- cocos/core/asset-manager/shared.ts | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cocos/core/asset-manager/bundle.ts b/cocos/core/asset-manager/bundle.ts index 80589c8c75..0fecab7aa4 100644 --- a/cocos/core/asset-manager/bundle.ts +++ b/cocos/core/asset-manager/bundle.ts @@ -210,20 +210,20 @@ export default class Bundle { * bundle2.load('imgs/cocos', cc.SpriteFrame, null, (err, spriteFrame) => console.log(err)); * */ - public load (paths: string, type: AssetType | null, + public load (paths: string, type: AssetType | null, onProgress: ProgressCallback | null, onComplete: CompleteCallback | null): void; - public load (paths: string[], type: AssetType | null, + public load (paths: string[], type: AssetType | null, onProgress: ProgressCallback | null, onComplete: CompleteCallback | null): void; public load (paths: string, onProgress: ProgressCallback | null, onComplete: CompleteCallback | null): void; public load (paths: string[], onProgress: ProgressCallback | null, onComplete: CompleteCallback | null): void; - public load (paths: string, type: AssetType | null, onComplete?: CompleteCallback | null): void; - public load (paths: string[], type: AssetType | null, onComplete?: CompleteCallback | null): void; + public load (paths: string, type: AssetType | null, onComplete?: CompleteCallback | null): void; + public load (paths: string[], type: AssetType | null, onComplete?: CompleteCallback | null): void; public load (paths: string, onComplete?: CompleteCallback | null): void; public load (paths: string[], onComplete?: CompleteCallback | null): void; public load (paths: string|string[], - type?: AssetType | ProgressCallback | CompleteCallback | null, + type?: AssetType | ProgressCallback | CompleteCallback | null, onProgress?: ProgressCallback | CompleteCallback | null, onComplete?: CompleteCallback | null) { const { type: _type, onProgress: onProg, onComplete: onComp } = parseLoadResArgs(type, onProgress, onComplete); @@ -319,12 +319,12 @@ export default class Bundle { * bundle2.loadDir('skills', cc.SpriteFrame, null, (err, spriteFrames) => console.log(err)); * */ - public loadDir (dir: string, type: AssetType | null, onProgress: ProgressCallback | null, onComplete: CompleteCallback | null): void; + public loadDir (dir: string, type: AssetType | null, onProgress: ProgressCallback | null, onComplete: CompleteCallback | null): void; public loadDir (dir: string, onProgress: ProgressCallback | null, onComplete: CompleteCallback | null): void; - public loadDir (dir: string, type: AssetType | null, onComplete?: CompleteCallback | null): void; + public loadDir (dir: string, type: AssetType | null, onComplete?: CompleteCallback | null): void; public loadDir (dir: string, onComplete?: CompleteCallback | null): void; public loadDir (dir: string, - type?: AssetType | ProgressCallback | CompleteCallback | null, + type?: AssetType | ProgressCallback | CompleteCallback | null, onProgress?: ProgressCallback | CompleteCallback | null, onComplete?: CompleteCallback | null) { const { type: _type, onProgress: onProg, onComplete: onComp } = parseLoadResArgs(type, onProgress, onComplete); @@ -492,7 +492,7 @@ export default class Bundle { * @example * bundle1.get('music/hit', cc.AudioClip); */ - public get (path: string, type?: AssetType | null): T | null { + public get (path: string, type?: AssetType | null): T | null { const info = this.getInfoWithPath(path, type); if (info) { return assets.get(info.uuid) as T || null; diff --git a/cocos/core/asset-manager/deprecated.ts b/cocos/core/asset-manager/deprecated.ts index 89de40eaba..40df83722b 100644 --- a/cocos/core/asset-manager/deprecated.ts +++ b/cocos/core/asset-manager/deprecated.ts @@ -438,7 +438,7 @@ export class CCLoader { * @param type - Only asset of type will be returned if this argument is supplied. * @deprecated since v3.0 loader.getRes is deprecated, please use resources.get instead */ - public getRes (url: string, type?: Constructor): T | null { + public getRes (url: string, type?: Constructor): T | null { return assets.has(url) ? assets.get(url) as T : resources.get(url, type); } diff --git a/cocos/core/asset-manager/shared.ts b/cocos/core/asset-manager/shared.ts index 8c7e75f1dd..90346f422b 100644 --- a/cocos/core/asset-manager/shared.ts +++ b/cocos/core/asset-manager/shared.ts @@ -91,7 +91,7 @@ export interface INativeAssetOptions extends IDownloadParseOptions { preset?: string; } -export type AssetType = Constructor; +export type AssetType = Constructor; export const assets = new Cache(); export const files = new Cache();