diff --git a/lua/server/room.lua b/lua/server/room.lua index 787cdf72..5f5d40fa 100644 --- a/lua/server/room.lua +++ b/lua/server/room.lua @@ -997,6 +997,7 @@ function Room:askForChooseCardAndPlayers(player, targets, minNum, maxNum, patter if maxNum < 1 then return {} end + pattern = pattern or ".", local pcards = table.filter(player:getCardIds({ Player.Hand, Player.Equip }), function(id) local c = Fk:getCardById(id) @@ -1008,7 +1009,7 @@ function Room:askForChooseCardAndPlayers(player, targets, minNum, maxNum, patter targets = targets, num = maxNum, min_num = minNum, - pattern = pattern or ".", + pattern = pattern, skillName = skillName } local _, ret = self:askForUseActiveSkill(player, "choose_players_skill", prompt or "", true, data) diff --git a/qml/Pages/RoomElement/PhotoElement/LimitSkillItem.qml b/qml/Pages/RoomElement/PhotoElement/LimitSkillItem.qml index 24465c57..12f5bb55 100644 --- a/qml/Pages/RoomElement/PhotoElement/LimitSkillItem.qml +++ b/qml/Pages/RoomElement/PhotoElement/LimitSkillItem.qml @@ -50,7 +50,7 @@ Item { onUsedtimesChanged: { x.visible = false; if (skilltype === "wake") { - visible = (usedtimes < 1); + visible = (usedtimes > 0); } else if (skilltype === "limit") { visible = true; if (usedtimes >= 1) {