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

Merge branch 'master' into app

Browse Source 
# Conflicts:
#	module/campaign/gems_farming.py
#	module/config/config.py
This commit is contained in:
LmeSzinc
2021-09-19 23:34:30 +08:00
parent b2ea5f897f fd4a345e7e
commit f71a151678
19 changed files with 69 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
module/campaign/gems_farming.py
View File

@@ -7,8 +7,8 @@ from module.equipment.fleet_equipment import OCR_FLEET_INDEX
from module.map.assets import FLEET_PREPARATION, MAP_PREPARATION
from module.ocr.ocr import Digit
from module.retire.dock import *
from module.retire.dock import Dock
from module.ui.page import page_fleet
from module.ui.page import page_fleet, page_main
from module.exception import CampaignEnd
SIM_VALUE = 0.95
@@ -41,7 +41,7 @@ class GemsCampaignOverride(CampaignBase):
or self.appear(MAP_PREPARATION, offset=(20, 20), interval=2):
self.enter_map_cancel()
break
return False
raise CampaignEnd('Emotion withdraw')
else:
return super().handle_combat_low_emotion()
@@ -96,6 +96,8 @@ class GemsFarming(CampaignRun, Dock, EquipmentChange):
self.equipment_take_on(index_list=index_list)
self.ui_ensure(page_main)
def vanguard_change(self):
"""
Change vanguard and vanguard's equipment
@@ -117,6 +119,7 @@ class GemsFarming(CampaignRun, Dock, EquipmentChange):
self._equip_take_off_one()
self.equipment_take_on()
self.ui_ensure(page_main)
def _ship_change_confirm(self, button):