Skip to content

识别加解锁位置适配5.2版本 #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FungusOVO wants to merge 1 commit into
base: main
Choose a base branch
from
Open

识别加解锁位置适配5.2版本 #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions yas-genshin/src/scanner/artifact_scanner/artifact_scanner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,12 +252,13 @@ impl GenshinArtifactScanner {
let gap = self.window_info.item_gap_size;
let size = self.window_info.item_size;

let left = (origin.left as f64 + margin.x) as i32;
let top = (origin.top as f64
let left = (origin.left as f64 + self.window_info.artifact_panel_offset.width + margin.x) as i32;
let top = (origin.top as f64 + self.window_info.artifact_panel_offset.height
+ margin.y
+ (gap.height + size.height)
* self.get_start_row(count, artifact_index) as f64)
as i32;

let width = (origin.width as f64 - margin.x) as i32;
let height = (origin.height as f64
- margin.y
Expand Down
2 changes: 1 addition & 1 deletion yas-genshin/window_info/windows1280x960.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
},
"genshin_artifact_lock_pos": {
"Pos": {
"x": 1160,
"x": 1130,
"y": 286
}
},
Expand Down
2 changes: 1 addition & 1 deletion yas-genshin/window_info/windows1440x900.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
},
"genshin_artifact_lock_pos": {
"Pos": {
"x": 1305,
"x": 1268,
"y": 322
}
},
Expand Down
2 changes: 1 addition & 1 deletion yas-genshin/window_info/windows1600x900.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
},
"genshin_artifact_lock_pos": {
"Pos": {
"x": 1450,
"x": 1415,
"y": 357
}
},
Expand Down
2 changes: 1 addition & 1 deletion yas-genshin/window_info/windows2100x900.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
},
"genshin_artifact_lock_pos": {
"Pos": {
"x": 1896,
"x": 1885,
"y": 371
}
},
Expand Down
2 changes: 1 addition & 1 deletion yas-genshin/window_info/windows3440x1440.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
},
"genshin_artifact_lock_pos": {
"Pos": {
"x": 3114,
"x": 3046,
"y": 592
}
},
Expand Down