diff --git a/cmdid.csv b/cmdid.csv index 6dfdb998..02ab84c1 100644 --- a/cmdid.csv +++ b/cmdid.csv @@ -266,13 +266,13 @@ ChannelerSlabLoopDungeonTakeFirstPassRewardReq,8498 ChannelerSlabLoopDungeonTakeFirstPassRewardRsp,8824 ChannelerSlabLoopDungeonTakeScoreRewardReq,8348 ChannelerSlabLoopDungeonTakeScoreRewardRsp,8369 -ChannelerSlabOneOfDungeonInfoNotify,8015 -ChannelerSlabOneOfDungeonInfoReq,8877 -ChannelerSlabOneOfDungeonInfoRsp,8270 +ChannelerSlabOneOffDungeonInfoNotify,8015 +ChannelerSlabOneOffDungeonInfoReq,8877 +ChannelerSlabOneOffDungeonInfoRsp,8270 ChannelerSlabSaveAssistInfoReq,8039 ChannelerSlabSaveAssistInfoRsp,8071 ChannelerSlabStageActiveChallengeIndexNotify,8857 -ChannelerSlabStageOneofDungeonNotify,8692 +ChannelerSlabStageOneoffDungeonNotify,8692 ChannelerSlabTakeoffBuffReq,8299 ChannelerSlabTakeoffBuffRsp,8034 ChannelerSlabWearBuffReq,8664 @@ -1309,7 +1309,7 @@ NpcTalkStateNotify,450 ObstacleModifyNotify,2356 OfferingInteractReq,2920 OfferingInteractRsp,2906 -OneofGatherPointDetectorDataNotify,4293 +OneoffGatherPointDetectorDataNotify,4293 OpActivityDataNotify,5156 OpActivityStateNotify,2579 OpActivityUpdateNotify,5119 diff --git a/proto/AllWidgetDataNotify.proto b/proto/AllWidgetDataNotify.proto index d65f8ff9..9f7a52a7 100644 --- a/proto/AllWidgetDataNotify.proto +++ b/proto/AllWidgetDataNotify.proto @@ -20,7 +20,7 @@ syntax = "proto3"; import "AnchorPointData.proto"; import "ClientCollectorData.proto"; import "LunchBoxData.proto"; -import "OneofGatherPointDetectorData.proto"; +import "OneoffGatherPointDetectorData.proto"; import "SkyCrystalDetectorData.proto"; import "WeatherWizardData.proto"; import "WidgetCoolDownData.proto"; @@ -39,7 +39,7 @@ message AllWidgetDataNotify { uint32 next_anchor_point_usable_time = 5; LunchBoxData lunch_box_data = 1; - repeated OneofGatherPointDetectorData oneof_gather_point_detector_data_list = 14; + repeated OneoffGatherPointDetectorData oneoff_gather_point_detector_data_list = 14; repeated WidgetSlotData slot_list = 6; repeated uint32 background_active_widget_list = 9; repeated WidgetCoolDownData cool_down_group_data_list = 3; diff --git a/proto/ChannelerSlabChallengeStage.proto b/proto/ChannelerSlabChallengeStage.proto index 82f013bb..2b1ea607 100644 --- a/proto/ChannelerSlabChallengeStage.proto +++ b/proto/ChannelerSlabChallengeStage.proto @@ -18,13 +18,13 @@ syntax = "proto3"; import "ChannelerSlabChallenge.proto"; -import "ChannelerSlabOneofDungeon.proto"; +import "ChannelerSlabOneoffDungeon.proto"; option java_package = "emu.grasscutter.net.proto"; message ChannelerSlabChallengeStage { bool is_open = 4; - ChannelerSlabOneofDungeon dungeon_info = 12; + ChannelerSlabOneoffDungeon dungeon_info = 12; uint32 open_time = 13; uint32 stage_id = 1; repeated ChannelerSlabChallenge challenge_list = 2; diff --git a/proto/ChannelerSlabOneOfDungeonInfoNotify.proto b/proto/ChannelerSlabOneOffDungeonInfoNotify.proto similarity index 96% rename from proto/ChannelerSlabOneOfDungeonInfoNotify.proto rename to proto/ChannelerSlabOneOffDungeonInfoNotify.proto index e661746b..2c7861e5 100644 --- a/proto/ChannelerSlabOneOfDungeonInfoNotify.proto +++ b/proto/ChannelerSlabOneOffDungeonInfoNotify.proto @@ -19,7 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -message ChannelerSlabOneOfDungeonInfoNotify { +message ChannelerSlabOneOffDungeonInfoNotify { // enum CmdId { // option allow_alias = true; // NONE = 0; diff --git a/proto/ChannelerSlabOneOfDungeonInfoReq.proto b/proto/ChannelerSlabOneOffDungeonInfoReq.proto similarity index 96% rename from proto/ChannelerSlabOneOfDungeonInfoReq.proto rename to proto/ChannelerSlabOneOffDungeonInfoReq.proto index f7a347d7..1c6aee5b 100644 --- a/proto/ChannelerSlabOneOfDungeonInfoReq.proto +++ b/proto/ChannelerSlabOneOffDungeonInfoReq.proto @@ -19,7 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -message ChannelerSlabOneOfDungeonInfoReq { +message ChannelerSlabOneOffDungeonInfoReq { // enum CmdId { // option allow_alias = true; // NONE = 0; diff --git a/proto/ChannelerSlabOneOfDungeonInfoRsp.proto b/proto/ChannelerSlabOneOffDungeonInfoRsp.proto similarity index 96% rename from proto/ChannelerSlabOneOfDungeonInfoRsp.proto rename to proto/ChannelerSlabOneOffDungeonInfoRsp.proto index 189ffc65..9dc7385c 100644 --- a/proto/ChannelerSlabOneOfDungeonInfoRsp.proto +++ b/proto/ChannelerSlabOneOffDungeonInfoRsp.proto @@ -19,7 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -message ChannelerSlabOneOfDungeonInfoRsp { +message ChannelerSlabOneOffDungeonInfoRsp { // enum CmdId { // option allow_alias = true; // NONE = 0; diff --git a/proto/ChannelerSlabOneofDungeon.proto b/proto/ChannelerSlabOneoffDungeon.proto similarity index 96% rename from proto/ChannelerSlabOneofDungeon.proto rename to proto/ChannelerSlabOneoffDungeon.proto index 5405b978..4793f4ed 100644 --- a/proto/ChannelerSlabOneofDungeon.proto +++ b/proto/ChannelerSlabOneoffDungeon.proto @@ -19,7 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -message ChannelerSlabOneofDungeon { +message ChannelerSlabOneoffDungeon { uint32 dungeon_id = 6; bool is_done = 1; uint32 reward_id = 5; diff --git a/proto/ChannelerSlabStageOneofDungeonNotify.proto b/proto/ChannelerSlabStageOneoffDungeonNotify.proto similarity index 95% rename from proto/ChannelerSlabStageOneofDungeonNotify.proto rename to proto/ChannelerSlabStageOneoffDungeonNotify.proto index 7595e194..9486e275 100644 --- a/proto/ChannelerSlabStageOneofDungeonNotify.proto +++ b/proto/ChannelerSlabStageOneoffDungeonNotify.proto @@ -19,7 +19,7 @@ syntax = "proto3"; option java_package = "emu.grasscutter.net.proto"; -message ChannelerSlabStageOneofDungeonNotify { +message ChannelerSlabStageOneoffDungeonNotify { // enum CmdId { // option allow_alias = true; // NONE = 0; diff --git a/proto/GetPlayerTokenReq.proto b/proto/GetPlayerTokenReq.proto index 2d2a6c03..22bf9abe 100644 --- a/proto/GetPlayerTokenReq.proto +++ b/proto/GetPlayerTokenReq.proto @@ -34,7 +34,7 @@ message GetPlayerTokenReq { uint32 platform_type = 2; bool is_guest = 14; string online_id = 12; - uint32 Unk3300_FDNAJOFMOAK = 6; + uint32 account_type = 6; uint32 channel_id = 8; string client_rand_key = 400; string Unk3300_PHNOHCKIHIA = 3; diff --git a/proto/GetPlayerTokenRsp.proto b/proto/GetPlayerTokenRsp.proto index da1eb185..fb829126 100644 --- a/proto/GetPlayerTokenRsp.proto +++ b/proto/GetPlayerTokenRsp.proto @@ -37,7 +37,7 @@ message GetPlayerTokenRsp { uint32 key_id = 134; string sign = 1666; string secret_key = 15; - uint32 Unk3300_FDNAJOFMOAK = 8; + uint32 account_type = 8; uint32 channel_id = 676; bytes extra_bin_data = 5; uint64 secret_key_seed = 3; diff --git a/proto/GetScenePointRsp.proto b/proto/GetScenePointRsp.proto index 874758ea..388af62d 100644 --- a/proto/GetScenePointRsp.proto +++ b/proto/GetScenePointRsp.proto @@ -28,16 +28,16 @@ message GetScenePointRsp { // ENET_IS_RELIABLE = 1; // } - repeated uint32 Unk3300_NFDMMIOFECO = 9; - repeated uint32 Unk3300_FKANNCGJEFJ = 15; + repeated uint32 unlock_area_list = 9; + repeated uint32 locked_point_list = 15; int32 retcode = 13; - repeated uint32 Unk3300_FGPKDGFLJOF = 3; - repeated uint32 Unk3300_PIGCABAAMMB = 10; - repeated uint32 Unk3300_NAPMOOABHLJ = 1; - repeated uint32 Unk3300_JFBPMPADAPA = 11; - repeated uint32 Unk3300_IJJGKIAMEJA = 6; - repeated uint32 Unk3300_JCGMJCEODCM = 7; + repeated uint32 unhide_point_list = 3; + repeated uint32 hide_point_list = 10; + repeated uint32 group_unlimit_point_list = 1; + repeated uint32 not_interact_dungeon_entry_list = 11; + repeated uint32 to_be_explore_dungeon_entry_list = 6; + repeated uint32 not_explored_dungeon_entry_list = 7; uint32 belong_uid = 12; - repeated uint32 Unk3300_GEDEFAIHKMH = 2; + repeated uint32 unlocked_point_list = 2; uint32 scene_id = 8; } diff --git a/proto/MarkMapReq.proto b/proto/MarkMapReq.proto index 8830e0d7..90e8de02 100644 --- a/proto/MarkMapReq.proto +++ b/proto/MarkMapReq.proto @@ -39,6 +39,6 @@ message MarkMapReq { } Operation op = 3; - MapMarkPoint Unk3300_IEBKBPOBECB = 6; - MapMarkPoint Unk3300_BGFDGKONNBI = 13; + MapMarkPoint old = 6; + MapMarkPoint mark = 13; } diff --git a/proto/OneofGatherPointDetectorData.proto b/proto/OneoffGatherPointDetectorData.proto similarity index 96% rename from proto/OneofGatherPointDetectorData.proto rename to proto/OneoffGatherPointDetectorData.proto index f1e47166..c4aab554 100644 --- a/proto/OneofGatherPointDetectorData.proto +++ b/proto/OneoffGatherPointDetectorData.proto @@ -21,7 +21,7 @@ import "Vector.proto"; option java_package = "emu.grasscutter.net.proto"; -message OneofGatherPointDetectorData { +message OneoffGatherPointDetectorData { uint32 hint_radius = 4; uint32 config_id = 3; bool is_hint_valid = 11; diff --git a/proto/OneofGatherPointDetectorDataNotify.proto b/proto/OneoffGatherPointDetectorDataNotify.proto similarity index 86% rename from proto/OneofGatherPointDetectorDataNotify.proto rename to proto/OneoffGatherPointDetectorDataNotify.proto index 63b0b378..3ada880e 100644 --- a/proto/OneofGatherPointDetectorDataNotify.proto +++ b/proto/OneoffGatherPointDetectorDataNotify.proto @@ -17,11 +17,11 @@ syntax = "proto3"; -import "OneofGatherPointDetectorData.proto"; +import "OneoffGatherPointDetectorData.proto"; option java_package = "emu.grasscutter.net.proto"; -message OneofGatherPointDetectorDataNotify { +message OneoffGatherPointDetectorDataNotify { // enum CmdId { // option allow_alias = true; // NONE = 0; @@ -30,5 +30,5 @@ message OneofGatherPointDetectorDataNotify { // ENET_IS_RELIABLE = 1; // } - repeated OneofGatherPointDetectorData oneof_gather_point_detector_data_list = 2; + repeated OneoffGatherPointDetectorData oneoff_gather_point_detector_data_list = 2; } diff --git a/proto/PlayerLoginReq.proto b/proto/PlayerLoginReq.proto index 066cf494..83188c4b 100644 --- a/proto/PlayerLoginReq.proto +++ b/proto/PlayerLoginReq.proto @@ -36,25 +36,25 @@ message PlayerLoginReq { uint32 target_uid = 10; bytes extra_bin_data = 2046; string platform = 4; - string Unk3300_LNPPCJMBOMN = 1334; + string checksum = 1334; uint32 channel_id = 1565; - string Unk3300_EJBMMPBPDBE = 2040; + string client_verison_hash = 2040; uint32 language_type = 11; uint32 client_data_version = 847; - uint32 Unk3300_FDNAJOFMOAK = 7; + uint32 account_type = 7; string Unk3300_BBAABEHNFOE = 868; string online_id = 577; uint32 Unk3300_PMGFBMJNNCL = 82; - string Unk3300_EAMDLGIILGK = 12; + string device_name = 12; string birthday = 875; uint32 tag = 525; string account_uid = 14; - string Unk3300_NALKBABGLDG = 15; + string device_info = 15; uint32 Unk3300_IADFJHNFKIB = 1458; bool is_editor = 1; string token = 8; uint32 reg_platform = 424; - string Unk3300_CHDCMLIBMPO = 581; + string checksum_client_version = 581; uint32 Unk3300_OOBHAIIIPHH = 85; uint32 Unk3300_NDLANBEIGEG = 1320; string country_code = 104; @@ -64,14 +64,14 @@ message PlayerLoginReq { string Unk3300_BIAKNIALBFJ = 828; string client_version = 2; bool is_guest = 13; - string Unk3300_OBJKBHMKJGM = 6; + string system_version = 6; uint32 target_home_owner_uid = 899; string psn_id = 1146; - bytes Unk3300_ILHAIPDJIMH = 874; + bytes security_cmd_reply = 874; uint32 Unk3300_OFFHPAFIFGD = 1028; uint64 login_rand = 9; AdjustTrackingInfo adjust_tracking_info = 64; - bytes Unk3300_FCDEBMBICIJ = 256; + bytes environment_error_code = 256; uint32 platform_type = 3; - string Unk3300_CFLCCIICKDE = 1983; + string cps = 1983; } diff --git a/proto/QuickUseWidgetRsp.proto b/proto/QuickUseWidgetRsp.proto index 96729369..e5bdeee4 100644 --- a/proto/QuickUseWidgetRsp.proto +++ b/proto/QuickUseWidgetRsp.proto @@ -18,7 +18,7 @@ syntax = "proto3"; import "ClientCollectorData.proto"; -import "OneofGatherPointDetectorData.proto"; +import "OneoffGatherPointDetectorData.proto"; import "SkyCrystalDetectorQuickUseResult.proto"; option java_package = "emu.grasscutter.net.proto"; @@ -35,7 +35,7 @@ message QuickUseWidgetRsp { uint32 material_id = 11; int32 retcode = 12; oneof param { - OneofGatherPointDetectorData detector_data = 14; + OneoffGatherPointDetectorData detector_data = 14; ClientCollectorData client_collector_data = 10; SkyCrystalDetectorQuickUseResult sky_crystal_detector_quick_use_result = 172322; } diff --git a/proto/ScenePointUnlockNotify.proto b/proto/ScenePointUnlockNotify.proto index d0a24863..cfc32344 100644 --- a/proto/ScenePointUnlockNotify.proto +++ b/proto/ScenePointUnlockNotify.proto @@ -28,9 +28,9 @@ message ScenePointUnlockNotify { // ENET_IS_RELIABLE = 1; // } - repeated uint32 Unk3300_PIGCABAAMMB = 10; - repeated uint32 Unk3300_FKANNCGJEFJ = 5; + repeated uint32 hide_point_list = 10; + repeated uint32 locked_point_list = 5; uint32 scene_id = 11; repeated uint32 point_list = 6; - repeated uint32 Unk3300_FGPKDGFLJOF = 1; + repeated uint32 unhide_point_list = 1; }