sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 08:38:20 +08:00
Code Activity

Fix: change HAVE_KEEPED_CV to _have_keeped_cv

Browse Source
This commit is contained in:
Cyunmi
2021-08-14 21:17:49 +08:00
parent 5230994d48
commit 0923d7b069
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
module/retire/retirement.py
View File

@@ -23,6 +23,7 @@ CARD_RARITY_COLORS = {
} }
class Retirement(Enhancement): class Retirement(Enhancement):
_unable_to_enhance = False _unable_to_enhance = False
_have_keeped_cv = True
def _retirement_choose(self, amount=10, target_rarity=('N',)): def _retirement_choose(self, amount=10, target_rarity=('N',)):
""" """
@@ -130,7 +131,7 @@ class Retirement(Enhancement):
if self.appear_then_click(SHIP_CONFIRM, offset=(30, 30), interval=2): if self.appear_then_click(SHIP_CONFIRM, offset=(30, 30), interval=2):
continue continue
if self.appear(SHIP_CONFIRM_2, offset=(30, 30), interval=2): if self.appear(SHIP_CONFIRM_2, offset=(30, 30), interval=2):
if self.config.RETIRE_KEEP_COMMON_CV and not self.HAVE_KEEPED_CV: if self.config.RETIRE_KEEP_COMMON_CV and not self._have_keeped_cv:
self.keep_one_common_cv() self.keep_one_common_cv()
self.device.click(SHIP_CONFIRM_2) self.device.click(SHIP_CONFIRM_2)
continue continue
@@ -189,7 +190,7 @@ class Retirement(Enhancement):
total = 0 total = 0
if self.config.RETIRE_KEEP_COMMON_CV: if self.config.RETIRE_KEEP_COMMON_CV:
self.HAVE_KEEPED_CV = False self._have_keeped_cv= False
while 1: while 1:
self.handle_info_bar() self.handle_info_bar()
@@ -236,7 +237,7 @@ class Retirement(Enhancement):
total = 0 total = 0
if self.config.RETIRE_KEEP_COMMON_CV: if self.config.RETIRE_KEEP_COMMON_CV:
self.HAVE_KEEPED_CV = False self._have_keeped_cv= False
while amount: while amount:
selected = self._retirement_choose(amount=10 if amount > 10 else amount, target_rarity=rarity) selected = self._retirement_choose(amount=10 if amount > 10 else amount, target_rarity=rarity)
@@ -355,7 +356,7 @@ class Retirement(Enhancement):
button = self.retirement_get_common_rarity_cv() button = self.retirement_get_common_rarity_cv()
if button is not None: if button is not None:
if self._retire_select_one(button, skip_first_screenshot=False): if self._retire_select_one(button, skip_first_screenshot=False):
self.HAVE_KEEPED_CV = True self._have_keeped_cv= True
else: else:
logger.warning('No ship retired, exit') logger.warning('No ship retired, exit')