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

Fix: merge LmeSzinc/dev into branch, resolve conflicts

Browse Source
This commit is contained in:
nEEtdo0d
2022-12-01 10:52:40 -05:00
parent c2d8fad6bb c9d296ad76
commit 1d433efc7b
29 changed files with 992 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
module/campaign/os_run.py
View File

@@ -22,15 +22,15 @@ class OSCampaignRun(OSMapOperation):
return True
def opsi_explore(self):
self.load_campaign()
try:
self.load_campaign()
self.campaign.os_explore()
except ActionPointLimit:
self.config.opsi_task_delay(ap_limit=True)
def opsi_shop(self):
self.load_campaign()
try:
self.load_campaign()
self.campaign.os_shop()
except ActionPointLimit:
self.config.opsi_task_delay(ap_limit=True)
@@ -43,15 +43,15 @@ class OSCampaignRun(OSMapOperation):
self.config.opsi_task_delay(ap_limit=True)
def opsi_daily(self):
self.load_campaign()
try:
self.load_campaign()
self.campaign.os_daily()
except ActionPointLimit:
self.config.opsi_task_delay(ap_limit=True)
def opsi_meowfficer_farming(self):
self.load_campaign()
try:
self.load_campaign()
self.campaign.os_meowfficer_farming()
except ActionPointLimit:
if get_os_reset_remain() > 0:
@@ -82,15 +82,15 @@ class OSCampaignRun(OSMapOperation):
self.config.task_delay(server_update=True)
def opsi_obscure(self):
self.load_campaign()
try:
self.load_campaign()
self.campaign.os_obscure()
except ActionPointLimit:
self.config.opsi_task_delay(ap_limit=True)
def opsi_abyssal(self):
self.load_campaign()
try:
self.load_campaign()
self.campaign.os_abyssal()
except ActionPointLimit:
self.config.opsi_task_delay(ap_limit=True)
@@ -103,8 +103,15 @@ class OSCampaignRun(OSMapOperation):
self.config.opsi_task_delay(ap_limit=True)
def opsi_stronghold(self):
self.load_campaign()
try:
self.load_campaign()
self.campaign.os_stronghold()
except ActionPointLimit:
self.config.opsi_task_delay(ap_limit=True)
def opsi_cross_month(self):
try:
self.load_campaign()
self.campaign.os_cross_month()
except ActionPointLimit:
self.campaign.os_cross_month_end()