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

Add: Frame of preset commission filter

Browse Source
This commit is contained in:
SarContDeli
2022-10-21 21:00:18 +08:00
parent c9d296ad76
commit ca6810d569
13 changed files with 101 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
module/commission/commission.py
View File

@@ -6,8 +6,9 @@ from module.base.timer import Timer
from module.base.utils import *
from module.combat.assets import *
from module.commission.assets import *
from module.commission.project import (COMMISSION_FILTER, SHORTEST_FILTER,
Commission)
from module.commission.preset import DICT_FILTER_PRESET, SHORTEST_FILTER
from module.commission.project import COMMISSION_FILTER, Commission
from module.config.config_generated import GeneratedConfig
from module.exception import GameStuckError
from module.handler.info_handler import InfoHandler
from module.logger import logger
@@ -127,8 +128,22 @@ class RewardCommission(UI, InfoHandler):
np.sum([1 for c in total if c.status == 'running']))
logger.attr('Running', f'{running_count}/{self.max_commission}')
# Load filter string
preset = self.config.Commission_PresetFilter
if preset == 'custom':
string = self.config.Commission_CustomFilter
else:
if f'{preset}_24h' in DICT_FILTER_PRESET \
and self.config.cross_get(keys='GemsFarming.GemsFarming.CommissionLimit', default=False):
preset = f'{preset}_24h'
if preset not in DICT_FILTER_PRESET:
logger.warning(f'Preset not found: {preset}, use default preset')
preset = GeneratedConfig.Commission_PresetFilter
string = DICT_FILTER_PRESET[preset]
logger.attr('Commission Filter', preset)
# Filter
COMMISSION_FILTER.load(self.config.Commission_CommissionFilter)
COMMISSION_FILTER.load(string)
run = COMMISSION_FILTER.apply(total.grids, func=self._commission_check)
logger.attr('Filter_sort', ' > '.join([str(c) for c in run]))
run = SelectedGrids(run)