From 6f5f4ad7ac19ba02b978b7ae3ed221327678da80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BD=A9=E8=99=B9QQ=E4=BA=BA?=
 <90805948+KRdingsan@users.noreply.github.com>
Date: Sat, 25 Oct 2025 11:52:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=81=B6=E5=8F=91=E6=80=A7?=
 =?UTF-8?q?=E2=80=9C=E7=99=BB=E9=99=86=E5=85=B6=E4=BB=96=E8=B4=A6=E5=8F=B7?=
 =?UTF-8?q?=E2=80=9D=E8=AF=86=E5=88=AB=E4=B8=8D=E5=88=B0=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20(#2239)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update README.md

* Update main.js

解决循环无法跳出

* Update README.md

增加更新记录

* Update README.md

* Update manifest.json

* 解决偶发性识别不到“登陆其他账号”的问题

* Add files via upload

---------

Co-authored-by: 起个名字好难 <25520958+MisakaAldrich@users.noreply.github.com>
---
 .../assets/login_other_account_1.png          | Bin 0 -> 3876 bytes
 repo/js/切换账号(OCR)版本/main.js             |  49 +++++++++++++-----
 2 files changed, 37 insertions(+), 12 deletions(-)
 create mode 100644 repo/js/切换账号(OCR)版本/assets/login_other_account_1.png

diff --git a/repo/js/切换账号(OCR)版本/assets/login_other_account_1.png b/repo/js/切换账号(OCR)版本/assets/login_other_account_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..299b3138939b08add3dfc0c6c5cb2d0a8008102e
GIT binary patch
literal 3876
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

literal 0
HcmV?d00001

diff --git a/repo/js/切换账号(OCR)版本/main.js b/repo/js/切换账号(OCR)版本/main.js
index 99804ee9e..515e30b8b 100644
--- a/repo/js/切换账号(OCR)版本/main.js
+++ b/repo/js/切换账号(OCR)版本/main.js
@@ -18,7 +18,7 @@ const out_account = {
     name: "out_account.png"
 };
 const login_other_account = {
-    template:RecognitionObject.TemplateMatch(file.ReadImageMatSync("assets/login_other_account.png")),
+    template:RecognitionObject.TemplateMatch(file.ReadImageMatSync("assets/login_other_account_1.png")),
     name: "login_other_account.png"
 };
 const input_phone_or_email = {
@@ -53,6 +53,7 @@ async function matchImgAndClick(obj, desc, timeout = 8000) {
     let status = false; // 用于记录是否匹配成功
     try {
         while (Date.now() - start < timeout && !status) {
+            await sleep(300);
             let result = captureGameRegion().Find(obj.template);
             await sleep(500); // 短暂延迟，避免过快循环
             if (result.isExist()) {
@@ -61,7 +62,7 @@ async function matchImgAndClick(obj, desc, timeout = 8000) {
                 status = true; // 设置匹配成功状态
                 return {success: true, x: clickResult.x, y: clickResult.y};
             }
-            await sleep(200); // 短暂延迟，避免过快循环
+            // await sleep(200); // 短暂延迟，避免过快循环
             log.info(`【IMG】第${retryCount++}次识别并点击 ${desc} 失败 | 耗时: ${Date.now() - start}ms`);
         }
     } catch (error) {
@@ -107,10 +108,21 @@ async function recognizeTextAndClick(targetText, ocrRegion, timeout = 8000) {
 
     setGameMetrics(1920, 1080, 1);
     // 如果切换账号是第一个脚本，则有可能出现月卡选项
-    await genshin.blessingOfTheWelkinMoon();
-    await sleep(1000);
-    await genshin.blessingOfTheWelkinMoon();
-    await sleep(1000);
+    //防止genshin.blessingOfTheWelkinMoon();方法失效，先使用物理点击。
+    try {
+        keyDown("VK_MENU");
+        await sleep(500);
+        for(let i = 0; i<=4; i++){
+            await click(genshin.width / 2.0, genshin.height * 0.8);
+            await sleep(1000);
+        }
+    }finally {
+        keyUp("VK_MENU");
+    }
+    //await genshin.blessingOfTheWelkinMoon();
+    //await sleep(1000);
+    //await genshin.blessingOfTheWelkinMoon();
+    //await sleep(1000);
     await genshin.returnMainUi();
 
     await keyPress("VK_ESCAPE");
@@ -151,20 +163,33 @@ async function recognizeTextAndClick(targetText, ocrRegion, timeout = 8000) {
          */
         await sleep(8000);
         await recognizeTextAndClick("点击进入", RecognitionObject.Ocr(862, 966, 206, 104), 960, 540, 5000);
-        await sleep(12000);
+        await sleep(15000);
 
         //可能登录账号的时候出现月卡提醒，则先点击一次月卡。
-        await genshin.blessingOfTheWelkinMoon();
-        await sleep(1000);
-        await genshin.blessingOfTheWelkinMoon();
+        //await genshin.blessingOfTheWelkinMoon();
+        //await sleep(1000);
+        //await genshin.blessingOfTheWelkinMoon();
+        //await sleep(1000);
+        //防止genshin.blessingOfTheWelkinMoon();方法失效，先使用物理点击。
+        await sleep(2000);
+        keyDown("VK_MENU");
+        await sleep(500);
+        for(let i = 0; i<=4; i++){
+            await click(genshin.width / 2.0, genshin.height * 0.8);
+            await sleep(1000);
+        }
+        //keyUp("VK_MENU");
+        await genshin.returnMainUi();
         await sleep(1000);
         // 如果配置了通知
-        notification.send("【UID：" + settings.UID + "】切换成功");
+        notification.send("账号【" + settings.UID + "】切换成功");
     }catch (error) {
         log.error(`${script_name}脚本执行过程中发生错误：${error.message}`);
         //如果发生错误，则发送通知
         notification.error(`${script_name}脚本执行过程中发生错误：${error.message}`);
         throw new Error(`${script_name}脚本执行过程中发生错误：${error.message}`);
+    }finally {
+                keyUp("VK_MENU");
     }
 
-})();
+})();
\ No newline at end of file