fix(Core): 模板预设字体导致默认字体失效

Dituon · Jan 24, 2025 · 2766274 · 2766274
1 parent 2b6fdc1
commit 2766274
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/core/src/main/kotlin/moe/dituon/petpet/old_template/OldTextTemplate.kt b/core/src/main/kotlin/moe/dituon/petpet/old_template/OldTextTemplate.kt
@@ -15,7 +15,7 @@ data class OldTextTemplate @JvmOverloads constructor(
     var pos: IntArray = intArrayOf(0, 0),
     var angle: Short = 0,
     var color: String = "#191919",
-    var font: String = "simsun",
+    var font: String = "",
     var size: Int = 16,
     var align: TextAlign = TextAlign.LEFT,
     var baseline: TextBaseline = TextBaseline.TOP,
@@ -82,7 +82,7 @@ data class OldTextTemplate @JvmOverloads constructor(
             ),
             angle = floatArrayOf(angle.toFloat()),
             color = listOf(decodeColor(color)),
-            fontName = listOf(font),
+            fontName = if (font.isEmpty()) listOf() else listOf(font),
             size = floatArrayOf(minSize.toFloat()),
             maxSize = floatArrayOf(maxSize.toFloat()),
             align = listOf(align),

diff --git a/core/src/main/kotlin/moe/dituon/petpet/template/element/TextTemplate.kt b/core/src/main/kotlin/moe/dituon/petpet/template/element/TextTemplate.kt
@@ -93,7 +93,7 @@ data class TextTemplate(
     val angle: FloatOrArray = floatArrayOf(0f),
     val color: ColorList = listOf(TextModel.DEFAULT_COLOR),
     @SerialName("font")
-    val fontName: StringList = listOf("simsun"),
+    val fontName: StringList = listOf(),
     @JsonNames("min_size")
     val size: FloatOrArray = floatArrayOf(16f),
     @JsonNames("max_size")
@@ -183,7 +183,7 @@ data class TextTemplate(
             private set
         var color: List<Color> = mutableListOf(TextModel.DEFAULT_COLOR)
             private set
-        var fontName: List<String> = mutableListOf("simsun")
+        var fontName: List<String> = mutableListOf()
             private set
         var size: FloatArray = floatArrayOf(16f)
             private set