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

Merge pull request #326 from nEEtdo0d/my_neet

Browse Source 
Fix: War Archives Module
This commit is contained in:
Kyo
2021-01-30 13:55:58 -03:00
committed by GitHub
parent bae2ee8a64 fd61568ad0
commit d8fce2b1e1
7 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/cn/handler/USE_DATA_KEY_NOTIFIED.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
assets/en/handler/USE_DATA_KEY.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

BIN
assets/en/handler/USE_DATA_KEY_NOTIFIED.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
assets/jp/handler/USE_DATA_KEY_NOTIFIED.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
assets/tw/handler/USE_DATA_KEY_NOTIFIED.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.3 KiB

2
module/handler/info_handler.py
View File

@@ -115,6 +115,8 @@ class InfoHandler(ModuleBase):
return False return False
if self.appear(USE_DATA_KEY, offset=(20, 20)): if self.appear(USE_DATA_KEY, offset=(20, 20)):
self.device.click(USE_DATA_KEY_NOTIFIED)
self.device.sleep((0.5, 0.8))
return self.handle_popup_confirm('USE_DATA_KEY') return self.handle_popup_confirm('USE_DATA_KEY')
return False return False

4
module/war_archives/war_archives.py
View File

@@ -23,7 +23,7 @@ class CampaignWarArchives(CampaignRun, CampaignBase):
return False return False
return super().handle_reward() return super().handle_reward()
def triggered_stop_condition(self): def triggered_stop_condition(self, oil_check=True):
# Must be in archives campaign to OCR check # Must be in archives campaign to OCR check
if self.appear(WAR_ARCHIVES_CAMPAIGN_CHECK, offset=(20, 20)): if self.appear(WAR_ARCHIVES_CAMPAIGN_CHECK, offset=(20, 20)):
# Check for 0 data keys left to use # Check for 0 data keys left to use
@@ -34,7 +34,7 @@ class CampaignWarArchives(CampaignRun, CampaignBase):
return True return True
# Else, check other stop conditions # Else, check other stop conditions
return super().triggered_stop_condition() return super().triggered_stop_condition(oil_check)
def run(self, name=None, folder='campaign_main', total=0): def run(self, name=None, folder='campaign_main', total=0):
backup = self.config.cover(USE_DATA_KEY=True) backup = self.config.cover(USE_DATA_KEY=True)