feat: Revert "feat: 屏蔽旗舰端背包整理、堆叠、锁定功能"

This reverts commit 353473e.

Author: tinymins

MY_BagEx/src/MY_BagEx_Bag.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_Bag', { remake = true })
 --------------------------------------------------------------------------------
 
 local O = X.CreateUserSettingsModule(MODULE_NAME, _L['General'], {
@@ -31,7 +30,6 @@ local O = X.CreateUserSettingsModule(MODULE_NAME, _L['General'], {
 		}),
 		xSchema = X.Schema.Boolean,
 		xDefaultValue = false,
-		szRestriction = 'MY_BagEx_Bag',
 	},
 	bConfirm = {
 		ePathType = X.PATH_TYPE.ROLE,
@@ -42,7 +40,6 @@ local O = X.CreateUserSettingsModule(MODULE_NAME, _L['General'], {
 		}),
 		xSchema = X.Schema.Boolean,
 		xDefaultValue = true,
-		szRestriction = 'MY_BagEx_Bag',
 	},
 	tLock = {
 		ePathType = X.PATH_TYPE.ROLE,
@@ -54,13 +51,12 @@ local O = X.CreateUserSettingsModule(MODULE_NAME, _L['General'], {
 		}),
 		xSchema = X.Schema.Map(X.Schema.String, X.Schema.Boolean),
 		xDefaultValue = {},
-		szRestriction = 'MY_BagEx_Bag',
 	},
 })
 local D = {}
 
 function D.IsEnabled()
-	return O.bEnable and not X.IsInInventoryPackageLimitedMap() and not X.IsRestricted('MY_BagEx_Bag')
+	return O.bEnable and not X.IsInInventoryPackageLimitedMap()
 end
 
 function D.ShowItemShadow(frame, dwBox, dwX, bEditLock)
@@ -222,28 +218,24 @@ function D.OnEnableChange()
 end
 
 function D.OnPanelActivePartial(ui, nPaddingX, nPaddingY, nW, nH, nX, nY, nLH)
-	if not X.IsRestricted('MY_BagEx_Bag') then
-		nX = nX + ui:Append('WndCheckBox', {
-			x = nX, y = nY, w = 200,
-			text = _L['Bag package sort and stack'],
-			checked = O.bEnable,
-			onCheck = function(bChecked)
-				O.bEnable = bChecked
-				D.OnEnableChange()
-			end,
-		}):AutoWidth():Width() + 5
-		nX = nX + ui:Append('WndCheckBox', {
-			x = nX, y = nY, w = 200,
-			text = _L['Need confirm'],
-			checked = O.bConfirm,
-			onCheck = function(bChecked)
-				O.bConfirm = bChecked
-			end,
-			autoEnable = function() return O.bEnable end,
-		}):AutoWidth():Width() + 5
-		nX = nPaddingX
-		nY = nY + nLH
-	end
+	nX = nX + ui:Append('WndCheckBox', {
+		x = nX, y = nY, w = 200,
+		text = _L['Bag package sort and stack'],
+		checked = O.bEnable,
+		onCheck = function(bChecked)
+			O.bEnable = bChecked
+			D.OnEnableChange()
+		end,
+	}):AutoWidth():Width() + 5
+	nX = nX + ui:Append('WndCheckBox', {
+		x = nX, y = nY, w = 200,
+		text = _L['Need confirm'],
+		checked = O.bConfirm,
+		onCheck = function(bChecked)
+			O.bConfirm = bChecked
+		end,
+		autoEnable = function() return O.bEnable end,
+	}):AutoWidth():Width() + 5
 	return nX, nY
 end
 

MY_BagEx/src/PS.lua

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