Merge pull request #614 from cont1nuity/master
Fix `extraStatusbar` showing in wrong views (non-player-dmg)
This commit is contained in:
@@ -2994,8 +2994,8 @@ end
|
||||
---@param onEnterFunc function?
|
||||
---@param onLeaveFunc function?
|
||||
function Details:ShowExtraStatusbar(thisLine, amount, extraAmount, totalAmount, topAmount, instanceObject, onEnterFunc, onLeaveFunc)
|
||||
if (extraAmount and extraAmount > 0) then
|
||||
local extraStatusbar = thisLine.extraStatusbar
|
||||
local extraStatusbar = thisLine.extraStatusbar
|
||||
if (extraAmount and extraAmount > 0 and instanceObject.atributo == 1 and instanceObject.sub_atributo == 1) then
|
||||
local initialOffset = 0
|
||||
local icon_offset_x, icon_offset_y = unpack(instanceObject.row_info.icon_offset)
|
||||
|
||||
@@ -3034,6 +3034,8 @@ function Details:ShowExtraStatusbar(thisLine, amount, extraAmount, totalAmount,
|
||||
extraStatusbar.defaultAlpha = 0.1
|
||||
end
|
||||
extraStatusbar:Show()
|
||||
else
|
||||
extraStatusbar:Hide()
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -290,6 +290,7 @@ local instanceMixins = {
|
||||
thisBar.minha_tabela = nil
|
||||
thisBar.animacao_fim = 0
|
||||
thisBar.animacao_fim2 = 0
|
||||
if thisBar.extraStatusbar then thisBar.extraStatusbar:Hide() end
|
||||
end
|
||||
|
||||
if (instance.rolagem) then
|
||||
|
||||
@@ -624,6 +624,7 @@
|
||||
esta_barra.minha_tabela = nil
|
||||
esta_barra.animacao_fim = 0
|
||||
esta_barra.animacao_fim2 = 0
|
||||
if esta_barra.extraStatusbar then esta_barra.extraStatusbar:Hide() end
|
||||
end
|
||||
|
||||
if (instancia.rolagem) then
|
||||
|
||||
Reference in New Issue
Block a user