From a6753a2fe2e7b8f3e05b9a1b548a96e3ddb21839 Mon Sep 17 00:00:00 2001
From: Jamis <JamisHoo@users.noreply.github.com>
Date: Mon, 6 Oct 2025 00:17:02 +0800
Subject: [PATCH] =?UTF-8?q?JS=E8=84=9A=E6=9C=ACAbundantOre=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=E8=87=B30.15(#2083)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 repo/js/AbundantOre/README.md     |  4 ++++
 repo/js/AbundantOre/main.js       | 26 ++++++++++++++++++++++++--
 repo/js/AbundantOre/manifest.json |  2 +-
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/repo/js/AbundantOre/README.md b/repo/js/AbundantOre/README.md
index 27e33adc5..9a25bac6c 100644
--- a/repo/js/AbundantOre/README.md
+++ b/repo/js/AbundantOre/README.md
@@ -29,6 +29,10 @@
 
 ## ChangeLog
 
+### 0.15
+
+- 子任务结束时如果坐标未变化则不写入记录
+
 ### 0.14
 
 - 允许用户使用BetterGI默认的挖矿逻辑
diff --git a/repo/js/AbundantOre/main.js b/repo/js/AbundantOre/main.js
index 92f3a4fb0..0eb43f8ff 100644
--- a/repo/js/AbundantOre/main.js
+++ b/repo/js/AbundantOre/main.js
@@ -305,6 +305,8 @@ async function get_inventory() {
     return inventory_result;
 }
 
+var last_script_end_pos = [null, null];
+
 async function run_pathing_script(name, path_state_change, current_states) {
     path_state_change ||= {};
     path_state_change.require ||= [];
@@ -361,11 +363,31 @@ async function run_pathing_script(name, path_state_change, current_states) {
     const elapsed_time = Date.now() - t0;
     forge_pathing_end_log(name, elapsed_time);
     if (!cancellation_token.isCancellationRequested) {
-        if (elapsed_time > 5000) {
-            await mark_task_finished(name);
+        const curr_pos = (() => {
+            try {
+                const p = genshin.getPositionFromMap();
+                return [p.X, p.Y];
+            } catch (e) {}
+            return [null, null];
+        })();
+        var character_moved = false;
+        if (curr_pos[0] === null || last_script_end_pos[0] === null) {
+            character_moved = curr_pos !== last_script_end_pos;
+            log.debug("Character {action}", character_moved ? "moved" : "not moved");
         } else {
+            const dist = Math.sqrt(Math.pow(curr_pos[0] - last_script_end_pos[0], 2) + Math.pow(curr_pos[1] - last_script_end_pos[1], 2));
+            character_moved = dist > 5;
+            log.debug("Character moved distance of {dist}", dist);
+        }
+        last_script_end_pos = curr_pos;
+        if (elapsed_time <= 5000) {
             in_memory_skip_tasks.add(name);
             log.warn("脚本运行时间小于5秒，可能发生了错误，不写记录");
+        } else if (!character_moved) {
+            in_memory_skip_tasks.add(name);
+            log.warn("角色未移动，可能发生了错误，不写记录");
+        } else {
+            await mark_task_finished(name);
         }
     } else {
         throw new Error("Cancelled");
diff --git a/repo/js/AbundantOre/manifest.json b/repo/js/AbundantOre/manifest.json
index 1a0b4ab8a..6d336fff3 100644
--- a/repo/js/AbundantOre/manifest.json
+++ b/repo/js/AbundantOre/manifest.json
@@ -2,7 +2,7 @@
   "bgi_version": "0.50.0",
   "manifest_version": 1,
   "name": "矿产资源批发",
-  "version": "0.14",
+  "version": "0.15",
   "description": "自动记录矿石刷新时间，优先选择效率最高的路线，支持按区域、种类、数量自动规划挖矿路线",
   "authors": [
     {