Files
esengine/packages/particle/src/systems/ClickFxSystem.ts

444 lines
17 KiB
TypeScript
Raw Normal View History

feat: 预制体系统与架构改进 (#303) * feat(prefab): 实现预制体系统和编辑器 UX 改进 ## 预制体系统 - 新增 PrefabSerializer: 预制体序列化/反序列化 - 新增 PrefabInstanceComponent: 追踪预制体实例来源和修改 - 新增 PrefabService: 预制体核心服务 - 新增 PrefabLoader: 预制体资产加载器 - 新增预制体命令: Create/Instantiate/Apply/Revert/BreakLink ## 预制体编辑模式 - 支持双击 .prefab 文件进入编辑模式 - 预制体编辑模式工具栏 (保存/退出) - 预制体实例指示器和操作菜单 ## 编辑器 UX 改进 - SceneHierarchy 快捷键: F2 重命名, Ctrl+D 复制, ↑↓ 导航 - 支持双击实体名称内联编辑 - 删除实体时显示子节点数量警告 - 右键菜单添加重命名/复制选项及快捷键提示 - 布局持久化和重置功能 ## Bug 修复 - 修复 editor-runtime 组件类重复导致的 TransformComponent 不识别问题 - 修复 .prefab-name 样式覆盖导致预制体工具栏文字不可见 - 修复 Inspector 资源字段高度不正确问题 * feat(editor): 改进编辑器 UX 交互体验 - ContentBrowser: 加载动画 spinner、搜索高亮、改进空状态设计 - SceneHierarchy: 选中项自动滚动到视图、搜索清除按钮 - PropertyInspector: 输入框本地状态管理、Enter/Escape 键处理 - EntityInspector: 组件折叠状态持久化、属性搜索清除按钮 - Viewport: 变换操作实时数值显示 - 国际化: 添加相关文本 (en/zh) * fix(build): 修复 Web 构建资产加载和编辑器 UX 改进 构建系统修复: - 修复 asset-catalog.json 字段名不匹配 (entries vs assets) - 修复 BrowserFileSystemService 支持两种目录格式 - 修复 bundle 策略检测逻辑 (空对象判断) - 修复 module.json 中 assetExtensions 声明和类型推断 行为树修复: - 修复 BehaviorTreeExecutionSystem 使用 loadAsset 替代 loadAssetByPath - 修复 BehaviorTreeAssetType 常量与 module.json 类型名一致 (behavior-tree) 编辑器 UX 改进: - 构建完成对话框添加"打开文件夹"按钮 - 构建完成对话框样式优化 (圆形图标背景、按钮布局) - SceneHierarchy 响应式布局 (窄窗口自动隐藏 Type 列) - SceneHierarchy 隐藏滚动条 错误追踪: - 添加全局错误处理器写入日志文件 (%TEMP%/esengine-editor-crash.log) - 添加 append_to_log Tauri 命令 * feat(render): 修复 UI 渲染和点击特效系统 ## UI 渲染修复 - 修复 GUID 验证 bug,使用统一的 isValidGUID() 函数 - 修复 UI 渲染顺序随机问题,Rust 端使用 IndexMap 替代 HashMap - Web 运行时添加 assetPathResolver 支持 GUID 解析 - UIInteractableComponent.blockEvents 默认值改为 false ## 点击特效系统 - 新增 ClickFxComponent 和 ClickFxSystem - 支持在点击位置播放粒子效果 - 支持多种触发模式和粒子轮换 ## Camera 系统重构 - CameraSystem 从 ecs-engine-bindgen 移至 camera 包 - 新增 CameraManager 统一管理相机 ## 编辑器改进 - 改进属性面板 UI 交互 - 粒子编辑器面板优化 - Transform 命令系统 * feat(render): 实现 Sorting Layer 系统和 Overlay 渲染层 - 新增 SortingLayerManager 管理排序层级 (Background, Default, Foreground, UI, Overlay) - 实现 ISortable 接口,统一 Sprite、UI、Particle 的排序属性 - 修复粒子 Overlay 层被 UI 遮挡问题:添加独立的 Overlay Pass 在 UI 之后渲染 - 更新粒子资产格式:从 sortingOrder 改为 sortingLayer + orderInLayer - 更新粒子编辑器面板支持新的排序属性 - 优化 UI 渲染系统使用新的排序层级 * feat(ci): 集成 SignPath 代码签名服务 - 添加 SignPath 自动签名工作流(Windows) - 配置 release-editor.yml 支持代码签名 - 将构建改为草稿模式,等待签名完成后发布 - 添加证书文件到 .gitignore 防止泄露 * fix(asset): 修复 Web 构建资产路径解析和全局单例移除 ## 资产路径修复 - 修复 Tauri 本地服务器 `/asset?path=...` 路径解析,正确与 root 目录连接 - BrowserPathResolver 支持两种模式: - 'proxy': 使用 /asset?path=... 格式(编辑器 Run in Browser) - 'direct': 使用直接路径 /assets/path.png(独立 Web 构建) - BrowserRuntime 使用 'direct' 模式,无需 Tauri 代理 ## 架构改进 - 移除全局单例 - 移除 globalAssetManager 导出,改用 AssetManagerToken 依赖注入 - 移除 globalPathResolver 导出,改用 PathResolutionService - 移除 globalPathResolutionService 导出 - ParticleUpdateSystem/ClickFxSystem 通过 setAssetManager() 注入依赖 - EngineService 使用 new AssetManager() 替代全局实例 ## 新增服务 - PathResolutionService: 统一路径解析接口 - RuntimeModeService: 运行时模式查询服务 - SerializationContext: EntityRef 序列化上下文 ## 其他改进 - 完善 ServiceToken 注释说明本地定义的意图 - 导出 BrowserPathResolveMode 类型 * fix(build): 添加 world-streaming composite 设置修复类型检查 * fix(build): 移除 world-streaming 引用避免 composite 冲突 * fix(build): 将 const enum 改为 enum 兼容 isolatedModules * fix(build): 添加缺失的 IAssetManager 导入
2025-12-13 19:44:08 +08:00
/**
* -
* Click FX System - Handles click input and spawns particle effects
*
* /
* Listens for user click/touch events and creates particle effect entities at click position.
*/
import { EntitySystem, Matcher, Entity, ECSSystem, PluginServiceRegistry, createServiceToken } from '@esengine/ecs-framework';
import { Input, MouseButton, TransformComponent, SortingLayers } from '@esengine/engine-core';
import type { IAssetManager } from '@esengine/asset-system';
import { ClickFxComponent, ClickFxTriggerMode } from '../ClickFxComponent';
import { ParticleSystemComponent, RenderSpace } from '../ParticleSystemComponent';
import type { IParticleAsset } from '../loaders/ParticleLoader';
// ============================================================================
// 本地服务令牌定义 | Local Service Token Definitions
// ============================================================================
// 使用 createServiceToken() 本地定义(与 runtime-core 相同策略)
// createServiceToken() 使用 Symbol.for(),确保运行时与源模块令牌匹配
//
// Local token definitions using createServiceToken() (same strategy as runtime-core)
// createServiceToken() uses Symbol.for(), ensuring runtime match with source module tokens
// ============================================================================
/**
* EngineBridge
* EngineBridge interface (minimal definition for coordinate conversion)
*/
interface IEngineBridge {
screenToWorld(screenX: number, screenY: number): { x: number; y: number };
}
/**
* EngineRenderSystem UI Canvas
* EngineRenderSystem interface (minimal definition for getting UI canvas size)
*/
interface IEngineRenderSystem {
getUICanvasSize(): { width: number; height: number };
}
// EngineBridge 令牌(与 engine-core 中的一致)
// EngineBridge token (consistent with engine-core)
const EngineBridgeToken = createServiceToken<IEngineBridge>('engineBridge');
// RenderSystem 令牌(与 ecs-engine-bindgen 中的一致)
// RenderSystem token (consistent with ecs-engine-bindgen)
const RenderSystemToken = createServiceToken<IEngineRenderSystem>('renderSystem');
/**
*
* Click FX System
*
* @example
* ```typescript
* // 在场景中添加系统
* scene.addSystem(new ClickFxSystem());
*
* // 创建带有 ClickFxComponent 的实体
* const clickFxEntity = scene.createEntity('ClickFx');
* const clickFx = clickFxEntity.addComponent(new ClickFxComponent());
* clickFx.particleAssets = ['particle-guid-1', 'particle-guid-2'];
* ```
*/
@ECSSystem('ClickFx', { updateOrder: 100 })
export class ClickFxSystem extends EntitySystem {
private _engineBridge: IEngineBridge | null = null;
private _renderSystem: IEngineRenderSystem | null = null;
private _assetManager: IAssetManager | null = null;
private _entitiesToDestroy: Entity[] = [];
private _canvas: HTMLCanvasElement | null = null;
constructor() {
super(Matcher.empty().all(ClickFxComponent));
}
/**
*
* Set asset manager
*/
setAssetManager(assetManager: IAssetManager | null): void {
this._assetManager = assetManager;
}
/**
* EngineBridge RenderSystem
* Set service registry (for getting EngineBridge and RenderSystem)
*/
setServiceRegistry(services: PluginServiceRegistry): void {
this._engineBridge = services.get(EngineBridgeToken) ?? null;
this._renderSystem = services.get(RenderSystemToken) ?? null;
}
/**
* EngineBridge
* Set EngineBridge (direct injection)
*/
setEngineBridge(bridge: IEngineBridge): void {
this._engineBridge = bridge;
}
/**
* RenderSystem
* Set RenderSystem (direct injection)
*/
setRenderSystem(renderSystem: IEngineRenderSystem): void {
this._renderSystem = renderSystem;
}
/**
* Canvas
* Set canvas element (for calculating relative coordinates)
*/
setCanvas(canvas: HTMLCanvasElement): void {
this._canvas = canvas;
}
/**
*
* Check if should process
*
*
* Only process click events in runtime mode (not editor mode)
*/
protected override onCheckProcessing(): boolean {
// 编辑器模式下不处理(预览时也不处理,只有 Play 模式才处理)
// Don't process in editor mode (including preview, only in Play mode)
if (this.scene?.isEditorMode) {
return false;
}
return super.onCheckProcessing();
}
protected override process(entities: readonly Entity[]): void {
// 处理延迟销毁 | Process delayed destruction
if (this._entitiesToDestroy.length > 0 && this.scene) {
this.scene.destroyEntities(this._entitiesToDestroy);
this._entitiesToDestroy = [];
}
for (const entity of entities) {
const clickFx = entity.getComponent(ClickFxComponent);
if (!clickFx || !clickFx.fxEnabled) continue;
// 清理过期的特效 | Clean up expired effects
this._cleanupExpiredEffects(clickFx);
// 检查触发条件 | Check trigger conditions
const triggered = this._checkTrigger(clickFx);
if (!triggered) continue;
// 检查是否可以添加新特效 | Check if can add new effect
if (!clickFx.canAddEffect()) continue;
// 获取点击/触摸位置 | Get click/touch position
const screenPos = this._getInputPosition(clickFx);
if (!screenPos) continue;
// 转换为 canvas 相对坐标 | Convert to canvas-relative coordinates
const canvasPos = this._windowToCanvas(screenPos.x, screenPos.y);
// 应用偏移 | Apply offset
canvasPos.x += clickFx.positionOffset.x;
canvasPos.y += clickFx.positionOffset.y;
// 创建粒子效果(使用屏幕空间坐标)
// Create particle effect (using screen space coordinates)
this._spawnEffect(clickFx, canvasPos.x, canvasPos.y);
}
}
/**
* canvas
* Window to canvas-relative coordinate conversion
*
* UI Canvas
* Converts window coordinates to UI canvas pixel coordinates.
*/
private _windowToCanvas(windowX: number, windowY: number): { x: number; y: number } {
// 获取 UI Canvas 尺寸 | Get UI canvas size
const canvasSize = this._renderSystem?.getUICanvasSize();
const uiCanvasWidth = canvasSize?.width ?? 1920;
const uiCanvasHeight = canvasSize?.height ?? 1080;
let canvasX = windowX;
let canvasY = windowY;
if (this._canvas) {
const rect = this._canvas.getBoundingClientRect();
// 计算 CSS 坐标 | Calculate CSS coordinates
canvasX = windowX - rect.left;
canvasY = windowY - rect.top;
// 将 CSS 坐标映射到 UI Canvas 坐标
// Map CSS coordinates to UI canvas coordinates
// UI Canvas 保持宽高比,可能会有 letterbox/pillarbox
// UI Canvas maintains aspect ratio, may have letterbox/pillarbox
const cssWidth = rect.width;
const cssHeight = rect.height;
// 计算 UI Canvas 在 CSS 坐标中的实际显示区域
// Calculate actual display area of UI Canvas in CSS coordinates
const uiAspect = uiCanvasWidth / uiCanvasHeight;
const cssAspect = cssWidth / cssHeight;
let displayWidth: number;
let displayHeight: number;
let offsetX = 0;
let offsetY = 0;
if (cssAspect > uiAspect) {
// CSS 更宽pillarbox左右黑边
// CSS is wider, pillarbox (black bars on sides)
displayHeight = cssHeight;
displayWidth = cssHeight * uiAspect;
offsetX = (cssWidth - displayWidth) / 2;
} else {
// CSS 更高letterbox上下黑边
// CSS is taller, letterbox (black bars on top/bottom)
displayWidth = cssWidth;
displayHeight = cssWidth / uiAspect;
offsetY = (cssHeight - displayHeight) / 2;
}
// 转换为 UI Canvas 坐标
// Convert to UI canvas coordinates
canvasX = ((canvasX - offsetX) / displayWidth) * uiCanvasWidth;
canvasY = ((canvasY - offsetY) / displayHeight) * uiCanvasHeight;
}
return { x: canvasX, y: canvasY };
}
/**
*
* Check trigger conditions
*/
private _checkTrigger(clickFx: ClickFxComponent): boolean {
const mode = clickFx.triggerMode;
switch (mode) {
case ClickFxTriggerMode.LeftClick:
return Input.isMouseButtonJustPressed(MouseButton.Left);
case ClickFxTriggerMode.RightClick:
return Input.isMouseButtonJustPressed(MouseButton.Right);
case ClickFxTriggerMode.AnyClick:
return Input.isMouseButtonJustPressed(MouseButton.Left) ||
Input.isMouseButtonJustPressed(MouseButton.Middle) ||
Input.isMouseButtonJustPressed(MouseButton.Right);
case ClickFxTriggerMode.Touch:
return this._checkTouchStart();
case ClickFxTriggerMode.All:
return Input.isMouseButtonJustPressed(MouseButton.Left) ||
Input.isMouseButtonJustPressed(MouseButton.Middle) ||
Input.isMouseButtonJustPressed(MouseButton.Right) ||
this._checkTouchStart();
default:
return false;
}
}
/**
*
* Check if there's a new touch start
*/
private _checkTouchStart(): boolean {
for (const [id] of Input.touches) {
if (Input.isTouchJustStarted(id)) {
return true;
}
}
return false;
}
/**
*
* Get input position
*/
private _getInputPosition(clickFx: ClickFxComponent): { x: number; y: number } | null {
const mode = clickFx.triggerMode;
// 优先检查触摸 | Check touch first
if (mode === ClickFxTriggerMode.Touch || mode === ClickFxTriggerMode.All) {
for (const [id, touch] of Input.touches) {
if (Input.isTouchJustStarted(id)) {
return { x: touch.x, y: touch.y };
}
}
}
// 检查鼠标 | Check mouse
if (mode !== ClickFxTriggerMode.Touch) {
return { x: Input.mousePosition.x, y: Input.mousePosition.y };
}
return null;
}
/**
*
* Spawn particle effect
*
* 使 UI Canvas
* Click effects use screen space rendering, coordinates relative to UI canvas center.
*/
private _spawnEffect(clickFx: ClickFxComponent, screenX: number, screenY: number): void {
const particleGuid = clickFx.getNextParticleAsset();
if (!particleGuid) {
console.warn('[ClickFxSystem] No particle assets configured');
return;
}
if (!this.scene) {
console.warn('[ClickFxSystem] No scene available');
return;
}
// 获取 UI Canvas 尺寸 | Get UI canvas size
const canvasSize = this._renderSystem?.getUICanvasSize();
const canvasWidth = canvasSize?.width ?? 1920;
const canvasHeight = canvasSize?.height ?? 1080;
// 将屏幕坐标转换为屏幕空间坐标(相对于 UI Canvas 中心)
// Convert screen coords to screen space coords (relative to UI canvas center)
// 屏幕空间坐标系:中心为 (0, 0)Y 轴向上
// Screen space coordinate system: center at (0, 0), Y-axis up
const screenSpaceX = screenX - canvasWidth / 2;
const screenSpaceY = canvasHeight / 2 - screenY; // Y 翻转
// 创建特效实体 | Create effect entity
const effectEntity = this.scene.createEntity(`ClickFx_${Date.now()}`);
// 添加 Transform使用屏幕空间坐标| Add Transform (using screen space coords)
const transform = effectEntity.addComponent(new TransformComponent(screenSpaceX, screenSpaceY));
transform.setScale(clickFx.scale, clickFx.scale, 1);
// 添加 ParticleSystem | Add ParticleSystem
const particleSystem = effectEntity.addComponent(new ParticleSystemComponent());
particleSystem.particleAssetGuid = particleGuid;
particleSystem.autoPlay = true;
// 使用 ScreenOverlay 层和屏幕空间渲染
// Use ScreenOverlay layer and screen space rendering
particleSystem.sortingLayer = SortingLayers.ScreenOverlay;
particleSystem.orderInLayer = 0;
particleSystem.renderSpace = RenderSpace.Screen;
// 记录活跃特效 | Record active effect
clickFx.addActiveEffect(effectEntity.id);
// 异步加载并播放 | Async load and play
if (this._assetManager) {
this._assetManager.loadAsset<IParticleAsset>(particleGuid).then(result => {
if (result?.asset) {
particleSystem.setAssetData(result.asset);
// 应用资产的排序属性 | Apply sorting properties from asset
if (result.asset.sortingLayer) {
particleSystem.sortingLayer = result.asset.sortingLayer;
}
if (result.asset.orderInLayer !== undefined) {
particleSystem.orderInLayer = result.asset.orderInLayer;
}
particleSystem.play();
} else {
console.warn(`[ClickFxSystem] Failed to load particle asset: ${particleGuid}`);
}
}).catch(error => {
console.error(`[ClickFxSystem] Error loading particle asset ${particleGuid}:`, error);
});
} else {
console.warn('[ClickFxSystem] AssetManager not set, cannot load particle asset');
}
}
/**
*
* Clean up expired effects
*/
private _cleanupExpiredEffects(clickFx: ClickFxComponent): void {
if (!this.scene) return;
const now = Date.now();
const lifetimeMs = clickFx.effectLifetime * 1000;
const effectsToRemove: number[] = [];
for (const effect of clickFx.getActiveEffects()) {
const age = now - effect.startTime;
if (age >= lifetimeMs) {
// 标记为需要移除 | Mark for removal
effectsToRemove.push(effect.entityId);
// 查找并销毁实体 | Find and destroy entity
const entity = this.scene.findEntityById(effect.entityId);
if (entity) {
// 停止粒子系统 | Stop particle system
const particleSystem = entity.getComponent(ParticleSystemComponent);
if (particleSystem) {
particleSystem.stop(true);
}
// 添加到销毁队列 | Add to destroy queue
this._entitiesToDestroy.push(entity);
}
}
}
// 从记录中移除 | Remove from records
for (const entityId of effectsToRemove) {
clickFx.removeActiveEffect(entityId);
}
}
protected override onDestroy(): void {
// 清理所有特效 | Clean up all effects
if (this.scene) {
const entities = this.scene.entities.buffer;
for (let i = 0; i < entities.length; i++) {
const entity = entities[i];
const clickFx = entity.getComponent(ClickFxComponent);
if (clickFx) {
for (const effect of clickFx.getActiveEffects()) {
const effectEntity = this.scene.findEntityById(effect.entityId);
if (effectEntity) {
this._entitiesToDestroy.push(effectEntity);
}
}
clickFx.clearActiveEffects();
}
}
// 立即销毁 | Destroy immediately
if (this._entitiesToDestroy.length > 0) {
this.scene.destroyEntities(this._entitiesToDestroy);
this._entitiesToDestroy = [];
}
}
}
}