Skip to content

Commit c245cd2

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents d78bb18 + da550ee commit c245cd2

File tree

10 files changed

+364
-51
lines changed

10 files changed

+364
-51
lines changed

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

Lines changed: 57 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,8 @@ CHANGE_EQUIP_MAGIC_RESULT_CODE = TableType
235235
CHARACTER_ACTION_TYPE = TableType
236236
CHARACTER_GENDER = TableType
237237
CHARACTER_KIND = TableType
238+
CHARACTER_LIGHT = TableType
239+
CHARACTER_LIGHT_BINDING = TableType
238240
CHARACTER_OTACTION_TYPE = TableType
239241
CHARGE_LIMIT_CODE = TableType
240242
CHARGE_MODE = TableType
@@ -290,16 +292,19 @@ CorrectSkillName = FunctionType
290292
count_c = FunctionType
291293
CPath = TableType
292294
CRAFT_RESULT_CODE = TableType
295+
CRAFT_TYPE = TableType
293296
CraftReadComparePanel = TableType
294297
CraftReadManagePanel = TableType
295298
CREATE_GIFT_ERROR_CODE = TableType
296299
CREATE_GIFT_PARAM_TYPE = TableType
300+
CREATE_HAWK_EYE_BY_PLAYER_NAME_FAILER_CODE = TableType
297301
CTCT = TableType
298302
CThreadCoor_Get = FunctionType
299303
CThreadCoor_Register = FunctionType
300304
CThreadCoor_Unregister = FunctionType
301305
CURL_DownloadFile = FunctionType
302306
CURL_HttpPost = FunctionType
307+
CURL_HttpPostEx = FunctionType
303308
CURRENCY_TYPE = TableType
304309
Cursor = TableType
305310
CURSOR = TableType
@@ -326,6 +331,7 @@ DIRECT_MENTOR_RECORD_STATE = TableType
326331
DOMESTICATE_CUB_SUB_TYPE = TableType
327332
DOMESTICATE_FODDER_SUB_TYPE = TableType
328333
DOMESTICATE_OPERATION_RESULT_CODE = TableType
334+
DONATE_RESULT_CODE = TableType
329335
DOODAD_KIND = TableType
330336
DUNGEON_TYPE = TableType
331337
dwQuestID = NumberType
@@ -408,6 +414,7 @@ GET_GIFT_ERROR_CODE = TableType
408414
GET_STATUS = TableType
409415
GetAddonCustomData = FunctionType
410416
GetAdjustTabPath = FunctionType
417+
GetAllShowMode = FunctionType
411418
GetAnsiCodePage = FunctionType
412419
GetArenaStatistics = FunctionType
413420
GetAttribute = FunctionType
@@ -426,6 +433,7 @@ GetBuffDesc = FunctionType
426433
GetBuffInfo = FunctionType
427434
GetBuffTime = FunctionType
428435
GetBuyLimitItemCDLeftFrames = FunctionType
436+
GetCDProcessInfo = FunctionType
429437
GetCenterID = FunctionType
430438
GetCenterNameByCenterID = FunctionType
431439
GetCharacterDistance = FunctionType
@@ -511,11 +519,14 @@ GetNpcIntensity = FunctionType
511519
GetNpcQuestState = FunctionType
512520
GetNpcQuestTip = FunctionType
513521
GetNpcTemplate = FunctionType
522+
GetObservedPlayer = FunctionType
523+
GetObservedPlayerID = FunctionType
514524
GetOnlineAddonCustomData = FunctionType
515525
GetOnlineFrameAnchor = FunctionType
516526
GetOpenFileName = FunctionType
517527
GetPartyMemberFontColor = FunctionType
518528
GetPeekPlayerID = FunctionType
529+
GetPID = FunctionType
519530
GetPingValue = FunctionType
520531
GetPlayer = FunctionType
521532
GetPlayerItem = FunctionType
@@ -602,6 +613,12 @@ Hand_DropHandObj = FunctionType
602613
Hand_Get = FunctionType
603614
Hand_IsEmpty = FunctionType
604615
Hand_Pick = FunctionType
616+
HAWK_EYE_FAILED_CODE = TableType
617+
HAWK_EYE_REMOTE_TARGET_CODE = TableType
618+
HAWK_EYE_TYPE = TableType
619+
HAWKEYE_GIFT_ERROR_CODE = TableType
620+
HAWKEYE_GIFT_TYPE = TableType
621+
HAWKEYE_NOTIFY_MESSAGE_CODE = TableType
605622
HIDE_PLAYER_NAME_MODE = TableType
606623
HideTip = FunctionType
607624
HOME_CLASS = TableType
@@ -614,6 +631,7 @@ Hotkey = TableType
614631
ilines = FunctionType
615632
ilines_r = FunctionType
616633
IMAGE = TableType
634+
IMMUNITY_CAST_TYPE = TableType
617635
InitFrameAutoPosInfo = FunctionType
618636
InsertDistributeMenu = FunctionType
619637
InsertEquipOptMenu = FunctionType
@@ -652,6 +670,7 @@ IsEnemy = FunctionType
652670
IsFileExist = FunctionType
653671
IsHorseFodderMatch = FunctionType
654672
IsKeyDown = FunctionType
673+
IsKungfuSkill = FunctionType
655674
IsLocalFileExist = FunctionType
656675
IsMiddleMapOpened = FunctionType
657676
IsMobile = FunctionType
@@ -663,6 +682,7 @@ IsMystiqueSkillRead = FunctionType
663682
IsNeedFilterName = FunctionType
664683
IsNeutrality = FunctionType
665684
IsNpcExist = FunctionType
685+
IsOnObservedPlayer = FunctionType
666686
IsOptionOrOptionChildPanelOpened = FunctionType
667687
IsParty = FunctionType
668688
IsPlayer = FunctionType
@@ -710,6 +730,7 @@ LOOT_ITEM_RESULT_CODE = TableType
710730
LootItem = FunctionType
711731
LootList_AddonClosePickupAll = FunctionType
712732
LootMoney = FunctionType
733+
MACRO_SKILL_CAST_MODE = TableType
713734
MAIL_RESPOND_CODE = TableType
714735
MAIL_TYPE = TableType
715736
MAIN_SCENE_DOF_AWAY_MAX = NumberType
@@ -754,6 +775,7 @@ MONTH_CARD_BP_ID = TableType
754775
MORPH_TYPE = TableType
755776
MOVE_STATE = TableType
756777
MOVIE = TableType
778+
MY_XMLDecode = FunctionType
757779
Navigator_Remove = FunctionType
758780
Navigator_SetID = FunctionType
759781
Navigator_SetPoint = FunctionType
@@ -773,6 +795,7 @@ NPC_GetHeadImageFile = FunctionType
773795
NPC_GetProtrait = FunctionType
774796
NPC_SPECIES_TYPE = TableType
775797
NumberToChinese = FunctionType
798+
OB_GIFT_TYPE = TableType
776799
OnBreakEquip = FunctionType
777800
OnDestroyItem = FunctionType
778801
OnDestroyItemTable = FunctionType
@@ -869,6 +892,7 @@ PlayerEnergyUI_Update = FunctionType
869892
PlayItemSound = FunctionType
870893
PlaySound = FunctionType
871894
PLUGIN_TEAM = TableType
895+
PluginInterface = TableType
872896
PopupMenu = FunctionType
873897
PopupMenu_ProcessHotkey = FunctionType
874898
PopupMenuEx = FunctionType
@@ -906,6 +930,7 @@ RegisterMsgHook = FunctionType
906930
RegisterMsgMonitor = FunctionType
907931
RegisterScrollControl = FunctionType
908932
RegisterScrollEvent = FunctionType
933+
RegisterShowModeFrame = FunctionType
909934
RegisterTalkFilter = FunctionType
910935
RegisterUITable = FunctionType
911936
ReInitUI = FunctionType
@@ -925,6 +950,7 @@ REVIVE_TYPE = TableType
925950
REWARDS_CLASS = TableType
926951
REWARDS_SHOP_RESPOND_CODE = TableType
927952
RIDE_BOX_COUNT = NumberType
953+
RL_FORCE_RELATION = TableType
928954
rlcmd = FunctionType
929955
ROLE_TYPE = TableType
930956
ROLL_ITEM_CHOICE = TableType
@@ -947,6 +973,7 @@ Scene_ScenePointToScreenPoint = FunctionType
947973
Scene_ScenePositionToGameWorldPosition = FunctionType
948974
Scene_SelectObject = FunctionType
949975
SCENE_SFX_ERROR_CODE = TableType
976+
SceneMain_SetVisible = FunctionType
950977
SceneObject_SetBrightness = FunctionType
951978
SceneObject_SetTitleEffect = FunctionType
952979
ScreenShot = FunctionType
@@ -975,6 +1002,7 @@ SetOnlineFrameAnchor = FunctionType
9751002
SetTarget = FunctionType
9761003
SetTeamMark = FunctionType
9771004
SETTING_CAST_MODE = TableType
1005+
SFX_REPRESENT = TableType
9781006
SHARE_QUEST = TableType
9791007
SHOP_SYSTEM_RESPOND_CODE = TableType
9801008
SKILL_ATTACK_WEAK_POS = TableType
@@ -1031,6 +1059,7 @@ Table_GetAccountFriendAvatar = FunctionType
10311059
Table_GetAchievement = FunctionType
10321060
Table_GetAchievementDLCReward = FunctionType
10331061
Table_GetAchievementInfo = FunctionType
1062+
Table_GetAchievementName = FunctionType
10341063
Table_GetAchievementProgress = FunctionType
10351064
Table_GetAchievementSubDLC = FunctionType
10361065
Table_GetActivityBPReward = FunctionType
@@ -1045,13 +1074,18 @@ Table_GetActivitySymbol = FunctionType
10451074
Table_GetActiviyTimeDesc = FunctionType
10461075
Table_GetActiviyTipDesc = FunctionType
10471076
Table_GetAdventure = FunctionType
1077+
Table_GetAdventureByID = FunctionType
10481078
Table_GetAdventureTask = FunctionType
1079+
Table_GetAdventureTryBook = FunctionType
10491080
Table_GetAllAchievement = FunctionType
1081+
Table_GetAllCraftDoodadInfo = FunctionType
1082+
Table_GetAllCraftInfo = FunctionType
10501083
Table_GetAllDanmakuColor = FunctionType
10511084
Table_GetAllFellowPet = FunctionType
10521085
Table_GetAllKBSeasonReward = FunctionType
10531086
Table_GetAllKBWeekReward = FunctionType
10541087
Table_GetAllKungfuSkillList = FunctionType
1088+
Table_GetAllMapID = FunctionType
10551089
Table_GetAllMasterBunusItem = FunctionType
10561090
Table_GetAllOutsideFilterParams = FunctionType
10571091
Table_GetAllPartnerNpcInfo = FunctionType
@@ -1061,12 +1095,16 @@ Table_GetAllPartnerTravelTeam = FunctionType
10611095
Table_GetAllPersonLabel = FunctionType
10621096
Table_GetAllSceneQuest = FunctionType
10631097
Table_GetAllSelfieFilterParams = FunctionType
1098+
Table_GetAllSelfieLightParams = FunctionType
1099+
Table_GetAllSelfieStudio = FunctionType
10641100
Table_GetAnimalAction = FunctionType
10651101
Table_GetAnnounceImage = FunctionType
10661102
Table_GetArena1V1BanInfo = FunctionType
1103+
Table_GetArenaChallengeInfo = FunctionType
10671104
Table_GetArenaLiveMap = FunctionType
10681105
Table_GetArtistReward = FunctionType
10691106
Table_GetArtistSkillsInfo = FunctionType
1107+
Table_GetASelfieStudioPreset = FunctionType
10701108
Table_GetAutoCorpsNameList = FunctionType
10711109
Table_GetBaseAttributeInfo = FunctionType
10721110
Table_GetBattleFieldDesc = FunctionType
@@ -1094,7 +1132,6 @@ Table_GetBookPageID = FunctionType
10941132
Table_GetBookPageNumber = FunctionType
10951133
Table_GetBookSort = FunctionType
10961134
Table_GetBookSubSort = FunctionType
1097-
Table_GetBoss = FunctionType
10981135
Table_GetBossBuffFilter = FunctionType
10991136
Table_GetBossBuffInfo = FunctionType
11001137
Table_GetBossInfo = FunctionType
@@ -1110,6 +1147,7 @@ Table_GetBuffTime = FunctionType
11101147
Table_GetCalenderActivity = FunctionType
11111148
Table_GetCalenderActivityAward = FunctionType
11121149
Table_GetCalenderActivityAwardIcon = FunctionType
1150+
Table_GetCalenderActivityAwardIconByID = FunctionType
11131151
Table_GetCalenderOfDay = FunctionType
11141152
Table_GetCampAuctionInfo = FunctionType
11151153
Table_GetCanExteriorDesc = FunctionType
@@ -1124,7 +1162,6 @@ Table_GetCareerTabTitle = FunctionType
11241162
Table_GetCastleByMapID = FunctionType
11251163
Table_GetCastleInfo = FunctionType
11261164
Table_GetCategoryByAttributeID = FunctionType
1127-
Table_GetCDProcessBoss = FunctionType
11281165
Table_GetCGList = FunctionType
11291166
Table_GetChanelList = FunctionType
11301167
Table_GetChanelName = FunctionType
@@ -1145,11 +1182,15 @@ Table_GetCopySuggest = FunctionType
11451182
Table_GetCountComboInfo = FunctionType
11461183
Table_GetCraft = FunctionType
11471184
Table_GetCraftBelongName = FunctionType
1185+
Table_GetCraftByProfessionID = FunctionType
11481186
Table_GetCraftDesc = FunctionType
1187+
Table_GetCraftDoodadInfo = FunctionType
11491188
Table_GetCraftHoleIcon = FunctionType
11501189
Table_GetCraftIconID = FunctionType
11511190
Table_GetCraftID = FunctionType
1191+
Table_GetCraftItemList = FunctionType
11521192
Table_GetCraftName = FunctionType
1193+
Table_GetCraftNpcInfo = FunctionType
11531194
Table_GetCreateRoleParam = FunctionType
11541195
Table_GetCubAttribute = FunctionType
11551196
Table_GetCubInfo = FunctionType
@@ -1170,6 +1211,7 @@ Table_GetDesertStormSkill = FunctionType
11701211
Table_GetDesertStormSkillFilter = FunctionType
11711212
Table_GetDesertStormSkillQuality = FunctionType
11721213
Table_GetDesignationGeneration = FunctionType
1214+
Table_GetDesignationPrefixByID = FunctionType
11731215
Table_GetDialogBtn = FunctionType
11741216
Table_GetDisCoupon = FunctionType
11751217
Table_GetDLCIDByShortName = FunctionType
@@ -1181,6 +1223,7 @@ Table_GetDoodadTemplateName = FunctionType
11811223
Table_GetDoodadTemplateType = FunctionType
11821224
Table_GetDungeonBoss = FunctionType
11831225
Table_GetDungeonBoss_StepSkill = FunctionType
1226+
Table_GetDungeonBossByBossIndex = FunctionType
11841227
Table_GetDungeonBossModel = FunctionType
11851228
Table_GetDungeonBossNpcListByBossIndex = FunctionType
11861229
Table_GetDungeonClass = FunctionType
@@ -1252,6 +1295,7 @@ Table_GetItemDesc = FunctionType
12521295
Table_GetItemIconID = FunctionType
12531296
Table_GetItemName = FunctionType
12541297
Table_GetItemSoundID = FunctionType
1298+
Table_GetItemSourceList = FunctionType
12551299
Table_GetJiuGongQiGuaTaskInfo = FunctionType
12561300
Table_GetJX3LibraryContent = FunctionType
12571301
Table_GetJX3LibraryList = FunctionType
@@ -1262,6 +1306,8 @@ Table_GetKungFuName = FunctionType
12621306
Table_GetKungfuSkillList = FunctionType
12631307
Table_GetLearnSkillInfo = FunctionType
12641308
Table_GetLinkCount = FunctionType
1309+
Table_GetLiveGiftInfo = FunctionType
1310+
Table_GetLiveGiftTable = FunctionType
12651311
Table_GetLiveLinkDate = FunctionType
12661312
Table_GetLocalActionBarData = FunctionType
12671313
Table_GetLocalActionBarParam = FunctionType
@@ -1422,6 +1468,8 @@ Table_GetSeasonTaskList = FunctionType
14221468
Table_GetSegmentName = FunctionType
14231469
Table_GetSelfieFilterParamsByLogicIndex = FunctionType
14241470
Table_GetSelfieResolution = FunctionType
1471+
Table_GetSelfieStudioInfo = FunctionType
1472+
Table_GetSelfieStudioPresetInfo = FunctionType
14251473
Table_GetServerName = FunctionType
14261474
Table_GetSfxSize = FunctionType
14271475
Table_GetShopPanelInfo = FunctionType
@@ -1453,6 +1501,7 @@ Table_GetSkillTeach = FunctionType
14531501
Table_GetSmartDialog = FunctionType
14541502
Table_GetSoundSetting = FunctionType
14551503
Table_GetSpecailGift = FunctionType
1504+
Table_GetSpecialHorseOnJump = FunctionType
14561505
Table_GetSpecialTimeToItemCount = FunctionType
14571506
Table_GetSprintHelp = FunctionType
14581507
Table_GetStructTypeList = FunctionType
@@ -1497,6 +1546,7 @@ Table_IsArtistWriteExist = FunctionType
14971546
Table_IsBattleFieldMap = FunctionType
14981547
Table_IsBlackListSkill = FunctionType
14991548
Table_IsInGuildBattleFieldMap = FunctionType
1549+
Table_IsInJJCChallengeMap = FunctionType
15001550
Table_IsInPVEActivityMap = FunctionType
15011551
Table_IsInRougeLikeMap = FunctionType
15021552
Table_IsLegalSkill = FunctionType
@@ -1544,6 +1594,7 @@ TEAM_AUTHORITY_TYPE = TableType
15441594
TEAM_BIDDING_END_RESULT = TableType
15451595
TEAM_BIDDING_RISE_MONEY_RESULT = TableType
15461596
TEAM_BIDDING_START_RESULT = TableType
1597+
TEAM_HAWKEYE_AUTHORITY_TYPE = TableType
15471598
TEAM_NOTICE_INTERVAL_TIME = NumberType
15481599
TEAM_PUSH_NOTIFY_CODE = TableType
15491600
TEAM_VOTE_TYPE = TableType
@@ -1576,10 +1627,14 @@ TraceButton_AppendAddonMenu = FunctionType
15761627
TraceButton_GetAddonMenu = FunctionType
15771628
TRADE_MALL_CODE = TableType
15781629
TRADING_RESPOND_CODE = TableType
1630+
TRANSFORM = TableType
15791631
tweenlite = TableType
15801632
type = FunctionType
1633+
UI_ARENA_TYPE = TableType
15811634
UI_COIN_SHOP_GOODS_TYPE_OTHER = NumberType
15821635
UI_COIN_SHOP_OTHER_CLASS = TableType
1636+
UI_COINSHOP_GENERAL = TableType
1637+
UI_COINSHOP_SHOW_HIDE_TYPE = TableType
15831638
UI_GetClientPlayerID = FunctionType
15841639
UI_GetCurrentMapID = FunctionType
15851640
UI_GetPlayerMountKungfuID = FunctionType

0 commit comments

Comments
 (0)