JS脚本更新：彻底优化了全队大招回能，周本一条龙精简了代码，从9600行到1400行 (#1401)

* Update manifest.json

* Update utils.js

* Update manifest.json

* Update main.js

repo/js/WeeklyBoss/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 1,
   "name": "周本一条龙",
-  "version": "3.0",
+  "version": "3.1",
   "description": "https://www.bilibili.com/video/BV1F2uvz3E4K/?vd_source=9dfaf88af48ecc0ff95a41f1145af7a2",
   "authors": [
     {
@@ -11,4 +11,4 @@
   ],
   "settings_ui": "settings.json",
   "main": "main.js"
-}
+}

repo/js/全队自动回满大招能量/main.js

@@ -25,139 +25,150 @@ async function tpEndDetection() {
     throw new Error('传送时间超时');
 }
 
-//一直行动，直到检测到指定文字await restoredEnergyAutoNavigateToReward();
+/**
-const restoredEnergyAutoNavigateToReward = async () => {
+ * 自动导航直到检测到指定文字
-        const rewardTextRo = RecognitionObject.Ocr(1210, 515, 200, 50);//领奖区域检测
+ * @param {Object} options 配置选项
-        let advanceNum = 0;
+ * @param {number} [options.x=1210] 检测区域左上角x坐标
-            while (true) {
+ * @param {number} [options.y=515] 检测区域左上角y坐标
-        // 1. 优先检查是否已到达领奖点
+ * @param {number} [options.width=200] 检测区域宽度
-        let captureRegion = captureGameRegion();
+ * @param {number} [options.height=50] 检测区域高度
-        let rewardTextArea = captureRegion.DeriveCrop(1210, 515, 200, 50);
+ * @param {string|RegExp} [options.targetText="奖励"] 要检测的目标文字
-        let rewardResult = rewardTextArea.find(RecognitionObject.ocrThis);
+ * @param {number} [options.maxSteps=100] 最大检查次数
-        // 检测到特点文字则结束！！！
+ * @param {number} [options.stepDuration=200] 每步前进持续时间(ms)
-        if (rewardResult.text) {
+ * @param {number} [options.waitTime=10] 单次等待时间(ms)
-            log.info("已到达指定位置，检测到文字: " + rewardResult.text);
+ * @param {string} [options.moveKey="w"] 前进按键
-            await sleep(100);
+ * @param {boolean} [options.ifClick=false] 是否点击
-            return;
+ * @returns {Promise<void>}
+ * await repeatOperationUntilTextFound();  默认F区域检测到任何文字即停止前进
+ * await repeatOperationUntilTextFound({targetText: "日落果"});  F区域检测到指定文字即停止前进
+ *await repeatOperationUntilTextFound({x: 10,y: 10,width: 100,height: 100,targetText: "奖励",stepDuration: 0,waitTime: 100,ifClick: true});//用来等待点击文字,10s等待
+ */
+const repeatOperationUntilTextFound = async ({
+    //默认区域为单个F图标右边的文字，最多6个
+    x = 1210,
+    y = 515,
+    width = 200,
+    height = 50,
+    targetText = null,
+    maxSteps = 100,
+    stepDuration = 200,
+    waitTime = 10,
+    moveKey = "w",
+    ifClick = false,
+} = {}) => {
+    /**
+     * 转义正则表达式中的特殊字符
+     * @param {string} string 要转义的字符串
+     * @returns {string} 转义后的字符串
+     */
+    const escapeRegExp = (string) => {
+        return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    };
+
+    // 预编译正则表达式（如果是字符串则转换并转义）
+    const textPattern = typeof targetText === 'string' 
+        ? new RegExp(escapeRegExp(targetText)) 
+        : targetText;
+    
+    let stepsTaken = 0;
+    
+    while (stepsTaken <= maxSteps) {
+        // 1. 捕获游戏区域并裁剪出检测区域
+        const captureRegion = captureGameRegion();
+        const textArea = captureRegion.DeriveCrop(x, y, width, height);
+        
+        // 2. 执行OCR识别
+        const ocrResult = textArea.find(RecognitionObject.ocrThis);
+        
+        const hasAnyText = ocrResult.text.trim().length > 0;
+        const matchesTarget = targetText === null 
+            ? hasAnyText 
+            : textPattern.test(ocrResult.text);
+
+        if (matchesTarget) {
+            log.info(`检测到${targetText === null ? '文字' : '目标文字'}: ${ocrResult.text}`);
+            await sleep(1000);
+            if (ifClick) click(Math.round(x + width / 2), Math.round(y + height / 2));
+            return true;
         }
-        else if(advanceNum > 60){
+        
-        throw new Error('前进时间超时');
+        // 4. 检查步数限制
+        if (stepsTaken >= maxSteps) {
+            throw new Error(`检查次数超过最大限制: ${maxSteps}，未查询到文字"${targetText}"`);
         }
-                // 前进一小步
+        
-        keyDown("w");
+        // 5. 前进一小步
-        await sleep(200);
+        if (stepDuration != 0) {
-        keyUp("w");
+        keyDown(moveKey);
-        advanceNum++;
+        await sleep(stepDuration);
+        keyUp(moveKey);
+        }
+        await sleep(waitTime);
+        stepsTaken++;
     }
 }
 
 //执行战斗并检测结束																		
 async function restoredEnergyAutoFightAndEndDetection() {
-    // 定义两个检测区域
+await genshin.tp(178.55,384.4);
-
+await repeatOperationUntilTextFound();//
-    const region2 = RecognitionObject.ocr(840, 935, 230, 40);//区域二 成功倒计时
+keyPress("F"); 
-    const region3 = RecognitionObject.ocr(1690, 230, 75, 350);//区域三 队伍名称
+await repeatOperationUntilTextFound({x: 1650,y: 1000,width: 160,height: 45,targetText: "单人挑战",stepDuration: 0,waitTime: 100,ifClick: true});//等待点击单人挑战
-    let challengeTime = 0;
+await sleep(200);
-
+click(1180, 760);//队伍等级偏低、体力不够可能会出弹窗
+await repeatOperationUntilTextFound({x: 1650,y: 1000,width: 160,height: 45,targetText: "开始挑战",stepDuration: 0,waitTime: 100,ifClick: true});//等待点击开始挑战
+await sleep(2000);
+await tpEndDetection();
+keyDown("w");
+await sleep(200);
+keyDown("SHIFT");
+await sleep(300);
+keyUp("SHIFT");
+await sleep(500);
+keyDown("SHIFT");
+await sleep(300);
+keyUp("SHIFT");
+await sleep(1000);
+keyDown("SHIFT");
+await sleep(300);
+keyUp("SHIFT");
+await sleep(500);
+keyUp("w");
+let challengeTime = 0;
     //2分钟兜底
     while (challengeTime < 5000) {
-        // 捕获游戏区域
+            for (let i = 1;i < 5; i++) {
-        let capture = captureGameRegion();
+            keyPress(i.toString()); 
-        // 检测两个区域的OCR结果
+            await sleep(300);
-
-        let res2 = capture.find(region2);
-        let res3 = capture.find(region3);
-        let hasText2 = !res2.isEmpty() && res2.text.trim().length > 0;
-        let hasText3 = !res3.isEmpty() && res3.text.trim().length > 0;
-        // 情况1: 区域2无文字 且 区域3有文字 → 执行AutoFight
-        if (!hasText2 && hasText3) {
-            keyPress("1"); 
-            await sleep(500);
             leftButtonClick();
             await sleep(400);
             keyDown("e"); 
             await sleep(400);
             keyUp("e"); 
-            await sleep(600);
-            keyPress("2"); 
             await sleep(500);
             leftButtonClick();
-            await sleep(400);
+            await sleep(100);
-            keyDown("e"); 
+            let res = captureGameRegion().find(RecognitionObject.ocr(840, 935, 230, 40));
-            await sleep(400);
+            if (res.text.includes("自动退出")) {
-            keyUp("e"); 
+                     log.info("检测到挑战成功");           
-            await sleep(600);
-            keyPress("3"); 
-            await sleep(500);
-            leftButtonClick();
-            await sleep(400);
-            keyDown("e"); 
-            await sleep(400);
-            keyUp("e"); 
-            await sleep(600);
-            keyPress("4"); 
-            await sleep(500);
-            leftButtonClick();
-            await sleep(400);
-            keyDown("e"); 
-            await sleep(400);
-            keyUp("e"); 
-            await sleep(600);
-            challengeTime = challengeTime + 200;
-        } 
-        // 情况2: 区域2有文字且 区域3有文字 → 结束循环
-        else if (hasText2 && hasText3) {
-                 await sleep(800);
-                 //二次检验
-                 capture = captureGameRegion();
-                 res2 = capture.find(region2);
-                 res3 = capture.find(region3);
-                 hasText2 = !res2.isEmpty() && res2.text.trim().length > 0;
-                 hasText3 = !res3.isEmpty() && res3.text.trim().length > 0;
-                 if (hasText2 && hasText3) {
-                     log.info("检测到挑战成功");
-                     log.info("能量充满，任务结束");
                      return;
-                     }
+                }
-        }
+            }
-        challengeTime = challengeTime + 1;
+        challengeTime = challengeTime + 200;
-        // 每次检测间隔100毫秒，避免CPU占用过高
         await sleep(100);
-    }
+        } 
 log.info("挑战超时，可能充能失败");
 }
 
-
 async function restoredEnergy() {
-let teamName = settings.teamName ?? 0;
 await genshin.returnMainUi();
-//切换队伍
+ if(settings.teamName) await genshin.switchParty(settings.teamName);
-if(teamName) await genshin.switchParty(teamName);
 await genshin.tp(2297.6201171875,-824.5869140625);//传送到神像，避免有倒下的角色
-//传送到蒙德武器副本
-await genshin.tp(-238,2256);
-await sleep(1000);
-await restoredEnergyAutoNavigateToReward();
-await sleep(1000);
-keyPress("F"); 
-await sleep(5000);
-click( 380,300 );//选择难度最低的关卡
-await sleep(1000);
-click( 1700,1000 );//单人挑战
-await sleep(200);
-click( 1100,750 );//避免没有体力掐死
-await sleep(1200);
-click( 1700,1000 );//开始挑战
-await tpEndDetection();
-await restoredEnergyAutoNavigateToReward();
-await sleep(200);
-keyPress("F"); 
 await restoredEnergyAutoFightAndEndDetection();//一直战斗直到检测到结束
-await sleep(1000);
+await restoredEnergyAutoFightAndEndDetection();//一直战斗直到检测到结束
+ log.info("能量充满，任务结束");
 await genshin.tp(2297.6201171875,-824.5869140625);//传送到神像回血
-await sleep(1000);
 }
 
 await restoredEnergy();
-
 })();

repo/js/全队自动回满大招能量/manifest.json

@@ -1,8 +1,8 @@
 {
   "manifest_version": 1,
   "name": "大招能量一键拉满",
-  "version": "1.3",
+  "version": "1.5",
-  "description": "需要开启蒙德武器副本，可选择指定队伍",
+  "description": "需要开启璃月远古副本，可选择指定队伍",
   "authors": [
     {
       "name": "柒叶子",
@@ -11,4 +11,4 @@
   ],
   "settings_ui": "settings.json",
   "main": "main.js"
-}
+}