lywsvip/oops-framework
1
0
Fork 0
mirror of https://gitee.com/dgflash/oops-framework.git synced 2026-05-31 18:59:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/dgflash/oops-framework

Browse Source 
# Conflicts:
#	assets/main.scene
This commit is contained in:
dgflash
2022-04-30 12:33:01 +08:00
parent f1efb99612 aea7701ebb
commit 249b3beafd
4 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/script/Main.ts
View File

@@ -26,7 +26,5 @@ export class Main extends Root {
if (JSB) {
oops.gui.toast("热更新后新程序的提示");
}
// console.log(protobuf);
}
}

13
assets/script/core/common/loader/ResLoader.ts
View File

@@ -152,8 +152,17 @@ export default class ResLoader {
public loadRemote<T extends Asset>(url: string, options: IRemoteOptions | null, onComplete?: CompleteCallback<T> | null): void;
public loadRemote<T extends Asset>(url: string, onComplete?: CompleteCallback<T> | null): void;
public loadRemote(url: string, ...args: any): void {
assetManager.loadRemote(url, args);
public loadRemote<T extends Asset>(url: string, ...args: any): void {
var options: IRemoteOptions | null = null;
var onComplete: CompleteCallback<T> | null = null;
if (args.length == 2) {
options = args[0];
onComplete = args[1];
}
else {
onComplete = args[0];
}
assetManager.loadRemote<T>(url, options, onComplete);
}
public release(path: string, bundleName: string = "resources") {