@shimotsuki/core 1.0.6 → 1.0.8

package/dist/index.d.ts

@@ -970,18 +970,17 @@ type UIComponentType<T> = T extends UILayer<infer U> ? U : void;
 type SceneComponentType<T> = T extends SceneLayer<infer U> ? U : void;
 /**预制体路径 */
 declare enum BasePrefab {
-    Root = "core/root",
-    Toast = "core/toast",
-    BlackMask = "core/black-mask",
-    Loading = "core/loading",
-    Notice = "core/notice",
-    Reconnection = "core/reconnection"
+    Root = "root",
+    Toast = "toast",
+    BlackMask = "black-mask",
+    Loading = "loading",
+    Notice = "notice",
+    Reconnection = "reconnection"
 }
 declare class GuiManager extends BaseManager {
+    #private;
     /**常驻顶层UI节点层级 */
-    private _gui;
-    get gui(): Gui;
-    set gui(v: Gui);
+    gui: Gui;
     /**
      * 获取预制体
      * @param type 类型
@@ -989,7 +988,7 @@ declare class GuiManager extends BaseManager {
      */
     private getGuiPrefabByType;
     /**初始化 */
-    init(): Promise<this>;
+    init(path?: string, bundleName?: string): Promise<this>;
 }
 
 /**
@@ -998,7 +997,7 @@ declare class GuiManager extends BaseManager {
 * @date 2024-09-12 11:49:44
 */
 declare class Manager {
-    static ins: Manager;
+    #private;
     static get instance(): Manager;
     readonly onAppInitDelegate: AsyncDelegate<() => (Promise<void> | void)>;
     /**音频 */
@@ -1013,6 +1012,11 @@ declare class Manager {
     res: ResLoader;
     /**工具类 */
     util: CoreUtil;
+    /**GUI资源配置 */
+    setGuiConfig: ({ path, bundleName }?: {
+        path?: string;
+        bundleName?: string;
+    }) => this;
     /**启动 */
     boot(): Promise<void>;
 }

package/dist/index.js

@@ -1709,30 +1709,26 @@ CoreBlackMask = __decorate([
 /**预制体路径 */
 var BasePrefab;
 (function (BasePrefab) {
-    BasePrefab["Root"] = "core/root";
-    BasePrefab["Toast"] = "core/toast";
-    BasePrefab["BlackMask"] = "core/black-mask";
-    BasePrefab["Loading"] = "core/loading";
-    BasePrefab["Notice"] = "core/notice";
-    BasePrefab["Reconnection"] = "core/reconnection";
+    BasePrefab["Root"] = "root";
+    BasePrefab["Toast"] = "toast";
+    BasePrefab["BlackMask"] = "black-mask";
+    BasePrefab["Loading"] = "loading";
+    BasePrefab["Notice"] = "notice";
+    BasePrefab["Reconnection"] = "reconnection";
 })(BasePrefab || (BasePrefab = {}));
 class GuiManager extends BaseManager {
     /**常驻顶层UI节点层级 */
-    _gui;
-    get gui() {
-        return this._gui;
-    }
-    set gui(v) {
-        this._gui = v;
-    }
+    gui;
+    #path = 'core';
+    #bundleName = 'resources';
     /**
      * 获取预制体
      * @param type 类型
      * @returns
      */
-    getGuiPrefabByType = (type) => {
+    getGuiPrefabByType = (bundleName, type) => {
         return new Promise((resolve, reject) => {
-            this.cat.res.load(type, (err, prefab) => {
+            this.cat.res.load(bundleName, `${this.#path}/${type}`, (err, prefab) => {
                 if (err) {
                     reject(err);
                 }
@@ -1743,9 +1739,11 @@ class GuiManager extends BaseManager {
         });
     };
     /**初始化 */
-    async init() {
+    async init(path = 'core', bundleName = 'resources') {
+        this.#bundleName = bundleName;
+        this.#path = path;
         // 初始化常驻节点
-        const root_prefab = await this.getGuiPrefabByType(BasePrefab.Root);
+        const root_prefab = await this.getGuiPrefabByType(this.#bundleName, BasePrefab.Root);
         const root = instantiate(root_prefab);
         this.gui = root.getComponent(Gui).init(this.cat);
         director.addPersistRootNode(root);
@@ -2529,12 +2527,12 @@ CoreUIModal = __decorate([
 * @date 2024-09-12 11:49:44
 */
 class Manager {
-    static ins;
+    static #ins;
     static get instance() {
-        if (!this.ins) {
-            this.ins = new Manager();
+        if (!this.#ins) {
+            this.#ins = new Manager();
         }
-        return this.ins;
+        return this.#ins;
     }
     onAppInitDelegate = new AsyncDelegate();
     /**音频 */
@@ -2549,6 +2547,15 @@ class Manager {
     res;
     /**工具类 */
     util;
+    #path = 'core';
+    #bundleName = 'resources';
+    /**GUI资源配置 */
+    setGuiConfig = ({ path = 'core', bundleName = 'resources' } = {}) => {
+        this.#path = path;
+        this.#bundleName = bundleName;
+        console.log('GUI资源配置', this.#path, this.#bundleName);
+        return this;
+    };
     /**启动 */
     async boot() {
         this.res = new ResLoader();
@@ -2556,7 +2563,7 @@ class Manager {
         this.storage = new StorageManager(this);
         this.event = new MessageManager();
         this.audio = new AudioManager(this);
-        this.gui = (await (new GuiManager(this)).init()).gui;
+        this.gui = (await (new GuiManager(this)).init(this.#bundleName, this.#path)).gui;
     }
 }
 const cat = Manager.instance;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@shimotsuki/core",
-    "version": "1.0.6",
+    "version": "1.0.8",
     "description": "",
     "license": "MIT",
     "main": "dist/index.js",