Skip to content

Commit bd0223b

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 6c38153 + 249259b commit bd0223b

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

!src-dist/src/global.zhcn_hd.lua

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -564,6 +564,7 @@ GetKeyName = FunctionType
564564
GetKeyShow = FunctionType
565565
GetKeyValue = FunctionType
566566
GetKungfuSchoolColor = FunctionType
567+
GetKungfuTypeByKungfuID = FunctionType
567568
GetLevelUpData = FunctionType
568569
GetLocalTimeText = FunctionType
569570
GetLogicFrameCount = FunctionType
@@ -770,6 +771,7 @@ IsInRougeLikeMap = FunctionType
770771
IsKeyDown = FunctionType
771772
IsLocalFileExist = FunctionType
772773
IsMiddleMapOpened = FunctionType
774+
IsMobileKungfu = FunctionType
773775
IsMobileStreamingEnable = FunctionType
774776
IsMonitorMsg = FunctionType
775777
IsMsgEditAllowed = FunctionType
@@ -1424,6 +1426,7 @@ Table_GetCraftID = FunctionType
14241426
Table_GetCraftItemList = FunctionType
14251427
Table_GetCraftName = FunctionType
14261428
Table_GetCraftNpcInfo = FunctionType
1429+
Table_GetCreateData = FunctionType
14271430
Table_GetCreateRoleParam = FunctionType
14281431
Table_GetCreateRoleTable = FunctionType
14291432
Table_GetCubAttribute = FunctionType

MY_!Base/src/lib/Chat.lua

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,9 @@ end
199199

200200
-- 复制聊天行
201201
function X.CopyChatLine(hTime, bTextEditor, bRichText)
202+
if X.IS_REMAKE and GetCurrentTime() < 1718578800 and GetCurrentTime() > 1718146800 then
203+
return X.OutputSystemAnnounceMessage(_L['First week of WuJie, chat copy not available.'])
204+
end
202205
local edit = X.GetChatInput()
203206
if bTextEditor then
204207
edit = X.UI.OpenTextEditor():Find('.WndEdit')[1]
@@ -335,6 +338,9 @@ local ChatLinkEvents = {
335338
InsertInviteTeamMenu(menu, (X.UI(link):Text():gsub('[%[%]]', '')))
336339
menu[1].fnAction()
337340
elseif IsCtrlKeyDown() then
341+
if X.IS_REMAKE and GetCurrentTime() < 1718578800 and GetCurrentTime() > 1718146800 then
342+
return X.OutputSystemAnnounceMessage(_L['First week of WuJie, chat copy not available.'])
343+
end
338344
X.CopyChatItem(link)
339345
elseif IsShiftKeyDown() then
340346
X.SetTarget(TARGET.PLAYER, X.UI(link):Text())
@@ -364,9 +370,6 @@ local ChatLinkEvents = {
364370
if not link then
365371
link = element
366372
end
367-
if X.IS_REMAKE and GetCurrentTime() < 1718578800 and GetCurrentTime() > 1718146800 then
368-
return X.OutputSystemAnnounceMessage(_L['First week of WuJie, chat copy not available.'])
369-
end
370373
X.CopyChatLine(link, IsCtrlKeyDown(), IsCtrlKeyDown() and IsShiftKeyDown())
371374
end,
372375
OnCopyMClick = function(element, link)

MY_!Base/src/lib/Game.Target.lua

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1527,6 +1527,9 @@ function X.GetTargetContextMenu(dwType, szName, dwID)
15271527
table.insert(t, {
15281528
szOption = _L['Copy'],
15291529
fnAction = function()
1530+
if X.IS_REMAKE and GetCurrentTime() < 1718578800 and GetCurrentTime() > 1718146800 then
1531+
return X.OutputSystemAnnounceMessage(_L['First week of WuJie, chat copy not available.'])
1532+
end
15301533
X.SendChat(X.GetClientPlayer().szName, '[' .. szName .. ']')
15311534
end,
15321535
})

0 commit comments

Comments
 (0)