feat(live2d): add texas, relight/neral, become anew/rosmon, dream/passager

TODO: missing fallback image for texas
2022-10-31 23:59:14 -04:00
parent 15d3c8d386
commit 6f28d800b1
8 changed files with 115 additions and 5 deletions
--- a/README.md
+++ b/README.md
@@ -23,6 +23,10 @@ A project that builds showcase webpage for Arknights Live2D-equipped operators.
 | Gavial the Invincible | [Link](https://arknights.halyul.dev/gavial/) | [Link](https://steamcommunity.com/sharedfiles/filedetails/?id=2847605961) |
 | Colorful Wonderland / Surtr | [Link](https://arknights.halyul.dev/surtr_colorful_wonderland/) | [Link](https://steamcommunity.com/sharedfiles/filedetails/?id=2847602015) |
 | Trust Your Eyes / Lee | [Link](https://arknights.halyul.dev/lee_trust_your_eyes/) | [Link](https://steamcommunity.com/sharedfiles/filedetails/?id=2879452075) |
+| Texas the Omertosa | [Link](https://arknights.halyul.dev/texas_the_omertosa/) | [Link](https://steamcommunity.com/sharedfiles/filedetails/?id=2879452075) |
+| Relight / Neral | [Link](https://arknights.halyul.dev/nearl_relight/) | [Link](https://steamcommunity.com/sharedfiles/filedetails/?id=2879452075) |
+| Become Anew / Rosmontis | [Link](https://arknights.halyul.dev/rosmontis_become_anew/) | [Link](https://steamcommunity.com/sharedfiles/filedetails/?id=2879452075) |
+| Dream in a Moment / Passager | [Link](https://arknights.halyul.dev/passager_dream_in_a_moment/) | [Link](https://steamcommunity.com/sharedfiles/filedetails/?id=2879452075) |

 - For Windows users: Use [Wallpaper Engine](https://www.wallpaperengine.io/en) or other softwares that support using webpage as desktop wallpaper.
 - For macOS users: Use [Plash](https://github.com/sindresorhus/Plash), however, I don't have macOS machine, so your mileage may vary.
--- a/config.yaml
+++ b/config.yaml
@@ -21,6 +21,10 @@ operators:
  gavial: !include config/gavial.yaml
  surtr_colorful_wonderland: !include config/surtr_colorful_wonderland.yaml
  lee_trust_your_eyes: !include config/lee_trust_your_eyes.yaml
+  texas_the_omertosa: !include config/texas_the_omertosa.yaml
+  nearl_relight: !include config/nearl_relight.yaml
+  rosmontis_become_anew: !include config/rosmontis_become_anew.yaml
+  passager_dream_in_a_moment: !include config/passager_dream_in_a_moment.yaml
 server:
  operator_folder: ./operator/
  release_folder: ./release/
--- a/config/nearl_relight.yaml
+++ b/config/nearl_relight.yaml
@@ -0,0 +1,26 @@
+_operator_settings.js:
+  fallbackImage_height: 2048
+  fallbackImage_width: 2048
+  filename: dyn_illust_char_1014_nearl2_epoque#17
+  fps: 60
+  opacity: 30
+  viewport_bottom: 0
+  viewport_left: 0
+  viewport_right: 0
+  viewport_top: 0
+index.html:
+  fallback_name: char_1014_nearl2_epoque%2317
+  id: char_1014_nearl2%2317
+  operator_logo: logo_kazimierz
+  title: 'Arknights: Relight / Neral - 明日方舟：复现荣光·耀骑士临光'
+  version: ${func:get_version()}
+project.json:
+  description: 'Arknights: Relight / Neral 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_relight\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}
--- a/config/passager_dream_in_a_moment.yaml
+++ b/config/passager_dream_in_a_moment.yaml
@@ -0,0 +1,26 @@
+_operator_settings.js:
+  fallbackImage_height: 2048
+  fallbackImage_width: 2048
+  filename: dyn_illust_char_472_pasngr_epoque#17
+  fps: 60
+  opacity: 30
+  viewport_bottom: 0
+  viewport_left: 0
+  viewport_right: 0
+  viewport_top: 0
+index.html:
+  fallback_name: char_472_pasngr_epoque%2317
+  id: char_472_pasngr%2317
+  operator_logo: logo_sargon
+  title: 'Arknights: Dream in a Moment / Passager - 明日方舟：今昔须臾之梦 · 异客'
+  version: ${func:get_version()}
+project.json:
+  description: 'Arknights: Dream in a Moment / Passager 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/passager_dream_in_a_moment\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}
--- a/config/rosmontis_become_anew.yaml
+++ b/config/rosmontis_become_anew.yaml
@@ -0,0 +1,26 @@
+_operator_settings.js:
+  fallbackImage_height: 2048
+  fallbackImage_width: 2048
+  filename: dyn_illust_char_391_rosmon_epoque#17
+  fps: 60
+  opacity: 30
+  viewport_bottom: 0
+  viewport_left: 0
+  viewport_right: 0
+  viewport_top: 0
+index.html:
+  fallback_name: char_391_rosmon_epoque%2317
+  id: char_391_rosmon%2317
+  operator_logo: logo_elite
+  title: 'Arknights: Become Anew / Rosmontis - 明日方舟：复现荣光·迷迭香'
+  version: ${func:get_version()}
+project.json:
+  description: 'Arknights: Become Anew / 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_become_anew\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}
--- a/config/texas_the_omertosa.yaml
+++ b/config/texas_the_omertosa.yaml
@@ -0,0 +1,26 @@
+_operator_settings.js:
+  fallbackImage_height: 2048
+  fallbackImage_width: 2048
+  filename: dyn_illust_char_1028_texas2
+  fps: 60
+  opacity: 30
+  viewport_bottom: 0
+  viewport_left: 0
+  viewport_right: 0
+  viewport_top: 0
+index.html:
+  fallback_name: null
+  id: char_1028_texas2
+  operator_logo: logo_penguin
+  title: 'Arknights: Texas the Omertosa - 明日方舟：缄默德克萨斯'
+  version: ${func:get_version()}
+project.json:
+  description: 'Arknights: Texas the Omertosa Live 2D\r\n明日方舟：缄默德克萨斯 Live 2D\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/texas_the_omertosa\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}
--- a/lib/builder.py
+++ b/lib/builder.py
@@ -66,7 +66,7 @@ class Builder:
            source=self.config["operator"]["source_folder"].format(name=operator_name),
            target=self.config["operator"]["target_folder"].format(name=operator_name),
            common_name=self.config["operators"][operator_name]["_operator_settings.js"]["filename"],
-            fallback_name=self.config["operators"][operator_name]["index.html"]["fallback_name"].replace("%23", "#"),
+            fallback_name=self.config["operators"][operator_name]["index.html"]["fallback_name"].replace("%23", "#") if self.config["operators"][operator_name]["index.html"]["fallback_name"] is not None else None,
            id_name=self.config["operators"][operator_name]["index.html"]["id"].replace("%23", "#")
        )

@@ -195,7 +195,7 @@ class Builder:
        source_path = file_paths["source"]
        target_path = file_paths["target"]
        fallback_name = file_paths["fallback_name"]
-
+        if fallback_name is not None:
            AlphaComposite(source_path + fallback_name, target_path + "../{}".format(fallback_name))

    def __json_to_base64(self, path, dict=None, key=None):
--- a/lib/config.py
+++ b/lib/config.py
@@ -33,12 +33,10 @@ class Config:
                    operator_logo=str,
                    title=str,
                    version=str,
-                    fallback_name=str,
                ),
                "_operator_settings.js": dict(
                    fallbackImage_height=int,
                    fallbackImage_width=int,
-                    filename=str,
                    fps=int,
                    viewport_left=int,
                    viewport_right=int,