@zhongguo168a/yxeditor-common 0.0.139 → 0.0.143

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as cc from 'cc';
-import { HorizontalTextAlignment, VerticalTextAlignment, Scheduler, Prefab, Node, Component, ISchedulable, AssetManager, Asset, Camera, Canvas, Vec2, Vec3, Vec4, SpriteAtlas, Widget, UITransform, math } from 'cc';
+import { HorizontalTextAlignment, VerticalTextAlignment, Scheduler, Prefab, Node, Component, ISchedulable, AssetManager, Asset, Vec2, Texture2D, SpriteAtlas, Camera, Canvas, Vec3, Vec4, Widget, UITransform, math } from 'cc';
 
 interface IError {
     isCancel(): boolean;
@@ -1352,7 +1352,7 @@ declare class ViewModel extends EventDispatcher {
     /**
          * 等待打开完成指令
          */
-    waitOpenComplete(...params: any): Promise<void>;
+    waitOpenComplete(...params: any): Promise<any>;
     protected openComplete(): void;
     waitCloseComplete(): void;
     closeComplete(): void;
@@ -1647,6 +1647,26 @@ 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,
@@ -2195,5 +2215,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, 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 { 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 type { CreatorFunction, DisposeFunction, IController, IError, IEventDispatcher, IExtend, IListItem, IModel, IModule, ITreeListItem, RecycleFunction };

package/dist/index.esm.js

@@ -4489,7 +4489,10 @@ class ViewModel extends EventDispatcher {
         return __awaiter(this, void 0, void 0, function* () {
             this._waitOpenComplete = true;
             for (const element of params) {
-                yield element();
+                let err = yield element();
+                if (err) {
+                    return err;
+                }
                 if (this.state == ViewState.Closed || this.state == ViewState.Closeing) {
                     return;
                 }
@@ -4937,6 +4940,45 @@ class XAssetManager {
 }
 let assetx = new XAssetManager();
 
+/**
+ * 自动生成等距图集的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 图集的名称
@@ -6970,5 +7012,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, 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 { 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 };
 //# sourceMappingURL=index.esm.js.map