@shimotsuki/core 2.0.31 → 2.0.32

package/dist/index.d.ts

@@ -1026,8 +1026,7 @@ declare class Manager {
     /**启动 */
     boot(): Promise<void>;
     /**合并对象 */
-    use(target: string, source: string): this;
-    use<T extends object>(target: T, source: T): this;
+    merge<K extends keyof Manager, T extends object>(target: K, source: T): this;
 }
 declare const cat: Manager;
 

package/dist/index.js

@@ -2775,57 +2775,41 @@ class Manager {
     /**音频 */
     #audio = null;
     get audio() {
-        if (!this.#initialized)
-            throw new Error('[CAT] 未初始化');
         return this.#audio;
     }
     /**事件 */
     #event = null;
     get event() {
-        if (!this.#initialized)
-            throw new Error('[CAT] 未初始化');
         return this.#event;
     }
     /**gui */
     #gui = null;
     get gui() {
-        if (!this.#initialized)
-            throw new Error('[CAT] 未初始化');
         return this.#gui;
     }
     /**本地存储 */
     #storage = null;
     get storage() {
-        if (!this.#initialized)
-            throw new Error('[CAT] 未初始化');
         return this.#storage;
     }
     /**资源 */
     #res = null;
     get res() {
-        if (!this.#initialized)
-            throw new Error('[CAT] 未初始化');
         return this.#res;
     }
     /**工具类 */
     #util = null;
     get util() {
-        if (!this.#initialized)
-            throw new Error('[CAT] 未初始化');
         return this.#util;
     }
     /**类 */
     #socialGameClient = null;
     get socialGameClient() {
-        if (!this.#initialized)
-            throw new Error('[CAT] 未初始化');
         return this.#socialGameClient;
     }
     /**数据存储 */
     #store = null;
     get store() {
-        if (!this.#initialized)
-            throw new Error('[CAT] 未初始化');
         return this.#store;
     }
     /**GUI */
@@ -2837,7 +2821,7 @@ class Manager {
     /**GUI资源配置 */
     setConfig = ({ gui_bundleName = 'resources', audio_local_store_key = 'game_audio' } = {}) => {
         if (this.#initialized) {
-            throw new Error('Manager 已初始化，无法修改配置');
+            throw new Error('[CAT] 已初始化，无法修改配置');
         }
         this.#gui_bundle_name = gui_bundleName;
         this.#audio_local_store_key = audio_local_store_key;
@@ -2846,7 +2830,7 @@ class Manager {
     /**启动 */
     async boot() {
         if (this.#initialized) {
-            throw new Error('Manager 已初始化');
+            throw new Error('[CAT] 已初始化');
         }
         try {
             this.#store = new CoreStore(this);
@@ -2860,23 +2844,19 @@ class Manager {
             this.#initialized = true;
         }
         catch (err) {
-            throw new Error(`Manager 初始化失败: ${err instanceof Error ? err.message : String(err)}`);
+            console.error(`[CAT] 初始化失败:`, err);
+            throw err;
         }
     }
-    use(target, source) {
+    /**合并对象 */
+    merge(target, source) {
         if (!this.#initialized)
             throw new Error('[CAT] 未初始化');
-        // 如果 target 是字符串，检查实例上是否有对应的属性
-        if (typeof target === 'string') {
-            Reflect.set(this, target, source);
-            return this;
-        }
-        // 如果 target 是对象，直接合并
-        if (target !== null && typeof target === 'object') {
-            Object.assign(target, source);
+        if (typeof target !== 'string') {
+            throw new Error(`merge方法第一个参数应该为string类型`);
         }
-        else {
-            throw new Error('target 必须是字符串或对象');
+        if (Reflect.get(this, target)) {
+            Reflect.set(this, target, source);
         }
         return this;
     }

package/package.json

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