mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-12 01:38:21 +08:00
Fix: 修复一些bug
- 修复了日常结束后不收菜的问题 - 修复登录 - 增加不能使用潜艇的地图的覆盖设置 - 修复了因图片不更新导致二队不会跳过阵容检查的问题 - 修复了一些过场图导致进入战斗判断错误的问题
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
import numpy as np
|
||||
|
||||
from module.base.timer import Timer
|
||||
from module.base.utils import color_bar_percentage
|
||||
from module.base.utils import color_bar_percentage, get_color
|
||||
from module.combat.assets import *
|
||||
from module.combat.combat_auto import CombatAuto
|
||||
from module.combat.combat_manual import CombatManual
|
||||
@@ -77,7 +79,7 @@ class Combat(HPBalancer, UrgentCommissionHandler, EnemySearchingHandler, Retirem
|
||||
Returns:
|
||||
bool:
|
||||
"""
|
||||
return self.appear(PAUSE)
|
||||
return self.appear(PAUSE) and np.mean(get_color(self.device.image, PAUSE_DOUBLE_CHECK.area)) < 153
|
||||
|
||||
def handle_combat_automation_confirm(self):
|
||||
if self.appear(AUTOMATION_CONFIRM_CHECK, interval=1):
|
||||
@@ -117,9 +119,8 @@ class Combat(HPBalancer, UrgentCommissionHandler, EnemySearchingHandler, Retirem
|
||||
continue
|
||||
|
||||
# Emotion
|
||||
if not self.config.ENABLE_MAP_FLEET_LOCK:
|
||||
if self.handle_combat_low_emotion():
|
||||
continue
|
||||
if self.handle_combat_low_emotion():
|
||||
continue
|
||||
|
||||
# Combat start
|
||||
if self.appear_then_click(BATTLE_PREPARATION):
|
||||
|
||||
Reference in New Issue
Block a user