From 7b7b109c25f13265ee6f1d9362ea1f063b184bea Mon Sep 17 00:00:00 2001 From: seven <786852516@qq.com> Date: Mon, 18 Nov 2024 18:13:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B0=8Ffix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/ui-util.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/ui-util.lua b/lua/ui-util.lua index 80ad52a..185d2b0 100644 --- a/lua/ui-util.lua +++ b/lua/ui-util.lua @@ -33,6 +33,7 @@ end UI.Spin = function(spec) assert(spec.from <= spec.to) spec.type = "spin" + spec.default = spec.default or spec.from return spec end -- Gitee From ab27184ea6c581e8e3c71c843b8f7250bab16226 Mon Sep 17 00:00:00 2001 From: seven <786852516@qq.com> Date: Tue, 19 Nov 2024 16:11:41 +0800 Subject: [PATCH 2/3] 111 --- lua/server/events/gameflow.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lua/server/events/gameflow.lua b/lua/server/events/gameflow.lua index 1ff490b..2a06112 100644 --- a/lua/server/events/gameflow.lua +++ b/lua/server/events/gameflow.lua @@ -328,7 +328,8 @@ function Phase:main() room.logic:trigger(fk.AfterDrawNCards, player, data) end, [Player.Play] = function() - player._phase_end = false + --player._phase_end = false + if player._phase_end then return end room:doBroadcastNotify("UpdateSkill", "", {player}) while not player.dead do if player._phase_end then break end -- Gitee From 0c9c3e5c7098cf7adf0b4fe4f5825b4ddc96e4c9 Mon Sep 17 00:00:00 2001 From: seven <786852516@qq.com> Date: Tue, 19 Nov 2024 16:19:10 +0800 Subject: [PATCH 3/3] 12 --- lua/core/player.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lua/core/player.lua b/lua/core/player.lua index dd817be..8f2ea21 100644 --- a/lua/core/player.lua +++ b/lua/core/player.lua @@ -1154,6 +1154,10 @@ function Player:getQuestSkillState(skillName) return type(questSkillState) == "string" and questSkillState or nil end + +--- 获取角色未被废除的装备栏 +---@param subtype? string @ 指定的装备栏类型,填空为所有装备栏 +---@return string[] function Player:getAvailableEquipSlots(subtype) local tempSlots = table.simpleClone(self.equipSlots) local tempSealedSlots = table.simpleClone(self.sealedSlots) -- Gitee