From f13fba3d832f95285661c1f116dffe4685e72d9a Mon Sep 17 00:00:00 2001
From: dgflash <dgflash@qq.com>
Date: Fri, 29 Apr 2022 16:05:41 +0800
Subject: [PATCH 1/2] README.md

---
 README.md | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index aacb9fa..ac3f8d8 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,12 @@ oops-framework 基于 Cocos Creato 3.x 开发的一款游戏框架
 1. 提供游戏常用功能库，提高开发效率
 2. 提供业务模块开发的模板，降低程序设计难度
 3. 框架内置模块低耦合，可自行删除不需要的模块
+4. 框架提供游戏常用插件工具
+
+注：
+1. [源库链接更新效率更高](https://gitee.com/dgflash/oops-framework)（好用记得给作者一个Star）
+2. Cocos Creato 3.x 不同版的框架在源库分支中下载，master分支为最新引擎版本
+3. 学习交流 QQ 群：798575969
 
 #### 框架使用说明
 框架里的技术内容是较多，每项技术作者都用到项目中测试过，所以单项技术的稳定性是相对有保证的。开发者拿到框架按自己当前需求了解需要的技术即可。
@@ -98,9 +104,4 @@ oops-framework 基于 Cocos Creato 3.x 开发的一款游戏框架
 #### [新手引导模块 oops-guide](https://store.cocos.com/app/detail/3653)
 #### [联机游戏框架 oops-mgobe](https://store.cocos.com/app/detail/3574)
 #### [开源框架 oops-framework gitee](https://gitee.com/dgflash/oops-framework)
-#### [开源框架 oops-framework github](https://github.com/dgflash/oops-framework)
-
-#### 学习交流 QQ 群：798575969
-
-#### 注：
-Cocos Creator 3.x 不同版本的框架，可在分支中下载
\ No newline at end of file
+#### [开源框架 oops-framework github](https://github.com/dgflash/oops-framework)
\ No newline at end of file

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 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8DresLoader.loadRemote?=
 =?UTF-8?q?=E6=96=B9=E5=8A=A0=E8=BD=BD=E8=BF=9C=E7=A8=8B=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E6=9C=AA=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") {