Skip to content

Commit 3832328

Browse files
authored
规范识别范围,避免直接使用genshin.width (#2464)
* 规范识别范围,避免直接使用genshin.width
1 parent dd139c2 commit 3832328

File tree

24 files changed

+46
-52
lines changed

24 files changed

+46
-52
lines changed

repo/js/AEscoffier_chef/main.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@
313313
* @returns {Promise<number[]>} 返回熟练度数组 [当前熟练度, 总熟练度]
314314
*/
315315
async function check_proficiency(ui="main") {
316-
let ocrRo = RecognitionObject.Ocr(0, 0, genshin.width, genshin.height);
316+
let ocrRo = RecognitionObject.Ocr(0, 0, 1920, 1080);
317317
if (ui === "main") {
318318
ocrRo = RecognitionObject.Ocr(1424, 422, 82, 37);
319319
} else if (ui === "finish") {
@@ -371,7 +371,7 @@
371371
*/
372372
async function select_food_by_fullname(food_name) {
373373
log.info(`在当前页面寻找 ${food_name} ...`);
374-
const ocrRo = RecognitionObject.Ocr(0, 0, genshin.width, genshin.height);
374+
const ocrRo = RecognitionObject.Ocr(0, 0, 1920, 1080);
375375

376376
moveMouseTo(1555, 860); // 移走鼠标,防止干扰OCR
377377
await sleep(200);

repo/js/AEscoffier_chef/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"manifest_version": 1,
33
"name": "一只爱可菲(厨娘版)",
4-
"version": "1.3.3",
4+
"version": "1.3.4",
55
"bgi_version": "0.45.0",
66
"description": "专精料理制作的爱可菲(自动烹饪及解锁、特殊料理)",
77
"authors": [

repo/js/ActivitySwitch/main.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ async function switchToActivityPage(activityName, activityKey, maxOcrCount) {
2020
await keyUp(activityKey);
2121

2222
await sleep(1000);
23-
let ocr_x = parseInt(100 * gameWidth / 1920 + '')
24-
let ocr_y = parseInt(200 * gameHeight / 1080 + '')
25-
let ocr_width = parseInt(450 * gameWidth / 1920 + '')
26-
let ocr_hight = parseInt(600 * gameHeight / 1080 + '')
23+
let ocr_x = 100;
24+
let ocr_y = 200;
25+
let ocr_width = 450;
26+
let ocr_hight = 600;
2727
log.info(`参考值(1920*1080):{"x": 100, "y": 200, "width": 450, "height": 600}`)
2828
let ocrRegion = {
2929
"x": ocr_x,

repo/js/ActivitySwitch/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "切换活动页面",
3-
"version": "1.1.1",
3+
"version": "1.1.2",
44
"description": "(需要处于主界面)一个通过 F5 打开活动页面、(鼠标上滑/滚轮滑动)并根据活动名称选择活动的脚本",
55
"settings_ui": "settings.json",
66
"main": "main.js",

repo/js/AutoLeyLineOutcrop/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const ocrRegion3 = { x: 1200, y: 520, width: 300, height: 300 }; // 拾取区
2424
// 预定义识别对象
2525
const openRo = RecognitionObject.TemplateMatch(file.ReadImageMatSync("assets/icon/open.png"));
2626
const closeRo = RecognitionObject.TemplateMatch(file.ReadImageMatSync("assets/icon/close.png"));
27-
const paimonMenuRo = RecognitionObject.TemplateMatch(file.ReadImageMatSync("assets/icon/paimon_menu.png"), 0, 0, genshin.width / 3.0, genshin.width / 5.0);
27+
const paimonMenuRo = RecognitionObject.TemplateMatch(file.ReadImageMatSync("assets/icon/paimon_menu.png"), 0, 0, 640, 216);
2828
const boxIconRo = RecognitionObject.TemplateMatch(file.ReadImageMatSync("assets/icon/box.png"));
2929
const ocrRo1 = RecognitionObject.ocr(ocrRegion1.x, ocrRegion1.y, ocrRegion1.width, ocrRegion1.height);
3030
const ocrRo2 = RecognitionObject.ocr(ocrRegion2.x, ocrRegion2.y, ocrRegion2.width, ocrRegion2.height);

repo/js/AutoLeyLineOutcrop/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"manifest_version": 1,
33
"name": "全自动地脉花",
4-
"version": "4.4.5",
4+
"version": "4.4.6",
55
"tags": ["地脉花"],
66
"bgi_version": "0.52.0",
77
"description": "基于OCR图像识别的全自动刷取地脉花。\n💡更多信息请查看README! \n\n----------注意事项----------\n●仅支持BetterGI 0.52.0 及以上版本!\n●部分地脉花因特殊原因不支持全自动,具体的点位请在手册中查看。\n●树脂使用的优先级:2倍原粹树脂 > 浓缩树脂 > 原粹树脂。\n●运行时会传送到七天神像设置中设置的七天神像,需要关闭七天神像设置中的“是否就近七天神像恢复血量”,并指定七天神像。\n●战斗策略注意调度器设置中地图追踪行走配置里的“允许在JsSpript中使用”和“覆盖JS中的自动战斗配置”,只有在都打开的情况下脚本才会使用下面的战斗配置,否则会使用独立任务中的战斗策略。战斗超时时间不能大于脚本自定义配置中的时间。\n\n如果遇到问题,请先参照README中的方法进行解决。",

repo/js/AutoMonday/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
const BossPartyName = settings.BossPartyName;// 战斗队伍
2929
let mijingCount = 1;// 自动秘境计数
3030
// OCR对象用于检测战斗文本
31-
const ocrRo2 = RecognitionObject.Ocr(0, 0, genshin.width, genshin.height);
31+
const ocrRo2 = RecognitionObject.Ocr(0, 0, 1920, 1080);
3232

3333
// 创建材质到ITEM的映射表
3434
// 养成道具=1,食物=2,材料=3

repo/js/AutoMonday/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"manifest_version": 1,
33
"name": "全自动周一",
4-
"version": "1.3.5",
4+
"version": "1.3.6",
55
"tags": [
66
"周常",
77
"纪行",

repo/js/AutoStoryLoader/main.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ const paimonMenuRo = RecognitionObject.TemplateMatch(
88
file.ReadImageMatSync("Data/RecognitionObject/paimon_menu.png"),
99
0,
1010
0,
11-
genshin.width / 3.0,
12-
genshin.width / 5.0
11+
640,
12+
216
1313
);
1414

1515
// 读取设置
@@ -539,8 +539,8 @@ const isInMainUI = () => {
539539
file.ReadImageMatSync("Data/RecognitionObject/paimon_menu.png"),
540540
0,
541541
0,
542-
genshin.width / 3.0,
543-
genshin.width / 5.0
542+
640,
543+
216
544544
);
545545

546546
return () => {

repo/js/AutoStoryLoader/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"manifest_version": 1,
33
"name": "自动剧情加载器",
4-
"version": "1.5",
4+
"version": "1.6",
55
"tags": ["剧情","任务"],
66
"description": "剧情自动加载器一键挂机过剧情:自动寻路、对话、战斗(需任务脚本支持),脚本拖进调度器就能跑,仅提供技术框架,完全体须搭配需任务脚本使用,详情见说明文档",
77
"authors": [

0 commit comments

Comments
 (0)