@cc-component/cc-core 1.4.0 → 1.4.2

package/assets/core/home/BaseModuleConfig.ts.meta

@@ -1,9 +1,9 @@
-{
-  "ver": "4.0.24",
-  "importer": "typescript",
-  "imported": true,
-  "uuid": "be82897c-95e5-4d69-9c19-4ff84d7f02eb",
-  "files": [],
-  "subMetas": {},
-  "userData": {}
-}
+{
+  "ver": "4.0.24",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "be82897c-95e5-4d69-9c19-4ff84d7f02eb",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

package/assets/core/home/ResourceManager.ts

@@ -290,7 +290,7 @@ export class ResourceManager {
             });
         }
         // 检查资源是否已加载
-        let asset = bundle.get(path);
+        let asset = bundle.get(path, type);
 
         if (asset) {
             //Logger.debug('已加载==', asset.refCount)
@@ -302,7 +302,7 @@ export class ResourceManager {
 
         // 加载资源
         return new Promise<T>((resolve, reject) => {
-            bundle.load(path, (err, asset) => {
+            bundle.load(path, type, (err, asset) => {
                 if (err) {
                     console.error(`${bundleName}-加载资源失败: ${path}`);
                     resolve(null);

package/assets/core/interface/App.ts

@@ -19,6 +19,7 @@ import { LayerType } from "../config/LayerType";
 import { ELoggerLevel } from "../lib/logger/ELoggerLevel";
 import { SkeletonAnim } from "../home/BaseSkeleton";
 import { Tools } from "../home/Tools";
+import { ecs } from "../lib/ecs/ECS";
 
 export class App {
     /**当前bundle */
@@ -285,11 +286,12 @@ export class App {
                     App.Ins.openedWindowsConfig.set(className, config);
                 }
                 //@ts-ignore
-                view.window_name = className;
+                config.name = className;
                 //@ts-ignore
                 view.config = config;
                 //@ts-ignore
                 if (param) view.param = param;
+
                 resolve(view);
             } catch (error) {
                 console.error("加载窗口失败:", config.path, error);
@@ -328,7 +330,7 @@ export class App {
                          * eventName：关闭方法名称
                          * param：参数
                         */
-                        const closeEvent: { eventName: string, param?: any } = view.closeEvent
+                        const closeEvent: { eventName: string, param?: any } = view.closeEvent?.()
                         const close: Function = view[closeEvent.eventName]
                         if (close) { close.call(view, closeEvent.param) }
                         if (view && view.node && view.node.isValid) view.node.destroy(); // 关闭窗口

package/assets/core/lib/ecs.meta

@@ -1,9 +1,9 @@
-{
-  "ver": "1.2.0",
-  "importer": "directory",
-  "imported": true,
-  "uuid": "becc7741-24ad-4102-b41f-b4e76ec62918",
-  "files": [],
-  "subMetas": {},
-  "userData": {}
-}
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "becc7741-24ad-4102-b41f-b4e76ec62918",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

package/index.ts.meta

@@ -1,9 +1,9 @@
-{
-  "ver": "4.0.24",
-  "importer": "typescript",
-  "imported": true,
-  "uuid": "7a336b7d-79a3-48ef-9451-d925e367809b",
-  "files": [],
-  "subMetas": {},
-  "userData": {}
-}
+{
+  "ver": "4.0.24",
+  "importer": "typescript",
+  "imported": true,
+  "uuid": "7a336b7d-79a3-48ef-9451-d925e367809b",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cc-component/cc-core",
-    "version": "1.4.0",
+    "version": "1.4.2",
     "engine": ">=3.8.6",
     "description": "系统组件添加常用扩展方法",
     "main": "index.ts",

package/package.json.meta

@@ -1,11 +1,11 @@
-{
-  "ver": "2.0.1",
-  "importer": "json",
-  "imported": true,
-  "uuid": "561e76c1-e517-4977-ac87-442704e3de8f",
-  "files": [
-    ".json"
-  ],
-  "subMetas": {},
-  "userData": {}
-}
+{
+  "ver": "2.0.1",
+  "importer": "json",
+  "imported": true,
+  "uuid": "561e76c1-e517-4977-ac87-442704e3de8f",
+  "files": [
+    ".json"
+  ],
+  "subMetas": {},
+  "userData": {}
+}