@ives_xxz/framework 1.6.6 → 2.0.1

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 (

package/item/FWVirtualListItem.ts

@@ -52,7 +52,7 @@ export default class FWVirtualListItem extends FWObject {
 
   _registerEvent() {
     if (!this._eventReg) {
-      if (this.btnCom && this.list.selectedMode > 0) {
+      if (this.btnCom && (this.list.selectedMode as number) > 0) {
         this.btnCom.clickEvents.unshift(this.createEvt(this, 'onClickThis'));
       }
       if (this.adaptiveSize) {

package/language/FWLanguage.ts

@@ -1,5 +1,4 @@
-import { FWEventDefine } from "../define/FWEventDefine";
-import { FWLodash } from "../utils/FWLodash";
+import { FWLodash } from '../utils/FWLodash';
 
 const { ccclass, property, executeInEditMode } = cc._decorator;
 
@@ -10,11 +9,8 @@ export default abstract class FWLanguage extends cc.Component {
   protected _language: number = 0;
 
   @property({
-    type: FWLodash.CCEnum([
-      "请选择语言",
-      ...FW.Entry.languageMgr.getSupportedLanguages(),
-    ]),
-    displayName: "language",
+    type: FWLodash.CCEnum(['请选择语言', ...FW.Entry.languageMgr.getSupportedLanguages()]),
+    displayName: 'language',
     visible: true,
     serializable: true,
   })
@@ -34,21 +30,21 @@ export default abstract class FWLanguage extends cc.Component {
 
   private refreshInspector() {
     //@ts-ignore
-    Editor.Utils.refreshSelectedInspector("node", this.node.uuid);
+    Editor.Utils.refreshSelectedInspector('node', this.node.uuid);
   }
 
   protected onLoad(): void {
-    this.registerEvent({
-  FWEvent: [
-    {
-      eventName: FWEventDefine.LanguageEvent.LANGUAGE_CHANGE,
-      cb: () => {
-        this._language = FW.Entry.languageMgr.getLanguageIndex();
-        this.onLanguageChange();
-      }
-    }
-  ]
-});
+    FW.Entry.uiMgr.register({
+      FWEvent: [
+        {
+          eventName: FW.EventDefine.LanguageEvent.LANGUAGE_CHANGE,
+          cb: () => {
+            this._language = FW.Entry.languageMgr.getLanguageIndex();
+            this.onLanguageChange();
+          },
+        },
+      ],
+    });
   }
 
   protected onEnable(): void {

package/layer/FWLayer.ts

@@ -1,7 +1,7 @@
 const { ccclass, property } = cc._decorator;
 
 @ccclass
-export default class FWLayer extends cc.Component implements FW.Layer {
+export class FWLayer extends cc.Component implements FW.Layer {
   public readonly entry: FW.Entry = FW.Entry;
   public ctr: FW.LayerController;
   public onLoad(): void {}

package/log/FWLog.ts

@@ -1,20 +1,17 @@
-import { FWSystemDefine } from '../define/FWSystemDefine';
-
-export const FWLogColorMap: Map<FWSystemDefine.FWLogType, string> = new Map<
-  FWSystemDefine.FWLogType,
-  string
->([
-  [FWSystemDefine.FWLogType.DEBUG, '#FFFFFF'],
-  [FWSystemDefine.FWLogType.SOCKET_SEND, '#50BBE4'],
-  [FWSystemDefine.FWLogType.SOCKET_RECEIVE, '#F423DF'],
-  [FWSystemDefine.FWLogType.REQUEST, '#23F4C6'],
-  [FWSystemDefine.FWLogType.RESPONSE, '#FF8A00'],
-  [FWSystemDefine.FWLogType.WARN, '#FFC107'],
-  [FWSystemDefine.FWLogType.ERROR, '#DC3545'],
-  [FWSystemDefine.FWLogType.SYSTEM, '#9b1eeeff'],
-]);
-
-class FWLog {
+export class FWLog {
+  FWLogColorMap: Map<FW.SystemDefine.FWLogType, string> = new Map<
+    FW.SystemDefine.FWLogType,
+    string
+  >([
+    [FW.SystemDefine.FWLogType.DEBUG, '#FFFFFF'],
+    [FW.SystemDefine.FWLogType.SOCKET_SEND, '#50BBE4'],
+    [FW.SystemDefine.FWLogType.SOCKET_RECEIVE, '#F423DF'],
+    [FW.SystemDefine.FWLogType.REQUEST, '#23F4C6'],
+    [FW.SystemDefine.FWLogType.RESPONSE, '#FF8A00'],
+    [FW.SystemDefine.FWLogType.WARN, '#FFC107'],
+    [FW.SystemDefine.FWLogType.ERROR, '#DC3545'],
+    [FW.SystemDefine.FWLogType.SYSTEM, '#9b1eeeff'],
+  ]);
   private static instance: FWLog;
   public static getInstance() {
     if (!this.instance) {
@@ -30,8 +27,8 @@ class FWLog {
       return window.console.log.bind(
         window.console,
         `%c[debug]:${FW.Entry.timeMgr.getTime()}`,
-        `color: black; background-color: ${FWLogColorMap.get(
-          FWSystemDefine.FWLogType.DEBUG,
+        `color: black; background-color: ${this.FWLogColorMap.get(
+          FW.SystemDefine.FWLogType.DEBUG,
         )}; font-weight: bold; font-size: 10;`,
       );
 
@@ -43,8 +40,8 @@ class FWLog {
       return window.console.log.bind(
         window.console,
         `%c[sendMsg]:${FW.Entry.timeMgr.getTime()}`,
-        `color: black; background-color: ${FWLogColorMap.get(
-          FWSystemDefine.FWLogType.SOCKET_SEND,
+        `color: black; background-color: ${this.FWLogColorMap.get(
+          FW.SystemDefine.FWLogType.SOCKET_SEND,
         )}; font-weight: bold; font-size: 10;`,
       );
     return console.log;
@@ -55,8 +52,8 @@ class FWLog {
       return window.console.log.bind(
         window.console,
         `%c[receiveMsg]:${FW.Entry.timeMgr.getTime()}`,
-        `color: black; background-color: ${FWLogColorMap.get(
-          FWSystemDefine.FWLogType.SOCKET_RECEIVE,
+        `color: black; background-color: ${this.FWLogColorMap.get(
+          FW.SystemDefine.FWLogType.SOCKET_RECEIVE,
         )}; font-weight: bold; font-size: 10;`,
       );
     return console.log;
@@ -67,8 +64,8 @@ class FWLog {
       return window.console.log.bind(
         window.console,
         `%c[request]:${FW.Entry.timeMgr.getTime()}`,
-        `color: black; background-color: ${FWLogColorMap.get(
-          FWSystemDefine.FWLogType.REQUEST,
+        `color: black; background-color: ${this.FWLogColorMap.get(
+          FW.SystemDefine.FWLogType.REQUEST,
         )}; font-weight: bold; font-size: 10;`,
       );
     return console.log;
@@ -79,8 +76,8 @@ class FWLog {
       return window.console.log.bind(
         window.console,
         `%c[response]:${FW.Entry.timeMgr.getTime()}`,
-        `color: black; background-color: ${FWLogColorMap.get(
-          FWSystemDefine.FWLogType.RESPONSE,
+        `color: black; background-color: ${this.FWLogColorMap.get(
+          FW.SystemDefine.FWLogType.RESPONSE,
         )}; font-weight: bold; font-size: 10;`,
       );
     return console.log;
@@ -91,8 +88,8 @@ class FWLog {
       return window.console.log.bind(
         window.console,
         `%c[system]:${FW.Entry.timeMgr.getTime()}`,
-        `color: black; background-color: ${FWLogColorMap.get(
-          FWSystemDefine.FWLogType.SYSTEM,
+        `color: black; background-color: ${this.FWLogColorMap.get(
+          FW.SystemDefine.FWLogType.SYSTEM,
         )}; font-weight: bold; font-size: 10;`,
       );
     return console.log;
@@ -103,8 +100,8 @@ class FWLog {
       return window.console.warn.bind(
         window.console,
         `%c[warn]:${FW.Entry.timeMgr.getTime()}`,
-        `color: black; background-color: ${FWLogColorMap.get(
-          FWSystemDefine.FWLogType.WARN,
+        `color: black; background-color: ${this.FWLogColorMap.get(
+          FW.SystemDefine.FWLogType.WARN,
         )}; font-weight: bold; font-size: 10;`,
       );
     return console.warn;
@@ -115,8 +112,8 @@ class FWLog {
       return window.console.error.bind(
         window.console,
         `%c[error]:${FW.Entry.timeMgr.getTime()}`,
-        `color: black; background-color: ${FWLogColorMap.get(
-          FWSystemDefine.FWLogType.ERROR,
+        `color: black; background-color: ${this.FWLogColorMap.get(
+          FW.SystemDefine.FWLogType.ERROR,
         )}; font-weight: bold; font-size: 10;`,
       );
     return console.error;
@@ -128,5 +125,3 @@ if (!CC_DEBUG && !CC_DEV && !CC_BUILD) {
   window.console.warn = () => {};
   window.console.error = () => {};
 }
-
-export default FWLog.getInstance();

package/logic/FWLogic.ts

@@ -1,8 +1,6 @@
-import { injectable } from "inversify";
-import { FrameworkBase } from "../FrameworkBase";
-import { FWSystemDefine } from "../define/FWSystemDefine";
+import { injectable } from 'inversify';
 @injectable()
-export default class FWLogic extends FrameworkBase implements FW.Logic {
+export class FWLogic extends FW.FrameworkBase {
   public initialize?(): void;
   public onDestroy?(): void;
 }

package/machine/FWStateMachine.ts

@@ -1,4 +1,3 @@
-import FWLog from '../log/FWLog';
 import { FWState } from '../state/FWState';
 
 export default class FWStateMachine implements FW.StateMachine {
@@ -17,7 +16,7 @@ export default class FWStateMachine implements FW.StateMachine {
   /** 进入状态 */
   enter(stateType: number, ...args: any): void {
     if (this.stateMap.size == 0) {
-      FWLog.error('stateMachine is not register!');
+      FW.Log.error('stateMachine is not register!');
       return;
     }
 

package/manager/FWAnimationManager.ts

@@ -1,8 +1,6 @@
 import { FWSkeleton } from '../animation/FWSkeleton';
 import { FWTween } from '../animation/FWTween';
 import { FWManager } from './FWManager';
-import { FWSystemDefine } from '../define/FWSystemDefine';
-import FWLog from '../log/FWLog';
 import { FWAnimationMachine } from '../machine/FWAnimationMachine';
 
 export default class FWAnimationManager extends FWManager {
@@ -10,9 +8,9 @@ export default class FWAnimationManager extends FWManager {
   public initialize(): void {
     this.animationMachineMap = new Map<string, FWAnimationMachine>();
 
-    this.createAnimationMachine(FWSystemDefine.FWAnimationMachineType.TWEEN);
-    this.createAnimationMachine(FWSystemDefine.FWAnimationMachineType.SKELETON);
-    this.createAnimationMachine(FWSystemDefine.FWAnimationMachineType.ANIMATION);
+    this.createAnimationMachine(FW.SystemDefine.FWAnimationMachineType.TWEEN);
+    this.createAnimationMachine(FW.SystemDefine.FWAnimationMachineType.SKELETON);
+    this.createAnimationMachine(FW.SystemDefine.FWAnimationMachineType.ANIMATION);
   }
 
   /**
@@ -22,7 +20,7 @@ export default class FWAnimationManager extends FWManager {
    */
   createTween(args?: FW.TweenArgs) {
     const t = new FWTween();
-    const machine = this.animationMachineMap.get(FWSystemDefine.FWAnimationMachineType.TWEEN);
+    const machine = this.animationMachineMap.get(FW.SystemDefine.FWAnimationMachineType.TWEEN);
     t.animationName = args?.tag || '';
     t.animation = cc.tween(args?.target);
     t.timeScale(args?.timeScale || 1);
@@ -37,7 +35,7 @@ export default class FWAnimationManager extends FWManager {
    */
   createSkeleton(skeleton: sp.Skeleton) {
     const s = new FWSkeleton();
-    const machine = this.animationMachineMap.get(FWSystemDefine.FWAnimationMachineType.SKELETON);
+    const machine = this.animationMachineMap.get(FW.SystemDefine.FWAnimationMachineType.SKELETON);
     s.animationName = skeleton.name;
     s.animation = skeleton;
     machine.addAnimation(s);
@@ -63,7 +61,7 @@ export default class FWAnimationManager extends FWManager {
    */
   private createAnimationMachine(animationMachineName: string) {
     if (this.animationMachineMap.has(animationMachineName)) {
-      FWLog.warn(`已创建动画机:${animationMachineName},请勿重复注册!`);
+      FW.Log.warn(`已创建动画机:${animationMachineName},请勿重复注册!`);
       return;
     }
     const machine = new FWAnimationMachine();