diff --git a/.clang-format b/.clang-format index df3c3b9645..39a9c475e1 100644 --- a/.clang-format +++ b/.clang-format @@ -1,3 +1,7 @@ +Language: Json +ColumnLimit: 1000 +IndentWidth: 4 +--- Language: Cpp AccessModifierOffset: -4 AlignAfterOpenBracket: Align diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000000..70fba46a71 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,17 @@ +# Since version 2.23 (released in August 2019), git-blame has a feature +# to ignore or bypass certain commits. +# +# This file contains a list of commits that are not likely what you +# are looking for in a blame, such as mass reformatting or renaming. +# You can set this file as a default ignore file for blame by running +# the following command. +# +# $ git config blame.ignoreRevsFile .git-blame-ignore-revs + +# style: clang format +98f949346e93e5a1adaade22cda9841e01b98c0b +290cc30f153a0206bd870a0a58cb6338aa16ea34 + +# incorrect format of 3rdparty/resource/Arknights-Tile-Pos/levels.json +65d654e54b9d04d1902c9ee9f9fb2679520adafd +81ea2c4d4fce29862f719972ecb32877fc4e654f diff --git a/3rdparty/resource/Arknights-Tile-Pos/.clang-format b/3rdparty/resource/Arknights-Tile-Pos/.clang-format new file mode 100644 index 0000000000..01d0321393 --- /dev/null +++ b/3rdparty/resource/Arknights-Tile-Pos/.clang-format @@ -0,0 +1,3 @@ +Language: Json +ColumnLimit: 1000 +IndentWidth: 2 diff --git a/resource/global/txwy/resource/tasks.json b/resource/global/txwy/resource/tasks.json index 5bbcbbf75d..bf84b278a3 100644 --- a/resource/global/txwy/resource/tasks.json +++ b/resource/global/txwy/resource/tasks.json @@ -72,7 +72,7 @@ ], "action": "Stop" }, - "TodaysSuppliesToRecruit": { + "TodaysSuppliesToRecruit": { "algorithm": "OcrDetect", "text": [ "今日配給" @@ -140,7 +140,7 @@ "rearDelay": 500, "text": [ "開始招.*", - "開始招募" + "開始招募" ], "roi": [ 0, @@ -203,7 +203,7 @@ "RecruitFlag" ] }, - "RecruitTags": { + "RecruitTags": { "algorithm": "OcrDetect", "text": [], "roi": [ @@ -217,11 +217,11 @@ "初期", "新手" ], - [ + [ "乾員", "干员" ], - [ + [ "幹員", "干员" ], @@ -257,7 +257,7 @@ "術師", "术师" ], - [ + [ "衛師", "术师" ], @@ -265,7 +265,7 @@ "狙撃", "狙击" ], - [ + [ "狙擊", "狙击" ], @@ -333,7 +333,7 @@ "快速復活", "快速复活" ], - [ + [ "回復", "回复" ], diff --git a/resource/infrast.json b/resource/infrast.json index 6098fe0146..c0b1565ded 100644 --- a/resource/infrast.json +++ b/resource/infrast.json @@ -363,8 +363,7 @@ "template": "Bskill_ctrl_ussg.png" } }, - "skillsGroup": [ - ] + "skillsGroup": [] }, "Dorm": { "skills": { @@ -1931,8 +1930,7 @@ "template": "Bskill_hire_spd_memento.png" } }, - "skillsGroup": [ - ] + "skillsGroup": [] }, "Power": { "maxNumOfOpers": 1, @@ -2050,8 +2048,7 @@ "template": "Bskill_pow_spd3.png" } }, - "skillsGroup": [ - ] + "skillsGroup": [] }, "Reception": { "Doc": "会客室", @@ -2359,8 +2356,7 @@ "template": "Bskill_meet_ursus2.png" } }, - "skillsGroup": [ - ] + "skillsGroup": [] }, "Trade": { "maxNumOfOpers": 3, @@ -2940,8 +2936,7 @@ ] } ], - "optional": [ - ] + "optional": [] }, { "allowExternal": true, diff --git a/tools/ClangFormater/clang-formater.py b/tools/ClangFormatter/clang-formatter.py similarity index 98% rename from tools/ClangFormater/clang-formater.py rename to tools/ClangFormatter/clang-formatter.py index a9a8deb64f..b1bec8d847 100644 --- a/tools/ClangFormater/clang-formater.py +++ b/tools/ClangFormatter/clang-formatter.py @@ -21,7 +21,7 @@ if not input_dir: for root, dirs, files in os.walk(input_dir): for f in files: file = os.path.join(root, f) - if os.path.splitext(file)[-1] in [".c", ".h", ".cpp", ".hpp"]: + if os.path.splitext(file)[-1] in [".c", ".h", ".cpp", ".hpp", ".json"]: print(file) os.system(f"{clang_format_exe} -i -style=file \"{file}\"");