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

Fix: Menu extraction

Browse Source 
- Delay task if reach oil limit
This commit is contained in:
LmeSzinc
2021-09-28 00:49:38 +08:00
parent 2627da413d
commit 5b772facb8
6 changed files with 71 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
module/campaign/run.py
View File

@@ -87,6 +87,7 @@ class CampaignRun(UI):
if OCR_OIL.ocr(self.device.image) < self.config.StopCondition_OilLimit:
logger.hr('Triggered stop condition: Oil limit')
self.config.Scheduler_Enable = False
self.config.task_delay(minute=(120, 240))
return True
# If Get a New Ship
if self.config.StopCondition_GetNewShip and self.campaign.config.GET_SHIP_TRIGGERED:

12
module/config/argument/menu.json
View File

@@ -1,11 +1,11 @@
{
"Task": {
"Farm": [
"Alas": [
"Alas",
"General",
"Restart"
],
"Reward": [
"Farm": [
"Main",
"Event",
"Raid",
@@ -15,7 +15,7 @@
"C124LargeLeveling",
"GemsFarming"
],
"Daily": [
"Reward": [
"Commission",
"Tactical",
"Research",
@@ -26,6 +26,12 @@
"Shop",
"Shipyard"
],
"Daily": [
"Daily",
"Hard",
"Exercise",
"Sos"
],
"Opsi": [
"OpsiGeneral",
"OpsiAshAssist",

2
module/config/config_updater.py
View File

@@ -199,9 +199,9 @@ class ConfigGenerator:
for line in f.readlines():
line = line.strip('\n')
if '=====' in line:
group = line.strip('#=- ')
if tasks:
deep_set(data, keys=f'Task.{group}', value=tasks)
group = line.strip('#=- ')
tasks = []
if group:
if line.endswith(':'):

20
module/config/i18n/en-US.json
View File

@@ -4,6 +4,10 @@
"name": "Menu.Task.name",
"help": "Menu.Task.help"
},
"Alas": {
"name": "Menu.Alas.name",
"help": "Menu.Alas.help"
},
"Farm": {
"name": "Menu.Farm.name",
"help": "Menu.Farm.help"
@@ -102,6 +106,22 @@
"name": "Task.Shipyard.name",
"help": "Task.Shipyard.help"
},
"Daily": {
"name": "Task.Daily.name",
"help": "Task.Daily.help"
},
"Hard": {
"name": "Task.Hard.name",
"help": "Task.Hard.help"
},
"Exercise": {
"name": "Task.Exercise.name",
"help": "Task.Exercise.help"
},
"Sos": {
"name": "Task.Sos.name",
"help": "Task.Sos.help"
},
"OpsiGeneral": {
"name": "Task.OpsiGeneral.name",
"help": "Task.OpsiGeneral.help"

20
module/config/i18n/zh-CN.json
View File

@@ -4,6 +4,10 @@
"name": "Menu.Task.name",
"help": "Menu.Task.help"
},
"Alas": {
"name": "Menu.Alas.name",
"help": "Menu.Alas.help"
},
"Farm": {
"name": "Menu.Farm.name",
"help": "Menu.Farm.help"
@@ -102,6 +106,22 @@
"name": "Task.Shipyard.name",
"help": "Task.Shipyard.help"
},
"Daily": {
"name": "Task.Daily.name",
"help": "Task.Daily.help"
},
"Hard": {
"name": "Task.Hard.name",
"help": "Task.Hard.help"
},
"Exercise": {
"name": "Task.Exercise.name",
"help": "Task.Exercise.help"
},
"Sos": {
"name": "Task.Sos.name",
"help": "Task.Sos.help"
},
"OpsiGeneral": {
"name": "Task.OpsiGeneral.name",
"help": "Task.OpsiGeneral.help"

20
module/config/i18n/zh-TW.json
View File

@@ -4,6 +4,10 @@
"name": "Menu.Task.name",
"help": "Menu.Task.help"
},
"Alas": {
"name": "Menu.Alas.name",
"help": "Menu.Alas.help"
},
"Farm": {
"name": "Menu.Farm.name",
"help": "Menu.Farm.help"
@@ -102,6 +106,22 @@
"name": "Task.Shipyard.name",
"help": "Task.Shipyard.help"
},
"Daily": {
"name": "Task.Daily.name",
"help": "Task.Daily.help"
},
"Hard": {
"name": "Task.Hard.name",
"help": "Task.Hard.help"
},
"Exercise": {
"name": "Task.Exercise.name",
"help": "Task.Exercise.help"
},
"Sos": {
"name": "Task.Sos.name",
"help": "Task.Sos.help"
},
"OpsiGeneral": {
"name": "Task.OpsiGeneral.name",
"help": "Task.OpsiGeneral.help"