From 276627477e250e7d4d9c7624881a49de79e36581 Mon Sep 17 00:00:00 2001 From: Dituon <68615161+Dituon@users.noreply.github.com> Date: Fri, 24 Jan 2025 19:32:02 +0900 Subject: [PATCH] =?UTF-8?q?fix(Core):=20=E6=A8=A1=E6=9D=BF=E9=A2=84?= =?UTF-8?q?=E8=AE=BE=E5=AD=97=E4=BD=93=E5=AF=BC=E8=87=B4=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=AD=97=E4=BD=93=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kotlin/moe/dituon/petpet/old_template/OldTextTemplate.kt | 4 ++-- .../kotlin/moe/dituon/petpet/template/element/TextTemplate.kt | 4 ++-- 2 files changed, 4 insertions(+), 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 index 85dab8a1..3087a6e9 100644 --- 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 index ff0c3fe6..4a82c7c7 100644 --- 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 = mutableListOf(TextModel.DEFAULT_COLOR) private set - var fontName: List = mutableListOf("simsun") + var fontName: List = mutableListOf() private set var size: FloatArray = floatArrayOf(16f) private set