1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 00:28:20 +08:00

Fix: 修复一些bug

- 修复了收完菜后不重新检查潜艇的问题
- 修复了使用潜艇时, 经验结算卡住的问题
- 调整了日常委托和教材类委托的权重, 不然一天下来, 日常委托做不完
This commit is contained in:
LmeSzinc
2020-04-16 22:01:52 +08:00
parent 6b41f3f692
commit 69b868a79e
8 changed files with 24 additions and 27 deletions

View File

@@ -103,6 +103,8 @@ class FleetOperator:
class FleetPreparation(ModuleBase):
map_fleet_checked = False
def fleet_preparation(self):
"""Change fleets.
@@ -110,7 +112,7 @@ class FleetPreparation(ModuleBase):
bool: True if changed.
"""
logger.info(f'Using fleet: {[self.config.FLEET_1, self.config.FLEET_2, self.config.SUBMARINE]}')
if self.config.FLEET_CHECKED:
if self.map_fleet_checked:
return False
if self.appear(FLEET_PREPARATION_HARD_1) or self.appear(FLEET_PREPARATION_HARD_2):
logger.info('Hard Campaign. No fleet preparation')
@@ -139,7 +141,7 @@ class FleetPreparation(ModuleBase):
if fleet_2.in_use():
fleet_2.clear()
fleet_1.ensure_to_be(self.config.FLEET_1)
self.config.FLEET_CHECKED = True
self.map_fleet_checked = True
return True
# Using both fleets.
@@ -147,7 +149,7 @@ class FleetPreparation(ModuleBase):
selected = fleet_1.selected()
if self.config.FLEET_1 in selected and self.config.FLEET_2 in selected:
fleet_1.close()
self.config.FLEET_CHECKED = True
self.map_fleet_checked = True
return True
else:
fleet_1.close()
@@ -155,5 +157,5 @@ class FleetPreparation(ModuleBase):
fleet_2.clear()
fleet_1.ensure_to_be(self.config.FLEET_1)
fleet_2.ensure_to_be(self.config.FLEET_2)
self.config.FLEET_CHECKED = True
self.map_fleet_checked = True
return True