diff --git a/cmdid_gc.json b/cmdid_gc.json
index b931554d..278600b2 100644
--- a/cmdid_gc.json
+++ b/cmdid_gc.json
@@ -1,16 +1,4 @@
 [
-    {
-        "name": "UNKNOWN1",
-        "id": 2682
-    },
-    {
-        "name": "UNKNOWN3",
-        "id": 28968
-    },
-    {
-        "name": "LOOP_UNK1",
-        "id": 23233
-    },
     {
         "name": "GetPlayerTokenReq",
         "id": 23703
@@ -805,139 +793,139 @@
     },
     {
         "name": "WindSeedClientNotify",
-        "id": 50000
+        "id": 5852
     },
     {
         "name": "SceneEntityUpdateNotify",
-        "id": 50001
+        "id": 27183
     },
     {
         "name": "EvtCreateGadgetNotify",
-        "id": 50002
+        "id": 25223
     },
     {
         "name": "GetFriendShowNameCardInfoRsp",
-        "id": 50003
+        "id": 4963
     },
     {
         "name": "EvtAiSyncSkillCdNotify",
-        "id": 50004
+        "id": 23435
     },
     {
         "name": "EvtDestroyGadgetNotify",
-        "id": 50005
+        "id": 1452
     },
     {
         "name": "EvtEntityRenderersChangedNotify",
-        "id": 50006
+        "id": 28488
     },
     {
         "name": "AbilityChangeNotify",
-        "id": 50007
+        "id": 22133
     },
     {
         "name": "HitTreeNotify",
-        "id": 50008
+        "id": 2178
     },
     {
         "name": "WorldPlayerLocationNotify",
-        "id": 50009
+        "id": 7420
     },
     {
         "name": "ObstacleModifyNotify",
-        "id": 50010
+        "id": 2375
     },
     {
         "name": "WeaponUpgradeReq",
-        "id": 50011
+        "id": 24162
     },
     {
         "name": "WeaponUpgradeRsp",
-        "id": 50012
+        "id": 3294
     },
     {
         "name": "WeaponPromoteReq",
-        "id": 50013
+        "id": 9611
     },
     {
         "name": "WeaponPromoteRsp",
-        "id": 50014
+        "id": 23521
     },
     {
         "name": "WeaponAwakenReq",
-        "id": 50015
+        "id": 25056
     },
     {
         "name": "WeaponAwakenRsp",
-        "id": 50016
+        "id": 1182
     },
     {
-        "name": "GetWidgetQuickSlotListReq",
+        "name": "    //public static final int GetWidgetQuickSlotListReq",
         "id": 50017
     },
     {
         "name": "TakePlayerLevelRewardReq",
-        "id": 50018
+        "id": 20108
     },
     {
         "name": "TakePlayerLevelRewardRsp",
-        "id": 50019
+        "id": 24293
     },
     {
         "name": "AvatarGainCostumeNotify",
-        "id": 50020
+        "id": 25586
     },
     {
         "name": "AvatarGainFlycloakNotify",
-        "id": 50021
+        "id": 2863
     },
     {
         "name": "PlayerEnterDungeonReq",
-        "id": 50022
+        "id": 21509
     },
     {
         "name": "PlayerEnterDungeonRsp",
-        "id": 50023
+        "id": 29126
     },
     {
         "name": "SelectWorktopOptionReq",
-        "id": 50024
+        "id": 6885
     },
     {
         "name": "SelectWorktopOptionRsp",
-        "id": 50025
+        "id": 28536
     },
     {
         "name": "PlayerQuitDungeonReq",
-        "id": 50026
+        "id": 4653
     },
     {
         "name": "DungeonChallengeBeginNotify",
-        "id": 50027
+        "id": 4649
     },
     {
         "name": "DungeonChallengeFinishNotify",
-        "id": 50028
+        "id": 25587
     },
     {
         "name": "DungeonDieOptionReq",
-        "id": 50029
+        "id": 22244
     },
     {
         "name": "DungeonDieOptionRsp",
-        "id": 50030
+        "id": 21764
     },
     {
         "name": "EntityAiSyncNotify",
-        "id": 50031
+        "id": 24710
     },
     {
         "name": "ServerAnnounceNotify",
-        "id": 50032
+        "id": 1758
     },
     {
         "name": "DungeonEntryToBeExploreNotify",
-        "id": 50033
+        "id": 26162
     },
     {
         "name": "GetDungeonEntryExploreConditionReq",
@@ -981,11 +969,11 @@
     },
     {
         "name": "AchievementAllDataNotify",
-        "id": 50044
+        "id": 7450
     },
     {
         "name": "AchievementUpdateNotify",
-        "id": 50045
+        "id": 27625
     },
     {
         "name": "ActivityAcceptAllGiveGiftReq",
@@ -1065,7 +1053,7 @@
     },
     {
         "name": "ActivityInfoNotify",
-        "id": 50065
+        "id": 20264
     },
     {
         "name": "ActivityPlayOpenAnimNotify",
@@ -1089,7 +1077,7 @@
     },
     {
         "name": "ActivityScheduleInfoNotify",
-        "id": 50071
+        "id": 29397
     },
     {
         "name": "ActivitySelectAvatarCardReq",
@@ -1209,7 +1197,7 @@
     },
     {
         "name": "AllWidgetDataNotify",
-        "id": 50101
+        "id": 9546
     },
     {
         "name": "AnchorPointDataNotify",
@@ -1229,7 +1217,7 @@
     },
     {
         "name": "AntiAddictNotify",
-        "id": 50106
+        "id": 243
     },
     {
         "name": "AranaraCollectionDataNotify",
@@ -1305,11 +1293,11 @@
     },
     {
         "name": "AvatarChangeAnimHashReq",
-        "id": 50125
+        "id": 29050
     },
     {
         "name": "AvatarChangeAnimHashRsp",
-        "id": 50126
+        "id": 29112
     },
     {
         "name": "AvatarChangeElementTypeReq",
@@ -1393,11 +1381,11 @@
     },
     {
         "name": "AvatarPromoteReq",
-        "id": 50147
+        "id": 20441
     },
     {
         "name": "AvatarPromoteRsp",
-        "id": 50148
+        "id": 20328
     },
     {
         "name": "AvatarRenameInfoNotify",
@@ -1405,132 +1393,44 @@
     },
     {
         "name": "AvatarSkillChangeNotify",
-        "id": 50150
+        "id": 9268
     },
     {
         "name": "AvatarSkillDepotChangeNotify",
-        "id": 50151
+        "id": 568
     },
     {
         "name": "AvatarSkillInfoNotify",
-        "id": 50152
+        "id": 28706
     },
     {
         "name": "AvatarSkillMaxChargeCountNotify",
-        "id": 50153
+        "id": 9198
     },
     {
         "name": "AvatarSkillUpgradeReq",
-        "id": 50154
+        "id": 22618
     },
     {
         "name": "AvatarSkillUpgradeRsp",
-        "id": 50155
+        "id": 26538
     },
     {
         "name": "AvatarUnlockTalentNotify",
-        "id": 50156
+        "id": 1893
     },
     {
         "name": "AvatarUpgradeReq",
-        "id": 50157
+        "id": 24626
     },
     {
         "name": "AvatarUpgradeRsp",
-        "id": 50158
-    },
-    {
-        "name": "BAAOCAEGJBP",
-        "id": 50159
-    },
-    {
-        "name": "BBLDMLJIAIM",
-        "id": 50160
-    },
-    {
-        "name": "BBLFOGIBMGA",
-        "id": 50161
-    },
-    {
-        "name": "BDPDLIDMKOJ",
-        "id": 50162
-    },
-    {
-        "name": "BFCKKPOACHJ",
-        "id": 50163
-    },
-    {
-        "name": "BFDMAPHCILI",
-        "id": 50164
-    },
-    {
-        "name": "BFECBNMGCJJ",
-        "id": 50165
-    },
-    {
-        "name": "BGJBIIDKDBL",
-        "id": 50166
-    },
-    {
-        "name": "BIHPFJENLOF",
-        "id": 50167
-    },
-    {
-        "name": "BIOILPNCJNI",
-        "id": 50168
-    },
-    {
-        "name": "BKCMELBNNNM",
-        "id": 50169
-    },
-    {
-        "name": "BKKLKEHJKPJ",
-        "id": 50170
-    },
-    {
-        "name": "BKKOCMDJIKO",
-        "id": 50171
-    },
-    {
-        "name": "BKNAMDDEIKH",
-        "id": 50172
-    },
-    {
-        "name": "BKOHLDCHKBL",
-        "id": 50173
-    },
-    {
-        "name": "BLDHOHDIBHB",
-        "id": 50174
+        "id": 24717
     },
     {
         "name": "PlayerEnterChildMapLayerNotify",
         "id": 50175
     },
-    {
-        "name": "BMODNHIFDPI",
-        "id": 50176
-    },
-    {
-        "name": "BMPHGPCILIK",
-        "id": 50177
-    },
-    {
-        "name": "BOFOFKKOBNO",
-        "id": 50178
-    },
-    {
-        "name": "BOKHOGPNNKA",
-        "id": 50179
-    },
-    {
-        "name": "BOLCDNOPCFK",
-        "id": 50180
-    },
-    {
-        "name": "BPOLCGACIHE",
-        "id": 50181
-    },
     {
         "name": "BackMyWorldReq",
         "id": 50182
@@ -1633,15 +1533,15 @@
     },
     {
         "name": "BattlePassAllDataNotify",
-        "id": 50207
+        "id": 2963
     },
     {
         "name": "BattlePassBuySuccNotify",
-        "id": 50208
+        "id": 9695
     },
     {
         "name": "BattlePassCurScheduleUpdateNotify",
-        "id": 50209
+        "id": 23013
     },
     {
         "name": "BattlePassMissionDelNotify",
@@ -1649,26 +1549,26 @@
     },
     {
         "name": "BattlePassMissionUpdateNotify",
-        "id": 50211
+        "id": 21651
     },
     {
         "name": "BeginCameraSceneLookNotify",
         "id": 50212
     },
     {
-        "name": "BeginCameraSceneLookWithTemplateNotify",
+        "name": "    //public static final int BeginCameraSceneLookWithTemplateNotify",
         "id": 50213
     },
     {
-        "name": "BigTalentPointConvertReq",
+        "name": "    //public static final int BigTalentPointConvertReq",
         "id": 50214
     },
     {
-        "name": "BigTalentPointConvertRsp",
+        "name": "    //public static final int BigTalentPointConvertRsp",
         "id": 50215
     },
     {
-        "name": "BlessingAcceptAllGivePicReq",
+        "name": "    //public static final int BlessingAcceptAllGivePicReq",
         "id": 50216
     },
     {
@@ -1737,7 +1637,7 @@
     },
     {
         "name": "BlossomBriefInfoNotify",
-        "id": 50233
+        "id": 24748
     },
     {
         "name": "BlossomChestCreateNotify",
@@ -1925,7 +1825,7 @@
     },
     {
         "name": "ChangeMailStarNotify",
-        "id": 50280
+        "id": 22223
     },
     {
         "name": "ChangeMpTeamAvatarReq",
@@ -2177,7 +2077,7 @@
     },
     {
         "name": "ClientAIStateNotify",
-        "id": 50343
+        "id": 22734
     },
     {
         "name": "ClientAbilitiesInitFinishCombineNotify",
@@ -2253,11 +2153,11 @@
     },
     {
         "name": "CodexDataFullNotify",
-        "id": 50362
+        "id": 2558
     },
     {
         "name": "CodexDataUpdateNotify",
-        "id": 50363
+        "id": 26679
     },
     {
         "name": "CoinCollectCheckDoubleStartPlayReq",
@@ -2301,19 +2201,19 @@
     },
     {
         "name": "CombineDataNotify",
-        "id": 50374
+        "id": 23746
     },
     {
         "name": "CombineFormulaDataNotify",
-        "id": 50375
+        "id": 22050
     },
     {
         "name": "CombineReq",
-        "id": 50376
+        "id": 3349
     },
     {
         "name": "CombineRsp",
-        "id": 50377
+        "id": 492
     },
     {
         "name": "CommonPlayerTipsNotify",
@@ -2321,7 +2221,7 @@
     },
     {
         "name": "CompoundDataNotify",
-        "id": 50379
+        "id": 26025
     },
     {
         "name": "CompoundUnlockNotify",
@@ -2977,7 +2877,7 @@
     },
     {
         "name": "EnterTransPointRegionNotify",
-        "id": 50543
+        "id": 20259
     },
     {
         "name": "EnterTrialAvatarActivityDungeonReq",
@@ -2989,11 +2889,11 @@
     },
     {
         "name": "EnterWorldAreaReq",
-        "id": 50546
+        "id": 6675
     },
     {
         "name": "EnterWorldAreaRsp",
-        "id": 50547
+        "id": 8436
     },
     {
         "name": "EntityAiKillSelfNotify",
@@ -3049,11 +2949,11 @@
     },
     {
         "name": "EvtAvatarEnterFocusNotify",
-        "id": 50561
+        "id": 4109
     },
     {
         "name": "EvtAvatarExitFocusNotify",
-        "id": 50562
+        "id": 28844
     },
     {
         "name": "EvtAvatarSitDownNotify",
@@ -3061,7 +2961,7 @@
     },
     {
         "name": "EvtAvatarUpdateFocusNotify",
-        "id": 50564
+        "id": 3013
     },
     {
         "name": "EvtBeingHealedNotify",
@@ -3125,11 +3025,11 @@
     },
     {
         "name": "ExecuteGadgetLuaReq",
-        "id": 50580
+        "id": 29143
     },
     {
         "name": "ExecuteGadgetLuaRsp",
-        "id": 50581
+        "id": 2532
     },
     {
         "name": "ExecuteGroupTriggerReq",
@@ -3161,7 +3061,7 @@
     },
     {
         "name": "ExitTransPointRegionNotify",
-        "id": 50589
+        "id": 8012
     },
     {
         "name": "ExpeditionChallengeEnterRegionNotify",
@@ -3373,31 +3273,31 @@
     },
     {
         "name": "ForgeDataNotify",
-        "id": 50642
+        "id": 6985
     },
     {
         "name": "ForgeFormulaDataNotify",
-        "id": 50643
+        "id": 8543
     },
     {
         "name": "ForgeGetQueueDataReq",
-        "id": 50644
+        "id": 5954
     },
     {
         "name": "ForgeGetQueueDataRsp",
-        "id": 50645
+        "id": 7571
     },
     {
         "name": "ForgeQueueDataNotify",
-        "id": 50646
+        "id": 5698
     },
     {
         "name": "ForgeQueueManipulateReq",
-        "id": 50647
+        "id": 23681
     },
     {
         "name": "ForgeQueueManipulateRsp",
-        "id": 50648
+        "id": 24425
     },
     {
         "name": "ForgeStartReq",
@@ -3969,7 +3869,7 @@
     },
     {
         "name": "GadgetStateNotify",
-        "id": 50791
+        "id": 22100
     },
     {
         "name": "GadgetTalkChangeNotify",
@@ -4109,19 +4009,19 @@
     },
     {
         "name": "GetAllMailNotify",
-        "id": 50826
+        "id": 8385
     },
     {
         "name": "GetAllMailReq",
-        "id": 50827
+        "id": 27885
     },
     {
         "name": "GetAllMailResultNotify",
-        "id": 50828
+        "id": 20380
     },
     {
         "name": "GetAllMailRsp",
-        "id": 50829
+        "id": 565
     },
     {
         "name": "GetAllSceneGalleryInfoReq",
@@ -4133,11 +4033,11 @@
     },
     {
         "name": "GetAreaExplorePointReq",
-        "id": 50832
+        "id": 533
     },
     {
         "name": "GetAreaExplorePointRsp",
-        "id": 50833
+        "id": 5384
     },
     {
         "name": "GetAuthSalesmanInfoReq",
@@ -4173,7 +4073,7 @@
     },
     {
         "name": "GetBlossomBriefInfoListRsp",
-        "id": 50842
+        "id": 27024
     },
     {
         "name": "GetBonusActivityRewardReq",
@@ -4221,7 +4121,7 @@
     },
     {
         "name": "GetCompoundDataRsp",
-        "id": 50854
+        "id": 28257
     },
     {
         "name": "GetCustomDungeonReq",
@@ -4297,11 +4197,11 @@
     },
     {
         "name": "GetInvestigationMonsterReq",
-        "id": 50873
+        "id": 21813
     },
     {
         "name": "GetInvestigationMonsterRsp",
-        "id": 50874
+        "id": 25460
     },
     {
         "name": "GetMailItemReq",
@@ -4317,7 +4217,7 @@
     },
     {
         "name": "GetMapAreaRsp",
-        "id": 50878
+        "id": 26944
     },
     {
         "name": "GetMapMarkTipsReq",
@@ -4353,11 +4253,11 @@
     },
     {
         "name": "GetOnlinePlayerListReq",
-        "id": 50887
+        "id": 22525
     },
     {
         "name": "GetOnlinePlayerListRsp",
-        "id": 50888
+        "id": 6813
     },
     {
         "name": "GetOpActivityInfoReq",
@@ -4477,11 +4377,11 @@
     },
     {
         "name": "GetShopmallDataReq",
-        "id": 50918
+        "id": 20724
     },
     {
         "name": "GetShopmallDataRsp",
-        "id": 50919
+        "id": 25915
     },
     {
         "name": "GetSignInRewardReq",
@@ -4517,11 +4417,11 @@
     },
     {
         "name": "GetWidgetSlotReq",
-        "id": 50928
+        "id": 21085
     },
     {
         "name": "GetWidgetSlotRsp",
-        "id": 50929
+        "id": 5626
     },
     {
         "name": "GetWorldMpInfoReq",
@@ -4541,11 +4441,11 @@
     },
     {
         "name": "GivingRecordChangeNotify",
-        "id": 50934
+        "id": 3907
     },
     {
         "name": "GivingRecordNotify",
-        "id": 50935
+        "id": 5883
     },
     {
         "name": "GlobalBuildingInfoNotify",
@@ -4617,11 +4517,11 @@
     },
     {
         "name": "GroupSuiteNotify",
-        "id": 50953
+        "id": 26778
     },
     {
         "name": "GroupUnloadNotify",
-        "id": 50954
+        "id": 25365
     },
     {
         "name": "GuestBeginEnterSceneNotify",
@@ -5269,7 +5169,7 @@
     },
     {
         "name": "InvestigationMonsterUpdateNotify",
-        "id": 51116
+        "id": 2443
     },
     {
         "name": "InvestigationQuestDailyNotify",
@@ -5525,7 +5425,7 @@
     },
     {
         "name": "LuaSetOptionNotify",
-        "id": 51180
+        "id": 29667
     },
     {
         "name": "LuminanceStoneChallengeSettleNotify",
@@ -5593,11 +5493,11 @@
     },
     {
         "name": "MarkTargetInvestigationMonsterNotify",
-        "id": 51197
+        "id": 4072
     },
     {
         "name": "MassiveEntityElementOpBatchNotify",
-        "id": 51198
+        "id": 25032
     },
     {
         "name": "MassiveEntityStateChangedNotify",
@@ -6145,7 +6045,7 @@
     },
     {
         "name": "PlayerApplyEnterHomeNotify",
-        "id": 51335
+        "id": 5247
     },
     {
         "name": "PlayerApplyEnterHomeResultNotify",
@@ -6165,27 +6065,27 @@
     },
     {
         "name": "PlayerApplyEnterMpNotify",
-        "id": 51340
+        "id": 7182
     },
     {
         "name": "PlayerApplyEnterMpReq",
-        "id": 51341
+        "id": 20663
     },
     {
         "name": "PlayerApplyEnterMpResultNotify",
-        "id": 51342
+        "id": 1143
     },
     {
         "name": "PlayerApplyEnterMpResultReq",
-        "id": 51343
+        "id": 26285
     },
     {
         "name": "PlayerApplyEnterMpResultRsp",
-        "id": 51344
+        "id": 4853
     },
     {
         "name": "PlayerApplyEnterMpRsp",
-        "id": 51345
+        "id": 20430
     },
     {
         "name": "PlayerCancelMatchReq",
@@ -6217,7 +6117,7 @@
     },
     {
         "name": "PlayerCompoundMaterialBoostRsp",
-        "id": 51353
+        "id": 3301
     },
     {
         "name": "PlayerCompoundMaterialReq",
@@ -6225,7 +6125,7 @@
     },
     {
         "name": "PlayerCompoundMaterialRsp",
-        "id": 51355
+        "id": 4656
     },
     {
         "name": "PlayerConfirmMatchReq",
@@ -6309,15 +6209,15 @@
     },
     {
         "name": "PlayerInvestigationAllInfoNotify",
-        "id": 51376
+        "id": 27774
     },
     {
         "name": "PlayerInvestigationNotify",
-        "id": 51377
+        "id": 6640
     },
     {
         "name": "PlayerInvestigationTargetNotify",
-        "id": 51378
+        "id": 22101
     },
     {
         "name": "PlayerIpRegionNotify",
@@ -6385,7 +6285,7 @@
     },
     {
         "name": "PlayerQuitDungeonRsp",
-        "id": 51395
+        "id": 29245
     },
     {
         "name": "PlayerQuitFromHomeNotify",
@@ -6553,23 +6453,23 @@
     },
     {
         "name": "QueryCodexMonsterBeKilledNumReq",
-        "id": 51437
+        "id": 21437
     },
     {
         "name": "QueryCodexMonsterBeKilledNumRsp",
-        "id": 51438
+        "id": 28880
     },
     {
         "name": "QuestCreateEntityReq",
-        "id": 51439
+        "id": 28703
     },
     {
         "name": "QuestCreateEntityRsp",
-        "id": 51440
+        "id": 9887
     },
     {
         "name": "QuestDelNotify",
-        "id": 51441
+        "id": 9734
     },
     {
         "name": "QuickOpenActivityReq",
@@ -6585,7 +6485,7 @@
     },
     {
         "name": "QuickUseWidgetRsp",
-        "id": 51445
+        "id": 22155
     },
     {
         "name": "ReadMailNotify",
@@ -7057,7 +6957,7 @@
     },
     {
         "name": "SceneAreaUnlockNotify",
-        "id": 51563
+        "id": 1330
     },
     {
         "name": "SceneAudioNotify",
@@ -7209,7 +7109,7 @@
     },
     {
         "name": "ScenePlayerLocationNotify",
-        "id": 51601
+        "id": 21376
     },
     {
         "name": "ScenePlayerSoundNotify",
@@ -7293,7 +7193,7 @@
     },
     {
         "name": "SeeMonsterReq",
-        "id": 51622
+        "id": 25646
     },
     {
         "name": "SeeMonsterRsp",
@@ -7337,7 +7237,7 @@
     },
     {
         "name": "ServerCondMeetQuestListUpdateNotify",
-        "id": 51633
+        "id": 25746
     },
     {
         "name": "ServerDisconnectClientNotify",
@@ -7349,7 +7249,7 @@
     },
     {
         "name": "ServerLogNotify",
-        "id": 51636
+        "id": 20727
     },
     {
         "name": "ServerMessageNotify",
@@ -7357,7 +7257,7 @@
     },
     {
         "name": "ServerTimeNotify",
-        "id": 51638
+        "id": 3350
     },
     {
         "name": "ServerTryCancelGeneralMatchNotify",
@@ -7445,11 +7345,11 @@
     },
     {
         "name": "SetOpenStateReq",
-        "id": 51660
+        "id": 9009
     },
     {
         "name": "SetOpenStateRsp",
-        "id": 51661
+        "id": 22146
     },
     {
         "name": "SetPlayerBornDataReq",
@@ -7461,11 +7361,11 @@
     },
     {
         "name": "SetPlayerPropReq",
-        "id": 51664
+        "id": 1774
     },
     {
         "name": "SetPlayerPropRsp",
-        "id": 51665
+        "id": 4436
     },
     {
         "name": "SetSceneWeatherAreaReq",
@@ -7477,19 +7377,19 @@
     },
     {
         "name": "SetUpLunchBoxWidgetReq",
-        "id": 51668
+        "id": 24935
     },
     {
         "name": "SetUpLunchBoxWidgetRsp",
-        "id": 51669
+        "id": 24393
     },
     {
         "name": "SetWidgetSlotReq",
-        "id": 51670
+        "id": 25160
     },
     {
         "name": "SetWidgetSlotRsp",
-        "id": 51671
+        "id": 29426
     },
     {
         "name": "ShowClientGuideNotify",
@@ -7869,11 +7769,11 @@
     },
     {
         "name": "TakeFurnitureMakeReq",
-        "id": 51766
+        "id": 7585
     },
     {
         "name": "TakeFurnitureMakeRsp",
-        "id": 51767
+        "id": 28114
     },
     {
         "name": "TakeHuntingOfferReq",
@@ -7885,19 +7785,19 @@
     },
     {
         "name": "TakeInvestigationRewardReq",
-        "id": 51770
+        "id": 25416
     },
     {
         "name": "TakeInvestigationRewardRsp",
-        "id": 51771
+        "id": 4841
     },
     {
         "name": "TakeInvestigationTargetRewardReq",
-        "id": 51772
+        "id": 20048
     },
     {
         "name": "TakeInvestigationTargetRewardRsp",
-        "id": 51773
+        "id": 25452
     },
     {
         "name": "TakeMaterialDeleteReturnReq",
@@ -8041,15 +7941,15 @@
     },
     {
         "name": "TowerAllDataReq",
-        "id": 51809
+        "id": 611
     },
     {
         "name": "TowerAllDataRsp",
-        "id": 51810
+        "id": 2253
     },
     {
         "name": "TowerBriefDataNotify",
-        "id": 51811
+        "id": 4797
     },
     {
         "name": "TowerBuffSelectReq",
@@ -8077,7 +7977,7 @@
     },
     {
         "name": "TowerFloorRecordChangeNotify",
-        "id": 51818
+        "id": 1981
     },
     {
         "name": "TowerGetFloorStarRewardReq",
@@ -8113,11 +8013,11 @@
     },
     {
         "name": "TowerTeamSelectReq",
-        "id": 51827
+        "id": 28157
     },
     {
         "name": "TowerTeamSelectRsp",
-        "id": 51828
+        "id": 27570
     },
     {
         "name": "TreasureMapBonusChallengeNotify",
@@ -8165,7 +8065,7 @@
     },
     {
         "name": "TriggerCreateGadgetToEquipPartNotify",
-        "id": 51840
+        "id": 24286
     },
     {
         "name": "TriggerRoguelikeCurseNotify",
@@ -8217,15 +8117,15 @@
     },
     {
         "name": "UnfreezeGroupLimitNotify",
-        "id": 51853
+        "id": 28371
     },
     {
         "name": "UnlockAvatarTalentReq",
-        "id": 51854
+        "id": 21301
     },
     {
         "name": "UnlockAvatarTalentRsp",
-        "id": 51855
+        "id": 22369
     },
     {
         "name": "UnlockCoopChapterReq",
@@ -8249,11 +8149,11 @@
     },
     {
         "name": "UnlockTransPointReq",
-        "id": 51861
+        "id": 24297
     },
     {
         "name": "UnlockTransPointRsp",
-        "id": 51862
+        "id": 26749
     },
     {
         "name": "UnlockedFurnitureFormulaDataNotify",
@@ -8501,26 +8401,26 @@
     },
     {
         "name": "WidgetCoolDownNotify",
-        "id": 51924
+        "id": 29375
     },
     {
         "name": "WidgetDoBagReq",
-        "id": 51925
+        "id": 8213
     },
     {
         "name": "WidgetDoBagRsp",
-        "id": 51926
+        "id": 21671
     },
     {
         "name": "WidgetGadgetAllDataNotify",
-        "id": 51927
+        "id": 6291
     },
     {
         "name": "WidgetGadgetDataNotify",
-        "id": 51928
+        "id": 9673
     },
     {
-        "name": "WidgetGadgetDestroyNotify",
+        "name": "    //public static final int WidgetGadgetDestroyNotify",
         "id": 51929
     },
     {
@@ -8541,7 +8441,7 @@
     },
     {
         "name": "WidgetSlotChangeNotify",
-        "id": 51934
+        "id": 25904
     },
     {
         "name": "WidgetUpdateExtraCDReq",
@@ -8689,7 +8589,7 @@
     },
     {
         "name": "WorktopOptionNotify",
-        "id": 51971
+        "id": 5012
     },
     {
         "name": "WorldAllRoutineTypeNotify",
@@ -8697,11 +8597,11 @@
     },
     {
         "name": "WorldChestOpenNotify",
-        "id": 51973
+        "id": 22669
     },
     {
         "name": "WorldOwnerBlossomBriefInfoNotify",
-        "id": 51974
+        "id": 24777
     },
     {
         "name": "WorldOwnerBlossomScheduleInfoNotify",
@@ -8713,7 +8613,7 @@
     },
     {
         "name": "WorldPlayerRTTNotify",
-        "id": 51977
+        "id": 2845
     },
     {
         "name": "WorldPlayerReviveRsp",
diff --git a/gc_needed2.json b/gc_needed2.json
index 23c4e3e2..eefbf585 100644
--- a/gc_needed2.json
+++ b/gc_needed2.json
@@ -560,6 +560,9 @@
     {
         "name": "CalcWeaponUpgradeReturnItemsReq"
     },
+    {
+        "name": "CancelCoopTaskReq"
+    },
     {
         "name": "ChangeAvatarReq"
     },
@@ -602,6 +605,9 @@
     {
         "name": "ClientLockGameTimeNotify"
     },
+    {
+        "name": "ClientScriptEventNotify"
+    },
     {
         "name": "CombatInvocationsNotify"
     },
@@ -629,6 +635,9 @@
     {
         "name": "DoGachaReq"
     },
+    {
+        "name": "DungeonDieOptionReq"
+    },
     {
         "name": "DungeonEntryInfoReq"
     },
@@ -713,6 +722,9 @@
     {
         "name": "GetDailyDungeonEntryInfoReq"
     },
+    {
+        "name": "GetDungeonEntryExploreConditionReq"
+    },
     {
         "name": "GetFriendShowAvatarInfoReq"
     },
@@ -971,6 +983,9 @@
     {
         "name": "SkipPlayerGameTimeReq"
     },
+    {
+        "name": "StartCoopPointReq"
+    },
     {
         "name": "TakeAchievementGoalRewardReq"
     },
@@ -1223,6 +1238,9 @@
     {
         "name": "CalcWeaponUpgradeReturnItemsRsp"
     },
+    {
+        "name": "CancelCoopTaskRsp"
+    },
     {
         "name": "CanUseSkillNotify"
     },
@@ -1286,6 +1304,15 @@
     {
         "name": "CookRecipeDataNotify"
     },
+    {
+        "name": "CoopChapter"
+    },
+    {
+        "name": "CoopDataNotify"
+    },
+    {
+        "name": "CoopPoint"
+    },
     {
         "name": "CreateVehicleRsp"
     },
@@ -1337,6 +1364,9 @@
     {
         "name": "DungeonEntryInfoRsp"
     },
+    {
+        "name": "DungeonEntryToBeExploreNotify"
+    },
     {
         "name": "DungeonPlayerDieNotify"
     },
@@ -1466,6 +1496,15 @@
     {
         "name": "GetCompoundDataRsp"
     },
+    {
+        "name": "DungeonEntryBlockReason"
+    },
+    {
+        "name": "DungeonEntryCond"
+    },
+    {
+        "name": "GetDungeonEntryExploreConditionRsp"
+    },
     {
         "name": "GetFriendShowAvatarInfoRsp"
     },
@@ -1583,6 +1622,12 @@
     {
         "name": "HomeGetOnlineStatusRsp"
     },
+    {
+        "name": "HomeMarkPointNotify"
+    },
+    {
+        "name": "HomeMarkPointSceneData"
+    },
     {
         "name": "HomeModuleSeenRsp"
     },
@@ -1994,6 +2039,9 @@
     {
         "name": "ShowCommonTipsNotify"
     },
+    {
+        "name": "StartCoopPointRsp"
+    },
     {
         "name": "StoreItemChangeNotify"
     },
@@ -2054,6 +2102,9 @@
     {
         "name": "TowerTeamSelectRsp"
     },
+    {
+        "name": "UnfreezeGroupLimitNotify"
+    },
     {
         "name": "UnlockAvatarTalentRsp"
     },
diff --git a/obfuscated.proto b/obfuscated.proto
index 86c0cd63..17a72f9c 100644
--- a/obfuscated.proto
+++ b/obfuscated.proto
@@ -26481,26 +26481,26 @@ message PKGNKDGHLOF {
   uint32 FLAEJDMDEIH = 4;
   uint32 GKAFIEPILPB = 5;
   uint32 ALOLAAGGKBA = 6;
-  string ACPNDAPFHOF = 7;
+  string ACPNDAPFHOF = 7; // 1
   uint32 HKOPPKGLDEL = 8;
   uint32 HCACIDLFMPM = 9;
   uint32 AOJLPDFHLPK = 10;
   uint32 FGPHIHCDOEO = 11;
   uint32 OFKJPAHLDIL = 12;
   uint32 HDNALBCJPEH = 13;
-  string OEAENFJOOAH = 14;
+  string OEAENFJOOAH = 14; // 1
   uint32 BCKAJGAPGOC = 15;
   repeated uint32 LDACOBOBLDE = 49;
   bool FHADOOFNHAH = 778;
-  string MJFFKKDGLBN = 784;
+  string MJFFKKDGLBN = 784; // 1
   repeated JEJNMHJKEPK ELHNAEFIPFN = 802;
   repeated uint32 OCBIFLEDBJD = 1046;
   uint32 EMFBCNGMLJJ = 1106;
   repeated uint32 LEBLGEAPMHC = 1152;
   uint32 ONMDPPDFMEL = 1274;
-  string PFGONJOJJAL = 1355;
+  string PFGONJOJJAL = 1355; // 1
   uint32 CNJJLOLJMEL = 1869;
-  string GJJKHLLCCGN = 1926;
+  string GJJKHLLCCGN = 1926; // 1
   uint32 NJMNJNNPFPL = 1954;
 }
 
diff --git a/proto/ActivityInfo.proto b/proto/ActivityInfo.proto
index 2c2dd20e..1c30c701 100644
--- a/proto/ActivityInfo.proto
+++ b/proto/ActivityInfo.proto
@@ -2,205 +2,38 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 import "ActivityWatcherInfo.proto";
 import "ActivityPushTipsData.proto";
-import "SeaLampActivityDetailInfo.proto";
-import "CrucibleActivityDetailInfo.proto";
-import "SalesmanActivityDetailInfo.proto";
-import "TrialAvatarActivityDetailInfo.proto";
-import "DeliveryActivityDetailInfo.proto";
-import "AsterActivityDetailInfo.proto";
-import "FlightActivityDetailInfo.proto";
-import "DragonSpineActivityDetailInfo.proto";
-import "EffigyActivityDetailInfo.proto";
-import "TreasureMapActivityDetailInfo.proto";
-import "BlessingActivityDetailInfo.proto";
-import "SeaLampActivityInfo.proto";
-import "ExpeditionActivityDetailInfo.proto";
-import "ArenaChallengeActivityDetailInfo.proto";
-import "FleurFairActivityDetailInfo.proto";
-import "WaterSpiritActivityDetailInfo.proto";
-import "ChannelerSlabActivityDetailInfo.proto";
-import "MistTrialActivityDetailInfo.proto";
-import "HideAndSeekActivityDetailInfo.proto";
-import "FindHilichurlDetailInfo.proto";
-import "SummerTimeDetailInfo.proto";
-import "BuoyantCombatDetailInfo.proto";
-import "EchoShellDetailInfo.proto";
-import "BounceConjuringActivityDetailInfo.proto";
-import "BlitzRushActivityDetailInfo.proto";
-import "ChessActivityDetailInfo.proto";
-import "SumoActivityDetailInfo.proto";
-import "MoonfinTrialActivityDetailInfo.proto";
-import "LunaRiteDetailInfo.proto";
-import "PlantFlowerActivityDetailInfo.proto";
+
 import "MusicGameActivityDetailInfo.proto";
-import "RoguelikeDungeonActivityDetailInfo.proto";
-import "DigActivityDetailInfo.proto";
-import "HachiActivityDetailInfo.proto";
-import "WinterCampActivityDetailInfo.proto";
-import "PotionActivityDetailInfo.proto";
-import "TanukiTravelActivityDetailInfo.proto";
-import "LanternRiteActivityDetailInfo.proto";
-import "MichiaeMatsuriActivityDetailInfo.proto";
-import "BartenderActivityDetailInfo.proto";
-import "UgcActivityDetailInfo.proto";
-import "CrystalLinkActivityDetailInfo.proto";
-import "IrodoriActivityDetailInfo.proto";
-import "PhotoActivityDetailInfo.proto";
-import "SpiceActivityDetailInfo.proto";
-import "GachaActivityDetailInfo.proto";
-import "LuminanceStoneChallengeActivityDetailInfo.proto";
-import "RogueDiaryActivityDetailInfo.proto";
-import "SummerTimeV2DetailInfo.proto";
-import "IslandPartyDetailInfo.proto";
-import "GearActivityDetailInfo.proto";
-import "GravenInnocenceDetailInfo.proto";
-import "InstableSprayDetailInfo.proto";
-import "MuqadasPotionActivityDetailInfo.proto";
-import "TreasureSeelieActivityDetailInfo.proto";
-import "RockBoardExploreDetailInfo.proto";
-import "VintageActivityDetailInfo.proto";
-import "WindFieldDetailInfo.proto";
-import "FungusFighterDetailInfo.proto";
-import "CharAmusementDetailInfo.proto";
-import "EffigyChallengeV2DetailInfo.proto";
-import "CoinCollectDetailInfo.proto";
-import "BrickBreakerDetailInfo.proto";
-import "DuelHeartDetailInfo.proto";
-import "SeaLampV3DetailInfo.proto";
-import "TeamChainDetailInfo.proto";
-import "ElectroherculesBattleDetailInfo.proto";
-import "GCGFestivalDetailInfo.proto";
-import "FleurFairV2DetailInfo.proto";
-import "FungusFighterV2DetailInfo.proto";
-import "AkaFesDetailInfo.proto";
-import "SandwormCannonDetailInfo.proto";
-import "SorushTrialDetailInfo.proto";
-import "JourneyInfo.proto";
-import "EffigyChallengeV4Info.proto";
-import "GcgPveInfo.proto";
-import "UgcV2Info.proto";
-import "PenumbraAdventureInfo.proto";
-import "AnimalViewInfo.proto";
-import "ActivityMultiCharacterInfo.proto";
-import "GcgPveInfiniteInfo.proto";
-import "ToyBattleInfo.proto";
-import "PhotoUnderseaInfo.proto";
-import "FontaineGatherInfo.proto";
-import "GcgPvePuzzleInfo.proto";
 
 // 4.7.0
 // Obf: ?
 message ActivityInfo {
 	uint32 activity_id = 3;
-	repeated uint32 DNMOEAFCDGC = 1736;
+	//repeated uint32 DNMOEAFCDGC = 1736;
 	repeated ActivityWatcherInfo watcher_info_list = 9;
 	bool is_finished = 14;
-	repeated uint32 LJLDCLMAMNL = 482;
-	bool PJJKJGALLGD = 16;
+	//repeated uint32 LJLDCLMAMNL = 482;
+	//bool PJJKJGALLGD = 16;
 	uint32 activity_type = 1;
 	uint32 schedule_id = 5;
 	map<uint32, uint32> activity_coin_map = 1562;
 	repeated uint32 meet_cond_list = 12;
-	bool DKJDABCNGBP = 13;
+	//bool DKJDABCNGBP = 13;
 	uint32 begin_time = 2;
-	uint32 INGFNLLCDOL = 733;
-	bool ENNDKMJIMHN = 15;
+	//uint32 INGFNLLCDOL = 733;
+	//bool ENNDKMJIMHN = 15;
 	uint32 cur_score = 1555;
-	bool BKJNDLLNAML = 1818;
+	//bool BKJNDLLNAML = 1818;
 	uint32 first_day_start_time = 978;
-	bool ABMOPKOIMPA = 525;
-	uint32 FGFGECAAKJM = 1703;
-	bool GFEMIEBKKKL = 1117;
-	uint32 CEFIPNKPEKA = 621;
+	//bool ABMOPKOIMPA = 525;
+	//uint32 FGFGECAAKJM = 1703;
+	//bool GFEMIEBKKKL = 1117;
+	//uint32 CEFIPNKPEKA = 621;
 	uint32 end_time = 11;
 	map<uint32, uint32> wish_gift_num_map = 924;
-	repeated uint32 PHCOMIFAIJD = 4;
+	//repeated uint32 PHCOMIFAIJD = 4;
 	repeated ActivityPushTipsData activity_push_tips_data_list = 643;
 	oneof detail {
-		SeaLampActivityDetailInfo sam_lamp_info = 10;
-		CrucibleActivityDetailInfo crucible_info = 7;
-		SalesmanActivityDetailInfo salesman_info = 8;
-		TrialAvatarActivityDetailInfo trial_avatar_info = 6;
-		DeliveryActivityDetailInfo delivery_info = 1846;
-		AsterActivityDetailInfo aster_info = 260;
-		FlightActivityDetailInfo flight_info = 826;
-		DragonSpineActivityDetailInfo dragon_spine_info = 110;
-		EffigyActivityDetailInfo effigy_info = 1010;
-		TreasureMapActivityDetailInfo treasure_map_info = 1754;
-		BlessingActivityDetailInfo blessing_info = 331;
-		SeaLampActivityInfo sea_lamp_info = 1114;
-		ExpeditionActivityDetailInfo expedition_info = 674;
-		ArenaChallengeActivityDetailInfo arena_challenge_info = 39;
-		FleurFairActivityDetailInfo fleur_fair_info = 293;
-		WaterSpiritActivityDetailInfo water_spirit_info = 1997;
-		ChannelerSlabActivityDetailInfo challneler_slab_info = 1757;
-		MistTrialActivityDetailInfo mist_trial_activity_info = 1622;
-		HideAndSeekActivityDetailInfo hide_and_seek_info = 1747;
-		FindHilichurlDetailInfo find_hilichurl_info = 1284;
-		SummerTimeDetailInfo summer_time_info = 950;
-		BuoyantCombatDetailInfo buoyant_combat_info = 519;
-		EchoShellDetailInfo echo_shell_info = 305;
-		BounceConjuringActivityDetailInfo bounce_conjuring_info = 1864;
-		BlitzRushActivityDetailInfo blitz_rush_info = 915;
-		ChessActivityDetailInfo chess_info = 1087;
-		SumoActivityDetailInfo sumo_info = 2008;
-		MoonfinTrialActivityDetailInfo moonfin_trial_info = 389;
-		LunaRiteDetailInfo luna_rite_info = 1971;
-		PlantFlowerActivityDetailInfo plant_flower_info = 1854;
 		MusicGameActivityDetailInfo music_game_info = 1847;
-		RoguelikeDungeonActivityDetailInfo roguelike_dungoen_info = 1025;
-		DigActivityDetailInfo dig_info = 1855;
-		HachiActivityDetailInfo hachi_info = 1176;
-		WinterCampActivityDetailInfo winter_camp_info = 2014;
-		PotionActivityDetailInfo potion_info = 1485;
-		TanukiTravelActivityDetailInfo tanuki_travel_activity_info = 944;
-		LanternRiteActivityDetailInfo lantern_rite_activity_info = 1980;
-		MichiaeMatsuriActivityDetailInfo michiae_matsuri_info = 114;
-		BartenderActivityDetailInfo bartender_info = 1441;
-		UgcActivityDetailInfo ugc_info = 1795;
-		CrystalLinkActivityDetailInfo crystal_link_info = 1301;
-		IrodoriActivityDetailInfo irodori_info = 54;
-		PhotoActivityDetailInfo photo_info = 1492;
-		SpiceActivityDetailInfo spice_info = 446;
-		GachaActivityDetailInfo gacha_info = 1192;
-		LuminanceStoneChallengeActivityDetailInfo luminance_stone_challenge_info = 38;
-		RogueDiaryActivityDetailInfo rogue_diary_info = 427;
-		SummerTimeV2DetailInfo summer_time_v2_info = 910;
-		IslandPartyDetailInfo island_party_info = 1044;
-		GearActivityDetailInfo gear_info = 1263;
-		GravenInnocenceDetailInfo graven_innocence_info = 356;
-		InstableSprayDetailInfo instable_spray_info = 508;
-		MuqadasPotionActivityDetailInfo muqadas_potion_info = 1474;
-		TreasureSeelieActivityDetailInfo treasure_seelie_info = 1251;
-		RockBoardExploreDetailInfo rock_board_explore_info = 1028;
-		VintageActivityDetailInfo vintage_info = 1465;
-		WindFieldDetailInfo wind_field_info = 768;
-		FungusFighterDetailInfo fungus_fighter_info = 834;
-		CharAmusementDetailInfo char_amusement_info = 1222;
-		EffigyChallengeV2DetailInfo effigy_challenge_info = 1275;
-		CoinCollectDetailInfo coin_collect_info = 839;
-		BrickBreakerDetailInfo brick_breaker_info = 551;
-		DuelHeartDetailInfo duel_heart_info = 1670;
-		SeaLampV3DetailInfo sea_lamp_v3_info = 833;
-		TeamChainDetailInfo team_chain_info = 1165;
-		ElectroherculesBattleDetailInfo electrohercules_battle_info = 981;
-		GCGFestivalDetailInfo gcg_festival_info = 1664;
-		FleurFairV2DetailInfo fleur_fair_v2_info = 1982;
-		FungusFighterV2DetailInfo fungus_fighter_v2_info = 1541;
-		AkaFesDetailInfo aka_fes_info = 1524;
-		SandwormCannonDetailInfo sandworm_cannon_detail_info = 626;
-		SorushTrialDetailInfo sorush_trial_info = 1077;
-		JourneyInfo journey_info = 1869;
-		EffigyChallengeV4Info effigy_challenge_v4_info = 1321;
-		GcgPveInfo gcg_pve_info = 1304;
-		UgcV2Info ugc_v2_info = 991;
-		PenumbraAdventureInfo penumbra_adventure_info = 306;
-		AnimalViewInfo animal_view_info = 947;
-		ActivityMultiCharacterInfo activity_multi_character_info = 1213;
-		GcgPveInfiniteInfo gcg_pve_infinite_info = 124;
-		ToyBattleInfo toy_battle_info = 62;
-		PhotoUnderseaInfo photo_undersea_info = 226;
-		FontaineGatherInfo fontaine_gather_info = 1035;
-		GcgPvePuzzleInfo gcg_pve_puzzle_info = 871;
 	}
 }