ReDawn/M-AzurLaneAutoScript
1
0
Fork 0
mirror of https://github.com/W1NDes/M-AzurLaneAutoScript.git synced 2026-05-14 07:08:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix(7Dtask: 将处理退役任务改为可选项

Browse Source
This commit is contained in:
W1NDes 2025-08-09 16:16:21 +08:00
parent 87dea7656d
commit 613ef9f22c
9 changed files with 43 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/template.json
View File

@ -1863,6 +1863,7 @@
"Smallevent": {
"SevenDayTask": true,
"UpdateInfoImmediately": false,
"autoRetire": false,
"OcrModel": "volc"
},
"Storage": {

4
module/config/argument/args.json
View File

@ -9164,6 +9164,10 @@
"type": "checkbox",
"value": false
},
"autoRetire": {
"type": "checkbox",
"value": false
},
"OcrModel": {
"type": "select",
"value": "volc",

1
module/config/argument/argument.yaml
View File

@ -732,6 +732,7 @@ Minigame:
Smallevent:
SevenDayTask: true
UpdateInfoImmediately: false
autoRetire: false
OcrModel:
value: volc
option: [ baidu, volc ]

1
module/config/config_generated.py
View File

@ -447,6 +447,7 @@ class GeneratedConfig:
# Group `Smallevent`
Smallevent_SevenDayTask = True
Smallevent_UpdateInfoImmediately = False
Smallevent_autoRetire = False
Smallevent_OcrModel = 'volc' # baidu, volc
# Group `Oilkeep`

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

@ -2507,6 +2507,10 @@
"name": "Smallevent.UpdateInfoImmediately.name",
"help": "Smallevent.UpdateInfoImmediately.help"
},
"autoRetire": {
"name": "Smallevent.autoRetire.name",
"help": "Smallevent.autoRetire.help"
},
"OcrModel": {
"name": "Smallevent.OcrModel.name",
"help": "Smallevent.OcrModel.help",

4
module/config/i18n/ja-JP.json
View File

@ -2507,6 +2507,10 @@
"name": "Smallevent.UpdateInfoImmediately.name",
"help": "Smallevent.UpdateInfoImmediately.help"
},
"autoRetire": {
"name": "Smallevent.autoRetire.name",
"help": "Smallevent.autoRetire.help"
},
"OcrModel": {
"name": "Smallevent.OcrModel.name",
"help": "Smallevent.OcrModel.help",

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

@ -2507,6 +2507,10 @@
"name": "立即更新任务进度",
"help": "开启后，会立即更新任务进度(多消耗一次api调用)，否则会等到第二天更新"
},
"autoRetire": {
"name": "自动完成退役任务",
"help": "开启后，会自动一键退役舰船以完成7日小任务"
},
"OcrModel": {
"name": "OCR模型",
"help": "选择OCR模型，火山OCR和百度OCR",

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

@ -2507,6 +2507,10 @@
"name": "Smallevent.UpdateInfoImmediately.name",
"help": "Smallevent.UpdateInfoImmediately.help"
},
"autoRetire": {
"name": "Smallevent.autoRetire.name",
"help": "Smallevent.autoRetire.help"
},
"OcrModel": {
"name": "Smallevent.OcrModel.name",
"help": "Smallevent.OcrModel.help",

35
module/smallevent/samllevent.py
View File

@ -183,22 +183,27 @@ class SmallEvent(UI):
return True
if "舰船退役" in text:
logger.info(f'resolve the task: 舰船退役')
from module.retire.retirement import Retirement
from module.ui.page import page_retire
self.ui_ensure(destination=page_retire)
retire = Retirement(self.config)
retire._unable_to_enhance = True
retire.device.screenshot()
total = retire.retire_ships_one_click()
if not total:
logger.warning(
'No ship retired, trying to reset dock filter and disable favourite, then retire again')
retire.dock_favourite_set(False, wait_loading=False)
retire.dock_filter_set()
if self.config.Smallevent_autoRetire == True:
logger.info("resolve the 7Dtask with auto retire")
from module.retire.retirement import Retirement
from module.ui.page import page_retire
self.ui_ensure(destination=page_retire)
retire = Retirement(self.config)
retire._unable_to_enhance = True
retire.device.screenshot()
total = retire.retire_ships_one_click()
if not total:
logger.critical('No ship retired')
return True
if not total:
logger.warning(
'No ship retired, trying to reset dock filter and disable favourite, then retire again')
retire.dock_favourite_set(False, wait_loading=False)
retire.dock_filter_set()
total = retire.retire_ships_one_click()
if not total:
logger.critical('No ship retired')
return True
else:
logger.info("skip the retire task")
return False
return False