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

Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript

Browse Source
This commit is contained in:
SevCrane
2024-06-05 23:53:03 +08:00
parent 5e482958f6 24aa3e00bd
commit 3cb29a9a37
179 changed files with 17873 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
module/campaign/campaign_event.py
View File

@@ -26,6 +26,7 @@ class CampaignEvent(CampaignStatus):
for task in ['GemsFarming']:
name = self.config.cross_get(keys=f'{task}.Campaign.Name', default='2-4')
if not self.stage_is_main(name):
<<<<<<< HEAD
from module.config.utils import deep_get
_gg_on = deep_get(self.config.data, keys='GameManager.GGHandler.Enabled')
if _gg_on:
@@ -34,6 +35,10 @@ class CampaignEvent(CampaignStatus):
campaign_to_go = '2-4'
logger.info(f'Reset GemsFarming to {campaign_to_go}')
self.config.cross_set(keys=f'{task}.Campaign.Name', value=campaign_to_go)
=======
logger.info(f'Reset GemsFarming to 2-4')
self.config.cross_set(keys=f'{task}.Campaign.Name', value='2-4')
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
self.config.cross_set(keys=f'{task}.Campaign.Event', value='campaign_main')
logger.info(f'Reset event time limit')
@@ -54,10 +59,15 @@ class CampaignEvent(CampaignStatus):
tasks = EVENTS + RAIDS + COALITIONS + GEMS_FARMINGS
command = self.config.Scheduler_Command
if limit <= 0 or command not in tasks:
<<<<<<< HEAD
self.get_event_pt()
return False
if command == 'GemsFarming' and self.stage_is_main(self.config.Campaign_Name):
self.get_event_pt()
=======
return False
if command == 'GemsFarming' and self.stage_is_main(self.config.Campaign_Name):
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
return False
pt = self.get_event_pt()
@@ -101,10 +111,15 @@ class CampaignEvent(CampaignStatus):
Pages:
in: page_event or page_sp
"""
<<<<<<< HEAD
from module.config.utils import deep_get
limit = self.config.TaskBalancer_CoinLimit
coin = deep_get(self.config.data, 'Dashboard.Coin.Value')
logger.attr('Coin Count', coin)
=======
limit = self.config.TaskBalancer_CoinLimit
coin = self.get_coin()
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
# Check Coin
if coin == 0:
# Avoid wrong/zero OCR result
@@ -121,12 +136,20 @@ class CampaignEvent(CampaignStatus):
return False
def handle_task_balancer(self):
<<<<<<< HEAD
if self.config.TaskBalancer_Enable and self.triggered_task_balancer():
self.config.task_delay(minute=5)
next_task = self.config.TaskBalancer_TaskCall
logger.hr(f'TaskBalancer triggered, switching task to {next_task}')
self.config.task_call(next_task)
self.config.task_stop()
=======
self.config.task_delay(minute=5)
next_task = self.config.TaskBalancer_TaskCall
logger.hr(f'TaskBalancer triggered, switching task to {next_task}')
self.config.task_call(next_task)
self.config.task_stop()
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
def is_event_entrance_available(self):
"""