Fixed "Time out of combat" after mythic+ and another round of polishing frames and menus
This commit is contained in:
+6
-7
@@ -5880,7 +5880,6 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
|
||||
Details222.MythicPlus.time = 0.1
|
||||
end
|
||||
|
||||
--if (level >= 28 or Details.user_is_patreon_supporter) then --debug
|
||||
if (Details.mythic_plus.show_damage_graphic) then
|
||||
C_Timer.After(0, function()
|
||||
if (ChallengeModeCompleteBanner) then
|
||||
@@ -5889,12 +5888,6 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
|
||||
end)
|
||||
end
|
||||
|
||||
--send mythic dungeon end event
|
||||
local zoneName, instanceType, difficultyID, difficultyName, maxPlayers, dynamicDifficulty, isDynamic, instanceMapID, instanceGroupSize = GetInstanceInfo()
|
||||
if (difficultyID == 8) then
|
||||
Details:SendEvent("COMBAT_MYTHICDUNGEON_END")
|
||||
end
|
||||
|
||||
local okay, errorText = pcall(function()
|
||||
local mapChallengeModeID, mythicLevel, time, onTime, keystoneUpgradeLevels, practiceRun, oldOverallDungeonScore, newOverallDungeonScore, IsMapRecord, IsAffixRecord, PrimaryAffix, isEligibleForScore, members = C_ChallengeMode.GetCompletionInfo()
|
||||
if (mapChallengeModeID) then
|
||||
@@ -5921,6 +5914,12 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
|
||||
end
|
||||
end)
|
||||
|
||||
--send mythic dungeon end event
|
||||
local zoneName, instanceType, difficultyID, difficultyName, maxPlayers, dynamicDifficulty, isDynamic, instanceMapID, instanceGroupSize = GetInstanceInfo()
|
||||
if (difficultyID == 8) then
|
||||
Details:SendEvent("COMBAT_MYTHICDUNGEON_END")
|
||||
end
|
||||
|
||||
if (not okay) then
|
||||
Details:Msg("something went wrong (0x7878):", errorText)
|
||||
end
|
||||
|
||||
+5
-4
@@ -540,16 +540,17 @@
|
||||
|
||||
--statusbar
|
||||
local statusBar = CreateFrame("frame", nil, optionsLeftSideBarMenu, "BackdropTemplate")
|
||||
statusBar:SetPoint("bottomleft", pluginContainerFrame, "bottomleft", 0, 5)
|
||||
statusBar:SetPoint("bottomleft", pluginContainerFrame, "bottomleft", 7, 5)
|
||||
statusBar:SetPoint("bottomright", pluginContainerFrame, "bottomright", 0, 5)
|
||||
statusBar:SetHeight(16)
|
||||
statusBar:SetAlpha(1)
|
||||
|
||||
DetailsFramework:BuildStatusbarAuthorInfo(statusBar)
|
||||
|
||||
local rightClickToBackLabel = detailsFramework:CreateLabel(statusBar, "right click to close", 10, "gray")
|
||||
rightClickToBackLabel:SetPoint("bottomright", statusBar, "bottomright", -1, 5)
|
||||
rightClickToBackLabel:SetAlpha(.4)
|
||||
local rightClickToBackLabel = detailsFramework:CreateLabel(statusBar, "right click to close", "GameFontNormal")
|
||||
rightClickToBackLabel:SetPoint("bottomright", statusBar, "bottomright", -150, 5)
|
||||
rightClickToBackLabel:SetAlpha(0.834)
|
||||
rightClickToBackLabel.textcolor = "gray"
|
||||
|
||||
local bigDogTexture = detailsFramework:NewImage(optionsLeftSideBarMenu, [[Interface\MainMenuBar\UI-MainMenuBar-EndCap-Human]], 180*0.7, 200*0.7, "overlay", {0, 1, 0, 1}, "backgroundBigDog", "$parentBackgroundBigDog")
|
||||
bigDogTexture:SetPoint("bottomleft", custom_window, "bottomleft", 0, 1)
|
||||
|
||||
Reference in New Issue
Block a user