dzkcc-mflow 0.0.21 → 0.0.23

package/dist/core/Decorators.js

@@ -1,105 +1,213 @@
-import { ServiceLocator } from './ServiceLocator.js';
 import 'reflect-metadata';
 
-// 通过symbol实现接口标识
-const interfaceSymbols = new Map();
-// 装饰器，方便自动注册manager和model
-const modelRegistry = [];
-const managerRegistry = [];
-function getInterface(ctor) {
-    let sym = interfaceSymbols.get(ctor);
-    if (!sym)
-        throw new Error(`Manager ${ctor.name} not registered! Please use @manager() decorator to register it.`);
-    return sym;
+// ============================================================================
+// Symbol 注册系统 - Names 对象（提供代码补全）
+// ============================================================================
+/** Model 名称到 Symbol 的映射，用于代码补全 */
+const ModelNames = {};
+/** Manager 名称到 Symbol 的映射，用于代码补全 */
+const ManagerNames = {};
+/** View 名称到 Symbol 的映射，用于代码补全 */
+const ViewNames = {};
+// ============================================================================
+// 内部注册表
+// ============================================================================
+// Model 注册表
+const modelSymbolRegistry = new Map(); // Symbol → 类
+const ctorToModelSymbol = new Map(); // 类 → Symbol
+// Manager 注册表
+const managerSymbolRegistry = new Map(); // Symbol → 类
+const ctorToManagerSymbol = new Map(); // 类 → Symbol
+// View 注册表
+const viewRegistry = new Map(); // Symbol → 类
+// ============================================================================
+// Model 装饰器
+// ============================================================================
+/**
+ * Model 装饰器，用于注册 Model 到全局注册表
+ * @param name 可选的 Model 名称，如果不提供则使用类名
+ * @example
+ * ```typescript
+ * @model('User')
+ * export class UserModel implements IModel {
+ *     initialize(): void { }
+ * }
+ *
+ * // 使用
+ * const user = mf.core.getModel(ModelNames.User);
+ * ```
+ */
+function model(name) {
+    return function (ctor) {
+        const modelName = name || ctor.name;
+        const modelSymbol = Symbol(modelName);
+        // 注册到映射表
+        modelSymbolRegistry.set(modelSymbol, ctor);
+        ctorToModelSymbol.set(ctor, modelSymbol);
+        ModelNames[modelName] = modelSymbol;
+        console.log(`Model registered: ${modelName}`);
+    };
+}
+/**
+ * 获取所有已注册的 Model 名称
+ * @returns Model 名称数组
+ */
+function getRegisteredModelNames() {
+    return Object.keys(ModelNames);
+}
+/**
+ * 通过 Symbol 获取 Model 类构造函数
+ * @param modelSymbol Model 的 Symbol 标识
+ * @returns Model 类构造函数
+ * @throws 如果 Model 未注册则抛出错误
+ */
+function getModelClass(modelSymbol) {
+    const modelClass = modelSymbolRegistry.get(modelSymbol);
+    if (!modelClass) {
+        throw new Error(`Model not registered! Symbol: ${modelSymbol.toString()}`);
+    }
+    return modelClass;
+}
+/**
+ * 通过类构造函数获取 Model 的 Symbol
+ * @param ctor Model 类构造函数
+ * @returns Model 的 Symbol
+ * @internal 内部使用
+ */
+function getModelSymbol(ctor) {
+    return ctorToModelSymbol.get(ctor);
 }
-function manager() {
+// ============================================================================
+// Manager 装饰器
+// ============================================================================
+/**
+ * Manager 装饰器，用于注册 Manager 到全局注册表
+ * @param name 可选的 Manager 名称，如果不提供则使用类名
+ * @example
+ * ```typescript
+ * @manager('Game')
+ * export class GameManager extends AbstractManager {
+ *     initialize(): void { }
+ * }
+ * ```
+ */
+function manager(name) {
     return function (ctor) {
-        // 自动生成并注册Symbol
-        if (!interfaceSymbols.has(ctor)) {
-            interfaceSymbols.set(ctor, Symbol(ctor.name));
-        }
-        managerRegistry.push(ctor);
+        const managerName = name || ctor.name;
+        const managerSymbol = Symbol(managerName);
+        // 注册到映射表
+        managerSymbolRegistry.set(managerSymbol, ctor);
+        ctorToManagerSymbol.set(ctor, managerSymbol);
+        ManagerNames[managerName] = managerSymbol;
+        console.log(`Manager registered: ${managerName}`);
     };
 }
-function model() {
+/**
+ * 获取所有已注册的 Manager 名称
+ * @returns Manager 名称数组
+ */
+function getRegisteredManagerNames() {
+    return Object.keys(ManagerNames);
+}
+/**
+ * 通过 Symbol 获取 Manager 类构造函数
+ * @param managerSymbol Manager 的 Symbol 标识
+ * @returns Manager 类构造函数
+ * @throws 如果 Manager 未注册则抛出错误
+ */
+function getManagerClass(managerSymbol) {
+    const managerClass = managerSymbolRegistry.get(managerSymbol);
+    if (!managerClass) {
+        throw new Error(`Manager not registered! Symbol: ${managerSymbol.toString()}`);
+    }
+    return managerClass;
+}
+/**
+ * 通过类构造函数获取 Manager 的 Symbol
+ * @param ctor Manager 类构造函数
+ * @returns Manager 的 Symbol
+ * @internal 内部使用
+ */
+function getManagerSymbol(ctor) {
+    return ctorToManagerSymbol.get(ctor);
+}
+// ============================================================================
+// View 装饰器
+// ============================================================================
+/**
+ * View 装饰器，用于注册 View 到全局注册表
+ * @param name 可选的 View 名称，如果不提供则使用类名
+ * @example
+ * ```typescript
+ * @view('Home')
+ * @ccclass('HomeView')
+ * export class HomeView extends BaseView {
+ *     onEnter(): void { }
+ *     onPause(): void { }
+ *     onResume(): void { }
+ * }
+ *
+ * // 使用
+ * await mf.ui.open(ViewNames.Home);
+ * ```
+ */
+function view(name) {
     return function (ctor) {
-        modelRegistry.push(ctor);
+        const viewName = name || ctor.name;
+        const viewSymbol = Symbol(viewName);
+        // 注册到映射表
+        viewRegistry.set(viewSymbol, ctor);
+        ViewNames[viewName] = viewSymbol;
+        console.log(`View registered: ${viewName}`);
     };
 }
+/**
+ * 获取所有已注册的 View 名称
+ * @returns View 名称数组
+ */
+function getRegisteredViewNames() {
+    return Object.keys(ViewNames);
+}
+/**
+ * 通过 Symbol 获取 View 类构造函数
+ * @param viewSymbol View 的 Symbol 标识
+ * @returns View 类构造函数
+ * @throws 如果 View 未注册则抛出错误
+ */
+function getViewClass(viewSymbol) {
+    const viewClass = viewRegistry.get(viewSymbol);
+    if (!viewClass) {
+        throw new Error(`View not registered! Symbol: ${viewSymbol.toString()}`);
+    }
+    return viewClass;
+}
+// ============================================================================
+// 自动注册
+// ============================================================================
+/**
+ * 自动注册所有使用装饰器标记的 Model 和 Manager
+ * @param core Core 实例
+ * @example
+ * ```typescript
+ * // 导入所有 Model 和 Manager
+ * import '@/models/UserModel';
+ * import '@/managers/GameManager';
+ *
+ * // 自动注册
+ * autoRegister(mf.core);
+ * ```
+ */
 function autoRegister(core) {
-    modelRegistry.forEach(ctor => {
+    // 注册所有 Model
+    ctorToModelSymbol.forEach((modelSymbol, ctor) => {
         console.log(`${ctor.name} initialize`);
-        core.regModel(new ctor());
+        core.regModel(modelSymbol);
     });
-    managerRegistry.forEach(ctor => {
+    // 注册所有 Manager
+    ctorToManagerSymbol.forEach((managerSymbol, ctor) => {
         console.log(`${ctor.name} initialize`);
-        core.regManager(new ctor());
+        core.regManager(managerSymbol);
     });
-}
-// 依赖注入
-// ------------------------------------------------------------------------------------
-const INJECTED_PROPERTIES_KEY = 'injectedProperties';
-// 因为明文定义的属性会覆盖injectManager（通过defineProperty定义）注入的属性，所以需要在编译时删除明文定义的属性
-function CleanInjectedProperties(constructor) {
-    return class extends constructor {
-        constructor(...args) {
-            super(...args);
-            // 递归收集当前类及其所有父类的注入属性
-            const collectInjectedProperties = (klass) => {
-                if (klass === null || klass === Object)
-                    return [];
-                const parentProperties = collectInjectedProperties(Object.getPrototypeOf(klass));
-                const currentProperties = Reflect.getMetadata(INJECTED_PROPERTIES_KEY, klass) || [];
-                // const currentProperties :any[] = []
-                return [...parentProperties, ...currentProperties];
-            };
-            // 合并并去重属性名
-            const injectedProperties = [
-                ...new Set(collectInjectedProperties(constructor))
-            ];
-            // 删除实例上的所有注入属性
-            injectedProperties.forEach(prop => {
-                if (this.hasOwnProperty(prop)) {
-                    delete this[prop];
-                }
-            });
-        }
-    };
-}
-function managedWithClean() {
-    return function (ctor) {
-        // 先执行清理逻辑
-        const decoratedCtor = CleanInjectedProperties(ctor);
-        // 后执行注册逻辑
-        manager()(decoratedCtor);
-        return decoratedCtor;
-    };
-}
-// 懒加载依赖注入manager
-function injectManager(sym) {
-    return function (target, prop) {
-        const injectionKey = Symbol.for(prop);
-        Object.defineProperty(target, prop, {
-            get: function () {
-                console.log(`[属性访问] 触发getter：${injectionKey.toString()}`);
-                if (!this[injectionKey]) {
-                    this[injectionKey] = ServiceLocator.getService('core').getManager(sym);
-                }
-                return this[injectionKey];
-            },
-            set: function (val) {
-                throw new Error('InjectManager property is read-only');
-            },
-            enumerable: true,
-            configurable: false // 禁止修改属性描述符
-        });
-        // 2. 将属性名记录到元数据
-        const injectedProperties = Reflect.getMetadata(INJECTED_PROPERTIES_KEY, target.constructor) || [];
-        if (!injectedProperties.includes(prop)) {
-            injectedProperties.push(prop);
-        }
-        Reflect.defineMetadata(INJECTED_PROPERTIES_KEY, injectedProperties, target.constructor);
-    };
 }
 
-export { autoRegister, getInterface, injectManager, managedWithClean, model };
+export { ManagerNames, ModelNames, ViewNames, autoRegister, getManagerClass, getManagerSymbol, getModelClass, getModelSymbol, getRegisteredManagerNames, getRegisteredModelNames, getRegisteredViewNames, getViewClass, manager, model, view };

package/dist/core/index.js

@@ -1,3 +1,3 @@
 export { AbstractCore, AbstractManager } from './Core.js';
-export { autoRegister, getInterface, injectManager, managedWithClean, model } from './Decorators.js';
+export { ManagerNames, ModelNames, ViewNames, autoRegister, getManagerClass, getManagerSymbol, getModelClass, getModelSymbol, getRegisteredManagerNames, getRegisteredModelNames, getRegisteredViewNames, getViewClass, manager, model, view } from './Decorators.js';
 export { ServiceLocator } from './ServiceLocator.js';

package/dist/libs/BaseView.d.ts

@@ -16,6 +16,6 @@ export declare abstract class BaseView extends Component implements IView {
     abstract onEnter(args?: any): void;
     onExit(): void;
     protected onDestroy(): void;
-    protected getManager<T extends IManager>(ctor: new () => T): T;
-    protected getModel<T extends IModel>(ctor: new () => T): T;
+    protected getManager<T extends IManager>(managerSymbol: symbol): T;
+    protected getModel<T extends IModel>(modelSymbol: symbol): T;
 }

package/dist/libs/BaseView.js

@@ -69,13 +69,13 @@ class BaseView extends Component {
         });
         this._loaderHandlers = [];
     }
-    getManager(ctor) {
+    getManager(managerSymbol) {
         // 业务组件避免直接依赖底层服务定位器，所以使用app.core统一对外接口，方便后续架构演进
-        return mf.core.getManager(ctor);
+        return mf.core.getManager(managerSymbol);
     }
-    getModel(ctor) {
+    getModel(modelSymbol) {
         // 业务组件避免直接依赖底层服务定位器，所以使用app.core统一对外接口，方便后续架构演进
-        return mf.core.getModel(ctor);
+        return mf.core.getModel(modelSymbol);
     }
 }
 

package/dist/libs/CocosCore.js

@@ -7,6 +7,7 @@ import { ResLoader } from './ResLoader.js';
 import { Broadcaster } from './Broadcaster.js';
 import { HttpManager } from './HttpManager.js';
 import { WebSocketManager } from './WebSocketManager.js';
+import { RedDotManager } from './indicator/RedDotManager.js';
 import '../App.js';
 
 class Core extends AbstractCore {
@@ -18,6 +19,7 @@ class Core extends AbstractCore {
         ServiceLocator.regService('UIManager', new UIManager());
         ServiceLocator.regService('HttpManager', new HttpManager());
         ServiceLocator.regService('WebSocketManager', new WebSocketManager());
+        ServiceLocator.regService('RedDotManager', new RedDotManager());
         // 注册业务模块（通过装饰器自动注册）
         // 推迟到构造函数执行完毕
         queueMicrotask(() => autoRegister(this));

package/dist/libs/UIManager.d.ts

@@ -3,14 +3,14 @@ import { IUIManager, IView } from "../core";
 type ICocosView = IView & Component;
 declare abstract class CcocosUIManager implements IUIManager {
     getTopView(): IView | undefined;
-    open<T extends IView>(viewType: new () => T, args?: any): Promise<T>;
-    close<T extends IView>(viewortype: T | (new () => T), destory?: boolean): void;
-    openAndPush<T extends IView>(viewType: new () => T, group: string, args?: any): Promise<T>;
+    open<T extends IView>(viewSymbol: symbol, args?: any): Promise<T>;
+    close(viewSymbol: symbol | IView, destory?: boolean): void;
+    openAndPush<T extends IView>(viewSymbol: symbol, group: string, args?: any): Promise<T>;
     closeAndPop(group: string, destroy?: boolean): void;
     clearStack(group: string, destroy?: boolean): void;
-    protected abstract internalOpen<T extends ICocosView>(viewType: new () => T, args?: any): Promise<T>;
-    protected abstract internalClose<T extends ICocosView>(viewortype: T | (new () => T), destory?: boolean): void;
-    protected abstract internalOpenAndPush<T extends ICocosView>(viewType: new () => T, group: string, args?: any): Promise<T>;
+    protected abstract internalOpen<T extends ICocosView>(viewSymbol: symbol, args?: any): Promise<T>;
+    protected abstract internalClose(viewSymbol: symbol | IView, destory?: boolean): void;
+    protected abstract internalOpenAndPush<T extends ICocosView>(viewSymbol: symbol, group: string, args?: any): Promise<T>;
     protected abstract internalCloseAndPop(group: string, destroy?: boolean): void;
     protected abstract internalClearStack(group: string, destroy?: boolean): void;
     protected abstract internalGetTopView(): ICocosView | undefined;
@@ -25,9 +25,9 @@ export declare class UIManager extends CcocosUIManager {
     private _load;
     private _remove;
     protected internalGetTopView(): ICocosView | undefined;
-    protected internalOpen<T extends ICocosView>(viewType: new () => T, args?: any): Promise<T>;
-    protected internalClose<T extends ICocosView>(viewortype: T | (new () => T), destroy?: boolean): void;
-    protected internalOpenAndPush<T extends ICocosView>(viewType: new () => T, group: string, args?: any): Promise<T>;
+    protected internalOpen<T extends ICocosView>(viewSymbol: symbol, args?: any): Promise<T>;
+    protected internalClose(viewSymbol: symbol | IView, destroy?: boolean): void;
+    protected internalOpenAndPush<T extends ICocosView>(viewSymbol: symbol, group: string, args?: any): Promise<T>;
     protected internalCloseAndPop(group: string, destroy?: boolean): void;
     protected internalClearStack(group: string, destroy?: boolean): void;
 }

package/dist/libs/UIManager.js

@@ -1,7 +1,7 @@
 import { __awaiter } from '../_virtual/_tslib.js';
 import { director, Node, Sprite, Widget, Input, input, Prefab, instantiate } from 'cc';
 import { ServiceLocator } from '../core/ServiceLocator.js';
-import 'reflect-metadata';
+import { getViewClass } from '../core/Decorators.js';
 
 function addWidget(node) {
     const widget = node.getComponent(Widget) || node.addComponent(Widget);
@@ -60,16 +60,14 @@ class CcocosUIManager {
     getTopView() {
         return this.internalGetTopView();
     }
-    open(viewType, args) {
-        let vt = viewType;
-        return this.internalOpen(vt, args);
+    open(viewSymbol, args) {
+        return this.internalOpen(viewSymbol, args);
     }
-    close(viewortype, destory) {
-        this.internalClose(viewortype, destory);
+    close(viewSymbol, destory) {
+        this.internalClose(viewSymbol, destory);
     }
-    openAndPush(viewType, group, args) {
-        let vt = viewType;
-        return this.internalOpenAndPush(vt, group, args);
+    openAndPush(viewSymbol, group, args) {
+        return this.internalOpenAndPush(viewSymbol, group, args);
     }
     closeAndPop(group, destroy) {
         this.internalCloseAndPop(group, destroy);
@@ -104,7 +102,7 @@ class UIManager extends CcocosUIManager {
             }
             prototype = Object.getPrototypeOf(prototype);
         }
-        throw new Error(`Prefab path not found for ${viewType.constructor.name}`);
+        throw new Error(`Prefab path not found for ${viewType.name}`);
     }
     // 调整Mask层级
     _adjustMaskLayer() {
@@ -131,8 +129,9 @@ class UIManager extends CcocosUIManager {
             }
         }
     }
-    _load(viewType, args) {
+    _load(viewSymbol, args) {
         return __awaiter(this, void 0, void 0, function* () {
+            const viewType = getViewClass(viewSymbol);
             let target;
             if (this._cache.has(viewType.name)) {
                 target = this._cache.get(viewType.name);
@@ -148,30 +147,39 @@ class UIManager extends CcocosUIManager {
             return target.getComponent(viewType);
         });
     }
-    _remove(viewortype, destroy) {
+    _remove(viewSymbolOrInstance, destroy) {
         var _a;
-        if (typeof viewortype == 'function') {
-            const cached = this._cache.get(viewortype.name);
+        // 如果是 symbol，从缓存中获取视图实例
+        if (typeof viewSymbolOrInstance === 'symbol') {
+            const viewType = getViewClass(viewSymbolOrInstance);
+            const cached = this._cache.get(viewType.name);
             if (!cached) {
-                console.warn(`No cached view found for ${viewortype.name}`);
+                console.warn(`No cached view found for ${viewType.name}`);
                 return;
             }
-            this._remove(cached.getComponent(viewortype), destroy);
+            const viewInstance = cached.getComponent(viewType);
+            if (!viewInstance) {
+                console.warn(`No view component found on node ${cached.name}`);
+                return;
+            }
+            this._remove(viewInstance, destroy);
             return;
         }
-        if ('__group__' in viewortype) {
-            viewortype.__group__ = undefined;
+        // 处理视图实例
+        const viewInstance = viewSymbolOrInstance;
+        if ('__group__' in viewInstance) {
+            viewInstance.__group__ = undefined;
         }
-        viewortype.onExit();
-        viewortype.node.removeFromParent();
-        viewortype.node.active = false;
+        viewInstance.onExit();
+        viewInstance.node.removeFromParent();
+        viewInstance.node.active = false;
         if (destroy) {
-            let cacheKey = viewortype.constructor.name;
+            let cacheKey = viewInstance.constructor.name;
             (_a = this._cache.get(cacheKey)) === null || _a === void 0 ? void 0 : _a.destroy();
             this._cache.delete(cacheKey);
             // 销毁被克隆出的UI后Node后，尝试释放 Prefab 资源
             try {
-                const viewType = viewortype.constructor;
+                const viewType = viewInstance.constructor;
                 const prefabPath = this._getPrefabPath(viewType);
                 const ResMgr = ServiceLocator.getService('ResLoader');
                 ResMgr.release(prefabPath, Prefab);
@@ -198,10 +206,10 @@ class UIManager extends CcocosUIManager {
         console.warn(`No view found in ${target.name}`);
         return undefined;
     }
-    internalOpen(viewType, args) {
+    internalOpen(viewSymbol, args) {
         return __awaiter(this, void 0, void 0, function* () {
             this._blockInput(true);
-            let view = yield this._load(viewType, args);
+            let view = yield this._load(viewSymbol, args);
             addChild(view.node);
             this._adjustMaskLayer();
             view.onEnter(args);
@@ -209,14 +217,14 @@ class UIManager extends CcocosUIManager {
             return view;
         });
     }
-    internalClose(viewortype, destroy) {
-        this._remove(viewortype, destroy);
+    internalClose(viewSymbol, destroy) {
+        this._remove(viewSymbol, destroy);
         this._adjustMaskLayer();
     }
-    internalOpenAndPush(viewType, group, args) {
+    internalOpenAndPush(viewSymbol, group, args) {
         return __awaiter(this, void 0, void 0, function* () {
             this._blockInput(true);
-            let view = yield this._load(viewType, args);
+            let view = yield this._load(viewSymbol, args);
             let stack = this._groupStacks.get(group) || [];
             this._groupStacks.set(group, stack);
             let top = stack[stack.length - 1];

package/dist/libs/index.d.ts

@@ -6,3 +6,6 @@ export * from './UIManager';
 export * from './UIRoot';
 export * from './HttpManager';
 export * from './WebSocketManager';
+export * from './indicator/RedDotManager';
+export * from './indicator/UIRedDot';
+export * from './indicator/RedDotNode';

package/dist/libs/index.js

@@ -6,3 +6,6 @@ export { UIManager } from './UIManager.js';
 export { UIRoot } from './UIRoot.js';
 export { HttpManager } from './HttpManager.js';
 export { WebSocketManager } from './WebSocketManager.js';
+export { RedDotManager } from './indicator/RedDotManager.js';
+export { UIRedDot } from './indicator/UIRedDot.js';
+export { RedDotNode } from './indicator/RedDotNode.js';

package/dist/libs/indicator/RedDotManager.d.ts

@@ -0,0 +1,58 @@
+import { IRedDotManager } from "../../core";
+/**
+ * 红点管理器,管理整个游戏的红点系统
+ */
+export declare class RedDotManager implements IRedDotManager {
+    private _root;
+    private _nodeCache;
+    initialize(): void;
+    dispose(): void;
+    /**
+     * 获取或创建红点节点
+     * @param path 节点路径，如 'main/bag/weapon'
+     */
+    private _getOrCreateNode;
+    /**
+     * 设置红点数量
+     * @param path 节点路径
+     * @param count 红点数量
+     */
+    setCount(path: string, count: number): void;
+    /**
+     * 增加红点数量
+     * @param path 节点路径
+     * @param delta 增量（可以为负数）
+     */
+    addCount(path: string, delta?: number): void;
+    /**
+     * 获取红点数量（包含子节点）
+     * @param path 节点路径
+     */
+    getCount(path: string): number;
+    /**
+     * 是否有红点
+     * @param path 节点路径
+     */
+    hasRedDot(path: string): boolean;
+    /**
+     * 清空红点
+     * @param path 节点路径
+     */
+    clearRedDot(path: string): void;
+    /**
+     * 添加监听器
+     * @param path 节点路径
+     * @param listener 监听函数 (totalCount, selfCount) => void
+     */
+    on(path: string, listener: Function): void;
+    /**
+     * 移除监听器
+     * @param path 节点路径
+     * @param listener 监听函数
+     */
+    off(path: string, listener: Function): void;
+    /**
+     * 标准化路径
+     */
+    private _normalizePath;
+}