NDui 7.13.0

siweia · Sep 11, 2023 · 206b990 · 206b990
1 parent 311c201
commit 206b990
Show file tree

Hide file tree

Showing 19 changed files with 91 additions and 86 deletions.
diff --git a/Interface/AddOns/!BaudErrorFrame/!BaudErrorFrame.toc b/Interface/AddOns/!BaudErrorFrame/!BaudErrorFrame.toc
@@ -1,4 +1,4 @@
-## Interface: 100105
+## Interface: 100107
 ## Title: |cff0080ffBaudErrorFrame|r
 ## Title-zhCN: |cff0080ffBaudErrorFrame|r 报错收集
 ## Title-zhTW: |cff0080ffBaudErrorFrame|r 報錯收集

diff --git a/Interface/AddOns/NDui/Config/AuraWatchList/Evoker.lua b/Interface/AddOns/NDui/Config/AuraWatchList/Evoker.lua
@@ -29,6 +29,7 @@ local list = {
 		{AuraID = 370818, UnitID = "player", Flash = true}, -- 瞬焰
 		{AuraID = 362877, UnitID = "player", Stack = 3}, -- 时光压缩
 		{AuraID = 370537, UnitID = "player", Flash = true}, -- 静滞
+		{AuraID = 370562, UnitID = "player", Flash = true}, -- 静滞
 		{AuraID = 371877, UnitID = "player", Value = true}, -- 生生不息
 		{AuraID = 395296, UnitID = "player"}, -- 黑檀之力
 	},

diff --git a/Interface/AddOns/NDui/Config/Nameplate.lua b/Interface/AddOns/NDui/Config/Nameplate.lua
@@ -27,6 +27,7 @@ C.WhiteList = {
 	[113309] = true,	-- 青龙寺，至高能量
 	[384148] = true,	-- 诱捕陷阱，蕨皮
 	[200672] = true,	-- 水晶迸裂，巢穴
+	[377724] = true,	-- 小怪易伤，提尔
 	[413027] = true,	-- 泰坦之壁，永恒黎明
 }
 

diff --git a/Interface/AddOns/NDui/Config/RaidFrameAuras/Dragonflight/Amirdrassil.lua b/Interface/AddOns/NDui/Config/RaidFrameAuras/Dragonflight/Amirdrassil.lua
@@ -0,0 +1,27 @@
+local _, ns = ...
+local B, C, L, DB = unpack(ns)
+local module = B:GetModule("AurasTable")
+if not DB.isNewPatch then return end
+
+local TIER = 10
+local INSTANCE = 1207 -- 阿梅达希尔，梦境之愿
+
+local BOSS
+BOSS = 2564 -- 瘤根
+module:RegisterDebuff(TIER, INSTANCE, BOSS, 370648) -- 熔岩涌流 -- 示例
+
+BOSS = 2554 -- 残虐者艾姬拉
+
+BOSS = 2557 -- 沃尔科罗斯
+
+BOSS = 2555 -- 梦境议会
+
+BOSS = 2553 -- 拉罗达尔，烈焰守护者
+
+BOSS = 2556 -- 尼穆，轮回编织者
+
+BOSS = 2563 -- 斯莫德隆
+
+BOSS = 2565 -- 丁达尔·迅贤，烈焰预言者
+
+BOSS = 2519 -- 火光之龙菲莱克
diff --git a/Interface/AddOns/NDui/Config/RaidFrameAuras/RaidFrameAuras.xml b/Interface/AddOns/NDui/Config/RaidFrameAuras/RaidFrameAuras.xml
@@ -27,4 +27,5 @@
 	<Script file="Dragonflight\Party-DF.lua"/>
 	<Script file="Dragonflight\VaultoftheIncarnates.lua"/>
 	<Script file="Dragonflight\Aberrus.lua"/>
+	<Script file="Dragonflight\Amirdrassil.lua"/>
 </Ui>
diff --git a/Interface/AddOns/NDui/Core/Changelog.lua b/Interface/AddOns/NDui/Core/Changelog.lua
@@ -5,13 +5,12 @@ if DB.Client ~= "zhCN" then return end
 local strsplit, pairs = string.split, pairs
 
 local hx = {
-	"更新部分法术监控；",
-	"oUF更新；",
-	"蓄力施法条调整；",
-	"龙希尔的法术监控更新；",
-	"修正地下城手册的一处污染；",
-	"本地文本调整；",
-	"聊天窗口的输入框调整。",
+	"oUF更新，支持信号系统的交互；",
+	"更新法术和姓名板过滤；",
+	"界面美化更新；",
+	"更新支持10.2；",
+	"更新唤魔师的监控；",
+	"移除对旧版本兼容的部分。",
 }
 
 local f

diff --git a/Interface/AddOns/NDui/Core/Database.lua b/Interface/AddOns/NDui/Core/Database.lua
@@ -9,7 +9,7 @@ DB.Version = C_AddOns.GetAddOnMetadata("NDui", "Version")
 DB.Support = C_AddOns.GetAddOnMetadata("NDui", "X-Support")
 DB.Client = GetLocale()
 DB.ScreenWidth, DB.ScreenHeight = GetPhysicalScreenSize()
-DB.isNewPatch = select(4, GetBuildInfo()) >= 100107 -- 10.1.7
+DB.isNewPatch = select(4, GetBuildInfo()) >= 100200 -- 10.2.0
 
 -- Colors
 DB.MyName = UnitName("player")

diff --git a/Interface/AddOns/NDui/Core/ExtraGUI.lua b/Interface/AddOns/NDui/Core/ExtraGUI.lua
@@ -129,6 +129,9 @@ function G:SetupRaidDebuffs(parent)
 		[1] = EJ_GetInstanceInfo(1200),
 		[2] = EJ_GetInstanceInfo(1208),
 	}
+	if DB.isNewPatch then
+		raids[3] = EJ_GetInstanceInfo(1207)
+	end
 
 	options[1] = G:CreateDropdown(frame, DUNGEONS.."*", 120, -30, dungeons, L["Dungeons Intro"], 130, 30)
 	options[1]:Hide()

diff --git a/Interface/AddOns/NDui/Core/Functions.lua b/Interface/AddOns/NDui/Core/Functions.lua
@@ -1561,7 +1561,7 @@ do
 		self:SetTexCoord(0, 1, 0, 1)
 	end
 
-	function B:ReskinRole(role)
+	function B:ReskinRole()
 		if self.background then self.background:SetTexture("") end
 
 		local cover = self.cover or self.Cover
@@ -1573,17 +1573,6 @@ do
 			checkButton:SetPoint("BOTTOMLEFT", -2, -2)
 			B.ReskinCheck(checkButton)
 		end
-
-		local shortageBorder = self.shortageBorder
-		if shortageBorder then
-			shortageBorder:SetTexture("")
-			local icon = self.incentiveIcon
-			icon:SetPoint("BOTTOMRIGHT")
-			icon:SetSize(14, 14)
-			icon.texture:SetSize(14, 14)
-			B.ReskinIcon(icon.texture)
-			icon.border:SetTexture("")
-		end
 	end
 end
 

diff --git a/Interface/AddOns/NDui/Libs/oUF/ouf.lua b/Interface/AddOns/NDui/Libs/oUF/ouf.lua
@@ -361,6 +361,17 @@ local function walkObject(object, unit)
 
 	local header = parent:GetAttribute('oUF-headerType') and parent
 
+	--[[ frame.IsPingable
+	This boolean can be set to false to disable the frame from being pingable. Enabled by default.
+	--]]
+	--[[ Override: frame:GetContextualPingType()
+	Used to define which contextual ping is used for the frame.
+
+	By default this wraps `C_Ping.GetContextualPingTypeForUnit(UnitGUID(frame.unit))`.
+	--]]
+	object:SetAttribute('ping-receiver', true)
+	Mixin(object, PingableType_UnitFrameMixin)
+
 	-- Check if we should leave the main frame blank.
 	if(object:GetAttribute('oUF-onlyProcessChildren')) then
 		object.hasChildren = true

diff --git a/Interface/AddOns/NDui/Modules/Auras/Lumos/Evoker.lua b/Interface/AddOns/NDui/Modules/Auras/Lumos/Evoker.lua
@@ -92,7 +92,7 @@ function A:ChantLumos(self)
 		UpdateCooldown(self.lumos[5], 360995, true)--清脆之拥
 
 	elseif spec == 3 then --增辉
-		local spellID = IsPlayerSpell(375783) and 382266 or 357208
+		local spellID = IsPlayerSpell(408083) and 382266 or 357208
 		UpdateCooldown(self.lumos[1], spellID, true)
 		UpdateCooldown(self.lumos[2], 409311, true)
 		UpdateCooldown(self.lumos[3], 395152, true)

diff --git a/Interface/AddOns/NDui/Modules/Skins/Blizzard/Blizzard_ExpansionLandingPage.lua b/Interface/AddOns/NDui/Modules/Skins/Blizzard/Blizzard_ExpansionLandingPage.lua
@@ -45,6 +45,9 @@ C.themes["Blizzard_ExpansionLandingPage"] = function()
 					self:ForEachFrame(SkinFactionCategory)
 				end)
 			end
+			if panel.ScrollFadeOverlay then
+				panel.ScrollFadeOverlay:SetAlpha(0) -- isNewPatch
+			end
 
 			panel.styled = true
 		end

diff --git a/Interface/AddOns/NDui/Modules/Skins/Blizzard/FrameXML/CharacterFrame.lua b/Interface/AddOns/NDui/Modules/Skins/Blizzard/FrameXML/CharacterFrame.lua
@@ -11,6 +11,7 @@ function B:ReskinIconSelector()
 	B.ReskinIcon(self.BorderBox.SelectedIconArea.SelectedIconButton.Icon)
 	B.Reskin(self.BorderBox.OkayButton)
 	B.Reskin(self.BorderBox.CancelButton)
+	B.ReskinDropDown(self.BorderBox.IconTypeDropDown.DropDownMenu)
 	B.ReskinTrimScroll(self.IconSelector.ScrollBar)
 
 	hooksecurefunc(self.IconSelector.ScrollBox, "Update", function(self)

diff --git a/Interface/AddOns/NDui/Modules/Skins/Blizzard/FrameXML/LFGFrame.lua b/Interface/AddOns/NDui/Modules/Skins/Blizzard/FrameXML/LFGFrame.lua
@@ -35,21 +35,6 @@ local function reskinDialogReward(button)
 	button.styled = true
 end
 
-local function reskinRoleButton(buttons, role)
-	for _, roleButton in pairs(buttons) do
-		B.ReskinRole(roleButton, role)
-	end
-end
-
-local function updateRoleBonus(roleButton)
-	if not roleButton.bg then return end
-	if roleButton.shortageBorder and roleButton.shortageBorder:IsShown() then
-		roleButton.bg:SetBackdropBorderColor(1, .9, .06)
-	else
-		roleButton.bg:SetBackdropBorderColor(0, 0, 0)
-	end
-end
-
 local function styleRewardRole(roleIcon)
 	if roleIcon and roleIcon:IsShown() then
 		B.ReskinSmallRole(roleIcon.texture, roleIcon.role)
@@ -132,39 +117,36 @@ tinsert(C.defaultThemes, function()
 	B.ReskinClose(LFGDungeonReadyDialogCloseButton)
 	B.ReskinClose(LFGDungeonReadyStatusCloseButton)
 
-	local tanks = {
+	local roleButtons = {
+		-- tank
 		LFDQueueFrameRoleButtonTank,
 		LFDRoleCheckPopupRoleButtonTank,
 		RaidFinderQueueFrameRoleButtonTank,
 		LFGInvitePopupRoleButtonTank,
 		LFGListApplicationDialog.TankButton,
 		LFGDungeonReadyStatusGroupedTank,
-	}
-	reskinRoleButton(tanks, "TANK")
-
-	local healers = {
+		-- healer
 		LFDQueueFrameRoleButtonHealer,
 		LFDRoleCheckPopupRoleButtonHealer,
 		RaidFinderQueueFrameRoleButtonHealer,
 		LFGInvitePopupRoleButtonHealer,
 		LFGListApplicationDialog.HealerButton,
 		LFGDungeonReadyStatusGroupedHealer,
-	}
-	reskinRoleButton(healers, "HEALER")
-
-	local dps = {
+		-- dps
 		LFDQueueFrameRoleButtonDPS,
 		LFDRoleCheckPopupRoleButtonDPS,
 		RaidFinderQueueFrameRoleButtonDPS,
 		LFGInvitePopupRoleButtonDPS,
 		LFGListApplicationDialog.DamagerButton,
 		LFGDungeonReadyStatusGroupedDamager,
+		-- leader
+		LFDQueueFrameRoleButtonLeader,
+		RaidFinderQueueFrameRoleButtonLeader,
+		LFGDungeonReadyStatusRolelessReady,
 	}
-	reskinRoleButton(dps, "DPS")
-
-	B.ReskinRole(LFDQueueFrameRoleButtonLeader, "LEADER")
-	B.ReskinRole(RaidFinderQueueFrameRoleButtonLeader, "LEADER")
-	B.ReskinRole(LFGDungeonReadyStatusRolelessReady, "READY")
+	for _, roleButton in pairs(roleButtons) do
+		B.ReskinRole(roleButton)
+	end
 
 	hooksecurefunc("SetCheckButtonIsRadio", function(button)
 		button:SetNormalTexture(0)
@@ -176,25 +158,6 @@ tinsert(C.defaultThemes, function()
 		button:GetDisabledCheckedTexture():SetTexCoord(0, 1, 0, 1)
 	end)
 
-	hooksecurefunc("LFG_SetRoleIconIncentive", function(roleButton, incentiveIndex)
-		if incentiveIndex then
-			local tex
-			if incentiveIndex == LFG_ROLE_SHORTAGE_PLENTIFUL then
-				tex = "coin-copper"
-			elseif incentiveIndex == LFG_ROLE_SHORTAGE_UNCOMMON then
-				tex = "coin-silver"
-			elseif incentiveIndex == LFG_ROLE_SHORTAGE_RARE then
-				tex = "coin-gold"
-			end
-			roleButton.incentiveIcon.texture:SetInside()
-			roleButton.incentiveIcon.texture:SetAtlas(tex)
-		end
-
-		updateRoleBonus(roleButton)
-	end)
-
-	hooksecurefunc("LFG_EnableRoleButton", updateRoleBonus)
-
 	-- RaidFinder
 	RaidFinderFrameBottomInset:Hide()
 	RaidFinderFrameRoleBackground:Hide()

diff --git a/Interface/AddOns/NDui/Modules/Skins/Blizzard/FrameXML/PetStable.lua b/Interface/AddOns/NDui/Modules/Skins/Blizzard/FrameXML/PetStable.lua
@@ -11,11 +11,6 @@ tinsert(C.defaultThemes, function()
 
 	PetStableBottomInset:Hide()
 	PetStableLeftInset:Hide()
-	if not DB.isNewPatch then
-		PetStableModelShadow:Hide()
-		PetStableModelRotateLeftButton:Hide()
-		PetStableModelRotateRightButton:Hide()
-	end
 	PetStableFrameModelBg:Hide()
 	PetStablePrevPageButtonIcon:SetTexture("")
 	PetStableNextPageButtonIcon:SetTexture("")

diff --git a/Interface/AddOns/NDui/Modules/Skins/Blizzard/FrameXML/ReadyCheck.lua b/Interface/AddOns/NDui/Modules/Skins/Blizzard/FrameXML/ReadyCheck.lua
@@ -5,15 +5,9 @@ tinsert(C.defaultThemes, function()
 	if not C.db["Skins"]["BlizzardSkins"] then return end
 
 	-- Ready check
+	B.StripTextures(ReadyCheckListenerFrame)
 	B.SetBD(ReadyCheckFrame)
 	ReadyCheckPortrait:SetAlpha(0)
-	select(2, ReadyCheckListenerFrame:GetRegions()):Hide()
-
-	ReadyCheckFrame:HookScript("OnShow", function(self)
-		if self.initiator and UnitIsUnit("player", self.initiator) then
-			self:Hide()
-		end
-	end)
 
 	B.Reskin(ReadyCheckFrameYesButton)
 	B.Reskin(ReadyCheckFrameNoButton)

diff --git a/Interface/AddOns/NDui/NDui.toc b/Interface/AddOns/NDui/NDui.toc
@@ -1,8 +1,8 @@
-## Interface: 100105
+## Interface: 100107
 ## Title: |cff0080ffNDui|r
 ## X-Credits: Elv, Freebaser, Haleth, Haste, lightspark, Loshine, Neavo, p3lim, Paopao001, Qulight, Ray, Rubgrsch, Simpy, Tuller, zork.
 ## Author: Siweia
 ## Notes: Empty toc for Curseforge
-## Version: 7.12.0
+## Version: 7.13.0
 ## X-Support: DF
 ## X-Website: https://github.com/siweia/NDui
diff --git a/Interface/AddOns/NDui/NDui_Mainline.toc b/Interface/AddOns/NDui/NDui_Mainline.toc
@@ -1,9 +1,9 @@
-## Interface: 100105
+## Interface: 100107
 ## Title: |cff0080ffNDui|r
 ## X-Credits: Elv, Freebaser, Haleth, Haste, lightspark, Loshine, Neavo, p3lim, Paopao001, Qulight, Ray, Rubgrsch, Simpy, Tuller, zork.
 ## Author: Siweia
 ## Notes: More than a UI.
-## Version: 7.12.0
+## Version: 7.13.0
 ## X-Support: DF
 ## X-Website: https://github.com/siweia/NDui
 ## X-Curse-Project-ID: 324377

diff --git a/Interface/Changelog.txt b/Interface/Changelog.txt
@@ -9,6 +9,23 @@
 - 配置文件夹位于Interface\Addons\NDui\Config；
 - 控制台无法调整的设置可以在里面找到。
 ---------------------------------------------------------
+2023/9/11 v7.13.0
+- oUF更新，支持信号系统的交互；
+- 更新法术和姓名板过滤；
+- 界面美化更新；
+- 更新支持10.2；
+- 更新唤魔师的监控；
+- 移除对旧版本兼容的部分。
+
+2023/8/27 v7.12.0
+- 更新部分法术监控；
+- oUF更新；
+- 蓄力施法条调整；
+- 龙希尔的法术监控更新；
+- 修正地下城手册的一处污染；
+- 本地文本调整；
+- 聊天窗口的输入框调整
+
 2023/7/15 v7.11.0
 - 移除对10.1.0的支持；
 - 更新部分法术监控；