Merge remote-tracking branch 'upstream/master'

Author: tinymins

MY_!Base/src/lib/Chat.lua

@@ -1636,17 +1636,16 @@ local function Unhook(i)
 end
 
 local function HookAll()
-	for i = 1, 10 do
-		Hook(i)
+	for _, k in X.pairs_c(X.CONSTANT.CHAT_PANEL_INDEX_LIST) do
+		Hook(k)
 	end
-	Hook('_Recently')
 end
 X.RegisterInit('LIB#ChatPanelHook', HookAll)
 X.RegisterEvent('CHAT_PANEL_INIT', 'ChatPanelHook', HookAll)
 
 local function UnhookAll()
-	for i = 1, 10 do
-		Unhook(i)
+	for _, k in X.pairs_c(X.CONSTANT.CHAT_PANEL_INDEX_LIST) do
+		Unhook(k)
 	end
 end
 X.RegisterExit('LIB#ChatPanelHook', UnhookAll)

MY_!Base/src/lib/Constant.lua

@@ -448,6 +448,19 @@ local CONSTANT = {
 		OPEN = 1,
 		CLOSE = 2,
 	}),
+	CHAT_PANEL_INDEX_LIST = X.FreezeTable({
+		1,
+		2,
+		3,
+		4,
+		5,
+		6,
+		7,
+		8,
+		9,
+		10,
+		'_Recently',
+	}),
 	ITEM_QUALITY = X.FreezeTable({
 		GRAY    = 0, -- 灰色
 		WHITE   = 1, -- 白色

MY_!Base/src/lib/System.Hotkey.lua

@@ -199,12 +199,11 @@ if X.PACKET_INFO.DEBUG_LEVEL <= X.DEBUG_LEVEL.DEBUG then
 		'Normal1',
 		'Lowest2',
 	}) do
-		for i = 1, 9 do
-			table.insert(aFrame, v .. '/ChatPanel' .. i)
-			table.insert(aFrame, v .. '/ChatPanel_Normal' .. i)
+		for _, k in X.pairs_c(X.CONSTANT.CHAT_PANEL_INDEX_LIST) do
+			table.insert(aFrame, v .. '/ChatPanel' .. k)
+			table.insert(aFrame, v .. '/ChatPanel_Normal' .. k)
 		end
 		table.insert(aFrame, v .. '/EditBox')
-		table.insert(aFrame, v .. '/ChatPanel_Recently')
 		table.insert(aFrame, v .. '/' .. X.PACKET_INFO.NAME_SPACE)
 	end
 	X.RegisterHotKey(X.NSFormatString('{$NS}_STAGE_CHAT'), _L['Display only chat panel'], function()