From ae2ff070fdcb9b764b07558c4dbf6f938f28d291 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: Sun, 27 Apr 2025 11:28:29 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=BC=BA=E5=88=B6=E6=8B=BE=E5=8F=96=20(#?=
 =?UTF-8?q?653)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 repo/js/AutoArtifacts_A_B_Extra/main.js              |  3 +++
 repo/js/AutoArtifacts_A_B_Extra/manifest.json        |  2 +-
 .../main.js                                          | 12 +++++++-----
 .../manifest.json                                    |  1 +
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/repo/js/AutoArtifacts_A_B_Extra/main.js b/repo/js/AutoArtifacts_A_B_Extra/main.js
index 676975b3..8be4be78 100644
--- a/repo/js/AutoArtifacts_A_B_Extra/main.js
+++ b/repo/js/AutoArtifacts_A_B_Extra/main.js
@@ -220,6 +220,9 @@
             log.info(filePath);
             await pathingScript.runFile(filePath);
 
+            // 配置强制拾取为关闭状态
+            dispatcher.addTimer(new RealtimeTimer("AutoPick", { "forceInteraction": false }));
+
             // 地图缩放按键同某些地图标识重叠，导致识别失败(bgi[v0.43.0]后引入)
             // // 完成路径后，放大地图，脚本中调用就近传送。仍可能被缩小回去。不可行
             // let shouldResizeMap_after = filePath.search("~m") != -1;
diff --git a/repo/js/AutoArtifacts_A_B_Extra/manifest.json b/repo/js/AutoArtifacts_A_B_Extra/manifest.json
index 14ebda3c..95ce065f 100644
--- a/repo/js/AutoArtifacts_A_B_Extra/manifest.json
+++ b/repo/js/AutoArtifacts_A_B_Extra/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 1,
   "name": "狗粮ABE路线，自动拾取分解",
-  "version": "2.5.2",
+  "version": "2.5.3",
   "bgi_version": "0.42.0",
   "description": "圣遗物狗粮AB及额外路线，自动轮换，自动分解，就近恢复。",
   "authors": [
diff --git a/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/main.js b/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/main.js
index ac97438d..1ca029c2 100644
--- a/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/main.js
+++ b/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/main.js
@@ -82,10 +82,7 @@
 				await sleep(delayTime);
 				notification.send(`已抵达突发任务（张牙舞爪的恶党）触发位置`);
 			}
-			// 开启急速拾取
-			dispatcher.addTimer(new RealtimeTimer("AutoPick", {
-				"forceInteraction": true
-			}));
+
 			await genshin.relogin();
 
 			// OCR识别是否触发任务
@@ -95,7 +92,7 @@
 				let resList = captureRegion.findMulti(RecognitionObject.ocr(0, 200, 300, 300));
 				for (let o = 0; o < resList.count; o++) {
 					let res = resList[o];
-					if (res.text.includes("打倒") || res.text.includes("所有") || res.text.includes("鳄") || res.text.includes("鱼") || res.text.includes("张牙") || res.text.includes("舞爪") || res.text.includes("的") || res.text.includes("恶党")) {
+					if (res.text.includes("张牙") || res.text.includes("舞爪") || res.text.includes("恶党") || res.text.includes("打倒") || res.text.includes("所有") || res.text.includes("鳄鱼")) {
 						ocrStatus = true;
 						break;
 					}
@@ -104,6 +101,10 @@
 
 			if (ocrStatus) {
 				log.info(`当前次数：${i + 1}/${runTimes}`);
+				// 开启急速拾取
+				dispatcher.addTimer(new RealtimeTimer("AutoPick", {
+					"forceInteraction": true
+				}));
 				await AutoPath(`好感-张牙舞爪的恶党-循环${GetMeatMode ? '(二净甸刷肉版)' : '(二净甸)'}`);
 				// 关闭急速拾取
 				dispatcher.addTimer(new RealtimeTimer("AutoPick", {
@@ -117,6 +118,7 @@
 					log.warn(`判定本轮循环执行失败，退回本轮执行次数：${i + 1}/${runTimes}`);
 				}
 			} else {
+				notification.send(`未识别到突发任务（张牙舞爪的恶党），兽肉好感结束`);
 				break;
 			}
 			const estimatedCompletion = calculateEstimatedCompletion(startTime, i + 1, runTimes);
diff --git a/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/manifest.json b/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/manifest.json
index 77bfcb61..f41fa9ca 100644
--- a/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/manifest.json
+++ b/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/manifest.json
@@ -2,6 +2,7 @@
   "manifest_version": 1,
   "name": "兽肉好感：自动好感度&刷两只鳄鱼兽肉&卡时间",
   "version": "1.3.4",
+  "bgi_version": "0.44.6",
   "description": "通过突发事件:张牙舞爪的恶党刷兽肉，并顺带获取好感度（好感度超过10次后不再获取），请使用满员好感度队伍，并为全体队伍角色配置相应的战斗策略",
   "authors": [
     {