From 44c932981b160451fdcb9f3d1f1a6ce3042d3075 Mon Sep 17 00:00:00 2001 From: notify Date: Mon, 20 Mar 2023 20:28:25 +0800 Subject: [PATCH] fix chain bug --- packages/standard/init.lua | 2 ++ packages/standard_cards/init.lua | 4 ++-- qml/Pages/Room.qml | 1 - qml/Splash.qml | 5 +---- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/standard/init.lua b/packages/standard/init.lua index f2f26f31..7acf8f3c 100644 --- a/packages/standard/init.lua +++ b/packages/standard/init.lua @@ -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, diff --git a/packages/standard_cards/init.lua b/packages/standard_cards/init.lua index 0b68c4a7..7792ace3 100644 --- a/packages/standard_cards/init.lua +++ b/packages/standard_cards/init.lua @@ -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 diff --git a/qml/Pages/Room.qml b/qml/Pages/Room.qml index d75e2499..73cf322c 100644 --- a/qml/Pages/Room.qml +++ b/qml/Pages/Room.qml @@ -622,7 +622,6 @@ Item { let item = specialCardSkills.itemAt(i); if (item.checked) { let ret = item.orig_text; - console.log(ret); return ret; } } diff --git a/qml/Splash.qml b/qml/Splash.qml index 5421ea0d..583db4e5 100644 --- a/qml/Splash.qml +++ b/qml/Splash.qml @@ -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 {