From aea7701ebb2be03a161e1b436279bb85f138ac78 Mon Sep 17 00:00:00 2001
From: dgflash <dgflash@qq.com>
Date: Fri, 29 Apr 2022 20:08:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DresLoader.loadRemote=E6=96=B9?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E8=BF=9C=E7=A8=8B=E8=B5=84=E6=BA=90=E6=9C=AA?=
 =?UTF-8?q?=E7=94=9F=E6=95=88=E6=9E=9C=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/main.scene                             |  2 +-
 assets/script/Main.ts                         |  2 --
 assets/script/core/common/loader/ResLoader.ts | 13 +++++++++++--
 3 files changed, 12 insertions(+), 5 deletions(-)

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<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") {