@ives_xxz/framework 1.6.6 → 2.0.0

package/define/FWSystemDefine.ts

@@ -1,152 +1,147 @@
-export namespace FWSystemDefine {
-  export enum FWBindTag {
-    LOGIC,
-    DATA,
-    CONFIG,
-    SENDER,
-    HANDLE,
-    SUB_LOGIC,
-  }
-  export enum FWObjectType {
-    ACTIVE,
-    OPACITY,
-  }
+export class FWBindTag {
+  LOGIC = 0;
+  DATA = 1;
+  CONFIG = 2;
+  SENDER = 3;
+  HANDLE = 4;
+  SUB_LOGIC = 5;
+}
+
+export class FWObjectType {
+  ACTIVE = 0;
+  OPACITY = 1;
+}
 
-  /** Layer渲染顺序 */
-  export const enum FWLayerRenderOrder {
-    SCENE = 0,
-    PERMANENT = 10,
-    UI = 100,
-    POPUP = 1000,
-    MAX = 10000,
-  }
+/** Layer渲染顺序 */
+export class FWLayerRenderOrder {
+  SCENE = 0;
+  PERMANENT = 10;
+  UI = 100;
+  POPUP = 1000;
+  MAX = 10000;
+}
+
+/**
+ * layer类型
+ */
+export class FWLayerType {
   /**
-   * layer类型
+   * 常驻
    */
-  export const enum FWLayerType {
-    /**
-     * 常驻
-     */
-    PERMANENT,
-    /**
-     * 可重复打开
-     */
-    REPEAT,
-    /**
-     * 弹出式(需要加入队列)
-     */
-    POPUP_QUEUE,
-    /**
-     * 弹出式(一次性,无需加入队列)
-     */
-    POPUP_DISPOSABLE,
-  }
-
-  export enum FWTaskStatus {
-    IDLE = 'IDLE',
-    RUNNING = 'RUNNING',
-    PAUSED = 'PAUSED',
-    COMPLETED = 'COMPLETED',
-  }
+  PERMANENT = 0;
+  /**
+   * 可重复打开
+   */
+  REPEAT = 1;
+  /**
+   * 弹出式(需要加入队列)
+   */
+  POPUP_QUEUE = 2;
+  /**
+   * 弹出式(一次性,无需加入队列)
+   */
+  POPUP_DISPOSABLE = 3;
+}
 
-  export enum FWPriorityOrder {
-    /**
-     * 优先级高
-     */
-    HIGHT,
-    /**
-     * 优先级普通
-     */
-    NORMAL,
-    /**
-     * 优先级低
-     */
-    LOW,
-  }
+export class FWTaskStatus {
+  IDLE = 'IDLE';
+  RUNNING = 'RUNNING';
+  PAUSED = 'PAUSED';
+  COMPLETED = 'COMPLETED';
+}
 
+export class FWPriorityOrder {
   /**
-   * 日志类型
+   * 优先级高
    */
-  export const enum FWLogType {
-    /** 调试信息 */
-    DEBUG,
-    /** socket请求 */
-    SOCKET_SEND,
-    /** socket接收 */
-    SOCKET_RECEIVE,
-    /**请求信息 */
-    REQUEST,
-    /** 响应信息 */
-    RESPONSE,
-    /** 警告信息 */
-    WARN,
-    /** 错误信息 */
-    ERROR,
-    /** 系统信息 */
-    SYSTEM,
-  }
-
+  HIGHT = 0;
   /**
-   * HTTP请求类型
+   * 优先级普通
    */
-  export const enum FWHttpRequestType {
-    GET = 'GET',
-    POST = 'POST',
-  }
-
+  NORMAL = 1;
   /**
-   * 动画机类型
+   * 优先级低
    */
-  export const enum FWAnimationMachineType {
-    TWEEN = 'TWEEN',
-    SKELETON = 'SKELETON',
-    ANIMATION = 'ANIMATION',
-  }
+  LOW = 2;
+}
+
+/**
+ * 日志类型
+ */
+export class FWLogType {
+  /** 调试信息 */
+  DEBUG = 0;
+  /** socket请求 */
+  SOCKET_SEND = 1;
+  /** socket接收 */
+  SOCKET_RECEIVE = 2;
+  /** 请求信息 */
+  REQUEST = 3;
+  /** 响应信息 */
+  RESPONSE = 4;
+  /** 警告信息 */
+  WARN = 5;
+  /** 错误信息 */
+  ERROR = 6;
+  /** 系统信息 */
+  SYSTEM = 7;
+}
+
+/**
+ * HTTP请求类型
+ */
+export class FWHttpRequestType {
+  GET = 'GET';
+  POST = 'POST';
+}
 
-  export const enum CCEventType {
-    ON_SHOW = 'ON_SHOW',
-    ON_HIDE = 'ON_HIDE',
-  }
+/**
+ * 动画机类型
+ */
+export class FWAnimationMachineType {
+  TWEEN = 'TWEEN';
+  SKELETON = 'SKELETON';
+  ANIMATION = 'ANIMATION';
+}
 
-  export enum FWScrollViewTemplateType {
-    NODE,
-    PREFAB,
-  }
+export class FWScrollViewTemplateType {
+  NODE = 0;
+  PREFAB = 1;
+}
 
-  export enum FWScrollViewSlideType {
-    NORMAL,
-    ADHERING,
-    PAGE,
-  }
+export class FWScrollViewSlideType {
+  NORMAL = 0;
+  ADHERING = 1;
+  PAGE = 2;
+}
 
-  export enum FWScrollViewSelectedType {
-    NONE,
-    SINGLE,
-    MULTIPLE,
-  }
+export class FWScrollViewSelectedType {
+  NONE = 0;
+  SINGLE = 1;
+  MULTIPLE = 2;
+}
 
-  export enum FWLanguageAssetType {
-    LABEL = 'label',
-    SPRITE = 'sprite',
-    SKELETON = 'skeleton',
-  }
+export class FWLanguageAssetType {
+  LABEL = 'label';
+  SPRITE = 'sprite';
+  SKELETON = 'skeleton';
+}
 
-  export enum FWPromiseStatus {
-    PENDING = 'pending',
-    FULFILLED = 'fulfilled',
-    REJECTED = 'rejected',
-    CANCELLED = 'cancelled',
-  }
+export class FWPromiseStatus {
+  PENDING = 'pending';
+  FULFILLED = 'fulfilled';
+  REJECTED = 'rejected';
+  CANCELLED = 'cancelled';
+}
 
-  export enum FWLayerState {
-    CLOSED = 'closed',
-    OPENING = 'opening',
-    OPENED = 'opened',
-    CLOSING = 'closing',
-  }
+export class FWLayerState {
+  CLOSED = 'closed';
+  OPENING = 'opening';
+  OPENED = 'opened';
+  CLOSING = 'closing';
+}
 
-  export enum FWAudioType {
-    MUSIC,
-    SOUND,
-  }
+export class FWAudioType {
+  MUSIC = 0;
+  SOUND = 1;
 }

package/define/FWSystemDefine.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "08a489c7-1eb2-493f-9fc2-604b47fe6bcf",
+  "uuid": "87adc2ef-9225-4ba8-9dba-5c0d192d2716",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

package/entry/FWEntry.ts

@@ -1,5 +1,4 @@
 import FWUiManager from '../manager/FWUiManager';
-import FWLog from '../log/FWLog';
 import FWAnimationManager from '../manager/FWAnimationManager';
 import FWAudioManager from '../manager/FWAudioManager';
 import FWComponentManager from '../manager/FWComponentManager';
@@ -22,7 +21,7 @@ import { FWPerformanceManager } from '../manager/FWPerformanceManager';
 /**
  * 入口脚本
  */
-export default class FWEntry implements FW.Entry {
+export class FWEntry implements FW.Entry {
   map: Map<string, FW.RegisterBundle>;
   /**
    * 事件管理器
@@ -144,7 +143,7 @@ export default class FWEntry implements FW.Entry {
         this.bundleName = '';
         return;
       } catch (e) {
-        FWLog.error('launchScene failed:', name);
+        FW.Log.error('launchScene failed:', name);
       }
     }
 

package/expand/FWDecorator.ts

@@ -1,13 +1,6 @@
-import "reflect-metadata";
-import FWLog from "../log/FWLog";
+import 'reflect-metadata';
 
-type PropertyDecorator = (
-  $class: Record<string, any>,
-  $propertyKey: string | symbol,
-  $descriptorOrInitializer?: any
-) => void;
-
-export const searchChild = function (node: cc.Node, name: string) {
+export function searchChild(node: cc.Node, name: string) {
   let ret = node.getChildByName(name);
   if (ret) return ret;
   for (let i = 0; i < node.children.length; i++) {
@@ -17,57 +10,49 @@ export const searchChild = function (node: cc.Node, name: string) {
     if (ret) return ret;
   }
   return null;
-};
+}
 
 const CookDecoratorKey = ($desc: string) => `__ccc_decorator_${$desc}__`;
 
-const KeyChild = CookDecoratorKey("child_cache");
+const KeyChild = CookDecoratorKey('child_cache');
 
 type ParamType = {
   path?: string;
 };
 
-export function FWPropertyNode($opt?: ParamType): PropertyDecorator {
+export function FWPropertyNode($opt?: ParamType): FW.PropertyDecorator {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   return ($target, $propertyKey: string, $descriptorOrInitializer) => {
-    const cache: { propertyKey: string; childName: string }[] = ($target[
-      KeyChild
-    ] ??= []);
+    const cache: { propertyKey: string; childName: string }[] = ($target[KeyChild] ??= []);
     if (!cache.some(($vo) => $vo.propertyKey === $propertyKey)) {
       cache.push({
         propertyKey: $propertyKey,
         childName: $opt?.path || $propertyKey,
       });
     } else {
-      throw new Error(
-        `child 装饰器重复绑定属性：${$propertyKey},class：${$target?.name}`
-      );
+      throw new Error(`child 装饰器重复绑定属性：${$propertyKey},class：${$target?.name}`);
     }
     if (cache.length === 1) {
       const oldOnLoad: () => void = $target.onLoad || undefined;
       $target.onLoad = function () {
-        cache.forEach(
-          ($vo) =>
-            (this[$vo.propertyKey] = searchChild(this.node, $vo.childName))
-        );
+        cache.forEach(($vo) => (this[$vo.propertyKey] = searchChild(this.node, $vo.childName)));
         oldOnLoad && oldOnLoad.apply(this);
       };
     }
   };
 }
 
-const KeyChildMulti = CookDecoratorKey("child_cache_multi"); // 重新定义 Key，避免冲突
+const KeyChildMulti = CookDecoratorKey('child_cache_multi'); // 重新定义 Key，避免冲突
 
 /** 查找多个节点，并存储为数组 */
-export function FWPropertyNodes(...paths: string[]): PropertyDecorator {
+export function FWPropertyNodes(...paths: string[]): FW.PropertyDecorator {
   return ($target: any, $propertyKey: string) => {
     // 确保 $target[KeyChild] 是数组
     if (!$target[KeyChildMulti]) {
       $target[KeyChildMulti] = [];
     }
 
-    const cache: { propertyKey: string; childNames: string[] }[] =
-      $target[KeyChildMulti];
+    const cache: { propertyKey: string; childNames: string[] }[] = $target[KeyChildMulti];
 
     // 查找是否已经存在该属性的绑定
     const existingEntry = cache.find(($vo) => $vo.propertyKey === $propertyKey);
@@ -80,7 +65,7 @@ export function FWPropertyNodes(...paths: string[]): PropertyDecorator {
       });
     } else {
       throw new Error(
-        `child 装饰器重复绑定属性：${$propertyKey}, class：${$target.constructor.name}`
+        `child 装饰器重复绑定属性：${$propertyKey}, class：${$target.constructor.name}`,
       );
     }
 
@@ -123,13 +108,13 @@ interface INewable<T = any> extends Function {
   new (...args: any[]): T;
 }
 
-const KeyComp = CookDecoratorKey("comp_cache");
+const KeyComp = CookDecoratorKey('comp_cache');
 
 export function FWPropertyComponent(
   $componentClass: INewable<cc.Component>,
   $childName?: string,
-  $mute = false
-): PropertyDecorator {
+  $mute = false,
+): FW.PropertyDecorator {
   return ($target, $propertyKey: string, $descriptorOrInitializer) => {
     const cache: {
       propertyKey: string;
@@ -144,9 +129,7 @@ export function FWPropertyComponent(
       });
     } else {
       if (!$mute) {
-        throw new Error(
-          `component装饰器重复绑定属性：${$propertyKey},class：${$target.name}`
-        );
+        throw new Error(`component装饰器重复绑定属性：${$propertyKey},class：${$target.name}`);
       }
       return;
     }
@@ -154,21 +137,18 @@ export function FWPropertyComponent(
       const oldOnLoad: () => void = $target.onLoad || undefined; //$target.onLoad也可以拿到父类的实现
       $target.onLoad = function () {
         cache.forEach(($vo) => {
-          const node = $vo.childName
-            ? searchChild(this.node, $vo.childName)
-            : this.node;
+          const node = $vo.childName ? searchChild(this.node, $vo.childName) : this.node;
           if (!node) {
             if (!$mute) {
               throw new Error(
-                `component装饰器没有找到适合的node节点:class：${$target?.name}，组件：${$componentClass?.name}，childName：${$childName}`
+                `component装饰器没有找到适合的node节点:class：${$target?.name}，组件：${$componentClass?.name}，childName：${$childName}`,
               );
             } else {
               return;
             }
           }
           this[$vo.propertyKey] =
-            node.getComponent($vo.compClass) ||
-            node.addComponent($vo.compClass);
+            node.getComponent($vo.compClass) || node.addComponent($vo.compClass);
         });
         oldOnLoad && oldOnLoad.apply(this);
       };
@@ -178,8 +158,8 @@ export function FWPropertyComponent(
 
 export function FWPropertyComponents(
   $componentClass: INewable<cc.Component>,
-  $childName?: string
-): PropertyDecorator {
+  $childName?: string,
+): FW.PropertyDecorator {
   return ($target, $propertyKey: string, $descriptorOrInitializer) => {
     const componentName = $childName || $propertyKey;
     const oldOnLoad: () => void = $target.onLoad || undefined; //$target.onLoad也可以拿到父类的实现
@@ -223,11 +203,7 @@ export function isNull(message?: string) {
 }
 
 export function FWSocketAutoProcessPause() {
-  return function (
-    target: any,
-    propertyKey: string,
-    descriptor: PropertyDescriptor
-  ) {
+  return function (target: any, propertyKey: string, descriptor: PropertyDescriptor) {
     const originalMethod = descriptor.value;
 
     descriptor.value = async function (...args: any[]) {
@@ -235,7 +211,7 @@ export function FWSocketAutoProcessPause() {
         const result = await originalMethod.apply(this, args);
         return result;
       } finally {
-        FWLog.debug("暂停socket消息处理");
+        FW.Log.debug('暂停socket消息处理');
         FW.Entry.socketMgr.resumeMessageHandle();
       }
     };
@@ -245,25 +221,17 @@ export function FWSocketAutoProcessPause() {
 }
 
 export function FWDeprecated(description?: string) {
-  return function (
-    target: any,
-    propertyKey: string,
-    descriptor: PropertyDescriptor
-  ) {
+  return function (target: any, propertyKey: string, descriptor: PropertyDescriptor) {
     const originalMethod = descriptor.value;
     descriptor.value = async function (...args: any[]) {
-      FWLog.warn(`${propertyKey}方法已弃用!${description || ""}`);
+      FW.Log.warn(`${propertyKey}方法已弃用!${description || ''}`);
       originalMethod.apply(this, args);
     };
     return descriptor;
   };
 }
 export function FWSocketAutoProcessResume() {
-  return function (
-    target: any,
-    propertyKey: string,
-    descriptor: PropertyDescriptor
-  ) {
+  return function (target: any, propertyKey: string, descriptor: PropertyDescriptor) {
     const originalMethod = descriptor.value;
 
     descriptor.value = async function (...args: any[]) {
@@ -271,7 +239,7 @@ export function FWSocketAutoProcessResume() {
         const result = await originalMethod.apply(this, args);
         return result;
       } finally {
-        FWLog.debug("恢复socket消息处理");
+        FW.Log.debug('恢复socket消息处理');
         FW.Entry.socketMgr.resumeMessageHandle();
       }
     };
@@ -281,11 +249,7 @@ export function FWSocketAutoProcessResume() {
 }
 
 export function RegisterEvents(events: FW.RegisterEventArgs[]) {
-  return function (
-    target: any,
-    propertyKey: string,
-    descriptor: PropertyDescriptor
-  ) {
+  return function (target: any, propertyKey: string, descriptor: PropertyDescriptor) {
     const originalMethod = descriptor.value;
 
     descriptor.value = function (...args: any[]) {
@@ -300,11 +264,7 @@ export function RegisterEvents(events: FW.RegisterEventArgs[]) {
 }
 
 export function AutoRegisterCCEvent(nodePath: string, eventName?: string) {
-  return function (
-    target: any,
-    propertyKey: string,
-    descriptor: PropertyDescriptor
-  ) {
+  return function (target: any, propertyKey: string, descriptor: PropertyDescriptor) {
     const originalMethod = descriptor.value;
     const originalOnInit = target.onInit;
     const evt = eventName || cc.Node.EventType.TOUCH_END;
@@ -315,9 +275,7 @@ export function AutoRegisterCCEvent(nodePath: string, eventName?: string) {
       let targetNode: cc.Node | null = null;
 
       const cachedNodes = this[KeyChild] || [];
-      const cachedNode = cachedNodes.find(
-        (vo: any) => vo.childName === nodePath
-      );
+      const cachedNode = cachedNodes.find((vo: any) => vo.childName === nodePath);
 
       if (cachedNode && this[cachedNode.propertyKey]) {
         targetNode = this[cachedNode.propertyKey];
@@ -325,7 +283,7 @@ export function AutoRegisterCCEvent(nodePath: string, eventName?: string) {
         targetNode = searchChild(this.layer?.node || this.node, nodePath);
 
         if (targetNode && !cachedNode) {
-          const cacheKey = `_cached_${nodePath.replace(/\//g, "_")}`;
+          const cacheKey = `_cached_${nodePath.replace(/\//g, '_')}`;
           this[cacheKey] = targetNode;
           if (!this[KeyChild]) this[KeyChild] = [];
           this[KeyChild].push({
@@ -336,53 +294,45 @@ export function AutoRegisterCCEvent(nodePath: string, eventName?: string) {
       }
 
       if (targetNode) {
-        this.registerEvent({
-  CCEvent: [
-    {
-      eventName: evt,
-      cb: originalMethod.bind(this),
-      target: targetNode,
-    }
-  ]
-});
-        FWLog.debug(`自动注册事件: ${nodePath} -> ${propertyKey}`);
+        this.registerEvent({
+          CCEvent: [
+            {
+              eventName: evt,
+              cb: originalMethod.bind(this),
+              target: targetNode,
+            },
+          ],
+        });
+        FW.Log.debug(`自动注册事件: ${nodePath} -> ${propertyKey}`);
       } else {
-        FWLog.warn(`自动注册事件失败: 未找到节点 ${nodePath}`);
+        FW.Log.warn(`自动注册事件失败: 未找到节点 ${nodePath}`);
       }
     };
   };
 }
 
 export function AutoRegisterFWEvent(eventName: any) {
-  return function (
-    target: any,
-    propertyKey: string,
-    descriptor: PropertyDescriptor
-  ) {
+  return function (target: any, propertyKey: string, descriptor: PropertyDescriptor) {
     const originalMethod = descriptor.value;
     const originalOnInit = target.onInit;
 
     target.onInit = function (...args) {
       originalOnInit?.call(this, args);
-      this.registerEvent({
-  CCEvent: [
-    {
-      eventName: eventName,
-      cb: originalMethod.bind(this),
-      target: this,
-    }
-  ]
-});
+      this.registerEvent({
+        CCEvent: [
+          {
+            eventName: eventName,
+            cb: originalMethod.bind(this),
+            target: this,
+          },
+        ],
+      });
     };
   };
 }
 
 export function PerformanceMonitor(operationName?: string) {
-  return function (
-    target: any,
-    propertyKey: string,
-    descriptor: PropertyDescriptor
-  ) {
+  return function (target: any, propertyKey: string, descriptor: PropertyDescriptor) {
     const originalMethod = descriptor.value;
 
     descriptor.value = async function (...args: any[]) {
@@ -400,24 +350,16 @@ export function PerformanceMonitor(operationName?: string) {
         const result = await originalMethod.apply(this, args);
         const duration = Date.now() - startTime;
 
-        FW.Entry.performanceMgr?.recordOperationMetric(
-          moduleName,
-          methodName,
-          duration
-        );
+        FW.Entry.performanceMgr?.recordOperationMetric(moduleName, methodName, duration);
 
         if (duration > 100) {
-          FWLog.warn(`[${moduleName}] ${methodName} took ${duration}ms`);
+          FW.Log.warn(`[${moduleName}] ${methodName} took ${duration}ms`);
         }
 
         return result;
       } catch (error) {
         const duration = Date.now() - startTime;
-        FW.Entry.performanceMgr?.recordOperationMetric(
-          moduleName,
-          `${methodName}_error`,
-          duration
-        );
+        FW.Entry.performanceMgr?.recordOperationMetric(moduleName, `${methodName}_error`, duration);
         throw error;
       }
     };

package/expand/FWRollingViewNesting.ts

@@ -1,5 +1,3 @@
-import FWLog from '../log/FWLog';
-
 const { ccclass, property, menu } = cc._decorator;
 
 interface EventTouch extends cc.Event.EventTouch {
@@ -59,9 +57,9 @@ export default class FWRollingViewNesting extends cc.Component {
           let touch = event.touch;
           if (viewGroup.content) {
             if (viewGroup instanceof cc.PageView) {
-                viewGroup['_touchEndPosition'] = touch.getLocation();
-              }
-              viewGroup._handleReleaseLogic(touch);
+              viewGroup['_touchEndPosition'] = touch.getLocation();
+            }
+            viewGroup._handleReleaseLogic(touch);
           }
         }
         if (