diff --git a/Fk/RoomElement/Photo.qml b/Fk/RoomElement/Photo.qml index c77d0ed3..40bc5c58 100644 --- a/Fk/RoomElement/Photo.qml +++ b/Fk/RoomElement/Photo.qml @@ -442,10 +442,12 @@ Item { // id: saveme visible: (root.dead && !root.rest) || root.dying || root.surrendered source: { - if (root.dead) { + if (root.surrendered) { + return SkinBank.DEATH_DIR + "surrender"; + } else if (root.dead) { return SkinBank.getRoleDeathPic(root.role); } - return SkinBank.DEATH_DIR + (root.surrendered ? "surrender" : "saveme") + return SkinBank.DEATH_DIR + "saveme"; } anchors.centerIn: photoMask } diff --git a/lua/core/game_mode.lua b/lua/core/game_mode.lua index d8480b98..2062a1ff 100644 --- a/lua/core/game_mode.lua +++ b/lua/core/game_mode.lua @@ -27,7 +27,7 @@ end ---@param victim ServerPlayer @ 死者 ---@return string @ 胜者阵营 function GameMode:getWinner(victim) - if victim.rest > 0 then + if not victim.surrendered and victim.rest > 0 then return "" end