diff --git a/lua/core/player.lua b/lua/core/player.lua
index dd817be1eb02dac240a90c33ed5e8ced788e6775..8f2ea210b23bdbf897b6de779e0f1ee85a84fbd8 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)
diff --git a/lua/server/events/gameflow.lua b/lua/server/events/gameflow.lua
index 1ff490b5279c24d5e048416b651f2bc2f56de405..2a06112fd11ed1bd887244780913fff75526b63c 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
diff --git a/lua/ui-util.lua b/lua/ui-util.lua
index 80ad52a97eda40728270e9b574f1f5bafdda92a6..185d2b00db1f854687909ec9ff4d8a63746e1ab2 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