feat: Revert "feat: 屏蔽旗舰端背包、仓库搜索与对比功能"

This reverts commit 094ec07.

Author: tinymins

MY_BagEx/src/MY_BagEx_GenericFilters.lua

@@ -18,7 +18,6 @@ if not X.AssertVersion(MODULE_NAME, _L[MODULE_NAME], '^27.0.0') then
 	return
 end
 --[[#DEBUG BEGIN]]X.ReportModuleLoading(MODULE_PATH, 'START')--[[#DEBUG END]]
-X.RegisterRestriction('MY_BagEx_GenericFilters', { remake = true })
 --------------------------------------------------------------------------------
 
 local O = X.CreateUserSettingsModule(MODULE_NAME, _L['General'], {
@@ -30,7 +29,6 @@ local O = X.CreateUserSettingsModule(MODULE_NAME, _L['General'], {
 		}),
 		xSchema = X.Schema.Boolean,
 		xDefaultValue = true,
-		szRestriction = 'MY_BagEx_GenericFilters',
 	},
 })
 local D = {}
@@ -417,7 +415,7 @@ local function Unhook()
 end
 
 local function Apply(bEnable)
-	if bEnable and not X.IsRestricted('MY_BagEx_GenericFilters') then
+	if bEnable then
 		Hook()
 		X.RegisterFrameCreate('BigBagPanel', 'MY_BAGEX', Hook)
 		X.RegisterFrameCreate('BigBankPanel', 'MY_BAGEX', Hook)
@@ -456,18 +454,15 @@ end)
 end
 
 function D.OnPanelActivePartial(ui, nPaddingX, nPaddingY, nW, nH, nX, nY, nLH)
-	if not X.IsRestricted('MY_BagEx_GenericFilters') then
-		nX = nX + ui:Append('WndCheckBox', {
-			x = nX, y = nY, w = 200,
-			text = _L['Generic package searcher and filters'],
-			checked = O.bEnable,
-			onCheck = function(bChecked)
-				D.Enable(bChecked)
-			end,
-		}):AutoWidth():Width() + 5
-		nX = nPaddingX
-		nY = nY + nLH
-	end
+	nX = nX + ui:Append('WndCheckBox', {
+		x = nX, y = nY, w = 200,
+		text = _L['Generic package searcher and filters'],
+		checked = O.bEnable,
+		onCheck = function(bChecked)
+			D.Enable(bChecked)
+		end,
+	}):AutoWidth():Width() + 5
+	-- y = y + 25
 	return nX, nY
 end
 

MY_BagEx/src/PS.lua

@@ -29,6 +29,8 @@ function PS.OnPanelActive(wnd)
 	local nLH = 28
 
 	nX, nY = MY_BagEx_GenericFilters.OnPanelActivePartial(ui, nPaddingX, nPaddingY, nW, nH, nX, nY, nLH)
+	nX = nPaddingX
+	nY = nY + nLH
 	nX, nY = MY_BagEx_Bag.OnPanelActivePartial(ui, nPaddingX, nPaddingY, nW, nH, nX, nY, nLH)
 	nX = nPaddingX
 	nY = nY + nLH