diff --git a/Fk/RoomElement/GeneralCardItem.qml b/Fk/RoomElement/GeneralCardItem.qml index 7ed4535b..0b0610cf 100644 --- a/Fk/RoomElement/GeneralCardItem.qml +++ b/Fk/RoomElement/GeneralCardItem.qml @@ -23,6 +23,7 @@ CardItem { property int maxHp property int shieldNum property string pkgName: "" + property bool detailed: true name: "" // description: Sanguosha.getGeneralDescription(name) suit: "" @@ -39,18 +40,21 @@ CardItem { scale: subkingdom ? 0.6 : 1 transformOrigin: Item.TopLeft source: SkinBank.getGeneralCardDir(kingdom) + kingdom + visible: detailed } Image { scale: 0.6; x: 9; y: 12 transformOrigin: Item.TopLeft source: subkingdom ? SkinBank.getGeneralCardDir(subkingdom) + subkingdom : "" + visible: detailed } Row { x: 34 y: 4 spacing: 1 + visible: detailed Repeater { id: hpRepeater model: (hp > 5 || hp !== maxHp) ? 1 : hp @@ -94,6 +98,7 @@ CardItem { } Shield { + visible: detailed anchors.right: parent.right anchors.top: parent.top anchors.topMargin: hpRepeater.model > 4 ? 16 : 0 @@ -107,7 +112,7 @@ CardItem { x: 2 y: lineCount > 6 ? 30 : 34 text: Backend.translate(name) - visible: Backend.translate(name).length <= 6 + visible: Backend.translate(name).length <= 6 && detailed color: "white" font.family: fontLibian.name font.pixelSize: 18 @@ -122,7 +127,7 @@ CardItem { rotation: 90 transformOrigin: Item.BottomLeft text: Backend.translate(name) - visible: Backend.translate(name).length > 6 + visible: Backend.translate(name).length > 6 && detailed color: "white" font.family: fontLibian.name font.pixelSize: 18 @@ -130,7 +135,7 @@ CardItem { } Rectangle { - visible: pkgName !== "" + visible: pkgName !== "" && detailed height: 16 width: childrenRect.width + 4 anchors.bottom: parent.bottom diff --git a/lua/core/card.lua b/lua/core/card.lua index 42eac902..908b754a 100644 --- a/lua/core/card.lua +++ b/lua/core/card.lua @@ -346,7 +346,7 @@ end ---@param symbol boolean @ 是否以符号形式显示花色 ---@return string @ 完整点数(字符串) function Card:getSuitCompletedString(symbol) - return self:getSuitString(symbol) .. getNumberStr(self.number) + return Fk:translate(self:getSuitString(symbol)) .. getNumberStr(self.number) end --- 判断卡牌是否为普通锦囊牌 diff --git a/lua/core/player.lua b/lua/core/player.lua index 28dcb81b..6f9e3acc 100644 --- a/lua/core/player.lua +++ b/lua/core/player.lua @@ -492,7 +492,7 @@ function Player:distanceTo(other, mode, ignore_dead) mode = mode or "both" if other == self then return 0 end if not ignore_dead and other.dead then - print(other.name .. " is dead!") + print(other.general .. " is dead!") return -1 end if self:isRemoved() or other:isRemoved() then