fix chain bug
This commit is contained in:
parent
16b6800811
commit
44c932981b
|
@ -167,6 +167,8 @@ local luoyi = fk.CreateTriggerSkill{
|
|||
return
|
||||
end
|
||||
|
||||
if data.chain then return end
|
||||
|
||||
local c = data.card
|
||||
return c and c.trueName == "slash" or c.name == "duel"
|
||||
end,
|
||||
|
|
|
@ -789,7 +789,7 @@ local iceSwordSkill = fk.CreateTriggerSkill{
|
|||
attached_equip = "ice_sword",
|
||||
events = {fk.DamageCaused},
|
||||
can_trigger = function(self, event, target, player, data)
|
||||
return target == player and player:hasSkill(self.name) and
|
||||
return target == player and player:hasSkill(self.name) and (not data.chain) and
|
||||
data.card and data.card.trueName == "slash" and not data.to:isNude()
|
||||
end,
|
||||
on_use = function(self, event, target, player, data)
|
||||
|
@ -989,7 +989,7 @@ local kylinBowSkill = fk.CreateTriggerSkill{
|
|||
events = {fk.DamageCaused},
|
||||
can_trigger = function(self, event, target, player, data)
|
||||
local ret = target == player and player:hasSkill(self.name) and
|
||||
data.card and data.card.trueName == "slash"
|
||||
data.card and data.card.trueName == "slash" and (not data.chain)
|
||||
if ret then
|
||||
---@type ServerPlayer
|
||||
local to = data.to
|
||||
|
|
|
@ -622,7 +622,6 @@ Item {
|
|||
let item = specialCardSkills.itemAt(i);
|
||||
if (item.checked) {
|
||||
let ret = item.orig_text;
|
||||
console.log(ret);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -148,15 +148,12 @@ Rectangle {
|
|||
PropertyAction { target: splash; property: "loading"; value: false }
|
||||
}
|
||||
|
||||
/*
|
||||
Text {
|
||||
text: qsTr("Powered by Mogara")
|
||||
color: "#f39292"
|
||||
text: "FK联机交流群:531553435"
|
||||
font.pixelSize: 20
|
||||
anchors.bottom: parent.bottom
|
||||
anchors.right: parent.right
|
||||
}
|
||||
*/
|
||||
|
||||
//--------------------Disappear--------------
|
||||
Behavior on opacity {
|
||||
|
|
Loading…
Reference in New Issue