mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-05-30 04:23:29 +08:00
Upd: method dorm_food_run
This commit is contained in:
@@ -563,8 +563,7 @@ class RewardCommission(UI, InfoHandler):
|
|||||||
if self.config.SERVER in ['cn']:
|
if self.config.SERVER in ['cn']:
|
||||||
if self.appear(OIL_MAXED, offset=(20, 20), interval=3):
|
if self.appear(OIL_MAXED, offset=(20, 20), interval=3):
|
||||||
logger.info("Oil maxed, buy food to consume oil")
|
logger.info("Oil maxed, buy food to consume oil")
|
||||||
RewardDorm(self.config, self.device).dorm_run(
|
RewardDorm(self.config, self.device).dorm_food_run(amount=10)
|
||||||
feed=False, collect=False, buy_furniture=False, buy_food=10)
|
|
||||||
self.ui_ensure(page_reward)
|
self.ui_ensure(page_reward)
|
||||||
continue
|
continue
|
||||||
# Check GET_SHIP at last to handle random white background at page_main
|
# Check GET_SHIP at last to handle random white background at page_main
|
||||||
|
|||||||
@@ -481,13 +481,35 @@ class RewardDorm(UI):
|
|||||||
if self.appear_then_click(DORM_BUY_FOOD_CONFIRM, offset=(20, 20), interval=5):
|
if self.appear_then_click(DORM_BUY_FOOD_CONFIRM, offset=(20, 20), interval=5):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
def dorm_run(self, feed=True, collect=True, buy_furniture=False, buy_food=0):
|
def dorm_food_run(self, amount):
|
||||||
|
"""
|
||||||
|
Args:
|
||||||
|
amount (int): amount of food to buy
|
||||||
|
|
||||||
|
Pages:
|
||||||
|
in: Any page
|
||||||
|
out: page_dorm
|
||||||
|
"""
|
||||||
|
if amount <= 0:
|
||||||
|
return
|
||||||
|
|
||||||
|
self.ui_ensure(page_dormmenu)
|
||||||
|
self.handle_info_bar()
|
||||||
|
self.ui_goto(page_dorm, skip_first_screenshot=True)
|
||||||
|
logger.hr('Dorm buy food', level=1)
|
||||||
|
self.dorm_feed_enter()
|
||||||
|
self.dorm_buy_food_enter()
|
||||||
|
self.dorm_buy_food(amount=amount)
|
||||||
|
self.dorm_buy_food_confirm()
|
||||||
|
self.dorm_feed_quit()
|
||||||
|
|
||||||
|
def dorm_run(self, feed=True, collect=True, buy_furniture=False):
|
||||||
"""
|
"""
|
||||||
Pages:
|
Pages:
|
||||||
in: Any page
|
in: Any page
|
||||||
out: page_dorm
|
out: page_dorm
|
||||||
"""
|
"""
|
||||||
if not feed and not collect and not buy_furniture and buy_food <= 0:
|
if not feed and not collect and not buy_furniture:
|
||||||
return
|
return
|
||||||
|
|
||||||
self.ui_ensure(page_dormmenu)
|
self.ui_ensure(page_dormmenu)
|
||||||
@@ -516,19 +538,8 @@ class RewardDorm(UI):
|
|||||||
logger.hr('Dorm buy furniture', level=1)
|
logger.hr('Dorm buy furniture', level=1)
|
||||||
BuyFurniture(self.config, self.device).run()
|
BuyFurniture(self.config, self.device).run()
|
||||||
|
|
||||||
if buy_food > 0:
|
|
||||||
logger.hr('Dorm buy food', level=1)
|
|
||||||
self.dorm_feed_enter()
|
|
||||||
self.dorm_buy_food_enter()
|
|
||||||
self.dorm_buy_food(amount=buy_food)
|
|
||||||
self.dorm_buy_food_confirm()
|
|
||||||
self.dorm_feed_quit()
|
|
||||||
|
|
||||||
def get_dorm_ship_amount(self):
|
def get_dorm_ship_amount(self):
|
||||||
"""
|
"""
|
||||||
Args:
|
|
||||||
skip_first_screenshot:
|
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
int: Number of ships in dorm
|
int: Number of ships in dorm
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user