From 9837a07ac2fb283c61ce6c6ae43fd226db83c73e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B7=E4=B8=AA=E5=90=8D=E5=AD=97=E5=A5=BD=E9=9A=BE?=
 =?UTF-8?q?=E7=9A=84=E5=96=B5?=
 <25520958+MisakaAldrich@users.noreply.github.com>
Date: Tue, 20 Jan 2026 20:23:07 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20AutoWoodcutting=E7=87=83=E7=88=86?=
 =?UTF-8?q?=E6=9C=A8-=E7=99=BD=E6=A0=97=E6=A0=8E=E6=9C=A8=E6=B7=B7?=
 =?UTF-8?q?=E5=90=88=E4=BC=90=E6=9C=A8=E7=BA=BF=E6=80=A7=E8=A7=84=E5=88=92?=
 =?UTF-8?q?=20(#2750)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 repo/js/AutoWoodcutting-Pathing/main.js       | 55 ++++++++++++++++++-
 repo/js/AutoWoodcutting-Pathing/manifest.json |  2 +-
 2 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/repo/js/AutoWoodcutting-Pathing/main.js b/repo/js/AutoWoodcutting-Pathing/main.js
index fdc7667b0..8f89a9b66 100644
--- a/repo/js/AutoWoodcutting-Pathing/main.js
+++ b/repo/js/AutoWoodcutting-Pathing/main.js
@@ -36,6 +36,49 @@
         }
     }
 
+    /**
+     * 求解 燃爆木-白栗栎木 路线次数.
+     * @param {number} targetB - 目标燃爆木数量
+     * @param {number} targetO - 目标白栗栎木数量
+     * @returns {object} 最优规划方案
+     */
+    function lpsolve3(targetB, targetO) {
+        let minTotalRuns = Infinity;
+        let bestScheme = { x1: 0, x2: 0, x3: 0, total: 0 };
+
+        // x2 是桥梁，遍历 x2 的可能次数
+        // 最大遍历范围可以设为两个目标中较大的一个除以 x2 对应的产量
+        const maxX2 = Math.max(Math.ceil(targetB / 27), Math.ceil(targetO / 33));
+
+        for (let x2 = 0; x2 <= maxX2; x2++) {
+            // 计算 x2 产出后的剩余需求
+            const remainingB = Math.max(0, targetB - x2 * 27);
+            const remainingO = Math.max(0, targetO - x2 * 33);
+
+            // x1 补齐剩下的燃爆木 (每单位产出 54)
+            const x1 = Math.ceil(remainingB / 54);
+
+            // x3 补齐剩下的白栗栎木 (每单位产出 36)
+            const x3 = Math.ceil(remainingO / 36);
+
+            const currentTotal = x1 + x2 + x3;
+
+            // 如果当前方案总次数更少，则更新最优解
+            if (currentTotal < minTotalRuns) {
+                minTotalRuns = currentTotal;
+                bestScheme = {
+                    x1: x1,
+                    x2: x2,
+                    x3: x3,
+                    total: currentTotal,
+                    actualB: x1 * 54 + x2 * 27,
+                    actualO: x2 * 33 + x3 * 36
+                };
+            }
+        }
+        return bestScheme;
+    }
+
     function logRemainingItems() {
         let target = woodCountToStr(woodNumberMap);
         if (target === '') {
@@ -146,6 +189,7 @@
             }
         }
 
+        // 椴木需要悬铃木凑数量，用||
         if (woodNumberMap.get('悬铃木') > 0 || woodNumberMap.get('椴木') > 0) {
             await runPathingNTimes('悬铃木-椴木-大循环', '', 1);
             let [x1, x2] = lpsolve2(woodNumberMap.get('悬铃木'), woodNumberMap.get('椴木'));
@@ -153,6 +197,13 @@
             await runPathingNTimes('椴木', '椴木', x2);
         }
 
+        if (woodNumberMap.get('燃爆木') > 0 && woodNumberMap.get('白栗栎木') > 0) {
+            let result = lpsolve3(woodNumberMap.get('燃爆木'), woodNumberMap.get('白栗栎木'));
+            await runPathingNTimes('燃爆木', '燃爆木', result.x1);
+            await runPathingNTimes('燃爆木-白栗栎木', '', result.x2);
+            await runPathingNTimes('白栗栎木', '白栗栎木', result.x3);
+        }
+
         for (let wood of singleWoodType) {
             await runPathingNTimes(wood, wood);
         }
@@ -204,6 +255,7 @@
         }
     }
 
+    // 从路径名称中获取单次伐木数量
     function filenameToWoodCountMap(str, woodCount = new Map()) {
         let strArray = str.split("-").filter(str => str.trim() !== "");
         for (let i = 0; i < strArray.length - 1; i++) {
@@ -423,7 +475,8 @@
         '香柏木-萃华木': { fileName: ['枫丹-枫丹廷-香柏木-9个(大循环)', '枫丹-枫丹廷-香柏木-27个-萃华木-15个(循环)'], folderName: '枫丹-香柏木-萃华木' },
         '炬木': { fileName: ['枫丹-很明亮的地方-炬木-36个'] },
         // '炬木': { fileName: ['枫丹-很明亮的地方-炬木-36个(大循环)', '枫丹-很明亮的地方-炬木-36个(循环)'], folderName: '枫丹-炬木' },
-        '白栗栎木': { fileName: ['纳塔-踞石山-白栗栎木-36个', '纳塔-回声之子-白栗栎木-33个-燃爆木-27个'], folderName: '纳塔-白栗栎木-燃爆木' },
+        '燃爆木-白栗栎木': { fileName: ['纳塔-回声之子-白栗栎木-33个-燃爆木-27个'], folderName: '纳塔-白栗栎木-燃爆木' },
+        '白栗栎木': { fileName: ['纳塔-踞石山-白栗栎木-36个'], folderName: '纳塔-白栗栎木-燃爆木' },
         '灰灰楼林木': { fileName: ['纳塔-奥奇卡纳塔-灰灰楼林木-42个'] },
         '燃爆木': { fileName: ['纳塔-隆崛坡-燃爆木-54个'] },
         // '桃椰子木': { fileName: ['纳塔-浮土静界-桃椰子木-0个(大循环)', '纳塔-浮土静界-桃椰子木-36个(循环)'], folderName: '纳塔-桃椰子木' },
diff --git a/repo/js/AutoWoodcutting-Pathing/manifest.json b/repo/js/AutoWoodcutting-Pathing/manifest.json
index 371502d98..bad3fcb11 100644
--- a/repo/js/AutoWoodcutting-Pathing/manifest.json
+++ b/repo/js/AutoWoodcutting-Pathing/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 1,
   "name": "自动伐木-地图追踪版",
-  "version": "3.0.6",
+  "version": "3.0.7",
   "description": "基于地图追踪的自动伐木，已支持6.0版本及之前的全部木材\n默认砍伐全部支持木材至2000上限\n自定义设置:\n-可更改砍伐木材种类和数量\n-可以单独设置每个木材数量\n-可设置队伍中是否包含一斗，按保底20%，计算砍伐数量时会除以1.2",
   "bgi_version": "0.53.0",
   "tags": [