From c0000a496102874459245ef81c57d3d7cdd64fac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E4=B8=89?= <940119273@qq.com> Date: Fri, 23 Aug 2024 10:25:38 +0000 Subject: [PATCH] =?UTF-8?q?!3015=20=E5=8F=98=E6=9B=B4:=E6=9C=A8=E9=94=80?= =?UTF-8?q?=E4=BF=9D=E6=8C=81=E5=8E=9F=E6=9D=A5=E7=9A=84=E7=A2=B0=E6=92=9E?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Add-on/DrawDrilling/DrawDrillingTool.ts | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/Add-on/DrawDrilling/DrawDrillingTool.ts b/src/Add-on/DrawDrilling/DrawDrillingTool.ts index f929736b6..c8318f21f 100644 --- a/src/Add-on/DrawDrilling/DrawDrillingTool.ts +++ b/src/Add-on/DrawDrilling/DrawDrillingTool.ts @@ -1330,8 +1330,7 @@ export class DrawDrillingTool extends Singleton if (this.IsTk(ds) && !this._AutoDeviation) continue; let bs1 = this.GetDrillsBox(ds, faceOcsInv); - let checkWoodPinss: ObjectId[]; - if (woodPinss.length) + if (this._AutoDeviation && woodPinss.length) { for (let wood of woodPinss) { @@ -1370,8 +1369,15 @@ export class DrawDrillingTool extends Singleton //是否仍存在碰撞 isCollsion = bs1.some(b => bs2.some(b2 => this.DrillIsCollsion(b, b2))); - if (checkWoodPinss?.length) - this.MoveDrillEnts(checkWoodPinss, offsetDist); + if (woodPinss.length === 0) continue; + if (i === 0) + { + this.MoveDrillEnts(woodPinss[0], offsetDist); + } + else if (i === drills.length - 1 && woodPinss.length === 2) + { + this.MoveDrillEnts(woodPinss[1], offsetDist); + } } } }