From a009110df481fd0504de83c2df816f870b3b97d7 Mon Sep 17 00:00:00 2001 From: Haoyu Xu Date: Tue, 29 Mar 2022 21:43:44 -0400 Subject: [PATCH] chore: use include to shorten main yaml config --- config.yaml | 352 +---------------------- config/chen.yaml | 26 ++ config/dusk.yaml | 26 ++ config/dusk_everything_is_a_miracle.yaml | 26 ++ config/ling.yaml | 26 ++ config/nearl.yaml | 26 ++ config/nian.yaml | 26 ++ config/nian_unfettered_freedom.yaml | 26 ++ config/phatom_placeholder.yaml | 26 ++ config/rosmontis.yaml | 26 ++ config/skadi.yaml | 26 ++ config/w.yaml | 26 ++ lib/config.py | 11 +- requirements.txt | 5 +- 14 files changed, 303 insertions(+), 351 deletions(-) create mode 100644 config/chen.yaml create mode 100644 config/dusk.yaml create mode 100644 config/dusk_everything_is_a_miracle.yaml create mode 100644 config/ling.yaml create mode 100644 config/nearl.yaml create mode 100644 config/nian.yaml create mode 100644 config/nian_unfettered_freedom.yaml create mode 100644 config/phatom_placeholder.yaml create mode 100644 config/rosmontis.yaml create mode 100644 config/skadi.yaml create mode 100644 config/w.yaml diff --git a/config.yaml b/config.yaml index a0894ce..3a0978e 100644 --- a/config.yaml +++ b/config.yaml @@ -4,347 +4,17 @@ operator: source_folder: ./operator/{name}/extracted/ target_folder: ./operator/{name}/processed/ operators: - chen: - _operator_settings.js: - fallbackImage_height: 2048 - fallbackImage_width: 2048 - filename: dyn_illust_char_1013_chen2 - fps: 60 - opacity: 100 - viewport_bottom: 1 - viewport_left: 0 - viewport_right: 0 - viewport_top: 1 - index.html: - fallback_name: char_1013_chen2_2 - id: char_1013_chen2 - operator_logo: logo_rhodes_override - title: 'Arknights: Ch''en/Chen the Holungday - 明日方舟：假日威龙陈' - version: ${func:get_version()} - project.json: - description: 'Arknights: Ch''en/Chen the Holungday Live 2D\n明日方舟：假日威龙陈 Live - 2D\nThe model is extracted from game with Spine support.\n模型来自游戏内提取，支持Spine\nPlease - set your FPS target in Wallpaper Engine > Settings > Performance > FPS\n请在 - Wallpaper Engine > 设置 > 性能 > FPS 下设置FPS\n\nLive preview on: https://arknights.halyul.dev/chen\nGithub: - https://github.com/Halyul/aklive2d' - title: ${var:index.html->title} - ui_logo_opacity: ${var:_operator_settings.js->opacity} - ui_logo_ratio: 61.8 - ui_operator_logo: 'true' - ui_position_padding_bottom: ${var:_operator_settings.js->viewport_bottom} - ui_position_padding_left: ${var:_operator_settings.js->viewport_left} - ui_position_padding_right: ${var:_operator_settings.js->viewport_right} - ui_position_padding_top: ${var:_operator_settings.js->viewport_top} - dusk: - _operator_settings.js: - fallbackImage_height: 2048 - fallbackImage_width: 2048 - filename: dyn_illust_char_2015_dusk - fps: 60 - opacity: 30 - viewport_bottom: 0 - viewport_left: 0 - viewport_right: 0 - viewport_top: 0 - index.html: - fallback_name: char_2015_dusk_2 - id: char_2015_dusk - operator_logo: logo_sui - title: 'Arknights: Dusk - 明日方舟：夕' - version: ${func:get_version()} - project.json: - description: 'Arknights: Dusk Live 2D\n明日方舟：夕 Live 2D\nThe model is extracted - from game with Spine support.\n模型来自游戏内提取，支持Spine\nPlease set your FPS target - in Wallpaper Engine > Settings > Performance > FPS\n请在 Wallpaper Engine > - 设置 > 性能 > FPS 下设置FPS\n\nLive preview on: https://arknights.halyul.dev/dusk\nGithub: - https://github.com/Halyul/aklive2d' - title: ${var:index.html->title} - ui_logo_opacity: ${var:_operator_settings.js->opacity} - ui_logo_ratio: 61.8 - ui_operator_logo: 'true' - ui_position_padding_bottom: ${var:_operator_settings.js->viewport_bottom} - ui_position_padding_left: ${var:_operator_settings.js->viewport_left} - ui_position_padding_right: ${var:_operator_settings.js->viewport_right} - ui_position_padding_top: ${var:_operator_settings.js->viewport_top} - dusk_everything_is_a_miracle: - _operator_settings.js: - fallbackImage_height: 2048 - fallbackImage_width: 2048 - filename: dyn_illust_char_2015_dusk_nian#7 - fps: 60 - opacity: 30 - viewport_bottom: 0 - viewport_left: 10 - viewport_right: 0 - viewport_top: 0 - index.html: - fallback_name: char_2015_dusk_nian%237 - id: char_2015_dusk_nian%237 - operator_logo: logo_sui - title: 'Arknights: Everything is a Miracle / Dusk - 明日方舟：染尘烟·夕' - version: ${func:get_version()} - project.json: - description: 'Arknights: Everything is a Miracle / Dusk Live 2D\n明日方舟：染尘烟·夕 - Live 2D\nThe model is extracted from game with Spine support.\n模型来自游戏内提取，支持Spine\nPlease - set your FPS target in Wallpaper Engine > Settings > Performance > FPS\n请在 - Wallpaper Engine > 设置 > 性能 > FPS 下设置FPS\n\nLive preview on: https://arknights.halyul.dev/dusk_everything_is_a_miracle\nGithub: - https://github.com/Halyul/aklive2d' - title: ${var:index.html->title} - ui_logo_opacity: ${var:_operator_settings.js->opacity} - ui_logo_ratio: 61.8 - ui_operator_logo: 'true' - ui_position_padding_bottom: ${var:_operator_settings.js->viewport_bottom} - ui_position_padding_left: ${var:_operator_settings.js->viewport_left} - ui_position_padding_right: ${var:_operator_settings.js->viewport_right} - ui_position_padding_top: ${var:_operator_settings.js->viewport_top} - ling: - _operator_settings.js: - fallbackImage_height: 2048 - fallbackImage_width: 2048 - filename: dyn_illust_char_2023_ling - fps: 60 - opacity: 30 - viewport_bottom: 0 - viewport_left: 0 - viewport_right: 0 - viewport_top: 0 - index.html: - fallback_name: char_2023_ling_2 - id: char_2023_ling - operator_logo: logo_sui - title: 'Arknights: Ling - 明日方舟：令' - version: ${func:get_version()} - project.json: - description: 'Arknights: Ling Live 2D\n明日方舟：令 Live 2D\nThe model is extracted - from game with Spine support.\n模型来自游戏内提取，支持Spine\nPlease set your FPS target - in Wallpaper Engine > Settings > Performance > FPS\n请在 Wallpaper Engine > - 设置 > 性能 > FPS 下设置FPS\n\nLive preview on: https://arknights.halyul.dev/ling\nGithub: - https://github.com/Halyul/aklive2d' - title: ${var:index.html->title} - ui_logo_opacity: ${var:_operator_settings.js->opacity} - ui_logo_ratio: 61.8 - ui_operator_logo: 'true' - ui_position_padding_bottom: ${var:_operator_settings.js->viewport_bottom} - ui_position_padding_left: ${var:_operator_settings.js->viewport_left} - ui_position_padding_right: ${var:_operator_settings.js->viewport_right} - ui_position_padding_top: ${var:_operator_settings.js->viewport_top} - nearl: - _operator_settings.js: - fallbackImage_height: 2048 - fallbackImage_width: 2048 - filename: dyn_illust_char_1014_nearl2 - fps: 60 - opacity: 30 - viewport_bottom: 0 - viewport_left: 2 - viewport_right: 3 - viewport_top: 10 - index.html: - fallback_name: char_1014_nearl2_2 - id: char_1014_nearl2 - operator_logo: logo_kazimierz - title: 'Arknights: Nearl the Radiant Knight - 明日方舟：耀骑士临光' - version: ${func:get_version()} - project.json: - description: 'Arknights: Nearl the Radiant Knight Live 2D\n明日方舟：耀骑士临光 Live 2D\nThe - model is extracted from game with Spine support.\n模型来自游戏内提取，支持Spine\nPlease - set your FPS target in Wallpaper Engine > Settings > Performance > FPS\n请在 - Wallpaper Engine > 设置 > 性能 > FPS 下设置FPS\n\nLive preview on: https://arknights.halyul.dev/nearl\nGithub: - https://github.com/Halyul/aklive2d' - title: ${var:index.html->title} - ui_logo_opacity: ${var:_operator_settings.js->opacity} - ui_logo_ratio: 61.8 - ui_operator_logo: 'true' - ui_position_padding_bottom: ${var:_operator_settings.js->viewport_bottom} - ui_position_padding_left: ${var:_operator_settings.js->viewport_left} - ui_position_padding_right: ${var:_operator_settings.js->viewport_right} - ui_position_padding_top: ${var:_operator_settings.js->viewport_top} - nian: - _operator_settings.js: - fallbackImage_height: 2048 - fallbackImage_width: 2048 - filename: dyn_illust_char_2014_nian - fps: 60 - opacity: 30 - viewport_bottom: 5 - viewport_left: 2 - viewport_right: 2 - viewport_top: 3 - index.html: - fallback_name: char_2014_nian_2 - id: char_2014_nian - operator_logo: logo_sui - title: 'Arknights: Nian - 明日方舟：年' - version: ${func:get_version()} - project.json: - description: 'Arknights: Nian Live 2D\n明日方舟：年 Live 2D\nThe model is extracted - from game with Spine support.\n模型来自游戏内提取，支持Spine\nPlease set your FPS target - in Wallpaper Engine > Settings > Performance > FPS\n请在 Wallpaper Engine > - 设置 > 性能 > FPS 下设置FPS\n\nLive preview on: https://arknights.halyul.dev/nian\nGithub: - https://github.com/Halyul/aklive2d' - title: ${var:index.html->title} - ui_logo_opacity: ${var:_operator_settings.js->opacity} - ui_logo_ratio: 61.8 - ui_operator_logo: 'true' - ui_position_padding_bottom: ${var:_operator_settings.js->viewport_bottom} - ui_position_padding_left: ${var:_operator_settings.js->viewport_left} - ui_position_padding_right: ${var:_operator_settings.js->viewport_right} - ui_position_padding_top: ${var:_operator_settings.js->viewport_top} - nian_unfettered_freedom: - _operator_settings.js: - fallbackImage_height: 2048 - fallbackImage_width: 2048 - filename: dyn_illust_char_2014_nian_nian#4 - fps: 60 - opacity: 30 - viewport_bottom: 0 - viewport_left: 0 - viewport_right: 0 - viewport_top: 0 - index.html: - fallback_name: char_2014_nian_nian%234 - id: char_2014_nian_nian%234 - operator_logo: logo_sui - title: 'Arknights: Unfettered Freedom / Nian - 明日方舟：乐逍遥·年' - version: ${func:get_version()} - project.json: - description: 'Arknights: Unfettered Freedom / Nian Live 2D\n明日方舟：乐逍遥·年 Live - 2D\nThe model is extracted from game with Spine support.\n模型来自游戏内提取，支持Spine\nPlease - set your FPS target in Wallpaper Engine > Settings > Performance > FPS\n请在 - Wallpaper Engine > 设置 > 性能 > FPS 下设置FPS\n\nLive preview on: https://arknights.halyul.dev/nian_unfettered_freedom\nGithub: - https://github.com/Halyul/aklive2d' - title: ${var:index.html->title} - ui_logo_opacity: ${var:_operator_settings.js->opacity} - ui_logo_ratio: 61.8 - ui_operator_logo: 'true' - ui_position_padding_bottom: ${var:_operator_settings.js->viewport_bottom} - ui_position_padding_left: ${var:_operator_settings.js->viewport_left} - ui_position_padding_right: ${var:_operator_settings.js->viewport_right} - ui_position_padding_top: ${var:_operator_settings.js->viewport_top} - phatom_placeholder: - _operator_settings.js: - fallbackImage_height: 2048 - fallbackImage_width: 2048 - filename: dyn_illust_char_250_phatom_sale#4 - fps: 60 - opacity: 30 - viewport_bottom: 1 - viewport_left: 0 - viewport_right: 0 - viewport_top: 5 - index.html: - fallback_name: char_250_phatom_sale%234 - id: char_250_phatom_sale%234 - operator_logo: logo_victoria - title: 'Arknights: Placeholder / Phatom - 明日方舟：Placeholder·傀影' - version: ${func:get_version()} - project.json: - description: 'Arknights: Placeholder / Phatom - 明日方舟：Placeholder·傀影 Live 2D\nThe - model is extracted from game with Spine support.\n模型来自游戏内提取，支持Spine\nPlease - set your FPS target in Wallpaper Engine > Settings > Performance > FPS\n请在 - Wallpaper Engine > 设置 > 性能 > FPS 下设置FPS\n\nLive preview on: https://arknights.halyul.dev/phatom_placeholder\nGithub: - https://github.com/Halyul/aklive2d' - title: ${var:index.html->title} - ui_logo_opacity: ${var:_operator_settings.js->opacity} - ui_logo_ratio: 61.8 - ui_operator_logo: 'true' - ui_position_padding_bottom: ${var:_operator_settings.js->viewport_bottom} - ui_position_padding_left: ${var:_operator_settings.js->viewport_left} - ui_position_padding_right: ${var:_operator_settings.js->viewport_right} - ui_position_padding_top: ${var:_operator_settings.js->viewport_top} - rosmontis: - _operator_settings.js: - fallbackImage_height: 2048 - fallbackImage_width: 2048 - filename: dyn_illust_char_391_rosmon - fps: 60 - opacity: 100 - viewport_bottom: -1 - viewport_left: 0 - viewport_right: -14 - viewport_top: -38 - index.html: - fallback_name: char_391_rosmon_2 - id: char_391_rosmon - operator_logo: logo_rhodes_override - title: 'Arknights: Rosmontis - 明日方舟：迷迭香' - version: ${func:get_version()} - project.json: - description: 'Arknights: Rosmontis Live 2D\n明日方舟：迷迭香 Live 2D\nThe model is extracted - from game with Spine support.\n模型来自游戏内提取，支持Spine\nPlease set your FPS target - in Wallpaper Engine > Settings > Performance > FPS\n请在 Wallpaper Engine > - 设置 > 性能 > FPS 下设置FPS\n\nLive preview on: https://arknights.halyul.dev/rosmontis\nGithub: - https://github.com/Halyul/aklive2d' - title: ${var:index.html->title} - ui_logo_opacity: ${var:_operator_settings.js->opacity} - ui_logo_ratio: 61.8 - ui_operator_logo: 'true' - ui_position_padding_bottom: ${var:_operator_settings.js->viewport_bottom} - ui_position_padding_left: ${var:_operator_settings.js->viewport_left} - ui_position_padding_right: ${var:_operator_settings.js->viewport_right} - ui_position_padding_top: ${var:_operator_settings.js->viewport_top} - skadi: - _operator_settings.js: - fallbackImage_height: 2048 - fallbackImage_width: 2048 - filename: dyn_illust_char_1012_skadi2 - fps: 60 - opacity: 30 - viewport_bottom: -12 - viewport_left: -5 - viewport_right: -10 - viewport_top: 0 - index.html: - fallback_name: char_1012_skadi2_2 - id: char_1012_skadi2 - operator_logo: logo_egir - title: 'Arknights: Skadi the Corrupting Heart - 明日方舟：浊心斯卡蒂' - version: ${func:get_version()} - project.json: - description: 'Arknights: Skadi the Corrupting Heart Live 2Di\r\n明日方舟：浊心斯卡蒂 Live - 2Di\r\nThe model is extracted from game with Spine support.\r\n模型来自游戏内提取，支持Spine\r\nPlease - set your FPS target in Wallpaper Engine > Settings > Performance > FPS\r\n请在 - Wallpaper Engine > 设置 > 性能 > FPS 下设置FPS\r\n\r\nLive preview on: https://arknights.halyul.dev/skadi\r\nGithub: - https://github.com/Halyul/aklive2d' - title: ${var:index.html->title} - ui_logo_opacity: ${var:_operator_settings.js->opacity} - ui_logo_ratio: 61.8 - ui_operator_logo: 'true' - ui_position_padding_bottom: ${var:_operator_settings.js->viewport_bottom} - ui_position_padding_left: ${var:_operator_settings.js->viewport_left} - ui_position_padding_right: ${var:_operator_settings.js->viewport_right} - ui_position_padding_top: ${var:_operator_settings.js->viewport_top} - w: - _operator_settings.js: - fallbackImage_height: 2048 - fallbackImage_width: 2048 - filename: dyn_illust_char_113_cqbw - fps: 60 - opacity: 30 - viewport_bottom: 1 - viewport_left: 3 - viewport_right: -3 - viewport_top: 0 - index.html: - fallback_name: char_113_cqbw_2 - id: char_113_cqbw - operator_logo: logo_babel - title: 'Arknights: W - 明日方舟：W' - version: ${func:get_version()} - project.json: - description: 'Arknights: W Live 2D\n明日方舟：W Live 2D\nThe model is extracted from - game with Spine support.\n模型来自游戏内提取，支持Spine\nPlease set your FPS target in - Wallpaper Engine > Settings > Performance > FPS\n请在 Wallpaper Engine > 设置 - > 性能 > FPS 下设置FPS\n\nLive preview on: https://arknights.halyul.dev/w\nGithub: - https://github.com/Halyul/aklive2d' - title: ${var:index.html->title} - ui_logo_opacity: ${var:_operator_settings.js->opacity} - ui_logo_ratio: 61.8 - ui_operator_logo: 'true' - ui_position_padding_bottom: ${var:_operator_settings.js->viewport_bottom} - ui_position_padding_left: ${var:_operator_settings.js->viewport_left} - ui_position_padding_right: ${var:_operator_settings.js->viewport_right} - ui_position_padding_top: ${var:_operator_settings.js->viewport_top} + chen: !include config/chen.yaml + dusk: !include config/dusk.yaml + dusk_everything_is_a_miracle: !include config/dusk_everything_is_a_miracle.yaml + ling: !include config/ling.yaml + nearl: !include config/nearl.yaml + nian: !include config/nian.yaml + nian_unfettered_freedom: !include config/nian_unfettered_freedom.yaml + phatom_placeholder: !include config/phatom_placeholder.yaml + rosmontis: !include config/rosmontis.yaml + skadi: !include config/skadi.yaml + w: !include config/w.yaml server: operator_folder: ./operator/ release_folder: ./release/ diff --git a/config/chen.yaml b/config/chen.yaml new file mode 100644 index 0000000..79a839d --- /dev/null +++ b/config/chen.yaml @@ -0,0 +1,26 @@ +_operator_settings.js: + fallbackImage_height: 2048 + fallbackImage_width: 2048 + filename: dyn_illust_char_1013_chen2 + fps: 60 + opacity: 100 + viewport_bottom: 1 + viewport_left: 0 + viewport_right: 0 + viewport_top: 1 +index.html: + fallback_name: char_1013_chen2_2 + id: char_1013_chen2 + operator_logo: logo_rhodes_override + title: 'Arknights: Ch''en/Chen the Holungday - 明日方舟：假日威龙陈' + version: ${func:get_version()} +project.json: + description: 'Arknights: Ch''en/Chen the Holungday Live 2D\n明日方舟：假日威龙陈 Live 2D\nThe model is extracted from game with Spine support.\n模型来自游戏内提取，支持Spine\nPlease set your FPS target in Wallpaper Engine > Settings > Performance > FPS\n请在 Wallpaper Engine > 设置 > 性能 > FPS 下设置FPS\n\nLive preview on: https://arknights.halyul.dev/chen\nGithub: https://github.com/Halyul/aklive2d' + title: ${var:index.html->title} + ui_logo_opacity: ${var:_operator_settings.js->opacity} + ui_logo_ratio: 61.8 + ui_operator_logo: 'true' + ui_position_padding_bottom: ${var:_operator_settings.js->viewport_bottom} + ui_position_padding_left: ${var:_operator_settings.js->viewport_left} + ui_position_padding_right: ${var:_operator_settings.js->viewport_right} + ui_position_padding_top: ${var:_operator_settings.js->viewport_top} \ No newline at end of file diff --git a/config/dusk.yaml b/config/dusk.yaml new file mode 100644 index 0000000..909d252 --- /dev/null +++ b/config/dusk.yaml @@ -0,0 +1,26 @@ +_operator_settings.js: + fallbackImage_height: 2048 + fallbackImage_width: 2048 + filename: dyn_illust_char_2015_dusk + fps: 60 + opacity: 30 + viewport_bottom: 0 + viewport_left: 0 + viewport_right: 0 + viewport_top: 0 +index.html: + fallback_name: char_2015_dusk_2 + id: char_2015_dusk + operator_logo: logo_sui + title: 'Arknights: Dusk - 明日方舟：夕' + version: ${func:get_version()} +project.json: + description: 'Arknights: Dusk Live 2D\n明日方舟：夕 Live 2D\nThe model is extracted from game with Spine support.\n模型来自游戏内提取，支持Spine\nPlease set your FPS target in Wallpaper Engine > Settings > Performance > FPS\n请在 Wallpaper Engine > 设置 > 性能 > FPS 下设置FPS\n\nLive preview on: https://arknights.halyul.dev/dusk\nGithub: https://github.com/Halyul/aklive2d' + title: ${var:index.html->title} + ui_logo_opacity: ${var:_operator_settings.js->opacity} + ui_logo_ratio: 61.8 + ui_operator_logo: 'true' + ui_position_padding_bottom: ${var:_operator_settings.js->viewport_bottom} + ui_position_padding_left: ${var:_operator_settings.js->viewport_left} + ui_position_padding_right: ${var:_operator_settings.js->viewport_right} + ui_position_padding_top: ${var:_operator_settings.js->viewport_top} \ No newline at end of file diff --git a/config/dusk_everything_is_a_miracle.yaml b/config/dusk_everything_is_a_miracle.yaml new file mode 100644 index 0000000..f4461ef --- /dev/null +++ b/config/dusk_everything_is_a_miracle.yaml @@ -0,0 +1,26 @@ +_operator_settings.js: + fallbackImage_height: 2048 + fallbackImage_width: 2048 + filename: dyn_illust_char_2015_dusk_nian#7 + fps: 60 + opacity: 30 + viewport_bottom: 0 + viewport_left: 10 + viewport_right: 0 + viewport_top: 0 +index.html: + fallback_name: char_2015_dusk_nian%237 + id: char_2015_dusk_nian%237 + operator_logo: logo_sui + title: 'Arknights: Everything is a Miracle / Dusk - 明日方舟：染尘烟·夕' + version: ${func:get_version()} +project.json: + description: 'Arknights: Everything is a Miracle / Dusk Live 2D\n明日方舟：染尘烟·夕 Live 2D\nThe model is extracted from game with Spine support.\n模型来自游戏内提取，支持Spine\nPlease set your FPS target in Wallpaper Engine > Settings > Performance > FPS\n请在 Wallpaper Engine > 设置 > 性能 > FPS 下设置FPS\n\nLive preview on: https://arknights.halyul.dev/dusk_everything_is_a_miracle\nGithub: https://github.com/Halyul/aklive2d' + title: ${var:index.html->title} + ui_logo_opacity: ${var:_operator_settings.js->opacity} + ui_logo_ratio: 61.8 + ui_operator_logo: 'true' + ui_position_padding_bottom: ${var:_operator_settings.js->viewport_bottom} + ui_position_padding_left: ${var:_operator_settings.js->viewport_left} + ui_position_padding_right: ${var:_operator_settings.js->viewport_right} + ui_position_padding_top: ${var:_operator_settings.js->viewport_top} \ No newline at end of file diff --git a/config/ling.yaml b/config/ling.yaml new file mode 100644 index 0000000..1f0ab40 --- /dev/null +++ b/config/ling.yaml @@ -0,0 +1,26 @@ +_operator_settings.js: + fallbackImage_height: 2048 + fallbackImage_width: 2048 + filename: dyn_illust_char_2023_ling + fps: 60 + opacity: 30 + viewport_bottom: 0 + viewport_left: 0 + viewport_right: 0 + viewport_top: 0 +index.html: + fallback_name: char_2023_ling_2 + id: char_2023_ling + operator_logo: logo_sui + title: 'Arknights: Ling - 明日方舟：令' + version: ${func:get_version()} +project.json: + description: 'Arknights: Ling Live 2D\n明日方舟：令 Live 2D\nThe model is extracted from game with Spine support.\n模型来自游戏内提取，支持Spine\nPlease set your FPS target in Wallpaper Engine > Settings > Performance > FPS\n请在 Wallpaper Engine > 设置 > 性能 > FPS 下设置FPS\n\nLive preview on: https://arknights.halyul.dev/ling\nGithub: https://github.com/Halyul/aklive2d' + title: ${var:index.html->title} + ui_logo_opacity: ${var:_operator_settings.js->opacity} + ui_logo_ratio: 61.8 + ui_operator_logo: 'true' + ui_position_padding_bottom: ${var:_operator_settings.js->viewport_bottom} + ui_position_padding_left: ${var:_operator_settings.js->viewport_left} + ui_position_padding_right: ${var:_operator_settings.js->viewport_right} + ui_position_padding_top: ${var:_operator_settings.js->viewport_top} \ No newline at end of file diff --git a/config/nearl.yaml b/config/nearl.yaml new file mode 100644 index 0000000..527a05a --- /dev/null +++ b/config/nearl.yaml @@ -0,0 +1,26 @@ +_operator_settings.js: + fallbackImage_height: 2048 + fallbackImage_width: 2048 + filename: dyn_illust_char_1014_nearl2 + fps: 60 + opacity: 30 + viewport_bottom: 0 + viewport_left: 2 + viewport_right: 3 + viewport_top: 10 +index.html: + fallback_name: char_1014_nearl2_2 + id: char_1014_nearl2 + operator_logo: logo_kazimierz + title: 'Arknights: Nearl the Radiant Knight - 明日方舟：耀骑士临光' + version: ${func:get_version()} +project.json: + description: 'Arknights: Nearl the Radiant Knight Live 2D\n明日方舟：耀骑士临光 Live 2D\nThe model is extracted from game with Spine support.\n模型来自游戏内提取，支持Spine\nPlease set your FPS target in Wallpaper Engine > Settings > Performance > FPS\n请在 Wallpaper Engine > 设置 > 性能 > FPS 下设置FPS\n\nLive preview on: https://arknights.halyul.dev/nearl\nGithub: https://github.com/Halyul/aklive2d' + title: ${var:index.html->title} + ui_logo_opacity: ${var:_operator_settings.js->opacity} + ui_logo_ratio: 61.8 + ui_operator_logo: 'true' + ui_position_padding_bottom: ${var:_operator_settings.js->viewport_bottom} + ui_position_padding_left: ${var:_operator_settings.js->viewport_left} + ui_position_padding_right: ${var:_operator_settings.js->viewport_right} + ui_position_padding_top: ${var:_operator_settings.js->viewport_top} \ No newline at end of file diff --git a/config/nian.yaml b/config/nian.yaml new file mode 100644 index 0000000..90ab89d --- /dev/null +++ b/config/nian.yaml @@ -0,0 +1,26 @@ +_operator_settings.js: + fallbackImage_height: 2048 + fallbackImage_width: 2048 + filename: dyn_illust_char_2014_nian + fps: 60 + opacity: 30 + viewport_bottom: 5 + viewport_left: 2 + viewport_right: 2 + viewport_top: 3 +index.html: + fallback_name: char_2014_nian_2 + id: char_2014_nian + operator_logo: logo_sui + title: 'Arknights: Nian - 明日方舟：年' + version: ${func:get_version()} +project.json: + description: 'Arknights: Nian Live 2D\n明日方舟：年 Live 2D\nThe model is extracted from game with Spine support.\n模型来自游戏内提取，支持Spine\nPlease set your FPS target in Wallpaper Engine > Settings > Performance > FPS\n请在 Wallpaper Engine > 设置 > 性能 > FPS 下设置FPS\n\nLive preview on: https://arknights.halyul.dev/nian\nGithub: https://github.com/Halyul/aklive2d' + title: ${var:index.html->title} + ui_logo_opacity: ${var:_operator_settings.js->opacity} + ui_logo_ratio: 61.8 + ui_operator_logo: 'true' + ui_position_padding_bottom: ${var:_operator_settings.js->viewport_bottom} + ui_position_padding_left: ${var:_operator_settings.js->viewport_left} + ui_position_padding_right: ${var:_operator_settings.js->viewport_right} + ui_position_padding_top: ${var:_operator_settings.js->viewport_top} \ No newline at end of file diff --git a/config/nian_unfettered_freedom.yaml b/config/nian_unfettered_freedom.yaml new file mode 100644 index 0000000..7f6c677 --- /dev/null +++ b/config/nian_unfettered_freedom.yaml @@ -0,0 +1,26 @@ +_operator_settings.js: + fallbackImage_height: 2048 + fallbackImage_width: 2048 + filename: dyn_illust_char_2014_nian_nian#4 + fps: 60 + opacity: 30 + viewport_bottom: 0 + viewport_left: 0 + viewport_right: 0 + viewport_top: 0 +index.html: + fallback_name: char_2014_nian_nian%234 + id: char_2014_nian_nian%234 + operator_logo: logo_sui + title: 'Arknights: Unfettered Freedom / Nian - 明日方舟：乐逍遥·年' + version: ${func:get_version()} +project.json: + description: 'Arknights: Unfettered Freedom / Nian Live 2D\n明日方舟：乐逍遥·年 Live 2D\nThe model is extracted from game with Spine support.\n模型来自游戏内提取，支持Spine\nPlease set your FPS target in Wallpaper Engine > Settings > Performance > FPS\n请在 Wallpaper Engine > 设置 > 性能 > FPS 下设置FPS\n\nLive preview on: https://arknights.halyul.dev/nian_unfettered_freedom\nGithub: https://github.com/Halyul/aklive2d' + title: ${var:index.html->title} + ui_logo_opacity: ${var:_operator_settings.js->opacity} + ui_logo_ratio: 61.8 + ui_operator_logo: 'true' + ui_position_padding_bottom: ${var:_operator_settings.js->viewport_bottom} + ui_position_padding_left: ${var:_operator_settings.js->viewport_left} + ui_position_padding_right: ${var:_operator_settings.js->viewport_right} + ui_position_padding_top: ${var:_operator_settings.js->viewport_top} \ No newline at end of file diff --git a/config/phatom_placeholder.yaml b/config/phatom_placeholder.yaml new file mode 100644 index 0000000..96ac71b --- /dev/null +++ b/config/phatom_placeholder.yaml @@ -0,0 +1,26 @@ +_operator_settings.js: + fallbackImage_height: 2048 + fallbackImage_width: 2048 + filename: dyn_illust_char_250_phatom_sale#4 + fps: 60 + opacity: 30 + viewport_bottom: 1 + viewport_left: 0 + viewport_right: 0 + viewport_top: 5 +index.html: + fallback_name: char_250_phatom_sale%234 + id: char_250_phatom_sale%234 + operator_logo: logo_victoria + title: 'Arknights: Placeholder / Phatom - 明日方舟：Placeholder·傀影' + version: ${func:get_version()} +project.json: + description: 'Arknights: Placeholder / Phatom - 明日方舟：Placeholder·傀影 Live 2D\nThe model is extracted from game with Spine support.\n模型来自游戏内提取，支持Spine\nPlease set your FPS target in Wallpaper Engine > Settings > Performance > FPS\n请在 Wallpaper Engine > 设置 > 性能 > FPS 下设置FPS\n\nLive preview on: https://arknights.halyul.dev/phatom_placeholder\nGithub: https://github.com/Halyul/aklive2d' + title: ${var:index.html->title} + ui_logo_opacity: ${var:_operator_settings.js->opacity} + ui_logo_ratio: 61.8 + ui_operator_logo: 'true' + ui_position_padding_bottom: ${var:_operator_settings.js->viewport_bottom} + ui_position_padding_left: ${var:_operator_settings.js->viewport_left} + ui_position_padding_right: ${var:_operator_settings.js->viewport_right} + ui_position_padding_top: ${var:_operator_settings.js->viewport_top} \ No newline at end of file diff --git a/config/rosmontis.yaml b/config/rosmontis.yaml new file mode 100644 index 0000000..6fcc131 --- /dev/null +++ b/config/rosmontis.yaml @@ -0,0 +1,26 @@ +_operator_settings.js: + fallbackImage_height: 2048 + fallbackImage_width: 2048 + filename: dyn_illust_char_391_rosmon + fps: 60 + opacity: 100 + viewport_bottom: -1 + viewport_left: 0 + viewport_right: -14 + viewport_top: -38 +index.html: + fallback_name: char_391_rosmon_2 + id: char_391_rosmon + operator_logo: logo_rhodes_override + title: 'Arknights: Rosmontis - 明日方舟：迷迭香' + version: ${func:get_version()} +project.json: + description: 'Arknights: Rosmontis Live 2D\n明日方舟：迷迭香 Live 2D\nThe model is extracted from game with Spine support.\n模型来自游戏内提取，支持Spine\nPlease set your FPS target in Wallpaper Engine > Settings > Performance > FPS\n请在 Wallpaper Engine > 设置 > 性能 > FPS 下设置FPS\n\nLive preview on: https://arknights.halyul.dev/rosmontis\nGithub: https://github.com/Halyul/aklive2d' + title: ${var:index.html->title} + ui_logo_opacity: ${var:_operator_settings.js->opacity} + ui_logo_ratio: 61.8 + ui_operator_logo: 'true' + ui_position_padding_bottom: ${var:_operator_settings.js->viewport_bottom} + ui_position_padding_left: ${var:_operator_settings.js->viewport_left} + ui_position_padding_right: ${var:_operator_settings.js->viewport_right} + ui_position_padding_top: ${var:_operator_settings.js->viewport_top} \ No newline at end of file diff --git a/config/skadi.yaml b/config/skadi.yaml new file mode 100644 index 0000000..fea592d --- /dev/null +++ b/config/skadi.yaml @@ -0,0 +1,26 @@ +_operator_settings.js: + fallbackImage_height: 2048 + fallbackImage_width: 2048 + filename: dyn_illust_char_1012_skadi2 + fps: 60 + opacity: 30 + viewport_bottom: -12 + viewport_left: -5 + viewport_right: -10 + viewport_top: 0 +index.html: + fallback_name: char_1012_skadi2_2 + id: char_1012_skadi2 + operator_logo: logo_egir + title: 'Arknights: Skadi the Corrupting Heart - 明日方舟：浊心斯卡蒂' + version: ${func:get_version()} +project.json: + description: 'Arknights: Skadi the Corrupting Heart Live 2Di\r\n明日方舟：浊心斯卡蒂 Live 2Di\r\nThe model is extracted from game with Spine support.\r\n模型来自游戏内提取，支持Spine\r\nPlease set your FPS target in Wallpaper Engine > Settings > Performance > FPS\r\n请在Wallpaper Engine > 设置 > 性能 > FPS 下设置FPS\r\n\r\nLive preview on: https://arknights.halyul.dev/skadi\r\nGithub: https://github.com/Halyul/aklive2d' + title: ${var:index.html->title} + ui_logo_opacity: ${var:_operator_settings.js->opacity} + ui_logo_ratio: 61.8 + ui_operator_logo: 'true' + ui_position_padding_bottom: ${var:_operator_settings.js->viewport_bottom} + ui_position_padding_left: ${var:_operator_settings.js->viewport_left} + ui_position_padding_right: ${var:_operator_settings.js->viewport_right} + ui_position_padding_top: ${var:_operator_settings.js->viewport_top} \ No newline at end of file diff --git a/config/w.yaml b/config/w.yaml new file mode 100644 index 0000000..bebd571 --- /dev/null +++ b/config/w.yaml @@ -0,0 +1,26 @@ +_operator_settings.js: + fallbackImage_height: 2048 + fallbackImage_width: 2048 + filename: dyn_illust_char_113_cqbw + fps: 60 + opacity: 30 + viewport_bottom: 1 + viewport_left: 3 + viewport_right: -3 + viewport_top: 0 +index.html: + fallback_name: char_113_cqbw_2 + id: char_113_cqbw + operator_logo: logo_babel + title: 'Arknights: W - 明日方舟：W' + version: ${func:get_version()} +project.json: + description: 'Arknights: W Live 2D\n明日方舟：W Live 2D\nThe model is extracted from game with Spine support.\n模型来自游戏内提取，支持Spine\nPlease set your FPS target in Wallpaper Engine > Settings > Performance > FPS\n请在 Wallpaper Engine > 设置 > 性能 > FPS 下设置FPS\n\nLive preview on: https://arknights.halyul.dev/w\nGithub: https://github.com/Halyul/aklive2d' + title: ${var:index.html->title} + ui_logo_opacity: ${var:_operator_settings.js->opacity} + ui_logo_ratio: 61.8 + ui_operator_logo: 'true' + ui_position_padding_bottom: ${var:_operator_settings.js->viewport_bottom} + ui_position_padding_left: ${var:_operator_settings.js->viewport_left} + ui_position_padding_right: ${var:_operator_settings.js->viewport_right} + ui_position_padding_top: ${var:_operator_settings.js->viewport_top} \ No newline at end of file diff --git a/lib/config.py b/lib/config.py index 93c206a..2a264f2 100644 --- a/lib/config.py +++ b/lib/config.py @@ -1,4 +1,5 @@ import pathlib, yaml +from yamlinclude import YamlIncludeConstructor class Config: @@ -58,14 +59,10 @@ class Config: self.__read_config() return self.config - def save(self, config): - yaml.SafeDumper.ignore_aliases = lambda *args : True - with open(self.config_path, 'w') as f: - yaml.safe_dump(config, f, allow_unicode=True, default_flow_style=False) - def __read_config(self): try: - self.config = yaml.safe_load(open(self.config_path, "r")) + YamlIncludeConstructor.add_to_loader_class(loader_class=yaml.FullLoader, base_dir=pathlib.Path.cwd()) + self.config = yaml.load(open(self.config_path, "r"), Loader=yaml.FullLoader) except Exception as e: raise else: @@ -86,8 +83,6 @@ class Config: self.__config_check(operator_name, operator_content, self.valid_keys[key]) for filename, filetype in self.config[key][operator_name].items(): self.__config_check(filename, filetype, self.valid_keys["operator_config"][filename]) - - self.save(self.config) def __config_check(self, block_name: str, contents: dict, required_keys: dict): checklist = [key for key in required_keys] diff --git a/requirements.txt b/requirements.txt index 0bcb3ff..a61000d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,3 @@ -Pillow==9.0.0 -PyYAML==5.4.1 +Pillow==9.0.1 +PyYAML==6.0 +pyyaml_include==1.2.post2