From abb4ac4acc7a58aef6e5af0c2c6a4a8988ac964d Mon Sep 17 00:00:00 2001 From: tianmo Date: Tue, 22 Sep 2026 17:17:39 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AE=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/Preset/{spine.json => SpineBoy.json} | 10 +++++----- public/Preset/index.json | 12 ++++++------ public/Preset/{多力场.json => 力场拖尾.json} | 12 ++++++------ src/views/stage/objectInteractions.ts | 4 ++-- 4 files changed, 19 insertions(+), 19 deletions(-) rename public/Preset/{spine.json => SpineBoy.json} (99%) rename public/Preset/{多力场.json => 力场拖尾.json} (98%) diff --git a/public/Preset/spine.json b/public/Preset/SpineBoy.json similarity index 99% rename from public/Preset/spine.json rename to public/Preset/SpineBoy.json index f9d3cf4..dcf4208 100644 --- a/public/Preset/spine.json +++ b/public/Preset/SpineBoy.json @@ -1,11 +1,11 @@ { "format": "SpineParticle.EditorConfig", "version": 1, - "savedAt": "2026-09-14T09:27:43.502Z", + "savedAt": "2026-09-22T09:10:07.796Z", "editor": { - "viewScale": 0.25667509294538904, - "viewX": -108.03375430502649, - "viewY": 58.10811303956338 + "viewScale": 0.5066311211773208, + "viewX": -21.45847112068003, + "viewY": 229.1173536037184 }, "settings": { "backgroundX": 0, @@ -462,7 +462,7 @@ "depth": 7 } ], - "assetVersion": 5, + "assetVersion": 6, "status": "ready", "error": "" } diff --git a/public/Preset/index.json b/public/Preset/index.json index f1c56d2..7877236 100644 --- a/public/Preset/index.json +++ b/public/Preset/index.json @@ -1,12 +1,12 @@ [ - { - "name": "多力场", - "file": "多力场.json" - }, { "name": "雷电序列帧", "file": "雷电序列帧.json" }, + { + "name": "力场拖尾", + "file": "力场拖尾.json" + }, { "name": "粒子扫过", "file": "粒子扫过.json" @@ -16,7 +16,7 @@ "file": "长条方块.json" }, { - "name": "spine", - "file": "spine.json" + "name": "SpineBoy", + "file": "SpineBoy.json" } ] diff --git a/public/Preset/多力场.json b/public/Preset/力场拖尾.json similarity index 98% rename from public/Preset/多力场.json rename to public/Preset/力场拖尾.json index 834627c..79398ca 100644 --- a/public/Preset/多力场.json +++ b/public/Preset/力场拖尾.json @@ -1,11 +1,11 @@ { "format": "SpineParticle.EditorConfig", "version": 1, - "savedAt": "2026-09-22T08:54:10.890Z", + "savedAt": "2026-09-22T09:13:58.532Z", "editor": { - "viewScale": 0.8928571428571433, - "viewX": 27.26238807717155, - "viewY": -5.489695295473268 + "viewScale": 1.4049280000000024, + "viewX": 4.425329339374599, + "viewY": -0.7737096708491435 }, "settings": { "backgroundX": 0, @@ -399,7 +399,7 @@ "y": 1 } ], - "boneCount": 2, + "boneCount": 6, "trailRatio": 100, "lengthMode": "fixed", "length": 100, @@ -488,7 +488,7 @@ } ], "trailGridRows": 2, - "trailGridCols": 2, + "trailGridCols": 12, "collision": false, "collisionColliderIds": [], "pathFollow": false, diff --git a/src/views/stage/objectInteractions.ts b/src/views/stage/objectInteractions.ts index e15c5f2..c5ef664 100644 --- a/src/views/stage/objectInteractions.ts +++ b/src/views/stage/objectInteractions.ts @@ -39,7 +39,7 @@ export class ObjectInteractions { const sys = this.ctx.store.systems.find((item) => item.id === this.ctx.store.activeId) if (sys?.visible === false) return false const cfg = sys?.config - if (!cfg?.forceField || cfg.forceRadius <= 0) return false + if (!cfg?.forceField || !cfg.showForceFieldShape || cfg.forceRadius <= 0) return false const startPointer = pointerToWorldMath(this.ctx, e.clientX, e.clientY) const distance = Math.hypot(startPointer.x - cfg.forceCenterX, startPointer.y - cfg.forceCenterY) if (distance > cfg.forceRadius) return false @@ -69,7 +69,7 @@ export class ObjectInteractions { const sys = this.ctx.store.systems.find((item) => item.id === this.ctx.store.activeId) if (sys?.visible === false) return false const cfg = sys?.config - if (!cfg?.attraction) return false + if (!cfg?.attraction || !cfg.showAttractionShape) return false const startPointer = pointerToWorldMath(this.ctx, e.clientX, e.clientY) const hitRadius = Math.max(cfg.attractionRadius, 12 / Math.max(0.0001, this.ctx.store.editor.viewScale)) const distance = Math.hypot(startPointer.x - cfg.attractionCenterX, startPointer.y - cfg.attractionCenterY)