From f4e4db5a267c064ee6e4ac24d185bd616cbd80c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=82=E7=8B=A9?= <smallp010@qq.com>
Date: Fri, 15 Oct 2021 10:22:14 +0000
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80bundle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/scripts/framework/core/logic/Logic.ts           |  2 --
 .../scripts/framework/core/nodePool/NodePoolManager.ts |  2 +-
 assets/scripts/framework/core/ui/UIView.ts             | 10 +---------
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/assets/scripts/framework/core/logic/Logic.ts b/assets/scripts/framework/core/logic/Logic.ts
index 7b42dcfb..f505f119 100644
--- a/assets/scripts/framework/core/logic/Logic.ts
+++ b/assets/scripts/framework/core/logic/Logic.ts
@@ -3,8 +3,6 @@ import { Macro } from "../../defines/Macros";
 export class Logic {
     /**@description logic bundle，管理器设置 */
     static bundle = Macro.UNKNOWN;
-    /**@description logic bundle，管理器设置 */
-    bundle: string = Macro.UNKNOWN;
 
     protected gameView : GameView = null!;
 
diff --git a/assets/scripts/framework/core/nodePool/NodePoolManager.ts b/assets/scripts/framework/core/nodePool/NodePoolManager.ts
index d6702441..cd80242c 100644
--- a/assets/scripts/framework/core/nodePool/NodePoolManager.ts
+++ b/assets/scripts/framework/core/nodePool/NodePoolManager.ts
@@ -89,7 +89,7 @@ export class NodePoolManager {
      * @description 创建对象池
      * @param type 对象池类型
      */
-    createPool(type: string) : NodePool | null{
+    createPool(type: string) : NodePool{
         if (!this.pools.has(type)) {
             this.pools.set(type, new NodePool(type));
         }
diff --git a/assets/scripts/framework/core/ui/UIView.ts b/assets/scripts/framework/core/ui/UIView.ts
index 82750678..170522c6 100644
--- a/assets/scripts/framework/core/ui/UIView.ts
+++ b/assets/scripts/framework/core/ui/UIView.ts
@@ -10,6 +10,7 @@ const { ccclass, property } = _decorator;
 
 @ccclass
 export default class UIView extends EventComponent implements IFullScreenAdapt {
+    bundle = Macro.BUNDLE_RESOURCES
     onFullScreenAdapt(): void {
 
     }
@@ -49,15 +50,6 @@ export default class UIView extends EventComponent implements IFullScreenAdapt {
         return this._className;
     }
 
-    private _bundle: BUNDLE_TYPE = null!;
-    /**指向当前View打开时的bundle */
-    public set bundle(value) {
-        this._bundle = value;
-    }
-    public get bundle() {
-        return this._bundle;
-    }
-
     /**@description 关闭界面动画 */
     protected get closeAction() : ViewAction | null{
         return null;
-- 
Gitee