ReDawn/M-AzurLaneAutoScript
1
0
Fork 0
mirror of https://github.com/W1NDes/M-AzurLaneAutoScript.git synced 2026-05-14 07:08:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
W1NDes 2025-08-15 15:49:12 +08:00
commit edadfe83e1
3 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
module/freebies/freebies.py
View File

@ -22,8 +22,9 @@ class Freebies(ModuleBase):
logger.hr('Mail', level=1)
MailWhite(self.config, self.device).run()
if self.config.SupplyPack_Collect:
logger.hr('Supply pack', level=1)
SupplyPack(self.config, self.device).run()
if self.config.SERVER in ['tw']:
if self.config.SupplyPack_Collect:
logger.hr('Supply pack', level=1)
SupplyPack(self.config, self.device).run()
self.config.task_delay(server_update=True)

3
module/private_quarters/private_quarters.py
View File

@ -4,7 +4,7 @@ from module.logger import logger
from module.private_quarters.assets import *
from module.private_quarters.interact import PQInteract
from module.private_quarters.shop import PQShop
from module.ui.page import page_private_quarters
from module.ui.page import page_private_quarters, page_dormmenu
class PrivateQuarters(PQInteract, PQShop):
@ -157,6 +157,7 @@ class PrivateQuarters(PQInteract, PQShop):
out: page_main, may have info_bar
"""
if server.server in ['cn', 'en', 'jp']:
self.ui_ensure(page_dormmenu)
self.ui_goto(page_private_quarters, get_ship=False)
self.handle_info_bar()

57
module/shop/shop_reward.py
View File

@ -10,22 +10,21 @@ from module.shop_event.ui import OCR_EVENT_SHOP_SECOND_ENSURE
class RewardShop(ShopUI):
def run_frequent(self):
self.config.task_delay(server_update=True)
self.config.task_stop()
if self.config.SERVER in ['tw']:
# Munitions shops
self.ui_goto_shop()
# Munitions shops
self.ui_goto_shop()
self.device.click_record_clear()
self.shop_tab.set(main=self, left=2)
self.shop_nav.set(main=self, upper=1)
GeneralShop(self.config, self.device).run()
self.device.click_record_clear()
self.shop_tab.set(main=self, left=2)
self.shop_nav.set(main=self, upper=1)
GeneralShop(self.config, self.device).run()
self.config.task_delay(server_update=True)
def run_once(self):
self.config.task_delay(server_update=True)
self.config.task_stop()
if self.config.SERVER in ['tw']:
# Munitions shops
self.ui_goto_shop()
# Munitions shops
if self.config.EventShop_Enable:
@ -38,26 +37,26 @@ class RewardShop(ShopUI):
EventShop(self.config, self.device).run()
else:
self.ui_goto_shop()
self.device.click_record_clear()
self.shop_tab.set(main=self, left=2)
self.shop_nav.set(main=self, upper=2)
MeritShop(self.config, self.device).run()
self.device.click_record_clear()
self.shop_tab.set(main=self, left=2)
self.shop_nav.set(main=self, upper=2)
MeritShop(self.config, self.device).run()
self.device.click_record_clear()
self.shop_tab.set(main=self, left=2)
self.shop_nav.set(main=self, upper=3)
GuildShop(self.config, self.device).run()
self.device.click_record_clear()
self.shop_tab.set(main=self, left=2)
self.shop_nav.set(main=self, upper=3)
GuildShop(self.config, self.device).run()
# core limited, core monthly, medal, prototype
self.device.click_record_clear()
self.shop_tab.set(main=self, left=1)
self.shop_nav.set(main=self, upper=2)
CoreShop(self.config, self.device).run()
# core limited, core monthly, medal, prototype
self.device.click_record_clear()
self.shop_tab.set(main=self, left=1)
self.shop_nav.set(main=self, upper=2)
CoreShop(self.config, self.device).run()
self.device.click_record_clear()
self.shop_tab.set(main=self, left=1)
self.shop_nav.set(main=self, upper=3)
MedalShop2(self.config, self.device).run()
self.device.click_record_clear()
self.shop_tab.set(main=self, left=1)
self.shop_nav.set(main=self, upper=3)
MedalShop2(self.config, self.device).run()
self.config.task_delay(server_update=True)