Bug fixes and scroll improvment

1. Fixed crash when not using advanced settings
2. Add a new method for detecting page scroll

Author: ProblemFactory

ArtScanner/art_scanner_logic.py

@@ -2,6 +2,7 @@
 import time
 import win32gui
 import mouse, math
+from PIL import ImageChops
 from utils import captureWindow
 
 class GameInfo:
@@ -55,15 +56,15 @@ def interrupt(self):
         self.stopped = True
 
 
-    def waitSwitched(self, art_center_x, art_center_y, min_wait=0.1, max_wait=3):
+    def waitSwitched(self, art_center_x, art_center_y, min_wait=0.1, max_wait=3, condition=lambda pix:sum(pix)/3>200):
         total_wait = 0
         while True:
             pix = captureWindow(self.game_info.hwnd, (
                 art_center_x-self.game_info.art_width/2-self.game_info.art_expand, 
                 art_center_y, 
                 art_center_x-self.game_info.art_width/2-self.game_info.art_expand+1.5, 
                 art_center_y+1.5))
-            if sum(pix.getpixel((0,0)))/3>200:
+            if condition(pix.getpixel((0,0))):
                 return True
             else:
                 time.sleep(min_wait)
@@ -149,8 +150,21 @@ def scrollToRow(self, target_row, max_scrolls=20, extra_scroll=0, interval=0.05)
                     return rows_scrolled
             if lines_scrolled > max_scrolls:
                 return rows_scrolled
+            get_first_art = lambda : captureWindow(self.game_info.hwnd, (
+                self.game_info.first_art_x+self.game_info.art_width/2-1, 
+                self.game_info.first_art_y+self.game_info.art_height/2, 
+                self.game_info.first_art_x+self.game_info.art_width/2+1, 
+                self.game_info.first_art_y+self.game_info.art_height))
+            first_art = get_first_art()
             for _ in range(7 if lines_scrolled==0 and target_row>0 else 1):
                 mouse.wheel(-1)
                 lines_scrolled += 1
                 # print('翻一下')
-            time.sleep(interval)
+            total_waited = 0
+            while True:
+                time.sleep(interval)
+                total_waited += interval
+                if total_waited>5:
+                    break
+                if ImageChops.difference(get_first_art(), first_art).getbbox():
+                    break

ArtScanner/main.py

@@ -97,7 +97,7 @@ def is_admin():
 input('运行期间请保持原神在前台，请勿遮挡窗口或操作鼠标，按鼠标中键停止。按回车继续')
 input('开始后将尝试自动对齐第一行以方便识别，若对齐结果有误，请立刻按中键停止。按回车继续')
 print('---------------------------------')
-if input('是否进行高级设置，例如等级过滤，稀有度过滤，翻页速度，确认请输入y：').strip().lower()=='y':
+if input('是否进行高级设置，例如等级过滤，稀有度过滤，翻页延迟，确认请输入y：').strip().lower()=='y':
     level_threshold = input('请输入圣遗物等级阈值(0-20)(比如：16，则仅将保存16级及以上的圣遗物信息)。直接按回车则默认保存所有圣遗物信息。')
     rarity_threshold = input('请输入圣遗物星级阈值(1-5)(比如：5，则仅将保存5星的圣遗物信息)。直接按回车则默认保存所有圣遗物信息。')
     scroll_interval = input('请输入翻页时的检测延迟（秒），数值越小翻页速度越快，但越可能造成跳行提前结束等问题，直接回车则为默认值0.05。')
@@ -106,15 +106,15 @@ def is_admin():
 
 try:
     level_threshold = int(level_threshold)
-except ValueError:
+except:
     level_threshold = 0
 try:
     rarity_threshold = int(rarity_threshold)
-except ValueError:
+except:
     rarity_threshold = 0
 try:
     scroll_interval = float(scroll_interval)
-except ValueError:
+except:
     scroll_interval = 0.05
 
 keyboard.press('alt')