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

Merge pull request #5030 from LmeSzinc/dev

Browse Source 
Bug fix
This commit is contained in:
LmeSzinc
2025-08-15 11:59:32 +08:00
committed by GitHub
parent 7a9cc5e325 034f69e98e
commit 4b6229f123
3 changed files with 33 additions and 35 deletions
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) logger.hr('Mail', level=1)
MailWhite(self.config, self.device).run() MailWhite(self.config, self.device).run()
if self.config.SupplyPack_Collect: if self.config.SERVER in ['tw']:
logger.hr('Supply pack', level=1) if self.config.SupplyPack_Collect:
SupplyPack(self.config, self.device).run() logger.hr('Supply pack', level=1)
SupplyPack(self.config, self.device).run()
self.config.task_delay(server_update=True) 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.assets import *
from module.private_quarters.interact import PQInteract from module.private_quarters.interact import PQInteract
from module.private_quarters.shop import PQShop 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): class PrivateQuarters(PQInteract, PQShop):
@@ -157,6 +157,7 @@ class PrivateQuarters(PQInteract, PQShop):
out: page_main, may have info_bar out: page_main, may have info_bar
""" """
if server.server in ['cn', 'en', 'jp']: if server.server in ['cn', 'en', 'jp']:
self.ui_ensure(page_dormmenu)
self.ui_goto(page_private_quarters, get_ship=False) self.ui_goto(page_private_quarters, get_ship=False)
self.handle_info_bar() self.handle_info_bar()

58
module/shop/shop_reward.py
View File

@@ -8,45 +8,41 @@ from module.shop.ui import ShopUI
class RewardShop(ShopUI): class RewardShop(ShopUI):
def run_frequent(self): def run_frequent(self):
self.config.task_delay(server_update=True) if self.config.SERVER in ['tw']:
self.config.task_stop() # Munitions shops
self.ui_goto_shop()
# Munitions shops self.device.click_record_clear()
self.ui_goto_shop() self.shop_tab.set(main=self, left=2)
self.shop_nav.set(main=self, upper=1)
self.device.click_record_clear() GeneralShop(self.config, self.device).run()
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) self.config.task_delay(server_update=True)
def run_once(self): def run_once(self):
self.config.task_delay(server_update=True) if self.config.SERVER in ['tw']:
self.config.task_stop() # Munitions shops
self.ui_goto_shop()
# Munitions shops self.device.click_record_clear()
self.ui_goto_shop() 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.device.click_record_clear()
self.shop_tab.set(main=self, left=2) self.shop_tab.set(main=self, left=2)
self.shop_nav.set(main=self, upper=2) self.shop_nav.set(main=self, upper=3)
MeritShop(self.config, self.device).run() GuildShop(self.config, self.device).run()
self.device.click_record_clear() # core limited, core monthly, medal, prototype
self.shop_tab.set(main=self, left=2) self.device.click_record_clear()
self.shop_nav.set(main=self, upper=3) self.shop_tab.set(main=self, left=1)
GuildShop(self.config, self.device).run() 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.device.click_record_clear() self.shop_tab.set(main=self, left=1)
self.shop_tab.set(main=self, left=1) self.shop_nav.set(main=self, upper=3)
self.shop_nav.set(main=self, upper=2) MedalShop2(self.config, self.device).run()
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.config.task_delay(server_update=True) self.config.task_delay(server_update=True)