Merge remote-tracking branch 'upstream/master'

tinymins · tinymins · commit 4816200d3364 · 2025-10-28T18:01:00.000+08:00
diff --git a/!src-dist/src/global.zhcn_hd.lua b/!src-dist/src/global.zhcn_hd.lua
@@ -2148,6 +2148,7 @@ Table_MKungfuIsSection = FunctionType
 Table_NewRoleVideo = FunctionType
 Table_OpenSkillLevel = FunctionType
 Table_ParseCalenderActivity = FunctionType
+Table_ReloadRoleAvatarList = FunctionType
 Table_SchoolToForce = FunctionType
 Table_SetSound = FunctionType
 Table_ViewReplace = FunctionType
diff --git a/MY_!Base/src/lib/Chat.lua b/MY_!Base/src/lib/Chat.lua
@@ -27,7 +27,6 @@ function X.GetChatPanel(k)
 		or Station.SearchFrame('ChatPanel_Normal' .. k)
 end
 
--- ��������ٳ�����
 -- ���츴�Ʋ�����
 function X.RepeatChatLine(hTime)
 	local edit = X.GetChatInput()
diff --git a/MY_!Base/ui/Shadows.ini b/MY_!Base/ui/Shadows.ini
@@ -1,7 +1,6 @@
 [Frame_Shadows]
 ._WndType=WndFrame
 ._Parent=Lowest
-._Comment=����ȫ�������� �������˳�� ���ľջ���
 BreatheWhenHide=1
 DisableBreath=0
 DragAreaHeight=0

-Original file line number
+Diff line change
 		or Station.SearchFrame('ChatPanel_Normal' .. k)
 end
 --- 海鳗里面抠出来的
 -- 聊天复制并发布
 function X.RepeatChatLine(hTime)
 	local edit = X.GetChatInput()