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

Fix: Handle get items in action_point_enter

Browse Source 
Remove unused argument `quit` in handle_os_auto_search_map_option
This commit is contained in:
LmeSzinc
2022-12-28 16:58:46 +08:00
parent 352a219571
commit 6e0f53bd6d
4 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
module/os/globe_operation.py
View File

@@ -4,7 +4,6 @@ from module.logger import logger
from module.os.assets import *
from module.os_handler.action_point import ActionPointHandler
from module.os_handler.assets import AUTO_SEARCH_REWARD
from module.os_handler.map_event import MapEventHandler
ZONE_TYPES = [ZONE_DANGEROUS, ZONE_SAFE, ZONE_OBSCURE, ZONE_ABYSSAL, ZONE_STRONGHOLD, ZONE_ARCHIVE]
ZONE_SELECT = [SELECT_DANGEROUS, SELECT_SAFE, SELECT_OBSCURE, SELECT_ABYSSAL, SELECT_STRONGHOLD, SELECT_ARCHIVE]
@@ -19,7 +18,7 @@ class RewardUncollectedError(Exception):
pass
class GlobeOperation(ActionPointHandler, MapEventHandler):
class GlobeOperation(ActionPointHandler):
def is_in_globe(self):
return self.appear(GLOBE_GOTO_MAP, offset=(20, 20))

4
module/os/operation_siren.py
View File

@@ -306,7 +306,7 @@ class OperationSiren(OSMap):
keep_current_ap = True
if not self.is_cl1_enabled and self.config.OpsiGeneral_BuyActionPointLimit > 0:
keep_current_ap = False
self.set_action_point(cost=0, keep_current_ap=keep_current_ap)
self.action_point_set(cost=0, keep_current_ap=keep_current_ap)
ap_checked = True
# (1252, 1012) is the coordinate of zone 134 (the center zone) in os_globe_map.png
@@ -376,7 +376,7 @@ class OperationSiren(OSMap):
keep_current_ap = True
if self.config.OpsiGeneral_BuyActionPointLimit > 0:
keep_current_ap = False
self.set_action_point(cost=100, keep_current_ap=keep_current_ap)
self.action_point_set(cost=100, keep_current_ap=keep_current_ap)
if self._action_point_total >= 3000:
with self.config.multi_set():
self.config.task_delay(server_update=True)