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

Fix: Strip thousands separators in EventGeneral.PtLimit

Browse Source
This commit is contained in:
LmeSzinc
2022-07-30 00:23:26 +08:00
parent ea3d61c5de
commit 9786e2951b
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
module/campaign/campaign_event.py
View File

@@ -45,7 +45,7 @@ class CampaignEvent(UI):
""" """
pt = self.campaign_pt_ocr.ocr(self.device.image) pt = self.campaign_pt_ocr.ocr(self.device.image)
res = re.search('X(\d+)', pt) res = re.search(r'X(\d+)', pt)
if res: if res:
pt = int(res.group(1)) pt = int(res.group(1))
logger.attr('Event_PT', pt) logger.attr('Event_PT', pt)
@@ -83,7 +83,10 @@ class CampaignEvent(UI):
Pages: Pages:
in: page_event or page_sp in: page_event or page_sp
""" """
limit = int(self.config.EventGeneral_PtLimit) # Some may use "100,000"
limit = int(
re.sub(r'[,.\'"，。]', '', str(self.config.EventGeneral_PtLimit))
)
tasks = [ tasks = [
'Event', 'Event',
'Event2', 'Event2',
@@ -93,7 +96,7 @@ class CampaignEvent(UI):
'EventD', 'EventD',
'EventSp', 'EventSp',
'Raid', 'Raid',
'RaidDaily' 'RaidDaily',
'GemsFarming', 'GemsFarming',
] ]
command = self.config.Scheduler_Command command = self.config.Scheduler_Command
@@ -103,6 +106,7 @@ class CampaignEvent(UI):
return False return False
pt = self.get_event_pt() pt = self.get_event_pt()
logger.attr('Event_PT_limit', f'{pt}/{limit}')
if pt >= limit: if pt >= limit:
logger.hr(f'Reach event PT limit: {limit}') logger.hr(f'Reach event PT limit: {limit}')
self._disable_tasks(tasks) self._disable_tasks(tasks)
@@ -138,7 +142,8 @@ class CampaignEvent(UI):
if command == 'GemsFarming' and self.config.Campaign_Event == 'campaign_main': if command == 'GemsFarming' and self.config.Campaign_Event == 'campaign_main':
return False return False
now = datetime.now() now = datetime.now().replace(microsecond=0)
logger.attr('Event_PT_limit', f'{now} -> {limit}')
if now > limit: if now > limit:
logger.hr(f'Reach event time limit: {limit}') logger.hr(f'Reach event time limit: {limit}')
self._disable_tasks(tasks) self._disable_tasks(tasks)