@zhongguo168a/yxeditor-common 0.0.9 → 0.0.10

package/dist/index.d.ts

@@ -1,7 +1,4 @@
 import { HorizontalTextAlignment, VerticalTextAlignment, Scheduler, Prefab, Node, Component, ISchedulable, AssetManager, Asset, SpriteAtlas, Vec2, Vec3, Vec4 } from 'cc';
-import { Dispatcher as Dispatcher$1 } from 'db://assets/core/libs/event';
-import { List as List$1 } from 'db://assets/core/libs/ds';
-import { AssetURI as AssetURI$1 } from 'db://assets/core/libs/loader/AssetManager';
 
 interface error {
     isCancel(): boolean;
@@ -1292,20 +1289,35 @@ declare class Dispatcher implements ISchedulable {
     protected typeToList: Dictionary<string, CallbackList<any>>;
 }
 
+declare class AssetURI {
+    name: string;
+    constructor(name: string);
+    loadType: number;
+    uuid: string;
+    path: string;
+    bundle: string;
+}
+declare class XAssetManager {
+    getAsset(uri: string): any;
+    getAssetByUUID(uuid: string): any;
+    getRoot(): AssetManager;
+}
+declare let assetx: XAssetManager;
+
 declare class LoaderItem {
     onComplete?: (err: any, asset: any) => void;
     callHandler(err: any, asset: any): void;
     getBundle(): AssetManager.Bundle;
     type: string;
     bundle: AssetManager.Bundle;
-    uri: AssetURI$1;
+    uri: AssetURI;
     preload: boolean;
     error: any;
 }
 /**
  * uri格式:path, uuid://uuid, https://url
  */
-declare class AssetLoader extends Dispatcher$1 {
+declare class AssetLoader extends Dispatcher {
     /**
      *
      * @param bundleName
@@ -1353,32 +1365,17 @@ declare class AssetLoader extends Dispatcher$1 {
     getTotle(): number;
     getSucceed(): number;
     getFail(): number;
-    getFailList(): List$1<LoaderItem>;
+    getFailList(): List<LoaderItem>;
     protected _handleFailList(err: any, item: any): void;
     stop(): void;
     protected _stop: boolean;
     protected _onCompleteHandler: Function;
     protected _onProgressHandler: Function;
     protected _loaded: number;
-    protected _loaderList: any;
-    protected _failList: any;
+    protected _loaderList: List<LoaderItem>;
+    protected _failList: List<LoaderItem>;
 }
 
-declare class AssetURI {
-    name: string;
-    constructor(name: string);
-    loadType: number;
-    uuid: string;
-    path: string;
-    bundle: string;
-}
-declare class XAssetManager {
-    getAsset(uri: string): any;
-    getAssetByUUID(uuid: string): any;
-    getRoot(): AssetManager;
-}
-declare let assetx: XAssetManager;
-
 declare function parseAtlas(name: any, plist: any, texture: any): SpriteAtlas;
 
 type CreatorFunction = (...args: any[]) => {};

package/dist/index.esm.js

@@ -1,8 +1,4 @@
-import { HorizontalTextAlignment, VerticalTextAlignment, Scheduler, macro, director, instantiate, math, Component, ImageAsset, SpriteFrame, SpriteAtlas, assetManager, JsonAsset, TextAsset, Asset, path, Texture2D, Size, Vec2, Rect, Vec3, UITransform, Vec4, resources } from 'cc';
-import { parseAtlas as parseAtlas$1 } from 'db://assets/core/libs/loader/ParseAtlas';
-import { Dispatcher as Dispatcher$1, Listener as Listener$1 } from 'db://assets/core/libs/event';
-import { List as List$1 } from 'db://assets/core/libs/ds';
-import { AssetURI as AssetURI$1, assetx as assetx$1 } from 'db://assets/core/libs/loader/AssetManager';
+import { HorizontalTextAlignment, VerticalTextAlignment, Scheduler, macro, director, instantiate, math, Component, SpriteAtlas, Size, Vec2, Rect, SpriteFrame, path, assetManager, ImageAsset, JsonAsset, TextAsset, Asset, Texture2D, Vec3, UITransform, Vec4, resources } from 'cc';
 
 class NetUtil {
     // 获取URL的参数对象
@@ -4331,6 +4327,111 @@ class Dispatcher {
     }
 }
 
+function parseAtlas(name, plist, texture) {
+    plist.meta;
+    let frames = plist.frames;
+    let atlas = new SpriteAtlas();
+    atlas.name = name;
+    atlas._nativeAsset = plist;
+    let spriteFrames = atlas.spriteFrames;
+    // 1/1_1_0.png:{
+    //     frame: {x: 137, y: 302, w: 18, h: 24}
+    //     rotated: false
+    //     sourceSize: {w: 32, h: 32}
+    //     spriteSourceSize: {x: 7, y: 0, w: 18, h: 24}
+    //     trimmed: true
+    // }
+    let maxWidth = 0;
+    let maxHeight = 0;
+    for (let key in frames) {
+        let frame = frames[key];
+        let rotated = false, sourceSize, offset, textureRect;
+        rotated = frame.rotated;
+        {
+            let size = frame.sourceSize;
+            sourceSize = new Size(size.w, size.h);
+            maxWidth = Math.max(maxWidth, size.w);
+            maxHeight = Math.max(maxHeight, size.h);
+        }
+        { // 需要转化成以sourceSize的中心点为原点，cocos坐标系的偏移量
+            let pos = frame.spriteSourceSize;
+            offset = new Vec2(pos.x + pos.w * 0.5, pos.y + pos.h * 0.5);
+            offset.x -= sourceSize.width * 0.5;
+            offset.y -= sourceSize.height * 0.5;
+            offset.y = -offset.y; // y轴相反
+        }
+        {
+            let rect = frame.frame;
+            textureRect = new Rect(rect.x, rect.y, rect.w, rect.h);
+        }
+        var sprite = new SpriteFrame();
+        sprite.name = key;
+        sprite.reset({
+            originalSize: sourceSize,
+            rect: textureRect,
+            offset: offset,
+            isRotate: !!rotated,
+            texture: texture
+        });
+        let name = path.mainFileName(key);
+        spriteFrames[name] = sprite;
+    }
+    //
+    plist.meta.maxSize = { w: maxWidth, h: maxHeight };
+    return atlas;
+}
+
+class AssetURI {
+    constructor(name) {
+        this.name = name;
+        // 0-bundle+path 1-uuid  2-remote
+        this.loadType = 0;
+        let arr = name.split("://");
+        if (arr.length == 2) {
+            let head = arr[0];
+            if (head == "uuid") {
+                this.loadType = 1;
+                this.uuid = arr[1];
+            }
+            else if (head == "http" || head == "https") {
+                this.loadType = 2;
+            }
+            else {
+                this.bundle = head;
+                this.path = arr[1];
+            }
+        }
+        else {
+            this.bundle = "resources";
+            this.path = name;
+        }
+    }
+}
+class XAssetManager {
+    getAsset(uri) {
+        let obj = new AssetURI(uri);
+        switch (obj.loadType) {
+            case 1:
+                return assetManager.assets.get(obj.uuid);
+            case 2:
+                return assetManager.assets.get(obj.name);
+            default:
+                let bundle = assetManager.getBundle(obj.bundle);
+                if (!bundle) {
+                    return null;
+                }
+                return bundle.get(obj.path);
+        }
+    }
+    getAssetByUUID(uuid) {
+        return assetManager.assets.get(uuid);
+    }
+    getRoot() {
+        return assetManager;
+    }
+}
+let assetx = new XAssetManager();
+
 class LoaderItem {
     constructor() {
         this.preload = false;
@@ -4352,13 +4453,13 @@ class LoaderItem {
 /**
  * uri格式:path, uuid://uuid, https://url
  */
-class AssetLoader extends Dispatcher$1 {
+class AssetLoader extends Dispatcher {
     constructor() {
         super(...arguments);
         this._stop = false;
         this._loaded = 0;
-        this._loaderList = new List$1();
-        this._failList = new List$1();
+        this._loaderList = new List();
+        this._failList = new List();
     }
     /**
      *
@@ -4368,7 +4469,7 @@ class AssetLoader extends Dispatcher$1 {
     loadBundle(bundleName, otherConfig) {
         let item = new LoaderItem();
         item.type = "Bundle";
-        item.uri = new AssetURI$1(`${bundleName}://bundle`);
+        item.uri = new AssetURI(`${bundleName}://bundle`);
         if (otherConfig) {
             item.preload = otherConfig.preload;
             item.onComplete = otherConfig.onComplete;
@@ -4384,7 +4485,7 @@ class AssetLoader extends Dispatcher$1 {
         let item = new LoaderItem();
         item.type = "Atlas";
         // 加载json文件
-        item.uri = new AssetURI$1(uri);
+        item.uri = new AssetURI(uri);
         if (otherConfig) {
             item.onComplete = otherConfig.onComplete;
             item.preload = otherConfig.preload != undefined ? otherConfig.preload : false;
@@ -4396,7 +4497,7 @@ class AssetLoader extends Dispatcher$1 {
         let item = new LoaderItem();
         item.type = "Prefab";
         // 加载json文件
-        item.uri = new AssetURI$1(uri);
+        item.uri = new AssetURI(uri);
         if (otherConfig) {
             item.onComplete = otherConfig.onComplete;
             item.preload = otherConfig.preload != undefined ? otherConfig.preload : false;
@@ -4407,14 +4508,14 @@ class AssetLoader extends Dispatcher$1 {
     loadConfig(uri) {
         let item = new LoaderItem();
         item.type = "Config";
-        item.uri = new AssetURI$1(uri);
+        item.uri = new AssetURI(uri);
         this._loaderList.push(item);
         return this;
     }
     loadSpriteFrame(uri, otherConfig) {
         let item = new LoaderItem();
         item.type = "SpriteFrame";
-        item.uri = new AssetURI$1(uri);
+        item.uri = new AssetURI(uri);
         if (otherConfig) {
             item.onComplete = otherConfig.onComplete;
         }
@@ -4424,7 +4525,7 @@ class AssetLoader extends Dispatcher$1 {
     loadImageAsset(uri, otherConfig) {
         let item = new LoaderItem();
         item.type = "ImageAsset";
-        item.uri = new AssetURI$1(uri);
+        item.uri = new AssetURI(uri);
         if (otherConfig) {
             item.onComplete = otherConfig.onHandler;
         }
@@ -4434,7 +4535,7 @@ class AssetLoader extends Dispatcher$1 {
     _loadSpriteFrameByBundle(uri, bundle) {
         let item = new LoaderItem();
         item.type = "SpriteFrame";
-        item.uri = new AssetURI$1(`${bundle.name}://${uri}`);
+        item.uri = new AssetURI(`${bundle.name}://${uri}`);
         item.bundle = bundle;
         this._loaderList.push(item);
     }
@@ -4448,7 +4549,7 @@ class AssetLoader extends Dispatcher$1 {
                 resolve(this);
             }
             else {
-                let listener = Listener$1.create();
+                let listener = Listener.create();
                 let succeed = () => {
                     listener.off();
                     resolve(this);
@@ -4489,7 +4590,7 @@ class AssetLoader extends Dispatcher$1 {
                     break;
                 }
                 case "Atlas": {
-                    let asset = assetx$1.getAsset(item.uri.name);
+                    let asset = assetx.getAsset(item.uri.name);
                     if (asset) {
                         if (asset instanceof SpriteAtlas) {
                             this._loaded++;
@@ -4515,7 +4616,7 @@ class AssetLoader extends Dispatcher$1 {
                     break;
                 }
                 case "Prefab": {
-                    let asset = assetx$1.getAsset(item.uri.name);
+                    let asset = assetx.getAsset(item.uri.name);
                     if (asset) {
                         this._loaded++;
                         item.callHandler(null, asset);
@@ -4622,14 +4723,14 @@ class AssetLoader extends Dispatcher$1 {
                 textureUrl = item.uri.name;
                 break;
         }
-        textureItem.uri = new AssetURI$1(textureUrl);
+        textureItem.uri = new AssetURI(textureUrl);
         //
         this._loadByItem(textureItem, ImageAsset, (err, asset) => {
             if (!err) {
                 let tex = new Texture2D();
                 tex.image = asset;
                 tex.setFilters(1, 1);
-                let atlasSprite = parseAtlas$1(item.uri, content, tex);
+                let atlasSprite = parseAtlas(item.uri, content, tex);
                 let uuid = atlasAsset.uuid;
                 assetManager.assets.remove(uuid);
                 assetManager.assets.add(uuid, atlasSprite);
@@ -4729,111 +4830,6 @@ class AssetLoader extends Dispatcher$1 {
     }
 }
 
-class AssetURI {
-    constructor(name) {
-        this.name = name;
-        // 0-bundle+path 1-uuid  2-remote
-        this.loadType = 0;
-        let arr = name.split("://");
-        if (arr.length == 2) {
-            let head = arr[0];
-            if (head == "uuid") {
-                this.loadType = 1;
-                this.uuid = arr[1];
-            }
-            else if (head == "http" || head == "https") {
-                this.loadType = 2;
-            }
-            else {
-                this.bundle = head;
-                this.path = arr[1];
-            }
-        }
-        else {
-            this.bundle = "resources";
-            this.path = name;
-        }
-    }
-}
-class XAssetManager {
-    getAsset(uri) {
-        let obj = new AssetURI(uri);
-        switch (obj.loadType) {
-            case 1:
-                return assetManager.assets.get(obj.uuid);
-            case 2:
-                return assetManager.assets.get(obj.name);
-            default:
-                let bundle = assetManager.getBundle(obj.bundle);
-                if (!bundle) {
-                    return null;
-                }
-                return bundle.get(obj.path);
-        }
-    }
-    getAssetByUUID(uuid) {
-        return assetManager.assets.get(uuid);
-    }
-    getRoot() {
-        return assetManager;
-    }
-}
-let assetx = new XAssetManager();
-
-function parseAtlas(name, plist, texture) {
-    plist.meta;
-    let frames = plist.frames;
-    let atlas = new SpriteAtlas();
-    atlas.name = name;
-    atlas._nativeAsset = plist;
-    let spriteFrames = atlas.spriteFrames;
-    // 1/1_1_0.png:{
-    //     frame: {x: 137, y: 302, w: 18, h: 24}
-    //     rotated: false
-    //     sourceSize: {w: 32, h: 32}
-    //     spriteSourceSize: {x: 7, y: 0, w: 18, h: 24}
-    //     trimmed: true
-    // }
-    let maxWidth = 0;
-    let maxHeight = 0;
-    for (let key in frames) {
-        let frame = frames[key];
-        let rotated = false, sourceSize, offset, textureRect;
-        rotated = frame.rotated;
-        {
-            let size = frame.sourceSize;
-            sourceSize = new Size(size.w, size.h);
-            maxWidth = Math.max(maxWidth, size.w);
-            maxHeight = Math.max(maxHeight, size.h);
-        }
-        { // 需要转化成以sourceSize的中心点为原点，cocos坐标系的偏移量
-            let pos = frame.spriteSourceSize;
-            offset = new Vec2(pos.x + pos.w * 0.5, pos.y + pos.h * 0.5);
-            offset.x -= sourceSize.width * 0.5;
-            offset.y -= sourceSize.height * 0.5;
-            offset.y = -offset.y; // y轴相反
-        }
-        {
-            let rect = frame.frame;
-            textureRect = new Rect(rect.x, rect.y, rect.w, rect.h);
-        }
-        var sprite = new SpriteFrame();
-        sprite.name = key;
-        sprite.reset({
-            originalSize: sourceSize,
-            rect: textureRect,
-            offset: offset,
-            isRotate: !!rotated,
-            texture: texture
-        });
-        let name = path.mainFileName(key);
-        spriteFrames[name] = sprite;
-    }
-    //
-    plist.meta.maxSize = { w: maxWidth, h: maxHeight };
-    return atlas;
-}
-
 class UIUtil {
     /**
      * 格式化节点的uuid，用于树结构