Skip to content

Commit

Permalink
Sync branch v2.4.1 to master
Browse files Browse the repository at this point in the history
  • Loading branch information
@cocos-robot
cocos-robot authored Jun 15, 2020
2 parents 7de1303 + 264a563 commit ee35c65
Show file tree
Hide file tree
Showing 10 changed files with 103 additions and 67 deletions.
2 changes: 1 addition & 1 deletion cocos2d/core/CCDirector.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ cc.Director.prototype = {
scene._load();

// Delay run / replace scene to the end of the frame
this.once(cc.Director.EVENT_AFTER_UPDATE, function () {
this.once(cc.Director.EVENT_AFTER_DRAW, function () {
this.runSceneImmediate(scene, onBeforeLoadScene, onLaunched);
}, this);
},
Expand Down
45 changes: 28 additions & 17 deletions cocos2d/core/asset-manager/CCAssetManager.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -460,10 +460,12 @@ AssetManager.prototype = {
* cc.assetManager.loadAny({ url: 'http://example.com/my.asset', skin: 'xxx', model: 'xxx', userName: 'xxx', password: 'xxx' });
*
* @typescript
* loadAny(requests: string | string[] | Record<string, any> | Record<string, any>[], options?: Record<string, any>, onProgress?: (finished: number, total: number, item: cc.AssetManager.RequestItem) => void, onComplete?: (err: Error, data: any) => void): void
* loadAny(requests: string | string[] | Record<string, any> | Record<string, any>[], options?: Record<string, any>, onComplete?: (err: Error, data: any) => void): void
* loadAny(requests: string | string[] | Record<string, any> | Record<string, any>[], onProgress?: (finished: number, total: number, item: cc.AssetManager.RequestItem) => void, onComplete?: (err: Error, data: any) => void): void
* loadAny(requests: string | string[] | Record<string, any> | Record<string, any>[], onComplete?: (err: Error, data: any) => void): void
* loadAny(requests: string | string[] | Record<string, any> | Record<string, any>[], options: Record<string, any>, onProgress: (finished: number, total: number, item: cc.AssetManager.RequestItem) => void, onComplete: (err: Error, data: any) => void): void
* loadAny(requests: string | string[] | Record<string, any> | Record<string, any>[], options: Record<string, any>, onComplete: (err: Error, data: any) => void): void
* loadAny(requests: string | string[] | Record<string, any> | Record<string, any>[], options: Record<string, any>): void
* loadAny(requests: string | string[] | Record<string, any> | Record<string, any>[], onProgress: (finished: number, total: number, item: cc.AssetManager.RequestItem) => void, onComplete: (err: Error, data: any) => void): void
* loadAny(requests: string | string[] | Record<string, any> | Record<string, any>[], onComplete: (err: Error, data: any) => void): void
* loadAny(requests: string | string[] | Record<string, any> | Record<string, any>[]): void
*/
loadAny (requests, options, onProgress, onComplete) {
var { options, onProgress, onComplete } = parseParameters(options, onProgress, onComplete);
Expand Down Expand Up @@ -493,16 +495,17 @@ AssetManager.prototype = {
* @param {Function} [onComplete] - Callback invoked when finish preloading
* @param {Error} onComplete.err - The error occured in preloading process.
* @param {RequestItem[]} onComplete.items - The preloaded content
* @returns {Task} preloading task
*
* @example
* cc.assetManager.preloadAny('0cbZa5Y71CTZAccaIFluuZ', (err) => cc.assetManager.loadAny('0cbZa5Y71CTZAccaIFluuZ'));
*
* @typescript
* preloadAny(requests: string | string[] | Record<string, any> | Record<string, any>[], options?: Record<string, any>, onProgress?: (finished: number, total: number, item: cc.AssetManager.RequestItem) => void, onComplete?: (err: Error, items: cc.AssetManager.RequestItem[]) => void): cc.AssetManager.Task
* preloadAny(requests: string | string[] | Record<string, any> | Record<string, any>[], options?: Record<string, any>, onComplete?: (err: Error, items: cc.AssetManager.RequestItem[]) => void): cc.AssetManager.Task
* preloadAny(requests: string | string[] | Record<string, any> | Record<string, any>[], onProgress?: (finished: number, total: number, item: cc.AssetManager.RequestItem) => void, onComplete?: (err: Error, items: cc.AssetManager.RequestItem[]) => void): cc.AssetManager.Task
* preloadAny(requests: string | string[] | Record<string, any> | Record<string, any>[], onComplete?: (err: Error, items: cc.AssetManager.RequestItem[]) => void): cc.AssetManager.Task
* preloadAny(requests: string | string[] | Record<string, any> | Record<string, any>[], options: Record<string, any>, onProgress: (finished: number, total: number, item: cc.AssetManager.RequestItem) => void, onComplete: (err: Error, items: cc.AssetManager.RequestItem[]) => void): void
* preloadAny(requests: string | string[] | Record<string, any> | Record<string, any>[], options: Record<string, any>, onComplete: (err: Error, items: cc.AssetManager.RequestItem[]) => void): void
* preloadAny(requests: string | string[] | Record<string, any> | Record<string, any>[], onProgress: (finished: number, total: number, item: cc.AssetManager.RequestItem) => void, onComplete: (err: Error, items: cc.AssetManager.RequestItem[]) => void): void
* preloadAny(requests: string | string[] | Record<string, any> | Record<string, any>[], onComplete: (err: Error, items: cc.AssetManager.RequestItem[]) => void): void
* preloadAny(requests: string | string[] | Record<string, any> | Record<string, any>[], options: Record<string, any>): void
* preloadAny(requests: string | string[] | Record<string, any> | Record<string, any>[]): void
*/
preloadAny (requests, options, onProgress, onComplete) {
var { options, onProgress, onComplete } = parseParameters(options, onProgress, onComplete);
Expand All @@ -529,8 +532,10 @@ AssetManager.prototype = {
* cc.assetManager.postLoadNative(texture, (err) => console.log(err));
*
* @typescript
* postLoadNative(asset: cc.Asset, options?: Record<string, any>, onComplete?: (err: Error) => void): void
* postLoadNative(asset: cc.Asset, onComplete?: (err: Error) => void): void
* postLoadNative(asset: cc.Asset, options: Record<string, any>, onComplete: (err: Error) => void): void
* postLoadNative(asset: cc.Asset, options: Record<string, any>): void
* postLoadNative(asset: cc.Asset, onComplete: (err: Error) => void): void
* postLoadNative(asset: cc.Asset): void
*/
postLoadNative (asset, options, onComplete) {
if (!(asset instanceof cc.Asset)) throw new Error('input is not asset');
Expand Down Expand Up @@ -583,8 +588,10 @@ AssetManager.prototype = {
* cc.assetManager.loadRemote('http://www.cloud.com/test2.mp3', (err, audioClip) => console.log(err));
*
* @typescript
* loadRemote<T extends cc.Asset>(url: string, options?: Record<string, any>, onComplete?: (err: Error, asset: T) => void): void
* loadRemote<T extends cc.Asset>(url: string, onComplete?: (err: Error, asset: T) => void): void
* loadRemote<T extends cc.Asset>(url: string, options: Record<string, any>, onComplete: (err: Error, asset: T) => void): void
* loadRemote<T extends cc.Asset>(url: string, options: Record<string, any>): void
* loadRemote<T extends cc.Asset>(url: string, onComplete: (err: Error, asset: T) => void): void
* loadRemote<T extends cc.Asset>(url: string): void
*/
loadRemote (url, options, onComplete) {
var { options, onComplete } = parseParameters(options, undefined, onComplete);
Expand Down Expand Up @@ -620,8 +627,10 @@ AssetManager.prototype = {
* loadScript('http://localhost:8080/index.js', null, (err) => console.log(err));
*
* @typescript
* loadScript(url: string|string[], options?: Record<string, any>, onComplete?: (err: Error) => void): void;
* loadScript(url: string|string[], onComplete?: (err: Error) => void): void;
* loadScript(url: string|string[], options: Record<string, any>, onComplete: (err: Error) => void): void;
* loadScript(url: string|string[], options: Record<string, any>): void;
* loadScript(url: string|string[], onComplete: (err: Error) => void): void;
* loadScript(url: string|string[]): void;
*/
loadScript (url, options, onComplete) {
var { options, onComplete } = parseParameters(options, undefined, onComplete);
Expand Down Expand Up @@ -649,8 +658,10 @@ AssetManager.prototype = {
* loadBundle('http://localhost:8080/test', null, (err, bundle) => console.log(err));
*
* @typescript
* loadBundle(nameOrUrl: string, options?: Record<string, any>, onComplete?: (err: Error, bundle: cc.AssetManager.Bundle) => void): void
* loadBundle(nameOrUrl: string, onComplete?: (err: Error, bundle: cc.AssetManager.Bundle) => void): void
* loadBundle(nameOrUrl: string, options: Record<string, any>, onComplete: (err: Error, bundle: cc.AssetManager.Bundle) => void): void
* loadBundle(nameOrUrl: string, options: Record<string, any>): void
* loadBundle(nameOrUrl: string, onComplete: (err: Error, bundle: cc.AssetManager.Bundle) => void): void
* loadBundle(nameOrUrl: string): void
*/
loadBundle (nameOrUrl, options, onComplete) {
var { options, onComplete } = parseParameters(options, undefined, onComplete);
Expand Down
64 changes: 39 additions & 25 deletions cocos2d/core/asset-manager/bundle.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,9 @@ Bundle.prototype = {
* bundle.getDirWithPath('images', cc.Texture2D, infos);
*
* @typescript
* getDirWithPath (path: string, type?: typeof cc.Asset, out?: Array<Record<string, any>>): Array<Record<string, any>>
* getDirWithPath (path: string, type: typeof cc.Asset, out: Array<Record<string, any>>): Array<Record<string, any>>
* getDirWithPath (path: string, type: typeof cc.Asset): Array<Record<string, any>>
* getDirWithPath (path: string): Array<Record<string, any>>
*/
getDirWithPath (path, type, out) {
return this._config.getDirWithPath(path, type, out);
Expand Down Expand Up @@ -240,10 +242,12 @@ Bundle.prototype = {
* bundle2.load('imgs/cocos', cc.SpriteFrame, null, (err, spriteFrame) => console.log(err));
*
* @typescript
* load<T extends cc.Asset>(paths: string|string[], type?: typeof cc.Asset, onProgress?: (finish: number, total: number, item: RequestItem) => void, onComplete?: (error: Error, assets: T|Array<T>) => void): void
* load<T extends cc.Asset>(paths: string|string[], onProgress?: (finish: number, total: number, item: RequestItem) => void, onComplete?: (error: Error, assets: T|Array<T>) => void): void
* load<T extends cc.Asset>(paths: string|string[], type?: typeof cc.Asset, onComplete?: (error: Error, assets: T|Array<T>) => void): void
* load<T extends cc.Asset>(paths: string|string[], onComplete?: (error: Error, assets: T|Array<T>) => void): void
* load<T extends cc.Asset>(paths: string|string[], type: typeof cc.Asset, onProgress: (finish: number, total: number, item: RequestItem) => void, onComplete: (error: Error, assets: T|Array<T>) => void): void
* load<T extends cc.Asset>(paths: string|string[], onProgress: (finish: number, total: number, item: RequestItem) => void, onComplete: (error: Error, assets: T|Array<T>) => void): void
* load<T extends cc.Asset>(paths: string|string[], type: typeof cc.Asset, onComplete: (error: Error, assets: T|Array<T>) => void): void
* load<T extends cc.Asset>(paths: string|string[], onComplete: (error: Error, assets: T|Array<T>) => void): void
* load<T extends cc.Asset>(paths: string|string[], type: typeof cc.Asset): void
* load<T extends cc.Asset>(paths: string|string[]): void
*/
load (paths, type, onProgress, onComplete) {
var { type, onProgress, onComplete } = parseLoadResArgs(type, onProgress, onComplete);
Expand Down Expand Up @@ -290,10 +294,12 @@ Bundle.prototype = {
* bundle2.load('imgs/cocos', cc.SpriteFrame, (err, spriteFrame) => {});
*
* @typescript
* preload(paths: string|string[], type?: typeof cc.Asset, onProgress?: (finish: number, total: number, item: RequestItem) => void, onComplete?: (error: Error, items: RequestItem[]) => void): void
* preload(paths: string|string[], onProgress?: (finish: number, total: number, item: RequestItem) => void, onComplete?: (error: Error, items: RequestItem[]) => void): void
* preload(paths: string|string[], type?: typeof cc.Asset, onComplete?: (error: Error, items: RequestItem[]) => void): void
* preload(paths: string|string[], onComplete?: (error: Error, items: RequestItem[]) => void): void
* preload(paths: string|string[], type: typeof cc.Asset, onProgress: (finish: number, total: number, item: RequestItem) => void, onComplete: (error: Error, items: RequestItem[]) => void): void
* preload(paths: string|string[], onProgress: (finish: number, total: number, item: RequestItem) => void, onComplete: (error: Error, items: RequestItem[]) => void): void
* preload(paths: string|string[], type: typeof cc.Asset, onComplete: (error: Error, items: RequestItem[]) => void): void
* preload(paths: string|string[], type: typeof cc.Asset): void
* preload(paths: string|string[], onComplete: (error: Error, items: RequestItem[]) => void): void
* preload(paths: string|string[]): void
*/
preload (paths, type, onProgress, onComplete) {
var { type, onProgress, onComplete } = parseLoadResArgs(type, onProgress, onComplete);
Expand Down Expand Up @@ -337,10 +343,12 @@ Bundle.prototype = {
* bundle2.loadDir('skills', cc.SpriteFrame, null, (err, spriteFrames) => console.log(err));
*
* @typescript
* loadDir<T extends cc.Asset>(dir: string, type?: typeof cc.Asset, onProgress?: (finish: number, total: number, item: RequestItem) => void, onComplete?: (error: Error, assets: Array<T>) => void): void
* loadDir<T extends cc.Asset>(dir: string, onProgress?: (finish: number, total: number, item: RequestItem) => void, onComplete?: (error: Error, assets: Array<T>) => void): void
* loadDir<T extends cc.Asset>(dir: string, type?: typeof cc.Asset, onComplete?: (error: Error, assets: Array<T>) => void): void
* loadDir<T extends cc.Asset>(dir: string, onComplete?: (error: Error, assets: Array<T>) => void): void
* loadDir<T extends cc.Asset>(dir: string, type: typeof cc.Asset, onProgress: (finish: number, total: number, item: RequestItem) => void, onComplete: (error: Error, assets: Array<T>) => void): void
* loadDir<T extends cc.Asset>(dir: string, onProgress: (finish: number, total: number, item: RequestItem) => void, onComplete: (error: Error, assets: Array<T>) => void): void
* loadDir<T extends cc.Asset>(dir: string, type: typeof cc.Asset, onComplete: (error: Error, assets: Array<T>) => void): void
* loadDir<T extends cc.Asset>(dir: string, type: typeof cc.Asset): void
* loadDir<T extends cc.Asset>(dir: string, onComplete: (error: Error, assets: Array<T>) => void): void
* loadDir<T extends cc.Asset>(dir: string): void
*/
loadDir (dir, type, onProgress, onComplete) {
var { type, onProgress, onComplete } = parseLoadResArgs(type, onProgress, onComplete);
Expand Down Expand Up @@ -385,10 +393,12 @@ Bundle.prototype = {
* bundle2.loadDir('skills', cc.SpriteFrame, (err, spriteFrames) => {});
*
* @typescript
* preloadDir(dir: string, type?: typeof cc.Asset, onProgress?: (finish: number, total: number, item: RequestItem) => void, onComplete?: (error: Error, items: RequestItem[]) => void): void
* preloadDir(dir: string, onProgress?: (finish: number, total: number, item: RequestItem) => void, onComplete?: (error: Error, items: RequestItem[]) => void): void
* preloadDir(dir: string, type?: typeof cc.Asset, onComplete?: (error: Error, items: RequestItem[]) => void): void
* preloadDir(dir: string, onComplete?: (error: Error, items: RequestItem[]) => void): void
* preloadDir(dir: string, type: typeof cc.Asset, onProgress: (finish: number, total: number, item: RequestItem) => void, onComplete: (error: Error, items: RequestItem[]) => void): void
* preloadDir(dir: string, onProgress: (finish: number, total: number, item: RequestItem) => void, onComplete: (error: Error, items: RequestItem[]) => void): void
* preloadDir(dir: string, type: typeof cc.Asset, onComplete: (error: Error, items: RequestItem[]) => void): void
* preloadDir(dir: string, type: typeof cc.Asset): void
* preloadDir(dir: string, onComplete: (error: Error, items: RequestItem[]) => void): void
* preloadDir(dir: string): void
*/
preloadDir (dir, type, onProgress, onComplete) {
var { type, onProgress, onComplete } = parseLoadResArgs(type, onProgress, onComplete);
Expand Down Expand Up @@ -417,10 +427,12 @@ Bundle.prototype = {
* bundle1.loadScene('first', (err, sceneAsset) => cc.director.runScene(sceneAsset));
*
* @typescript
* loadScene(sceneName: string, options?: Record<string, any>, onProgress?: (finish: number, total: number, item: RequestItem) => void, onComplete?: (error: Error, sceneAsset: cc.SceneAsset) => void): void
* loadScene(sceneName: string, onProgress?: (finish: number, total: number, item: RequestItem) => void, onComplete?: (error: Error, sceneAsset: cc.SceneAsset) => void): void
* loadScene(sceneName: string, options?: Record<string, any>, onComplete?: (error: Error, sceneAsset: cc.SceneAsset) => void): void
* loadScene(sceneName: string, onComplete?: (error: Error, sceneAsset: cc.SceneAsset) => void): void
* loadScene(sceneName: string, options: Record<string, any>, onProgress: (finish: number, total: number, item: RequestItem) => void, onComplete: (error: Error, sceneAsset: cc.SceneAsset) => void): void
* loadScene(sceneName: string, onProgress: (finish: number, total: number, item: RequestItem) => void, onComplete: (error: Error, sceneAsset: cc.SceneAsset) => void): void
* loadScene(sceneName: string, options: Record<string, any>, onComplete: (error: Error, sceneAsset: cc.SceneAsset) => void): void
* loadScene(sceneName: string, options: Record<string, any>): void
* loadScene(sceneName: string, onComplete: (error: Error, sceneAsset: cc.SceneAsset) => void): void
* loadScene(sceneName: string): void
*/
loadScene (sceneName, options, onProgress, onComplete) {
var { options, onProgress, onComplete } = parseParameters(options, onProgress, onComplete);
Expand Down Expand Up @@ -469,10 +481,12 @@ Bundle.prototype = {
* bundle1.loadScene('first', (err, scene) => cc.director.runScene(scene));
*
* @typescript
* preloadScene(sceneName: string, options?: Record<string, any>, onProgress?: (finish: number, total: number, item: RequestItem) => void, onComplete?: (error: Error) => void): void
* preloadScene(sceneName: string, onProgress?: (finish: number, total: number, item: RequestItem) => void, onComplete?: (error: Error) => void): void
* preloadScene(sceneName: string, options?: Record<string, any>, onComplete?: (error: Error) => void): void
* preloadScene(sceneName: string, onComplete?: (error: Error) => void): void
* preloadScene(sceneName: string, options: Record<string, any>, onProgress: (finish: number, total: number, item: RequestItem) => void, onComplete: (error: Error) => void): void
* preloadScene(sceneName: string, onProgress: (finish: number, total: number, item: RequestItem) => void, onComplete: (error: Error) => void): void
* preloadScene(sceneName: string, options: Record<string, any>, onComplete: (error: Error) => void): void
* preloadScene(sceneName: string, options: Record<string, any>): void
* preloadScene(sceneName: string, onComplete: (error: Error) => void): void
* preloadScene(sceneName: string): void
*/
preloadScene (sceneName, options, onProgress, onComplete) {
var { options, onProgress, onComplete } = parseParameters(options, onProgress, onComplete);
Expand Down
Loading

0 comments on commit ee35c65

Please sign in to comment.