Преглед изворни кода

fix(task): Ocr remain number error

runhey пре 3 година
родитељ
комит
8485fc991d
2 измењених фајлова са 5 додато и 5 уклоњено
  1. 2 2
      tasks/MysteryShop/script_task.py
  2. 3 3
      tasks/RichMan/mall/special.py

+ 2 - 2
tasks/MysteryShop/script_task.py

@@ -230,6 +230,6 @@ if __name__ == '__main__':
     t = ScriptTask(c, d)
     t = ScriptTask(c, d)
     t.screenshot()
     t.screenshot()
 
 
-    # t.run_shop(t.config.mystery_shop.shop_config)
-    t.shop_reward()
+    t.run_shop(t.config.mystery_shop.shop_config)
+    # t.shop_reward()
 
 

+ 3 - 3
tasks/RichMan/mall/special.py

@@ -161,13 +161,13 @@ class Special(Buy, MallNavbar):
         # logger.info(f'上中点是:{upper_midpoint}')
         # logger.info(f'上中点是:{upper_midpoint}')
         # logger.info(f'数字的ROI是: {self.O_SP_RES_NUMBER.roi}')
         # logger.info(f'数字的ROI是: {self.O_SP_RES_NUMBER.roi}')
         result = self.O_SP_RES_NUMBER.ocr(self.device.image)
         result = self.O_SP_RES_NUMBER.ocr(self.device.image)
-        result = result.replace('?', '2').replace('?', '2')
+        result = result.replace('?', '2').replace('?', '2').replace(':', ';')
         try:
         try:
-            result = re.findall(r'\d+', result)[0]
+            result = re.findall(r'剩余购买次数:(\d+)', result)[0]
             result = int(result)
             result = int(result)
         except:
         except:
             result = 0
             result = 0
-        logger.info(f'Remain {result}')
+        logger.info(f'Remain [{result}]')
         return result
         return result