diff --git a/assets/main.scene b/assets/main.scene index afb10d4..29e9380 100644 --- a/assets/main.scene +++ b/assets/main.scene @@ -227,7 +227,7 @@ "_priority": 1073741824, "_fov": 45, "_fovAxis": 0, - "_orthoHeight": 474.1565217391304, + "_orthoHeight": 375, "_near": 1, "_far": 2000, "_color": { diff --git a/assets/script/Main.ts b/assets/script/Main.ts index c23445f..188d8e5 100644 --- a/assets/script/Main.ts +++ b/assets/script/Main.ts @@ -26,7 +26,5 @@ export class Main extends Root { if (JSB) { oops.gui.toast("热更新后新程序的提示"); } - - // console.log(protobuf); } } \ No newline at end of file diff --git a/assets/script/core/common/loader/ResLoader.ts b/assets/script/core/common/loader/ResLoader.ts index 125d4b8..f4ad78f 100644 --- a/assets/script/core/common/loader/ResLoader.ts +++ b/assets/script/core/common/loader/ResLoader.ts @@ -152,8 +152,17 @@ export default class ResLoader { public loadRemote(url: string, options: IRemoteOptions | null, onComplete?: CompleteCallback | null): void; public loadRemote(url: string, onComplete?: CompleteCallback | null): void; - public loadRemote(url: string, ...args: any): void { - assetManager.loadRemote(url, args); + public loadRemote(url: string, ...args: any): void { + var options: IRemoteOptions | null = null; + var onComplete: CompleteCallback | null = null; + if (args.length == 2) { + options = args[0]; + onComplete = args[1]; + } + else { + onComplete = args[0]; + } + assetManager.loadRemote(url, options, onComplete); } public release(path: string, bundleName: string = "resources") {