From f8d8dba00fab942a92c1422da67854987c03c12b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 25 Dec 2025 16:53:07 +0000 Subject: [PATCH] chore: Auto update by pre-commit hooks https://github.com/MaaAssistantArknights/MaaAssistantArknights/actions/runs/20508148724 [skip changelog] --- .pre-commit-config.yaml | 2 +- .../manual/introduction/introduction_old.md | 8 ++--- src/Python/asst/asst.py | 6 ++-- src/Python/sample.py | 1 - .../src/auto_localization/translate.py | 7 ++-- .../src/auto_localization/xaml_load.py | 36 +++++++++---------- .../AutoLocalization/tests/test_xaml_load.py | 1 - tools/ImageCoordinate/coordinate.py | 1 - tools/ImageCropper/roi.py | 1 - tools/OptimizeTemplates/optimize_templates.py | 4 +-- .../FindMissingJsonTranslate.py | 1 - tools/OverseasClients/FindMissingTemplates.py | 1 - tools/TaskSorter/TaskSorter.py | 1 - 13 files changed, 30 insertions(+), 40 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c624b3cea3..240de44e2e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -43,4 +43,4 @@ repos: files: ^docs/.*|^README\.md$ types: - markdown - args: ["--fix", "--config", "docs/.markdownlint.yaml"] \ No newline at end of file + args: ["--fix", "--config", "docs/.markdownlint.yaml"] diff --git a/docs/ja-jp/manual/introduction/introduction_old.md b/docs/ja-jp/manual/introduction/introduction_old.md index 53ba8dd06b..a39f502f66 100644 --- a/docs/ja-jp/manual/introduction/introduction_old.md +++ b/docs/ja-jp/manual/introduction/introduction_old.md @@ -34,10 +34,10 @@ icon: ic:baseline-article | 例 | 理性剤使用数 | 割る源石の数 | 周回数指定 | 素材を限定 | 結果 | | :-: | :----------: | :----------: | :--------: | :---------: | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| A | 999 | 10 | 1 | ✖ | 理性材/純正源石を**1回**以上摂取し、`周回数：1`回の条件を完了すると、即座に停止。理性不足の状態で純正源石か理性剤が不足している場合は摂取せずに自動的に終了します。 | -| B | ✖ | ✖ | 100 | ✖ | 100回ステージを実行しようとしますが、現在使用可能な理性を消費後（おそらく数回）に、`理性剤`、`純正源石`なしの条件が達成されるため、理性を消費できず、タスクは完了されます。 | -| C | 1 | ✖ | 100 | ✖ | 100回ステージを実行しようとしますが、理性剤を 1 個消費した後に理性が不足した場合、`理性剤使用数：1`、`割る源石の数0`の条件を達成したためタスクは完了します。 | -| D | 999 | ✖ | 100 | 3個初級源岩 | 100回ステージを実行しようとし、最大 999 の理性剤を消費しようとしますが、実行中に3個の初級源岩を獲得した場合、`素材を限定：3個の初級源岩`の条件を達成するため、その時点でタスクを完了し停止します。 | +| A | 999 | 10 | 1 | ✖ | 理性材/純正源石を**1回**以上摂取し、`周回数：1`回の条件を完了すると、即座に停止。理性不足の状態で純正源石か理性剤が不足している場合は摂取せずに自動的に終了します。 | +| B | ✖ | ✖ | 100 | ✖ | 100回ステージを実行しようとしますが、現在使用可能な理性を消費後（おそらく数回）に、`理性剤`、`純正源石`なしの条件が達成されるため、理性を消費できず、タスクは完了されます。 | +| C | 1 | ✖ | 100 | ✖ | 100回ステージを実行しようとしますが、理性剤を 1 個消費した後に理性が不足した場合、`理性剤使用数：1`、`割る源石の数0`の条件を達成したためタスクは完了します。 | +| D | 999 | ✖ | 100 | 3個初級源岩 | 100回ステージを実行しようとし、最大 999 の理性剤を消費しようとしますが、実行中に3個の初級源岩を獲得した場合、`素材を限定：3個の初級源岩`の条件を達成するため、その時点でタスクを完了し停止します。 | - `素材を限定` と `ステージ選択` は2つの別々のロジックです。 - `素材を限定` は、タスクを完了するための素材の数に基づいており、対応するステージに自動的に移動しません。 diff --git a/src/Python/asst/asst.py b/src/Python/asst/asst.py index b02f8c50e7..064d3fad9f 100644 --- a/src/Python/asst/asst.py +++ b/src/Python/asst/asst.py @@ -55,9 +55,9 @@ class Asst: Asst.__libpath = pathlib.Path(path) / platform_values[platform_type]["libpath"] try: - os.environ[ - platform_values[platform_type]["environ_var"] - ] += os.pathsep + str(path) + os.environ[platform_values[platform_type]["environ_var"]] += ( + os.pathsep + str(path) + ) except KeyError: os.environ[platform_values[platform_type]["environ_var"]] = ( os.pathsep + str(path) diff --git a/src/Python/sample.py b/src/Python/sample.py index 5c7a2e52cb..18cf979c5b 100644 --- a/src/Python/sample.py +++ b/src/Python/sample.py @@ -17,7 +17,6 @@ def my_callback(msg, details, arg): if __name__ == "__main__": - # 请设置为存放 dll 文件及资源的路径 path = pathlib.Path(__file__).resolve().parent.parent diff --git a/tools/AutoLocalization/src/auto_localization/translate.py b/tools/AutoLocalization/src/auto_localization/translate.py index bbdf3f8f53..454b73af45 100644 --- a/tools/AutoLocalization/src/auto_localization/translate.py +++ b/tools/AutoLocalization/src/auto_localization/translate.py @@ -208,11 +208,8 @@ class ChatTranslator: ) def add_rules(self, rules: str): - self._rules += ( - """ - - """ - + rules.strip() - ) + self._rules += """ + - """ + rules.strip() self._instruction = self.generate_instruction( self, self._language, self._base_language ) diff --git a/tools/AutoLocalization/src/auto_localization/xaml_load.py b/tools/AutoLocalization/src/auto_localization/xaml_load.py index 37542003c0..f2033cadc5 100644 --- a/tools/AutoLocalization/src/auto_localization/xaml_load.py +++ b/tools/AutoLocalization/src/auto_localization/xaml_load.py @@ -71,9 +71,9 @@ class XamlParser: xaml_string, ) = self.__from_file(file) elif parse_type == 1: - assert ( - language is not None - ), "language must be specified when parse_type is 1" + assert language is not None, ( + "language must be specified when parse_type is 1" + ) self._file_path, self.__encoding, self.__language = file, encoding, language else: raise ValueError("parse_type must be 0 or 1") @@ -220,12 +220,12 @@ class XamlParser: """ this_tree = self.cp_tree compare_tree = compare_parser.cp_tree - assert ( - self.x_key_ns == compare_parser.x_key_ns - ), f"{self.language} 和 {compare_parser.language}x:Key命名空间不一致" - assert ( - self.x_uid_ns == compare_parser.x_uid_ns - ), f"{self.language} 和 {compare_parser.language}x:Uid命名空间不一致" + assert self.x_key_ns == compare_parser.x_key_ns, ( + f"{self.language} 和 {compare_parser.language}x:Key命名空间不一致" + ) + assert self.x_uid_ns == compare_parser.x_uid_ns, ( + f"{self.language} 和 {compare_parser.language}x:Uid命名空间不一致" + ) pt = re.compile(r"/\*/\*/\*\[\d*]/comment\(\)\[1]") uniqueattrs = [self.x_key_ns, self.x_uid_ns] ignored_attrs = [SPACE] @@ -315,15 +315,15 @@ class XamlParser: """ target_cp_tree = self.cp_tree base_cp_tree = compare_parser.cp_tree - assert ( - self.nsmap == compare_parser.nsmap - ), f"{self.language} 和 {compare_parser.language}命名空间不一致" - assert ( - self.x_key_ns == compare_parser.x_key_ns - ), f"{self.language}和{compare_parser.language}x:Key命名空间不一致" - assert ( - self.x_uid_ns == compare_parser.x_uid_ns - ), f"{self.language}和{compare_parser.language}x:Uid命名空间不一致" + assert self.nsmap == compare_parser.nsmap, ( + f"{self.language} 和 {compare_parser.language}命名空间不一致" + ) + assert self.x_key_ns == compare_parser.x_key_ns, ( + f"{self.language}和{compare_parser.language}x:Key命名空间不一致" + ) + assert self.x_uid_ns == compare_parser.x_uid_ns, ( + f"{self.language}和{compare_parser.language}x:Uid命名空间不一致" + ) uniqueattrs = [self.x_key_ns, self.x_uid_ns] ignored_attrs = [SPACE] chat = ( diff --git a/tools/AutoLocalization/tests/test_xaml_load.py b/tools/AutoLocalization/tests/test_xaml_load.py index f8328bb530..066b96f1fd 100644 --- a/tools/AutoLocalization/tests/test_xaml_load.py +++ b/tools/AutoLocalization/tests/test_xaml_load.py @@ -5,7 +5,6 @@ from src.auto_localization import XamlParser, judge_encoding, parse_lang_str class TestXamlParser(unittest.TestCase): - def setUp(self): self.zh_sample_path = "example/zh-cn.xaml" self.zh_new_sample_path = "example/zh-cn_new.xaml" diff --git a/tools/ImageCoordinate/coordinate.py b/tools/ImageCoordinate/coordinate.py index 4fb0f104cc..fde006ca57 100644 --- a/tools/ImageCoordinate/coordinate.py +++ b/tools/ImageCoordinate/coordinate.py @@ -280,7 +280,6 @@ if __name__ == "__main__": # Create an ImageRectSelector instance for each image path for image_path in image_paths: - # Create an ImageRectSelector instance with the image path selector = ImageRectSelector(image_path) diff --git a/tools/ImageCropper/roi.py b/tools/ImageCropper/roi.py index e221b69631..101d79d90c 100644 --- a/tools/ImageCropper/roi.py +++ b/tools/ImageCropper/roi.py @@ -5,7 +5,6 @@ from typing import Optional # 描述符基类,用于类型检查 class Typed(object): - def __init__(self, name, expected_type): self.name = name self.expected_type = expected_type diff --git a/tools/OptimizeTemplates/optimize_templates.py b/tools/OptimizeTemplates/optimize_templates.py index db2e9b7a88..1269004d31 100644 --- a/tools/OptimizeTemplates/optimize_templates.py +++ b/tools/OptimizeTemplates/optimize_templates.py @@ -246,10 +246,10 @@ if __name__ == "__main__": if quiet: t.update(cur_file_sz**2 // 2**20) t.set_postfix( - file_counts=f"{i+1}/{len(files)}", reduced_size=total_diff_sz_str + file_counts=f"{i + 1}/{len(files)}", reduced_size=total_diff_sz_str ) t.refresh() else: print( - f"file counts: {i+1}/{len(files)}, reduced pngs size: {total_diff_sz_str}" + f"file counts: {i + 1}/{len(files)}, reduced pngs size: {total_diff_sz_str}" ) diff --git a/tools/OverseasClients/FindMissingJsonTranslate.py b/tools/OverseasClients/FindMissingJsonTranslate.py index bfba093765..8acc96f89e 100644 --- a/tools/OverseasClients/FindMissingJsonTranslate.py +++ b/tools/OverseasClients/FindMissingJsonTranslate.py @@ -41,7 +41,6 @@ proj_dir = os.path.join(cur_dir, "../../") def find_missing_translations(server_name): - output_file = "missing_translate-" + server_name + ".txt" output_file = os.path.join(cur_dir, output_file) diff --git a/tools/OverseasClients/FindMissingTemplates.py b/tools/OverseasClients/FindMissingTemplates.py index 8f3bdb1baf..745486d473 100644 --- a/tools/OverseasClients/FindMissingTemplates.py +++ b/tools/OverseasClients/FindMissingTemplates.py @@ -47,7 +47,6 @@ proj_dir = os.path.join(cur_dir, "../../") def find_missing_templates(server_name): - zh_dir = os.path.join(proj_dir, "resource/template/") gl_dir = os.path.join( proj_dir, "resource/global/", server_name, "resource/template/" diff --git a/tools/TaskSorter/TaskSorter.py b/tools/TaskSorter/TaskSorter.py index ed82d865af..0cec94857f 100644 --- a/tools/TaskSorter/TaskSorter.py +++ b/tools/TaskSorter/TaskSorter.py @@ -66,7 +66,6 @@ def raise_on_duplicate_keys(pairs): def main(cn_base_path, global_resources): - cn_tasks = {} cn_order = {} # 使用 Path 处理路径，确保跨平台兼容