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

fix chain bug

This commit is contained in:
notify 2023-03-20 20:28:25 +08:00
parent 16b6800811
commit 44c932981b
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/standard/init.lua
View File

@ -167,6 +167,8 @@ local luoyi = fk.CreateTriggerSkill{
return return
end end
if data.chain then return end
local c = data.card local c = data.card
return c and c.trueName == "slash" or c.name == "duel" return c and c.trueName == "slash" or c.name == "duel"
end, end,

4
packages/standard_cards/init.lua
View File

@ -789,7 +789,7 @@ local iceSwordSkill = fk.CreateTriggerSkill{
attached_equip = "ice_sword", attached_equip = "ice_sword",
events = {fk.DamageCaused}, events = {fk.DamageCaused},
can_trigger = function(self, event, target, player, data) 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() data.card and data.card.trueName == "slash" and not data.to:isNude()
end, end,
on_use = function(self, event, target, player, data) on_use = function(self, event, target, player, data)
@ -989,7 +989,7 @@ local kylinBowSkill = fk.CreateTriggerSkill{
events = {fk.DamageCaused}, events = {fk.DamageCaused},
can_trigger = function(self, event, target, player, data) can_trigger = function(self, event, target, player, data)
local ret = target == player and player:hasSkill(self.name) and 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 if ret then
---@type ServerPlayer ---@type ServerPlayer
local to = data.to local to = data.to

1
qml/Pages/Room.qml
View File

@ -622,7 +622,6 @@ Item {
let item = specialCardSkills.itemAt(i); let item = specialCardSkills.itemAt(i);
if (item.checked) { if (item.checked) {
let ret = item.orig_text; let ret = item.orig_text;
console.log(ret);
return ret; return ret;
} }
} }

5
qml/Splash.qml
View File

@ -148,15 +148,12 @@ Rectangle {
PropertyAction { target: splash; property: "loading"; value: false } PropertyAction { target: splash; property: "loading"; value: false }
} }
/*
Text { Text {
text: qsTr("Powered by Mogara") text: "FK联机交流群：531553435"
color: "#f39292"
font.pixelSize: 20 font.pixelSize: 20
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.right: parent.right anchors.right: parent.right
} }
*/
//--------------------Disappear-------------- //--------------------Disappear--------------
Behavior on opacity { Behavior on opacity {