From 628798ff43b6ee6d02809b947401f7be52c8f6b7 Mon Sep 17 00:00:00 2001
From: Harry Huang <harryhuang2652@qq.com>
Date: Sat, 27 Jan 2024 23:12:40 +0800
Subject: [PATCH 1/3] Small Update

---
 assets/UI/Homepage.fxml                       | 16 ++++++-------
 assets/UI/Main.css                            | 23 ++++++++++---------
 build.gradle                                  |  2 +-
 core/src/cn/harryh/arkpets/Const.java         |  2 +-
 .../cn/harryh/arkpets/assets/AssetItem.java   |  8 +++----
 docs/scripts/ExePacking.iss                   |  2 +-
 6 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/assets/UI/Homepage.fxml b/assets/UI/Homepage.fxml
index e9c0d944..6365586e 100644
--- a/assets/UI/Homepage.fxml
+++ b/assets/UI/Homepage.fxml
@@ -32,7 +32,7 @@
                     <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
                     <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
                 </rowConstraints>
-                <JFXButton fx:id="menuBtn1" mnemonicParsing="false" prefHeight="40.0" prefWidth="140.0" styleClass="shadowed" text="模型" textAlignment="CENTER">
+                <JFXButton fx:id="menuBtn1" mnemonicParsing="false" prefHeight="40.0" prefWidth="140.0" text="模型" textAlignment="CENTER">
                     <GridPane.margin>
                         <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
                     </GridPane.margin>
@@ -42,7 +42,7 @@
                         </AnchorPane>
                     </graphic>
                 </JFXButton>
-                <JFXButton fx:id="menuBtn2" mnemonicParsing="false" prefHeight="40.0" prefWidth="140.0" styleClass="shadowed" text="行为" textAlignment="CENTER" GridPane.rowIndex="1">
+                <JFXButton fx:id="menuBtn2" mnemonicParsing="false" prefHeight="40.0" prefWidth="140.0" text="行为" textAlignment="CENTER" GridPane.rowIndex="1">
                     <GridPane.margin>
                         <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
                     </GridPane.margin>
@@ -52,7 +52,7 @@
                         </AnchorPane>
                     </graphic>
                 </JFXButton>
-                <JFXButton fx:id="menuBtn3" mnemonicParsing="false" prefHeight="40.0" prefWidth="140.0" styleClass="shadowed" text="选项" textAlignment="CENTER" GridPane.rowIndex="2">
+                <JFXButton fx:id="menuBtn3" mnemonicParsing="false" prefHeight="40.0" prefWidth="140.0" text="选项" textAlignment="CENTER" GridPane.rowIndex="2">
                     <GridPane.margin>
                         <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
                     </GridPane.margin>
@@ -77,13 +77,13 @@
             <Label layoutX="10.0" layoutY="15.0" styleClass="config-group-title" text="模型选择" />
             <ImageView fx:id="selectedModelView" fitHeight="140.0" fitWidth="140.0" layoutX="15.0" layoutY="85.0" pickOnBounds="true" preserveRatio="true" />
             <VBox layoutX="15.0" layoutY="200.0" prefHeight="140.0" prefWidth="140.0">
-                <Label fx:id="selectedModelName" styleClass="Info-primary" text="Name" />
-                <Label fx:id="selectedModelAppellation" styleClass="Info-secondary" text="Appellation" />
-                <Label fx:id="selectedModelSkinGroupName" styleClass="Info-secondary" text="SkinGroup" />
+                <Label fx:id="selectedModelName" styleClass="info-primary" text="Name" />
+                <Label fx:id="selectedModelAppellation" styleClass="info-secondary" text="Appellation" />
+                <Label fx:id="selectedModelSkinGroupName" styleClass="info-secondary" text="SkinGroup" />
                 <Label fx:id="selectedModelType" text="ModelType">
                     <styleClass>
-                        <String fx:value="Info-tag" />
-                        <String fx:value="Info-tag-theme" />
+                        <String fx:value="info-tag" />
+                        <String fx:value="info-tag-theme" />
                     </styleClass>
                 </Label>
             </VBox>
diff --git a/assets/UI/Main.css b/assets/UI/Main.css
index e60cbbb9..048033ae 100644
--- a/assets/UI/Main.css
+++ b/assets/UI/Main.css
@@ -20,7 +20,8 @@
 
 /* Drop shadow for Nodes */
 .shadowed {
--fx-effect: dropshadow(gaussian, #00000040, 10, 0.2, 0, 1);
+/* Note: dropshadow(type, color, radius, spread, x, y) */
+-fx-effect: dropshadow(gaussian, #00000040, 10, 0.1, 0, 0.5);
 }
 
 /* Fluorescent strokes for Shapes */
@@ -125,7 +126,7 @@ JFXButton {
 -fx-border-style: solid;
 }
 
-.menu-btn-active, .menu-btn-active:hover, .menu-btn-active:focused {
+.menu-btn-active {
 /* Active */
 -fx-text-fill: #FFFFFF;
 -fx-background-color: #204880;
@@ -136,7 +137,7 @@ JFXButton {
 -fx-fill: #204880;
 }
 
-.menu-btn-active SVGPath, .menu-btn-active:hover SVGPath, .menu-btn-active:focused SVGPath {
+.menu-btn-active SVGPath {
 /* Hover & Active */
 -fx-fill: #FFFFFF;
 }
@@ -247,27 +248,27 @@ JFXButton {
 -fx-text-fill: #606060;
 }
 
-.Info-primary {
+.info-primary {
 -fx-font-size: 16px;
 -fx-text-fill: #202020;
 -fx-font-weight: bold;
 -fx-label-padding: 4px 2px 4px 2px;
 }
 
-.Info-secondary {
+.info-secondary {
 -fx-font-size: 12px;
 -fx-font-weight: normal;
 -fx-text-fill: #808080;
 -fx-label-padding: 2px;
 }
 
-.Info-tag {
+.info-tag {
 -fx-font-size: 10px;
 -fx-background-radius: 6px;
 -fx-label-padding: 2px 4px 2px 4px;
 }
 
-.Info-tag-theme {
+.info-tag-theme {
 -fx-text-fill: #FFFFFF;
 -fx-background-color: #4D7999;
 }
@@ -434,11 +435,11 @@ ProgressBar > .bar, ProgressBar:indeterminate > .bar{
 -fx-padding: 0;
 }
 
+.scroll-pane:focused, .scroll-pane .corner {
+-fx-background-insets: 0;
+}
+
 .scroll-v {
 -fx-hbar-policy: never;
 -fx-vbar-policy: as-needed;
 }
-
-.scroll-pane:focused, .scroll-pane .corner {
--fx-background-insets: 0;
-}
diff --git a/build.gradle b/build.gradle
index 571b4808..99528f91 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ allprojects {
     apply plugin: "java-library"
     apply plugin: "org.openjfx.javafxplugin"
 
-    version = "2.4.0"
+    version = "2.4.1"
     ext {
         // App Metadata
         appName = "ArkPets"
diff --git a/core/src/cn/harryh/arkpets/Const.java b/core/src/cn/harryh/arkpets/Const.java
index 5066b8b7..b997cf7e 100644
--- a/core/src/cn/harryh/arkpets/Const.java
+++ b/core/src/cn/harryh/arkpets/Const.java
@@ -11,7 +11,7 @@
  */
 public final class Const {
     // App version
-    public static final Version appVersion  = new Version(2, 4, 0);
+    public static final Version appVersion  = new Version(2, 4, 1);
 
     // App name
     public static final String appName      = "ArkPets";
diff --git a/core/src/cn/harryh/arkpets/assets/AssetItem.java b/core/src/cn/harryh/arkpets/assets/AssetItem.java
index 22a210cf..03aac83d 100644
--- a/core/src/cn/harryh/arkpets/assets/AssetItem.java
+++ b/core/src/cn/harryh/arkpets/assets/AssetItem.java
@@ -207,9 +207,9 @@ public interface PropertyExtractor<T> extends Function<AssetItem, Set<T>> {
         @Override
         Set<T> apply(AssetItem assetItem);
 
-        PropertyExtractor<String> ASSET_ITEM_TYPE               = item -> Set.of(item.type);
-        PropertyExtractor<String> ASSET_ITEM_STYLE              = item -> Set.of(item.style);
-        PropertyExtractor<String> ASSET_ITEM_SKIN_GROUP_NAME    = item -> Set.of(item.skinGroupName);
-        PropertyExtractor<String> ASSET_ITEM_SORT_TAGS          = item -> new HashSet<>(item.sortTags.toJavaList(String.class));
+        PropertyExtractor<String> ASSET_ITEM_TYPE            = item -> item.type          == null ? Set.of() : Set.of(item.type);
+        PropertyExtractor<String> ASSET_ITEM_STYLE           = item -> item.style         == null ? Set.of() : Set.of(item.style);
+        PropertyExtractor<String> ASSET_ITEM_SKIN_GROUP_NAME = item -> item.skinGroupName == null ? Set.of() : Set.of(item.skinGroupName);
+        PropertyExtractor<String> ASSET_ITEM_SORT_TAGS       = item -> new HashSet<>(item.sortTags.toJavaList(String.class));
     }
 }
diff --git a/docs/scripts/ExePacking.iss b/docs/scripts/ExePacking.iss
index 6112eb1f..f67db6d5 100644
--- a/docs/scripts/ExePacking.iss
+++ b/docs/scripts/ExePacking.iss
@@ -4,7 +4,7 @@
 ; Download Inno Setup: https://jrsoftware.org/isdl.php
 
 #define MyAppName "ArkPets"
-#define MyAppVersion "2.4.0"
+#define MyAppVersion "2.4.1"
 #define MyAppPublisher "Harry Huang"
 #define MyAppURL "https://arkpets.harryh.cn/"
 

From 5e15d000bd77006da596696de2e41024fb4183d4 Mon Sep 17 00:00:00 2001
From: Harry Huang <harryhuang2652@qq.com>
Date: Sat, 27 Jan 2024 23:22:57 +0800
Subject: [PATCH 2/3] Bug-fix

---
 core/src/cn/harryh/arkpets/ArkChar.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/cn/harryh/arkpets/ArkChar.java b/core/src/cn/harryh/arkpets/ArkChar.java
index a3b95cf6..91516e51 100644
--- a/core/src/cn/harryh/arkpets/ArkChar.java
+++ b/core/src/cn/harryh/arkpets/ArkChar.java
@@ -55,7 +55,9 @@ public ArkChar(String assetLocation, AssetItem.AssetAccessor assetAccessor, floa
         batch = new TwoColorPolygonBatch();
         fbo = new FrameBuffer(Format.RGBA8888, canvasMaxSize, canvasMaxSize, false);
         renderer = new SkeletonRenderer();
-        renderer.setPremultipliedAlpha(true);
+        /* Pre-multiplied alpha shouldn't be applied to models released in Arknights 2.1.41 or later,
+        otherwise you may get a corrupted rendering result. */
+        renderer.setPremultipliedAlpha(false);
         // 2.Geometry setup
         position = new TransitionVector3(TernaryFunction.LINEAR, linearEasingDuration);
         offsetY = new TransitionFloat(TernaryFunction.LINEAR, linearEasingDuration);

From d18c124359a53d6175b9aedcf794b9010941e5bb Mon Sep 17 00:00:00 2001
From: Harry Huang <harryhuang2652@qq.com>
Date: Sun, 28 Jan 2024 13:34:04 +0800
Subject: [PATCH 3/3] Doc Update

---
 CHANGELOG.md | 13 ++++++-------
 README.md    | 20 ++++++++++----------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79592abe..cce88b71 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,5 @@
 # 更新日志 / CHANGELOG
 
-***目前最新可用版本：***
-[<img alt="GitHub latest release" src="https://img.shields.io/github/v/release/isHarryh/Ark-Pets?display_name=tag&label=Version&sort=semver&include_prereleases">](https://github.com/isHarryh/Ark-Pets/releases)
-
 ## v2.4
 | **新增**      |                                                     |
 |:------------|:----------------------------------------------------|
@@ -24,9 +21,10 @@
 | [`f6139c3`]                | 重构了**模型资源**的代码逻辑。                              |
 | [`#47`]<br>[`7db99c3`]     | 优化了 Windows 安装程序的默认安装目录和在控制面板卸载页面中的表现。         |
 
-| **补丁**                  |                        |
-|:------------------------|:-----------------------|
-| `v2.4.1`<br>[`f2683f9`] | 修复了首次启动桌宠后的提示弹窗未生效的问题。 |
+| **补丁**                  |                                             |
+|:------------------------|:--------------------------------------------|
+| `v2.4.1`<br>[`f2683f9`] | 修复了首次启动桌宠后的提示弹窗未生效的问题。                      |
+| `v2.4.2`<br>[`5e15d00`] | 修复了渲染《明日方舟》2.1.41 及以后的新模型时 Alpha 图层表现异常的问题。 |
 
 ## v2.3
 | **新增**      |                                              |
@@ -304,4 +302,5 @@
 [`7db99c3`]: https://github.com/isHarryh/Ark-Pets/commit/7db99c32f44d86ff23b9857fec21e5e024f8a9b8
 [`a5c7b9a`]: https://github.com/isHarryh/Ark-Pets/commit/a5c7b9a99f4fd79d4f92497a7a855c71ba112dcb
 [`727a34e`]: https://github.com/isHarryh/Ark-Pets/commit/727a34eed5d1a41ee3e6f153726f2bcf92a28958
-[`f2683f9`]: https://github.com/isHarryh/Ark-Pets/commit/f2683f9d40bfb09fdacee719df9a001f55fa9d8f
\ No newline at end of file
+[`f2683f9`]: https://github.com/isHarryh/Ark-Pets/commit/f2683f9d40bfb09fdacee719df9a001f55fa9d8f
+[`5e15d00`]: https://github.com/isHarryh/Ark-Pets/commit/5e15d000bd77006da596696de2e41024fb4183d4
diff --git a/README.md b/README.md
index c602cb15..5c9659ef 100644
--- a/README.md
+++ b/README.md
@@ -81,21 +81,21 @@
 
 ## 使用方法 <sub>Usage</sub>
 
-***目前最新可用版本：***
-[<img alt="GitHub latest release" src="https://img.shields.io/github/v/release/isHarryh/Ark-Pets?display_name=tag&label=Version&sort=semver&include_prereleases">](https://github.com/isHarryh/Ark-Pets/releases)
+|                                            **[目前最新版本](https://github.com/isHarryh/Ark-Pets/releases)**                                             |                                   **支持的操作系统**                                    |
+|:--------------------------------------------------------------------------------------------------------------------------------------------------:|:--------------------------------------------------------------------------------:|
+| ![GitHub latest release](https://img.shields.io/github/v/release/isHarryh/Ark-Pets?display_name=tag&label=Release&sort=semver&include_prereleases) | ![Windows 7+](https://img.shields.io/badge/7%2B-blue?logo=Windows&label=Windows) |
 
 ### 快速上手
 
 1. 请[**前往此页面**](https://github.com/isHarryh/Ark-Pets/releases)下载最新的 **ArkPets-Setup.exe** 安装包。
-2. 下载完成后，请运行所下载的安装包以进行软件的安装。
-3. 安装完成后，请通过桌面快捷方式等途径，打开 ArkPets 启动器。
-4. 打开启动器后，首次使用需要 **下载模型文件** 。请进入启动器“选项”页面，在“模型下载”处点击“全部下载”。
-5. 最后，进入启动器“模型”页面即可检索并选中想要作为桌宠启动的角色，然后点击左下角“启动”按钮即可。
+2. 运行安装包并进行软件的安装。安装完成后，打开 ArkPets 启动器。
+3. 首次使用时需要**下载模型文件**。请进入启动器 “选项” 页面，在模型下载处点击 “全部下载” 按钮。
+4. 进入启动器 “模型” 页面即可检索并选中想要作为桌宠启动的角色，最后点击左下角 “启动” 按钮即可。
 
 > 提示：
-> - 本程序当前只支持在`Windows`系统上运行。
-> - 如需更新软件到 v2.x 的更高版本，无需预先手动卸载，直接运行安装包即可。
-> - 如需关闭已启动的桌宠，请右键点击系统托盘中的 ArkPets 图标，然后选择“退出”。
+> - 如需关闭已启动的桌宠，请右键单击桌宠或系统托盘中的 ArkPets 图标，然后选择 “退出”。
+> - 若无法在软件内下载模型，可以访问 [ArkModels 模型仓库](https://github.com/isHarryh/Ark-Models)页面。手动下载模型压缩包后，在 “选项” 页面点击 “导入压缩包” 按钮后导入即可。
+> - 如需更新软件到 v2.x 的更高版本，无需预先手动卸载，直接运行新版安装包即可。
 
 ### 额外说明
 
@@ -123,7 +123,7 @@
 
 ### 许可证
 
-本项目基于**GPL3协议**。任何人都可以自由地使用和修改项目内的源代码，前提是要在源代码或版权声明中保留作者说明和原有协议，且使用相同的许可证进行开源。
+本项目基于 **GPL3协议**。任何人都可以自由地使用和修改项目内的源代码，前提是要在源代码或版权声明中保留作者说明和原有协议，且使用相同的许可证进行开源。
 
 ### 参与贡献