xtaodada/StarRailCopilot
1
0
Fork 0
mirror of https://github.com/LmeSzinc/StarRailCopilot.git synced 2024-11-15 22:19:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Update again after synthesize

Browse Source
This commit is contained in:
LmeSzinc 2024-06-13 01:40:43 +08:00
parent 9e30c82446
commit 1003e08f52
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tasks/item/synthesize.py
View File

@ -203,7 +203,7 @@ class Synthesize(CombatObtain, ItemUI):
items = [] items = []
def obtain_end(): def obtain_end():
return self.item_get_rarity(ENTRY_ITEM_FROM) is not None return self.ui_page_appear(page_synthesize) and self.item_get_rarity(ENTRY_ITEM_FROM) is not None
# Purple # Purple
self.synthesize_rarity_set('blue') self.synthesize_rarity_set('blue')
@ -432,6 +432,7 @@ class Synthesize(CombatObtain, ItemUI):
out: page_main out: page_main
""" """
logger.hr('Synthesize exit') logger.hr('Synthesize exit')
self.interval_clear(page_synthesize.check_button)
while 1: while 1:
if skip_first_screenshot: if skip_first_screenshot:
skip_first_screenshot = False skip_first_screenshot = False
@ -442,9 +443,9 @@ class Synthesize(CombatObtain, ItemUI):
if self.is_in_main(): if self.is_in_main():
break break
# Click # Click
if self.handle_ui_close(page_synthesize): if self.handle_ui_close(page_synthesize.check_button):
continue continue
if self.handle_ui_close(page_menu): if self.handle_ui_close(page_menu.check_button):
continue continue
if self.handle_reward(): if self.handle_reward():
continue continue
@ -475,7 +476,7 @@ class Synthesize(CombatObtain, ItemUI):
self.planner.load_obtained_amount(obtained) self.planner.load_obtained_amount(obtained)
if not row.need_synthesize(): if not row.need_synthesize():
logger.warning('Planner row do not need to synthesize') logger.warning('Planner row do not need to synthesize')
return False continue
logger.info(f'Synthesize row: {row}') logger.info(f'Synthesize row: {row}')
# green -> blue # green -> blue
@ -496,10 +497,15 @@ class Synthesize(CombatObtain, ItemUI):
self.synthesize_amount_set(value, total) self.synthesize_amount_set(value, total)
self.synthesize_confirm() self.synthesize_confirm()
# Update obtain amount
obtained = self.synthesize_obtain_get()
self.planner.load_obtained_amount(obtained)
self.synthesize_exit() self.synthesize_exit()
self.planner_write()
if __name__ == '__main__': if __name__ == '__main__':
self = Synthesize('src') self = Synthesize('src')
self.device.screenshot() self.device.screenshot()
self.synthesize_planner() self.synthesize_obtain_get()

2
tasks/planner/model.py
View File

@ -633,7 +633,7 @@ class PlannerMixin(UI):
remove.append(key) remove.append(key)
for key in remove: for key in remove:
self.config.cross_set(f'Dungeon.Planner.{key}', {}) self.config.cross_set(f'Dungeon.Planner.{key}', {})
print(progress, eta) # print(progress, eta)
# Set overall # Set overall
self.config.stored.PlannerOverall.value = f'{progress:.2f}%' self.config.stored.PlannerOverall.value = f'{progress:.2f}%'
self.config.stored.PlannerOverall.comment = f'<{eta:.1f}d' self.config.stored.PlannerOverall.comment = f'<{eta:.1f}d'