sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 03:58:22 +08:00
Code Activity

Add: OS daily support

Browse Source
This commit is contained in:
LmeSzinc
2021-04-23 15:01:50 +08:00
parent af6c976a26
commit 109876ff97
5 changed files with 56 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/os_handler/action_point.py
View File

@@ -68,7 +68,9 @@ class ActionPointHandler(UI):
items = ACTION_POINT_ITEMS.predict(self.device.image, name=False, amount=True)
box = [item.amount for item in items]
current = OCR_ACTION_POINT_REMAIN.ocr(self.device.image)
total = np.sum(np.array(box) * (0, 20, 50, 200)) + current
total = current
if self.config.OS_ACTION_POINT_BOX_USE:
total += np.sum(np.array(box) * (0, 20, 50, 200))
oil = box[0]
logger.info(f'Action points: {current}({total}), oil: {oil}')

2
module/os_handler/map_event.py
View File

@@ -168,6 +168,6 @@ class MapEventHandler(EnemySearchingHandler):
and AUTO_SEARCH_OS_MAP_OPTION_OFF.match_appear_on(self.device.image) \
and self.info_bar_count() >= 2:
raise CampaignEnd
if self.appear(AUTO_SEARCH_REWARD, offset=(20, 20)):
if self.appear(AUTO_SEARCH_REWARD, offset=(20, 50)):
self.os_auto_search_quit()
raise CampaignEnd