sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-28 16:14:06 +08:00
Code Activity

Opt: Remove debug logs, additional error checking for select methods

Browse Source
This commit is contained in:
nEEtdo0d
2020-12-30 19:19:22 -05:00
parent c184f1abc4
commit e920738c24
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
module/reward/guild.py
View File

@@ -114,7 +114,6 @@ class RewardGuild(UI):
in: GUILD_LOGISTICS in: GUILD_LOGISTICS
out: GUILD_LOGISTICS out: GUILD_LOGISTICS
""" """
logger.info(choices)
while len(choices): while len(choices):
# Select minimum by order of details # Select minimum by order of details
# First, item_weight then plate_weight then button_index # First, item_weight then plate_weight then button_index
@@ -205,7 +204,6 @@ class RewardGuild(UI):
# Scan the available exchange items that are selectable # Scan the available exchange items that are selectable
GUILD_EXCHANGE_ITEMS._load_image(self.device.image) GUILD_EXCHANGE_ITEMS._load_image(self.device.image)
name = [GUILD_EXCHANGE_ITEMS.match_template(item.image) for item in GUILD_EXCHANGE_ITEMS.items] name = [GUILD_EXCHANGE_ITEMS.match_template(item.image) for item in GUILD_EXCHANGE_ITEMS.items]
logger.info(f'{name}')
# Turn all elements into str and lowercase them # Turn all elements into str and lowercase them
return [str(item).lower() for item in name] return [str(item).lower() for item in name]
@@ -220,7 +218,6 @@ class RewardGuild(UI):
in: GUILD_LOGISTICS in: GUILD_LOGISTICS
out: GUILD_LOGISTICS out: GUILD_LOGISTICS
""" """
logger.info(options)
# Contains the details of all options # Contains the details of all options
choices = dict() choices = dict()
@@ -308,7 +305,9 @@ class RewardGuild(UI):
out: GUILD_LOBBY out: GUILD_LOBBY
""" """
# Transition to GUILD_LOBBY # Transition to GUILD_LOBBY
self.guild_sidebar_ensure(5) if not self.guild_sidebar_ensure(5):
logger.info('Ensurance has failed, please join a Guild first')
return
confirm_timer = Timer(1.5, count=3).start() confirm_timer = Timer(1.5, count=3).start()
while 1: while 1:
@@ -472,6 +471,8 @@ class RewardGuild(UI):
# correct sidebar # correct sidebar
self.ui_ensure(page_guild) self.ui_ensure(page_guild)
is_affiliation_azur = self.guild_affiliation_ensure() is_affiliation_azur = self.guild_affiliation_ensure()
if is_affiliation_azur is None:
return False
if logistics: if logistics:
self.guild_logistics(is_affiliation_azur) self.guild_logistics(is_affiliation_azur)