From f78cd611ea1743cb3602d04d43cfa5e6846744d0 Mon Sep 17 00:00:00 2001 From: POLAR me Date: Tue, 11 Mar 2025 15:44:00 +0800 Subject: [PATCH] Revert "Add: Tools to do event story" This reverts commit c5f1d6e18b99e3e48e398ed1cc37c14fb761e5d1. --- alas.py | 4 ---- config/template.json | 8 -------- module/config/argument/args.json | 22 ---------------------- module/config/argument/argument.yaml | 5 ----- module/config/argument/menu.json | 1 - module/config/argument/override.yaml | 10 ---------- module/config/argument/task.yaml | 2 -- module/config/config_generated.py | 3 --- module/config/i18n/en-US.json | 16 ---------------- module/config/i18n/ja-JP.json | 16 ---------------- module/config/i18n/zh-CN.json | 16 ---------------- module/config/i18n/zh-TW.json | 16 ---------------- module/submodule/utils.py | 1 - 13 files changed, 120 deletions(-) diff --git a/alas.py b/alas.py index bb7eae1ab..23b5fc51d 100644 --- a/alas.py +++ b/alas.py @@ -539,10 +539,6 @@ class AzurLaneAutoScript: from module.daemon.os_daemon import AzurLaneDaemon AzurLaneDaemon(config=self.config, device=self.device, task="OpsiDaemon").run() - def event_story(self): - from module.eventstory.eventstory import EventStory - EventStory(config=self.config, device=self.device, task="EventStory").run() - def azur_lane_uncensored(self): from module.daemon.uncensored import AzurLaneUncensored AzurLaneUncensored(config=self.config, device=self.device, task="AzurLaneUncensored").run() diff --git a/config/template.json b/config/template.json index 4b98de7ae..ad6f8cce5 100644 --- a/config/template.json +++ b/config/template.json @@ -2099,14 +2099,6 @@ "Storage": {} } }, - "EventStory": { - "EventStory": { - "SkipBattle": true - }, - "Storage": { - "Storage": {} - } - }, "Benchmark": { "Benchmark": { "DeviceType": "emulator", diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 235cc636a..b3cc9018a 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -10251,28 +10251,6 @@ } } }, - "EventStory": { - "EventStory": { - "SkipBattle": { - "type": "lock", - "value": true, - "option": [ - true - ], - "option_bold": [ - true - ] - } - }, - "Storage": { - "Storage": { - "type": "storage", - "value": {}, - "valuetype": "ignore", - "display": "disabled" - } - } - }, "Benchmark": { "Benchmark": { "DeviceType": { diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index a236340e8..b123e3144 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -812,11 +812,6 @@ Daemon: OpsiDaemon: RepairShip: true SelectEnemy: true -EventStory: - SkipBattle: - type: checkbox - value: false - option: [ true, false ] Benchmark: DeviceType: value: emulator diff --git a/module/config/argument/menu.json b/module/config/argument/menu.json index 33541bfe5..46b1f27ac 100644 --- a/module/config/argument/menu.json +++ b/module/config/argument/menu.json @@ -104,7 +104,6 @@ "tasks": [ "Daemon", "OpsiDaemon", - "EventStory", "Benchmark", "AzurLaneUncensored", "GameManager" diff --git a/module/config/argument/override.yaml b/module/config/argument/override.yaml index dcbe5d693..c002c710d 100644 --- a/module/config/argument/override.yaml +++ b/module/config/argument/override.yaml @@ -442,13 +442,3 @@ OpsiHazard1Leveling: ServerUpdate: 00:00, 12:00 OpsiFleet: Submarine: false - -# ==================== Tool ==================== - -EventStory: - EventStory: - SkipBattle: - type: lock - value: true - option: [ true, ] - option_bold: [ true, ] diff --git a/module/config/argument/task.yaml b/module/config/argument/task.yaml index b8f349f11..4a6bdaf47 100644 --- a/module/config/argument/task.yaml +++ b/module/config/argument/task.yaml @@ -347,8 +347,6 @@ Tool: - Daemon OpsiDaemon: - OpsiDaemon - EventStory: - - EventStory Benchmark: - Benchmark AzurLaneUncensored: diff --git a/module/config/config_generated.py b/module/config/config_generated.py index 96287215a..85b22b9ba 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -518,9 +518,6 @@ class GeneratedConfig: OpsiDaemon_RepairShip = True OpsiDaemon_SelectEnemy = True - # Group `EventStory` - EventStory_SkipBattle = False # True, False - # Group `Benchmark` Benchmark_DeviceType = 'emulator' # emulator, plone_cloud_with_adb, phone_cloud_without_adb, android_phone, android_phone_vmos Benchmark_TestScene = 'screenshot_click' # screenshot_click, screenshot, click diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index f29c2988d..f93a965ab 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -270,10 +270,6 @@ "name": "OpSi Semi-auto", "help": "" }, - "EventStory": { - "name": "Event Story", - "help": "" - }, "Benchmark": { "name": "Performance Test", "help": "" @@ -2823,18 +2819,6 @@ "help": "Clean nearby enemies and resources, and find new enemies or materials after cleaning, which usually clears the entire map. If some of them haven't been cleared, you need to solve them manually" } }, - "EventStory": { - "_info": { - "name": "Event Story", - "help": "Complete the event story, only applicable to events aired on or after 20241219, please wait for about 3 minutes" - }, - "SkipBattle": { - "name": "Kill game to skip battles", - "help": "", - "True": "Enabled", - "False": "False" - } - }, "Benchmark": { "_info": { "name": "Performance Test", diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index 73e15e170..65a171f37 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -270,10 +270,6 @@ "name": "セイレーン作戦半自動", "help": "" }, - "EventStory": { - "name": "Event Story", - "help": "" - }, "Benchmark": { "name": "機能テスト", "help": "" @@ -2823,18 +2819,6 @@ "help": "OpsiDaemon.SelectEnemy.help" } }, - "EventStory": { - "_info": { - "name": "EventStory._info.name", - "help": "EventStory._info.help" - }, - "SkipBattle": { - "name": "EventStory.SkipBattle.name", - "help": "EventStory.SkipBattle.help", - "True": "True", - "False": "False" - } - }, "Benchmark": { "_info": { "name": "Benchmark._info.name", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index aa5fd70e1..348afb007 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -270,10 +270,6 @@ "name": "大世界半自动", "help": "" }, - "EventStory": { - "name": "活动剧情", - "help": "" - }, "Benchmark": { "name": "性能测试", "help": "" @@ -2823,18 +2819,6 @@ "help": "清理附近的敌人和物资，清理完后又会找到新的敌人或物资，这样通常能清理整个海域，如果有遗漏或者点击错误，需要手动解决" } }, - "EventStory": { - "_info": { - "name": "活动剧情", - "help": "完成活动剧情，仅适用于上线时间20241219及之后的活动，请等待约3分钟" - }, - "SkipBattle": { - "name": "杀游戏跳过战斗", - "help": "", - "True": "已启用", - "False": "False" - } - }, "Benchmark": { "_info": { "name": "性能测试", diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index 57638eaa2..84aa9d4b1 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -270,10 +270,6 @@ "name": "大世界半自動", "help": "" }, - "EventStory": { - "name": "活動劇情", - "help": "" - }, "Benchmark": { "name": "性能測試", "help": "" @@ -2823,18 +2819,6 @@ "help": "清理附近的敵人和物資，清理完後又會找到新的敵人或物資，這樣通常能清理整個海域，如果有遺漏或者點擊錯誤，需要手動解決" } }, - "EventStory": { - "_info": { - "name": "活動劇情", - "help": "完成活動劇情，僅適用於上線時間20241219及以後的活動，請等待約3分鐘" - }, - "SkipBattle": { - "name": "關遊戲跳過戰鬥", - "help": "", - "True": "已启用", - "False": "False" - } - }, "Benchmark": { "_info": { "name": "性能測試", diff --git a/module/submodule/utils.py b/module/submodule/utils.py index 5fdda4c93..800dabe5d 100644 --- a/module/submodule/utils.py +++ b/module/submodule/utils.py @@ -17,7 +17,6 @@ def get_available_func(): return ( 'Daemon', 'OpsiDaemon', - 'EventStory', 'AzurLaneUncensored', 'Benchmark', 'GameManager',