diff --git a/assets/resources/game/skill/atk/atk_f2.prefab b/assets/resources/game/skill/atk/atk_f2.prefab index 0c80d4cd..3e0a3e49 100644 --- a/assets/resources/game/skill/atk/atk_f2.prefab +++ b/assets/resources/game/skill/atk/atk_f2.prefab @@ -111,8 +111,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1.8, - "y": -1.6, + "x": 2, + "y": -1, "z": 1 }, "_mobility": 0, @@ -460,6 +460,7 @@ }, "atk_x": 0, "atk_y": 0, + "debugMode": true, "_id": "" }, { diff --git a/assets/script/game/hero/MoveComp.ts b/assets/script/game/hero/MoveComp.ts index deeb1736..29333053 100644 --- a/assets/script/game/hero/MoveComp.ts +++ b/assets/script/game/hero/MoveComp.ts @@ -289,10 +289,13 @@ export class MoveSystem extends ecs.ComblockSystem implements ecs.ISystemUpdate } private hasAnyActorTooClose(self: ecs.Entity, x: number, y: number): boolean { + const myAttrs = self.get(HeroAttrsComp); + if (!myAttrs) return false; return ecs.query(ecs.allOf(HeroAttrsComp, HeroViewComp)).some(e => { if (e === self) return false; const attrs = e.get(HeroAttrsComp); if (!attrs || attrs.is_dead) return false; + if (attrs.fac !== myAttrs.fac) return false; const view = e.get(HeroViewComp); if (!view || !view.node) return false; return Math.abs(view.node.position.x - x) < this.minSpacingX