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

Merge pull request #660 from migsmiku/dev

fix(KekkaiActivation): Improve best card selection logic for KekkaiActivation
huangrunheng 1 год назад
Родитель
Сommit
48158d3055
2 измененных файлов с 6 добавлено и 2 удалено
  1. 1 1
      tasks/Component/SwitchSoul/switch_soul.py
  2. 5 1
      tasks/KekkaiActivation/script_task.py

+ 1 - 1
tasks/Component/SwitchSoul/switch_soul.py

@@ -239,7 +239,7 @@ class SwitchSoul(BaseTask, SwitchSoulAssets):
             # 有则跳出检测
             # 有则跳出检测
             if result and len(result) > 0:
             if result and len(result) > 0:
                 break
                 break
-            self.swipe(self.S_SS_TEAM_SWIPE_UP)
+            self.swipe(self.S_SS_TEAM_SWIPE_UP, 0.3)
         logger.info('Swipe up to find target team')
         logger.info('Swipe up to find target team')
 
 
         # 选中分组
         # 选中分组

+ 5 - 1
tasks/KekkaiActivation/script_task.py

@@ -269,7 +269,11 @@ class ScriptTask(KU, KekkaiActivationAssets):
             if current_best is None:
             if current_best is None:
                 logger.warning('There is no card in the list')
                 logger.warning('There is no card in the list')
                 break
                 break
-
+            # Record best card for future comparison
+            if(card_best is None):
+                card_best = current_best
+            elif self.order_cards.index(current_best) <= self.order_cards.index(card_best):
+                break
             if current_best == self.order_cards[0]:
             if current_best == self.order_cards[0]:
                 break
                 break
             # 为什么找到第二个最优解也是会退出呢???
             # 为什么找到第二个最优解也是会退出呢???