!3015 变更:木销保持原来的碰撞检测方式

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<CADObject>[];
-            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);
+                        }
                     }
                 }
             }