Просмотр исходного кода

fix(duel):Remove the highest digit while score is too high

ryland 2 лет назад
Родитель
Сommit
7a39e18daf
1 измененных файлов с 12 добавлено и 2 удалено
  1. 12 2
      tasks/Duel/script_task.py

+ 12 - 2
tasks/Duel/script_task.py

@@ -5,7 +5,7 @@ from time import sleep
 from datetime import time, datetime, timedelta
 from datetime import time, datetime, timedelta
 
 
 from module.logger import logger
 from module.logger import logger
-from module.exception import TaskEnd
+from module.exception import TaskEnd, RequestHumanTakeover
 from module.base.timer import Timer
 from module.base.timer import Timer
 
 
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
@@ -106,7 +106,17 @@ class ScriptTask(GameUi, GeneralBattle, DuelAssets):
                 logger.info('You are already a celeb')
                 logger.info('You are already a celeb')
                 return None
                 return None
             current_score = self.O_D_SCORE.ocr(self.device.image)
             current_score = self.O_D_SCORE.ocr(self.device.image)
-            if current_score < 1200 or current_score > 3000:
+            if current_score < 1200:
+                # 分太低了
+                logger.warning('Score is too low')
+                logger.error('Please enhance your score')
+                raise RequestHumanTakeover
+            elif current_score > 10000:
+                # 识别错误分数超过一万, 去掉最高位
+                logger.warning('Recognition error, score is too high')
+                logger.warning('Remove the highest digit')
+                current_score = int(str(current_score)[1:])
+            elif current_score > 3000:
                 continue
                 continue
             return current_score if current_score <= target else None
             return current_score if current_score <= target else None