From 1dae1bac6c779a846a2c27c2c8ad26b0c2d45788 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Wed, 5 Aug 2026 00:33:34 +0800 Subject: [PATCH] Del: delete MaritimeEscort task, no more rerun for this event --- config/template.json | 16 --------- module/config/argument/args.json | 51 ---------------------------- module/config/argument/argument.yaml | 2 -- module/config/argument/menu.json | 1 - module/config/argument/override.yaml | 5 --- module/config/argument/task.yaml | 3 -- module/config/config_generated.py | 3 -- module/config/i18n/en-US.json | 14 -------- module/config/i18n/ja-JP.json | 14 -------- module/config/i18n/zh-CN.json | 14 -------- module/config/i18n/zh-TW.json | 14 -------- 11 files changed, 137 deletions(-) diff --git a/config/template.json b/config/template.json index aac2acf1b..cc3ae3536 100644 --- a/config/template.json +++ b/config/template.json @@ -666,22 +666,6 @@ "Storage": {} } }, - "MaritimeEscort": { - "Scheduler": { - "Enable": false, - "NextRun": "2020-01-01 00:00:00", - "Command": "MaritimeEscort", - "SuccessInterval": 30, - "FailureInterval": 30, - "ServerUpdate": "00:00" - }, - "MaritimeEscort": { - "Enable": true - }, - "Storage": { - "Storage": {} - } - }, "WarArchives": { "Scheduler": { "Enable": false, diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 60c69e301..1b4a66c43 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -3477,57 +3477,6 @@ } } }, - "MaritimeEscort": { - "Scheduler": { - "Enable": { - "type": "checkbox", - "value": false, - "option": [ - true, - false - ] - }, - "NextRun": { - "type": "datetime", - "value": "2020-01-01 00:00:00", - "validate": "datetime" - }, - "Command": { - "type": "input", - "value": "MaritimeEscort", - "display": "hide" - }, - "SuccessInterval": { - "type": "input", - "value": 30, - "display": "hide" - }, - "FailureInterval": { - "type": "input", - "value": 30, - "display": "hide" - }, - "ServerUpdate": { - "type": "input", - "value": "00:00", - "display": "hide" - } - }, - "MaritimeEscort": { - "Enable": { - "type": "checkbox", - "value": true - } - }, - "Storage": { - "Storage": { - "type": "storage", - "value": {}, - "valuetype": "ignore", - "display": "disabled" - } - } - }, "WarArchives": { "Scheduler": { "Enable": { diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index 5fb541157..e7ee8c6d9 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -311,8 +311,6 @@ RaidDaily: hard > normal > easy Hospital: UseRecommendFleet: true -MaritimeEscort: - Enable: true Coalition: Mode: value: hard diff --git a/module/config/argument/menu.json b/module/config/argument/menu.json index 7a2c2243d..a745ee04e 100644 --- a/module/config/argument/menu.json +++ b/module/config/argument/menu.json @@ -28,7 +28,6 @@ "Event2", "Raid", "Hospital", - "MaritimeEscort", "WarArchives" ] }, diff --git a/module/config/argument/override.yaml b/module/config/argument/override.yaml index 99266fc18..9430455f5 100644 --- a/module/config/argument/override.yaml +++ b/module/config/argument/override.yaml @@ -215,11 +215,6 @@ RaidDaily: Fleet2Control: prevent_yellow_face Fleet2Recover: not_in_dormitory Fleet2Oath: false -MaritimeEscort: - Scheduler: - SuccessInterval: 30 - FailureInterval: 30 - ServerUpdate: 00:00 Coalition: Scheduler: SuccessInterval: 30 diff --git a/module/config/argument/task.yaml b/module/config/argument/task.yaml index 6ecd4d843..9fb52b375 100644 --- a/module/config/argument/task.yaml +++ b/module/config/argument/task.yaml @@ -109,9 +109,6 @@ Event: - Hospital - StopCondition - Emotion - MaritimeEscort: - - Scheduler - - MaritimeEscort WarArchives: - Scheduler - Campaign diff --git a/module/config/config_generated.py b/module/config/config_generated.py index 1f45f2f65..101dc0b1f 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -181,9 +181,6 @@ class GeneratedConfig: # Group `Hospital` Hospital_UseRecommendFleet = True - # Group `MaritimeEscort` - MaritimeEscort_Enable = True - # Group `Coalition` Coalition_Mode = 'hard' # easy, normal, hard, sp Coalition_Fleet = 'single' # single, multi diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index f7a446b15..f8839029e 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -86,10 +86,6 @@ "name": "Valley Hospital", "help": "" }, - "MaritimeEscort": { - "name": "Maritime Escort", - "help": "" - }, "WarArchives": { "name": "War Archives", "help": "Due to the lack of maintenance of war archives, continuous clear may not work normally, if Alas runs abnormally, Please manually finish clearing and use auto search" @@ -1338,16 +1334,6 @@ "help": "If turned off, you need to manually prepare fleets of all 15 stages in advance" } }, - "MaritimeEscort": { - "_info": { - "name": "Maritime Escort", - "help": "Enter then retreat, get about 70% of maximum rewards" - }, - "Enable": { - "name": "Enable maritime Escort", - "help": "" - } - }, "Coalition": { "_info": { "name": "Event Settings", diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index 73d221f4b..c29abc74d 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -86,10 +86,6 @@ "name": "病院探訪", "help": "" }, - "MaritimeEscort": { - "name": "Maritime Escort", - "help": "" - }, "WarArchives": { "name": "作戦履歴", "help": "" @@ -1338,16 +1334,6 @@ "help": "Hospital.UseRecommendFleet.help" } }, - "MaritimeEscort": { - "_info": { - "name": "MaritimeEscort._info.name", - "help": "MaritimeEscort._info.help" - }, - "Enable": { - "name": "MaritimeEscort.Enable.name", - "help": "MaritimeEscort.Enable.help" - } - }, "Coalition": { "_info": { "name": "Coalition._info.name", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index fb9c03ea5..9ce8b48eb 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -86,10 +86,6 @@ "name": "深谷来信", "help": "" }, - "MaritimeEscort": { - "name": "商船护航", - "help": "" - }, "WarArchives": { "name": "作战档案", "help": "由于作战档案缺少维护，开荒功能不一定能正常使用，如果发现Alas运行异常，请手动完成开荒后使用自律寻敌功能" @@ -1338,16 +1334,6 @@ "help": "如果关闭，需要事先手动为所有15个关卡配队" } }, - "MaritimeEscort": { - "_info": { - "name": "商船护航", - "help": "进一下就撤退，能拿约70%的奖励" - }, - "Enable": { - "name": "启用商船护航", - "help": "" - } - }, "Coalition": { "_info": { "name": "活动设置", diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index b90ede1fa..0516c5039 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -86,10 +86,6 @@ "name": "深谷来信", "help": "" }, - "MaritimeEscort": { - "name": "商船護航", - "help": "" - }, "WarArchives": { "name": "作戰檔案", "help": "由於作戰檔案缺少維護，開荒功能不一定能正常使用，如果發現Alas運行異常，請手動完成開荒後使用自律尋敵功能" @@ -1338,16 +1334,6 @@ "help": "如果關閉，需要事先手動為所有15個關卡配隊" } }, - "MaritimeEscort": { - "_info": { - "name": "商船護航", - "help": "進一下就撤退，能拿約70%的獎勵" - }, - "Enable": { - "name": "啟用商船護航", - "help": "" - } - }, "Coalition": { "_info": { "name": "活動設定",