Add: 适配第二章

- 修复了不开启周回模式时, 会在出击界面开启自动的问题
- 修复了多打一战后, 打完BOSS不判定当前出击结束的问题
- 增加掉落新船时锁定的功能
- 增加了地图不支持周回模式时, 跳过周回检查的功能
  周回模式的选项可以无脑开了
- 修改透视识别报warning为info
  因为低级图地图小降低了检测的阈值, 导致需要纠正错误有点多
- 减少了战斗准备页面的多余点击
- 减少了挂委托时的多余点击

module/combat/combat.py

@@ -123,7 +123,7 @@ class Combat(HPBalancer, UrgentCommissionHandler, EnemySearchingHandler, Retirem
                 continue
 
             # Combat start
-            if self.appear_then_click(BATTLE_PREPARATION):
+            if self.appear_then_click(BATTLE_PREPARATION, interval=2):
                 continue
 
             if self.handle_combat_automation_confirm():
@@ -259,6 +259,8 @@ class Combat(HPBalancer, UrgentCommissionHandler, EnemySearchingHandler, Retirem
                 continue
             if self.handle_battle_status(save_get_items=save_get_items):
                 continue
+            if self.handle_popup_confirm():
+                continue
             if self.handle_get_ship():
                 continue
             if self.appear_then_click(EXP_INFO_S):
@@ -294,7 +296,7 @@ class Combat(HPBalancer, UrgentCommissionHandler, EnemySearchingHandler, Retirem
         """
         balance_hp = balance_hp if balance_hp is not None else self.config.ENABLE_HP_BALANCE
         emotion_reduce = emotion_reduce if emotion_reduce is not None else self.config.ENABLE_EMOTION_REDUCE
-        auto = func is None
+        auto = self.config.COMBAT_AUTO_MODE == 'combat_auto'
         call_submarine_at_boss = call_submarine_at_boss if call_submarine_at_boss is not None else self.config.SUBMARINE_CALL_AT_BOSS
         save_get_items = save_get_items if save_get_items is not None else self.config.ENABLE_SAVE_GET_ITEMS