diff --git a/resource/template/UiTheme/LoneTrail/Day/DepotEnter.png b/resource/template/UiTheme/LoneTrail/Day/DepotEnter.png index f6c1fb6b7e..d1d635f096 100644 Binary files a/resource/template/UiTheme/LoneTrail/Day/DepotEnter.png and b/resource/template/UiTheme/LoneTrail/Day/DepotEnter.png differ diff --git a/resource/template/UiTheme/LoneTrail/Day/EnterInfrast.png b/resource/template/UiTheme/LoneTrail/Day/EnterInfrast.png index 2f74892b05..0df1ff9376 100644 Binary files a/resource/template/UiTheme/LoneTrail/Day/EnterInfrast.png and b/resource/template/UiTheme/LoneTrail/Day/EnterInfrast.png differ diff --git a/resource/template/UiTheme/LoneTrail/Day/Friends.png b/resource/template/UiTheme/LoneTrail/Day/Friends.png index d8cfaf66c3..ab2959717d 100644 Binary files a/resource/template/UiTheme/LoneTrail/Day/Friends.png and b/resource/template/UiTheme/LoneTrail/Day/Friends.png differ diff --git a/resource/template/UiTheme/LoneTrail/Day/GachaEnter.png b/resource/template/UiTheme/LoneTrail/Day/GachaEnter.png index 4fbd884471..24eab0b75c 100644 Binary files a/resource/template/UiTheme/LoneTrail/Day/GachaEnter.png and b/resource/template/UiTheme/LoneTrail/Day/GachaEnter.png differ diff --git a/resource/template/UiTheme/LoneTrail/Day/Mall.png b/resource/template/UiTheme/LoneTrail/Day/Mall.png index 5cb8effb5d..45a3b53e0c 100644 Binary files a/resource/template/UiTheme/LoneTrail/Day/Mall.png and b/resource/template/UiTheme/LoneTrail/Day/Mall.png differ diff --git a/resource/template/UiTheme/LoneTrail/Day/OperBoxEnter.png b/resource/template/UiTheme/LoneTrail/Day/OperBoxEnter.png index c23fb78d8f..c88fa5acf0 100644 Binary files a/resource/template/UiTheme/LoneTrail/Day/OperBoxEnter.png and b/resource/template/UiTheme/LoneTrail/Day/OperBoxEnter.png differ diff --git a/resource/template/UiTheme/LoneTrail/Day/Recruit.png b/resource/template/UiTheme/LoneTrail/Day/Recruit.png index cf02c576a9..4b96ecd876 100644 Binary files a/resource/template/UiTheme/LoneTrail/Day/Recruit.png and b/resource/template/UiTheme/LoneTrail/Day/Recruit.png differ diff --git a/resource/template/UiTheme/LoneTrail/Day/Task.png b/resource/template/UiTheme/LoneTrail/Day/Task.png index 9043e3dcb6..08980e42b1 100644 Binary files a/resource/template/UiTheme/LoneTrail/Day/Task.png and b/resource/template/UiTheme/LoneTrail/Day/Task.png differ diff --git a/resource/template/UiTheme/LoneTrail/Day/Terminal.png b/resource/template/UiTheme/LoneTrail/Day/Terminal.png index d9a344a33d..3544f3c2e5 100644 Binary files a/resource/template/UiTheme/LoneTrail/Day/Terminal.png and b/resource/template/UiTheme/LoneTrail/Day/Terminal.png differ diff --git a/resource/template/UiTheme/LoneTrail/Night/DepotEnter.png b/resource/template/UiTheme/LoneTrail/Night/DepotEnter.png index 08de8d5c94..d852f20e11 100644 Binary files a/resource/template/UiTheme/LoneTrail/Night/DepotEnter.png and b/resource/template/UiTheme/LoneTrail/Night/DepotEnter.png differ diff --git a/resource/template/UiTheme/LoneTrail/Night/EnterInfrast.png b/resource/template/UiTheme/LoneTrail/Night/EnterInfrast.png index 0b4f6b8bd5..4a3d2ad91a 100644 Binary files a/resource/template/UiTheme/LoneTrail/Night/EnterInfrast.png and b/resource/template/UiTheme/LoneTrail/Night/EnterInfrast.png differ diff --git a/resource/template/UiTheme/LoneTrail/Night/Friends.png b/resource/template/UiTheme/LoneTrail/Night/Friends.png index e3ba22a156..4e32a66402 100644 Binary files a/resource/template/UiTheme/LoneTrail/Night/Friends.png and b/resource/template/UiTheme/LoneTrail/Night/Friends.png differ diff --git a/resource/template/UiTheme/LoneTrail/Night/GachaEnter.png b/resource/template/UiTheme/LoneTrail/Night/GachaEnter.png index 1c6bb10a4d..4f9e25f88b 100644 Binary files a/resource/template/UiTheme/LoneTrail/Night/GachaEnter.png and b/resource/template/UiTheme/LoneTrail/Night/GachaEnter.png differ diff --git a/resource/template/UiTheme/LoneTrail/Night/Mall.png b/resource/template/UiTheme/LoneTrail/Night/Mall.png index dde4f3065a..b6d7640ce0 100644 Binary files a/resource/template/UiTheme/LoneTrail/Night/Mall.png and b/resource/template/UiTheme/LoneTrail/Night/Mall.png differ diff --git a/resource/template/UiTheme/LoneTrail/Night/OperBoxEnter.png b/resource/template/UiTheme/LoneTrail/Night/OperBoxEnter.png index cd3b70046a..7ded492d57 100644 Binary files a/resource/template/UiTheme/LoneTrail/Night/OperBoxEnter.png and b/resource/template/UiTheme/LoneTrail/Night/OperBoxEnter.png differ diff --git a/resource/template/UiTheme/LoneTrail/Night/Recruit.png b/resource/template/UiTheme/LoneTrail/Night/Recruit.png index a833f3cb60..38a0699093 100644 Binary files a/resource/template/UiTheme/LoneTrail/Night/Recruit.png and b/resource/template/UiTheme/LoneTrail/Night/Recruit.png differ diff --git a/resource/template/UiTheme/LoneTrail/Night/Task.png b/resource/template/UiTheme/LoneTrail/Night/Task.png index 7eb1619001..69f3111cb7 100644 Binary files a/resource/template/UiTheme/LoneTrail/Night/Task.png and b/resource/template/UiTheme/LoneTrail/Night/Task.png differ diff --git a/resource/template/UiTheme/LoneTrail/Night/Terminal.png b/resource/template/UiTheme/LoneTrail/Night/Terminal.png index 5ca07a7d92..ca8b08894e 100644 Binary files a/resource/template/UiTheme/LoneTrail/Night/Terminal.png and b/resource/template/UiTheme/LoneTrail/Night/Terminal.png differ diff --git a/src/MaaCore/Utils/JsonMisc.hpp b/src/MaaCore/Utils/JsonMisc.hpp index 05adee9f53..abe52e5a4e 100644 --- a/src/MaaCore/Utils/JsonMisc.hpp +++ b/src/MaaCore/Utils/JsonMisc.hpp @@ -134,23 +134,23 @@ bool get_value_or( return true; } if (parse_json_as(*opt, output)) { -/* -#ifdef ASST_DEBUG - if constexpr (CheckDefault) { - // 如果有默认值,检查是否与默认值相同 - if constexpr (std::constructible_from) { - if (output == default_val) { - Log.warn("Value of", key, "in", repr, "is same as default value"); + /* + #ifdef ASST_DEBUG + if constexpr (CheckDefault) { + // 如果有默认值,检查是否与默认值相同 + if constexpr (std::constructible_from) { + if (output == default_val) { + Log.warn("Value of", key, "in", repr, "is same as default value"); + } + } + else { + if (output == default_val()) { + Log.warn("Value of", key, "in", repr, "is same as default value of construct function"); + } + } } - } - else { - if (output == default_val()) { - Log.warn("Value of", key, "in", repr, "is same as default value of construct function"); - } - } - } -#endif -*/ + #endif + */ return true; } Log.error("Invalid type of", key, "in", repr); diff --git a/tools/GetImageFromROI/cutter.py b/tools/GetImageFromROI/cutter.py index 9e5ae21340..ebf22ae419 100644 --- a/tools/GetImageFromROI/cutter.py +++ b/tools/GetImageFromROI/cutter.py @@ -62,14 +62,16 @@ if __name__ == "__main__": dsize = (dsize_width, dsize_height) image = cv2.resize(image, dsize, interpolation=cv2.INTER_AREA) - theme_name = str(raw_image.relative_to(src_path).with_suffix('')) + theme_name = str(raw_image.relative_to(src_path).with_suffix("")) for i in tasks: if "crop_doc" not in tasks[i]: continue - default_temp_name = tasks[f"{i.split('-Entry')[0]}Default"].get("template", "") - filename = f"{theme_name}/{default_temp_name.split("Default/")[-1]}" + default_temp_name = tasks[f"{i.split('-Entry')[0]}Default"].get( + "template", "" + ) + filename = f"{theme_name}/{default_temp_name.split('Default/')[-1]}" crop_doc = tasks[i].get("crop_doc", {}) roi = crop_doc.get("roi") diff --git a/tools/GetImageFromROI/updater.py b/tools/GetImageFromROI/updater.py index 04dc0c27b6..d5a0f384f0 100644 --- a/tools/GetImageFromROI/updater.py +++ b/tools/GetImageFromROI/updater.py @@ -38,7 +38,6 @@ def update_ui_theme_tasks(): modified = False - theme_variants = {} for image in src_path.rglob("*.png"): theme_path = image.relative_to(src_path).with_suffix("")