diff --git a/repo/js/AutoPickLitter/README.md b/repo/js/AutoPickLitter/README.md index 7e006d5ed..0cc2ef36b 100644 --- a/repo/js/AutoPickLitter/README.md +++ b/repo/js/AutoPickLitter/README.md @@ -1,12 +1,13 @@ 还在因为抽到七七（bushi）而感到身体乏力嘛，快加入玄学玩家的步伐！！！ -主要功能有：蒙德购买圣水，璃月上香，稻妻抽签，枫丹领取福利餐，纳塔领取龙蛋； +主要功能有：蒙德购买圣水，璃月上香，稻妻抽签，稻妻海螺，枫丹领取福利餐，纳塔领取龙蛋； 使用前先检查你图开完没，没开的地方，就不要勾选相关选项！！！ 注意： 璃月上香:铜雀庙任务解锁方法，做完群玉阁重建活动后，现实第二天，到万民堂接取任务！！！ 稻妻抽签:解签的姐姐不在，表示你在做相关任务，请把任务做了在进行抽解签，注意第一次去解签会被派蒙捕获，暂时不做被捕获！！！ 以及，解签的时候出现“那个人，什么时候才会来···”！！！也是没有把这个隐藏任务做完 +稻妻海螺:请用户自己把附近相关调查点以及宝箱开了！！！然后第二天再勾选 @@ -15,6 +16,12 @@ 更新 +版本:1.1 +1、新增奇异的海螺 +2、修改圣水识别 +3、修改稻妻识别御神签 + + 版本:1.0.4 1、重构相关代码 2、替换解签后的识别模式 @@ -31,4 +38,5 @@ 1、优化相关功能的点击时间 2、优化背包滑动（感谢吉吉喵！！） 3、更新御神签的识别，以及修复挂签bug -4、输出福利餐得到的食物，以及幸运签的内容到本地，后续还会加入其他东西 \ No newline at end of file + +4、输出福利餐得到的食物，以及幸运签的内容到本地，后续还会加入其他东西 diff --git a/repo/js/AutoPickLitter/assets/Old/Bad.png b/repo/js/AutoPickLitter/assets/Old/Bad.png new file mode 100644 index 000000000..534782b7d Binary files /dev/null and b/repo/js/AutoPickLitter/assets/Old/Bad.png differ diff --git a/repo/js/AutoPickLitter/assets/Old/Bad1.png b/repo/js/AutoPickLitter/assets/Old/Bad1.png new file mode 100644 index 000000000..e3249729f Binary files /dev/null and b/repo/js/AutoPickLitter/assets/Old/Bad1.png differ diff --git a/repo/js/AutoPickLitter/assets/Old/BigBad.png b/repo/js/AutoPickLitter/assets/Old/BigBad.png new file mode 100644 index 000000000..150e1c35f Binary files /dev/null and b/repo/js/AutoPickLitter/assets/Old/BigBad.png differ diff --git a/repo/js/AutoPickLitter/assets/Old/BigBad1.png b/repo/js/AutoPickLitter/assets/Old/BigBad1.png new file mode 100644 index 000000000..9b9353675 Binary files /dev/null and b/repo/js/AutoPickLitter/assets/Old/BigBad1.png differ diff --git a/repo/js/AutoPickLitter/assets/Old/BigLuck.png b/repo/js/AutoPickLitter/assets/Old/BigLuck.png index 62ab31397..4e1c0792e 100644 Binary files a/repo/js/AutoPickLitter/assets/Old/BigLuck.png and b/repo/js/AutoPickLitter/assets/Old/BigLuck.png differ diff --git a/repo/js/AutoPickLitter/assets/Old/BigLuck1.png b/repo/js/AutoPickLitter/assets/Old/BigLuck1.png new file mode 100644 index 000000000..5a6f6d1bb Binary files /dev/null and b/repo/js/AutoPickLitter/assets/Old/BigLuck1.png differ diff --git a/repo/js/AutoPickLitter/assets/Old/EndLuck.png b/repo/js/AutoPickLitter/assets/Old/EndLuck.png new file mode 100644 index 000000000..c6ab90fc7 Binary files /dev/null and b/repo/js/AutoPickLitter/assets/Old/EndLuck.png differ diff --git a/repo/js/AutoPickLitter/assets/Old/EndLuck1.png b/repo/js/AutoPickLitter/assets/Old/EndLuck1.png new file mode 100644 index 000000000..637303a44 Binary files /dev/null and b/repo/js/AutoPickLitter/assets/Old/EndLuck1.png differ diff --git a/repo/js/AutoPickLitter/assets/Old/Luck.png b/repo/js/AutoPickLitter/assets/Old/Luck.png new file mode 100644 index 000000000..33fa4945c Binary files /dev/null and b/repo/js/AutoPickLitter/assets/Old/Luck.png differ diff --git a/repo/js/AutoPickLitter/assets/Old/Luck1.png b/repo/js/AutoPickLitter/assets/Old/Luck1.png new file mode 100644 index 000000000..123cd2022 Binary files /dev/null and b/repo/js/AutoPickLitter/assets/Old/Luck1.png differ diff --git a/repo/js/AutoPickLitter/assets/Old/MidLuck.png b/repo/js/AutoPickLitter/assets/Old/MidLuck.png new file mode 100644 index 000000000..5faf101c2 Binary files /dev/null and b/repo/js/AutoPickLitter/assets/Old/MidLuck.png differ diff --git a/repo/js/AutoPickLitter/assets/Old/MidLuck1.png b/repo/js/AutoPickLitter/assets/Old/MidLuck1.png new file mode 100644 index 000000000..73c830eba Binary files /dev/null and b/repo/js/AutoPickLitter/assets/Old/MidLuck1.png differ diff --git a/repo/js/AutoPickLitter/assets/Old/移动4行.json b/repo/js/AutoPickLitter/assets/Old/移动4行.json new file mode 100644 index 000000000..e5e548ee1 --- /dev/null +++ b/repo/js/AutoPickLitter/assets/Old/移动4行.json @@ -0,0 +1,369 @@ +{ + "macroEvents": [ + { + "type": 4, + "mouseX": 1206, + "mouseY": 920, + "mouseButton": "Left", + "time": 1125 + }, + { + "type": 2, + "mouseX": 1206, + "mouseY": 919, + "time": 2079 + }, + { + "type": 2, + "mouseX": 1206, + "mouseY": 910, + "time": 2125 + }, + { + "type": 2, + "mouseX": 1207, + "mouseY": 906, + "time": 2329 + }, + { + "type": 2, + "mouseX": 1208, + "mouseY": 899, + "time": 2360 + }, + { + "type": 2, + "mouseX": 1210, + "mouseY": 876, + "time": 2391 + }, + { + "type": 2, + "mouseX": 1211, + "mouseY": 853, + "time": 2422 + }, + { + "type": 2, + "mouseX": 1211, + "mouseY": 834, + "time": 2454 + }, + { + "type": 2, + "mouseX": 1211, + "mouseY": 824, + "time": 2485 + }, + { + "type": 2, + "mouseX": 1211, + "mouseY": 813, + "time": 2516 + }, + { + "type": 2, + "mouseX": 1211, + "mouseY": 792, + "time": 2547 + }, + { + "type": 2, + "mouseX": 1211, + "mouseY": 770, + "time": 2579 + }, + { + "type": 2, + "mouseX": 1205, + "mouseY": 672, + "time": 2672 + }, + { + "type": 2, + "mouseX": 1204, + "mouseY": 643, + "time": 2704 + }, + { + "type": 2, + "mouseX": 1202, + "mouseY": 616, + "time": 2735 + }, + { + "type": 2, + "mouseX": 1202, + "mouseY": 600, + "time": 2766 + }, + { + "type": 2, + "mouseX": 1201, + "mouseY": 576, + "time": 2797 + }, + { + "type": 2, + "mouseX": 1201, + "mouseY": 556, + "time": 2829 + }, + { + "type": 2, + "mouseX": 1201, + "mouseY": 536, + "time": 2860 + }, + { + "type": 2, + "mouseX": 1201, + "mouseY": 513, + "time": 2891 + }, + { + "type": 2, + "mouseX": 1201, + "mouseY": 499, + "time": 2922 + }, + { + "type": 2, + "mouseX": 1201, + "mouseY": 481, + "time": 2954 + }, + { + "type": 2, + "mouseX": 1201, + "mouseY": 463, + "time": 2985 + }, + { + "type": 2, + "mouseX": 1201, + "mouseY": 448, + "time": 3016 + }, + { + "type": 2, + "mouseX": 1201, + "mouseY": 425, + "time": 3047 + }, + { + "type": 2, + "mouseX": 1201, + "mouseY": 399, + "time": 3079 + }, + { + "type": 2, + "mouseX": 1201, + "mouseY": 385, + "time": 3110 + }, + { + "type": 2, + "mouseX": 1201, + "mouseY": 378, + "time": 3141 + }, + { + "type": 2, + "mouseX": 1201, + "mouseY": 314, + "time": 3235 + }, + { + "type": 2, + "mouseX": 1202, + "mouseY": 297, + "time": 3266 + }, + { + "type": 2, + "mouseX": 1203, + "mouseY": 278, + "time": 3297 + }, + { + "type": 2, + "mouseX": 1203, + "mouseY": 265, + "time": 3329 + }, + { + "type": 2, + "mouseX": 1203, + "mouseY": 248, + "time": 3360 + }, + { + "type": 2, + "mouseX": 1204, + "mouseY": 234, + "time": 3391 + }, + { + "type": 2, + "mouseX": 1204, + "mouseY": 224, + "time": 3422 + }, + { + "type": 2, + "mouseX": 1204, + "mouseY": 222, + "time": 3454 + }, + { + "type": 2, + "mouseX": 1204, + "mouseY": 221, + "time": 4750 + }, + { + "type": 2, + "mouseX": 1204, + "mouseY": 220, + "time": 4797 + }, + { + "type": 2, + "mouseX": 1204, + "mouseY": 219, + "time": 5157 + }, + { + "type": 2, + "mouseX": 1204, + "mouseY": 216, + "time": 5204 + }, + { + "type": 2, + "mouseX": 1205, + "mouseY": 216, + "time": 5235 + }, + { + "type": 2, + "mouseX": 1205, + "mouseY": 215, + "time": 5313 + }, + { + "type": 5, + "mouseX": 1205, + "mouseY": 215, + "mouseButton": "Left", + "time": 5829 + }, + { + "type": 2, + "mouseX": 1205, + "mouseY": 216, + "time": 5891 + }, + { + "type": 2, + "mouseX": 1204, + "mouseY": 219, + "time": 5969 + }, + { + "type": 2, + "mouseX": 1204, + "mouseY": 226, + "time": 6000 + }, + { + "type": 2, + "mouseX": 1205, + "mouseY": 241, + "time": 6032 + }, + { + "type": 2, + "mouseX": 1205, + "mouseY": 251, + "time": 6829 + }, + { + "type": 2, + "mouseX": 1215, + "mouseY": 312, + "time": 6860 + }, + { + "type": 2, + "mouseX": 1227, + "mouseY": 390, + "time": 6891 + }, + { + "type": 2, + "mouseX": 1233, + "mouseY": 439, + "time": 6922 + }, + { + "type": 2, + "mouseX": 1241, + "mouseY": 526, + "time": 6954 + }, + { + "type": 2, + "mouseX": 1223, + "mouseY": 799, + "time": 7063 + }, + { + "type": 2, + "mouseX": 1215, + "mouseY": 853, + "time": 7094 + }, + { + "type": 2, + "mouseX": 1211, + "mouseY": 899, + "time": 7125 + }, + { + "type": 2, + "mouseX": 1210, + "mouseY": 911, + "time": 7157 + }, + { + "type": 2, + "mouseX": 1209, + "mouseY": 914, + "time": 7219 + }, + { + "type": 2, + "mouseX": 1208, + "mouseY": 921, + "time": 7250 + }, + { + "type": 2, + "mouseX": 1208, + "mouseY": 924, + "time": 7282 + } + ], + "info": { + "name": "", + "description": "滑动4行", + "x": 0, + "y": 0, + "width": 1920, + "height": 1080, + "recordDpi": 1 + } +} \ No newline at end of file diff --git a/repo/js/AutoPickLitter/assets/RecognitionObject/Bad.png b/repo/js/AutoPickLitter/assets/RecognitionObject/Bad.png index e3249729f..385b032f3 100644 Binary files a/repo/js/AutoPickLitter/assets/RecognitionObject/Bad.png and b/repo/js/AutoPickLitter/assets/RecognitionObject/Bad.png differ diff --git a/repo/js/AutoPickLitter/assets/RecognitionObject/BigBad.png b/repo/js/AutoPickLitter/assets/RecognitionObject/BigBad.png index 9b9353675..3d544a99f 100644 Binary files a/repo/js/AutoPickLitter/assets/RecognitionObject/BigBad.png and b/repo/js/AutoPickLitter/assets/RecognitionObject/BigBad.png differ diff --git a/repo/js/AutoPickLitter/assets/RecognitionObject/BigLuck.png b/repo/js/AutoPickLitter/assets/RecognitionObject/BigLuck.png index 5a6f6d1bb..6fa135f95 100644 Binary files a/repo/js/AutoPickLitter/assets/RecognitionObject/BigLuck.png and b/repo/js/AutoPickLitter/assets/RecognitionObject/BigLuck.png differ diff --git a/repo/js/AutoPickLitter/assets/RecognitionObject/EndLuck.png b/repo/js/AutoPickLitter/assets/RecognitionObject/EndLuck.png index 637303a44..9f8fd497f 100644 Binary files a/repo/js/AutoPickLitter/assets/RecognitionObject/EndLuck.png and b/repo/js/AutoPickLitter/assets/RecognitionObject/EndLuck.png differ diff --git a/repo/js/AutoPickLitter/assets/RecognitionObject/Luck.png b/repo/js/AutoPickLitter/assets/RecognitionObject/Luck.png index 123cd2022..8263d2be9 100644 Binary files a/repo/js/AutoPickLitter/assets/RecognitionObject/Luck.png and b/repo/js/AutoPickLitter/assets/RecognitionObject/Luck.png differ diff --git a/repo/js/AutoPickLitter/assets/RecognitionObject/MidLuck.png b/repo/js/AutoPickLitter/assets/RecognitionObject/MidLuck.png new file mode 100644 index 000000000..e9458ee58 Binary files /dev/null and b/repo/js/AutoPickLitter/assets/RecognitionObject/MidLuck.png differ diff --git a/repo/js/AutoPickLitter/assets/宝箱1.json b/repo/js/AutoPickLitter/assets/宝箱1.json new file mode 100644 index 000000000..3183515e7 --- /dev/null +++ b/repo/js/AutoPickLitter/assets/宝箱1.json @@ -0,0 +1,31 @@ +{ + "info": { + "authors": [ + { + "links": "", + "name": "古又" + } + ], + "bgi_version": "0.45.0", + "description": "", + "enable_monster_loot_split": false, + "last_modified_time": 1757127594190, + "map_match_method": "", + "map_name": "Teyvat", + "name": "宝箱1", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "action": "combat_script", + "action_params": "wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f);", + "id": 1, + "move_mode": "run", + "type": "target", + "x": -3045.833984375, + "y": -3455.8564453125 + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoPickLitter/assets/宝箱2.json b/repo/js/AutoPickLitter/assets/宝箱2.json new file mode 100644 index 000000000..d330abd84 --- /dev/null +++ b/repo/js/AutoPickLitter/assets/宝箱2.json @@ -0,0 +1,31 @@ +{ + "info": { + "authors": [ + { + "links": "", + "name": "古又" + } + ], + "bgi_version": "0.45.0", + "description": "", + "enable_monster_loot_split": false, + "last_modified_time": 1757127596725, + "map_match_method": "", + "map_name": "Teyvat", + "name": "宝箱2", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "action": "combat_script", + "action_params": "wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f);", + "id": 1, + "move_mode": "run", + "type": "target", + "x": -3049.146484375, + "y": -3458.802734375 + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoPickLitter/assets/宝箱3.json b/repo/js/AutoPickLitter/assets/宝箱3.json new file mode 100644 index 000000000..9277e85c8 --- /dev/null +++ b/repo/js/AutoPickLitter/assets/宝箱3.json @@ -0,0 +1,31 @@ +{ + "info": { + "authors": [ + { + "links": "", + "name": "古又" + } + ], + "bgi_version": "0.45.0", + "description": "", + "enable_monster_loot_split": false, + "last_modified_time": 1757127598664, + "map_match_method": "", + "map_name": "Teyvat", + "name": "宝箱3", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "action": "combat_script", + "action_params": "wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f);", + "id": 1, + "move_mode": "run", + "type": "target", + "x": -3047.36328125, + "y": -3462.962890625 + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoPickLitter/assets/稻妻踏鞴砂路线.json b/repo/js/AutoPickLitter/assets/稻妻踏鞴砂路线.json new file mode 100644 index 000000000..cb50cd11a --- /dev/null +++ b/repo/js/AutoPickLitter/assets/稻妻踏鞴砂路线.json @@ -0,0 +1,211 @@ +{ + "config": { + "realtime_triggers": { + "AutoPick": true + } + }, + "farming_info": { + "allow_farming_count": false, + "duration_seconds": 0, + "elite_details": "", + "elite_mob_count": 0, + "normal_mob_count": 0, + "primary_target": "", + "total_mora": 0 + }, + "info": { + "authors": [ + { + "links": "", + "name": "古又" + } + ], + "bgi_version": "0.45.0", + "description": "", + "enable_monster_loot_split": false, + "items": [], + "last_modified_time": 1757126413936, + "map_match_method": "", + "map_name": "Teyvat", + "name": "稻妻踏鞴砂路线", + "order": 0, + "tags": [], + "type": "collect", + "version": "3.0" + }, + "positions": [ + { + "action": "", + "action_params": "", + "id": 1, + "move_mode": "walk", + "type": "teleport", + "x": -3016.494140625, + "y": -3623.3935546875 + }, + { + "action": "", + "action_params": "", + "id": 2, + "move_mode": "run", + "type": "path", + "x": -3024.7734375, + "y": -3560.5029296875 + }, + { + "action": "", + "action_params": "", + "id": 3, + "move_mode": "run", + "type": "path", + "x": -3000.927734375, + "y": -3521.7841796875 + }, + { + "action": "combat_script", + "action_params": "wait(0.2),keypress(f);", + "id": 4, + "move_mode": "walk", + "type": "path", + "x": -3018.033203125, + "y": -3516.87109375 + }, + { + "action": "combat_script", + "action_params": "wait(0.2),keypress(f);", + "id": 5, + "move_mode": "walk", + "type": "path", + "x": -3034.796875, + "y": -3514.798828125 + }, + { + "action": "", + "action_params": "", + "id": 6, + "move_mode": "run", + "type": "path", + "x": -3065.5, + "y": -3516 + }, + { + "action": "", + "action_params": "", + "id": 7, + "move_mode": "dash", + "type": "path", + "x": -3069, + "y": -3503.5 + }, + { + "action": "combat_script", + "action_params": "wait(0.2),keypress(f);", + "id": 8, + "move_mode": "run", + "type": "path", + "x": -3026.9765625, + "y": -3471.837890625 + }, + { + "action": "combat_script", + "action_params": "wait(0.2),keypress(f);", + "id": 9, + "move_mode": "run", + "type": "path", + "x": -3025.373046875, + "y": -3481.05859375 + }, + { + "action": "combat_script", + "action_params": "wait(0.2),keypress(f);", + "id": 10, + "move_mode": "walk", + "point_ext_params": { + "description": "", + "enable_monster_loot_split": false, + "misidentification": { + "arrival_time": 0, + "handling_mode": "previousDetectedPoint", + "type": [ + "unrecognized" + ] + } + }, + "type": "path", + "x": -3011.41015625, + "y": -3470.673828125 + }, + { + "action": "", + "action_params": "", + "id": 11, + "move_mode": "walk", + "type": "path", + "x": -3003.630859375, + "y": -3481.4169921875 + }, + { + "action": "", + "action_params": "", + "id": 12, + "move_mode": "walk", + "type": "path", + "x": -2990.884765625, + "y": -3471.7333984375 + }, + { + "action": "combat_script", + "action_params": "wait(0.2),keypress(f);", + "id": 13, + "move_mode": "dash", + "type": "path", + "x": -2984.275390625, + "y": -3480.443359375 + }, + { + "action": "combat_script", + "action_params": "wait(0.2),keypress(f),wait(0.2),keypress(f);", + "id": 14, + "move_mode": "dash", + "type": "path", + "x": -2958.71484375, + "y": -3439.4755859375 + }, + { + "action": "combat_script", + "action_params": "wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2);", + "id": 15, + "move_mode": "dash", + "type": "path", + "x": -2980.548828125, + "y": -3416.419921875 + }, + { + "action": "", + "action_params": "", + "id": 16, + "move_mode": "run", + "type": "path", + "x": -2997.9453125, + "y": -3417.5146484375 + }, + { + "action": "", + "action_params": "", + "id": 17, + "move_mode": "run", + "type": "path", + "x": -3034.443359375, + "y": -3461.5 + }, + { + "action": "", + "action_params": "", + "id": 18, + "move_mode": "run", + "type": "target", + "x": -3039.61328125, + "y": -3460.5390625 + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoPickLitter/main.js b/repo/js/AutoPickLitter/main.js index 33926e858..8b7fc517b 100644 --- a/repo/js/AutoPickLitter/main.js +++ b/repo/js/AutoPickLitter/main.js @@ -229,14 +229,14 @@ async function scrollPage(totalDistance, stepDistance = 10, delayMs = 5) { let ocrResults = await performOcr("神奇的", dialogZone.x, dialogZone.y, false); if (ocrResults.length != 0) { await sleep(700); - await genshin.chooseTalkOption("如何才能获得强大的力量"); + await genshin.chooseTalkOption("如何才"); await sleep(1000); leftButtonClick(); await sleep(1000); let recognizedOver = await performOcr("已",{ min: 1482, max: 1630 }, { min: 912, max: 957 }, false) if (recognizedOver.length != 0) { log.info("已售罄！！！"); - await genshin.returnMainUi(); + // await genshin.returnMainUi(); } else { let recognizedMora = await performOcr("", { min: 1600, max: 1780 }, { min: 30, max: 60 }, true) if (BigInt(recognizedMora) >= 300) { @@ -247,14 +247,15 @@ async function scrollPage(totalDistance, stepDistance = 10, delayMs = 5) { await sleep(1000); } else { log.info("不是哥们，你怎么比我还穷！！！"); - await genshin.returnMainUi(); + // await genshin.returnMainUi(); }; }; }; - await genshin.returnMainUi(); + // await genshin.returnMainUi(); } catch (error) { log.error(`识别图像时发生异常: ${error.message}`); - } + }; + await genshin.returnMainUi(); }; @@ -280,7 +281,7 @@ async function scrollPage(totalDistance, stepDistance = 10, delayMs = 5) { // let ocrResults1 = await performOcr("敬香", { min: 1060, max: 1550 }, { min: 400, max: 680 }, false); let ocrResults1 = await performOcr("敬香", dialogZone.x, dialogZone.y, false); if(ocrResults1.length != 0){ - await sleep(700); + // await sleep(700); await click(1168,785); await sleep(700); } else { @@ -315,7 +316,7 @@ async function scrollPage(totalDistance, stepDistance = 10, delayMs = 5) { leftButtonClick(); await sleep(4000); leftButtonClick(); - await sleep(3000); + await sleep(3500); }; let ocrResults2 = await performOcr("玄冬林", dialogZone.x, dialogZone.y, false); @@ -362,20 +363,21 @@ async function scrollPage(totalDistance, stepDistance = 10, delayMs = 5) { await sleep(2500); // 通过图片识别 // 大凶or凶 - let img2 = await findImgIcon("assets/RecognitionObject/Bad.png", { min: 630, max: 830 }, { min: 100, max: 160 }, false); - let img3 = await findImgIcon("assets/RecognitionObject/BigBad.png", { min: 630, max: 830 }, { min: 100, max: 160 }, false); - // 大吉、吉、末吉 + let img2 = await findImgIcon("assets/RecognitionObject/BigBad.png", { min: 630, max: 830 }, { min: 100, max: 160 }, false); + let img3 = await findImgIcon("assets/RecognitionObject/Bad.png", { min: 630, max: 830 }, { min: 100, max: 160 }, false); + // 大吉、中吉、吉、末吉 let img4 = await findImgIcon("assets/RecognitionObject/BigLuck.png", { min: 630, max: 830 }, { min: 100, max: 160 }, false); - let img5 = await findImgIcon("assets/RecognitionObject/luck.png", { min: 630, max: 830 }, { min: 100, max: 160 }, false); + let img5 = await findImgIcon("assets/RecognitionObject/MidLuck.png", { min: 630, max: 830 }, { min: 100, max: 160 }, false); let img6 = await findImgIcon("assets/RecognitionObject/EndLuck.png", { min: 630, max: 830 }, { min: 100, max: 160 }, false); + let img7 = await findImgIcon("assets/RecognitionObject/Luck.png", { min: 630, max: 830 }, { min: 100, max: 160 }, false); await genshin.returnMainUi(); if (img2.length !== 0) { - log.info("抽签的结果:凶"); - writeContentToFile(`抽签的结果:凶\n`, false); + log.info("抽签的结果:大凶"); + writeContentToFile(`抽签的结果:大凶\n`, false); await pathingScript.runFile("assets/挂签路线.json"); await performOcr("御签挂", { min: 900, max: 1700 }, { min: 380, max: 880 }, false); - await sleep(700); await genshin.chooseTalkOption("挂起来吧"); + await sleep(700); await click(111,184); await sleep(1000); await click(1250,817); @@ -385,8 +387,8 @@ async function scrollPage(totalDistance, stepDistance = 10, delayMs = 5) { await genshin.returnMainUi(); log.info("事事顺利"); } else if (img3.length !== 0) { - log.info("抽签的结果:大凶"); - writeContentToFile(`抽签的结果:大凶\n`, false); + log.info("抽签的结果:凶"); + writeContentToFile(`抽签的结果:凶\n`, false); await pathingScript.runFile("assets/挂签路线.json"); await performOcr("御签挂", { min: 900, max: 1700 }, { min: 380, max: 880 }, false); await sleep(700); @@ -403,33 +405,19 @@ async function scrollPage(totalDistance, stepDistance = 10, delayMs = 5) { log.info("抽签的结果:大吉"); writeContentToFile(`抽签的结果:大吉\n`, false); } else if (img5.length !== 0) { + log.info("抽签的结果:中吉"); + writeContentToFile(`抽签的结果:中吉\n`, false); + } else if (img6.length !== 0) { + log.info("抽签的结果:末吉"); + writeContentToFile(`抽签的结果:末吉\n`, false); + } else if (img7.length !== 0) { log.info("抽签的结果:吉"); writeContentToFile(`抽签的结果:吉\n`, false); } else { - log.info("抽签的结果:末吉"); - writeContentToFile(`抽签的结果:末吉\n`, false); + log.warn("嘘，快踢作者屁股，修bug！！！"); + }; - - - // // 通过文字识别 - // let recognizedText = await performOcr("", { min: 630, max: 800 }, { min: 100, max: 160 }, true); - // await genshin.returnMainUi(); - // if(recognizedText.includes("区")){ - // await pathingScript.runFile("assets/挂签路线.json"); - // await performOcr("御签挂", { min: 900, max: 1700 }, { min: 380, max: 880 }, false); - // await sleep(700); - // await genshin.chooseTalkOption("挂起来吧"); - // await click(111,184); - // await sleep(1000); - // await click(1250,817); - // await sleep(1000); - // await click(1603,1013); - // await sleep(1500); - // await genshin.returnMainUi(); - // log.info("事事顺利"); - // }; - } else { await sleep(700); await genshin.chooseTalkOption("再见"); @@ -444,16 +432,60 @@ async function scrollPage(totalDistance, stepDistance = 10, delayMs = 5) { } else { log.error(`识别图像时发生异常: ${error.message}`); - await genshin.returnMainUi(); + // await genshin.returnMainUi(); } } catch (error) { log.error(`识别图像时发生异常: ${error.message}`); - } + }; await genshin.returnMainUi(); }; + //稻妻踏鞴砂海螺 + if (settings.conchs) { + await genshin.returnMainUi(); + await pathingScript.runFile("assets/稻妻踏鞴砂路线.json"); + await sleep(700); + let figure = parseInt(settings.pickupTreasure); + try { + let ocrResults = await performOcr("阿敬", dialogZone.x, dialogZone.y, false); + if (ocrResults.length != 0) { + await sleep(1000); + let ocrResults1 = await performOcr("想要", dialogZone.x, dialogZone.y, false); + if (ocrResults1.length != 0) { + await sleep(700); + leftButtonClick(); + await sleep(1500); + //交互道具，直接选择位置点击 + await click(111,184); + await sleep(1000); + await click(1250,817); + await sleep(1000); + await click(1603,1013); + await sleep(1500); + await genshin.returnMainUi(); + if (figure != 0) { + await pathingScript.runFile(`assets/宝箱${figure}.json`); + log.info(`你即将开启${figure}号宝箱`) + } else { + figure = Math.floor(Math.random() * 3) + 1; + log.info(`你即将开启${figure}号宝箱`) + await pathingScript.runFile(`assets/宝箱${figure}.json`); + } + } else { + log.info("你开过了？look my eyes,回答我！！！"); + }; + } else { + log.error(`识别图像时发生异常: ${error.message}`); + // await genshin.returnMainUi(); + }; + } catch (error) { + log.error(`识别图像时发生异常: ${error.message}`); + }; + await genshin.returnMainUi(); + }; + //枫丹梅洛彼得堡领取福利餐 if(settings.meal){ await genshin.returnMainUi(); @@ -465,7 +497,6 @@ async function scrollPage(totalDistance, stepDistance = 10, delayMs = 5) { await sleep(1000); let ocrResults1 = await performOcr("没什么", dialogZone.x, dialogZone.y, false); if(ocrResults1.length != 0){ - await sleep(700); log.info("对话出现没什么，默认领取和使用过！！！"); } else{ await genshin.chooseTalkOption("给我一份福利餐"); @@ -508,11 +539,11 @@ async function scrollPage(totalDistance, stepDistance = 10, delayMs = 5) { } else { log.error(`识别图像时发生异常: ${error.message}`); - await genshin.returnMainUi(); - } + // await genshin.returnMainUi(); + }; } catch (error) { log.error(`识别图像时发生异常: ${error.message}`); - } + }; await genshin.returnMainUi(); }; @@ -523,7 +554,7 @@ async function scrollPage(totalDistance, stepDistance = 10, delayMs = 5) { await sleep(1000); try { let ocrResults = await performOcr("察尔瓦", dialogZone.x, dialogZone.y, false); - + if (ocrResults.length != 0) { await sleep(700); leftButtonClick(); await sleep(2000); @@ -588,7 +619,7 @@ async function scrollPage(totalDistance, stepDistance = 10, delayMs = 5) { default: writeContentToFile("获得的龙蛋:闪闪礼蛋·飞澜鲨鲨\n", false); break; - } + }; break; }; moveMouseTo(coordinates[figure - 1][0],coordinates[figure - 1][1]); @@ -598,9 +629,15 @@ async function scrollPage(totalDistance, stepDistance = 10, delayMs = 5) { } else { log.info("你今天已经领取过了"); }; + } else { + log.error(`识别图像时发生异常: ${error.message}`); + }; + + + } catch (error) { log.error(`识别图像时发生异常: ${error.message}`); - } + }; await genshin.returnMainUi(); }; diff --git a/repo/js/AutoPickLitter/manifest.json b/repo/js/AutoPickLitter/manifest.json index 406a4b003..c6d4c8f04 100644 --- a/repo/js/AutoPickLitter/manifest.json +++ b/repo/js/AutoPickLitter/manifest.json @@ -1,13 +1,13 @@ { "manifest_version": 1, "name": "提瓦特杂事（收集）", - "version": "1.0.4", + "version": "1.1", "tags": [ "玄学", "收集", "成就" ], - "description": "买圣水、抽签、上香、领福利餐、领闪闪礼蛋", + "description": "买圣水、抽签、海螺、上香、领福利餐、领闪闪礼蛋", "authors": [ { "name": "古又", diff --git a/repo/js/AutoPickLitter/records/默认账户.txt b/repo/js/AutoPickLitter/records/默认账户.txt index 8b1378917..e69de29bb 100644 --- a/repo/js/AutoPickLitter/records/默认账户.txt +++ b/repo/js/AutoPickLitter/records/默认账户.txt @@ -1 +0,0 @@ - diff --git a/repo/js/AutoPickLitter/settings.json b/repo/js/AutoPickLitter/settings.json index 823057d42..ebdc1b0f5 100644 --- a/repo/js/AutoPickLitter/settings.json +++ b/repo/js/AutoPickLitter/settings.json @@ -14,6 +14,20 @@ "type": "checkbox", "label": "---------------稻妻鸣神大社抽签---------------\n注意:勾选前，请去看readme" }, + { + "name": "conchs", + "type": "checkbox", + "label": "---------------稻妻踏鞴砂海螺---------------\n注意:勾选前，请去看readme" + }, + { + "name": "pickupTreasure", + "type": "select", + "label": "开启宝箱或随机(1:左面 2:中间 3:右边 0:随机)", + "options": [ + "1", "2", "3", "0" + ], + "default": "0" + }, { "name": "meal", "type": "checkbox", @@ -25,19 +39,19 @@ "label": "-------------纳塔悠悠集市闪闪龙蛋-------------\n注意:开图啊，喂！！！" }, { - "name": "pickupDragonEgg", - "type": "select", - "label": "挑选你喜欢的龙蛋或随机", - "options": [ - "闪闪礼蛋·山之血", - "闪闪礼蛋·太阳的轰鸣", - "闪闪礼蛋·圣龙君临", - "闪闪礼蛋·菲耶蒂娜", - "闪闪礼蛋·献给小酒杯", - "闪闪礼蛋·飞澜鲨鲨", - "随机龙蛋" - ], - "default": "随机龙蛋" + "name": "pickupDragonEgg", + "type": "select", + "label": "挑选你喜欢的龙蛋或随机", + "options": [ + "闪闪礼蛋·山之血", + "闪闪礼蛋·太阳的轰鸣", + "闪闪礼蛋·圣龙君临", + "闪闪礼蛋·菲耶蒂娜", + "闪闪礼蛋·献给小酒杯", + "闪闪礼蛋·飞澜鲨鲨", + "随机龙蛋" + ], + "default": "随机龙蛋" }, { "name": "accountName", @@ -45,4 +59,5 @@ "label": "账户名称\n用于多用户运行时区分不同账户\n单用户无需修改", "default": "默认账户" } -] \ No newline at end of file + +]