sync

nameTranslation.txt

@@ -1909,4 +1909,64 @@ MLNPMOILLJI⇨DelMailReq
 OGHIMOFAHII⇨BuyGoodsReq
 ALLGKCIALEP⇨BuyGoodsRsp
 LNEBPLKCKLJ⇨GetGachaInfoReq
-DHONBCHNPJD⇨display_chronicle5_item_list
+DHONBCHNPJD⇨display_chronicle5_item_list
+IBPEMCDPBHM⇨GadgetStateNotify
+BKGNMCPHAOK⇨dungeon_avatar_info_list
+ABMPEDCFHIF⇨DungeonEntryInfoReq
+AJMEBNFDBFP⇨scene_point_id_list
+IPAMCDBKCOB⇨DungeonEntryInfo
+DKFMGIFDBCK⇨is_passed
+ONJECHEKGEL⇨is_alive
+MOJHEMEKPLH⇨GCGPlayerField
+FOHCOGHIJGD⇨RogueStageInfo
+GHKMDKIHGAN⇨InvestigationMonster
+LEMBJKHNFIP⇨LockState
+OJCPGGMAMHM⇨lock_state
+OOADKBLCCJN⇨GetInvestigationMonsterRsp
+DBBHMECOOAI⇨monster_list
+DIEGMMLFECA⇨is_for_mark
+DHCBHICEMLG⇨GetInvestigationMonsterReq
+KLOJDHAJPFI⇨city_id_list
+OIJLIIANFHK⇨InvestigationMonsterUpdateNotify
+BMEBBFAMNOP⇨investigation_monster
+PJIEDHIAOEH⇨DailyDungeonEntryInfo
+OAAIHDCMHLE⇨dungeon_entry_id
+FHDLJGPFHMB⇨recommend_dungeon_entry_info
+PPONBHNAGGM⇨recommend_dungeon_id
+OABAOIFOJML⇨DungeonEntryInfoRsp
+OKLEJIMAHJC⇨dungeon_entry_list
+NHGDJAAICLF⇨DungeonEntryPointInfo
+EOPAAHNCHAP⇨dungeon_entry_point_list
+DMBNPMFIEBM⇨dungeon_entry_config_id
+GOAIIPKPHMG⇨QuickChallengeDungeonReq
+OJPNNDBCMDP⇨QuickChallengeDungeonRsp
+MIBACBKBNJE⇨dungeon_entry_scene_point_id
+FBMFIAFCPKB⇨is_point_unlocked
+KHMADLJLNEB⇨is_quick_open
+EDDHDLPMJCE⇨GetDailyDungeonEntryInfoRsp
+NEGIIFOGBHL⇨daily_dungeon_info_list
+PMEMIBNLJIF⇨weekly_boss_resin_discount_info
+CLCBKDGLMJP⇨GetBlossomBriefInfoListReq
+DIMJJHANHPG⇨FungusFighterMonsterDetail
+HHIJEEEFODH⇨fungus_id
+KPACGMCGGHM⇨cur_hp_percentage
+NJICICNNAKG⇨RogueAvatarInfo
+EMENECCLLNE⇨is_onstage
+PCINBMGKKDJ⇨map_layer_id
+ILNBNHMLOOA⇨BlossomBriefInfo
+AHAPIDGGAJB⇨is_guide_opened
+CEPMFLMJDEO⇨circle_camp_id
+HLHPGKGLOAN⇨BlossomChestCreateNotify
+ACDGMFFCMHP⇨BlossomScheduleInfo
+EPKBMLAJJIA⇨finish_progress
+BAGJJCINLDD⇨monster_level
+BPJGKLGEOKA⇨GetBlossomBriefInfoListRsp
+KOIFEHOCJLC⇨brief_info_list
+KOEFMCGDFGA⇨GetDailyDungeonEntryInfoReq
+NKDIJIFMLKI⇨left_times
+JNDHLFKEGAL⇨max_boss_chest_num
+KMANALJGHMG⇨InteractDailyDungeonInfoNotify
+MEKAOIMGOON⇨BatchDeleteMapMarkReq
+PMIMCAJMJPM⇨BatchDeleteMapMarkRsp
+OFEIOKCHBFK⇨WorldPlayerDieNotify
+EJFMLLICCCF⇨WorldPlayerReviveReq

proto/AbilityIdentifier.proto

@@ -3,10 +3,10 @@ option java_package = "emu.grasscutter.net.proto";
 
 //obf: PEMAEGMEAAE
 message AbilityIdentifier {
-    uint32 instanced_ability_id = 6;
+	uint32 instanced_ability_id = 6;
-    uint32 instanced_modifier_id = 7;
+	uint32 instanced_modifier_id = 7;
-    bool is_serverbuff_modifier = 8;
+	bool is_serverbuff_modifier = 8;
-    uint32 EGFPJDNPCAJ = 9;
+	uint32 EGFPJDNPCAJ = 9;
-    uint32 OOEBIGKJEBA = 10;
+	uint32 OOEBIGKJEBA = 10;
-    int32 local_id = 13;
+	int32 local_id = 13;
 }

proto/AbilityInvocationsNotify.proto

@@ -6,5 +6,5 @@ import "AbilityInvokeEntry.proto";
 //obf: KGJLCBEKCFD
 // CmdId: 21569
 message AbilityInvocationsNotify {
-    repeated AbilityInvokeEntry invokes = 5;
+	repeated AbilityInvokeEntry invokes = 5;
 }

proto/Achievement.proto

@@ -2,16 +2,16 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
 message Achievement {
-    enum Status {
+	enum Status {
-        STATUS_INVALID = 0;
+		STATUS_INVALID = 0;
-        STATUS_UNFINISHED = 1;
+		STATUS_UNFINISHED = 1;
-        STATUS_FINISHED = 2;
+		STATUS_FINISHED = 2;
-        STATUS_REWARD_TAKEN = 3;
+		STATUS_REWARD_TAKEN = 3;
-    }
+	}
 
-    uint32 id = 1;
+	uint32 id = 1;
-    Status status = 2;
+	Status status = 2;
-    uint32 cur_progress = 6;
+	uint32 cur_progress = 6;
-    uint32 total_progress = 9;
+	uint32 total_progress = 9;
-    uint32 finish_timestamp = 13;
+	uint32 finish_timestamp = 13;
 }

proto/AchievementAllDataNotify.proto

@@ -6,6 +6,6 @@ import "Achievement.proto";
 // 4.6.0
 // CmdId: 1655
 message AchievementAllDataNotify {
-    repeated uint32 reward_taken_goal_id_list = 8;
+	repeated uint32 reward_taken_goal_id_list = 8;
-    repeated Achievement achievement_list = 11;
+	repeated Achievement achievement_list = 11;
 }

proto/AchievementUpdateNotify.proto

@@ -6,5 +6,5 @@ import "Achievement.proto";
 // 4.6.0
 // CmdId: 6011
 message AchievementUpdateNotify {
-    repeated Achievement achievement_list = 14;
+	repeated Achievement achievement_list = 14;
 }

proto/AttackHitEffectResult.proto

@@ -3,10 +3,10 @@ option java_package = "emu.grasscutter.net.proto";
 
 //obf: EHHIGNCAHDN
 message AttackHitEffectResult {
-    uint32 CODNNLGEFAB = 2;
+	uint32 CODNNLGEFAB = 2;
-    float BGGGOCDMEIJ = 7;
+	float BGGGOCDMEIJ = 7;
-    float PFHMCODCDOG = 9;
+	float PFHMCODCDOG = 9;
-    uint32 INHHAFPAGMM = 11;
+	uint32 INHHAFPAGMM = 11;
-    float ILBDIPJINIH = 14;
+	float ILBDIPJINIH = 14;
-    float DPOCKHHOAPH = 15;
+	float DPOCKHHOAPH = 15;
 }

proto/AttackResult.proto

@@ -8,35 +8,35 @@ import "AttackHitEffectResult.proto";
 
 //obf: PBNJFKKLHNG
 message AttackResult {
-    int32 hit_retreat_angle_compat = 2;
+	int32 hit_retreat_angle_compat = 2;
-    HitCollision hit_collision = 3;
+	HitCollision hit_collision = 3;
-    float damage = 4;
+	float damage = 4;
-    Vector resolved_dir = 5;
+	Vector resolved_dir = 5;
-    uint32 element_type = 6;
+	uint32 element_type = 6;
-    AttackHitEffectResult hit_eff_result = 7;
+	AttackHitEffectResult hit_eff_result = 7;
-    uint32 defense_id = 8;
+	uint32 defense_id = 8;
-    uint32 HLDPABLDFMA = 9;
+	uint32 HLDPABLDFMA = 9;
-    AbilityIdentifier ability_identifier = 11;
+	AbilityIdentifier ability_identifier = 11;
-    uint32 attacker_id = 12;
+	uint32 attacker_id = 12;
-    uint32 PBAOKLLNEKH = 13;
+	uint32 PBAOKLLNEKH = 13;
-    string anim_event_id = 14;
+	string anim_event_id = 14;
-    bool DOOAHLOJHFI = 15;
+	bool DOOAHLOJHFI = 15;
-    bool MMGHNAGCMKI = 101;
+	bool MMGHNAGCMKI = 101;
-    uint32 ANCLENEDEFP = 368;
+	uint32 ANCLENEDEFP = 368;
-    float KIBCOOHDGGC = 395;
+	float KIBCOOHDGGC = 395;
-    float KOHHKJHBPGC = 434;
+	float KOHHKJHBPGC = 434;
-    bool OLBMHKAKCAO = 686;
+	bool OLBMHKAKCAO = 686;
-    uint32 GKEECIACCJL = 792;
+	uint32 GKEECIACCJL = 792;
-    float JAMLOHCLJGO = 844;
+	float JAMLOHCLJGO = 844;
-    uint32 IKBJOJCMIDD = 966;
+	uint32 IKBJOJCMIDD = 966;
-    uint32 JHGMKBBHGKK = 1152;
+	uint32 JHGMKBBHGKK = 1152;
-    float IBDIPOKNGND = 1178;
+	float IBDIPOKNGND = 1178;
-    uint32 ADAPJNAPCFM = 1195;
+	uint32 ADAPJNAPCFM = 1195;
-    uint32 HEGHHBKOGPM = 1400;
+	uint32 HEGHHBKOGPM = 1400;
-    uint32 GONCKDKHCCD = 1579;
+	uint32 GONCKDKHCCD = 1579;
-    uint32 IPHOJADNMPG = 1582;
+	uint32 IPHOJADNMPG = 1582;
-    bool ECOJPMMOFGO = 1638;
+	bool ECOJPMMOFGO = 1638;
-    uint32 LINKMJIJDAI = 1649;
+	uint32 LINKMJIJDAI = 1649;
-    uint32 GBFOLNPHPFC = 1744;
+	uint32 GBFOLNPHPFC = 1744;
-    uint32 PMCGHDEGGGO = 2023;
+	uint32 PMCGHDEGGGO = 2023;
 }

proto/AvatarAddNotify.proto

@@ -4,6 +4,6 @@ option java_package = "emu.grasscutter.net.proto";
 import "AvatarInfo.proto";
 
 message AvatarAddNotify {
-    bool is_in_team = 2;
+	bool is_in_team = 2;
-    AvatarInfo avatar = 12;
+	AvatarInfo avatar = 12;
 }

proto/AvatarFetterDataNotify.proto

@@ -1,24 +1,10 @@
-// https://github.com/SlushinPS/beach-simulator
-// Copyright (C) 2023 Slushy Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
+
 import "AvatarFetterInfo.proto";
-// CmdId: 29004
+
-// Obf: JKPPLBNFEGM
+// 4.6.0
+// CmdId: 28961
 message AvatarFetterDataNotify {
-	map<uint64, AvatarFetterInfo> fetter_info_map = 8;
+	map<uint64, AvatarFetterInfo> fetter_info_map = 10;
-}
+}

proto/AvatarFetterLevelRewardReq.proto

@@ -1,24 +1,9 @@
-// https://github.com/SlushinPS/beach-simulator
-// Copyright (C) 2023 Slushy Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 28996
+
-// Obf: NAEEPLALPHF
+// 4.6.0
+// CmdId: 4220
 message AvatarFetterLevelRewardReq {
-	uint64 avatar_guid = 14;
 	uint32 fetter_level = 9;
-}
+	uint64 avatar_guid = 14;
+}

proto/AvatarFetterLevelRewardRsp.proto

@@ -1,26 +1,11 @@
-// https://github.com/SlushinPS/beach-simulator
-// Copyright (C) 2023 Slushy Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 3975
+
-// Obf: MEJJHABMCID
+// 4.6.0
+// CmdId: 27738
 message AvatarFetterLevelRewardRsp {
-	uint32 fetter_level = 12;
+	uint32 fetter_level = 6;
 	uint32 reward_id = 7;
-	int32 retcode = 5;
+	int32 retcode = 10;
-	uint64 avatar_guid = 11;
+	uint64 avatar_guid = 14;
-}
+}

proto/AvatarFightPropNotify.proto

@@ -4,6 +4,6 @@ option java_package = "emu.grasscutter.net.proto";
 //obf: MPDFJECBFKM
 // CmdId: 9531
 message AvatarFightPropNotify {
-    uint64 avatar_guid = 5;
+	uint64 avatar_guid = 5;
-    map<uint32, float> fight_prop_map = 10;
+	map<uint32, float> fight_prop_map = 10;
 }

proto/AvatarFightPropUpdateNotify.proto

@@ -4,6 +4,6 @@ option java_package = "emu.grasscutter.net.proto";
 //obf: JHPCPJAFGMI
 // CmdId: 21817
 message AvatarFightPropUpdateNotify {
-    uint64 avatar_guid = 3;
+	uint64 avatar_guid = 3;
-    map<uint32, float> fight_prop_map = 5;
+	map<uint32, float> fight_prop_map = 5;
 }

proto/AvatarPromoteGetRewardReq.proto

@@ -0,0 +1,9 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+
+// 4.6.0
+// CmdId: 287
+message AvatarPromoteGetRewardReq {
+	uint32 promote_level = 4;
+	uint64 avatar_guid = 13;
+}

proto/AvatarPromoteGetRewardRsp.proto

@@ -0,0 +1,11 @@
+syntax = "proto3";
+option java_package = "emu.grasscutter.net.proto";
+
+// 4.6.0
+// CmdId: 229
+message AvatarPromoteGetRewardRsp {
+	uint32 reward_id = 7;
+	uint64 avatar_guid = 9;
+	int32 retcode = 10;
+	uint32 promote_level = 13;
+}

proto/AvatarSkillChangeNotify.proto

@@ -1,28 +1,13 @@
-// https://github.com/SlushinPS/beach-simulator
-// Copyright (C) 2023 Slushy Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 20893
+
-// Obf: KHLDKNNHLFE
+// 4.6.0
+// CmdId: 854
 message AvatarSkillChangeNotify {
-	uint32 skill_depot_id = 2;
+	uint32 skill_depot_id = 1;
-	uint32 entity_id = 6;
+	uint32 old_level = 2;
-	uint64 avatar_guid = 5;
+	uint32 avatar_skill_id = 5;
-	uint32 cur_level = 7;
+	uint32 cur_level = 6;
-	uint32 avatar_skill_id = 10;
+	uint32 entity_id = 10;
-	uint32 old_level = 12;
+	uint64 avatar_guid = 11;
-}
+}

proto/AvatarSkillUpgradeReq.proto

@@ -1,25 +1,10 @@
-// https://github.com/SlushinPS/beach-simulator
-// Copyright (C) 2023 Slushy Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 29541
+
-// Obf: JLJFPGIINAB
+// 4.6.0
+// CmdId: 3446
 message AvatarSkillUpgradeReq {
-	uint32 avatar_skill_id = 13;
+	uint64 avatar_guid = 5;
-	uint32 old_level = 9;
+	uint32 old_level = 12;
-	uint64 avatar_guid = 3;
+	uint32 avatar_skill_id = 14;
-}
+}

proto/AvatarSkillUpgradeRsp.proto

@@ -1,27 +1,12 @@
-// https://github.com/SlushinPS/beach-simulator
-// Copyright (C) 2023 Slushy Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 22584
+
-// Obf: JDINKHGKCON
+// 4.6.0
+// CmdId: 119
 message AvatarSkillUpgradeRsp {
-	uint32 cur_level = 2;
+	uint32 old_level = 6;
-	uint32 old_level = 9;
+	uint64 avatar_guid = 8;
-	int32 retcode = 4;
+	int32 retcode = 9;
-	uint32 avatar_skill_id = 1;
+	uint32 cur_level = 10;
-	uint64 avatar_guid = 7;
+	uint32 avatar_skill_id = 15;
-}
+}

proto/AvatarUpgradeRsp.proto

@@ -1,28 +1,12 @@
-// https://github.com/SlushinPS/beach-simulator
-// Copyright (C) 2023 Slushy Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 24216
+
-// Obf: GOMCDJDBLPG
+// 4.6.0
+// CmdId: 6374
+// maybe
 message AvatarUpgradeRsp {
-	uint32 cur_level = 3;
+	int32 retcode = 2;
-	map<uint32, float> cur_fight_prop_map = 2;
+	uint32 old_level = 8;
-	map<uint32, float> old_fight_prop_map = 6;
+	uint64 avatar_guid = 10;
-	int32 retcode = 9;
+	uint32 cur_level = 11;
-	uint32 old_level = 5;
+}
-	uint64 avatar_guid = 14;
-}

proto/BatchDeleteMapMarkReq.proto

@@ -0,0 +1,12 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "MapMarkPoint.proto";
+
+// CmdId: 21841
+// Version: 4.6.0
+// Obfs: MEKAOIMGOON
+message BatchDeleteMapMarkReq {
+	repeated MapMarkPoint mark_list = 13;
+}

proto/BatchDeleteMapMarkRsp.proto

@@ -0,0 +1,13 @@
+syntax = "proto3";
+
+option java_package = "emu.grasscutter.net.proto";
+
+import "MapMarkPoint.proto";
+
+// CmdId: 1360
+// Version: 4.6.0
+// Obfs: PMIMCAJMJPM
+message BatchDeleteMapMarkRsp {
+	int32 retcode = 2;
+	repeated MapMarkPoint mark_list = 6;
+}

proto/BlossomBriefInfo.proto

@@ -1,33 +1,21 @@
-// https://github.com/SlushinPS/beach-simulator
-// Copyright (C) 2023 Slushy Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+
 import "Vector.proto";
-// Obf: LHLCLOAIDOK
+
+// Version: 4.6.0
+// Obfs: ILNBNHMLOOA
 message BlossomBriefInfo {
-	uint32 state = 10;
+	uint32 refresh_id = 1;
-	bool is_guide_opened = 5;
 	uint32 resin = 2;
+	uint32 monster_level = 3;
+	uint32 reward_id = 5;
+	bool is_guide_opened = 7;
+	uint32 scene_id = 8;
+	uint32 city_id = 9;
+	uint32 map_layer_id = 11;
+	Vector pos = 12;
+	uint32 state = 13;
 	uint32 circle_camp_id = 14;
-	uint32 monster_level = 12;
+}
-	uint32 HJMMAOMEHOL = 8;
-	uint32 scene_id = 13;
-	uint32 refresh_id = 11;
-	uint32 reward_id = 7;
-	Vector pos = 15;
-	uint32 city_id = 4;
-}

proto/CalcWeaponUpgradeReturnItemsReq.proto

@@ -1,26 +1,13 @@
-// https://github.com/SlushinPS/beach-simulator
-// Copyright (C) 2023 Slushy Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
+
 import "ItemParam.proto";
-// CmdId: 23232
+
-// Obf: GJIAADPBGKA
+// 4.6.0
+// CmdId: 20664
+// sus
 message CalcWeaponUpgradeReturnItemsReq {
-	repeated ItemParam item_param_list = 15;
+	uint64 target_weapon_guid = 4;
-	uint64 target_weapon_guid = 1;
+	repeated ItemParam item_param_list = 10;
-	repeated uint64 food_weapon_guid_list = 14;
+	repeated uint64 food_weapon_guid_list = 13;
-}
+}

proto/CalcWeaponUpgradeReturnItemsRsp.proto

@@ -1,26 +1,12 @@
-// https://github.com/SlushinPS/beach-simulator
-// Copyright (C) 2023 Slushy Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
+
 import "ItemParam.proto";
-// CmdId: 24299
+
-// Obf: EFEMOPJBOBD
+// 4.6.0
+// CmdId: 20136
 message CalcWeaponUpgradeReturnItemsRsp {
-	repeated ItemParam item_param_list = 10;
+	uint64 target_weapon_guid = 7;
-	uint64 target_weapon_guid = 15;
+	repeated ItemParam item_param_list = 12;
-	int32 retcode = 14;
+	int32 retcode = 13;
-}
+}

proto/ChangeAvatarRsp.proto

@@ -5,6 +5,6 @@ option java_package = "emu.grasscutter.net.proto";
 // CmdId: 26267
 message ChangeAvatarRsp {
 	uint64 cur_guid = 2;
-    int32 retcode = 15; // OK
+	int32 retcode = 15; // OK
 	/* protected @ 0x2C */// uint32 skill_id = 65535;
 }

proto/ChangeEnergyReason.proto

@@ -3,6 +3,6 @@ option java_package = "emu.grasscutter.net.proto";
 
 //obf: DIBAILDCPJF
 enum ChangeEnergyReason {
-    CHANGE_ENERGY_REASON_NONE = 0;
+	CHANGE_ENERGY_REASON_NONE = 0;
-    CHANGE_ENERGY_REASON_SKILL_START = 1;
+	CHANGE_ENERGY_REASON_SKILL_START = 1;
 }

proto/ChangeHpReason.proto

@@ -3,39 +3,39 @@ option java_package = "emu.grasscutter.net.proto";
 
 //obf: MKHKMLCFAAJ
 enum ChangeHpReason {
-    CHANGE_HP_REASON_NONE = 0;
+	CHANGE_HP_REASON_NONE = 0;
-    CHANGE_HP_REASON_SUB_AVATAR = 1;
+	CHANGE_HP_REASON_SUB_AVATAR = 1;
-    CHANGE_HP_REASON_SUB_MONSTER = 2;
+	CHANGE_HP_REASON_SUB_MONSTER = 2;
-    CHANGE_HP_REASON_SUB_GEAR = 3;
+	CHANGE_HP_REASON_SUB_GEAR = 3;
-    CHANGE_HP_REASON_SUB_ENVIR = 4;
+	CHANGE_HP_REASON_SUB_ENVIR = 4;
-    CHANGE_HP_REASON_SUB_FALL = 5;
+	CHANGE_HP_REASON_SUB_FALL = 5;
-    CHANGE_HP_REASON_SUB_DRAWN = 6;
+	CHANGE_HP_REASON_SUB_DRAWN = 6;
-    CHANGE_HP_REASON_SUB_ABYSS = 7;
+	CHANGE_HP_REASON_SUB_ABYSS = 7;
-    CHANGE_HP_REASON_SUB_ABILITY = 8;
+	CHANGE_HP_REASON_SUB_ABILITY = 8;
-    CHANGE_HP_REASON_SUB_SUMMON = 9;
+	CHANGE_HP_REASON_SUB_SUMMON = 9;
-    CHANGE_HP_REASON_SUB_SCRIPT = 10;
+	CHANGE_HP_REASON_SUB_SCRIPT = 10;
-    CHANGE_HP_REASON_SUB_GM = 11;
+	CHANGE_HP_REASON_SUB_GM = 11;
-    CHANGE_HP_REASON_SUB_KILL_SELF = 12;
+	CHANGE_HP_REASON_SUB_KILL_SELF = 12;
-    CHANGE_HP_REASON_SUB_CLIMATE_COLD = 13;
+	CHANGE_HP_REASON_SUB_CLIMATE_COLD = 13;
-    CHANGE_HP_REASON_SUB_STORM_LIGHTNING = 14;
+	CHANGE_HP_REASON_SUB_STORM_LIGHTNING = 14;
-    CHANGE_HP_REASON_SUB_KILL_SERVER_GADGET = 15;
+	CHANGE_HP_REASON_SUB_KILL_SERVER_GADGET = 15;
-    CHANGE_HP_REASON_SUB_REPLACE = 16;
+	CHANGE_HP_REASON_SUB_REPLACE = 16;
-    CHANGE_HP_REASON_SUB_PLAYER_LEAVE = 17;
+	CHANGE_HP_REASON_SUB_PLAYER_LEAVE = 17;
-    CHANGE_HP_REASON_ATTACK_BY_ENERGY = 18;
+	CHANGE_HP_REASON_ATTACK_BY_ENERGY = 18;
-    CHANGE_HP_REASON_ATTACK_BY_RECYCLE = 19;
+	CHANGE_HP_REASON_ATTACK_BY_RECYCLE = 19;
-    CHANGE_HP_REASON_SUB_PLAYER_BACK = 20;
+	CHANGE_HP_REASON_SUB_PLAYER_BACK = 20;
-    CHANGE_HP_REASON_SUB_UGC = 21;
+	CHANGE_HP_REASON_SUB_UGC = 21;
-    CHANGE_HP_REASON_SUB_DIRTY_WATER_EROSION = 22;
+	CHANGE_HP_REASON_SUB_DIRTY_WATER_EROSION = 22;
-    CHANGE_HP_REASON_SUB_DESTROY_SELF = 23;
+	CHANGE_HP_REASON_SUB_DESTROY_SELF = 23;
-    CHANGE_HP_REASON_BY_LUA = 51;
+	CHANGE_HP_REASON_BY_LUA = 51;
-    CHANGE_HP_REASON_ADD_ABILITY = 101;
+	CHANGE_HP_REASON_ADD_ABILITY = 101;
-    CHANGE_HP_REASON_ADD_ITEM = 102;
+	CHANGE_HP_REASON_ADD_ITEM = 102;
-    CHANGE_HP_REASON_ADD_REVIVE = 103;
+	CHANGE_HP_REASON_ADD_REVIVE = 103;
-    CHANGE_HP_REASON_ADD_UPGRADE = 104;
+	CHANGE_HP_REASON_ADD_UPGRADE = 104;
-    CHANGE_HP_REASON_ADD_STATUE = 105;
+	CHANGE_HP_REASON_ADD_STATUE = 105;
-    CHANGE_HP_REASON_ADD_BACKGROUND = 106;
+	CHANGE_HP_REASON_ADD_BACKGROUND = 106;
-    CHANGE_HP_REASON_ADD_GM = 107;
+	CHANGE_HP_REASON_ADD_GM = 107;
-    CHANGE_HP_REASON_ADD_TRIAL_AVATAR_ACTIVITY = 108;
+	CHANGE_HP_REASON_ADD_TRIAL_AVATAR_ACTIVITY = 108;
-    CHANGE_HP_REASON_ADD_ROUGUELIKE_SPRING = 109;
+	CHANGE_HP_REASON_ADD_ROUGUELIKE_SPRING = 109;
-    CHANGE_HP_REASON_ADD_EFFIGY_CHALLENGE_V5 = 110;
+	CHANGE_HP_REASON_ADD_EFFIGY_CHALLENGE_V5 = 110;
 }

proto/ChatInfo.proto

@@ -6,11 +6,11 @@ message ChatInfo {
 	message SystemHint {
 		uint32 type = 11;
 	}
-    enum SystemHintType {
+	enum SystemHintType {
-        SYSTEM_HINT_TYPE_CHAT_NONE = 0;
+		SYSTEM_HINT_TYPE_CHAT_NONE = 0;
-        SYSTEM_HINT_TYPE_CHAT_ENTER_WORLD = 1;
+		SYSTEM_HINT_TYPE_CHAT_ENTER_WORLD = 1;
-        SYSTEM_HINT_TYPE_CHAT_LEAVE_WORLD = 2;
+		SYSTEM_HINT_TYPE_CHAT_LEAVE_WORLD = 2;
-    }
+	}
 	uint32 time = 1;
 	uint32 uid = 3;
 	uint32 to_uid = 6;

proto/ClientAbilitiesInitFinishCombineNotify.proto

@@ -6,5 +6,5 @@ import "EntityAbilityInvokeEntry.proto";
 //obf: KNDIDFOJEJD
 // CmdId: 22401
 message ClientAbilitiesInitFinishCombineNotify {
-    repeated EntityAbilityInvokeEntry entity_invoke_list = 2;
+	repeated EntityAbilityInvokeEntry entity_invoke_list = 2;
 }

proto/ClientAbilityChangeNotify.proto

@@ -6,7 +6,7 @@ import "AbilityInvokeEntry.proto";
 //obf: PHBIGCMGNHM
 // CmdId: 28122
 message ClientAbilityChangeNotify {
-    bool is_init_hash = 6;
+	bool is_init_hash = 6;
-    uint32 entity_id = 8;
+	uint32 entity_id = 8;
-    repeated AbilityInvokeEntry invokes = 9;
+	repeated AbilityInvokeEntry invokes = 9;
 }

proto/ClientAbilityInitFinishNotify.proto

@@ -6,6 +6,6 @@ import "AbilityInvokeEntry.proto";
 //obf: HMICLOFFJGD
 // CmdId: 21190
 message ClientAbilityInitFinishNotify {
-    repeated AbilityInvokeEntry invokes = 3;
+	repeated AbilityInvokeEntry invokes = 3;
-    uint32 entity_id = 14;
+	uint32 entity_id = 14;
 }

proto/ClientLoadingCostumeVerificationNotify.proto

@@ -1,25 +1,12 @@
-// https://github.com/SlushinPS/beach-simulator
-// Copyright (C) 2023 Slushy Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 21932
+
-// Obf: IPHKDOMBFFJ
+// CmdId: 9147
+// Version: 4.6.0
+// Obfs: LOCACCFEBLN
 message ClientLoadingCostumeVerificationNotify {
-	uint32 costume_id = 13;
+	uint64 prefab_hash = 2;
-	uint64 guid = 9;
+	uint32 costume_id = 4;
-	uint64 prefab_hash = 14;
+	uint64 guid = 6;
 }

proto/CodexDataUpdateNotify.proto

@@ -8,7 +8,7 @@ import "CodexType.proto";
 // Version: 4.6.0
 // Obfs: JJIPFMLHHKI
 message CodexDataUpdateNotify {
-  uint32 weapon_max_promote_level = 2;
+	uint32 weapon_max_promote_level = 2;
-  uint32 id = 8;
+	uint32 id = 8;
-  CodexType type = 9;
+	CodexType type = 9;
 }

proto/CrystalLinkLevelInfo.proto

@@ -1,26 +1,14 @@
-// https://github.com/SlushinPS/beach-simulator
-// Copyright (C) 2023 Slushy Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+
 import "CrystalLinkTeamInfo.proto";
-// Obf: NLNFBPGLCBA
+
+// Version: 4.6.0
+// Obfs: DEEAEONHCHO
 message CrystalLinkLevelInfo {
-	uint32 best_score = 5;
+	uint32 level_id = 2;
-	uint32 level_id = 14;
+	uint32 best_score = 3;
-	bool is_open = 11;
+	repeated CrystalLinkTeamInfo team_info_list = 12;
-	repeated CrystalLinkTeamInfo team_info_list = 6;
+	bool is_open = 14;
-}
+}

proto/DailyDungeonEntryInfo.proto

@@ -1,26 +1,17 @@
-// https://github.com/SlushinPS/beach-simulator
-// Copyright (C) 2023 Slushy Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+
 import "DungeonEntryInfo.proto";
-// Obf: FMKJAHHOCBE
+
+// CmdId: 7795
+// Version: 4.6.0
+// Obfs: PJIEDHIAOEH
 message DailyDungeonEntryInfo {
-	DungeonEntryInfo recommend_dungeon_entry_info = 8;
+	DungeonEntryInfo recommend_dungeon_entry_info = 2;
-	uint32 recommend_dungeon_id = 10;
+	uint32 recommend_dungeon_id = 6;
-	uint32 dungeon_entry_id = 2;
+	uint32 dungeon_entry_id = 9;
-	uint32 dungeon_entry_config_id = 15;
+	uint32 dungeon_entry_config_id = 10;
-}
+	bool is_point_unlocked = 13; // FBMFIAFCPKB
+	bool is_quick_open = 14;	 // KHMADLJLNEB
+}

proto/DetailAbilityInfo.proto

@@ -4,10 +4,10 @@ option java_package = "emu.grasscutter.net.proto";
 import "AbilityString.proto";
 
 message DetailAbilityInfo {
-    int32 local_id = 1;
+	int32 local_id = 1;
-    AbilityString parent_ability_name = 2;
+	AbilityString parent_ability_name = 2;
-    uint32 instanced_ability_id = 4;
+	uint32 instanced_ability_id = 4;
-    uint32 instanced_modifier_id = 5;
+	uint32 instanced_modifier_id = 5;
-    uint32 caster_id = 6;
+	uint32 caster_id = 6;
-    int32 modifier_local_id = 7;
+	int32 modifier_local_id = 7;
 }

proto/DoGachaReq.proto

@@ -6,9 +6,9 @@ option java_package = "emu.grasscutter.net.proto";
 // Version: 4.6.0
 // Obfs: ???
 message DoGachaReq {
-  string gachaTag = 1;
+	string gachaTag = 1;
-  uint32 gachaScheduleId = 7;
+	uint32 gachaScheduleId = 7;
-  uint32 gachaTimes = 8;
+	uint32 gachaTimes = 8;
-  uint32 gachaRandom = 10;
+	uint32 gachaRandom = 10;
-  uint32 gachaType = 13;
+	uint32 gachaType = 13;
 }

proto/DoGachaRsp.proto

@@ -8,23 +8,23 @@ import "GachaItem.proto";
 // Version: 4.6.0
 // Obfs: IMDOCDDMJDD
 message DoGachaRsp {
-  uint32 ten_cost_item_id = 1;
+	uint32 ten_cost_item_id = 1;
-  uint32 wish_item_id = 2;
+	uint32 wish_item_id = 2;
-  uint32 wish_max_progress = 3;
+	uint32 wish_max_progress = 3;
-  uint32 new_gacha_random = 4; // sus
+	uint32 new_gacha_random = 4; // sus
-  int32 retcode = 5;
+	int32 retcode = 5;
-  uint32 wish_progress = 6;
+	uint32 wish_progress = 6;
-  uint32 ten_cost_item_num = 7;
+	uint32 ten_cost_item_num = 7;
-  uint32 left_gacha_times = 8;
+	uint32 left_gacha_times = 8;
-  uint32 cost_item_id = 9;
+	uint32 cost_item_id = 9;
-  uint32 cost_item_num = 10;
+	uint32 cost_item_num = 10;
-  uint32 gacha_times_limit = 11;
+	uint32 gacha_times_limit = 11;
-  uint32 gachaType = 12;
+	uint32 gachaType = 12;
-  repeated GachaItem gacha_item_list = 13;
+	repeated GachaItem gacha_item_list = 13;
-  uint32 gachaScheduleId = 14;
+	uint32 gachaScheduleId = 14;
-  uint32 gachaTimes = 15;
+	uint32 gachaTimes = 15;
-  uint32 daily_gacha_times = 156;
+	uint32 daily_gacha_times = 156;
-  bool is_under_general_restrict = 205; // BLIOHILHJOP (205, 1563)
+	bool is_under_general_restrict = 205; // BLIOHILHJOP (205, 1563)
-  uint32 cur_schedule_daily_gacha_times = 1513; // sus
+	uint32 cur_schedule_daily_gacha_times = 1513; // sus
-  bool is_under_minors_restrict = 1563; // AGPAJPJENKG (205, 1563)
+	bool is_under_minors_restrict = 1563; // AGPAJPJENKG (205, 1563)
 }

proto/DungeonEntryInfo.proto

@@ -1,12 +1,16 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+
 import "WeeklyBossResinDiscountInfo.proto";
 
+// Version: 4.6.0
+// Obfs: IPAMCDBKCOB
 message DungeonEntryInfo {
-  WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 5;
+	uint32 next_refresh_time = 4;
-  uint32 ACDENLCGGOG = 8;
+	uint32 dungeon_id = 5;
-  bool is_passed = 12;
+	WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 7;
-  uint32 dungeon_id = 7;
+	uint32 left_times = 8;
-  uint32 IOLIIMALAGH = 10;
+	bool is_passed = 14;
-  uint32 BNOMBDGDKCC = 9;
+	uint32 max_boss_chest_num = 15;
-}
+}

proto/DungeonEntryInfoReq.proto

@@ -1,9 +1,14 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+
 import "Uint32Pair.proto";
 
+// CmdId: 8949
+// Version: 4.6.0
+// Obfs: ABMPEDCFHIF
 message DungeonEntryInfoReq {
-  repeated Uint32Pair scene_point_id_list = 6;
+	repeated Uint32Pair scene_point_id_list = 8;
-  uint32 scene_id = 7;
+	uint32 point_id = 9;
-  uint32 point_id = 4;
+	uint32 scene_id = 14;
-}
+}

proto/DungeonEntryInfoRsp.proto

@@ -1,12 +1,17 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+
 import "DungeonEntryInfo.proto";
 import "DungeonEntryPointInfo.proto";
 
+// CmdId: 21310
+// Version: 4.6.0
+// Obfs: OABAOIFOJML
 message DungeonEntryInfoRsp {
-  repeated DungeonEntryInfo dungeon_entry_list = 11;
+	uint32 recommend_dungeon_id = 2;
-  repeated DungeonEntryPointInfo dungeon_entry_point_list = 8;
+	repeated DungeonEntryInfo dungeon_entry_list = 6;
-  int32 retcode = 6;
+	int32 retcode = 8;
-  uint32 point_id = 1;
+	uint32 point_id = 9;
-  uint32 recommend_dungeon_id = 4;
+	repeated DungeonEntryPointInfo dungeon_entry_point_list = 11;
-}
+}

proto/DungeonEntryPointInfo.proto

@@ -1,10 +1,14 @@
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+
 import "DungeonEntryInfo.proto";
 
+// Version: 4.6.0
+// Obfs: NHGDJAAICLF
 message DungeonEntryPointInfo {
-  repeated DungeonEntryInfo dungeon_entry_list = 3;
+	uint32 scene_id = 7;
-  uint32 point_id = 13;
+	repeated DungeonEntryInfo dungeon_entry_list = 8;
-  uint32 scene_id = 15;
+	uint32 recommend_dungeon_id = 9;
-  uint32 recommend_dungeon_id = 2;
+	uint32 point_id = 13;
-}
+}

proto/EnterTransPointRegionNotify.proto

@@ -3,6 +3,6 @@ option java_package = "emu.grasscutter.net.proto";
 
 // CmdId: 7189
 message EnterTransPointRegionNotify {
-    uint32 point_id = 11;
+	uint32 point_id = 11;
-    uint32 scene_id = 15;
+	uint32 scene_id = 15;
 }

proto/EntityAbilityInvokeEntry.proto

@@ -5,6 +5,6 @@ import "AbilityInvokeEntry.proto";
 
 //obf: PONAMDDLEBN
 message EntityAbilityInvokeEntry {
-    repeated AbilityInvokeEntry invokes = 10;
+	repeated AbilityInvokeEntry invokes = 10;
-    uint32 entity_id = 13;
+	uint32 entity_id = 13;
 }

proto/EntityFightPropChangeReasonNotify.proto

@@ -10,14 +10,14 @@ import "MGHDLMIEMLI.proto";
 //obf: KNIDFELLKBI
 // CmdId: 9207
 message EntityFightPropChangeReasonNotify {
-    uint32 entity_id = 1;
+	uint32 entity_id = 1;
-    ChangeHpReason changeHpReason = 2;
+	ChangeHpReason changeHpReason = 2;
-    repeated uint32 param_list = 6;
+	repeated uint32 param_list = 6;
-    ChangeHpDebts change_hp_debts = 7;
+	ChangeHpDebts change_hp_debts = 7;
-    MGHDLMIEMLI detail_info = 8;
+	MGHDLMIEMLI detail_info = 8;
-    uint32 prop_type = 9;
+	uint32 prop_type = 9;
-    PropChangeReason reason = 10;
+	PropChangeReason reason = 10;
-    float prop_delta = 13;
+	float prop_delta = 13;
-    ChangeEnergyReason changeEnergyReason = 14;
+	ChangeEnergyReason changeEnergyReason = 14;
-    float IFDGFBBCMBB = 15;
+	float IFDGFBBCMBB = 15;
 }

proto/EntityFightPropUpdateNotify.proto

@@ -4,6 +4,6 @@ option java_package = "emu.grasscutter.net.proto";
 //obf: PDMMIGKPKBI
 // CmdId: 8257
 message EntityFightPropUpdateNotify {
-    map<uint32, float> fight_prop_map = 7;
+	map<uint32, float> fight_prop_map = 7;
-    uint32 entity_id = 8;
+	uint32 entity_id = 8;
 }

proto/EntityTagChangeNotify.proto

@@ -6,7 +6,7 @@ option java_package = "emu.grasscutter.net.proto";
 // Version: 4.6.0
 // Obfs: DJPKAAHDPMG
 message EntityTagChangeNotify {
-  uint32 entity_id = 8;
+	uint32 entity_id = 8;
-  bool is_add = 10;
+	bool is_add = 10;
-  string tag = 12;
+	string tag = 12;
 }

proto/EquipParam.proto

@@ -2,8 +2,8 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
 message EquipParam {
-    uint32 item_id = 1;
+	uint32 item_id = 1;
-    uint32 item_num = 2;
+	uint32 item_num = 2;
-    uint32 item_level = 3;
+	uint32 item_level = 3;
-    uint32 promote_level = 4;
+	uint32 promote_level = 4;
 }

proto/EvtBeingHitInfo.proto

@@ -5,7 +5,7 @@ import "AttackResult.proto";
 
 //obf: PJOFJKPOAOF
 message EvtBeingHitInfo {
-    uint32 peer_id = 9;
+	uint32 peer_id = 9;
-    uint32 frame_num = 12;
+	uint32 frame_num = 12;
-    AttackResult attack_result = 13;
+	AttackResult attack_result = 13;
 }

proto/EvtCreateGadgetNotify.proto

@@ -10,27 +10,27 @@ import "AbilityString.proto";
 // Version: 4.6.0
 // Obfs: ???
 message EvtCreateGadgetNotify {
-  uint32 config_id = 1;
+	uint32 config_id = 1;
-  uint32 HOFCLFELEMK = 2;
+	uint32 HOFCLFELEMK = 2;
-  bool is_async_load = 3; // LGOLECDFPNK sus
+	bool is_async_load = 3; // LGOLECDFPNK sus
-  uint32 entity_id = 4;
+	uint32 entity_id = 4;
-  bool BANJELHCLDK = 5;
+	bool BANJELHCLDK = 5;
-  uint32 room_id = 6;
+	uint32 room_id = 6;
-  uint32 camp_type = 7;
+	uint32 camp_type = 7;
-  Vector InitEulerAngles = 8;
+	Vector InitEulerAngles = 8;
-  uint64 guid = 9;
+	uint64 guid = 9;
-  uint32 camp_id = 10;
+	uint32 camp_id = 10;
-  uint32 target_entity_id = 11;
+	uint32 target_entity_id = 11;
-  ForwardType forward_type = 12;
+	ForwardType forward_type = 12;
-  Vector InitPos = 13;
+	Vector InitPos = 13;
-  uint32 owner_entity_id = 14;
+	uint32 owner_entity_id = 14;
-  uint32 prop_owner_entity_id = 15;
+	uint32 prop_owner_entity_id = 15;
-  AbilityString ability_name = 440;
+	AbilityString ability_name = 440;
-  uint32 KDPGILHNFNM = 554;
+	uint32 KDPGILHNFNM = 554;
-  repeated uint32 target_lock_point_index_list = 588;
+	repeated uint32 target_lock_point_index_list = 588;
-  repeated uint32 target_entity_id_list = 1298;
+	repeated uint32 target_entity_id_list = 1298;
-  int32 local_id = 1381;
+	int32 local_id = 1381;
-  bool PDGGCPDDAOL = 1542;
+	bool PDGGCPDDAOL = 1542;
-  uint32 init_pose_id = 1860;
+	uint32 init_pose_id = 1860;
-  bool is_peer_id_from_player = 1956;
+	bool is_peer_id_from_player = 1956;
 }

proto/EvtDestroyGadgetNotify.proto

@@ -8,6 +8,6 @@ import "ForwardType.proto";
 // Version: 4.6.0
 // Obfs: ???
 message EvtDestroyGadgetNotify {
-  uint32 entity_id = 2;
+	uint32 entity_id = 2;
-  ForwardType forward_type = 3;
+	ForwardType forward_type = 3;
 }

proto/EvtDoSkillSuccNotify.proto

@@ -7,8 +7,8 @@ import "Vector.proto";
 //obf: BLPANCPNDIN
 // CmdId: 6290
 message EvtDoSkillSuccNotify {
-    uint32 skill_id = 2;
+	uint32 skill_id = 2;
-    uint32 caster_id = 3;
+	uint32 caster_id = 3;
-    ForwardType forward_type = 8;
+	ForwardType forward_type = 8;
-    Vector forward = 13;
+	Vector forward = 13;
 }

proto/EvtEntityRenderersChangedNotify.proto

@@ -6,8 +6,8 @@ import "ForwardType.proto";
 
 // CmdId: 5936
 message EvtEntityRenderersChangedNotify {
-    bool is_server_cache = 2;
+	bool is_server_cache = 2;
-    uint32 entity_id = 5;
+	uint32 entity_id = 5;
-    EntityRendererChangedInfo renderer_changed_info = 6;
+	EntityRendererChangedInfo renderer_changed_info = 6;
-    ForwardType forward_type = 7;
+	ForwardType forward_type = 7;
 }

proto/ExitTransPointRegionNotify.proto

@@ -3,6 +3,6 @@ option java_package = "emu.grasscutter.net.proto";
 
 // CmdId: 6413
 message ExitTransPointRegionNotify {
-    uint32 point_id = 2;
+	uint32 point_id = 2;
-    uint32 scene_id = 9;
+	uint32 scene_id = 9;
 }

proto/GachaInfo.proto

@@ -9,31 +9,31 @@ import "GachaUpInfo.proto";
 // RN fill order frm 3.2.0
 // 3 is wish_item_id wish_max_progress wish_progress
 message GachaInfo {
-	uint32 left_gacha_times = 1;                         // found 2 HNFPBJIEGHD (uint32 limit)
+	uint32 left_gacha_times = 1; // found 2 HNFPBJIEGHD (uint32 limit)
-	uint32 ten_cost_item_id = 2;                         // found 2 BCDOOPICEMD (2, 11)
+	uint32 ten_cost_item_id = 2; // found 2 BCDOOPICEMD (2, 11)
-	uint32 end_time = 3;                                 // OK
+	uint32 end_time = 3;  // OK
-	string gacha_preview_prefab_path = 4;                // single LCNMHLJCLIK OK
+	string gacha_preview_prefab_path = 4;// single LCNMHLJCLIK OK
-	string gacha_record_url = 5;                         // single HIOKPEGNPLK (5, 1354)
+	string gacha_record_url = 5; // single HIOKPEGNPLK (5, 1354)
-	uint32 ten_cost_item_num = 6;                        // found 2 EMKBGHENNEL OK
+	uint32 ten_cost_item_num = 6;// found 2 EMKBGHENNEL OK
-	uint32 gachaType = 7;                                // OK
+	uint32 gachaType = 7;  	// OK
-	uint32 gacha_times_limit = 8;                        // found 2 NABJFPLLGGM (uint32 limit)
+	uint32 gacha_times_limit = 8;// found 2 NABJFPLLGGM (uint32 limit)
-	uint32 schedule_id = 9;                              // OK
+	uint32 schedule_id = 9;    // OK
-	string gacha_prob_url = 10;                          // single FCPIKKHIDDO (10, 448)
+	string gacha_prob_url = 10;  // single FCPIKKHIDDO (10, 448)
-	uint32 cost_item_id = 11;                            // found 2 KINBJAPMIJD (2, 11)
+	uint32 cost_item_id = 11;  // found 2 KINBJAPMIJD (2, 11)
-	uint32 gacha_sort_id = 12;                           // single EKKEPHGDAKB OK
+	uint32 gacha_sort_id = 12;   // single EKKEPHGDAKB OK
-	uint32 cost_item_num = 13;                           // found 2 POEJPPCFPNG OK
+	uint32 cost_item_num = 13;   // found 2 POEJPPCFPNG OK
-	string gacha_prefab_path = 14;                       // single ICOEPLJMDCK OK
+	string gacha_prefab_path = 14;   // single ICOEPLJMDCK OK
-	uint32 begin_time = 15;                              // OK
+	uint32 begin_time = 15;    // OK
-	bool is_new_wish = 298;                              // JLNOHJBDNJN OK
+	bool is_new_wish = 298;   // JLNOHJBDNJN OK
-	string gacha_prob_url_oversea = 448;                 // single ELOGPDHLPAI (10, 448)
+	string gacha_prob_url_oversea = 448; // single ELOGPDHLPAI (10, 448)
-	repeated GachaUpInfo gacha_up_info_list = 535;       // OK
+	repeated GachaUpInfo gacha_up_info_list = 535;  // OK
-	string title_textmap = 667;                          // single JPBNAMGLKEC OK
+	string title_textmap = 667;  // single JPBNAMGLKEC OK
-	repeated uint32 display_up4_item_list = 707;         // single KIEKPNDHGGJ OK
+	repeated uint32 display_up4_item_list = 707; // single KIEKPNDHGGJ OK
-	uint32 wish_item_id = 794;                           // found 3 NFGOJJOMFCA OK
+	uint32 wish_item_id = 794;   // found 3 NFGOJJOMFCA OK
-	uint32 cur_schedule_daily_gacha_times = 1233;        // found 2 MJCGMHMPKOE sus
+	uint32 cur_schedule_daily_gacha_times = 1233;// found 2 MJCGMHMPKOE sus
-	string gacha_record_url_oversea = 1354;              // single GGCMMKLOJMN (5, 1354)
+	string gacha_record_url_oversea = 1354;	 // single GGCMMKLOJMN (5, 1354)
-	repeated uint32 display_up5_item_list = 1621;        // single OAJAMCHOPFJ (1621, 1921)
+	repeated uint32 display_up5_item_list = 1621;// single OAJAMCHOPFJ (1621, 1921)
-	uint32 wish_max_progress = 1757;                     // found 3 BHBCHFFGHHE OK
+	uint32 wish_max_progress = 1757; // found 3 BHBCHFFGHHE OK
-	uint32 wish_progress = 1799;                         // found 3 EOFACNPOJBN OK
+	uint32 wish_progress = 1799; // found 3 EOFACNPOJBN OK
 	repeated uint32 display_chronicle5_item_list = 1921; // single DHONBCHNPJD (1621, 1921)
 }

proto/GachaItem.proto

@@ -8,9 +8,9 @@ import "GachaTransferItem.proto";
 // Version: 4.6.0
 // Obfs: EDJOEJJIOMG
 message GachaItem {
-  ItemParam gacha_item = 4;
+	ItemParam gacha_item = 4;
-  repeated ItemParam token_item_list = 9;
+	repeated ItemParam token_item_list = 9;
-  bool is_gacha_item_new = 11; // CKAPCKPPAIG
+	bool is_gacha_item_new = 11; // CKAPCKPPAIG
-  repeated GachaTransferItem transfer_items = 12;
+	repeated GachaTransferItem transfer_items = 12;
-  bool is_flash_card = 14;     // AAECBIKHMFM
+	bool is_flash_card = 14;	 // AAECBIKHMFM
 }

proto/GachaTransferItem.proto

@@ -7,6 +7,6 @@ import "ItemParam.proto";
 // Version: 4.6.0
 // Obfs: AFCOODFGGDL
 message GachaTransferItem {
-  ItemParam item = 2;
+	ItemParam item = 2;
-  bool is_transfer_item_new = 3;
+	bool is_transfer_item_new = 3;
 }

proto/GachaUpInfo.proto

@@ -5,6 +5,6 @@ option java_package = "emu.grasscutter.net.proto";
 // Version: 4.6.0
 // Obfs: ???
 message GachaUpInfo {
-  uint32 item_parent_type = 1;
+	uint32 item_parent_type = 1;
-  repeated uint32 item_id_list = 9;
+	repeated uint32 item_id_list = 9;
 }

proto/GadgetAutoPickDropInfoNotify.proto

@@ -1,24 +1,12 @@
-// https://github.com/SlushinPS/beach-simulator
-// Copyright (C) 2023 Slushy Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+
 import "Item.proto";
-// CmdId: 3579
+
-// Obf: PEILLEHHFBL
+// CmdId: 21348
+// Version: 4.6.0
+// Obfs: HAAAAPJJBGF
 message GadgetAutoPickDropInfoNotify {
-	repeated Item item_list = 1;
+	repeated Item item_list = 12;
-}
+}

proto/GadgetStateNotify.proto

@@ -1,25 +1,12 @@
-// https://github.com/SlushinPS/beach-simulator
-// Copyright (C) 2023 Slushy Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 2075
+
-// Obf: DAHKNOFELFH
+// CmdId: 5911
+// Version: 4.6.0
+// Obfs: IBPEMCDPBHM
 message GadgetStateNotify {
-	bool is_enable_interact = 12;
+	uint32 gadget_entity_id = 5;
-	uint32 gadget_entity_id = 3;
+	uint32 gadget_state = 8;
-	uint32 gadget_state = 1;
+	bool is_enable_interact = 15;
-}
+}

proto/GetAllMailNotify.proto

@@ -6,5 +6,5 @@ option java_package = "emu.grasscutter.net.proto";
 // Version: 4.6.0
 // Obfs: PANJGIHEJFO
 message GetAllMailNotify {
-  bool is_collected = 4;
+	bool is_collected = 4;
 }

proto/GetAllMailResultNotify.proto

@@ -8,10 +8,10 @@ import "MailData.proto";
 // Version: 4.6.0
 // Obfs: MPLFKHHMJKP
 message GetAllMailResultNotify {
-  int32 retcode = 1;
+	int32 retcode = 1;
-  repeated MailData mail_list = 3;
+	repeated MailData mail_list = 3;
-  string transaction = 7;
+	string transaction = 7;
-  uint32 packet_num = 9;
+	uint32 packet_num = 9;
-  bool is_collected = 12;
+	bool is_collected = 12;
-  uint32 packet_be_sent_num = 15;
+	uint32 packet_be_sent_num = 15;
 }

proto/GetAuthkeyReq.proto

@@ -6,7 +6,7 @@ option java_package = "emu.grasscutter.net.proto";
 // Version: 4.6.0
 // Obfs: HJKMHGJBGON
 message GetAuthkeyReq {
-  string auth_appid = 4;
+	string auth_appid = 4;
-  uint32 sign_type = 5;
+	uint32 sign_type = 5;
-  uint32 authkey_ver = 14;
+	uint32 authkey_ver = 14;
 }

proto/GetAuthkeyRsp.proto

@@ -6,10 +6,10 @@ option java_package = "emu.grasscutter.net.proto";
 // Version: 4.6.0
 // Obfs: PBKMLPJKLEM
 message GetAuthkeyRsp {
-  string game_biz = 1;
+	string game_biz = 1;
-  string authkey = 2;
+	string authkey = 2;
-  int32 retcode = 6;
+	int32 retcode = 6;
-  uint32 sign_type = 11;
+	uint32 sign_type = 11;
-  uint32 authkey_ver = 12;
+	uint32 authkey_ver = 12;
-  string auth_appid = 14;
+	string auth_appid = 14;
 }

proto/GetBlossomBriefInfoListReq.proto

@@ -1,23 +1,10 @@
-// https://github.com/SlushinPS/beach-simulator
-// Copyright (C) 2023 Slushy Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 29592
+
-// Obf: PIHIGCAKDMM
+// CmdId: 20706
+// Version: 4.6.0
+// Obfs: CLCBKDGLMJP
 message GetBlossomBriefInfoListReq {
-	repeated uint32 city_id_list = 11;
+	repeated uint32 city_id_list = 12;
-}
+}

proto/GetBlossomBriefInfoListRsp.proto

@@ -1,25 +1,13 @@
-// https://github.com/SlushinPS/beach-simulator
-// Copyright (C) 2023 Slushy Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+
 import "BlossomBriefInfo.proto";
-// CmdId: 8452
+
-// Obf: DODBCPCGPMA
+// CmdId: 23247
+// Version: 4.6.0
+// Obfs: BPJGKLGEOKA
 message GetBlossomBriefInfoListRsp {
-	repeated BlossomBriefInfo brief_info_list = 11;
+	repeated BlossomBriefInfo brief_info_list = 4;
-	int32 retcode = 2;
+	int32 retcode = 6;
 }

proto/GetDailyDungeonEntryInfoReq.proto

@@ -1,23 +1,10 @@
-// https://github.com/SlushinPS/beach-simulator
-// Copyright (C) 2023 Slushy Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 6924
+
-// Obf: MBPLOJNEPHM
+// CmdId: 25932
+// Version: 4.6.0
+// Obfs: KOEFMCGDFGA
 message GetDailyDungeonEntryInfoReq {
-	uint32 scene_id = 5;
+	uint32 scene_id = 7;
-}
+}

proto/GetDailyDungeonEntryInfoRsp.proto

@@ -1,25 +1,13 @@
-// https://github.com/SlushinPS/beach-simulator
-// Copyright (C) 2023 Slushy Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+
 import "DailyDungeonEntryInfo.proto";
-// CmdId: 674
+
-// Obf: OENGIKKHMHC
+// CmdId: 7795
+// Version: 4.6.0
+// Obfs: EDDHDLPMJCE
 message GetDailyDungeonEntryInfoRsp {
-	int32 retcode = 14;
+	repeated DailyDungeonEntryInfo daily_dungeon_info_list = 3;
-	repeated DailyDungeonEntryInfo daily_dungeon_info_list = 7;
+	int32 retcode = 12;
-}
+}

proto/GetGachaInfoRsp.proto

@@ -8,10 +8,10 @@ import "GachaInfo.proto";
 // Version: 4.6.0
 // Obfs: 
 message GetGachaInfoRsp {
-  uint32 daily_gacha_times = 2; //IMPJPKBKFLB
+	uint32 daily_gacha_times = 2; //IMPJPKBKFLB
-  int32 retcode = 3;
+	int32 retcode = 3;
-  repeated GachaInfo gacha_info_list = 5;
+	repeated GachaInfo gacha_info_list = 5;
-  bool is_under_general_restrict = 9; // BLIOHILHJOP 5050
+	bool is_under_general_restrict = 9; // BLIOHILHJOP 5050
-  uint32 gachaRandom = 11;
+	uint32 gachaRandom = 11;
-  bool is_under_minors_restrict = 13; // AGPAJPJENKG 5050
+	bool is_under_minors_restrict = 13; // AGPAJPJENKG 5050
 }

proto/GetInvestigationMonsterReq.proto

@@ -1,24 +1,11 @@
-// https://github.com/SlushinPS/beach-simulator
-// Copyright (C) 2023 Slushy Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
-// CmdId: 23800
+
-// Obf: DEMDDKHMDFD
+// CmdId: 25947
+// Version: 4.6.0
+// Obfs: DHCBHICEMLG
 message GetInvestigationMonsterReq {
-	bool is_for_mark = 12;
+	bool is_for_mark = 11;
-	repeated uint32 city_id_list = 6;
+	repeated uint32 city_id_list = 12;
-}
+}

proto/GetInvestigationMonsterRsp.proto

@@ -1,26 +1,14 @@
-// https://github.com/SlushinPS/beach-simulator
-// Copyright (C) 2023 Slushy Team
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 syntax = "proto3";
+
 option java_package = "emu.grasscutter.net.proto";
+
 import "InvestigationMonster.proto";
-// CmdId: 23497
+
-// Obf: PBLBHKIGDKG
+// CmdId: 27061
+// Version: 4.6.0
+// Obfs: OOADKBLCCJN
 message GetInvestigationMonsterRsp {
-	repeated InvestigationMonster monster_list = 9;
-	bool is_for_mark = 1;
 	int32 retcode = 11;
-}
+	repeated InvestigationMonster monster_list = 13;
+	bool is_for_mark = 15;
+}

proto/GetMailItemReq.proto

@@ -6,5 +6,5 @@ option java_package = "emu.grasscutter.net.proto";
 // Version: 4.6.0
 // Obfs: OFALDGJHMKE
 message GetMailItemReq {
-  repeated uint32 mail_id_list = 8;
+	repeated uint32 mail_id_list = 8;
 }

proto/GetMailItemRsp.proto

@@ -8,7 +8,7 @@ import "EquipParam.proto";
 // Version: 4.6.0
 // Obfs: IMOHHNPKKDF
 message GetMailItemRsp {
-  int32 retcode = 3;
+	int32 retcode = 3;
-  repeated uint32 mail_id_list = 6;
+	repeated uint32 mail_id_list = 6;
-  repeated EquipParam item_list = 14;
+	repeated EquipParam item_list = 14;
 }

proto/GetScenePointReq.proto

@@ -4,7 +4,7 @@ option java_package = "emu.grasscutter.net.proto";
 // 4.6.0
 // CmdId: 1207
 message GetScenePointReq {
-  uint32 scene_id = 11;
+	uint32 scene_id = 11;
-  uint32 belong_uid = 5;
+	uint32 belong_uid = 5;
-  bool is_relogin = 10;
+	bool is_relogin = 10;
 }

proto/GetScenePointRsp.proto

@@ -7,7 +7,7 @@ message GetScenePointRsp {
 	bool CPNKHEDGHHL = 1;
 	uint32 scene_id = 2;
 	uint32 belong_uid = 3;
-  int32 retcode = 14;
+	int32 retcode = 14;
 	repeated uint32 unhide_point_list = 4;//2
 	repeated uint32 AKHAPPFGOGM = 5;//1
 	repeated uint32 HNFMMECDIGB = 6;//1

proto/HitClientTrivialNotify.proto

@@ -8,6 +8,6 @@ import "Vector.proto";
 // Version: 4.6.0
 // Obfs: LCPIGGMOOOF
 message HitClientTrivialNotify {
-  Vector position = 6;
+	Vector position = 6;
-  uint32 owner_entity_id = 7;
+	uint32 owner_entity_id = 7;
 }

proto/HitColliderType.proto

@@ -3,8 +3,8 @@ option java_package = "emu.grasscutter.net.proto";
 
 //obf: LPNDGGEHLED
 enum HitColliderType {
-    HIT_COLLIDER_INVALID = 0;
+	HIT_COLLIDER_INVALID = 0;
-    HIT_COLLIDER_HIT_BOX = 1;
+	HIT_COLLIDER_HIT_BOX = 1;
-    HIT_COLLIDER_WET_HIT_BOX = 2;
+	HIT_COLLIDER_WET_HIT_BOX = 2;
-    HIT_COLLIDER_HEAD_BOX = 3;
+	HIT_COLLIDER_HEAD_BOX = 3;
 }

proto/HitCollision.proto

@@ -6,10 +6,10 @@ import "HitColliderType.proto";
 
 //obf: ILBCLHPLHKO
 message HitCollision {
-    float IGBDAFGNEAH = 1;
+	float IGBDAFGNEAH = 1;
-    HitColliderType hit_collider_type = 3;
+	HitColliderType hit_collider_type = 3;
-    int32 hit_box_index = 4;
+	int32 hit_box_index = 4;
-    Vector hit_point = 8;
+	Vector hit_point = 8;
-    Vector hit_dir = 9;
+	Vector hit_dir = 9;
-    float PGLJPGHIPGO = 15;
+	float PGLJPGHIPGO = 15;
 }

proto/HomeAnimalData.proto

@@ -5,7 +5,7 @@ import "Vector.proto";
 
 //obf: NJOKBNDHOJL
 message HomeAnimalData {
-    Vector spawnRot = 10;
+	Vector spawnRot = 10;
-    uint32 furniture_id = 14;
+	uint32 furniture_id = 14;
-    Vector spawn_pos = 15;
+	Vector spawn_pos = 15;
 }

proto/HomeBasicInfo.proto

@@ -4,13 +4,13 @@ option java_package = "emu.grasscutter.net.proto";
 import "HomeLimitedShopInfo.proto";
 
 message HomeBasicInfo {
-    uint32 cur_room_scene_id = 2;
+	uint32 cur_room_scene_id = 2;
-    uint32 level = 3;
+	uint32 level = 3;
-    HomeLimitedShopInfo limited_shop_info = 4;
+	HomeLimitedShopInfo limited_shop_info = 4;
-    uint32 cur_module_id = 5;
+	uint32 cur_module_id = 5;
-    bool is_in_edit_mode = 9;
+	bool is_in_edit_mode = 9;
-    uint64 exp = 10;
+	uint64 exp = 10;
-    uint32 KFBPCHPPMEM = 11;
+	uint32 KFBPCHPPMEM = 11;
-    uint32 home_owner_uid = 12;
+	uint32 home_owner_uid = 12;
-    string owner_nick_name = 13;
+	string owner_nick_name = 13;
 }

proto/HomeBasicInfoNotify.proto

@@ -5,5 +5,5 @@ import "HomeBasicInfo.proto";
 
 // CmdId: 25591
 message HomeBasicInfoNotify {
-    HomeBasicInfo basic_info = 8;
+	HomeBasicInfo basic_info = 8;
 }

proto/HomeBlockArrangementInfo.proto

@@ -12,17 +12,17 @@ import "HomeFurnitureSuiteData.proto";
 import "WeekendDjinnInfo.proto";
 
 message HomeBlockArrangementInfo {
-    repeated HomeFurnitureGroupData furniture_group_list = 1;
+	repeated HomeFurnitureGroupData furniture_group_list = 1;
-    bool is_unlocked = 2;
+	bool is_unlocked = 2;
-    uint32 block_id = 4;
+	uint32 block_id = 4;
-    repeated HomeFurnitureData deployFurniureList = 5;
+	repeated HomeFurnitureData deployFurniureList = 5;
-    repeated HomeAnimalData deploy_animal_list = 6;
+	repeated HomeAnimalData deploy_animal_list = 6;
-    repeated HomeFurnitureCustomSuiteData furniture_custom_suite_list = 7;
+	repeated HomeFurnitureCustomSuiteData furniture_custom_suite_list = 7;
-    repeated HomeNpcData deploy_npc_list = 8;
+	repeated HomeNpcData deploy_npc_list = 8;
-    uint32 comfort_value = 9;
+	uint32 comfort_value = 9;
-    repeated HomeBlockFieldData field_list = 10;
+	repeated HomeBlockFieldData field_list = 10;
-    repeated HomeBlockDotPattern dot_pattern_list = 11;
+	repeated HomeBlockDotPattern dot_pattern_list = 11;
-    repeated HomeFurnitureData persistentFurnitureList = 13;
+	repeated HomeFurnitureData persistentFurnitureList = 13;
-    repeated HomeFurnitureSuiteData furniture_suite_list = 14;
+	repeated HomeFurnitureSuiteData furniture_suite_list = 14;
-    repeated WeekendDjinnInfo weekend_djinn_info_list = 15;
+	repeated WeekendDjinnInfo weekend_djinn_info_list = 15;
 }

proto/HomeBlockDotPattern.proto

@@ -3,7 +3,7 @@ option java_package = "emu.grasscutter.net.proto";
 
 //obf: IEKCEGFNINF
 message HomeBlockDotPattern {
-    bytes data = 5;
+	bytes data = 5;
-    uint32 width = 9;
+	uint32 width = 9;
-    uint32 height = 11;
+	uint32 height = 11;
 }

proto/HomeBlockFieldData.proto

@@ -6,9 +6,9 @@ import "HomeBlockSubFieldData.proto";
 
 //obf: ECDJBCPLCNO
 message HomeBlockFieldData {
-    uint32 furniture_id = 4;
+	uint32 furniture_id = 4;
-    repeated HomeBlockSubFieldData sub_field_list = 7;
+	repeated HomeBlockSubFieldData sub_field_list = 7;
-    uint32 guid = 9;
+	uint32 guid = 9;
-    Vector rot = 11;
+	Vector rot = 11;
-    Vector pos = 14;
+	Vector pos = 14;
 }

proto/HomeBlockSubFieldData.proto

@@ -5,6 +5,6 @@ import "Vector.proto";
 
 //obf: DLGDKPKEOEG
 message HomeBlockSubFieldData {
-    Vector rot = 8;
+	Vector rot = 8;
-    Vector pos = 13;
+	Vector pos = 13;
 }

proto/HomeChangeModuleReq.proto

@@ -4,5 +4,5 @@ option java_package = "emu.grasscutter.net.proto";
 //obf: EOPBEIGHCKC
 // CmdId: 26930
 message HomeChangeModuleReq {
-    uint32 target_module_id = 7;
+	uint32 target_module_id = 7;
 }

proto/HomeChangeModuleRsp.proto

@@ -4,6 +4,6 @@ option java_package = "emu.grasscutter.net.proto";
 //obf: HLONDLKECKC
 // CmdId: 9924
 message HomeChangeModuleRsp {
-    int32 retcode = 3;
+	int32 retcode = 3;
-    uint32 target_module_id = 5;
+	uint32 target_module_id = 5;
 }

proto/HomeChooseModuleReq.proto

@@ -2,5 +2,5 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
 message HomeChooseModuleReq {
-    uint32 module_id = 9;
+	uint32 module_id = 9;
 }

proto/HomeChooseModuleRsp.proto

@@ -2,6 +2,6 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
 message HomeChooseModuleRsp {
-    uint32 module_id = 6;
+	uint32 module_id = 6;
-    int32 retcode = 11;
+	int32 retcode = 11;
 }

proto/HomeComfortInfoNotify.proto

@@ -4,5 +4,5 @@ option java_package = "emu.grasscutter.net.proto";
 import "HomeModuleComfortInfo.proto";
 
 message HomeComfortInfoNotify {
-    repeated HomeModuleComfortInfo module_info_list = 11;
+	repeated HomeModuleComfortInfo module_info_list = 11;
 }

proto/HomeFurnitureCustomSuiteData.proto

@@ -5,7 +5,7 @@ import "Vector.proto";
 
 //obf: ECIIKJIKNFC
 message HomeFurnitureCustomSuiteData {
-    uint32 guid = 9;
+	uint32 guid = 9;
-    repeated int32 included_furniture_index_list = 10;
+	repeated int32 included_furniture_index_list = 10;
-    Vector spawn_pos = 11;
+	Vector spawn_pos = 11;
 }

proto/HomeFurnitureData.proto

@@ -5,10 +5,10 @@ import "Vector.proto";
 
 //obf: DJKBKLKPFML
 message HomeFurnitureData {
-    uint32 version = 3;
+	uint32 version = 3;
-    int32 parent_furniture_index = 4;
+	int32 parent_furniture_index = 4;
-    Vector spawn_pos = 5;
+	Vector spawn_pos = 5;
-    Vector spawnRot = 12;
+	Vector spawnRot = 12;
-    uint32 furniture_id = 14;
+	uint32 furniture_id = 14;
-    uint32 guid = 15;
+	uint32 guid = 15;
 }

proto/HomeFurnitureGroupData.proto

@@ -5,6 +5,6 @@ import "HomeFurnitureData.proto";
 
 //obf: NFNCNNJLKJH
 message HomeFurnitureGroupData {
-    repeated HomeFurnitureData virtual_furniure_list = 5;
+	repeated HomeFurnitureData virtual_furniure_list = 5;
-    uint32 group_furniture_index = 8;
+	uint32 group_furniture_index = 8;
 }

proto/HomeFurnitureSuiteData.proto

@@ -5,9 +5,9 @@ import "Vector.proto";
 
 //obf: JGGCDILKLJF
 message HomeFurnitureSuiteData {
-    repeated int32 included_furniture_index_list = 1;
+	repeated int32 included_furniture_index_list = 1;
-    uint32 guid = 5;
+	uint32 guid = 5;
-    uint32 suite_id = 6;
+	uint32 suite_id = 6;
-    bool is_allow_summon = 8;
+	bool is_allow_summon = 8;
-    Vector spawn_pos = 11;
+	Vector spawn_pos = 11;
 }

proto/HomeLimitedShopInfo.proto

@@ -4,10 +4,10 @@ option java_package = "emu.grasscutter.net.proto";
 import "Vector.proto";
 
 message HomeLimitedShopInfo {
-    fixed32 end_time = 3;
+	fixed32 end_time = 3;
-    Vector djinn_rot = 7;
+	Vector djinn_rot = 7;
-    fixed32 start_time = 8;
+	fixed32 start_time = 8;
-    fixed32 CPOCMEGMECF = 11;
+	fixed32 CPOCMEGMECF = 11;
-    uint32 uid = 12;
+	uint32 uid = 12;
-    Vector djinn_pos = 13;
+	Vector djinn_pos = 13;
 }

proto/HomeMarkPointFurnitureData.proto

@@ -6,12 +6,12 @@ import "HomeMarkPointNPCData.proto";
 import "HomeMarkPointSuiteData.proto";
 
 message HomeMarkPointFurnitureData {
-    uint32 guid = 1;
+	uint32 guid = 1;
-    uint32 furniture_id = 2;
+	uint32 furniture_id = 2;
-    uint32 furniture_type = 3;
+	uint32 furniture_type = 3;
-    Vector pos = 4;
+	Vector pos = 4;
-    oneof data {
+	oneof data {
-        HomeMarkPointNPCData npc_data = 6;
+		HomeMarkPointNPCData npc_data = 6;
-        HomeMarkPointSuiteData suite_data = 7;
+		HomeMarkPointSuiteData suite_data = 7;
-    }
+	}
 }

proto/HomeMarkPointNPCData.proto

@@ -2,6 +2,6 @@ syntax = "proto3";
 option java_package = "emu.grasscutter.net.proto";
 
 message HomeMarkPointNPCData {
-    uint32 avatar_id = 1;
+	uint32 avatar_id = 1;
-    uint32 costume_id = 2;
+	uint32 costume_id = 2;
 }

proto/HomeMarkPointNotify.proto

@@ -5,5 +5,5 @@ import "HomeMarkPointSceneData.proto";
 
 // CmdId: 7160
 message HomeMarkPointNotify {
-    repeated HomeMarkPointSceneData mark_point_data_list = 6;
+	repeated HomeMarkPointSceneData mark_point_data_list = 6;
 }