@zhongguo168a/yxeditor-common 0.0.132 → 0.0.139

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as cc from 'cc';
-import { HorizontalTextAlignment, VerticalTextAlignment, Scheduler, Prefab, Node, Component, ISchedulable, AssetManager, Asset, Vec2, Texture2D, SpriteAtlas, Camera, Canvas, Vec3, Vec4, Widget, UITransform, math } from 'cc';
+import { HorizontalTextAlignment, VerticalTextAlignment, Scheduler, Prefab, Node, Component, ISchedulable, AssetManager, Asset, Camera, Canvas, Vec2, Vec3, Vec4, SpriteAtlas, Widget, UITransform, math } from 'cc';
 
 interface IError {
     isCancel(): boolean;
@@ -707,8 +707,10 @@ declare class ListSource extends EventDispatcher {
 }
 
 declare class DictIterator {
-    break(): void;
+    break(reason?: any): void;
     isBreak(): boolean;
+    getReason(): any;
+    protected _reason: any;
     protected _isBreak: any;
 }
 declare class Dictionary<K = string, V = any> {
@@ -1645,26 +1647,6 @@ declare class AssetLoader extends Dispatcher {
     protected _failList: List<LoaderItem>;
 }
 
-/**
- * 自动生成等距图集的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,
     INFO = 1,
@@ -2213,5 +2195,5 @@ declare class WidgetUtil {
 }
 declare var widgetutil: WidgetUtil;
 
-export { ArrayUtil, AssetLoader, AssetURI, BitUtil, CallbackList, CameraUtil, CanvasUtil, Controller, ControllerDict, ControllerRepo, ConvertUtil, DictIterator, DictNode, DictSource, Dictionary, DirectionMode, Dispatcher, DocUtil, ErrorUtil, EventDispatcher, EventItem, EventUtil, Factory, FloatUtil, GeometryDirection, 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, RouteViewDict, SampleCallbackList, SamplePool, SamplePoolSet, ScaleUtil, SimpleModel, StringUtil, TimeUtil, Timer, TreeIterator, TreeNode, TreeNodePlugin, TreeRoot, TreeRootPlugin, TreeUtil, UIManager, UIObjectRepo, UIPoolConfig, UISingleConfig, UIUtil, ViewDict, ViewEvent, ViewHistory, ViewList, ViewModel, ViewModelComponent, 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, routeViews, scaleutil, stringutil, timer, timeutil, treeutil, uimgr, uirepo, uiutil, viewhistorys, widgetutil };
+export { ArrayUtil, AssetLoader, AssetURI, BitUtil, CallbackList, CameraUtil, CanvasUtil, Controller, ControllerDict, ControllerRepo, ConvertUtil, DictIterator, DictNode, DictSource, Dictionary, DirectionMode, Dispatcher, DocUtil, ErrorUtil, EventDispatcher, EventItem, EventUtil, Factory, FloatUtil, GeometryDirection, 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, RouteViewDict, SampleCallbackList, SamplePool, SamplePoolSet, ScaleUtil, SimpleModel, StringUtil, TimeUtil, Timer, TreeIterator, TreeNode, TreeNodePlugin, TreeRoot, TreeRootPlugin, TreeUtil, UIManager, UIObjectRepo, UIPoolConfig, UISingleConfig, UIUtil, ViewDict, ViewEvent, ViewHistory, ViewList, ViewModel, ViewModelComponent, 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, parsePlist, pathutil, randutil, resutil, routeViews, scaleutil, stringutil, timer, timeutil, treeutil, uimgr, uirepo, uiutil, viewhistorys, widgetutil };
 export type { CreatorFunction, DisposeFunction, IController, IError, IEventDispatcher, IExtend, IListItem, IModel, IModule, ITreeListItem, RecycleFunction };

package/dist/index.esm.js

@@ -1,4 +1,4 @@
-import { HorizontalTextAlignment, VerticalTextAlignment, director, macro, Scheduler, math, instantiate, _decorator, Component, SpriteAtlas, Size, Vec2, Rect, SpriteFrame, path, assetManager, Texture2D, ImageAsset, JsonAsset, TextAsset, Asset, find, Canvas, Node, Vec3, Vec4, resources, UITransform, Widget } from 'cc';
+import { HorizontalTextAlignment, VerticalTextAlignment, director, macro, Scheduler, math, instantiate, _decorator, Component, assetManager, SpriteAtlas, Size, Vec2, Rect, SpriteFrame, path, Texture2D, ImageAsset, JsonAsset, TextAsset, Asset, find, Canvas, Node, Vec3, Vec4, resources, UITransform, Widget } from 'cc';
 
 class NetUtil {
     // 获取URL的参数对象
@@ -2825,12 +2825,16 @@ ListSource.EVENT_DATA_SET = "data_set";
 ListSource.EVENT_TAGS_SET = "tags_set";
 
 class DictIterator {
-    break() {
+    break(reason) {
         this._isBreak = true;
+        this._reason = reason;
     }
     isBreak() {
         return this._isBreak;
     }
+    getReason() {
+        return this._reason;
+    }
 }
 class Dictionary {
     constructor(data) {
@@ -4864,106 +4868,6 @@ class SampleCallbackList {
     }
 }
 
-/**
- * 自动生成等距图集的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 = texture.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 {
     /**
      *
@@ -5033,6 +4937,67 @@ class XAssetManager {
 }
 let assetx = new XAssetManager();
 
+/**
+ *
+ * @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 = texture.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 LoaderItem {
     constructor() {
         this.preload = false;
@@ -7005,5 +6970,5 @@ class WidgetUtil {
 }
 var widgetutil = new WidgetUtil();
 
-export { ArrayUtil, AssetLoader, AssetURI, BitUtil, CallbackList, CameraUtil, CanvasUtil, Controller, ControllerDict, ControllerRepo, ConvertUtil, DictIterator, DictNode, DictSource, Dictionary, DirectionMode, Dispatcher, DocUtil, ErrorUtil, EventDispatcher, EventItem, EventUtil, Factory, FloatUtil, GeometryDirection, 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, RouteViewDict, SampleCallbackList, SamplePool, SamplePoolSet, ScaleUtil, SimpleModel, StringUtil, TimeUtil, Timer, TreeIterator, TreeNode, TreeNodePlugin, TreeRoot, TreeRootPlugin, TreeUtil, UIManager, UIObjectRepo, UIPoolConfig, UISingleConfig, UIUtil, ViewDict, ViewEvent, ViewHistory, ViewList, ViewModel, ViewModelComponent, 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, routeViews, scaleutil, stringutil, timer, timeutil, treeutil, uimgr, uirepo, uiutil, viewhistorys, widgetutil };
+export { ArrayUtil, AssetLoader, AssetURI, BitUtil, CallbackList, CameraUtil, CanvasUtil, Controller, ControllerDict, ControllerRepo, ConvertUtil, DictIterator, DictNode, DictSource, Dictionary, DirectionMode, Dispatcher, DocUtil, ErrorUtil, EventDispatcher, EventItem, EventUtil, Factory, FloatUtil, GeometryDirection, 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, RouteViewDict, SampleCallbackList, SamplePool, SamplePoolSet, ScaleUtil, SimpleModel, StringUtil, TimeUtil, Timer, TreeIterator, TreeNode, TreeNodePlugin, TreeRoot, TreeRootPlugin, TreeUtil, UIManager, UIObjectRepo, UIPoolConfig, UISingleConfig, UIUtil, ViewDict, ViewEvent, ViewHistory, ViewList, ViewModel, ViewModelComponent, 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, parsePlist, pathutil, randutil, resutil, routeViews, scaleutil, stringutil, timer, timeutil, treeutil, uimgr, uirepo, uiutil, viewhistorys, widgetutil };
 //# sourceMappingURL=index.esm.js.map