YunFeiyang
/
FreeKill
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

回来吧我的十常侍 (#324) 

回来吧我的十常侍，我最骄傲的信仰，历历在目的休整，投降莫名在平局。
This commit is contained in:
Ho-spair 2024-02-27 16:32:14 +08:00 committed by GitHub
parent 59c638fa47
commit 4d94ee8a93
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Fk/RoomElement/Photo.qml
View File

@ -442,10 +442,12 @@ Item {
// id: saveme // id: saveme
visible: (root.dead && !root.rest) || root.dying || root.surrendered visible: (root.dead && !root.rest) || root.dying || root.surrendered
source: { source: {
if (root.dead) { if (root.surrendered) {
return SkinBank.DEATH_DIR + "surrender";
} else if (root.dead) {
return SkinBank.getRoleDeathPic(root.role); return SkinBank.getRoleDeathPic(root.role);
} }
return SkinBank.DEATH_DIR + (root.surrendered ? "surrender" : "saveme") return SkinBank.DEATH_DIR + "saveme";
} }
anchors.centerIn: photoMask anchors.centerIn: photoMask
} }

2
lua/core/game_mode.lua
View File

@ -27,7 +27,7 @@ end
---@param victim ServerPlayer @ 死者 ---@param victim ServerPlayer @ 死者
---@return string @ 胜者阵营 ---@return string @ 胜者阵营
function GameMode:getWinner(victim) function GameMode:getWinner(victim)
if victim.rest > 0 then if not victim.surrendered and victim.rest > 0 then
return "" return ""
end end