@zhongguo168a/yxeditor-common 0.0.74 → 0.0.76

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { HorizontalTextAlignment, VerticalTextAlignment, Scheduler, Prefab, Node, ISchedulable, AssetManager, Asset, SpriteAtlas, Camera, Canvas, Vec2, Vec3, Vec4, Widget, UITransform, math } from 'cc';
+import { HorizontalTextAlignment, VerticalTextAlignment, Scheduler, Prefab, Node, ISchedulable, AssetManager, Asset, Vec2, Texture2D, SpriteAtlas, Camera, Canvas, Vec3, Vec4, Widget, UITransform, math } from 'cc';
 
 interface IError {
     isCancel(): boolean;
@@ -770,7 +770,7 @@ declare class Dictionary<K = string, V = any> {
         [key: string]: any;
     };
     protected size: number;
-    private _data;
+    protected _data: any;
     private _onSet;
     private _onDelete;
     private _onSetCaller;
@@ -1134,23 +1134,6 @@ declare class MapUtil {
 }
 declare const maputil: MapUtil;
 
-interface CommandInfo {
-    /**
-     * 默认的
-     */
-    caller?: any;
-    name: string;
-    handler: Function;
-    group?: string;
-    global: boolean;
-}
-declare class CommandManager extends EventDispatcher {
-    protected _infos: any[];
-    register(info: CommandInfo): void;
-    execute(name: string, ...args: any): any;
-    removeGroup(group: string): void;
-}
-
 declare enum ViewState {
     /**
      * 关闭
@@ -1216,7 +1199,6 @@ declare class RouteView extends EventDispatcher {
      */
     onStop(value: (ctx: this) => void): this;
     get reason(): LinkError;
-    get cmdmgr(): CommandManager;
     node: Node;
     datas: MapObject;
     tags: MapObject;
@@ -1226,7 +1208,6 @@ declare class RouteView extends EventDispatcher {
     protected _controller: RouteController;
     protected _route: Route;
     protected _reason: LinkError;
-    protected _cmdmgr: CommandManager;
     private _onOpen;
     private _onOpened;
     private _onClose;
@@ -1551,7 +1532,25 @@ declare class AssetLoader extends Dispatcher {
     protected _failList: List<LoaderItem>;
 }
 
-declare function parseAtlas(name: any, plist: any, texture: any): SpriteAtlas;
+/**
+ * 自动生成等距图集的frame描述表。
+ * 用于减少创建atlas文件的过程。
+ *
+ * @param atlasSize 图集的像素尺寸
+ * @param gridSize 每格的像素尺寸
+ * @param keyFormat 名称格式化字符串，例如 "%d.png" 或 "tile_%d.png"
+ * @param maxCount 可选，限制生成数量
+ * @returns atlas数据对象
+ */
+declare function create等距图集(atlasSize: Vec2, gridSize: Vec2, keyFormat?: string, maxCount?: number): Record<string, any>;
+/**
+ *
+ * @param name 图集的名称
+ * @param plist plist格式的json文件内容
+ * @param texture
+ * @returns
+ */
+declare function parseAtlas(plist: any, texture: Texture2D): SpriteAtlas;
 
 declare enum LogLevel {
     DEBUG = 0,
@@ -2091,5 +2090,5 @@ declare class WidgetUtil {
 }
 declare var widgetutil: WidgetUtil;
 
-export { ArrayUtil, AssetLoader, AssetURI, BitUtil, CallbackList, CameraUtil, CanvasUtil, Controller, ControllerDict, ControllerRepo, ConvertUtil, DictIterator, DictNode, DictSource, Dictionary, Dispatcher, DocUtil, ErrorUtil, EventDispatcher, EventItem, EventUtil, Factory, FloatUtil, GeometryUtil, IdentUtil, LOGGER_EVENT, LinkError, List, ListIterator, ListNode, ListSource, Listener, LogLevel, LogManager, Logger, MapObject, MapUtil, MathUtil, Model, NetUtil, PathUtil, Pool, RandUtil, Route, RouteController, RouteList, RouteView, SampleCallbackList, SamplePool, SamplePoolSet, ScaleUtil, SimpleModel, StringUtil, TimeUtil, Timer, TreeIterator, TreeNode, TreeNodePlugin, TreeRoot, TreeRootPlugin, TreeUtil, UIManager, UIObjectRepo, UIPoolConfig, UISingleConfig, UIUtil, ViewDict, ViewEvent, ViewHistory, ViewList, ViewRepo, ViewState, WidgetAlign, WidgetUtil, XAssetManager, XEvent, arrayutil, assetx, bitutil, camerautil, canvasutil, convertutil, ctrlrepo, docutil, errorutil, eventmgr, eventutil, floatutil, formatutil, geoutil, identutil, loadAtlas, logmgr, maputil, mathutil, netutil, parseAtlas, parsePlist, pathutil, randutil, resutil, scaleutil, stringutil, timer, timeutil, treeutil, uimgr, uirepo, uiutil, viewhistorys, viewrepo, widgetutil };
+export { ArrayUtil, AssetLoader, AssetURI, BitUtil, CallbackList, CameraUtil, CanvasUtil, Controller, ControllerDict, ControllerRepo, ConvertUtil, DictIterator, DictNode, DictSource, Dictionary, Dispatcher, DocUtil, ErrorUtil, EventDispatcher, EventItem, EventUtil, Factory, FloatUtil, GeometryUtil, IdentUtil, LOGGER_EVENT, LinkError, List, ListIterator, ListNode, ListSource, Listener, LogLevel, LogManager, Logger, MapObject, MapUtil, MathUtil, Model, NetUtil, PathUtil, Pool, RandUtil, Route, RouteController, RouteList, RouteView, SampleCallbackList, SamplePool, SamplePoolSet, ScaleUtil, SimpleModel, StringUtil, TimeUtil, Timer, TreeIterator, TreeNode, TreeNodePlugin, TreeRoot, TreeRootPlugin, TreeUtil, UIManager, UIObjectRepo, UIPoolConfig, UISingleConfig, UIUtil, ViewDict, ViewEvent, ViewHistory, ViewList, ViewRepo, ViewState, WidgetAlign, WidgetUtil, XAssetManager, XEvent, arrayutil, assetx, bitutil, camerautil, canvasutil, convertutil, create等距图集, ctrlrepo, docutil, errorutil, eventmgr, eventutil, floatutil, formatutil, geoutil, identutil, loadAtlas, logmgr, maputil, mathutil, netutil, parseAtlas, parsePlist, pathutil, randutil, resutil, scaleutil, stringutil, timer, timeutil, treeutil, uimgr, uirepo, uiutil, viewhistorys, viewrepo, widgetutil };
 export type { CreatorFunction, DisposeFunction, IController, IError, IEventDispatcher, IExtend, IListItem, IModel, IModule, ITreeListItem, RecycleFunction };

package/dist/index.esm.js

@@ -3892,39 +3892,6 @@ class ViewRepo extends ViewDict {
 }
 const viewrepo = new ViewRepo();
 
-class CommandManager extends EventDispatcher {
-    constructor() {
-        super(...arguments);
-        this._infos = [];
-    }
-    register(info) {
-        this._infos[info.name] = info;
-        if (info.global) {
-            window[info.name] = info.handler;
-        }
-    }
-    execute(name, ...args) {
-        let info = this._infos[name];
-        if (!info) {
-            return;
-        }
-        let caller;
-        if (!caller) {
-            caller = info.caller;
-        }
-        return info.handler.call(caller, ...args);
-    }
-    removeGroup(group) {
-        for (let key in this._infos) {
-            let info = this._infos[key];
-            if (info.group == group) {
-                delete this._infos[key];
-            }
-        }
-    }
-}
-new CommandManager();
-
 var ViewState;
 (function (ViewState) {
     /**
@@ -3966,7 +3933,6 @@ class RouteView extends EventDispatcher {
         this.tags = new MapObject({});
         this.enableHistory = false;
         this.state = 0;
-        this._cmdmgr = new CommandManager();
         this._onStop = (ctx) => {
             ctx.close();
         };
@@ -4173,9 +4139,6 @@ class RouteView extends EventDispatcher {
     get reason() {
         return this._reason;
     }
-    get cmdmgr() {
-        return this._cmdmgr;
-    }
 }
 
 class ViewHistory extends RouteList {
@@ -4509,11 +4472,57 @@ class SampleCallbackList {
     }
 }
 
-function parseAtlas(name, plist, texture) {
+/**
+ * 自动生成等距图集的frame描述表。
+ * 用于减少创建atlas文件的过程。
+ *
+ * @param atlasSize 图集的像素尺寸
+ * @param gridSize 每格的像素尺寸
+ * @param keyFormat 名称格式化字符串，例如 "%d.png" 或 "tile_%d.png"
+ * @param maxCount 可选，限制生成数量
+ * @returns atlas数据对象
+ */
+function create等距图集(atlasSize, gridSize, keyFormat = "%d.png", maxCount) {
+    const cols = Math.floor(atlasSize.x / gridSize.x);
+    const rows = Math.floor(atlasSize.y / gridSize.y);
+    const total = maxCount !== null && maxCount !== void 0 ? maxCount : cols * rows;
+    const frames = {};
+    let index = 0;
+    for (let y = 0; y < rows; y++) {
+        for (let x = 0; x < cols; x++) {
+            if (index >= total)
+                break;
+            const key = keyFormat.replace("%d", (index + 1).toString());
+            const frame = {
+                frame: {
+                    x: x * gridSize.x,
+                    y: y * gridSize.y,
+                    w: gridSize.x,
+                    h: gridSize.y
+                },
+                rotated: false,
+                trimmed: false,
+                sourceSize: { w: gridSize.x, h: gridSize.y },
+                spriteSourceSize: { x: 0, y: 0, w: gridSize.x, h: gridSize.y }
+            };
+            frames[key] = frame;
+            index++;
+        }
+    }
+    return frames;
+}
+/**
+ *
+ * @param name 图集的名称
+ * @param plist plist格式的json文件内容
+ * @param texture
+ * @returns
+ */
+function parseAtlas(plist, texture) {
     plist.meta;
     let frames = plist.frames;
     let atlas = new SpriteAtlas();
-    atlas.name = name;
+    atlas.name = texture.name;
     atlas._nativeAsset = plist;
     let spriteFrames = atlas.spriteFrames;
     // 1/1_1_0.png:{
@@ -4924,7 +4933,8 @@ class AssetLoader extends Dispatcher {
                 let tex = new Texture2D();
                 tex.image = asset;
                 tex.setFilters(1, 1);
-                let atlasSprite = parseAtlas(item.uri, content, tex);
+                let atlasSprite = parseAtlas(content, tex);
+                atlasSprite.name = item.uri.name;
                 let uuid = atlasAsset.uuid;
                 assetManager.assets.remove(uuid);
                 assetManager.assets.add(uuid, atlasSprite);
@@ -6490,5 +6500,5 @@ class WidgetUtil {
 }
 var widgetutil = new WidgetUtil();
 
-export { ArrayUtil, AssetLoader, AssetURI, BitUtil, CallbackList, CameraUtil, CanvasUtil, Controller, ControllerDict, ControllerRepo, ConvertUtil, DictIterator, DictNode, DictSource, Dictionary, Dispatcher, DocUtil, ErrorUtil, EventDispatcher, EventItem, EventUtil, Factory, FloatUtil, GeometryUtil, IdentUtil, LOGGER_EVENT, LinkError, List, ListIterator, ListNode, ListSource, Listener, LogLevel, LogManager, Logger, MapObject, MapUtil, MathUtil, Model, NetUtil, PathUtil, Pool, RandUtil, Route, RouteController, RouteList, RouteView, SampleCallbackList, SamplePool, SamplePoolSet, ScaleUtil, SimpleModel, StringUtil, TimeUtil, Timer, TreeIterator, TreeNode, TreeNodePlugin, TreeRoot, TreeRootPlugin, TreeUtil, UIManager, UIObjectRepo, UIPoolConfig, UISingleConfig, UIUtil, ViewDict, ViewEvent, ViewHistory, ViewList, ViewRepo, ViewState, WidgetAlign, WidgetUtil, XAssetManager, XEvent, arrayutil, assetx, bitutil, camerautil, canvasutil, convertutil, ctrlrepo, docutil, errorutil, eventmgr, eventutil, floatutil, formatutil, geoutil, identutil, loadAtlas, logmgr, maputil, mathutil, netutil, parseAtlas, parsePlist, pathutil, randutil, resutil, scaleutil, stringutil, timer, timeutil, treeutil, uimgr, uirepo, uiutil, viewhistorys, viewrepo, widgetutil };
+export { ArrayUtil, AssetLoader, AssetURI, BitUtil, CallbackList, CameraUtil, CanvasUtil, Controller, ControllerDict, ControllerRepo, ConvertUtil, DictIterator, DictNode, DictSource, Dictionary, Dispatcher, DocUtil, ErrorUtil, EventDispatcher, EventItem, EventUtil, Factory, FloatUtil, GeometryUtil, IdentUtil, LOGGER_EVENT, LinkError, List, ListIterator, ListNode, ListSource, Listener, LogLevel, LogManager, Logger, MapObject, MapUtil, MathUtil, Model, NetUtil, PathUtil, Pool, RandUtil, Route, RouteController, RouteList, RouteView, SampleCallbackList, SamplePool, SamplePoolSet, ScaleUtil, SimpleModel, StringUtil, TimeUtil, Timer, TreeIterator, TreeNode, TreeNodePlugin, TreeRoot, TreeRootPlugin, TreeUtil, UIManager, UIObjectRepo, UIPoolConfig, UISingleConfig, UIUtil, ViewDict, ViewEvent, ViewHistory, ViewList, ViewRepo, ViewState, WidgetAlign, WidgetUtil, XAssetManager, XEvent, arrayutil, assetx, bitutil, camerautil, canvasutil, convertutil, create等距图集, ctrlrepo, docutil, errorutil, eventmgr, eventutil, floatutil, formatutil, geoutil, identutil, loadAtlas, logmgr, maputil, mathutil, netutil, parseAtlas, parsePlist, pathutil, randutil, resutil, scaleutil, stringutil, timer, timeutil, treeutil, uimgr, uirepo, uiutil, viewhistorys, viewrepo, widgetutil };
 //# sourceMappingURL=index.esm.js.map