@eva/eva.js 2.0.0-beta.8 → 2.0.0

package/dist/eva.js.esm.js

@@ -2,7 +2,6 @@ import EventEmitter from 'eventemitter3';
 import { isObject, isEqual } from 'lodash-es';
 import { type, step } from '@eva/inspector-decorator';
 import { Assets } from 'pixi.js';
-import { AbstractLoadStrategy, AudioLoadStrategy, ImageLoadStrategy, XhrResponseType, MediaElementLoadStrategy, VideoLoadStrategy, Loader, Resource as Resource$1, ResourceType, ResourceState } from 'resource-loader';
 
 function getComponentName(component) {
     if (component instanceof Component) {
@@ -864,7 +863,7 @@ class Game extends EventEmitter {
     }
     init({ systems, frameRate = 60, autoStart = true, needScene = true } = {}) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (window.__EVA_INSPECTOR_ENV__) {
+            if (typeof window !== 'undefined' && window.__EVA_INSPECTOR_ENV__) {
                 window.__EVA_GAME_INSTANCE__ = this;
             }
             this.ticker = new Ticker$1({ autoStart: false, frameRate });
@@ -1116,19 +1115,6 @@ class Progress extends EventEmitter {
     }
 }
 
-const resourceLoader = {
-    AbstractLoadStrategy,
-    AudioLoadStrategy,
-    ImageLoadStrategy,
-    XhrResponseType,
-    MediaElementLoadStrategy,
-    VideoLoadStrategy,
-    Loader,
-    Resource: Resource$1,
-    ResourceType,
-    ResourceState,
-};
-
 var LOAD_EVENT;
 (function (LOAD_EVENT) {
     LOAD_EVENT["START"] = "start";
@@ -1255,7 +1241,7 @@ class Resource extends EventEmitter {
         if (!unLoadNames.length)
             return;
         const resolves = {};
-        unLoadNames.forEach(name => {
+        unLoadNames.forEach((name) => __awaiter(this, void 0, void 0, function* () {
             var _a;
             this.promiseMap[name] = new Promise(r => (resolves[name] = r));
             const res = this.resourcesMap[name];
@@ -1270,23 +1256,55 @@ class Resource extends EventEmitter {
                 }
                 else {
                     let url = (_a = res.src[key]) === null || _a === void 0 ? void 0 : _a.url;
+                    console.log(url);
                     if (typeof url === 'string' && url.startsWith('//')) {
-                        url = `${window.location.protocol}${res.src[key].url}`;
+                        url = `https:${res.src[key].url}`;
                     }
                     if (key === 'atlas') {
+                        const loadImagePromise = Assets.load(res.src['image'].url).catch(e => {
+                            this.onError({
+                                preload,
+                                errMsg: e.message,
+                                resource: {
+                                    metadata: { key, name, resolves },
+                                },
+                            });
+                        });
                         Assets.add({
                             alias: url,
                             src: url,
                             data: {
-                                resolve: () => Assets.load(res.src['image'].url),
+                                resolve: () => loadImagePromise,
+                                imageTexture: yield loadImagePromise,
                             },
                         });
                     }
                     else {
-                        Assets.add({
+                        const options = {
                             alias: url,
                             src: url,
-                        });
+                        };
+                        if (res.type === RESOURCE_TYPE.SPRITE || res.type === RESOURCE_TYPE.SPRITE_ANIMATION) {
+                            if (res.src[key].type === 'json') {
+                                try {
+                                    const data = yield Assets.load(res.src['image'].url);
+                                    options.data = {
+                                        texture: data,
+                                    };
+                                }
+                                catch (e) {
+                                    console.log('>>>E', e);
+                                    this.onError({
+                                        preload,
+                                        errMsg: e.message,
+                                        resource: {
+                                            metadata: { key, name, resolves },
+                                        },
+                                    });
+                                }
+                            }
+                        }
+                        Assets.add(options);
                     }
                     Assets.load(url)
                         .then(data => {
@@ -1310,7 +1328,7 @@ class Resource extends EventEmitter {
                     });
                 }
             }
-        });
+        }));
     }
     doComplete(name, resolve, preload = false) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -1379,8 +1397,8 @@ const decorators = {
     IDEProp,
     componentObserver,
 };
-const version = '2.0.0-beta.8';
+const version = '2.0.0-beta.22';
 console.log(`Eva.js version: ${version}`);
 const RESOURCE_TYPE_STRATEGY = {};
 
-export { Component$1 as Component, Game$1 as Game, GameObject$1 as GameObject, IDEProp, LOAD_EVENT, LOAD_SCENE_MODE, ObserverType as OBSERVER_TYPE, RESOURCE_TYPE, RESOURCE_TYPE_STRATEGY, Scene$1 as Scene, System$1 as System, Transform$1 as Transform, componentObserver, decorators, resource, resourceLoader, version };
+export { Component$1 as Component, Game$1 as Game, GameObject$1 as GameObject, IDEProp, LOAD_EVENT, LOAD_SCENE_MODE, ObserverType as OBSERVER_TYPE, RESOURCE_TYPE, RESOURCE_TYPE_STRATEGY, Scene$1 as Scene, System$1 as System, Transform$1 as Transform, componentObserver, decorators, resource, version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eva/eva.js",
-  "version": "2.0.0-beta.8",
+  "version": "2.0.0",
   "description": "@eva/eva.js",
   "main": "index.js",
   "module": "dist/eva.js.esm.js",