diff --git a/yas-genshin/src/scanner/artifact_scanner/artifact_scanner.rs b/yas-genshin/src/scanner/artifact_scanner/artifact_scanner.rs index 3f2d55f5..1f663de9 100644 --- a/yas-genshin/src/scanner/artifact_scanner/artifact_scanner.rs +++ b/yas-genshin/src/scanner/artifact_scanner/artifact_scanner.rs @@ -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 diff --git a/yas-genshin/window_info/windows1280x960.json b/yas-genshin/window_info/windows1280x960.json index d097e45e..2b6b6cc9 100644 --- a/yas-genshin/window_info/windows1280x960.json +++ b/yas-genshin/window_info/windows1280x960.json @@ -80,7 +80,7 @@ }, "genshin_artifact_lock_pos": { "Pos": { - "x": 1160, + "x": 1130, "y": 286 } }, diff --git a/yas-genshin/window_info/windows1440x900.json b/yas-genshin/window_info/windows1440x900.json index a30d728b..b2796830 100644 --- a/yas-genshin/window_info/windows1440x900.json +++ b/yas-genshin/window_info/windows1440x900.json @@ -80,7 +80,7 @@ }, "genshin_artifact_lock_pos": { "Pos": { - "x": 1305, + "x": 1268, "y": 322 } }, diff --git a/yas-genshin/window_info/windows1600x900.json b/yas-genshin/window_info/windows1600x900.json index 40421c6b..edf526d8 100644 --- a/yas-genshin/window_info/windows1600x900.json +++ b/yas-genshin/window_info/windows1600x900.json @@ -80,7 +80,7 @@ }, "genshin_artifact_lock_pos": { "Pos": { - "x": 1450, + "x": 1415, "y": 357 } }, diff --git a/yas-genshin/window_info/windows2100x900.json b/yas-genshin/window_info/windows2100x900.json index b4833392..8d8764b0 100644 --- a/yas-genshin/window_info/windows2100x900.json +++ b/yas-genshin/window_info/windows2100x900.json @@ -80,7 +80,7 @@ }, "genshin_artifact_lock_pos": { "Pos": { - "x": 1896, + "x": 1885, "y": 371 } }, diff --git a/yas-genshin/window_info/windows3440x1440.json b/yas-genshin/window_info/windows3440x1440.json index 46c351a5..d5c5318e 100644 --- a/yas-genshin/window_info/windows3440x1440.json +++ b/yas-genshin/window_info/windows3440x1440.json @@ -74,7 +74,7 @@ }, "genshin_artifact_lock_pos": { "Pos": { - "x": 3114, + "x": 3046, "y": 592 } },