From a8f81230f2543e6207a69ac6a58ef927018026df Mon Sep 17 00:00:00 2001
From: DarkFlameMaster <1004452714@qq.com>
Date: Thu, 23 Oct 2025 17:57:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=AF=B9=E8=AF=9Dicon?=
 =?UTF-8?q?=E7=9A=84=E8=AF=86=E5=88=AB=E5=8C=BA=E5=9F=9F=EF=BC=8C=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=E5=86=97=E4=BD=99=E5=8F=82=E6=95=B0=20(#2216)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/AutoCommission/lib/dialog-processor.js | 25 ++++++-------------
 repo/js/AutoCommission/lib/steps/dialog.js    |  2 --
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/repo/js/AutoCommission/lib/dialog-processor.js b/repo/js/AutoCommission/lib/dialog-processor.js
index af4827af2..27bfa0d98 100644
--- a/repo/js/AutoCommission/lib/dialog-processor.js
+++ b/repo/js/AutoCommission/lib/dialog-processor.js
@@ -2,27 +2,21 @@
 var DialogProcessor = {
   // 执行优化的自动对话
   executeOptimizedAutoTalk: async function (
-    extractedName,
-    skipCount,
     customPriorityOptions,
     customNpcWhiteList,
     isInMainUI
   ) {
-    extractedName = extractedName || null;
-    skipCount = skipCount || 5;
     customPriorityOptions = customPriorityOptions || null;
     customNpcWhiteList = customNpcWhiteList || null;
-
-    // 使用传入的参数，不再加载默认配置
     var effectivePriorityOptions = customPriorityOptions || [];
     var effectiveNpcWhiteList = customNpcWhiteList || [];
 
     // 初始化
     keyPress("V");
 
-    // 初始触发剧情 - 识别人名并点击
+    // 从委托描述中提取任务相关的人名存为列表
     extractedName = [];
-    // 人名区域OCR识别
+    // 委托描述的OCR识别区域
     var nameRegion = {X: 75, Y: 240, WIDTH: 225, HEIGHT: 60};
     var nameResults = await Utils.easyOCR(nameRegion);
     // 尝试提取任务人名
@@ -39,8 +33,10 @@ var DialogProcessor = {
       }
     }
 
-    // 对话选项区域OCR识别
-    var dialogRegion = {X: 1150, Y: 300, WIDTH: 350, HEIGHT: 400};
+    // 交互选项区域OCR识别
+    var dialogRegion = { X: 1150, Y: 300, WIDTH: 350, HEIGHT: 400 };
+    // 对话选项的ICON识别区域
+    var talkIconRegion = { X: 1260, Y: 300, WIDTH: 90, HEIGHT: 550 };
     nameResults = await Utils.easyOCR(dialogRegion);
     var clickedWhitelistNPC = false;
     var clickedExtractedName = false;
@@ -122,9 +118,6 @@ var DialogProcessor = {
     while (!isInMainUI() && attempts < maxAttempts) {
       attempts++;
 
-      // 正常跳过对话
-      //await genshin.chooseTalkOption("纳西妲美貌举世无双", skipCount, false); 不好用
-
       var startTime = new Date().getTime();
 
       // 1秒内按空格键跳过
@@ -138,8 +131,6 @@ var DialogProcessor = {
         break;
       }
 
-      //keyPress("VK_ESCAPE");//关弹窗
-
       // 检查是否有匹配的优先选项
       var foundPriorityOption = false;
 
@@ -179,12 +170,12 @@ var DialogProcessor = {
         if (!foundPriorityOption && !isInMainUI()) {
           let exitList = await Utils.easyTemplateMatch(
             Constants.TALK_EXIT_IMAGE_PATH,
-            dialogRegion,
+            talkIconRegion,
             true
           );
           let iconList = await Utils.easyTemplateMatch(
             Constants.TALK_ICON_IMAGE_PATH,
-            dialogRegion
+            talkIconRegion
           );
           let clickXY = null;
           //正常应该只识别到一个退出选项
diff --git a/repo/js/AutoCommission/lib/steps/dialog.js b/repo/js/AutoCommission/lib/steps/dialog.js
index 8135875cf..5f8739083 100644
--- a/repo/js/AutoCommission/lib/steps/dialog.js
+++ b/repo/js/AutoCommission/lib/steps/dialog.js
@@ -30,8 +30,6 @@
       
       // 执行优化的自动对话
       await DialogProcessor.executeOptimizedAutoTalk(
-        null,
-        skipCount, 
         priorityOptions,
         npcWhiteList,
         context.isInMainUI