From 9b49946d919139460bffb2e9f37f669a23eab49d Mon Sep 17 00:00:00 2001
From: kaedelcb <57870068+kaedelcb@users.noreply.github.com>
Date: Tue, 1 Jul 2025 08:59:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9E=AB=E4=B8=B9=E5=9C=B0=E8=84=89=E8=8A=B1?=
 =?UTF-8?q?=E7=83=AD=E6=9B=B4=E7=BA=BF=E8=B7=AF3=E6=88=98=E6=96=97?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20(#1252)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

枫丹地脉花热更线路3战斗修复
---
 .../枫丹地脉花-路线3 秋分山西侧锚点右-3：锚点右右右1.json |  9 -------
 repo/js/AutoFontaineLeyLine/main.js           | 26 ++++++++++---------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/repo/js/AutoFontaineLeyLine/assets/枫丹地脉花-路线3 秋分山西侧锚点右/枫丹地脉花-路线3 秋分山西侧锚点右-3：锚点右右右1.json b/repo/js/AutoFontaineLeyLine/assets/枫丹地脉花-路线3 秋分山西侧锚点右/枫丹地脉花-路线3 秋分山西侧锚点右-3：锚点右右右1.json
index 9cd07abc..78bb36ba 100644
--- a/repo/js/AutoFontaineLeyLine/assets/枫丹地脉花-路线3 秋分山西侧锚点右/枫丹地脉花-路线3 秋分山西侧锚点右-3：锚点右右右1.json	
+++ b/repo/js/AutoFontaineLeyLine/assets/枫丹地脉花-路线3 秋分山西侧锚点右/枫丹地脉花-路线3 秋分山西侧锚点右-3：锚点右右右1.json	
@@ -37,15 +37,6 @@
     },
     {
       "id": 4,
-      "x": 4034.130859375,
-      "y": 2625.865478515625,
-      "action": "fight",
-      "move_mode": "walk",
-      "action_params": "",
-      "type": "path"
-    },
-    {
-      "id": 5,
       "x": 3999.6552734375,
       "y": 2613.181640625,
       "move_mode": "walk",
diff --git a/repo/js/AutoFontaineLeyLine/main.js b/repo/js/AutoFontaineLeyLine/main.js
index 3f366e22..5e2ddb53 100644
--- a/repo/js/AutoFontaineLeyLine/main.js
+++ b/repo/js/AutoFontaineLeyLine/main.js
@@ -54,7 +54,7 @@
                 }
             }
             const NowTime = new Date();
-            if (Math.abs(NowTime - startTime)>chaotime*1000){if (x===0 & y===0){log.info(`${chaotime}秒超时退出，·${wenzi}·未找到`);}return result = {found: false };}else{ii=8;if(x !== 840){keyPress("w")}log.info(`·${wenzi}·识别中……`);}
+            if (Math.abs(NowTime - startTime)>chaotime*1000){if (x===0 & y===0){log.info(`${chaotime}秒超时退出，·${wenzi}·未找到`);}return result = {found: false };}else{ii=8;if(x !== 840 || x !== 1188){keyPress("w")}log.info(`·${wenzi}·识别中……`);}
             await sleep(100);
         }   
     }
@@ -763,12 +763,12 @@
     var retryCount = 0;
     var executedCount = 0;
     async function Veinfligt() {
-         // 定义路线常量
-         var selectedPath = pathingMap[`路线${position.line} ${['厄里那斯', '秋分山西侧锚点左下', '秋分山西侧锚点右', '柔灯港上锚点', '新枫丹科学院左锚点', '芒索斯山东麓'][position.line - 1]}`]
-         var selectedFolder = folderMap[`路线${position.line} ${['厄里那斯', '秋分山西侧锚点左下', '秋分山西侧锚点右', '柔灯港上锚点', '新枫丹科学院左锚点', '芒索斯山东麓'][position.line - 1]}`]
+        // 定义路线常量
+        var selectedPath = pathingMap[`路线${position.line} ${['厄里那斯', '秋分山西侧锚点左下', '秋分山西侧锚点右', '柔灯港上锚点', '新枫丹科学院左锚点', '芒索斯山东麓'][position.line - 1]}`]
+        var selectedFolder = folderMap[`路线${position.line} ${['厄里那斯', '秋分山西侧锚点左下', '秋分山西侧锚点右', '柔灯港上锚点', '新枫丹科学院左锚点', '芒索斯山东麓'][position.line - 1]}`]
 
-         executedCount = (position.flower-1)*2+0;         
-         Lastexecution = false;
+        executedCount = (position.flower-1)*2+0;         
+        Lastexecution = false;       
 
          log.info(`开始执行第 ${position.line} 线路的第 ${executedCount/2 + 1}/${selectedPath.length/2} 朵地脉花...`);
 
@@ -840,14 +840,17 @@
                             }else{await pathingScript.runFile(`${selectedFolder}${jsonFile1}`);}
                         
                     }
-            }
- 
+            }            
+            
             // 寻找地脉溢口，找到地脉花就领奖，没有找到就直接战斗，再尝试领奖
-            if (await VeinEntrance()){
+            if (await VeinEntrance()){                
                 await sleep(1000);
                 await dispatcher.addTimer(new RealtimeTimer("AutoPick", { forceInteraction: false})); await keyPress("F");
-                log.warn("开始战斗...");
-            
+                log.warn("开始战斗..."); 
+
+                checkRewardPage();// 执行自动战斗并同步检测领奖页面
+                shouldContinueChecking = true;
+
                 if (!Fightquick){           
                     await dispatcher.runTask(new SoloTask("AutoFight")); //固定执行两次战斗，执行自动战斗,配置器中的设置建议填你的队伍打一次大概得时间
                     await sleep(1000);
@@ -869,7 +872,6 @@
             }
 
             shouldContinueChecking = true;
-            checkRewardPage();// 执行自动战斗并同步检测领奖页面
             //执行到地脉花地点的寻路脚本
             log.info(`开始执行寻找地脉花奖励：${jsonFile2}`);
             await dispatcher.addTimer(new RealtimeTimer("AutoPick", { forceInteraction: false}));