From 02e3bb2424d9c294da48989f120e89557e88dd27 Mon Sep 17 00:00:00 2001
From: WatchAndyTW <andyediteroffice@gmail.com>
Date: Wed, 20 Nov 2024 10:22:53 +0800
Subject: [PATCH] Support anime game version 5.2.0

---
 README.md                                     |   53 +-
 README_zh-CN.md                               |   55 +-
 .../proto/AbilityInvokeEntryOuterClass.java   | 1044 +++---
 .../AchievementAllDataNotifyOuterClass.java   |  302 +-
 .../net/proto/AchievementOuterClass.java      |  456 ++-
 .../net/proto/ActivityInfoOuterClass.java     |  588 ++--
 .../AddQuestContentProgressReqOuterClass.java |  132 +-
 .../AddQuestContentProgressRspOuterClass.java |   94 +-
 .../AvatarChangeCostumeRspOuterClass.java     |  134 +-
 .../net/proto/AvatarDataNotifyOuterClass.java | 1006 +++---
 .../AvatarDieAnimationEndReqOuterClass.java   |  200 +-
 .../AvatarDieAnimationEndRspOuterClass.java   |  216 +-
 .../proto/AvatarEnterSceneInfoOuterClass.java | 1460 +++++----
 .../AvatarEquipChangeNotifyOuterClass.java    |  800 +++--
 .../AvatarFlycloakChangeNotifyOuterClass.java |   82 +-
 ...AvatarLifeStateChangeNotifyOuterClass.java | 1656 ++++++----
 .../net/proto/AvatarPropNotifyOuterClass.java |  260 +-
 .../net/proto/AvatarRenameInfoOuterClass.java |  210 +-
 .../AvatarTeamUpdateNotifyOuterClass.java     |  204 +-
 .../net/proto/ChangeAvatarReqOuterClass.java  |  388 ++-
 .../net/proto/ChangeAvatarRspOuterClass.java  |  204 +-
 .../proto/ChangeGameTimeReqOuterClass.java    |  216 +-
 .../proto/ChangeGameTimeRspOuterClass.java    |  220 +-
 .../net/proto/ChildQuestOuterClass.java       |  212 +-
 .../net/proto/CityInfoOuterClass.java         |  216 +-
 .../ClientAbilityChangeNotifyOuterClass.java  |  384 ++-
 ...ientAbilityInitFinishNotifyOuterClass.java |  322 +-
 .../CombatInvocationsNotifyOuterClass.java    |  182 +-
 .../proto/EnterSceneDoneReqOuterClass.java    |   44 +-
 .../proto/EnterSceneDoneRspOuterClass.java    |  126 +-
 .../proto/EnterScenePeerNotifyOuterClass.java |  318 +-
 .../proto/EnterSceneReadyReqOuterClass.java   |   44 +-
 .../proto/EnterSceneReadyRspOuterClass.java   |  136 +-
 ...FightPropChangeReasonNotifyOuterClass.java | 1084 ++++---
 ...EntityFightPropUpdateNotifyOuterClass.java |  136 +-
 .../EvtAvatarLockChairRspOuterClass.java      |  664 ++--
 .../EvtAvatarStandUpNotifyOuterClass.java     |  340 +-
 .../net/proto/EvtBeingHitInfoOuterClass.java  |  404 ++-
 .../proto/EvtDoSkillSuccNotifyOuterClass.java |  364 ++-
 .../FinishedParentQuestNotifyOuterClass.java  |  182 +-
 ...shedParentQuestUpdateNotifyOuterClass.java |  182 +-
 .../proto/GadgetInteractReqOuterClass.java    |  600 ++--
 .../proto/GadgetInteractRspOuterClass.java    |  526 ++--
 .../proto/GetActivityInfoRspOuterClass.java   | 1264 +++++---
 .../GetAllUnlockNameCardReqOuterClass.java    |    4 +-
 .../GetAllUnlockNameCardRspOuterClass.java    |  256 +-
 .../GetParentQuestVideoKeyRspOuterClass.java  |  132 +-
 .../GetPlayerFriendListReqOuterClass.java     |    4 +-
 .../GetPlayerSocialDetailReqOuterClass.java   |  141 +-
 .../GetPlayerSocialDetailRspOuterClass.java   |  356 ++-
 .../proto/GetPlayerTokenReqOuterClass.java    |  706 ++---
 .../proto/GetPlayerTokenRspOuterClass.java    | 1044 +++---
 .../GetProfilePictureDataReqOuterClass.java   |    4 +-
 .../GetProfilePictureDataRspOuterClass.java   |  148 +-
 .../net/proto/GetSceneAreaReqOuterClass.java  |  176 +-
 .../net/proto/GetSceneAreaRspOuterClass.java  |  464 ++-
 .../net/proto/GetScenePointReqOuterClass.java |  222 +-
 .../net/proto/GetScenePointRspOuterClass.java | 2716 +++++++++-------
 .../net/proto/GetWidgetSlotRspOuterClass.java |  344 +-
 .../net/proto/HostPlayerNotifyOuterClass.java |   82 +-
 .../proto/InferencePageInfoOuterClass.java    |  342 +-
 .../LifeStateChangeNotifyOuterClass.java      | 1444 +++++----
 .../net/proto/MPLevelEntityInfo.java          |  206 +-
 .../proto/MPLevelEntityInfoOuterClass.java    |  188 +-
 .../net/proto/MarkMapReqOuterClass.java       |  268 +-
 .../net/proto/NpcTalkReqOuterClass.java       |  240 +-
 .../net/proto/NpcTalkRspOuterClass.java       |  264 +-
 .../OpenStateUpdateNotifyOuterClass.java      |   52 +-
 .../net/proto/ParentQuestOuterClass.java      | 2802 ++++++++++-------
 .../ParentQuestRandomInfoOuterClass.java      |  184 +-
 .../proto/PersonalSceneJumpReqOuterClass.java |   44 +-
 .../net/proto/PingReqOuterClass.java          |  334 +-
 .../net/proto/PingRspOuterClass.java          |  182 +-
 .../net/proto/PlayerDataNotifyOuterClass.java |  784 +++--
 .../PlayerEnterSceneInfoNotifyOuterClass.java |  850 +++--
 .../PlayerEnterSceneNotifyOuterClass.java     |  984 +++---
 .../proto/PlayerGameTimeNotifyOuterClass.java |  240 +-
 .../net/proto/PlayerLoginReqOuterClass.java   |  710 ++---
 .../net/proto/PlayerLoginRspOuterClass.java   | 1142 +++----
 .../PlayerPropChangeNotifyOuterClass.java     |  166 +-
 ...layerPropChangeReasonNotifyOuterClass.java |  392 ++-
 .../net/proto/PlayerPropNotifyOuterClass.java |  116 +-
 .../proto/PlayerSetPauseReqOuterClass.java    |   24 +-
 .../proto/PlayerSetPauseRspOuterClass.java    |   44 +-
 .../proto/PlayerStoreNotifyOuterClass.java    |  400 ++-
 .../net/proto/PlayerTimeNotifyOuterClass.java |  232 +-
 ...yerWorldSceneInfoListNotifyOuterClass.java |  606 ++--
 .../proto/PlayerWorldSceneInfoOuterClass.java |  454 ++-
 .../proto/PostEnterSceneReqOuterClass.java    |  166 +-
 .../proto/PostEnterSceneRspOuterClass.java    |  138 +-
 .../proto/PrivateChatNotifyOuterClass.java    |  104 +-
 .../net/proto/PrivateChatReqOuterClass.java   |  160 +-
 .../proto/QuestDestroyNpcReqOuterClass.java   |   84 +-
 .../proto/QuestDestroyNpcRspOuterClass.java   |  216 +-
 .../net/proto/QuestListNotifyOuterClass.java  |  182 +-
 .../QuestListUpdateNotifyOuterClass.java      |  182 +-
 .../QuestProgressUpdateNotifyOuterClass.java  |  294 +-
 .../net/proto/QuestTransmitRspOuterClass.java |  122 +-
 .../QuestUpdateQuestVarNotifyOuterClass.java  |  392 ++-
 .../SceneAreaWeatherNotifyOuterClass.java     |  478 ++-
 .../SceneEntityAppearNotifyOuterClass.java    |  402 ++-
 .../proto/SceneInitFinishReqOuterClass.java   |   44 +-
 .../proto/SceneInitFinishRspOuterClass.java   |   56 +-
 .../net/proto/SceneTeamAvatarOuterClass.java  | 2762 +++++++++-------
 .../SceneTeamUpdateNotifyOuterClass.java      |  222 +-
 .../net/proto/SceneTimeNotifyOuterClass.java  |  216 +-
 .../proto/SceneTransToPointReqOuterClass.java |   84 +-
 .../proto/SceneTransToPointRspOuterClass.java |  236 +-
 ...rverGlobalValueChangeNotifyOuterClass.java |  244 +-
 .../net/proto/ServerTimeNotifyOuterClass.java |   44 +-
 .../net/proto/SetNameCardReqOuterClass.java   |   24 +-
 .../net/proto/SetNameCardRspOuterClass.java   |  164 +-
 .../proto/SetUpAvatarTeamReqOuterClass.java   |  264 +-
 .../proto/SetUpAvatarTeamRspOuterClass.java   |  448 ++-
 .../net/proto/SetWidgetSlotReqOuterClass.java |  196 +-
 .../net/proto/SetWidgetSlotRspOuterClass.java |  672 ++--
 .../StoreItemChangeNotifyOuterClass.java      |  264 +-
 .../StoreWeightLimitNotifyOuterClass.java     |  504 +--
 .../proto/TeamEnterSceneInfoOuterClass.java   |  310 +-
 .../ToTheMoonEnterSceneReqOuterClass.java     |  348 +-
 .../net/proto/Uint32PairOuterClass.java       |   40 +
 .../net/proto/UnionCmdNotifyOuterClass.java   |  182 +-
 .../net/proto/UnionCmdOuterClass.java         |  172 +-
 .../proto/VehicleInteractReqOuterClass.java   |  442 ++-
 .../proto/VehicleInteractRspOuterClass.java   | 1142 ++++---
 .../net/proto/VehicleMemberOuterClass.java    |  168 +-
 .../proto/VehicleStaminaNotifyOuterClass.java |   84 +-
 .../net/proto/WearEquipReqOuterClass.java     |   82 +-
 .../net/proto/WearEquipRspOuterClass.java     |  242 +-
 .../proto/WindSeedType1NotifyOuterClass.java  |  188 +-
 .../net/proto/WorldDataNotifyOuterClass.java  |  116 +-
 .../java/emu/grasscutter/GameConstants.java   |    4 +-
 .../grasscutter/net/packet/PacketOpcodes.java |  418 +--
 .../net/packet/PacketOpcodesUtils.java        |   20 +-
 .../server/http/dispatch/RegionHandler.java   |   48 +-
 .../server/http/dispatch/hotfix.java          |   30 -
 136 files changed, 31954 insertions(+), 19649 deletions(-)
 delete mode 100644 src/main/java/emu/grasscutter/server/http/dispatch/hotfix.java

diff --git a/README.md b/README.md
index 4bebb7af353..66f0d6980b5 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,21 @@
 
 English | [简体中文](README_zh-CN.md)
 
+## Joker Board
+GlazePS who? The fucking retarded guy who modify mostly everything's author to his own, saying all public stuff like thats what he made. SHAMELESS and RETARDED.
+
 ## Current features
 
 * Logging in
+* Combat (-)
+* Friends list (-)
+* Teleportation
+* Gacha system (-)
+* Activity (-)
+* Co-op *partially* works (-)
+* Spawning monsters via console
+* Inventory features (receiving items/characters, upgrading items/characters, etc) (-)
+* Teapot (-)
 
 # Star History Chart
 [![Star History Chart](https://api.star-history.com/svg?repos=XeonSucksLAB/UnknownAnimeGamePS&type=Date)](https://star-history.com/#XeonSucksLAB/UnknownAnimeGamePS&Date)
@@ -22,32 +34,21 @@ English | [简体中文](README_zh-CN.md)
 
 | Download link | Package size | Decompressed package size | MD5 checksum |
 | :---: | :---: | :---: | :---: |
-| [GenshinImpact_5.1.0.zip.001](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20240927184459_CVopfb3tD4Zi3As6/GenshinImpact_5.1.0.zip.001) | 10.0 GB | 20.0 GB | cbe2934260fda10ab8cdaca80ef69cb3 |
-| [GenshinImpact_5.1.0.zip.002](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20240927184459_CVopfb3tD4Zi3As6/GenshinImpact_5.1.0.zip.002) | 10.0 GB | 20.0 GB | df706bb5e83dde4d3df7276a1210a8fb |
-| [GenshinImpact_5.1.0.zip.003](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20240927184459_CVopfb3tD4Zi3As6/GenshinImpact_5.1.0.zip.003) | 10.0 GB | 20.0 GB | dd7062a4abde83f02f184fe081eb2006 |
-| [GenshinImpact_5.1.0.zip.004](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20240927184459_CVopfb3tD4Zi3As6/GenshinImpact_5.1.0.zip.004) | 10.0 GB | 20.0 GB | 39f014a760e27f77abed1989739c74c6 |
-| [GenshinImpact_5.1.0.zip.005](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20240927184459_CVopfb3tD4Zi3As6/GenshinImpact_5.1.0.zip.005) | 10.0 GB | 20.0 GB | e3beb938f521be5a74431716394baee3 |
-| [GenshinImpact_5.1.0.zip.006](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20240927184459_CVopfb3tD4Zi3As6/GenshinImpact_5.1.0.zip.006) | 10.0 GB | 20.0 GB | f59a086e986cce9f9e98e2d3c44212c8 |
-| [GenshinImpact_5.1.0.zip.007](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20240927184459_CVopfb3tD4Zi3As6/GenshinImpact_5.1.0.zip.007) | 5.94 GB | 11.89 GB | 0e165aec640ca7025f9d52b0f53a4223 |
-| [Audio_Chinese_5.1.0.zip](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20240927184459_CVopfb3tD4Zi3As6/Audio_Chinese_5.1.0.zip) | 13.09 GB | 26.19 GB | 5c2e8a5e8a79a2e04a43e3a9d6df1ade |
-| [Audio_English(US)_5.1.0.zip](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20240927184459_CVopfb3tD4Zi3As6/Audio_English(US)_5.1.0.zip) | 15.09 GB | 30.20 GB | 2504bd3606681c20cbdb5f82e8ca361b |
-| [Audio_Korean_5.1.0.zip](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20240927184459_CVopfb3tD4Zi3As6/Audio_Korean_5.1.0.zip) | 12.84 GB | 25.70 GB | 89f4668220ceaba401244c5d506defeb |
-| [Audio_Japanese_5.1.0.zip](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20240927184459_CVopfb3tD4Zi3As6/Audio_Japanese_5.1.0.zip) | 17.00 GB | 34.02 GB | b2a2d965ccc36b1c583381cf4b3962e9 |
-
-- Or get the 5.0.0 -> 5.1.0 hdiffs:
-
-
-| Download link | Package size | Decompressed package size | MD5 checksum |
-| :---: | :---: | :---: | :---: |
-| [game_5.0.0_5.1.0_hdiff_YqcpfTRBIuOIwHrO.zip](https://autopatchhk.yuanshen.com/client_app/update/hk4e_global/game_5.0.0_5.1.0_hdiff_YqcpfTRBIuOIwHrO.zip) | 18.00 GB | 36.66 GB | 3d628fcde7aaf5b242e253188885ef8d |
-| [audio_ko-kr_5.0.0_5.1.0_hdiff_PumQPsFuEgvDnZyX.zip](https://autopatchhk.yuanshen.com/client_app/update/hk4e_global/audio_ko-kr_5.0.0_5.1.0_hdiff_PumQPsFuEgvDnZyX.zip) | 0.51 GB | 1.12 GB | 0d77474fe49e46cdfc20298034501019 |
-| [audio_ja-jp_5.0.0_5.1.0_hdiff_cSIWEmsNoqluMIrF.zip](https://autopatchhk.yuanshen.com/client_app/update/hk4e_global/audio_ja-jp_5.0.0_5.1.0_hdiff_cSIWEmsNoqluMIrF.zip) | 0.59 GB | 1.34 GB | de00c4d5d02dead7b8e80c68ab57db17 |
-| [audio_zh-cn_5.0.0_5.1.0_hdiff_bktSOAPsrWSJHOII.zip](https://autopatchhk.yuanshen.com/client_app/update/hk4e_global/audio_zh-cn_5.0.0_5.1.0_hdiff_bktSOAPsrWSJHOII.zip) | 0.54 GB | 1.16 GB | 1e988fbd3a6854e885564e3cca56fb65 |
-| [audio_en-us_5.0.0_5.1.0_hdiff_jRxUUsOrikPdkOPL.zip](https://autopatchhk.yuanshen.com/client_app/update/hk4e_global/audio_en-us_5.0.0_5.1.0_hdiff_jRxUUsOrikPdkOPL.zip) | 0.51 GB | 1.11 GB | 501590a0aa8a67e0101e827be5c16cef |
-
-
-- Download the patch from [here](https://watchandy.me/5.0.0/version.dll). -- The patch has not been updated to 5.1.0 yet.
-- Put the `version.dll` in to the folder of your game client. 
+| [GenshinImpact_5.2.0.zip.001](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20241108173711_97p3DLcQqGoVFVR0/GenshinImpact_5.2.0.zip.001) | 10.0 GB | 20.0 GB | 651a72b1adb3bb5be28dcffded9ee7ec |
+| [GenshinImpact_5.2.0.zip.002](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20241108173711_97p3DLcQqGoVFVR0/GenshinImpact_5.2.0.zip.002) | 10.0 GB | 20.0 GB | ecfcb0aa4b403608aa0089e8cbc0c618 |
+| [GenshinImpact_5.2.0.zip.003](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20241108173711_97p3DLcQqGoVFVR0/GenshinImpact_5.2.0.zip.003) | 10.0 GB | 20.0 GB | 5bac8cd01f87d13dd3e20cbf897731d9 |
+| [GenshinImpact_5.2.0.zip.004](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20241108173711_97p3DLcQqGoVFVR0/GenshinImpact_5.2.0.zip.004) | 10.0 GB | 20.0 GB | 84501620dded6000f758bfc4bde68d50 |
+| [GenshinImpact_5.2.0.zip.005](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20241108173711_97p3DLcQqGoVFVR0/GenshinImpact_5.2.0.zip.005) | 10.0 GB | 20.0 GB | 2d47ee68d07fd698c02001311998498f |
+| [GenshinImpact_5.2.0.zip.006](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20241108173711_97p3DLcQqGoVFVR0/GenshinImpact_5.2.0.zip.006) | 10.0 GB | 20.0 GB | 8246d93ee1f93ed787bf87314220ed4e |
+| [GenshinImpact_5.2.0.zip.007](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20241108173711_97p3DLcQqGoVFVR0/GenshinImpact_5.2.0.zip.007) | 7.24 GB | 14.49 GB | fda38b6c9a5f746829abd8b561f51f54 |
+| [Audio_Chinese_5.2.0.zip](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20241108173711_97p3DLcQqGoVFVR0/Audio_Chinese_5.2.0.zip) | 13.42 GB | 26.84 GB | 10dd6595c3687dec572afdc329c47eec |
+| [Audio_English(US)_5.2.0.zip](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20241108173711_97p3DLcQqGoVFVR0/Audio_English(US)_5.2.0.zip) | 15.46 GB | 30.93 GB | c67d7e98f823afce67fe662f76d27388 |
+| [Audio_Korean_5.2.0.zip](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20241108173711_97p3DLcQqGoVFVR0/Audio_Korean_5.0.0.zip) | 13.17 GB | 26.35 GB | 071cfaab116ac1578fb6d755c34634e0 |
+| [Audio_Japanese_5.2.0.zip](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20241108173711_97p3DLcQqGoVFVR0/Audio_Japanese_5.0.0.zip) | 17.41 GB | 34.84 GB | 285fba0cf723fc0ec033944caa1ada5c |
+
+
+- Download the patch from [here](https://watchandy.me/5.2.0/version.dll).
+- Put the `version.dll` in to the folder of your game client.
 
 ## Let's build the server
 
diff --git a/README_zh-CN.md b/README_zh-CN.md
index 8f8496f5250..8a291edd06c 100644
--- a/README_zh-CN.md
+++ b/README_zh-CN.md
@@ -4,10 +4,21 @@
 
 [English](README.md) | 简体中文
 
-## 当前功能
+## 小丑板
+琉璃服？把几乎所有东西的作者改成自己名字的傻X，把公开的东西改个名字就说是他做的。无耻又愚蠢。
 
+## 当前功能
 
 * 登录
+* 战斗 (-)
+* 好友列表 (-)
+* 传送
+* 抽卡系统 (-)
+* 活动 (-)
+* 联机模式 部分 可用 (-)
+* 通过控制台生成怪物
+* 背包功能（接收物品/角色，升级物品/角色等) (-)
+* 尘歌壶 (-)
 
 # 收藏历史图表
 [![收藏历史图表](https://api.star-history.com/svg?repos=XeonSucksLAB/UnknownAnimeGamePS&type=Date)](https://star-history.com/#XeonSucksLAB/UnknownAnimeGamePS&Date)
@@ -18,37 +29,25 @@
 
 - 获取 [Java 17](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html)
 - 获取 [MongoDB Community Server](https://www.mongodb.com/try/download/community)
-- 获取游戏版本 REL5.1.0（如果你没有5.1.0客户端，你可以在这里找到并下载）：
-
-
-| 下载链接 | 包大小 | 解压后的包大小 | MD5校验码 |
-| :---: | :---: | :---: | :---: |
-| [GenshinImpact_5.1.0.zip.001](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20240927184459_CVopfb3tD4Zi3As6/GenshinImpact_5.1.0.zip.001) | 10.0 GB | 20.0 GB | cbe2934260fda10ab8cdaca80ef69cb3 |
-| [GenshinImpact_5.1.0.zip.002](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20240927184459_CVopfb3tD4Zi3As6/GenshinImpact_5.1.0.zip.002) | 10.0 GB | 20.0 GB | df706bb5e83dde4d3df7276a1210a8fb |
-| [GenshinImpact_5.1.0.zip.003](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20240927184459_CVopfb3tD4Zi3As6/GenshinImpact_5.1.0.zip.003) | 10.0 GB | 20.0 GB | dd7062a4abde83f02f184fe081eb2006 |
-| [GenshinImpact_5.1.0.zip.004](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20240927184459_CVopfb3tD4Zi3As6/GenshinImpact_5.1.0.zip.004) | 10.0 GB | 20.0 GB | 39f014a760e27f77abed1989739c74c6 |
-| [GenshinImpact_5.1.0.zip.005](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20240927184459_CVopfb3tD4Zi3As6/GenshinImpact_5.1.0.zip.005) | 10.0 GB | 20.0 GB | e3beb938f521be5a74431716394baee3 |
-| [GenshinImpact_5.1.0.zip.006](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20240927184459_CVopfb3tD4Zi3As6/GenshinImpact_5.1.0.zip.006) | 10.0 GB | 20.0 GB | f59a086e986cce9f9e98e2d3c44212c8 |
-| [GenshinImpact_5.1.0.zip.007](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20240927184459_CVopfb3tD4Zi3As6/GenshinImpact_5.1.0.zip.007) | 5.94 GB | 11.89 GB | 0e165aec640ca7025f9d52b0f53a4223 |
-| [Audio_Chinese_5.1.0.zip](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20240927184459_CVopfb3tD4Zi3As6/Audio_Chinese_5.1.0.zip) | 13.09 GB | 26.19 GB | 5c2e8a5e8a79a2e04a43e3a9d6df1ade |
-| [Audio_English(US)_5.1.0.zip](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20240927184459_CVopfb3tD4Zi3As6/Audio_English(US)_5.1.0.zip) | 15.09 GB | 30.20 GB | 2504bd3606681c20cbdb5f82e8ca361b |
-| [Audio_Korean_5.1.0.zip](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20240927184459_CVopfb3tD4Zi3As6/Audio_Korean_5.1.0.zip) | 12.84 GB | 25.70 GB | 89f4668220ceaba401244c5d506defeb |
-| [Audio_Japanese_5.1.0.zip](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20240927184459_CVopfb3tD4Zi3As6/Audio_Japanese_5.1.0.zip) | 17.00 GB | 34.02 GB | b2a2d965ccc36b1c583381cf4b3962e9 |
-
-
-- 或者获取 5.0.0 -> 5.1.0 hdiff:
+- 获取游戏版本 REL5.2.0（如果你没有5.1.0客户端，你可以在这里找到并下载）：
 
 
 | 下载链接 | 包大小 | 解压后的包大小 | MD5校验码 |
 | :---: | :---: | :---: | :---: |
-| [game_5.0.0_5.1.0_hdiff_YqcpfTRBIuOIwHrO.zip](https://autopatchhk.yuanshen.com/client_app/update/hk4e_global/game_5.0.0_5.1.0_hdiff_YqcpfTRBIuOIwHrO.zip) | 18.00 GB | 36.66 GB | 3d628fcde7aaf5b242e253188885ef8d |
-| [audio_ko-kr_5.0.0_5.1.0_hdiff_PumQPsFuEgvDnZyX.zip](https://autopatchhk.yuanshen.com/client_app/update/hk4e_global/audio_ko-kr_5.0.0_5.1.0_hdiff_PumQPsFuEgvDnZyX.zip) | 0.51 GB | 1.12 GB | 0d77474fe49e46cdfc20298034501019 |
-| [audio_ja-jp_5.0.0_5.1.0_hdiff_cSIWEmsNoqluMIrF.zip](https://autopatchhk.yuanshen.com/client_app/update/hk4e_global/audio_ja-jp_5.0.0_5.1.0_hdiff_cSIWEmsNoqluMIrF.zip) | 0.59 GB | 1.34 GB | de00c4d5d02dead7b8e80c68ab57db17 |
-| [audio_zh-cn_5.0.0_5.1.0_hdiff_bktSOAPsrWSJHOII.zip](https://autopatchhk.yuanshen.com/client_app/update/hk4e_global/audio_zh-cn_5.0.0_5.1.0_hdiff_bktSOAPsrWSJHOII.zip) | 0.54 GB | 1.16 GB | 1e988fbd3a6854e885564e3cca56fb65 |
-| [audio_en-us_5.0.0_5.1.0_hdiff_jRxUUsOrikPdkOPL.zip](https://autopatchhk.yuanshen.com/client_app/update/hk4e_global/audio_en-us_5.0.0_5.1.0_hdiff_jRxUUsOrikPdkOPL.zip) | 0.51 GB | 1.11 GB | 501590a0aa8a67e0101e827be5c16cef |
-
-
-- 从[这里](https://watchandy.me/5.0.0/version.dll)下载补丁。 --当前补丁还未更新至5.1.0版本
+| [GenshinImpact_5.2.0.zip.001](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20241108173711_97p3DLcQqGoVFVR0/GenshinImpact_5.2.0.zip.001) | 10.0 GB | 20.0 GB | 651a72b1adb3bb5be28dcffded9ee7ec |
+| [GenshinImpact_5.2.0.zip.002](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20241108173711_97p3DLcQqGoVFVR0/GenshinImpact_5.2.0.zip.002) | 10.0 GB | 20.0 GB | ecfcb0aa4b403608aa0089e8cbc0c618 |
+| [GenshinImpact_5.2.0.zip.003](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20241108173711_97p3DLcQqGoVFVR0/GenshinImpact_5.2.0.zip.003) | 10.0 GB | 20.0 GB | 5bac8cd01f87d13dd3e20cbf897731d9 |
+| [GenshinImpact_5.2.0.zip.004](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20241108173711_97p3DLcQqGoVFVR0/GenshinImpact_5.2.0.zip.004) | 10.0 GB | 20.0 GB | 84501620dded6000f758bfc4bde68d50 |
+| [GenshinImpact_5.2.0.zip.005](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20241108173711_97p3DLcQqGoVFVR0/GenshinImpact_5.2.0.zip.005) | 10.0 GB | 20.0 GB | 2d47ee68d07fd698c02001311998498f |
+| [GenshinImpact_5.2.0.zip.006](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20241108173711_97p3DLcQqGoVFVR0/GenshinImpact_5.2.0.zip.006) | 10.0 GB | 20.0 GB | 8246d93ee1f93ed787bf87314220ed4e |
+| [GenshinImpact_5.2.0.zip.007](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20241108173711_97p3DLcQqGoVFVR0/GenshinImpact_5.2.0.zip.007) | 7.24 GB | 14.49 GB | fda38b6c9a5f746829abd8b561f51f54 |
+| [Audio_Chinese_5.2.0.zip](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20241108173711_97p3DLcQqGoVFVR0/Audio_Chinese_5.2.0.zip) | 13.42 GB | 26.84 GB | 10dd6595c3687dec572afdc329c47eec |
+| [Audio_English(US)_5.2.0.zip](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20241108173711_97p3DLcQqGoVFVR0/Audio_English(US)_5.2.0.zip) | 15.46 GB | 30.93 GB | c67d7e98f823afce67fe662f76d27388 |
+| [Audio_Korean_5.2.0.zip](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20241108173711_97p3DLcQqGoVFVR0/Audio_Korean_5.0.0.zip) | 13.17 GB | 26.35 GB | 071cfaab116ac1578fb6d755c34634e0 |
+| [Audio_Japanese_5.2.0.zip](https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20241108173711_97p3DLcQqGoVFVR0/Audio_Japanese_5.0.0.zip) | 17.41 GB | 34.84 GB | 285fba0cf723fc0ec033944caa1ada5c |
+
+
+- 从[这里](https://watchandy.me/5.2.0/version.dll)下载补丁。
 - 将 `version.dll` 放入游戏客户端的文件夹中。
 
 ## 搭建服务器
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityInvokeEntryOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityInvokeEntryOuterClass.java
index 4978cdd30d5..8797d5beead 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AbilityInvokeEntryOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityInvokeEntryOuterClass.java
@@ -19,77 +19,129 @@ public interface AbilityInvokeEntryOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 event_id = 2;</code>
-     * @return The eventId.
-     */
-    int getEventId();
-
-    /**
-     * <code>.AbilityInvokeArgument argument_type = 3;</code>
-     * @return The enum numeric value on the wire for argumentType.
-     */
-    int getArgumentTypeValue();
-    /**
-     * <code>.AbilityInvokeArgument argument_type = 3;</code>
-     * @return The argumentType.
-     */
-    emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument getArgumentType();
-
-    /**
-     * <code>uint32 forward_peer = 4;</code>
-     * @return The forwardPeer.
-     */
-    int getForwardPeer();
-
-    /**
-     * <code>.ForwardType forward_type = 7;</code>
-     * @return The enum numeric value on the wire for forwardType.
-     */
-    int getForwardTypeValue();
-    /**
-     * <code>.ForwardType forward_type = 7;</code>
-     * @return The forwardType.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>bytes ability_data = 15;</code>
+     * @return The abilityData.
      */
-    emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType();
+    com.google.protobuf.ByteString getAbilityData();
 
     /**
-     * <code>.AbilityInvokeEntryHead head = 8;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.AbilityInvokeEntryHead head = 4;</code>
      * @return Whether the head field is set.
      */
     boolean hasHead();
     /**
-     * <code>.AbilityInvokeEntryHead head = 8;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.AbilityInvokeEntryHead head = 4;</code>
      * @return The head.
      */
     emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead getHead();
     /**
-     * <code>.AbilityInvokeEntryHead head = 8;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.AbilityInvokeEntryHead head = 4;</code>
      */
     emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHeadOrBuilder getHeadOrBuilder();
 
     /**
-     * <code>bool is_ignore_auth = 9;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>bool is_ignore_auth = 6;</code>
      * @return The isIgnoreAuth.
      */
     boolean getIsIgnoreAuth();
 
     /**
+     * <pre>
+     * Offset: 0x34
+     * </pre>
+     *
      * <code>uint32 entity_id = 11;</code>
      * @return The entityId.
      */
     int getEntityId();
 
     /**
-     * <code>double total_tick_time = 12;</code>
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>.ForwardType forward_type = 9;</code>
+     * @return The enum numeric value on the wire for forwardType.
+     */
+    int getForwardTypeValue();
+    /**
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>.ForwardType forward_type = 9;</code>
+     * @return The forwardType.
+     */
+    emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType();
+
+    /**
+     * <pre>
+     * Offset: 0x3C
+     * </pre>
+     *
+     * <code>uint32 forward_peer = 13;</code>
+     * @return The forwardPeer.
+     */
+    int getForwardPeer();
+
+    /**
+     * <pre>
+     * Offset: 0x40
+     * </pre>
+     *
+     * <code>double total_tick_time = 10;</code>
      * @return The totalTickTime.
      */
     double getTotalTickTime();
 
     /**
-     * <code>bytes ability_data = 14;</code>
-     * @return The abilityData.
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>.AbilityInvokeArgument argument_type = 7;</code>
+     * @return The enum numeric value on the wire for argumentType.
      */
-    com.google.protobuf.ByteString getAbilityData();
+    int getArgumentTypeValue();
+    /**
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>.AbilityInvokeArgument argument_type = 7;</code>
+     * @return The argumentType.
+     */
+    emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument getArgumentType();
+
+    /**
+     * <pre>
+     * Offset: 0x4C
+     * </pre>
+     *
+     * <code>uint32 event_id = 8;</code>
+     * @return The eventId.
+     */
+    int getEventId();
   }
   /**
    * Protobuf type {@code AbilityInvokeEntry}
@@ -104,9 +156,9 @@ private AbilityInvokeEntry(com.google.protobuf.GeneratedMessageV3.Builder<?> bui
       super(builder);
     }
     private AbilityInvokeEntry() {
-      argumentType_ = 0;
-      forwardType_ = 0;
       abilityData_ = com.google.protobuf.ByteString.EMPTY;
+      forwardType_ = 0;
+      argumentType_ = 0;
     }
 
     @java.lang.Override
@@ -139,44 +191,44 @@ private AbilityInvokeEntry(
             case 0:
               done = true;
               break;
-            case 16: {
+            case 34: {
+              emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead.Builder subBuilder = null;
+              if (head_ != null) {
+                subBuilder = head_.toBuilder();
+              }
+              head_ = input.readMessage(emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(head_);
+                head_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+            case 48: {
 
-              eventId_ = input.readUInt32();
+              isIgnoreAuth_ = input.readBool();
               break;
             }
-            case 24: {
+            case 56: {
               int rawValue = input.readEnum();
 
               argumentType_ = rawValue;
               break;
             }
-            case 32: {
+            case 64: {
 
-              forwardPeer_ = input.readUInt32();
+              eventId_ = input.readUInt32();
               break;
             }
-            case 56: {
+            case 72: {
               int rawValue = input.readEnum();
 
               forwardType_ = rawValue;
               break;
             }
-            case 66: {
-              emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead.Builder subBuilder = null;
-              if (head_ != null) {
-                subBuilder = head_.toBuilder();
-              }
-              head_ = input.readMessage(emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(head_);
-                head_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 72: {
+            case 81: {
 
-              isIgnoreAuth_ = input.readBool();
+              totalTickTime_ = input.readDouble();
               break;
             }
             case 88: {
@@ -184,12 +236,12 @@ private AbilityInvokeEntry(
               entityId_ = input.readUInt32();
               break;
             }
-            case 97: {
+            case 104: {
 
-              totalTickTime_ = input.readDouble();
+              forwardPeer_ = input.readUInt32();
               break;
             }
-            case 114: {
+            case 122: {
 
               abilityData_ = input.readBytes();
               break;
@@ -226,70 +278,29 @@ private AbilityInvokeEntry(
               emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.class, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder.class);
     }
 
-    public static final int EVENT_ID_FIELD_NUMBER = 2;
-    private int eventId_;
-    /**
-     * <code>uint32 event_id = 2;</code>
-     * @return The eventId.
-     */
-    @java.lang.Override
-    public int getEventId() {
-      return eventId_;
-    }
-
-    public static final int ARGUMENT_TYPE_FIELD_NUMBER = 3;
-    private int argumentType_;
-    /**
-     * <code>.AbilityInvokeArgument argument_type = 3;</code>
-     * @return The enum numeric value on the wire for argumentType.
-     */
-    @java.lang.Override public int getArgumentTypeValue() {
-      return argumentType_;
-    }
-    /**
-     * <code>.AbilityInvokeArgument argument_type = 3;</code>
-     * @return The argumentType.
-     */
-    @java.lang.Override public emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument getArgumentType() {
-      @SuppressWarnings("deprecation")
-      emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument result = emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument.valueOf(argumentType_);
-      return result == null ? emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument.UNRECOGNIZED : result;
-    }
-
-    public static final int FORWARD_PEER_FIELD_NUMBER = 4;
-    private int forwardPeer_;
+    public static final int ABILITY_DATA_FIELD_NUMBER = 15;
+    private com.google.protobuf.ByteString abilityData_;
     /**
-     * <code>uint32 forward_peer = 4;</code>
-     * @return The forwardPeer.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>bytes ability_data = 15;</code>
+     * @return The abilityData.
      */
     @java.lang.Override
-    public int getForwardPeer() {
-      return forwardPeer_;
-    }
-
-    public static final int FORWARD_TYPE_FIELD_NUMBER = 7;
-    private int forwardType_;
-    /**
-     * <code>.ForwardType forward_type = 7;</code>
-     * @return The enum numeric value on the wire for forwardType.
-     */
-    @java.lang.Override public int getForwardTypeValue() {
-      return forwardType_;
-    }
-    /**
-     * <code>.ForwardType forward_type = 7;</code>
-     * @return The forwardType.
-     */
-    @java.lang.Override public emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType() {
-      @SuppressWarnings("deprecation")
-      emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType result = emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.valueOf(forwardType_);
-      return result == null ? emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.UNRECOGNIZED : result;
+    public com.google.protobuf.ByteString getAbilityData() {
+      return abilityData_;
     }
 
-    public static final int HEAD_FIELD_NUMBER = 8;
+    public static final int HEAD_FIELD_NUMBER = 4;
     private emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead head_;
     /**
-     * <code>.AbilityInvokeEntryHead head = 8;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.AbilityInvokeEntryHead head = 4;</code>
      * @return Whether the head field is set.
      */
     @java.lang.Override
@@ -297,7 +308,11 @@ public boolean hasHead() {
       return head_ != null;
     }
     /**
-     * <code>.AbilityInvokeEntryHead head = 8;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.AbilityInvokeEntryHead head = 4;</code>
      * @return The head.
      */
     @java.lang.Override
@@ -305,17 +320,25 @@ public emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeE
       return head_ == null ? emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead.getDefaultInstance() : head_;
     }
     /**
-     * <code>.AbilityInvokeEntryHead head = 8;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.AbilityInvokeEntryHead head = 4;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHeadOrBuilder getHeadOrBuilder() {
       return getHead();
     }
 
-    public static final int IS_IGNORE_AUTH_FIELD_NUMBER = 9;
+    public static final int IS_IGNORE_AUTH_FIELD_NUMBER = 6;
     private boolean isIgnoreAuth_;
     /**
-     * <code>bool is_ignore_auth = 9;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>bool is_ignore_auth = 6;</code>
      * @return The isIgnoreAuth.
      */
     @java.lang.Override
@@ -326,6 +349,10 @@ public boolean getIsIgnoreAuth() {
     public static final int ENTITY_ID_FIELD_NUMBER = 11;
     private int entityId_;
     /**
+     * <pre>
+     * Offset: 0x34
+     * </pre>
+     *
      * <code>uint32 entity_id = 11;</code>
      * @return The entityId.
      */
@@ -334,10 +361,56 @@ public int getEntityId() {
       return entityId_;
     }
 
-    public static final int TOTAL_TICK_TIME_FIELD_NUMBER = 12;
+    public static final int FORWARD_TYPE_FIELD_NUMBER = 9;
+    private int forwardType_;
+    /**
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>.ForwardType forward_type = 9;</code>
+     * @return The enum numeric value on the wire for forwardType.
+     */
+    @java.lang.Override public int getForwardTypeValue() {
+      return forwardType_;
+    }
+    /**
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>.ForwardType forward_type = 9;</code>
+     * @return The forwardType.
+     */
+    @java.lang.Override public emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType() {
+      @SuppressWarnings("deprecation")
+      emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType result = emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.valueOf(forwardType_);
+      return result == null ? emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.UNRECOGNIZED : result;
+    }
+
+    public static final int FORWARD_PEER_FIELD_NUMBER = 13;
+    private int forwardPeer_;
+    /**
+     * <pre>
+     * Offset: 0x3C
+     * </pre>
+     *
+     * <code>uint32 forward_peer = 13;</code>
+     * @return The forwardPeer.
+     */
+    @java.lang.Override
+    public int getForwardPeer() {
+      return forwardPeer_;
+    }
+
+    public static final int TOTAL_TICK_TIME_FIELD_NUMBER = 10;
     private double totalTickTime_;
     /**
-     * <code>double total_tick_time = 12;</code>
+     * <pre>
+     * Offset: 0x40
+     * </pre>
+     *
+     * <code>double total_tick_time = 10;</code>
      * @return The totalTickTime.
      */
     @java.lang.Override
@@ -345,15 +418,46 @@ public double getTotalTickTime() {
       return totalTickTime_;
     }
 
-    public static final int ABILITY_DATA_FIELD_NUMBER = 14;
-    private com.google.protobuf.ByteString abilityData_;
+    public static final int ARGUMENT_TYPE_FIELD_NUMBER = 7;
+    private int argumentType_;
     /**
-     * <code>bytes ability_data = 14;</code>
-     * @return The abilityData.
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>.AbilityInvokeArgument argument_type = 7;</code>
+     * @return The enum numeric value on the wire for argumentType.
+     */
+    @java.lang.Override public int getArgumentTypeValue() {
+      return argumentType_;
+    }
+    /**
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>.AbilityInvokeArgument argument_type = 7;</code>
+     * @return The argumentType.
+     */
+    @java.lang.Override public emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument getArgumentType() {
+      @SuppressWarnings("deprecation")
+      emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument result = emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument.valueOf(argumentType_);
+      return result == null ? emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument.UNRECOGNIZED : result;
+    }
+
+    public static final int EVENT_ID_FIELD_NUMBER = 8;
+    private int eventId_;
+    /**
+     * <pre>
+     * Offset: 0x4C
+     * </pre>
+     *
+     * <code>uint32 event_id = 8;</code>
+     * @return The eventId.
      */
     @java.lang.Override
-    public com.google.protobuf.ByteString getAbilityData() {
-      return abilityData_;
+    public int getEventId() {
+      return eventId_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -370,32 +474,32 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (eventId_ != 0) {
-        output.writeUInt32(2, eventId_);
+      if (head_ != null) {
+        output.writeMessage(4, getHead());
+      }
+      if (isIgnoreAuth_ != false) {
+        output.writeBool(6, isIgnoreAuth_);
       }
       if (argumentType_ != emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument.ABILITY_INVOKE_ARGUMENT_NONE.getNumber()) {
-        output.writeEnum(3, argumentType_);
+        output.writeEnum(7, argumentType_);
       }
-      if (forwardPeer_ != 0) {
-        output.writeUInt32(4, forwardPeer_);
+      if (eventId_ != 0) {
+        output.writeUInt32(8, eventId_);
       }
       if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) {
-        output.writeEnum(7, forwardType_);
-      }
-      if (head_ != null) {
-        output.writeMessage(8, getHead());
+        output.writeEnum(9, forwardType_);
       }
-      if (isIgnoreAuth_ != false) {
-        output.writeBool(9, isIgnoreAuth_);
+      if (totalTickTime_ != 0D) {
+        output.writeDouble(10, totalTickTime_);
       }
       if (entityId_ != 0) {
         output.writeUInt32(11, entityId_);
       }
-      if (totalTickTime_ != 0D) {
-        output.writeDouble(12, totalTickTime_);
+      if (forwardPeer_ != 0) {
+        output.writeUInt32(13, forwardPeer_);
       }
       if (!abilityData_.isEmpty()) {
-        output.writeBytes(14, abilityData_);
+        output.writeBytes(15, abilityData_);
       }
       unknownFields.writeTo(output);
     }
@@ -406,41 +510,41 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (eventId_ != 0) {
+      if (head_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, eventId_);
+          .computeMessageSize(4, getHead());
       }
-      if (argumentType_ != emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument.ABILITY_INVOKE_ARGUMENT_NONE.getNumber()) {
+      if (isIgnoreAuth_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(3, argumentType_);
+          .computeBoolSize(6, isIgnoreAuth_);
       }
-      if (forwardPeer_ != 0) {
+      if (argumentType_ != emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument.ABILITY_INVOKE_ARGUMENT_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, forwardPeer_);
+          .computeEnumSize(7, argumentType_);
       }
-      if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) {
+      if (eventId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(7, forwardType_);
+          .computeUInt32Size(8, eventId_);
       }
-      if (head_ != null) {
+      if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(8, getHead());
+          .computeEnumSize(9, forwardType_);
       }
-      if (isIgnoreAuth_ != false) {
+      if (totalTickTime_ != 0D) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(9, isIgnoreAuth_);
+          .computeDoubleSize(10, totalTickTime_);
       }
       if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(11, entityId_);
       }
-      if (totalTickTime_ != 0D) {
+      if (forwardPeer_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeDoubleSize(12, totalTickTime_);
+          .computeUInt32Size(13, forwardPeer_);
       }
       if (!abilityData_.isEmpty()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(14, abilityData_);
+          .computeBytesSize(15, abilityData_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -457,12 +561,8 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry other = (emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry) obj;
 
-      if (getEventId()
-          != other.getEventId()) return false;
-      if (argumentType_ != other.argumentType_) return false;
-      if (getForwardPeer()
-          != other.getForwardPeer()) return false;
-      if (forwardType_ != other.forwardType_) return false;
+      if (!getAbilityData()
+          .equals(other.getAbilityData())) return false;
       if (hasHead() != other.hasHead()) return false;
       if (hasHead()) {
         if (!getHead()
@@ -472,11 +572,15 @@ public boolean equals(final java.lang.Object obj) {
           != other.getIsIgnoreAuth()) return false;
       if (getEntityId()
           != other.getEntityId()) return false;
+      if (forwardType_ != other.forwardType_) return false;
+      if (getForwardPeer()
+          != other.getForwardPeer()) return false;
       if (java.lang.Double.doubleToLongBits(getTotalTickTime())
           != java.lang.Double.doubleToLongBits(
               other.getTotalTickTime())) return false;
-      if (!getAbilityData()
-          .equals(other.getAbilityData())) return false;
+      if (argumentType_ != other.argumentType_) return false;
+      if (getEventId()
+          != other.getEventId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -488,14 +592,8 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + EVENT_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getEventId();
-      hash = (37 * hash) + ARGUMENT_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + argumentType_;
-      hash = (37 * hash) + FORWARD_PEER_FIELD_NUMBER;
-      hash = (53 * hash) + getForwardPeer();
-      hash = (37 * hash) + FORWARD_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + forwardType_;
+      hash = (37 * hash) + ABILITY_DATA_FIELD_NUMBER;
+      hash = (53 * hash) + getAbilityData().hashCode();
       if (hasHead()) {
         hash = (37 * hash) + HEAD_FIELD_NUMBER;
         hash = (53 * hash) + getHead().hashCode();
@@ -505,11 +603,17 @@ public int hashCode() {
           getIsIgnoreAuth());
       hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getEntityId();
+      hash = (37 * hash) + FORWARD_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + forwardType_;
+      hash = (37 * hash) + FORWARD_PEER_FIELD_NUMBER;
+      hash = (53 * hash) + getForwardPeer();
       hash = (37 * hash) + TOTAL_TICK_TIME_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           java.lang.Double.doubleToLongBits(getTotalTickTime()));
-      hash = (37 * hash) + ABILITY_DATA_FIELD_NUMBER;
-      hash = (53 * hash) + getAbilityData().hashCode();
+      hash = (37 * hash) + ARGUMENT_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + argumentType_;
+      hash = (37 * hash) + EVENT_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getEventId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -643,13 +747,7 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        eventId_ = 0;
-
-        argumentType_ = 0;
-
-        forwardPeer_ = 0;
-
-        forwardType_ = 0;
+        abilityData_ = com.google.protobuf.ByteString.EMPTY;
 
         if (headBuilder_ == null) {
           head_ = null;
@@ -661,9 +759,15 @@ public Builder clear() {
 
         entityId_ = 0;
 
+        forwardType_ = 0;
+
+        forwardPeer_ = 0;
+
         totalTickTime_ = 0D;
 
-        abilityData_ = com.google.protobuf.ByteString.EMPTY;
+        argumentType_ = 0;
+
+        eventId_ = 0;
 
         return this;
       }
@@ -691,10 +795,7 @@ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry
       @java.lang.Override
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry buildPartial() {
         emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry result = new emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry(this);
-        result.eventId_ = eventId_;
-        result.argumentType_ = argumentType_;
-        result.forwardPeer_ = forwardPeer_;
-        result.forwardType_ = forwardType_;
+        result.abilityData_ = abilityData_;
         if (headBuilder_ == null) {
           result.head_ = head_;
         } else {
@@ -702,8 +803,11 @@ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry
         }
         result.isIgnoreAuth_ = isIgnoreAuth_;
         result.entityId_ = entityId_;
+        result.forwardType_ = forwardType_;
+        result.forwardPeer_ = forwardPeer_;
         result.totalTickTime_ = totalTickTime_;
-        result.abilityData_ = abilityData_;
+        result.argumentType_ = argumentType_;
+        result.eventId_ = eventId_;
         onBuilt();
         return result;
       }
@@ -752,17 +856,8 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry other) {
         if (other == emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.getDefaultInstance()) return this;
-        if (other.getEventId() != 0) {
-          setEventId(other.getEventId());
-        }
-        if (other.argumentType_ != 0) {
-          setArgumentTypeValue(other.getArgumentTypeValue());
-        }
-        if (other.getForwardPeer() != 0) {
-          setForwardPeer(other.getForwardPeer());
-        }
-        if (other.forwardType_ != 0) {
-          setForwardTypeValue(other.getForwardTypeValue());
+        if (other.getAbilityData() != com.google.protobuf.ByteString.EMPTY) {
+          setAbilityData(other.getAbilityData());
         }
         if (other.hasHead()) {
           mergeHead(other.getHead());
@@ -773,11 +868,20 @@ public Builder mergeFrom(emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.
         if (other.getEntityId() != 0) {
           setEntityId(other.getEntityId());
         }
+        if (other.forwardType_ != 0) {
+          setForwardTypeValue(other.getForwardTypeValue());
+        }
+        if (other.getForwardPeer() != 0) {
+          setForwardPeer(other.getForwardPeer());
+        }
         if (other.getTotalTickTime() != 0D) {
           setTotalTickTime(other.getTotalTickTime());
         }
-        if (other.getAbilityData() != com.google.protobuf.ByteString.EMPTY) {
-          setAbilityData(other.getAbilityData());
+        if (other.argumentType_ != 0) {
+          setArgumentTypeValue(other.getArgumentTypeValue());
+        }
+        if (other.getEventId() != 0) {
+          setEventId(other.getEventId());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -808,172 +912,48 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int eventId_ ;
-      /**
-       * <code>uint32 event_id = 2;</code>
-       * @return The eventId.
-       */
-      @java.lang.Override
-      public int getEventId() {
-        return eventId_;
-      }
-      /**
-       * <code>uint32 event_id = 2;</code>
-       * @param value The eventId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEventId(int value) {
-        
-        eventId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 event_id = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEventId() {
-        
-        eventId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int argumentType_ = 0;
-      /**
-       * <code>.AbilityInvokeArgument argument_type = 3;</code>
-       * @return The enum numeric value on the wire for argumentType.
-       */
-      @java.lang.Override public int getArgumentTypeValue() {
-        return argumentType_;
-      }
-      /**
-       * <code>.AbilityInvokeArgument argument_type = 3;</code>
-       * @param value The enum numeric value on the wire for argumentType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setArgumentTypeValue(int value) {
-        
-        argumentType_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.AbilityInvokeArgument argument_type = 3;</code>
-       * @return The argumentType.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument getArgumentType() {
-        @SuppressWarnings("deprecation")
-        emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument result = emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument.valueOf(argumentType_);
-        return result == null ? emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument.UNRECOGNIZED : result;
-      }
-      /**
-       * <code>.AbilityInvokeArgument argument_type = 3;</code>
-       * @param value The argumentType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setArgumentType(emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        
-        argumentType_ = value.getNumber();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.AbilityInvokeArgument argument_type = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearArgumentType() {
-        
-        argumentType_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int forwardPeer_ ;
-      /**
-       * <code>uint32 forward_peer = 4;</code>
-       * @return The forwardPeer.
-       */
-      @java.lang.Override
-      public int getForwardPeer() {
-        return forwardPeer_;
-      }
-      /**
-       * <code>uint32 forward_peer = 4;</code>
-       * @param value The forwardPeer to set.
-       * @return This builder for chaining.
-       */
-      public Builder setForwardPeer(int value) {
-        
-        forwardPeer_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 forward_peer = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearForwardPeer() {
-        
-        forwardPeer_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int forwardType_ = 0;
-      /**
-       * <code>.ForwardType forward_type = 7;</code>
-       * @return The enum numeric value on the wire for forwardType.
-       */
-      @java.lang.Override public int getForwardTypeValue() {
-        return forwardType_;
-      }
-      /**
-       * <code>.ForwardType forward_type = 7;</code>
-       * @param value The enum numeric value on the wire for forwardType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setForwardTypeValue(int value) {
-        
-        forwardType_ = value;
-        onChanged();
-        return this;
-      }
+      private com.google.protobuf.ByteString abilityData_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>.ForwardType forward_type = 7;</code>
-       * @return The forwardType.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>bytes ability_data = 15;</code>
+       * @return The abilityData.
        */
       @java.lang.Override
-      public emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType() {
-        @SuppressWarnings("deprecation")
-        emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType result = emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.valueOf(forwardType_);
-        return result == null ? emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.UNRECOGNIZED : result;
+      public com.google.protobuf.ByteString getAbilityData() {
+        return abilityData_;
       }
       /**
-       * <code>.ForwardType forward_type = 7;</code>
-       * @param value The forwardType to set.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>bytes ability_data = 15;</code>
+       * @param value The abilityData to set.
        * @return This builder for chaining.
        */
-      public Builder setForwardType(emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType value) {
+      public Builder setAbilityData(com.google.protobuf.ByteString value) {
         if (value == null) {
-          throw new NullPointerException();
-        }
-        
-        forwardType_ = value.getNumber();
+    throw new NullPointerException();
+  }
+  
+        abilityData_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>.ForwardType forward_type = 7;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>bytes ability_data = 15;</code>
        * @return This builder for chaining.
        */
-      public Builder clearForwardType() {
+      public Builder clearAbilityData() {
         
-        forwardType_ = 0;
+        abilityData_ = getDefaultInstance().getAbilityData();
         onChanged();
         return this;
       }
@@ -982,14 +962,22 @@ public Builder clearForwardType() {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead, emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead.Builder, emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHeadOrBuilder> headBuilder_;
       /**
-       * <code>.AbilityInvokeEntryHead head = 8;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.AbilityInvokeEntryHead head = 4;</code>
        * @return Whether the head field is set.
        */
       public boolean hasHead() {
         return headBuilder_ != null || head_ != null;
       }
       /**
-       * <code>.AbilityInvokeEntryHead head = 8;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.AbilityInvokeEntryHead head = 4;</code>
        * @return The head.
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead getHead() {
@@ -1000,7 +988,11 @@ public emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeE
         }
       }
       /**
-       * <code>.AbilityInvokeEntryHead head = 8;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.AbilityInvokeEntryHead head = 4;</code>
        */
       public Builder setHead(emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead value) {
         if (headBuilder_ == null) {
@@ -1016,7 +1008,11 @@ public Builder setHead(emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClas
         return this;
       }
       /**
-       * <code>.AbilityInvokeEntryHead head = 8;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.AbilityInvokeEntryHead head = 4;</code>
        */
       public Builder setHead(
           emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead.Builder builderForValue) {
@@ -1030,7 +1026,11 @@ public Builder setHead(
         return this;
       }
       /**
-       * <code>.AbilityInvokeEntryHead head = 8;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.AbilityInvokeEntryHead head = 4;</code>
        */
       public Builder mergeHead(emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead value) {
         if (headBuilder_ == null) {
@@ -1048,7 +1048,11 @@ public Builder mergeHead(emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterCl
         return this;
       }
       /**
-       * <code>.AbilityInvokeEntryHead head = 8;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.AbilityInvokeEntryHead head = 4;</code>
        */
       public Builder clearHead() {
         if (headBuilder_ == null) {
@@ -1062,7 +1066,11 @@ public Builder clearHead() {
         return this;
       }
       /**
-       * <code>.AbilityInvokeEntryHead head = 8;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.AbilityInvokeEntryHead head = 4;</code>
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead.Builder getHeadBuilder() {
         
@@ -1070,7 +1078,11 @@ public emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeE
         return getHeadFieldBuilder().getBuilder();
       }
       /**
-       * <code>.AbilityInvokeEntryHead head = 8;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.AbilityInvokeEntryHead head = 4;</code>
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHeadOrBuilder getHeadOrBuilder() {
         if (headBuilder_ != null) {
@@ -1081,7 +1093,11 @@ public emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeE
         }
       }
       /**
-       * <code>.AbilityInvokeEntryHead head = 8;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.AbilityInvokeEntryHead head = 4;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead, emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead.Builder, emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHeadOrBuilder> 
@@ -1099,7 +1115,11 @@ public emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeE
 
       private boolean isIgnoreAuth_ ;
       /**
-       * <code>bool is_ignore_auth = 9;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>bool is_ignore_auth = 6;</code>
        * @return The isIgnoreAuth.
        */
       @java.lang.Override
@@ -1107,7 +1127,11 @@ public boolean getIsIgnoreAuth() {
         return isIgnoreAuth_;
       }
       /**
-       * <code>bool is_ignore_auth = 9;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>bool is_ignore_auth = 6;</code>
        * @param value The isIgnoreAuth to set.
        * @return This builder for chaining.
        */
@@ -1118,7 +1142,11 @@ public Builder setIsIgnoreAuth(boolean value) {
         return this;
       }
       /**
-       * <code>bool is_ignore_auth = 9;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>bool is_ignore_auth = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsIgnoreAuth() {
@@ -1130,6 +1158,10 @@ public Builder clearIsIgnoreAuth() {
 
       private int entityId_ ;
       /**
+       * <pre>
+       * Offset: 0x34
+       * </pre>
+       *
        * <code>uint32 entity_id = 11;</code>
        * @return The entityId.
        */
@@ -1138,6 +1170,10 @@ public int getEntityId() {
         return entityId_;
       }
       /**
+       * <pre>
+       * Offset: 0x34
+       * </pre>
+       *
        * <code>uint32 entity_id = 11;</code>
        * @param value The entityId to set.
        * @return This builder for chaining.
@@ -1149,6 +1185,10 @@ public Builder setEntityId(int value) {
         return this;
       }
       /**
+       * <pre>
+       * Offset: 0x34
+       * </pre>
+       *
        * <code>uint32 entity_id = 11;</code>
        * @return This builder for chaining.
        */
@@ -1159,9 +1199,130 @@ public Builder clearEntityId() {
         return this;
       }
 
+      private int forwardType_ = 0;
+      /**
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>.ForwardType forward_type = 9;</code>
+       * @return The enum numeric value on the wire for forwardType.
+       */
+      @java.lang.Override public int getForwardTypeValue() {
+        return forwardType_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>.ForwardType forward_type = 9;</code>
+       * @param value The enum numeric value on the wire for forwardType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setForwardTypeValue(int value) {
+        
+        forwardType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>.ForwardType forward_type = 9;</code>
+       * @return The forwardType.
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType() {
+        @SuppressWarnings("deprecation")
+        emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType result = emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.valueOf(forwardType_);
+        return result == null ? emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.UNRECOGNIZED : result;
+      }
+      /**
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>.ForwardType forward_type = 9;</code>
+       * @param value The forwardType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setForwardType(emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        
+        forwardType_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>.ForwardType forward_type = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearForwardType() {
+        
+        forwardType_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int forwardPeer_ ;
+      /**
+       * <pre>
+       * Offset: 0x3C
+       * </pre>
+       *
+       * <code>uint32 forward_peer = 13;</code>
+       * @return The forwardPeer.
+       */
+      @java.lang.Override
+      public int getForwardPeer() {
+        return forwardPeer_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x3C
+       * </pre>
+       *
+       * <code>uint32 forward_peer = 13;</code>
+       * @param value The forwardPeer to set.
+       * @return This builder for chaining.
+       */
+      public Builder setForwardPeer(int value) {
+        
+        forwardPeer_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x3C
+       * </pre>
+       *
+       * <code>uint32 forward_peer = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearForwardPeer() {
+        
+        forwardPeer_ = 0;
+        onChanged();
+        return this;
+      }
+
       private double totalTickTime_ ;
       /**
-       * <code>double total_tick_time = 12;</code>
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>double total_tick_time = 10;</code>
        * @return The totalTickTime.
        */
       @java.lang.Override
@@ -1169,7 +1330,11 @@ public double getTotalTickTime() {
         return totalTickTime_;
       }
       /**
-       * <code>double total_tick_time = 12;</code>
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>double total_tick_time = 10;</code>
        * @param value The totalTickTime to set.
        * @return This builder for chaining.
        */
@@ -1180,7 +1345,11 @@ public Builder setTotalTickTime(double value) {
         return this;
       }
       /**
-       * <code>double total_tick_time = 12;</code>
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>double total_tick_time = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearTotalTickTime() {
@@ -1190,36 +1359,119 @@ public Builder clearTotalTickTime() {
         return this;
       }
 
-      private com.google.protobuf.ByteString abilityData_ = com.google.protobuf.ByteString.EMPTY;
+      private int argumentType_ = 0;
       /**
-       * <code>bytes ability_data = 14;</code>
-       * @return The abilityData.
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>.AbilityInvokeArgument argument_type = 7;</code>
+       * @return The enum numeric value on the wire for argumentType.
+       */
+      @java.lang.Override public int getArgumentTypeValue() {
+        return argumentType_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>.AbilityInvokeArgument argument_type = 7;</code>
+       * @param value The enum numeric value on the wire for argumentType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setArgumentTypeValue(int value) {
+        
+        argumentType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>.AbilityInvokeArgument argument_type = 7;</code>
+       * @return The argumentType.
        */
       @java.lang.Override
-      public com.google.protobuf.ByteString getAbilityData() {
-        return abilityData_;
+      public emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument getArgumentType() {
+        @SuppressWarnings("deprecation")
+        emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument result = emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument.valueOf(argumentType_);
+        return result == null ? emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument.UNRECOGNIZED : result;
       }
       /**
-       * <code>bytes ability_data = 14;</code>
-       * @param value The abilityData to set.
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>.AbilityInvokeArgument argument_type = 7;</code>
+       * @param value The argumentType to set.
        * @return This builder for chaining.
        */
-      public Builder setAbilityData(com.google.protobuf.ByteString value) {
+      public Builder setArgumentType(emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument value) {
         if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        abilityData_ = value;
+          throw new NullPointerException();
+        }
+        
+        argumentType_ = value.getNumber();
         onChanged();
         return this;
       }
       /**
-       * <code>bytes ability_data = 14;</code>
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>.AbilityInvokeArgument argument_type = 7;</code>
        * @return This builder for chaining.
        */
-      public Builder clearAbilityData() {
+      public Builder clearArgumentType() {
         
-        abilityData_ = getDefaultInstance().getAbilityData();
+        argumentType_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int eventId_ ;
+      /**
+       * <pre>
+       * Offset: 0x4C
+       * </pre>
+       *
+       * <code>uint32 event_id = 8;</code>
+       * @return The eventId.
+       */
+      @java.lang.Override
+      public int getEventId() {
+        return eventId_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x4C
+       * </pre>
+       *
+       * <code>uint32 event_id = 8;</code>
+       * @param value The eventId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setEventId(int value) {
+        
+        eventId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x4C
+       * </pre>
+       *
+       * <code>uint32 event_id = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEventId() {
+        
+        eventId_ = 0;
         onChanged();
         return this;
       }
@@ -1293,13 +1545,13 @@ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry
       "\n\030AbilityInvokeEntry.proto\032\033AbilityInvok" +
       "eArgument.proto\032\034AbilityInvokeEntryHead." +
       "proto\032\021ForwardType.proto\"\220\002\n\022AbilityInvo" +
-      "keEntry\022\020\n\010event_id\030\002 \001(\r\022-\n\rargument_ty" +
-      "pe\030\003 \001(\0162\026.AbilityInvokeArgument\022\024\n\014forw" +
-      "ard_peer\030\004 \001(\r\022\"\n\014forward_type\030\007 \001(\0162\014.F" +
-      "orwardType\022%\n\004head\030\010 \001(\0132\027.AbilityInvoke" +
-      "EntryHead\022\026\n\016is_ignore_auth\030\t \001(\010\022\021\n\tent" +
-      "ity_id\030\013 \001(\r\022\027\n\017total_tick_time\030\014 \001(\001\022\024\n" +
-      "\014ability_data\030\016 \001(\014B\033\n\031emu.grasscutter.n" +
+      "keEntry\022\024\n\014ability_data\030\017 \001(\014\022%\n\004head\030\004 " +
+      "\001(\0132\027.AbilityInvokeEntryHead\022\026\n\016is_ignor" +
+      "e_auth\030\006 \001(\010\022\021\n\tentity_id\030\013 \001(\r\022\"\n\014forwa" +
+      "rd_type\030\t \001(\0162\014.ForwardType\022\024\n\014forward_p" +
+      "eer\030\r \001(\r\022\027\n\017total_tick_time\030\n \001(\001\022-\n\rar" +
+      "gument_type\030\007 \001(\0162\026.AbilityInvokeArgumen" +
+      "t\022\020\n\010event_id\030\010 \001(\rB\033\n\031emu.grasscutter.n" +
       "et.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1314,7 +1566,7 @@ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry
     internal_static_AbilityInvokeEntry_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AbilityInvokeEntry_descriptor,
-        new java.lang.String[] { "EventId", "ArgumentType", "ForwardPeer", "ForwardType", "Head", "IsIgnoreAuth", "EntityId", "TotalTickTime", "AbilityData", });
+        new java.lang.String[] { "AbilityData", "Head", "IsIgnoreAuth", "EntityId", "ForwardType", "ForwardPeer", "TotalTickTime", "ArgumentType", "EventId", });
     emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.getDescriptor();
     emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.getDescriptor();
     emu.grasscutter.net.proto.ForwardTypeOuterClass.getDescriptor();
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AchievementAllDataNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AchievementAllDataNotifyOuterClass.java
index c4d1866b775..b7a2221f00c 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AchievementAllDataNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AchievementAllDataNotifyOuterClass.java
@@ -19,41 +19,73 @@ public interface AchievementAllDataNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .Achievement achievement_list = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Achievement achievement_list = 9;</code>
      */
     java.util.List<emu.grasscutter.net.proto.AchievementOuterClass.Achievement> 
         getAchievementListList();
     /**
-     * <code>repeated .Achievement achievement_list = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Achievement achievement_list = 9;</code>
      */
     emu.grasscutter.net.proto.AchievementOuterClass.Achievement getAchievementList(int index);
     /**
-     * <code>repeated .Achievement achievement_list = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Achievement achievement_list = 9;</code>
      */
     int getAchievementListCount();
     /**
-     * <code>repeated .Achievement achievement_list = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Achievement achievement_list = 9;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder> 
         getAchievementListOrBuilderList();
     /**
-     * <code>repeated .Achievement achievement_list = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Achievement achievement_list = 9;</code>
      */
     emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder getAchievementListOrBuilder(
         int index);
 
     /**
-     * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated uint32 reward_taken_goal_id_list = 7;</code>
      * @return A list containing the rewardTakenGoalIdList.
      */
     java.util.List<java.lang.Integer> getRewardTakenGoalIdListList();
     /**
-     * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated uint32 reward_taken_goal_id_list = 7;</code>
      * @return The count of rewardTakenGoalIdList.
      */
     int getRewardTakenGoalIdListCount();
     /**
-     * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated uint32 reward_taken_goal_id_list = 7;</code>
      * @param index The index of the element to return.
      * @return The rewardTakenGoalIdList at the given index.
      */
@@ -61,7 +93,7 @@ emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder getAchievem
   }
   /**
    * <pre>
-   * CmdId: 259
+   * CmdId: 1007
    * </pre>
    *
    * Protobuf type {@code AchievementAllDataNotify}
@@ -111,16 +143,7 @@ private AchievementAllDataNotify(
             case 0:
               done = true;
               break;
-            case 66: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                achievementList_ = new java.util.ArrayList<emu.grasscutter.net.proto.AchievementOuterClass.Achievement>();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              achievementList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.AchievementOuterClass.Achievement.parser(), extensionRegistry));
-              break;
-            }
-            case 120: {
+            case 56: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 rewardTakenGoalIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
@@ -128,7 +151,7 @@ private AchievementAllDataNotify(
               rewardTakenGoalIdList_.addInt(input.readUInt32());
               break;
             }
-            case 122: {
+            case 58: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
@@ -141,6 +164,15 @@ private AchievementAllDataNotify(
               input.popLimit(limit);
               break;
             }
+            case 74: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                achievementList_ = new java.util.ArrayList<emu.grasscutter.net.proto.AchievementOuterClass.Achievement>();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              achievementList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.AchievementOuterClass.Achievement.parser(), extensionRegistry));
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -156,12 +188,12 @@ private AchievementAllDataNotify(
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          achievementList_ = java.util.Collections.unmodifiableList(achievementList_);
-        }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
           rewardTakenGoalIdList_.makeImmutable(); // C
         }
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          achievementList_ = java.util.Collections.unmodifiableList(achievementList_);
+        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -179,17 +211,25 @@ private AchievementAllDataNotify(
               emu.grasscutter.net.proto.AchievementAllDataNotifyOuterClass.AchievementAllDataNotify.class, emu.grasscutter.net.proto.AchievementAllDataNotifyOuterClass.AchievementAllDataNotify.Builder.class);
     }
 
-    public static final int ACHIEVEMENT_LIST_FIELD_NUMBER = 8;
+    public static final int ACHIEVEMENT_LIST_FIELD_NUMBER = 9;
     private java.util.List<emu.grasscutter.net.proto.AchievementOuterClass.Achievement> achievementList_;
     /**
-     * <code>repeated .Achievement achievement_list = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Achievement achievement_list = 9;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.AchievementOuterClass.Achievement> getAchievementListList() {
       return achievementList_;
     }
     /**
-     * <code>repeated .Achievement achievement_list = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Achievement achievement_list = 9;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder> 
@@ -197,21 +237,33 @@ public java.util.List<emu.grasscutter.net.proto.AchievementOuterClass.Achievemen
       return achievementList_;
     }
     /**
-     * <code>repeated .Achievement achievement_list = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Achievement achievement_list = 9;</code>
      */
     @java.lang.Override
     public int getAchievementListCount() {
       return achievementList_.size();
     }
     /**
-     * <code>repeated .Achievement achievement_list = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Achievement achievement_list = 9;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AchievementOuterClass.Achievement getAchievementList(int index) {
       return achievementList_.get(index);
     }
     /**
-     * <code>repeated .Achievement achievement_list = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Achievement achievement_list = 9;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder getAchievementListOrBuilder(
@@ -219,10 +271,14 @@ public emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder getA
       return achievementList_.get(index);
     }
 
-    public static final int REWARD_TAKEN_GOAL_ID_LIST_FIELD_NUMBER = 15;
+    public static final int REWARD_TAKEN_GOAL_ID_LIST_FIELD_NUMBER = 7;
     private com.google.protobuf.Internal.IntList rewardTakenGoalIdList_;
     /**
-     * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated uint32 reward_taken_goal_id_list = 7;</code>
      * @return A list containing the rewardTakenGoalIdList.
      */
     @java.lang.Override
@@ -231,14 +287,22 @@ public emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder getA
       return rewardTakenGoalIdList_;
     }
     /**
-     * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated uint32 reward_taken_goal_id_list = 7;</code>
      * @return The count of rewardTakenGoalIdList.
      */
     public int getRewardTakenGoalIdListCount() {
       return rewardTakenGoalIdList_.size();
     }
     /**
-     * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated uint32 reward_taken_goal_id_list = 7;</code>
      * @param index The index of the element to return.
      * @return The rewardTakenGoalIdList at the given index.
      */
@@ -262,16 +326,16 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      for (int i = 0; i < achievementList_.size(); i++) {
-        output.writeMessage(8, achievementList_.get(i));
-      }
       if (getRewardTakenGoalIdListList().size() > 0) {
-        output.writeUInt32NoTag(122);
+        output.writeUInt32NoTag(58);
         output.writeUInt32NoTag(rewardTakenGoalIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < rewardTakenGoalIdList_.size(); i++) {
         output.writeUInt32NoTag(rewardTakenGoalIdList_.getInt(i));
       }
+      for (int i = 0; i < achievementList_.size(); i++) {
+        output.writeMessage(9, achievementList_.get(i));
+      }
       unknownFields.writeTo(output);
     }
 
@@ -281,10 +345,6 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      for (int i = 0; i < achievementList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(8, achievementList_.get(i));
-      }
       {
         int dataSize = 0;
         for (int i = 0; i < rewardTakenGoalIdList_.size(); i++) {
@@ -299,6 +359,10 @@ public int getSerializedSize() {
         }
         rewardTakenGoalIdListMemoizedSerializedSize = dataSize;
       }
+      for (int i = 0; i < achievementList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(9, achievementList_.get(i));
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -434,7 +498,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 259
+     * CmdId: 1007
      * </pre>
      *
      * Protobuf type {@code AchievementAllDataNotify}
@@ -651,7 +715,11 @@ private void ensureAchievementListIsMutable() {
           emu.grasscutter.net.proto.AchievementOuterClass.Achievement, emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder, emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder> achievementListBuilder_;
 
       /**
-       * <code>repeated .Achievement achievement_list = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Achievement achievement_list = 9;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AchievementOuterClass.Achievement> getAchievementListList() {
         if (achievementListBuilder_ == null) {
@@ -661,7 +729,11 @@ public java.util.List<emu.grasscutter.net.proto.AchievementOuterClass.Achievemen
         }
       }
       /**
-       * <code>repeated .Achievement achievement_list = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Achievement achievement_list = 9;</code>
        */
       public int getAchievementListCount() {
         if (achievementListBuilder_ == null) {
@@ -671,7 +743,11 @@ public int getAchievementListCount() {
         }
       }
       /**
-       * <code>repeated .Achievement achievement_list = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Achievement achievement_list = 9;</code>
        */
       public emu.grasscutter.net.proto.AchievementOuterClass.Achievement getAchievementList(int index) {
         if (achievementListBuilder_ == null) {
@@ -681,7 +757,11 @@ public emu.grasscutter.net.proto.AchievementOuterClass.Achievement getAchievemen
         }
       }
       /**
-       * <code>repeated .Achievement achievement_list = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Achievement achievement_list = 9;</code>
        */
       public Builder setAchievementList(
           int index, emu.grasscutter.net.proto.AchievementOuterClass.Achievement value) {
@@ -698,7 +778,11 @@ public Builder setAchievementList(
         return this;
       }
       /**
-       * <code>repeated .Achievement achievement_list = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Achievement achievement_list = 9;</code>
        */
       public Builder setAchievementList(
           int index, emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder builderForValue) {
@@ -712,7 +796,11 @@ public Builder setAchievementList(
         return this;
       }
       /**
-       * <code>repeated .Achievement achievement_list = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Achievement achievement_list = 9;</code>
        */
       public Builder addAchievementList(emu.grasscutter.net.proto.AchievementOuterClass.Achievement value) {
         if (achievementListBuilder_ == null) {
@@ -728,7 +816,11 @@ public Builder addAchievementList(emu.grasscutter.net.proto.AchievementOuterClas
         return this;
       }
       /**
-       * <code>repeated .Achievement achievement_list = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Achievement achievement_list = 9;</code>
        */
       public Builder addAchievementList(
           int index, emu.grasscutter.net.proto.AchievementOuterClass.Achievement value) {
@@ -745,7 +837,11 @@ public Builder addAchievementList(
         return this;
       }
       /**
-       * <code>repeated .Achievement achievement_list = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Achievement achievement_list = 9;</code>
        */
       public Builder addAchievementList(
           emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder builderForValue) {
@@ -759,7 +855,11 @@ public Builder addAchievementList(
         return this;
       }
       /**
-       * <code>repeated .Achievement achievement_list = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Achievement achievement_list = 9;</code>
        */
       public Builder addAchievementList(
           int index, emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder builderForValue) {
@@ -773,7 +873,11 @@ public Builder addAchievementList(
         return this;
       }
       /**
-       * <code>repeated .Achievement achievement_list = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Achievement achievement_list = 9;</code>
        */
       public Builder addAllAchievementList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.AchievementOuterClass.Achievement> values) {
@@ -788,7 +892,11 @@ public Builder addAllAchievementList(
         return this;
       }
       /**
-       * <code>repeated .Achievement achievement_list = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Achievement achievement_list = 9;</code>
        */
       public Builder clearAchievementList() {
         if (achievementListBuilder_ == null) {
@@ -801,7 +909,11 @@ public Builder clearAchievementList() {
         return this;
       }
       /**
-       * <code>repeated .Achievement achievement_list = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Achievement achievement_list = 9;</code>
        */
       public Builder removeAchievementList(int index) {
         if (achievementListBuilder_ == null) {
@@ -814,14 +926,22 @@ public Builder removeAchievementList(int index) {
         return this;
       }
       /**
-       * <code>repeated .Achievement achievement_list = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Achievement achievement_list = 9;</code>
        */
       public emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder getAchievementListBuilder(
           int index) {
         return getAchievementListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .Achievement achievement_list = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Achievement achievement_list = 9;</code>
        */
       public emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder getAchievementListOrBuilder(
           int index) {
@@ -831,7 +951,11 @@ public emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder getA
         }
       }
       /**
-       * <code>repeated .Achievement achievement_list = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Achievement achievement_list = 9;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder> 
            getAchievementListOrBuilderList() {
@@ -842,14 +966,22 @@ public emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder getA
         }
       }
       /**
-       * <code>repeated .Achievement achievement_list = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Achievement achievement_list = 9;</code>
        */
       public emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder addAchievementListBuilder() {
         return getAchievementListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.AchievementOuterClass.Achievement.getDefaultInstance());
       }
       /**
-       * <code>repeated .Achievement achievement_list = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Achievement achievement_list = 9;</code>
        */
       public emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder addAchievementListBuilder(
           int index) {
@@ -857,7 +989,11 @@ public emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder addAc
             index, emu.grasscutter.net.proto.AchievementOuterClass.Achievement.getDefaultInstance());
       }
       /**
-       * <code>repeated .Achievement achievement_list = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Achievement achievement_list = 9;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder> 
            getAchievementListBuilderList() {
@@ -886,7 +1022,11 @@ private void ensureRewardTakenGoalIdListIsMutable() {
          }
       }
       /**
-       * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated uint32 reward_taken_goal_id_list = 7;</code>
        * @return A list containing the rewardTakenGoalIdList.
        */
       public java.util.List<java.lang.Integer>
@@ -895,14 +1035,22 @@ private void ensureRewardTakenGoalIdListIsMutable() {
                  java.util.Collections.unmodifiableList(rewardTakenGoalIdList_) : rewardTakenGoalIdList_;
       }
       /**
-       * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated uint32 reward_taken_goal_id_list = 7;</code>
        * @return The count of rewardTakenGoalIdList.
        */
       public int getRewardTakenGoalIdListCount() {
         return rewardTakenGoalIdList_.size();
       }
       /**
-       * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated uint32 reward_taken_goal_id_list = 7;</code>
        * @param index The index of the element to return.
        * @return The rewardTakenGoalIdList at the given index.
        */
@@ -910,7 +1058,11 @@ public int getRewardTakenGoalIdList(int index) {
         return rewardTakenGoalIdList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated uint32 reward_taken_goal_id_list = 7;</code>
        * @param index The index to set the value at.
        * @param value The rewardTakenGoalIdList to set.
        * @return This builder for chaining.
@@ -923,7 +1075,11 @@ public Builder setRewardTakenGoalIdList(
         return this;
       }
       /**
-       * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated uint32 reward_taken_goal_id_list = 7;</code>
        * @param value The rewardTakenGoalIdList to add.
        * @return This builder for chaining.
        */
@@ -934,7 +1090,11 @@ public Builder addRewardTakenGoalIdList(int value) {
         return this;
       }
       /**
-       * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated uint32 reward_taken_goal_id_list = 7;</code>
        * @param values The rewardTakenGoalIdList to add.
        * @return This builder for chaining.
        */
@@ -947,7 +1107,11 @@ public Builder addAllRewardTakenGoalIdList(
         return this;
       }
       /**
-       * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated uint32 reward_taken_goal_id_list = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearRewardTakenGoalIdList() {
@@ -1025,8 +1189,8 @@ public emu.grasscutter.net.proto.AchievementAllDataNotifyOuterClass.AchievementA
     java.lang.String[] descriptorData = {
       "\n\036AchievementAllDataNotify.proto\032\021Achiev" +
       "ement.proto\"e\n\030AchievementAllDataNotify\022" +
-      "&\n\020achievement_list\030\010 \003(\0132\014.Achievement\022" +
-      "!\n\031reward_taken_goal_id_list\030\017 \003(\rB\033\n\031em" +
+      "&\n\020achievement_list\030\t \003(\0132\014.Achievement\022" +
+      "!\n\031reward_taken_goal_id_list\030\007 \003(\rB\033\n\031em" +
       "u.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AchievementOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AchievementOuterClass.java
index 85e2689b1ca..cae27232820 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AchievementOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AchievementOuterClass.java
@@ -19,36 +19,60 @@ public interface AchievementOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 cur_progress = 3;</code>
-     * @return The curProgress.
-     */
-    int getCurProgress();
-
-    /**
-     * <code>uint32 total_progress = 4;</code>
-     * @return The totalProgress.
-     */
-    int getTotalProgress();
-
-    /**
-     * <code>uint32 finish_timestamp = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 finish_timestamp = 7;</code>
      * @return The finishTimestamp.
      */
     int getFinishTimestamp();
 
     /**
-     * <code>.Achievement.Status status = 9;</code>
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>.Achievement.Status status = 5;</code>
      * @return The enum numeric value on the wire for status.
      */
     int getStatusValue();
     /**
-     * <code>.Achievement.Status status = 9;</code>
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>.Achievement.Status status = 5;</code>
      * @return The status.
      */
     emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status getStatus();
 
     /**
-     * <code>uint32 id = 15;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 total_progress = 12;</code>
+     * @return The totalProgress.
+     */
+    int getTotalProgress();
+
+    /**
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>uint32 cur_progress = 8;</code>
+     * @return The curProgress.
+     */
+    int getCurProgress();
+
+    /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>uint32 id = 13;</code>
      * @return The id.
      */
     int getId();
@@ -99,28 +123,28 @@ private Achievement(
             case 0:
               done = true;
               break;
-            case 24: {
+            case 40: {
+              int rawValue = input.readEnum();
 
-              curProgress_ = input.readUInt32();
+              status_ = rawValue;
               break;
             }
-            case 32: {
+            case 56: {
 
-              totalProgress_ = input.readUInt32();
+              finishTimestamp_ = input.readUInt32();
               break;
             }
             case 64: {
 
-              finishTimestamp_ = input.readUInt32();
+              curProgress_ = input.readUInt32();
               break;
             }
-            case 72: {
-              int rawValue = input.readEnum();
+            case 96: {
 
-              status_ = rawValue;
+              totalProgress_ = input.readUInt32();
               break;
             }
-            case 120: {
+            case 104: {
 
               id_ = input.readUInt32();
               break;
@@ -283,32 +307,14 @@ private Status(int value) {
       // @@protoc_insertion_point(enum_scope:Achievement.Status)
     }
 
-    public static final int CUR_PROGRESS_FIELD_NUMBER = 3;
-    private int curProgress_;
-    /**
-     * <code>uint32 cur_progress = 3;</code>
-     * @return The curProgress.
-     */
-    @java.lang.Override
-    public int getCurProgress() {
-      return curProgress_;
-    }
-
-    public static final int TOTAL_PROGRESS_FIELD_NUMBER = 4;
-    private int totalProgress_;
-    /**
-     * <code>uint32 total_progress = 4;</code>
-     * @return The totalProgress.
-     */
-    @java.lang.Override
-    public int getTotalProgress() {
-      return totalProgress_;
-    }
-
-    public static final int FINISH_TIMESTAMP_FIELD_NUMBER = 8;
+    public static final int FINISH_TIMESTAMP_FIELD_NUMBER = 7;
     private int finishTimestamp_;
     /**
-     * <code>uint32 finish_timestamp = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 finish_timestamp = 7;</code>
      * @return The finishTimestamp.
      */
     @java.lang.Override
@@ -316,17 +322,25 @@ public int getFinishTimestamp() {
       return finishTimestamp_;
     }
 
-    public static final int STATUS_FIELD_NUMBER = 9;
+    public static final int STATUS_FIELD_NUMBER = 5;
     private int status_;
     /**
-     * <code>.Achievement.Status status = 9;</code>
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>.Achievement.Status status = 5;</code>
      * @return The enum numeric value on the wire for status.
      */
     @java.lang.Override public int getStatusValue() {
       return status_;
     }
     /**
-     * <code>.Achievement.Status status = 9;</code>
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>.Achievement.Status status = 5;</code>
      * @return The status.
      */
     @java.lang.Override public emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status getStatus() {
@@ -335,10 +349,44 @@ public int getFinishTimestamp() {
       return result == null ? emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.UNRECOGNIZED : result;
     }
 
-    public static final int ID_FIELD_NUMBER = 15;
+    public static final int TOTAL_PROGRESS_FIELD_NUMBER = 12;
+    private int totalProgress_;
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 total_progress = 12;</code>
+     * @return The totalProgress.
+     */
+    @java.lang.Override
+    public int getTotalProgress() {
+      return totalProgress_;
+    }
+
+    public static final int CUR_PROGRESS_FIELD_NUMBER = 8;
+    private int curProgress_;
+    /**
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>uint32 cur_progress = 8;</code>
+     * @return The curProgress.
+     */
+    @java.lang.Override
+    public int getCurProgress() {
+      return curProgress_;
+    }
+
+    public static final int ID_FIELD_NUMBER = 13;
     private int id_;
     /**
-     * <code>uint32 id = 15;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>uint32 id = 13;</code>
      * @return The id.
      */
     @java.lang.Override
@@ -360,20 +408,20 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (curProgress_ != 0) {
-        output.writeUInt32(3, curProgress_);
-      }
-      if (totalProgress_ != 0) {
-        output.writeUInt32(4, totalProgress_);
+      if (status_ != emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.STATUS_INVALID.getNumber()) {
+        output.writeEnum(5, status_);
       }
       if (finishTimestamp_ != 0) {
-        output.writeUInt32(8, finishTimestamp_);
+        output.writeUInt32(7, finishTimestamp_);
       }
-      if (status_ != emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.STATUS_INVALID.getNumber()) {
-        output.writeEnum(9, status_);
+      if (curProgress_ != 0) {
+        output.writeUInt32(8, curProgress_);
+      }
+      if (totalProgress_ != 0) {
+        output.writeUInt32(12, totalProgress_);
       }
       if (id_ != 0) {
-        output.writeUInt32(15, id_);
+        output.writeUInt32(13, id_);
       }
       unknownFields.writeTo(output);
     }
@@ -384,25 +432,25 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (curProgress_ != 0) {
+      if (status_ != emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.STATUS_INVALID.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, curProgress_);
+          .computeEnumSize(5, status_);
       }
-      if (totalProgress_ != 0) {
+      if (finishTimestamp_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, totalProgress_);
+          .computeUInt32Size(7, finishTimestamp_);
       }
-      if (finishTimestamp_ != 0) {
+      if (curProgress_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, finishTimestamp_);
+          .computeUInt32Size(8, curProgress_);
       }
-      if (status_ != emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.STATUS_INVALID.getNumber()) {
+      if (totalProgress_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(9, status_);
+          .computeUInt32Size(12, totalProgress_);
       }
       if (id_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, id_);
+          .computeUInt32Size(13, id_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -419,13 +467,13 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.AchievementOuterClass.Achievement other = (emu.grasscutter.net.proto.AchievementOuterClass.Achievement) obj;
 
-      if (getCurProgress()
-          != other.getCurProgress()) return false;
-      if (getTotalProgress()
-          != other.getTotalProgress()) return false;
       if (getFinishTimestamp()
           != other.getFinishTimestamp()) return false;
       if (status_ != other.status_) return false;
+      if (getTotalProgress()
+          != other.getTotalProgress()) return false;
+      if (getCurProgress()
+          != other.getCurProgress()) return false;
       if (getId()
           != other.getId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -439,14 +487,14 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + CUR_PROGRESS_FIELD_NUMBER;
-      hash = (53 * hash) + getCurProgress();
-      hash = (37 * hash) + TOTAL_PROGRESS_FIELD_NUMBER;
-      hash = (53 * hash) + getTotalProgress();
       hash = (37 * hash) + FINISH_TIMESTAMP_FIELD_NUMBER;
       hash = (53 * hash) + getFinishTimestamp();
       hash = (37 * hash) + STATUS_FIELD_NUMBER;
       hash = (53 * hash) + status_;
+      hash = (37 * hash) + TOTAL_PROGRESS_FIELD_NUMBER;
+      hash = (53 * hash) + getTotalProgress();
+      hash = (37 * hash) + CUR_PROGRESS_FIELD_NUMBER;
+      hash = (53 * hash) + getCurProgress();
       hash = (37 * hash) + ID_FIELD_NUMBER;
       hash = (53 * hash) + getId();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -582,14 +630,14 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        curProgress_ = 0;
-
-        totalProgress_ = 0;
-
         finishTimestamp_ = 0;
 
         status_ = 0;
 
+        totalProgress_ = 0;
+
+        curProgress_ = 0;
+
         id_ = 0;
 
         return this;
@@ -618,10 +666,10 @@ public emu.grasscutter.net.proto.AchievementOuterClass.Achievement build() {
       @java.lang.Override
       public emu.grasscutter.net.proto.AchievementOuterClass.Achievement buildPartial() {
         emu.grasscutter.net.proto.AchievementOuterClass.Achievement result = new emu.grasscutter.net.proto.AchievementOuterClass.Achievement(this);
-        result.curProgress_ = curProgress_;
-        result.totalProgress_ = totalProgress_;
         result.finishTimestamp_ = finishTimestamp_;
         result.status_ = status_;
+        result.totalProgress_ = totalProgress_;
+        result.curProgress_ = curProgress_;
         result.id_ = id_;
         onBuilt();
         return result;
@@ -671,18 +719,18 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AchievementOuterClass.Achievement other) {
         if (other == emu.grasscutter.net.proto.AchievementOuterClass.Achievement.getDefaultInstance()) return this;
-        if (other.getCurProgress() != 0) {
-          setCurProgress(other.getCurProgress());
-        }
-        if (other.getTotalProgress() != 0) {
-          setTotalProgress(other.getTotalProgress());
-        }
         if (other.getFinishTimestamp() != 0) {
           setFinishTimestamp(other.getFinishTimestamp());
         }
         if (other.status_ != 0) {
           setStatusValue(other.getStatusValue());
         }
+        if (other.getTotalProgress() != 0) {
+          setTotalProgress(other.getTotalProgress());
+        }
+        if (other.getCurProgress() != 0) {
+          setCurProgress(other.getCurProgress());
+        }
         if (other.getId() != 0) {
           setId(other.getId());
         }
@@ -715,71 +763,13 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int curProgress_ ;
-      /**
-       * <code>uint32 cur_progress = 3;</code>
-       * @return The curProgress.
-       */
-      @java.lang.Override
-      public int getCurProgress() {
-        return curProgress_;
-      }
-      /**
-       * <code>uint32 cur_progress = 3;</code>
-       * @param value The curProgress to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCurProgress(int value) {
-        
-        curProgress_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 cur_progress = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCurProgress() {
-        
-        curProgress_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int totalProgress_ ;
-      /**
-       * <code>uint32 total_progress = 4;</code>
-       * @return The totalProgress.
-       */
-      @java.lang.Override
-      public int getTotalProgress() {
-        return totalProgress_;
-      }
-      /**
-       * <code>uint32 total_progress = 4;</code>
-       * @param value The totalProgress to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTotalProgress(int value) {
-        
-        totalProgress_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 total_progress = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTotalProgress() {
-        
-        totalProgress_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int finishTimestamp_ ;
       /**
-       * <code>uint32 finish_timestamp = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 finish_timestamp = 7;</code>
        * @return The finishTimestamp.
        */
       @java.lang.Override
@@ -787,7 +777,11 @@ public int getFinishTimestamp() {
         return finishTimestamp_;
       }
       /**
-       * <code>uint32 finish_timestamp = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 finish_timestamp = 7;</code>
        * @param value The finishTimestamp to set.
        * @return This builder for chaining.
        */
@@ -798,7 +792,11 @@ public Builder setFinishTimestamp(int value) {
         return this;
       }
       /**
-       * <code>uint32 finish_timestamp = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 finish_timestamp = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearFinishTimestamp() {
@@ -810,14 +808,22 @@ public Builder clearFinishTimestamp() {
 
       private int status_ = 0;
       /**
-       * <code>.Achievement.Status status = 9;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>.Achievement.Status status = 5;</code>
        * @return The enum numeric value on the wire for status.
        */
       @java.lang.Override public int getStatusValue() {
         return status_;
       }
       /**
-       * <code>.Achievement.Status status = 9;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>.Achievement.Status status = 5;</code>
        * @param value The enum numeric value on the wire for status to set.
        * @return This builder for chaining.
        */
@@ -828,7 +834,11 @@ public Builder setStatusValue(int value) {
         return this;
       }
       /**
-       * <code>.Achievement.Status status = 9;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>.Achievement.Status status = 5;</code>
        * @return The status.
        */
       @java.lang.Override
@@ -838,7 +848,11 @@ public emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status getSta
         return result == null ? emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.UNRECOGNIZED : result;
       }
       /**
-       * <code>.Achievement.Status status = 9;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>.Achievement.Status status = 5;</code>
        * @param value The status to set.
        * @return This builder for chaining.
        */
@@ -852,7 +866,11 @@ public Builder setStatus(emu.grasscutter.net.proto.AchievementOuterClass.Achieve
         return this;
       }
       /**
-       * <code>.Achievement.Status status = 9;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>.Achievement.Status status = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearStatus() {
@@ -862,9 +880,99 @@ public Builder clearStatus() {
         return this;
       }
 
+      private int totalProgress_ ;
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 total_progress = 12;</code>
+       * @return The totalProgress.
+       */
+      @java.lang.Override
+      public int getTotalProgress() {
+        return totalProgress_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 total_progress = 12;</code>
+       * @param value The totalProgress to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTotalProgress(int value) {
+        
+        totalProgress_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 total_progress = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTotalProgress() {
+        
+        totalProgress_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int curProgress_ ;
+      /**
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 cur_progress = 8;</code>
+       * @return The curProgress.
+       */
+      @java.lang.Override
+      public int getCurProgress() {
+        return curProgress_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 cur_progress = 8;</code>
+       * @param value The curProgress to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCurProgress(int value) {
+        
+        curProgress_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 cur_progress = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCurProgress() {
+        
+        curProgress_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int id_ ;
       /**
-       * <code>uint32 id = 15;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint32 id = 13;</code>
        * @return The id.
        */
       @java.lang.Override
@@ -872,7 +980,11 @@ public int getId() {
         return id_;
       }
       /**
-       * <code>uint32 id = 15;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint32 id = 13;</code>
        * @param value The id to set.
        * @return This builder for chaining.
        */
@@ -883,7 +995,11 @@ public Builder setId(int value) {
         return this;
       }
       /**
-       * <code>uint32 id = 15;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint32 id = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearId() {
@@ -959,10 +1075,10 @@ public emu.grasscutter.net.proto.AchievementOuterClass.Achievement getDefaultIns
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\021Achievement.proto\"\351\001\n\013Achievement\022\024\n\014c" +
-      "ur_progress\030\003 \001(\r\022\026\n\016total_progress\030\004 \001(" +
-      "\r\022\030\n\020finish_timestamp\030\010 \001(\r\022#\n\006status\030\t " +
-      "\001(\0162\023.Achievement.Status\022\n\n\002id\030\017 \001(\r\"a\n\006" +
+      "\n\021Achievement.proto\"\351\001\n\013Achievement\022\030\n\020f" +
+      "inish_timestamp\030\007 \001(\r\022#\n\006status\030\005 \001(\0162\023." +
+      "Achievement.Status\022\026\n\016total_progress\030\014 \001" +
+      "(\r\022\024\n\014cur_progress\030\010 \001(\r\022\n\n\002id\030\r \001(\r\"a\n\006" +
       "Status\022\022\n\016STATUS_INVALID\020\000\022\025\n\021STATUS_UNF" +
       "INISHED\020\001\022\023\n\017STATUS_FINISHED\020\002\022\027\n\023STATUS" +
       "_REWARD_TAKEN\020\003B\033\n\031emu.grasscutter.net.p" +
@@ -977,7 +1093,7 @@ public emu.grasscutter.net.proto.AchievementOuterClass.Achievement getDefaultIns
     internal_static_Achievement_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Achievement_descriptor,
-        new java.lang.String[] { "CurProgress", "TotalProgress", "FinishTimestamp", "Status", "Id", });
+        new java.lang.String[] { "FinishTimestamp", "Status", "TotalProgress", "CurProgress", "Id", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ActivityInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ActivityInfoOuterClass.java
index eb6423600cd..2f5c153533c 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ActivityInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ActivityInfoOuterClass.java
@@ -19,28 +19,34 @@ public interface ActivityInfoOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <pre>
-     * 11
-     * </pre>
-     *
+     * <code>uint32 activity_id = 11;</code>
+     * @return The activityId.
+     */
+    int getActivityId();
+
+    /**
+     * <code>bool is_finished = 4;</code>
+     * @return The isFinished.
+     */
+    boolean getIsFinished();
+
+    /**
+     * <code>uint32 schedule_id = 2;</code>
+     * @return The scheduleId.
+     */
+    int getScheduleId();
+
+    /**
      * <code>repeated uint32 meet_cond_list = 1;</code>
      * @return A list containing the meetCondList.
      */
     java.util.List<java.lang.Integer> getMeetCondListList();
     /**
-     * <pre>
-     * 11
-     * </pre>
-     *
      * <code>repeated uint32 meet_cond_list = 1;</code>
      * @return The count of meetCondList.
      */
     int getMeetCondListCount();
     /**
-     * <pre>
-     * 11
-     * </pre>
-     *
      * <code>repeated uint32 meet_cond_list = 1;</code>
      * @param index The index of the element to return.
      * @return The meetCondList at the given index.
@@ -48,7 +54,7 @@ public interface ActivityInfoOrBuilder extends
     int getMeetCondList(int index);
 
     /**
-     * <code>uint32 end_time = 4;</code>
+     * <code>uint32 end_time = 5;</code>
      * @return The endTime.
      */
     int getEndTime();
@@ -59,12 +65,6 @@ public interface ActivityInfoOrBuilder extends
      */
     int getBeginTime();
 
-    /**
-     * <code>bool is_finished = 7;</code>
-     * @return The isFinished.
-     */
-    boolean getIsFinished();
-
     /**
      * <code>repeated .ActivityWatcherInfo watcher_info_list = 10;</code>
      */
@@ -90,52 +90,28 @@ emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfoOrBui
         int index);
 
     /**
-     * <pre>
-     * 1
-     * </pre>
-     *
-     * <code>repeated uint32 expire_cond_list = 11;</code>
+     * <code>repeated uint32 expire_cond_list = 12;</code>
      * @return A list containing the expireCondList.
      */
     java.util.List<java.lang.Integer> getExpireCondListList();
     /**
-     * <pre>
-     * 1
-     * </pre>
-     *
-     * <code>repeated uint32 expire_cond_list = 11;</code>
+     * <code>repeated uint32 expire_cond_list = 12;</code>
      * @return The count of expireCondList.
      */
     int getExpireCondListCount();
     /**
-     * <pre>
-     * 1
-     * </pre>
-     *
-     * <code>repeated uint32 expire_cond_list = 11;</code>
+     * <code>repeated uint32 expire_cond_list = 12;</code>
      * @param index The index of the element to return.
      * @return The expireCondList at the given index.
      */
     int getExpireCondList(int index);
 
-    /**
-     * <code>uint32 schedule_id = 12;</code>
-     * @return The scheduleId.
-     */
-    int getScheduleId();
-
     /**
      * <code>uint32 activity_type = 14;</code>
      * @return The activityType.
      */
     int getActivityType();
 
-    /**
-     * <code>uint32 activity_id = 15;</code>
-     * @return The activityId.
-     */
-    int getActivityId();
-
     /**
      * <code>uint32 cur_score = 63;</code>
      * @return The curScore.
@@ -346,19 +322,24 @@ private ActivityInfo(
               input.popLimit(limit);
               break;
             }
+            case 16: {
+
+              scheduleId_ = input.readUInt32();
+              break;
+            }
             case 32: {
 
-              endTime_ = input.readUInt32();
+              isFinished_ = input.readBool();
               break;
             }
-            case 48: {
+            case 40: {
 
-              beginTime_ = input.readUInt32();
+              endTime_ = input.readUInt32();
               break;
             }
-            case 56: {
+            case 48: {
 
-              isFinished_ = input.readBool();
+              beginTime_ = input.readUInt32();
               break;
             }
             case 82: {
@@ -371,6 +352,11 @@ private ActivityInfo(
               break;
             }
             case 88: {
+
+              activityId_ = input.readUInt32();
+              break;
+            }
+            case 96: {
               if (!((mutable_bitField0_ & 0x00000004) != 0)) {
                 expireCondList_ = newIntList();
                 mutable_bitField0_ |= 0x00000004;
@@ -378,7 +364,7 @@ private ActivityInfo(
               expireCondList_.addInt(input.readUInt32());
               break;
             }
-            case 90: {
+            case 98: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
@@ -391,21 +377,11 @@ private ActivityInfo(
               input.popLimit(limit);
               break;
             }
-            case 96: {
-
-              scheduleId_ = input.readUInt32();
-              break;
-            }
             case 112: {
 
               activityType_ = input.readUInt32();
               break;
             }
-            case 120: {
-
-              activityId_ = input.readUInt32();
-              break;
-            }
             case 504: {
 
               curScore_ = input.readUInt32();
@@ -586,13 +562,42 @@ public int getNumber() {
           detailCase_);
     }
 
+    public static final int ACTIVITY_ID_FIELD_NUMBER = 11;
+    private int activityId_;
+    /**
+     * <code>uint32 activity_id = 11;</code>
+     * @return The activityId.
+     */
+    @java.lang.Override
+    public int getActivityId() {
+      return activityId_;
+    }
+
+    public static final int IS_FINISHED_FIELD_NUMBER = 4;
+    private boolean isFinished_;
+    /**
+     * <code>bool is_finished = 4;</code>
+     * @return The isFinished.
+     */
+    @java.lang.Override
+    public boolean getIsFinished() {
+      return isFinished_;
+    }
+
+    public static final int SCHEDULE_ID_FIELD_NUMBER = 2;
+    private int scheduleId_;
+    /**
+     * <code>uint32 schedule_id = 2;</code>
+     * @return The scheduleId.
+     */
+    @java.lang.Override
+    public int getScheduleId() {
+      return scheduleId_;
+    }
+
     public static final int MEET_COND_LIST_FIELD_NUMBER = 1;
     private com.google.protobuf.Internal.IntList meetCondList_;
     /**
-     * <pre>
-     * 11
-     * </pre>
-     *
      * <code>repeated uint32 meet_cond_list = 1;</code>
      * @return A list containing the meetCondList.
      */
@@ -602,10 +607,6 @@ public int getNumber() {
       return meetCondList_;
     }
     /**
-     * <pre>
-     * 11
-     * </pre>
-     *
      * <code>repeated uint32 meet_cond_list = 1;</code>
      * @return The count of meetCondList.
      */
@@ -613,10 +614,6 @@ public int getMeetCondListCount() {
       return meetCondList_.size();
     }
     /**
-     * <pre>
-     * 11
-     * </pre>
-     *
      * <code>repeated uint32 meet_cond_list = 1;</code>
      * @param index The index of the element to return.
      * @return The meetCondList at the given index.
@@ -626,10 +623,10 @@ public int getMeetCondList(int index) {
     }
     private int meetCondListMemoizedSerializedSize = -1;
 
-    public static final int END_TIME_FIELD_NUMBER = 4;
+    public static final int END_TIME_FIELD_NUMBER = 5;
     private int endTime_;
     /**
-     * <code>uint32 end_time = 4;</code>
+     * <code>uint32 end_time = 5;</code>
      * @return The endTime.
      */
     @java.lang.Override
@@ -648,17 +645,6 @@ public int getBeginTime() {
       return beginTime_;
     }
 
-    public static final int IS_FINISHED_FIELD_NUMBER = 7;
-    private boolean isFinished_;
-    /**
-     * <code>bool is_finished = 7;</code>
-     * @return The isFinished.
-     */
-    @java.lang.Override
-    public boolean getIsFinished() {
-      return isFinished_;
-    }
-
     public static final int WATCHER_INFO_LIST_FIELD_NUMBER = 10;
     private java.util.List<emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo> watcherInfoList_;
     /**
@@ -699,14 +685,10 @@ public emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherIn
       return watcherInfoList_.get(index);
     }
 
-    public static final int EXPIRE_COND_LIST_FIELD_NUMBER = 11;
+    public static final int EXPIRE_COND_LIST_FIELD_NUMBER = 12;
     private com.google.protobuf.Internal.IntList expireCondList_;
     /**
-     * <pre>
-     * 1
-     * </pre>
-     *
-     * <code>repeated uint32 expire_cond_list = 11;</code>
+     * <code>repeated uint32 expire_cond_list = 12;</code>
      * @return A list containing the expireCondList.
      */
     @java.lang.Override
@@ -715,22 +697,14 @@ public emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherIn
       return expireCondList_;
     }
     /**
-     * <pre>
-     * 1
-     * </pre>
-     *
-     * <code>repeated uint32 expire_cond_list = 11;</code>
+     * <code>repeated uint32 expire_cond_list = 12;</code>
      * @return The count of expireCondList.
      */
     public int getExpireCondListCount() {
       return expireCondList_.size();
     }
     /**
-     * <pre>
-     * 1
-     * </pre>
-     *
-     * <code>repeated uint32 expire_cond_list = 11;</code>
+     * <code>repeated uint32 expire_cond_list = 12;</code>
      * @param index The index of the element to return.
      * @return The expireCondList at the given index.
      */
@@ -739,17 +713,6 @@ public int getExpireCondList(int index) {
     }
     private int expireCondListMemoizedSerializedSize = -1;
 
-    public static final int SCHEDULE_ID_FIELD_NUMBER = 12;
-    private int scheduleId_;
-    /**
-     * <code>uint32 schedule_id = 12;</code>
-     * @return The scheduleId.
-     */
-    @java.lang.Override
-    public int getScheduleId() {
-      return scheduleId_;
-    }
-
     public static final int ACTIVITY_TYPE_FIELD_NUMBER = 14;
     private int activityType_;
     /**
@@ -761,17 +724,6 @@ public int getActivityType() {
       return activityType_;
     }
 
-    public static final int ACTIVITY_ID_FIELD_NUMBER = 15;
-    private int activityId_;
-    /**
-     * <code>uint32 activity_id = 15;</code>
-     * @return The activityId.
-     */
-    @java.lang.Override
-    public int getActivityId() {
-      return activityId_;
-    }
-
     public static final int CUR_SCORE_FIELD_NUMBER = 63;
     private int curScore_;
     /**
@@ -1077,34 +1029,34 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       for (int i = 0; i < meetCondList_.size(); i++) {
         output.writeUInt32NoTag(meetCondList_.getInt(i));
       }
+      if (scheduleId_ != 0) {
+        output.writeUInt32(2, scheduleId_);
+      }
+      if (isFinished_ != false) {
+        output.writeBool(4, isFinished_);
+      }
       if (endTime_ != 0) {
-        output.writeUInt32(4, endTime_);
+        output.writeUInt32(5, endTime_);
       }
       if (beginTime_ != 0) {
         output.writeUInt32(6, beginTime_);
       }
-      if (isFinished_ != false) {
-        output.writeBool(7, isFinished_);
-      }
       for (int i = 0; i < watcherInfoList_.size(); i++) {
         output.writeMessage(10, watcherInfoList_.get(i));
       }
+      if (activityId_ != 0) {
+        output.writeUInt32(11, activityId_);
+      }
       if (getExpireCondListList().size() > 0) {
-        output.writeUInt32NoTag(90);
+        output.writeUInt32NoTag(98);
         output.writeUInt32NoTag(expireCondListMemoizedSerializedSize);
       }
       for (int i = 0; i < expireCondList_.size(); i++) {
         output.writeUInt32NoTag(expireCondList_.getInt(i));
       }
-      if (scheduleId_ != 0) {
-        output.writeUInt32(12, scheduleId_);
-      }
       if (activityType_ != 0) {
         output.writeUInt32(14, activityType_);
       }
-      if (activityId_ != 0) {
-        output.writeUInt32(15, activityId_);
-      }
       if (curScore_ != 0) {
         output.writeUInt32(63, curScore_);
       }
@@ -1159,22 +1111,30 @@ public int getSerializedSize() {
         }
         meetCondListMemoizedSerializedSize = dataSize;
       }
+      if (scheduleId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(2, scheduleId_);
+      }
+      if (isFinished_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(4, isFinished_);
+      }
       if (endTime_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, endTime_);
+          .computeUInt32Size(5, endTime_);
       }
       if (beginTime_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(6, beginTime_);
       }
-      if (isFinished_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(7, isFinished_);
-      }
       for (int i = 0; i < watcherInfoList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(10, watcherInfoList_.get(i));
       }
+      if (activityId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(11, activityId_);
+      }
       {
         int dataSize = 0;
         for (int i = 0; i < expireCondList_.size(); i++) {
@@ -1189,18 +1149,10 @@ public int getSerializedSize() {
         }
         expireCondListMemoizedSerializedSize = dataSize;
       }
-      if (scheduleId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, scheduleId_);
-      }
       if (activityType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(14, activityType_);
       }
-      if (activityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, activityId_);
-      }
       if (curScore_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(63, curScore_);
@@ -1266,24 +1218,24 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo other = (emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo) obj;
 
+      if (getActivityId()
+          != other.getActivityId()) return false;
+      if (getIsFinished()
+          != other.getIsFinished()) return false;
+      if (getScheduleId()
+          != other.getScheduleId()) return false;
       if (!getMeetCondListList()
           .equals(other.getMeetCondListList())) return false;
       if (getEndTime()
           != other.getEndTime()) return false;
       if (getBeginTime()
           != other.getBeginTime()) return false;
-      if (getIsFinished()
-          != other.getIsFinished()) return false;
       if (!getWatcherInfoListList()
           .equals(other.getWatcherInfoListList())) return false;
       if (!getExpireCondListList()
           .equals(other.getExpireCondListList())) return false;
-      if (getScheduleId()
-          != other.getScheduleId()) return false;
       if (getActivityType()
           != other.getActivityType()) return false;
-      if (getActivityId()
-          != other.getActivityId()) return false;
       if (getCurScore()
           != other.getCurScore()) return false;
       if (getFirstDayStartTime()
@@ -1316,6 +1268,13 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + ACTIVITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getActivityId();
+      hash = (37 * hash) + IS_FINISHED_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsFinished());
+      hash = (37 * hash) + SCHEDULE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getScheduleId();
       if (getMeetCondListCount() > 0) {
         hash = (37 * hash) + MEET_COND_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getMeetCondListList().hashCode();
@@ -1324,9 +1283,6 @@ public int hashCode() {
       hash = (53 * hash) + getEndTime();
       hash = (37 * hash) + BEGIN_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getBeginTime();
-      hash = (37 * hash) + IS_FINISHED_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsFinished());
       if (getWatcherInfoListCount() > 0) {
         hash = (37 * hash) + WATCHER_INFO_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getWatcherInfoListList().hashCode();
@@ -1335,12 +1291,8 @@ public int hashCode() {
         hash = (37 * hash) + EXPIRE_COND_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getExpireCondListList().hashCode();
       }
-      hash = (37 * hash) + SCHEDULE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getScheduleId();
       hash = (37 * hash) + ACTIVITY_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + getActivityType();
-      hash = (37 * hash) + ACTIVITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getActivityId();
       hash = (37 * hash) + CUR_SCORE_FIELD_NUMBER;
       hash = (53 * hash) + getCurScore();
       hash = (37 * hash) + FIRST_DAY_START_TIME_FIELD_NUMBER;
@@ -1530,14 +1482,18 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        activityId_ = 0;
+
+        isFinished_ = false;
+
+        scheduleId_ = 0;
+
         meetCondList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
         endTime_ = 0;
 
         beginTime_ = 0;
 
-        isFinished_ = false;
-
         if (watcherInfoListBuilder_ == null) {
           watcherInfoList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000002);
@@ -1546,12 +1502,8 @@ public Builder clear() {
         }
         expireCondList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000004);
-        scheduleId_ = 0;
-
         activityType_ = 0;
 
-        activityId_ = 0;
-
         curScore_ = 0;
 
         firstDayStartTime_ = 0;
@@ -1595,6 +1547,9 @@ public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo build() {
       public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo buildPartial() {
         emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo result = new emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo(this);
         int from_bitField0_ = bitField0_;
+        result.activityId_ = activityId_;
+        result.isFinished_ = isFinished_;
+        result.scheduleId_ = scheduleId_;
         if (((bitField0_ & 0x00000001) != 0)) {
           meetCondList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
@@ -1602,7 +1557,6 @@ public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo buildPartia
         result.meetCondList_ = meetCondList_;
         result.endTime_ = endTime_;
         result.beginTime_ = beginTime_;
-        result.isFinished_ = isFinished_;
         if (watcherInfoListBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0)) {
             watcherInfoList_ = java.util.Collections.unmodifiableList(watcherInfoList_);
@@ -1617,9 +1571,7 @@ public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo buildPartia
           bitField0_ = (bitField0_ & ~0x00000004);
         }
         result.expireCondList_ = expireCondList_;
-        result.scheduleId_ = scheduleId_;
         result.activityType_ = activityType_;
-        result.activityId_ = activityId_;
         result.curScore_ = curScore_;
         result.firstDayStartTime_ = firstDayStartTime_;
         if (((bitField0_ & 0x00000008) != 0)) {
@@ -1696,6 +1648,15 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo other) {
         if (other == emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.getDefaultInstance()) return this;
+        if (other.getActivityId() != 0) {
+          setActivityId(other.getActivityId());
+        }
+        if (other.getIsFinished() != false) {
+          setIsFinished(other.getIsFinished());
+        }
+        if (other.getScheduleId() != 0) {
+          setScheduleId(other.getScheduleId());
+        }
         if (!other.meetCondList_.isEmpty()) {
           if (meetCondList_.isEmpty()) {
             meetCondList_ = other.meetCondList_;
@@ -1712,9 +1673,6 @@ public Builder mergeFrom(emu.grasscutter.net.proto.ActivityInfoOuterClass.Activi
         if (other.getBeginTime() != 0) {
           setBeginTime(other.getBeginTime());
         }
-        if (other.getIsFinished() != false) {
-          setIsFinished(other.getIsFinished());
-        }
         if (watcherInfoListBuilder_ == null) {
           if (!other.watcherInfoList_.isEmpty()) {
             if (watcherInfoList_.isEmpty()) {
@@ -1751,15 +1709,9 @@ public Builder mergeFrom(emu.grasscutter.net.proto.ActivityInfoOuterClass.Activi
           }
           onChanged();
         }
-        if (other.getScheduleId() != 0) {
-          setScheduleId(other.getScheduleId());
-        }
         if (other.getActivityType() != 0) {
           setActivityType(other.getActivityType());
         }
-        if (other.getActivityId() != 0) {
-          setActivityId(other.getActivityId());
-        }
         if (other.getCurScore() != 0) {
           setCurScore(other.getCurScore());
         }
@@ -1860,6 +1812,99 @@ public Builder clearDetail() {
 
       private int bitField0_;
 
+      private int activityId_ ;
+      /**
+       * <code>uint32 activity_id = 11;</code>
+       * @return The activityId.
+       */
+      @java.lang.Override
+      public int getActivityId() {
+        return activityId_;
+      }
+      /**
+       * <code>uint32 activity_id = 11;</code>
+       * @param value The activityId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setActivityId(int value) {
+        
+        activityId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 activity_id = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearActivityId() {
+        
+        activityId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private boolean isFinished_ ;
+      /**
+       * <code>bool is_finished = 4;</code>
+       * @return The isFinished.
+       */
+      @java.lang.Override
+      public boolean getIsFinished() {
+        return isFinished_;
+      }
+      /**
+       * <code>bool is_finished = 4;</code>
+       * @param value The isFinished to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsFinished(boolean value) {
+        
+        isFinished_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_finished = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsFinished() {
+        
+        isFinished_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int scheduleId_ ;
+      /**
+       * <code>uint32 schedule_id = 2;</code>
+       * @return The scheduleId.
+       */
+      @java.lang.Override
+      public int getScheduleId() {
+        return scheduleId_;
+      }
+      /**
+       * <code>uint32 schedule_id = 2;</code>
+       * @param value The scheduleId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setScheduleId(int value) {
+        
+        scheduleId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 schedule_id = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearScheduleId() {
+        
+        scheduleId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private com.google.protobuf.Internal.IntList meetCondList_ = emptyIntList();
       private void ensureMeetCondListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
@@ -1868,10 +1913,6 @@ private void ensureMeetCondListIsMutable() {
          }
       }
       /**
-       * <pre>
-       * 11
-       * </pre>
-       *
        * <code>repeated uint32 meet_cond_list = 1;</code>
        * @return A list containing the meetCondList.
        */
@@ -1881,10 +1922,6 @@ private void ensureMeetCondListIsMutable() {
                  java.util.Collections.unmodifiableList(meetCondList_) : meetCondList_;
       }
       /**
-       * <pre>
-       * 11
-       * </pre>
-       *
        * <code>repeated uint32 meet_cond_list = 1;</code>
        * @return The count of meetCondList.
        */
@@ -1892,10 +1929,6 @@ public int getMeetCondListCount() {
         return meetCondList_.size();
       }
       /**
-       * <pre>
-       * 11
-       * </pre>
-       *
        * <code>repeated uint32 meet_cond_list = 1;</code>
        * @param index The index of the element to return.
        * @return The meetCondList at the given index.
@@ -1904,10 +1937,6 @@ public int getMeetCondList(int index) {
         return meetCondList_.getInt(index);
       }
       /**
-       * <pre>
-       * 11
-       * </pre>
-       *
        * <code>repeated uint32 meet_cond_list = 1;</code>
        * @param index The index to set the value at.
        * @param value The meetCondList to set.
@@ -1921,10 +1950,6 @@ public Builder setMeetCondList(
         return this;
       }
       /**
-       * <pre>
-       * 11
-       * </pre>
-       *
        * <code>repeated uint32 meet_cond_list = 1;</code>
        * @param value The meetCondList to add.
        * @return This builder for chaining.
@@ -1936,10 +1961,6 @@ public Builder addMeetCondList(int value) {
         return this;
       }
       /**
-       * <pre>
-       * 11
-       * </pre>
-       *
        * <code>repeated uint32 meet_cond_list = 1;</code>
        * @param values The meetCondList to add.
        * @return This builder for chaining.
@@ -1953,10 +1974,6 @@ public Builder addAllMeetCondList(
         return this;
       }
       /**
-       * <pre>
-       * 11
-       * </pre>
-       *
        * <code>repeated uint32 meet_cond_list = 1;</code>
        * @return This builder for chaining.
        */
@@ -1969,7 +1986,7 @@ public Builder clearMeetCondList() {
 
       private int endTime_ ;
       /**
-       * <code>uint32 end_time = 4;</code>
+       * <code>uint32 end_time = 5;</code>
        * @return The endTime.
        */
       @java.lang.Override
@@ -1977,7 +1994,7 @@ public int getEndTime() {
         return endTime_;
       }
       /**
-       * <code>uint32 end_time = 4;</code>
+       * <code>uint32 end_time = 5;</code>
        * @param value The endTime to set.
        * @return This builder for chaining.
        */
@@ -1988,7 +2005,7 @@ public Builder setEndTime(int value) {
         return this;
       }
       /**
-       * <code>uint32 end_time = 4;</code>
+       * <code>uint32 end_time = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearEndTime() {
@@ -2029,37 +2046,6 @@ public Builder clearBeginTime() {
         return this;
       }
 
-      private boolean isFinished_ ;
-      /**
-       * <code>bool is_finished = 7;</code>
-       * @return The isFinished.
-       */
-      @java.lang.Override
-      public boolean getIsFinished() {
-        return isFinished_;
-      }
-      /**
-       * <code>bool is_finished = 7;</code>
-       * @param value The isFinished to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsFinished(boolean value) {
-        
-        isFinished_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_finished = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsFinished() {
-        
-        isFinished_ = false;
-        onChanged();
-        return this;
-      }
-
       private java.util.List<emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo> watcherInfoList_ =
         java.util.Collections.emptyList();
       private void ensureWatcherInfoListIsMutable() {
@@ -2308,11 +2294,7 @@ private void ensureExpireCondListIsMutable() {
          }
       }
       /**
-       * <pre>
-       * 1
-       * </pre>
-       *
-       * <code>repeated uint32 expire_cond_list = 11;</code>
+       * <code>repeated uint32 expire_cond_list = 12;</code>
        * @return A list containing the expireCondList.
        */
       public java.util.List<java.lang.Integer>
@@ -2321,22 +2303,14 @@ private void ensureExpireCondListIsMutable() {
                  java.util.Collections.unmodifiableList(expireCondList_) : expireCondList_;
       }
       /**
-       * <pre>
-       * 1
-       * </pre>
-       *
-       * <code>repeated uint32 expire_cond_list = 11;</code>
+       * <code>repeated uint32 expire_cond_list = 12;</code>
        * @return The count of expireCondList.
        */
       public int getExpireCondListCount() {
         return expireCondList_.size();
       }
       /**
-       * <pre>
-       * 1
-       * </pre>
-       *
-       * <code>repeated uint32 expire_cond_list = 11;</code>
+       * <code>repeated uint32 expire_cond_list = 12;</code>
        * @param index The index of the element to return.
        * @return The expireCondList at the given index.
        */
@@ -2344,11 +2318,7 @@ public int getExpireCondList(int index) {
         return expireCondList_.getInt(index);
       }
       /**
-       * <pre>
-       * 1
-       * </pre>
-       *
-       * <code>repeated uint32 expire_cond_list = 11;</code>
+       * <code>repeated uint32 expire_cond_list = 12;</code>
        * @param index The index to set the value at.
        * @param value The expireCondList to set.
        * @return This builder for chaining.
@@ -2361,11 +2331,7 @@ public Builder setExpireCondList(
         return this;
       }
       /**
-       * <pre>
-       * 1
-       * </pre>
-       *
-       * <code>repeated uint32 expire_cond_list = 11;</code>
+       * <code>repeated uint32 expire_cond_list = 12;</code>
        * @param value The expireCondList to add.
        * @return This builder for chaining.
        */
@@ -2376,11 +2342,7 @@ public Builder addExpireCondList(int value) {
         return this;
       }
       /**
-       * <pre>
-       * 1
-       * </pre>
-       *
-       * <code>repeated uint32 expire_cond_list = 11;</code>
+       * <code>repeated uint32 expire_cond_list = 12;</code>
        * @param values The expireCondList to add.
        * @return This builder for chaining.
        */
@@ -2393,11 +2355,7 @@ public Builder addAllExpireCondList(
         return this;
       }
       /**
-       * <pre>
-       * 1
-       * </pre>
-       *
-       * <code>repeated uint32 expire_cond_list = 11;</code>
+       * <code>repeated uint32 expire_cond_list = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearExpireCondList() {
@@ -2407,37 +2365,6 @@ public Builder clearExpireCondList() {
         return this;
       }
 
-      private int scheduleId_ ;
-      /**
-       * <code>uint32 schedule_id = 12;</code>
-       * @return The scheduleId.
-       */
-      @java.lang.Override
-      public int getScheduleId() {
-        return scheduleId_;
-      }
-      /**
-       * <code>uint32 schedule_id = 12;</code>
-       * @param value The scheduleId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setScheduleId(int value) {
-        
-        scheduleId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 schedule_id = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearScheduleId() {
-        
-        scheduleId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int activityType_ ;
       /**
        * <code>uint32 activity_type = 14;</code>
@@ -2469,37 +2396,6 @@ public Builder clearActivityType() {
         return this;
       }
 
-      private int activityId_ ;
-      /**
-       * <code>uint32 activity_id = 15;</code>
-       * @return The activityId.
-       */
-      @java.lang.Override
-      public int getActivityId() {
-        return activityId_;
-      }
-      /**
-       * <code>uint32 activity_id = 15;</code>
-       * @param value The activityId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setActivityId(int value) {
-        
-        activityId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 activity_id = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearActivityId() {
-        
-        activityId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int curScore_ ;
       /**
        * <code>uint32 cur_score = 63;</code>
@@ -3424,12 +3320,12 @@ public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo getDefaultI
       "initeInfo.proto\032\023ToyBattleInfo.proto\032\027Ph" +
       "otoUnderseaInfo.proto\032\030FontaineGatherInf" +
       "o.proto\032\026GcgPvePuzzleInfo.proto\"\253\005\n\014Acti" +
-      "vityInfo\022\026\n\016meet_cond_list\030\001 \003(\r\022\020\n\010end_" +
-      "time\030\004 \001(\r\022\022\n\nbegin_time\030\006 \001(\r\022\023\n\013is_fin" +
-      "ished\030\007 \001(\010\022/\n\021watcher_info_list\030\n \003(\0132\024" +
-      ".ActivityWatcherInfo\022\030\n\020expire_cond_list" +
-      "\030\013 \003(\r\022\023\n\013schedule_id\030\014 \001(\r\022\025\n\ractivity_" +
-      "type\030\016 \001(\r\022\023\n\013activity_id\030\017 \001(\r\022\021\n\tcur_s" +
+      "vityInfo\022\023\n\013activity_id\030\013 \001(\r\022\023\n\013is_fini" +
+      "shed\030\004 \001(\010\022\023\n\013schedule_id\030\002 \001(\r\022\026\n\016meet_" +
+      "cond_list\030\001 \003(\r\022\020\n\010end_time\030\005 \001(\r\022\022\n\nbeg" +
+      "in_time\030\006 \001(\r\022/\n\021watcher_info_list\030\n \003(\013" +
+      "2\024.ActivityWatcherInfo\022\030\n\020expire_cond_li" +
+      "st\030\014 \003(\r\022\025\n\ractivity_type\030\016 \001(\r\022\021\n\tcur_s" +
       "core\030? \001(\r\022\035\n\024first_day_start_time\030\365\002 \001(" +
       "\r\022\032\n\021taken_reward_list\030\262\006 \003(\r\022<\n\034activit" +
       "y_push_tips_data_list\030\327\007 \003(\0132\025.ActivityP" +
@@ -3539,7 +3435,7 @@ public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo getDefaultI
     internal_static_ActivityInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ActivityInfo_descriptor,
-        new java.lang.String[] { "MeetCondList", "EndTime", "BeginTime", "IsFinished", "WatcherInfoList", "ExpireCondList", "ScheduleId", "ActivityType", "ActivityId", "CurScore", "FirstDayStartTime", "TakenRewardList", "ActivityPushTipsDataList", "ActivityCoinMap", "WishGiftNumMap", "MusicGameInfo", "Detail", });
+        new java.lang.String[] { "ActivityId", "IsFinished", "ScheduleId", "MeetCondList", "EndTime", "BeginTime", "WatcherInfoList", "ExpireCondList", "ActivityType", "CurScore", "FirstDayStartTime", "TakenRewardList", "ActivityPushTipsDataList", "ActivityCoinMap", "WishGiftNumMap", "MusicGameInfo", "Detail", });
     internal_static_ActivityInfo_ActivityCoinMapEntry_descriptor =
       internal_static_ActivityInfo_descriptor.getNestedTypes().get(0);
     internal_static_ActivityInfo_ActivityCoinMapEntry_fieldAccessorTable = new
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AddQuestContentProgressReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AddQuestContentProgressReqOuterClass.java
index 774adcf750c..36b144933cb 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AddQuestContentProgressReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AddQuestContentProgressReqOuterClass.java
@@ -19,26 +19,38 @@ public interface AddQuestContentProgressReqOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 content_type = 7;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 content_type = 5;</code>
      * @return The contentType.
      */
     int getContentType();
 
     /**
-     * <code>uint32 param = 11;</code>
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 param = 3;</code>
      * @return The param.
      */
     int getParam();
 
     /**
-     * <code>uint32 add_progress = 15;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 add_progress = 8;</code>
      * @return The addProgress.
      */
     int getAddProgress();
   }
   /**
    * <pre>
-   * CmdId: 20088
+   * CmdId: 4657
    * </pre>
    *
    * Protobuf type {@code AddQuestContentProgressReq}
@@ -85,17 +97,17 @@ private AddQuestContentProgressReq(
             case 0:
               done = true;
               break;
-            case 56: {
+            case 24: {
 
-              contentType_ = input.readUInt32();
+              param_ = input.readUInt32();
               break;
             }
-            case 88: {
+            case 40: {
 
-              param_ = input.readUInt32();
+              contentType_ = input.readUInt32();
               break;
             }
-            case 120: {
+            case 64: {
 
               addProgress_ = input.readUInt32();
               break;
@@ -132,10 +144,14 @@ private AddQuestContentProgressReq(
               emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq.class, emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq.Builder.class);
     }
 
-    public static final int CONTENT_TYPE_FIELD_NUMBER = 7;
+    public static final int CONTENT_TYPE_FIELD_NUMBER = 5;
     private int contentType_;
     /**
-     * <code>uint32 content_type = 7;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 content_type = 5;</code>
      * @return The contentType.
      */
     @java.lang.Override
@@ -143,10 +159,14 @@ public int getContentType() {
       return contentType_;
     }
 
-    public static final int PARAM_FIELD_NUMBER = 11;
+    public static final int PARAM_FIELD_NUMBER = 3;
     private int param_;
     /**
-     * <code>uint32 param = 11;</code>
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 param = 3;</code>
      * @return The param.
      */
     @java.lang.Override
@@ -154,10 +174,14 @@ public int getParam() {
       return param_;
     }
 
-    public static final int ADD_PROGRESS_FIELD_NUMBER = 15;
+    public static final int ADD_PROGRESS_FIELD_NUMBER = 8;
     private int addProgress_;
     /**
-     * <code>uint32 add_progress = 15;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 add_progress = 8;</code>
      * @return The addProgress.
      */
     @java.lang.Override
@@ -179,14 +203,14 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (contentType_ != 0) {
-        output.writeUInt32(7, contentType_);
-      }
       if (param_ != 0) {
-        output.writeUInt32(11, param_);
+        output.writeUInt32(3, param_);
+      }
+      if (contentType_ != 0) {
+        output.writeUInt32(5, contentType_);
       }
       if (addProgress_ != 0) {
-        output.writeUInt32(15, addProgress_);
+        output.writeUInt32(8, addProgress_);
       }
       unknownFields.writeTo(output);
     }
@@ -197,17 +221,17 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (contentType_ != 0) {
+      if (param_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, contentType_);
+          .computeUInt32Size(3, param_);
       }
-      if (param_ != 0) {
+      if (contentType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, param_);
+          .computeUInt32Size(5, contentType_);
       }
       if (addProgress_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, addProgress_);
+          .computeUInt32Size(8, addProgress_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -344,7 +368,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 20088
+     * CmdId: 4657
      * </pre>
      *
      * Protobuf type {@code AddQuestContentProgressReq}
@@ -507,7 +531,11 @@ public Builder mergeFrom(
 
       private int contentType_ ;
       /**
-       * <code>uint32 content_type = 7;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 content_type = 5;</code>
        * @return The contentType.
        */
       @java.lang.Override
@@ -515,7 +543,11 @@ public int getContentType() {
         return contentType_;
       }
       /**
-       * <code>uint32 content_type = 7;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 content_type = 5;</code>
        * @param value The contentType to set.
        * @return This builder for chaining.
        */
@@ -526,7 +558,11 @@ public Builder setContentType(int value) {
         return this;
       }
       /**
-       * <code>uint32 content_type = 7;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 content_type = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearContentType() {
@@ -538,7 +574,11 @@ public Builder clearContentType() {
 
       private int param_ ;
       /**
-       * <code>uint32 param = 11;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 param = 3;</code>
        * @return The param.
        */
       @java.lang.Override
@@ -546,7 +586,11 @@ public int getParam() {
         return param_;
       }
       /**
-       * <code>uint32 param = 11;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 param = 3;</code>
        * @param value The param to set.
        * @return This builder for chaining.
        */
@@ -557,7 +601,11 @@ public Builder setParam(int value) {
         return this;
       }
       /**
-       * <code>uint32 param = 11;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 param = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearParam() {
@@ -569,7 +617,11 @@ public Builder clearParam() {
 
       private int addProgress_ ;
       /**
-       * <code>uint32 add_progress = 15;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 add_progress = 8;</code>
        * @return The addProgress.
        */
       @java.lang.Override
@@ -577,7 +629,11 @@ public int getAddProgress() {
         return addProgress_;
       }
       /**
-       * <code>uint32 add_progress = 15;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 add_progress = 8;</code>
        * @param value The addProgress to set.
        * @return This builder for chaining.
        */
@@ -588,7 +644,11 @@ public Builder setAddProgress(int value) {
         return this;
       }
       /**
-       * <code>uint32 add_progress = 15;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 add_progress = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearAddProgress() {
@@ -666,7 +726,7 @@ public emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestCo
     java.lang.String[] descriptorData = {
       "\n AddQuestContentProgressReq.proto\"W\n\032Ad" +
       "dQuestContentProgressReq\022\024\n\014content_type" +
-      "\030\007 \001(\r\022\r\n\005param\030\013 \001(\r\022\024\n\014add_progress\030\017 " +
+      "\030\005 \001(\r\022\r\n\005param\030\003 \001(\r\022\024\n\014add_progress\030\010 " +
       "\001(\rB\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AddQuestContentProgressRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AddQuestContentProgressRspOuterClass.java
index 3adbbffae0c..bf85a6122b2 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AddQuestContentProgressRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AddQuestContentProgressRspOuterClass.java
@@ -19,20 +19,28 @@ public interface AddQuestContentProgressRspOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 content_type = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 content_type = 8;</code>
      * @return The contentType.
      */
     int getContentType();
 
     /**
-     * <code>int32 retcode = 15;</code>
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>int32 retcode = 3;</code>
      * @return The retcode.
      */
     int getRetcode();
   }
   /**
    * <pre>
-   * CmdId: 22640
+   * CmdId: 23529
    * </pre>
    *
    * Protobuf type {@code AddQuestContentProgressRsp}
@@ -79,14 +87,14 @@ private AddQuestContentProgressRsp(
             case 0:
               done = true;
               break;
-            case 96: {
+            case 24: {
 
-              contentType_ = input.readUInt32();
+              retcode_ = input.readInt32();
               break;
             }
-            case 120: {
+            case 64: {
 
-              retcode_ = input.readInt32();
+              contentType_ = input.readUInt32();
               break;
             }
             default: {
@@ -121,10 +129,14 @@ private AddQuestContentProgressRsp(
               emu.grasscutter.net.proto.AddQuestContentProgressRspOuterClass.AddQuestContentProgressRsp.class, emu.grasscutter.net.proto.AddQuestContentProgressRspOuterClass.AddQuestContentProgressRsp.Builder.class);
     }
 
-    public static final int CONTENT_TYPE_FIELD_NUMBER = 12;
+    public static final int CONTENT_TYPE_FIELD_NUMBER = 8;
     private int contentType_;
     /**
-     * <code>uint32 content_type = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 content_type = 8;</code>
      * @return The contentType.
      */
     @java.lang.Override
@@ -132,10 +144,14 @@ public int getContentType() {
       return contentType_;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 15;
+    public static final int RETCODE_FIELD_NUMBER = 3;
     private int retcode_;
     /**
-     * <code>int32 retcode = 15;</code>
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>int32 retcode = 3;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -157,11 +173,11 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (contentType_ != 0) {
-        output.writeUInt32(12, contentType_);
-      }
       if (retcode_ != 0) {
-        output.writeInt32(15, retcode_);
+        output.writeInt32(3, retcode_);
+      }
+      if (contentType_ != 0) {
+        output.writeUInt32(8, contentType_);
       }
       unknownFields.writeTo(output);
     }
@@ -172,13 +188,13 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (contentType_ != 0) {
+      if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, contentType_);
+          .computeInt32Size(3, retcode_);
       }
-      if (retcode_ != 0) {
+      if (contentType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(15, retcode_);
+          .computeUInt32Size(8, contentType_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -311,7 +327,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 22640
+     * CmdId: 23529
      * </pre>
      *
      * Protobuf type {@code AddQuestContentProgressRsp}
@@ -468,7 +484,11 @@ public Builder mergeFrom(
 
       private int contentType_ ;
       /**
-       * <code>uint32 content_type = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 content_type = 8;</code>
        * @return The contentType.
        */
       @java.lang.Override
@@ -476,7 +496,11 @@ public int getContentType() {
         return contentType_;
       }
       /**
-       * <code>uint32 content_type = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 content_type = 8;</code>
        * @param value The contentType to set.
        * @return This builder for chaining.
        */
@@ -487,7 +511,11 @@ public Builder setContentType(int value) {
         return this;
       }
       /**
-       * <code>uint32 content_type = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 content_type = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearContentType() {
@@ -499,7 +527,11 @@ public Builder clearContentType() {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 15;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>int32 retcode = 3;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -507,7 +539,11 @@ public int getRetcode() {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 15;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>int32 retcode = 3;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -518,7 +554,11 @@ public Builder setRetcode(int value) {
         return this;
       }
       /**
-       * <code>int32 retcode = 15;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>int32 retcode = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -596,7 +636,7 @@ public emu.grasscutter.net.proto.AddQuestContentProgressRspOuterClass.AddQuestCo
     java.lang.String[] descriptorData = {
       "\n AddQuestContentProgressRsp.proto\"C\n\032Ad" +
       "dQuestContentProgressRsp\022\024\n\014content_type" +
-      "\030\014 \001(\r\022\017\n\007retcode\030\017 \001(\005B\033\n\031emu.grasscutt" +
+      "\030\010 \001(\r\022\017\n\007retcode\030\003 \001(\005B\033\n\031emu.grasscutt" +
       "er.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarChangeCostumeRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarChangeCostumeRspOuterClass.java
index 958f70081d8..6b740ecc51a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarChangeCostumeRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarChangeCostumeRspOuterClass.java
@@ -19,26 +19,38 @@ public interface AvatarChangeCostumeRspOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 avatar_guid = 4;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint64 avatar_guid = 11;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
 
     /**
-     * <code>uint32 costume_id = 9;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 costume_id = 5;</code>
      * @return The costumeId.
      */
     int getCostumeId();
 
     /**
-     * <code>int32 retcode = 15;</code>
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>int32 retcode = 12;</code>
      * @return The retcode.
      */
     int getRetcode();
   }
   /**
    * <pre>
-   * CmdId: 3408
+   * CmdId: 3472
    * </pre>
    *
    * Protobuf type {@code AvatarChangeCostumeRsp}
@@ -85,17 +97,17 @@ private AvatarChangeCostumeRsp(
             case 0:
               done = true;
               break;
-            case 32: {
+            case 40: {
 
-              avatarGuid_ = input.readUInt64();
+              costumeId_ = input.readUInt32();
               break;
             }
-            case 72: {
+            case 88: {
 
-              costumeId_ = input.readUInt32();
+              avatarGuid_ = input.readUInt64();
               break;
             }
-            case 120: {
+            case 96: {
 
               retcode_ = input.readInt32();
               break;
@@ -132,10 +144,14 @@ private AvatarChangeCostumeRsp(
               emu.grasscutter.net.proto.AvatarChangeCostumeRspOuterClass.AvatarChangeCostumeRsp.class, emu.grasscutter.net.proto.AvatarChangeCostumeRspOuterClass.AvatarChangeCostumeRsp.Builder.class);
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 4;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 11;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 4;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint64 avatar_guid = 11;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -143,10 +159,14 @@ public long getAvatarGuid() {
       return avatarGuid_;
     }
 
-    public static final int COSTUME_ID_FIELD_NUMBER = 9;
+    public static final int COSTUME_ID_FIELD_NUMBER = 5;
     private int costumeId_;
     /**
-     * <code>uint32 costume_id = 9;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 costume_id = 5;</code>
      * @return The costumeId.
      */
     @java.lang.Override
@@ -154,10 +174,14 @@ public int getCostumeId() {
       return costumeId_;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 15;
+    public static final int RETCODE_FIELD_NUMBER = 12;
     private int retcode_;
     /**
-     * <code>int32 retcode = 15;</code>
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>int32 retcode = 12;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -179,14 +203,14 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (avatarGuid_ != 0L) {
-        output.writeUInt64(4, avatarGuid_);
-      }
       if (costumeId_ != 0) {
-        output.writeUInt32(9, costumeId_);
+        output.writeUInt32(5, costumeId_);
+      }
+      if (avatarGuid_ != 0L) {
+        output.writeUInt64(11, avatarGuid_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(15, retcode_);
+        output.writeInt32(12, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -197,17 +221,17 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (avatarGuid_ != 0L) {
+      if (costumeId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(4, avatarGuid_);
+          .computeUInt32Size(5, costumeId_);
       }
-      if (costumeId_ != 0) {
+      if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, costumeId_);
+          .computeUInt64Size(11, avatarGuid_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(15, retcode_);
+          .computeInt32Size(12, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -345,7 +369,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 3408
+     * CmdId: 3472
      * </pre>
      *
      * Protobuf type {@code AvatarChangeCostumeRsp}
@@ -508,7 +532,11 @@ public Builder mergeFrom(
 
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 4;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint64 avatar_guid = 11;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -516,7 +544,11 @@ public long getAvatarGuid() {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 4;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint64 avatar_guid = 11;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -527,7 +559,11 @@ public Builder setAvatarGuid(long value) {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 4;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint64 avatar_guid = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -539,7 +575,11 @@ public Builder clearAvatarGuid() {
 
       private int costumeId_ ;
       /**
-       * <code>uint32 costume_id = 9;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 costume_id = 5;</code>
        * @return The costumeId.
        */
       @java.lang.Override
@@ -547,7 +587,11 @@ public int getCostumeId() {
         return costumeId_;
       }
       /**
-       * <code>uint32 costume_id = 9;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 costume_id = 5;</code>
        * @param value The costumeId to set.
        * @return This builder for chaining.
        */
@@ -558,7 +602,11 @@ public Builder setCostumeId(int value) {
         return this;
       }
       /**
-       * <code>uint32 costume_id = 9;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 costume_id = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearCostumeId() {
@@ -570,7 +618,11 @@ public Builder clearCostumeId() {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 15;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>int32 retcode = 12;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -578,7 +630,11 @@ public int getRetcode() {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 15;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>int32 retcode = 12;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -589,7 +645,11 @@ public Builder setRetcode(int value) {
         return this;
       }
       /**
-       * <code>int32 retcode = 15;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>int32 retcode = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -666,8 +726,8 @@ public emu.grasscutter.net.proto.AvatarChangeCostumeRspOuterClass.AvatarChangeCo
   static {
     java.lang.String[] descriptorData = {
       "\n\034AvatarChangeCostumeRsp.proto\"R\n\026Avatar" +
-      "ChangeCostumeRsp\022\023\n\013avatar_guid\030\004 \001(\004\022\022\n" +
-      "\ncostume_id\030\t \001(\r\022\017\n\007retcode\030\017 \001(\005B\033\n\031em" +
+      "ChangeCostumeRsp\022\023\n\013avatar_guid\030\013 \001(\004\022\022\n" +
+      "\ncostume_id\030\005 \001(\r\022\017\n\007retcode\030\014 \001(\005B\033\n\031em" +
       "u.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarDataNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarDataNotifyOuterClass.java
index e6c6c63ac0a..1f53e2156c2 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarDataNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarDataNotifyOuterClass.java
@@ -19,41 +19,47 @@ public interface AvatarDataNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 cur_avatar_team_id = 6;</code>
+     * <code>uint32 cur_avatar_team_id = 5;</code>
      * @return The curAvatarTeamId.
      */
     int getCurAvatarTeamId();
 
     /**
-     * <code>repeated .AvatarInfo avatar_list = 7;</code>
+     * <code>uint64 choose_avatar_guid = 13;</code>
+     * @return The chooseAvatarGuid.
+     */
+    long getChooseAvatarGuid();
+
+    /**
+     * <code>repeated .AvatarInfo avatar_list = 2;</code>
      */
     java.util.List<emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo> 
         getAvatarListList();
     /**
-     * <code>repeated .AvatarInfo avatar_list = 7;</code>
+     * <code>repeated .AvatarInfo avatar_list = 2;</code>
      */
     emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo getAvatarList(int index);
     /**
-     * <code>repeated .AvatarInfo avatar_list = 7;</code>
+     * <code>repeated .AvatarInfo avatar_list = 2;</code>
      */
     int getAvatarListCount();
     /**
-     * <code>repeated .AvatarInfo avatar_list = 7;</code>
+     * <code>repeated .AvatarInfo avatar_list = 2;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder> 
         getAvatarListOrBuilderList();
     /**
-     * <code>repeated .AvatarInfo avatar_list = 7;</code>
+     * <code>repeated .AvatarInfo avatar_list = 2;</code>
      */
     emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAvatarListOrBuilder(
         int index);
 
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 9;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 15;</code>
      */
     int getAvatarTeamMapCount();
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 9;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 15;</code>
      */
     boolean containsAvatarTeamMap(
         int key);
@@ -64,125 +70,119 @@ boolean containsAvatarTeamMap(
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam>
     getAvatarTeamMap();
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 9;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 15;</code>
      */
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam>
     getAvatarTeamMapMap();
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 9;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 15;</code>
      */
 
     emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam getAvatarTeamMapOrDefault(
         int key,
         emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam defaultValue);
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 9;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 15;</code>
      */
 
     emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam getAvatarTeamMapOrThrow(
         int key);
 
     /**
-     * <code>repeated uint32 owned_flycloak_list = 12;</code>
+     * <code>repeated uint64 temp_avatar_guid_list = 12;</code>
+     * @return A list containing the tempAvatarGuidList.
+     */
+    java.util.List<java.lang.Long> getTempAvatarGuidListList();
+    /**
+     * <code>repeated uint64 temp_avatar_guid_list = 12;</code>
+     * @return The count of tempAvatarGuidList.
+     */
+    int getTempAvatarGuidListCount();
+    /**
+     * <code>repeated uint64 temp_avatar_guid_list = 12;</code>
+     * @param index The index of the element to return.
+     * @return The tempAvatarGuidList at the given index.
+     */
+    long getTempAvatarGuidList(int index);
+
+    /**
+     * <code>repeated uint32 owned_flycloak_list = 14;</code>
      * @return A list containing the ownedFlycloakList.
      */
     java.util.List<java.lang.Integer> getOwnedFlycloakListList();
     /**
-     * <code>repeated uint32 owned_flycloak_list = 12;</code>
+     * <code>repeated uint32 owned_flycloak_list = 14;</code>
      * @return The count of ownedFlycloakList.
      */
     int getOwnedFlycloakListCount();
     /**
-     * <code>repeated uint32 owned_flycloak_list = 12;</code>
+     * <code>repeated uint32 owned_flycloak_list = 14;</code>
      * @param index The index of the element to return.
      * @return The ownedFlycloakList at the given index.
      */
     int getOwnedFlycloakList(int index);
 
     /**
-     * <code>repeated uint32 owned_costume_list = 4;</code>
+     * <code>repeated uint32 owned_costume_list = 10;</code>
      * @return A list containing the ownedCostumeList.
      */
     java.util.List<java.lang.Integer> getOwnedCostumeListList();
     /**
-     * <code>repeated uint32 owned_costume_list = 4;</code>
+     * <code>repeated uint32 owned_costume_list = 10;</code>
      * @return The count of ownedCostumeList.
      */
     int getOwnedCostumeListCount();
     /**
-     * <code>repeated uint32 owned_costume_list = 4;</code>
+     * <code>repeated uint32 owned_costume_list = 10;</code>
      * @param index The index of the element to return.
      * @return The ownedCostumeList at the given index.
      */
     int getOwnedCostumeList(int index);
 
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 15;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
      */
     java.util.List<emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo> 
         getAvatarRenameListList();
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 15;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
      */
     emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo getAvatarRenameList(int index);
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 15;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
      */
     int getAvatarRenameListCount();
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 15;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfoOrBuilder> 
         getAvatarRenameListOrBuilderList();
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 15;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
      */
     emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfoOrBuilder getAvatarRenameListOrBuilder(
         int index);
 
     /**
-     * <code>uint64 choose_avatar_guid = 1;</code>
-     * @return The chooseAvatarGuid.
-     */
-    long getChooseAvatarGuid();
-
-    /**
-     * <code>repeated uint32 backup_avatar_team_order_list = 90;</code>
+     * <code>repeated uint32 backup_avatar_team_order_list = 1;</code>
      * @return A list containing the backupAvatarTeamOrderList.
      */
     java.util.List<java.lang.Integer> getBackupAvatarTeamOrderListList();
     /**
-     * <code>repeated uint32 backup_avatar_team_order_list = 90;</code>
+     * <code>repeated uint32 backup_avatar_team_order_list = 1;</code>
      * @return The count of backupAvatarTeamOrderList.
      */
     int getBackupAvatarTeamOrderListCount();
     /**
-     * <code>repeated uint32 backup_avatar_team_order_list = 90;</code>
+     * <code>repeated uint32 backup_avatar_team_order_list = 1;</code>
      * @param index The index of the element to return.
      * @return The backupAvatarTeamOrderList at the given index.
      */
     int getBackupAvatarTeamOrderList(int index);
-
-    /**
-     * <code>repeated uint64 temp_avatar_guid_list = 40;</code>
-     * @return A list containing the tempAvatarGuidList.
-     */
-    java.util.List<java.lang.Long> getTempAvatarGuidListList();
-    /**
-     * <code>repeated uint64 temp_avatar_guid_list = 40;</code>
-     * @return The count of tempAvatarGuidList.
-     */
-    int getTempAvatarGuidListCount();
-    /**
-     * <code>repeated uint64 temp_avatar_guid_list = 40;</code>
-     * @param index The index of the element to return.
-     * @return The tempAvatarGuidList at the given index.
-     */
-    long getTempAvatarGuidList(int index);
   }
   /**
    * <pre>
-   * CmdId: 23378
+   * CmdId: 23485
    * </pre>
    *
    * Protobuf type {@code AvatarDataNotify}
@@ -198,11 +198,11 @@ private AvatarDataNotify(com.google.protobuf.GeneratedMessageV3.Builder<?> build
     }
     private AvatarDataNotify() {
       avatarList_ = java.util.Collections.emptyList();
+      tempAvatarGuidList_ = emptyLongList();
       ownedFlycloakList_ = emptyIntList();
       ownedCostumeList_ = emptyIntList();
       avatarRenameList_ = java.util.Collections.emptyList();
       backupAvatarTeamOrderList_ = emptyIntList();
-      tempAvatarGuidList_ = emptyLongList();
     }
 
     @java.lang.Override
@@ -237,37 +237,27 @@ private AvatarDataNotify(
               done = true;
               break;
             case 8: {
-
-              chooseAvatarGuid_ = input.readUInt64();
-              break;
-            }
-            case 32: {
-              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
-                ownedCostumeList_ = newIntList();
-                mutable_bitField0_ |= 0x00000008;
+              if (!((mutable_bitField0_ & 0x00000040) != 0)) {
+                backupAvatarTeamOrderList_ = newIntList();
+                mutable_bitField0_ |= 0x00000040;
               }
-              ownedCostumeList_.addInt(input.readUInt32());
+              backupAvatarTeamOrderList_.addInt(input.readUInt32());
               break;
             }
-            case 34: {
+            case 10: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000008) != 0) && input.getBytesUntilLimit() > 0) {
-                ownedCostumeList_ = newIntList();
-                mutable_bitField0_ |= 0x00000008;
+              if (!((mutable_bitField0_ & 0x00000040) != 0) && input.getBytesUntilLimit() > 0) {
+                backupAvatarTeamOrderList_ = newIntList();
+                mutable_bitField0_ |= 0x00000040;
               }
               while (input.getBytesUntilLimit() > 0) {
-                ownedCostumeList_.addInt(input.readUInt32());
+                backupAvatarTeamOrderList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
             }
-            case 48: {
-
-              curAvatarTeamId_ = input.readUInt32();
-              break;
-            }
-            case 58: {
+            case 18: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 avatarList_ = new java.util.ArrayList<emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -276,63 +266,55 @@ private AvatarDataNotify(
                   input.readMessage(emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.parser(), extensionRegistry));
               break;
             }
-            case 74: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                avatarTeamMap_ = com.google.protobuf.MapField.newMapField(
-                    AvatarTeamMapDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000002;
-              }
-              com.google.protobuf.MapEntry<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam>
-              avatarTeamMap__ = input.readMessage(
-                  AvatarTeamMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
-              avatarTeamMap_.getMutableMap().put(
-                  avatarTeamMap__.getKey(), avatarTeamMap__.getValue());
+            case 40: {
+
+              curAvatarTeamId_ = input.readUInt32();
               break;
             }
-            case 96: {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                ownedFlycloakList_ = newIntList();
-                mutable_bitField0_ |= 0x00000004;
+            case 80: {
+              if (!((mutable_bitField0_ & 0x00000010) != 0)) {
+                ownedCostumeList_ = newIntList();
+                mutable_bitField0_ |= 0x00000010;
               }
-              ownedFlycloakList_.addInt(input.readUInt32());
+              ownedCostumeList_.addInt(input.readUInt32());
               break;
             }
-            case 98: {
+            case 82: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
-                ownedFlycloakList_ = newIntList();
-                mutable_bitField0_ |= 0x00000004;
+              if (!((mutable_bitField0_ & 0x00000010) != 0) && input.getBytesUntilLimit() > 0) {
+                ownedCostumeList_ = newIntList();
+                mutable_bitField0_ |= 0x00000010;
               }
               while (input.getBytesUntilLimit() > 0) {
-                ownedFlycloakList_.addInt(input.readUInt32());
+                ownedCostumeList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
             }
-            case 122: {
-              if (!((mutable_bitField0_ & 0x00000010) != 0)) {
+            case 90: {
+              if (!((mutable_bitField0_ & 0x00000020) != 0)) {
                 avatarRenameList_ = new java.util.ArrayList<emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo>();
-                mutable_bitField0_ |= 0x00000010;
+                mutable_bitField0_ |= 0x00000020;
               }
               avatarRenameList_.add(
                   input.readMessage(emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.parser(), extensionRegistry));
               break;
             }
-            case 320: {
-              if (!((mutable_bitField0_ & 0x00000040) != 0)) {
+            case 96: {
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
                 tempAvatarGuidList_ = newLongList();
-                mutable_bitField0_ |= 0x00000040;
+                mutable_bitField0_ |= 0x00000004;
               }
               tempAvatarGuidList_.addLong(input.readUInt64());
               break;
             }
-            case 322: {
+            case 98: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000040) != 0) && input.getBytesUntilLimit() > 0) {
+              if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
                 tempAvatarGuidList_ = newLongList();
-                mutable_bitField0_ |= 0x00000040;
+                mutable_bitField0_ |= 0x00000004;
               }
               while (input.getBytesUntilLimit() > 0) {
                 tempAvatarGuidList_.addLong(input.readUInt64());
@@ -340,27 +322,45 @@ private AvatarDataNotify(
               input.popLimit(limit);
               break;
             }
-            case 720: {
-              if (!((mutable_bitField0_ & 0x00000020) != 0)) {
-                backupAvatarTeamOrderList_ = newIntList();
-                mutable_bitField0_ |= 0x00000020;
+            case 104: {
+
+              chooseAvatarGuid_ = input.readUInt64();
+              break;
+            }
+            case 112: {
+              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
+                ownedFlycloakList_ = newIntList();
+                mutable_bitField0_ |= 0x00000008;
               }
-              backupAvatarTeamOrderList_.addInt(input.readUInt32());
+              ownedFlycloakList_.addInt(input.readUInt32());
               break;
             }
-            case 722: {
+            case 114: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000020) != 0) && input.getBytesUntilLimit() > 0) {
-                backupAvatarTeamOrderList_ = newIntList();
-                mutable_bitField0_ |= 0x00000020;
+              if (!((mutable_bitField0_ & 0x00000008) != 0) && input.getBytesUntilLimit() > 0) {
+                ownedFlycloakList_ = newIntList();
+                mutable_bitField0_ |= 0x00000008;
               }
               while (input.getBytesUntilLimit() > 0) {
-                backupAvatarTeamOrderList_.addInt(input.readUInt32());
+                ownedFlycloakList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
             }
+            case 122: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                avatarTeamMap_ = com.google.protobuf.MapField.newMapField(
+                    AvatarTeamMapDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000002;
+              }
+              com.google.protobuf.MapEntry<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam>
+              avatarTeamMap__ = input.readMessage(
+                  AvatarTeamMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+              avatarTeamMap_.getMutableMap().put(
+                  avatarTeamMap__.getKey(), avatarTeamMap__.getValue());
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -376,23 +376,23 @@ private AvatarDataNotify(
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000008) != 0)) {
-          ownedCostumeList_.makeImmutable(); // C
+        if (((mutable_bitField0_ & 0x00000040) != 0)) {
+          backupAvatarTeamOrderList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
           avatarList_ = java.util.Collections.unmodifiableList(avatarList_);
         }
-        if (((mutable_bitField0_ & 0x00000004) != 0)) {
-          ownedFlycloakList_.makeImmutable(); // C
-        }
         if (((mutable_bitField0_ & 0x00000010) != 0)) {
+          ownedCostumeList_.makeImmutable(); // C
+        }
+        if (((mutable_bitField0_ & 0x00000020) != 0)) {
           avatarRenameList_ = java.util.Collections.unmodifiableList(avatarRenameList_);
         }
-        if (((mutable_bitField0_ & 0x00000040) != 0)) {
+        if (((mutable_bitField0_ & 0x00000004) != 0)) {
           tempAvatarGuidList_.makeImmutable(); // C
         }
-        if (((mutable_bitField0_ & 0x00000020) != 0)) {
-          backupAvatarTeamOrderList_.makeImmutable(); // C
+        if (((mutable_bitField0_ & 0x00000008) != 0)) {
+          ownedFlycloakList_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -408,7 +408,7 @@ private AvatarDataNotify(
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 9:
+        case 15:
           return internalGetAvatarTeamMap();
         default:
           throw new RuntimeException(
@@ -423,10 +423,10 @@ protected com.google.protobuf.MapField internalGetMapField(
               emu.grasscutter.net.proto.AvatarDataNotifyOuterClass.AvatarDataNotify.class, emu.grasscutter.net.proto.AvatarDataNotifyOuterClass.AvatarDataNotify.Builder.class);
     }
 
-    public static final int CUR_AVATAR_TEAM_ID_FIELD_NUMBER = 6;
+    public static final int CUR_AVATAR_TEAM_ID_FIELD_NUMBER = 5;
     private int curAvatarTeamId_;
     /**
-     * <code>uint32 cur_avatar_team_id = 6;</code>
+     * <code>uint32 cur_avatar_team_id = 5;</code>
      * @return The curAvatarTeamId.
      */
     @java.lang.Override
@@ -434,17 +434,28 @@ public int getCurAvatarTeamId() {
       return curAvatarTeamId_;
     }
 
-    public static final int AVATAR_LIST_FIELD_NUMBER = 7;
+    public static final int CHOOSE_AVATAR_GUID_FIELD_NUMBER = 13;
+    private long chooseAvatarGuid_;
+    /**
+     * <code>uint64 choose_avatar_guid = 13;</code>
+     * @return The chooseAvatarGuid.
+     */
+    @java.lang.Override
+    public long getChooseAvatarGuid() {
+      return chooseAvatarGuid_;
+    }
+
+    public static final int AVATAR_LIST_FIELD_NUMBER = 2;
     private java.util.List<emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo> avatarList_;
     /**
-     * <code>repeated .AvatarInfo avatar_list = 7;</code>
+     * <code>repeated .AvatarInfo avatar_list = 2;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo> getAvatarListList() {
       return avatarList_;
     }
     /**
-     * <code>repeated .AvatarInfo avatar_list = 7;</code>
+     * <code>repeated .AvatarInfo avatar_list = 2;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder> 
@@ -452,21 +463,21 @@ public java.util.List<emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo>
       return avatarList_;
     }
     /**
-     * <code>repeated .AvatarInfo avatar_list = 7;</code>
+     * <code>repeated .AvatarInfo avatar_list = 2;</code>
      */
     @java.lang.Override
     public int getAvatarListCount() {
       return avatarList_.size();
     }
     /**
-     * <code>repeated .AvatarInfo avatar_list = 7;</code>
+     * <code>repeated .AvatarInfo avatar_list = 2;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo getAvatarList(int index) {
       return avatarList_.get(index);
     }
     /**
-     * <code>repeated .AvatarInfo avatar_list = 7;</code>
+     * <code>repeated .AvatarInfo avatar_list = 2;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAvatarListOrBuilder(
@@ -474,7 +485,7 @@ public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAva
       return avatarList_.get(index);
     }
 
-    public static final int AVATAR_TEAM_MAP_FIELD_NUMBER = 9;
+    public static final int AVATAR_TEAM_MAP_FIELD_NUMBER = 15;
     private static final class AvatarTeamMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam> defaultEntry =
@@ -501,7 +512,7 @@ public int getAvatarTeamMapCount() {
       return internalGetAvatarTeamMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 9;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 15;</code>
      */
 
     @java.lang.Override
@@ -519,7 +530,7 @@ public java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOute
       return getAvatarTeamMapMap();
     }
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 9;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 15;</code>
      */
     @java.lang.Override
 
@@ -527,7 +538,7 @@ public java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOute
       return internalGetAvatarTeamMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 9;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 15;</code>
      */
     @java.lang.Override
 
@@ -540,7 +551,7 @@ public emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam getAvatarTeamMa
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 9;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 15;</code>
      */
     @java.lang.Override
 
@@ -555,10 +566,38 @@ public emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam getAvatarTeamMa
       return map.get(key);
     }
 
-    public static final int OWNED_FLYCLOAK_LIST_FIELD_NUMBER = 12;
+    public static final int TEMP_AVATAR_GUID_LIST_FIELD_NUMBER = 12;
+    private com.google.protobuf.Internal.LongList tempAvatarGuidList_;
+    /**
+     * <code>repeated uint64 temp_avatar_guid_list = 12;</code>
+     * @return A list containing the tempAvatarGuidList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getTempAvatarGuidListList() {
+      return tempAvatarGuidList_;
+    }
+    /**
+     * <code>repeated uint64 temp_avatar_guid_list = 12;</code>
+     * @return The count of tempAvatarGuidList.
+     */
+    public int getTempAvatarGuidListCount() {
+      return tempAvatarGuidList_.size();
+    }
+    /**
+     * <code>repeated uint64 temp_avatar_guid_list = 12;</code>
+     * @param index The index of the element to return.
+     * @return The tempAvatarGuidList at the given index.
+     */
+    public long getTempAvatarGuidList(int index) {
+      return tempAvatarGuidList_.getLong(index);
+    }
+    private int tempAvatarGuidListMemoizedSerializedSize = -1;
+
+    public static final int OWNED_FLYCLOAK_LIST_FIELD_NUMBER = 14;
     private com.google.protobuf.Internal.IntList ownedFlycloakList_;
     /**
-     * <code>repeated uint32 owned_flycloak_list = 12;</code>
+     * <code>repeated uint32 owned_flycloak_list = 14;</code>
      * @return A list containing the ownedFlycloakList.
      */
     @java.lang.Override
@@ -567,14 +606,14 @@ public emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam getAvatarTeamMa
       return ownedFlycloakList_;
     }
     /**
-     * <code>repeated uint32 owned_flycloak_list = 12;</code>
+     * <code>repeated uint32 owned_flycloak_list = 14;</code>
      * @return The count of ownedFlycloakList.
      */
     public int getOwnedFlycloakListCount() {
       return ownedFlycloakList_.size();
     }
     /**
-     * <code>repeated uint32 owned_flycloak_list = 12;</code>
+     * <code>repeated uint32 owned_flycloak_list = 14;</code>
      * @param index The index of the element to return.
      * @return The ownedFlycloakList at the given index.
      */
@@ -583,10 +622,10 @@ public int getOwnedFlycloakList(int index) {
     }
     private int ownedFlycloakListMemoizedSerializedSize = -1;
 
-    public static final int OWNED_COSTUME_LIST_FIELD_NUMBER = 4;
+    public static final int OWNED_COSTUME_LIST_FIELD_NUMBER = 10;
     private com.google.protobuf.Internal.IntList ownedCostumeList_;
     /**
-     * <code>repeated uint32 owned_costume_list = 4;</code>
+     * <code>repeated uint32 owned_costume_list = 10;</code>
      * @return A list containing the ownedCostumeList.
      */
     @java.lang.Override
@@ -595,14 +634,14 @@ public int getOwnedFlycloakList(int index) {
       return ownedCostumeList_;
     }
     /**
-     * <code>repeated uint32 owned_costume_list = 4;</code>
+     * <code>repeated uint32 owned_costume_list = 10;</code>
      * @return The count of ownedCostumeList.
      */
     public int getOwnedCostumeListCount() {
       return ownedCostumeList_.size();
     }
     /**
-     * <code>repeated uint32 owned_costume_list = 4;</code>
+     * <code>repeated uint32 owned_costume_list = 10;</code>
      * @param index The index of the element to return.
      * @return The ownedCostumeList at the given index.
      */
@@ -611,17 +650,17 @@ public int getOwnedCostumeList(int index) {
     }
     private int ownedCostumeListMemoizedSerializedSize = -1;
 
-    public static final int AVATAR_RENAME_LIST_FIELD_NUMBER = 15;
+    public static final int AVATAR_RENAME_LIST_FIELD_NUMBER = 11;
     private java.util.List<emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo> avatarRenameList_;
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 15;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo> getAvatarRenameListList() {
       return avatarRenameList_;
     }
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 15;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfoOrBuilder> 
@@ -629,21 +668,21 @@ public java.util.List<emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.Avata
       return avatarRenameList_;
     }
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 15;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
      */
     @java.lang.Override
     public int getAvatarRenameListCount() {
       return avatarRenameList_.size();
     }
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 15;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo getAvatarRenameList(int index) {
       return avatarRenameList_.get(index);
     }
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 15;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfoOrBuilder getAvatarRenameListOrBuilder(
@@ -651,21 +690,10 @@ public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfoOrBu
       return avatarRenameList_.get(index);
     }
 
-    public static final int CHOOSE_AVATAR_GUID_FIELD_NUMBER = 1;
-    private long chooseAvatarGuid_;
-    /**
-     * <code>uint64 choose_avatar_guid = 1;</code>
-     * @return The chooseAvatarGuid.
-     */
-    @java.lang.Override
-    public long getChooseAvatarGuid() {
-      return chooseAvatarGuid_;
-    }
-
-    public static final int BACKUP_AVATAR_TEAM_ORDER_LIST_FIELD_NUMBER = 90;
+    public static final int BACKUP_AVATAR_TEAM_ORDER_LIST_FIELD_NUMBER = 1;
     private com.google.protobuf.Internal.IntList backupAvatarTeamOrderList_;
     /**
-     * <code>repeated uint32 backup_avatar_team_order_list = 90;</code>
+     * <code>repeated uint32 backup_avatar_team_order_list = 1;</code>
      * @return A list containing the backupAvatarTeamOrderList.
      */
     @java.lang.Override
@@ -674,14 +702,14 @@ public long getChooseAvatarGuid() {
       return backupAvatarTeamOrderList_;
     }
     /**
-     * <code>repeated uint32 backup_avatar_team_order_list = 90;</code>
+     * <code>repeated uint32 backup_avatar_team_order_list = 1;</code>
      * @return The count of backupAvatarTeamOrderList.
      */
     public int getBackupAvatarTeamOrderListCount() {
       return backupAvatarTeamOrderList_.size();
     }
     /**
-     * <code>repeated uint32 backup_avatar_team_order_list = 90;</code>
+     * <code>repeated uint32 backup_avatar_team_order_list = 1;</code>
      * @param index The index of the element to return.
      * @return The backupAvatarTeamOrderList at the given index.
      */
@@ -690,34 +718,6 @@ public int getBackupAvatarTeamOrderList(int index) {
     }
     private int backupAvatarTeamOrderListMemoizedSerializedSize = -1;
 
-    public static final int TEMP_AVATAR_GUID_LIST_FIELD_NUMBER = 40;
-    private com.google.protobuf.Internal.LongList tempAvatarGuidList_;
-    /**
-     * <code>repeated uint64 temp_avatar_guid_list = 40;</code>
-     * @return A list containing the tempAvatarGuidList.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Long>
-        getTempAvatarGuidListList() {
-      return tempAvatarGuidList_;
-    }
-    /**
-     * <code>repeated uint64 temp_avatar_guid_list = 40;</code>
-     * @return The count of tempAvatarGuidList.
-     */
-    public int getTempAvatarGuidListCount() {
-      return tempAvatarGuidList_.size();
-    }
-    /**
-     * <code>repeated uint64 temp_avatar_guid_list = 40;</code>
-     * @param index The index of the element to return.
-     * @return The tempAvatarGuidList at the given index.
-     */
-    public long getTempAvatarGuidList(int index) {
-      return tempAvatarGuidList_.getLong(index);
-    }
-    private int tempAvatarGuidListMemoizedSerializedSize = -1;
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -733,52 +733,52 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (chooseAvatarGuid_ != 0L) {
-        output.writeUInt64(1, chooseAvatarGuid_);
+      if (getBackupAvatarTeamOrderListList().size() > 0) {
+        output.writeUInt32NoTag(10);
+        output.writeUInt32NoTag(backupAvatarTeamOrderListMemoizedSerializedSize);
       }
-      if (getOwnedCostumeListList().size() > 0) {
-        output.writeUInt32NoTag(34);
-        output.writeUInt32NoTag(ownedCostumeListMemoizedSerializedSize);
+      for (int i = 0; i < backupAvatarTeamOrderList_.size(); i++) {
+        output.writeUInt32NoTag(backupAvatarTeamOrderList_.getInt(i));
       }
-      for (int i = 0; i < ownedCostumeList_.size(); i++) {
-        output.writeUInt32NoTag(ownedCostumeList_.getInt(i));
+      for (int i = 0; i < avatarList_.size(); i++) {
+        output.writeMessage(2, avatarList_.get(i));
       }
       if (curAvatarTeamId_ != 0) {
-        output.writeUInt32(6, curAvatarTeamId_);
+        output.writeUInt32(5, curAvatarTeamId_);
       }
-      for (int i = 0; i < avatarList_.size(); i++) {
-        output.writeMessage(7, avatarList_.get(i));
-      }
-      com.google.protobuf.GeneratedMessageV3
-        .serializeIntegerMapTo(
-          output,
-          internalGetAvatarTeamMap(),
-          AvatarTeamMapDefaultEntryHolder.defaultEntry,
-          9);
-      if (getOwnedFlycloakListList().size() > 0) {
-        output.writeUInt32NoTag(98);
-        output.writeUInt32NoTag(ownedFlycloakListMemoizedSerializedSize);
+      if (getOwnedCostumeListList().size() > 0) {
+        output.writeUInt32NoTag(82);
+        output.writeUInt32NoTag(ownedCostumeListMemoizedSerializedSize);
       }
-      for (int i = 0; i < ownedFlycloakList_.size(); i++) {
-        output.writeUInt32NoTag(ownedFlycloakList_.getInt(i));
+      for (int i = 0; i < ownedCostumeList_.size(); i++) {
+        output.writeUInt32NoTag(ownedCostumeList_.getInt(i));
       }
       for (int i = 0; i < avatarRenameList_.size(); i++) {
-        output.writeMessage(15, avatarRenameList_.get(i));
+        output.writeMessage(11, avatarRenameList_.get(i));
       }
       if (getTempAvatarGuidListList().size() > 0) {
-        output.writeUInt32NoTag(322);
+        output.writeUInt32NoTag(98);
         output.writeUInt32NoTag(tempAvatarGuidListMemoizedSerializedSize);
       }
       for (int i = 0; i < tempAvatarGuidList_.size(); i++) {
         output.writeUInt64NoTag(tempAvatarGuidList_.getLong(i));
       }
-      if (getBackupAvatarTeamOrderListList().size() > 0) {
-        output.writeUInt32NoTag(722);
-        output.writeUInt32NoTag(backupAvatarTeamOrderListMemoizedSerializedSize);
+      if (chooseAvatarGuid_ != 0L) {
+        output.writeUInt64(13, chooseAvatarGuid_);
       }
-      for (int i = 0; i < backupAvatarTeamOrderList_.size(); i++) {
-        output.writeUInt32NoTag(backupAvatarTeamOrderList_.getInt(i));
+      if (getOwnedFlycloakListList().size() > 0) {
+        output.writeUInt32NoTag(114);
+        output.writeUInt32NoTag(ownedFlycloakListMemoizedSerializedSize);
       }
+      for (int i = 0; i < ownedFlycloakList_.size(); i++) {
+        output.writeUInt32NoTag(ownedFlycloakList_.getInt(i));
+      }
+      com.google.protobuf.GeneratedMessageV3
+        .serializeIntegerMapTo(
+          output,
+          internalGetAvatarTeamMap(),
+          AvatarTeamMapDefaultEntryHolder.defaultEntry,
+          15);
       unknownFields.writeTo(output);
     }
 
@@ -788,59 +788,45 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (chooseAvatarGuid_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(1, chooseAvatarGuid_);
-      }
       {
         int dataSize = 0;
-        for (int i = 0; i < ownedCostumeList_.size(); i++) {
+        for (int i = 0; i < backupAvatarTeamOrderList_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(ownedCostumeList_.getInt(i));
+            .computeUInt32SizeNoTag(backupAvatarTeamOrderList_.getInt(i));
         }
         size += dataSize;
-        if (!getOwnedCostumeListList().isEmpty()) {
+        if (!getBackupAvatarTeamOrderListList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        ownedCostumeListMemoizedSerializedSize = dataSize;
-      }
-      if (curAvatarTeamId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, curAvatarTeamId_);
+        backupAvatarTeamOrderListMemoizedSerializedSize = dataSize;
       }
       for (int i = 0; i < avatarList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(7, avatarList_.get(i));
+          .computeMessageSize(2, avatarList_.get(i));
       }
-      for (java.util.Map.Entry<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam> entry
-           : internalGetAvatarTeamMap().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam>
-        avatarTeamMap__ = AvatarTeamMapDefaultEntryHolder.defaultEntry.newBuilderForType()
-            .setKey(entry.getKey())
-            .setValue(entry.getValue())
-            .build();
+      if (curAvatarTeamId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(9, avatarTeamMap__);
+          .computeUInt32Size(5, curAvatarTeamId_);
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < ownedFlycloakList_.size(); i++) {
+        for (int i = 0; i < ownedCostumeList_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(ownedFlycloakList_.getInt(i));
+            .computeUInt32SizeNoTag(ownedCostumeList_.getInt(i));
         }
         size += dataSize;
-        if (!getOwnedFlycloakListList().isEmpty()) {
+        if (!getOwnedCostumeListList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        ownedFlycloakListMemoizedSerializedSize = dataSize;
+        ownedCostumeListMemoizedSerializedSize = dataSize;
       }
       for (int i = 0; i < avatarRenameList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(15, avatarRenameList_.get(i));
+          .computeMessageSize(11, avatarRenameList_.get(i));
       }
       {
         int dataSize = 0;
@@ -850,25 +836,39 @@ public int getSerializedSize() {
         }
         size += dataSize;
         if (!getTempAvatarGuidListList().isEmpty()) {
-          size += 2;
+          size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
         tempAvatarGuidListMemoizedSerializedSize = dataSize;
       }
+      if (chooseAvatarGuid_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(13, chooseAvatarGuid_);
+      }
       {
         int dataSize = 0;
-        for (int i = 0; i < backupAvatarTeamOrderList_.size(); i++) {
+        for (int i = 0; i < ownedFlycloakList_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(backupAvatarTeamOrderList_.getInt(i));
+            .computeUInt32SizeNoTag(ownedFlycloakList_.getInt(i));
         }
         size += dataSize;
-        if (!getBackupAvatarTeamOrderListList().isEmpty()) {
-          size += 2;
+        if (!getOwnedFlycloakListList().isEmpty()) {
+          size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        backupAvatarTeamOrderListMemoizedSerializedSize = dataSize;
+        ownedFlycloakListMemoizedSerializedSize = dataSize;
+      }
+      for (java.util.Map.Entry<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam> entry
+           : internalGetAvatarTeamMap().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam>
+        avatarTeamMap__ = AvatarTeamMapDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(15, avatarTeamMap__);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -887,22 +887,22 @@ public boolean equals(final java.lang.Object obj) {
 
       if (getCurAvatarTeamId()
           != other.getCurAvatarTeamId()) return false;
+      if (getChooseAvatarGuid()
+          != other.getChooseAvatarGuid()) return false;
       if (!getAvatarListList()
           .equals(other.getAvatarListList())) return false;
       if (!internalGetAvatarTeamMap().equals(
           other.internalGetAvatarTeamMap())) return false;
+      if (!getTempAvatarGuidListList()
+          .equals(other.getTempAvatarGuidListList())) return false;
       if (!getOwnedFlycloakListList()
           .equals(other.getOwnedFlycloakListList())) return false;
       if (!getOwnedCostumeListList()
           .equals(other.getOwnedCostumeListList())) return false;
       if (!getAvatarRenameListList()
           .equals(other.getAvatarRenameListList())) return false;
-      if (getChooseAvatarGuid()
-          != other.getChooseAvatarGuid()) return false;
       if (!getBackupAvatarTeamOrderListList()
           .equals(other.getBackupAvatarTeamOrderListList())) return false;
-      if (!getTempAvatarGuidListList()
-          .equals(other.getTempAvatarGuidListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -916,6 +916,9 @@ public int hashCode() {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + CUR_AVATAR_TEAM_ID_FIELD_NUMBER;
       hash = (53 * hash) + getCurAvatarTeamId();
+      hash = (37 * hash) + CHOOSE_AVATAR_GUID_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getChooseAvatarGuid());
       if (getAvatarListCount() > 0) {
         hash = (37 * hash) + AVATAR_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getAvatarListList().hashCode();
@@ -924,6 +927,10 @@ public int hashCode() {
         hash = (37 * hash) + AVATAR_TEAM_MAP_FIELD_NUMBER;
         hash = (53 * hash) + internalGetAvatarTeamMap().hashCode();
       }
+      if (getTempAvatarGuidListCount() > 0) {
+        hash = (37 * hash) + TEMP_AVATAR_GUID_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getTempAvatarGuidListList().hashCode();
+      }
       if (getOwnedFlycloakListCount() > 0) {
         hash = (37 * hash) + OWNED_FLYCLOAK_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getOwnedFlycloakListList().hashCode();
@@ -936,17 +943,10 @@ public int hashCode() {
         hash = (37 * hash) + AVATAR_RENAME_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getAvatarRenameListList().hashCode();
       }
-      hash = (37 * hash) + CHOOSE_AVATAR_GUID_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getChooseAvatarGuid());
       if (getBackupAvatarTeamOrderListCount() > 0) {
         hash = (37 * hash) + BACKUP_AVATAR_TEAM_ORDER_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getBackupAvatarTeamOrderListList().hashCode();
       }
-      if (getTempAvatarGuidListCount() > 0) {
-        hash = (37 * hash) + TEMP_AVATAR_GUID_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getTempAvatarGuidListList().hashCode();
-      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -1044,7 +1044,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 23378
+     * CmdId: 23485
      * </pre>
      *
      * Protobuf type {@code AvatarDataNotify}
@@ -1062,7 +1062,7 @@ public static final class Builder extends
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 9:
+          case 15:
             return internalGetAvatarTeamMap();
           default:
             throw new RuntimeException(
@@ -1073,7 +1073,7 @@ protected com.google.protobuf.MapField internalGetMapField(
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 9:
+          case 15:
             return internalGetMutableAvatarTeamMap();
           default:
             throw new RuntimeException(
@@ -1110,6 +1110,8 @@ public Builder clear() {
         super.clear();
         curAvatarTeamId_ = 0;
 
+        chooseAvatarGuid_ = 0L;
+
         if (avatarListBuilder_ == null) {
           avatarList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
@@ -1117,21 +1119,19 @@ public Builder clear() {
           avatarListBuilder_.clear();
         }
         internalGetMutableAvatarTeamMap().clear();
-        ownedFlycloakList_ = emptyIntList();
+        tempAvatarGuidList_ = emptyLongList();
         bitField0_ = (bitField0_ & ~0x00000004);
-        ownedCostumeList_ = emptyIntList();
+        ownedFlycloakList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000008);
+        ownedCostumeList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000010);
         if (avatarRenameListBuilder_ == null) {
           avatarRenameList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000010);
+          bitField0_ = (bitField0_ & ~0x00000020);
         } else {
           avatarRenameListBuilder_.clear();
         }
-        chooseAvatarGuid_ = 0L;
-
         backupAvatarTeamOrderList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000020);
-        tempAvatarGuidList_ = emptyLongList();
         bitField0_ = (bitField0_ & ~0x00000040);
         return this;
       }
@@ -1161,6 +1161,7 @@ public emu.grasscutter.net.proto.AvatarDataNotifyOuterClass.AvatarDataNotify bui
         emu.grasscutter.net.proto.AvatarDataNotifyOuterClass.AvatarDataNotify result = new emu.grasscutter.net.proto.AvatarDataNotifyOuterClass.AvatarDataNotify(this);
         int from_bitField0_ = bitField0_;
         result.curAvatarTeamId_ = curAvatarTeamId_;
+        result.chooseAvatarGuid_ = chooseAvatarGuid_;
         if (avatarListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             avatarList_ = java.util.Collections.unmodifiableList(avatarList_);
@@ -1173,35 +1174,34 @@ public emu.grasscutter.net.proto.AvatarDataNotifyOuterClass.AvatarDataNotify bui
         result.avatarTeamMap_ = internalGetAvatarTeamMap();
         result.avatarTeamMap_.makeImmutable();
         if (((bitField0_ & 0x00000004) != 0)) {
-          ownedFlycloakList_.makeImmutable();
+          tempAvatarGuidList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000004);
         }
-        result.ownedFlycloakList_ = ownedFlycloakList_;
+        result.tempAvatarGuidList_ = tempAvatarGuidList_;
         if (((bitField0_ & 0x00000008) != 0)) {
-          ownedCostumeList_.makeImmutable();
+          ownedFlycloakList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000008);
         }
+        result.ownedFlycloakList_ = ownedFlycloakList_;
+        if (((bitField0_ & 0x00000010) != 0)) {
+          ownedCostumeList_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000010);
+        }
         result.ownedCostumeList_ = ownedCostumeList_;
         if (avatarRenameListBuilder_ == null) {
-          if (((bitField0_ & 0x00000010) != 0)) {
+          if (((bitField0_ & 0x00000020) != 0)) {
             avatarRenameList_ = java.util.Collections.unmodifiableList(avatarRenameList_);
-            bitField0_ = (bitField0_ & ~0x00000010);
+            bitField0_ = (bitField0_ & ~0x00000020);
           }
           result.avatarRenameList_ = avatarRenameList_;
         } else {
           result.avatarRenameList_ = avatarRenameListBuilder_.build();
         }
-        result.chooseAvatarGuid_ = chooseAvatarGuid_;
-        if (((bitField0_ & 0x00000020) != 0)) {
-          backupAvatarTeamOrderList_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000020);
-        }
-        result.backupAvatarTeamOrderList_ = backupAvatarTeamOrderList_;
         if (((bitField0_ & 0x00000040) != 0)) {
-          tempAvatarGuidList_.makeImmutable();
+          backupAvatarTeamOrderList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000040);
         }
-        result.tempAvatarGuidList_ = tempAvatarGuidList_;
+        result.backupAvatarTeamOrderList_ = backupAvatarTeamOrderList_;
         onBuilt();
         return result;
       }
@@ -1253,6 +1253,9 @@ public Builder mergeFrom(emu.grasscutter.net.proto.AvatarDataNotifyOuterClass.Av
         if (other.getCurAvatarTeamId() != 0) {
           setCurAvatarTeamId(other.getCurAvatarTeamId());
         }
+        if (other.getChooseAvatarGuid() != 0L) {
+          setChooseAvatarGuid(other.getChooseAvatarGuid());
+        }
         if (avatarListBuilder_ == null) {
           if (!other.avatarList_.isEmpty()) {
             if (avatarList_.isEmpty()) {
@@ -1281,10 +1284,20 @@ public Builder mergeFrom(emu.grasscutter.net.proto.AvatarDataNotifyOuterClass.Av
         }
         internalGetMutableAvatarTeamMap().mergeFrom(
             other.internalGetAvatarTeamMap());
+        if (!other.tempAvatarGuidList_.isEmpty()) {
+          if (tempAvatarGuidList_.isEmpty()) {
+            tempAvatarGuidList_ = other.tempAvatarGuidList_;
+            bitField0_ = (bitField0_ & ~0x00000004);
+          } else {
+            ensureTempAvatarGuidListIsMutable();
+            tempAvatarGuidList_.addAll(other.tempAvatarGuidList_);
+          }
+          onChanged();
+        }
         if (!other.ownedFlycloakList_.isEmpty()) {
           if (ownedFlycloakList_.isEmpty()) {
             ownedFlycloakList_ = other.ownedFlycloakList_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000008);
           } else {
             ensureOwnedFlycloakListIsMutable();
             ownedFlycloakList_.addAll(other.ownedFlycloakList_);
@@ -1294,7 +1307,7 @@ public Builder mergeFrom(emu.grasscutter.net.proto.AvatarDataNotifyOuterClass.Av
         if (!other.ownedCostumeList_.isEmpty()) {
           if (ownedCostumeList_.isEmpty()) {
             ownedCostumeList_ = other.ownedCostumeList_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+            bitField0_ = (bitField0_ & ~0x00000010);
           } else {
             ensureOwnedCostumeListIsMutable();
             ownedCostumeList_.addAll(other.ownedCostumeList_);
@@ -1305,7 +1318,7 @@ public Builder mergeFrom(emu.grasscutter.net.proto.AvatarDataNotifyOuterClass.Av
           if (!other.avatarRenameList_.isEmpty()) {
             if (avatarRenameList_.isEmpty()) {
               avatarRenameList_ = other.avatarRenameList_;
-              bitField0_ = (bitField0_ & ~0x00000010);
+              bitField0_ = (bitField0_ & ~0x00000020);
             } else {
               ensureAvatarRenameListIsMutable();
               avatarRenameList_.addAll(other.avatarRenameList_);
@@ -1318,7 +1331,7 @@ public Builder mergeFrom(emu.grasscutter.net.proto.AvatarDataNotifyOuterClass.Av
               avatarRenameListBuilder_.dispose();
               avatarRenameListBuilder_ = null;
               avatarRenameList_ = other.avatarRenameList_;
-              bitField0_ = (bitField0_ & ~0x00000010);
+              bitField0_ = (bitField0_ & ~0x00000020);
               avatarRenameListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getAvatarRenameListFieldBuilder() : null;
@@ -1327,29 +1340,16 @@ public Builder mergeFrom(emu.grasscutter.net.proto.AvatarDataNotifyOuterClass.Av
             }
           }
         }
-        if (other.getChooseAvatarGuid() != 0L) {
-          setChooseAvatarGuid(other.getChooseAvatarGuid());
-        }
         if (!other.backupAvatarTeamOrderList_.isEmpty()) {
           if (backupAvatarTeamOrderList_.isEmpty()) {
             backupAvatarTeamOrderList_ = other.backupAvatarTeamOrderList_;
-            bitField0_ = (bitField0_ & ~0x00000020);
+            bitField0_ = (bitField0_ & ~0x00000040);
           } else {
             ensureBackupAvatarTeamOrderListIsMutable();
             backupAvatarTeamOrderList_.addAll(other.backupAvatarTeamOrderList_);
           }
           onChanged();
         }
-        if (!other.tempAvatarGuidList_.isEmpty()) {
-          if (tempAvatarGuidList_.isEmpty()) {
-            tempAvatarGuidList_ = other.tempAvatarGuidList_;
-            bitField0_ = (bitField0_ & ~0x00000040);
-          } else {
-            ensureTempAvatarGuidListIsMutable();
-            tempAvatarGuidList_.addAll(other.tempAvatarGuidList_);
-          }
-          onChanged();
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -1382,7 +1382,7 @@ public Builder mergeFrom(
 
       private int curAvatarTeamId_ ;
       /**
-       * <code>uint32 cur_avatar_team_id = 6;</code>
+       * <code>uint32 cur_avatar_team_id = 5;</code>
        * @return The curAvatarTeamId.
        */
       @java.lang.Override
@@ -1390,7 +1390,7 @@ public int getCurAvatarTeamId() {
         return curAvatarTeamId_;
       }
       /**
-       * <code>uint32 cur_avatar_team_id = 6;</code>
+       * <code>uint32 cur_avatar_team_id = 5;</code>
        * @param value The curAvatarTeamId to set.
        * @return This builder for chaining.
        */
@@ -1401,7 +1401,7 @@ public Builder setCurAvatarTeamId(int value) {
         return this;
       }
       /**
-       * <code>uint32 cur_avatar_team_id = 6;</code>
+       * <code>uint32 cur_avatar_team_id = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearCurAvatarTeamId() {
@@ -1411,6 +1411,37 @@ public Builder clearCurAvatarTeamId() {
         return this;
       }
 
+      private long chooseAvatarGuid_ ;
+      /**
+       * <code>uint64 choose_avatar_guid = 13;</code>
+       * @return The chooseAvatarGuid.
+       */
+      @java.lang.Override
+      public long getChooseAvatarGuid() {
+        return chooseAvatarGuid_;
+      }
+      /**
+       * <code>uint64 choose_avatar_guid = 13;</code>
+       * @param value The chooseAvatarGuid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setChooseAvatarGuid(long value) {
+        
+        chooseAvatarGuid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 choose_avatar_guid = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearChooseAvatarGuid() {
+        
+        chooseAvatarGuid_ = 0L;
+        onChanged();
+        return this;
+      }
+
       private java.util.List<emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo> avatarList_ =
         java.util.Collections.emptyList();
       private void ensureAvatarListIsMutable() {
@@ -1424,7 +1455,7 @@ private void ensureAvatarListIsMutable() {
           emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder> avatarListBuilder_;
 
       /**
-       * <code>repeated .AvatarInfo avatar_list = 7;</code>
+       * <code>repeated .AvatarInfo avatar_list = 2;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo> getAvatarListList() {
         if (avatarListBuilder_ == null) {
@@ -1434,7 +1465,7 @@ public java.util.List<emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo>
         }
       }
       /**
-       * <code>repeated .AvatarInfo avatar_list = 7;</code>
+       * <code>repeated .AvatarInfo avatar_list = 2;</code>
        */
       public int getAvatarListCount() {
         if (avatarListBuilder_ == null) {
@@ -1444,7 +1475,7 @@ public int getAvatarListCount() {
         }
       }
       /**
-       * <code>repeated .AvatarInfo avatar_list = 7;</code>
+       * <code>repeated .AvatarInfo avatar_list = 2;</code>
        */
       public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo getAvatarList(int index) {
         if (avatarListBuilder_ == null) {
@@ -1454,7 +1485,7 @@ public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo getAvatarList(i
         }
       }
       /**
-       * <code>repeated .AvatarInfo avatar_list = 7;</code>
+       * <code>repeated .AvatarInfo avatar_list = 2;</code>
        */
       public Builder setAvatarList(
           int index, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo value) {
@@ -1471,7 +1502,7 @@ public Builder setAvatarList(
         return this;
       }
       /**
-       * <code>repeated .AvatarInfo avatar_list = 7;</code>
+       * <code>repeated .AvatarInfo avatar_list = 2;</code>
        */
       public Builder setAvatarList(
           int index, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder builderForValue) {
@@ -1485,7 +1516,7 @@ public Builder setAvatarList(
         return this;
       }
       /**
-       * <code>repeated .AvatarInfo avatar_list = 7;</code>
+       * <code>repeated .AvatarInfo avatar_list = 2;</code>
        */
       public Builder addAvatarList(emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo value) {
         if (avatarListBuilder_ == null) {
@@ -1501,7 +1532,7 @@ public Builder addAvatarList(emu.grasscutter.net.proto.AvatarInfoOuterClass.Avat
         return this;
       }
       /**
-       * <code>repeated .AvatarInfo avatar_list = 7;</code>
+       * <code>repeated .AvatarInfo avatar_list = 2;</code>
        */
       public Builder addAvatarList(
           int index, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo value) {
@@ -1518,7 +1549,7 @@ public Builder addAvatarList(
         return this;
       }
       /**
-       * <code>repeated .AvatarInfo avatar_list = 7;</code>
+       * <code>repeated .AvatarInfo avatar_list = 2;</code>
        */
       public Builder addAvatarList(
           emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder builderForValue) {
@@ -1532,7 +1563,7 @@ public Builder addAvatarList(
         return this;
       }
       /**
-       * <code>repeated .AvatarInfo avatar_list = 7;</code>
+       * <code>repeated .AvatarInfo avatar_list = 2;</code>
        */
       public Builder addAvatarList(
           int index, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder builderForValue) {
@@ -1546,7 +1577,7 @@ public Builder addAvatarList(
         return this;
       }
       /**
-       * <code>repeated .AvatarInfo avatar_list = 7;</code>
+       * <code>repeated .AvatarInfo avatar_list = 2;</code>
        */
       public Builder addAllAvatarList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo> values) {
@@ -1561,7 +1592,7 @@ public Builder addAllAvatarList(
         return this;
       }
       /**
-       * <code>repeated .AvatarInfo avatar_list = 7;</code>
+       * <code>repeated .AvatarInfo avatar_list = 2;</code>
        */
       public Builder clearAvatarList() {
         if (avatarListBuilder_ == null) {
@@ -1574,7 +1605,7 @@ public Builder clearAvatarList() {
         return this;
       }
       /**
-       * <code>repeated .AvatarInfo avatar_list = 7;</code>
+       * <code>repeated .AvatarInfo avatar_list = 2;</code>
        */
       public Builder removeAvatarList(int index) {
         if (avatarListBuilder_ == null) {
@@ -1587,14 +1618,14 @@ public Builder removeAvatarList(int index) {
         return this;
       }
       /**
-       * <code>repeated .AvatarInfo avatar_list = 7;</code>
+       * <code>repeated .AvatarInfo avatar_list = 2;</code>
        */
       public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder getAvatarListBuilder(
           int index) {
         return getAvatarListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .AvatarInfo avatar_list = 7;</code>
+       * <code>repeated .AvatarInfo avatar_list = 2;</code>
        */
       public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAvatarListOrBuilder(
           int index) {
@@ -1604,7 +1635,7 @@ public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAva
         }
       }
       /**
-       * <code>repeated .AvatarInfo avatar_list = 7;</code>
+       * <code>repeated .AvatarInfo avatar_list = 2;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder> 
            getAvatarListOrBuilderList() {
@@ -1615,14 +1646,14 @@ public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAva
         }
       }
       /**
-       * <code>repeated .AvatarInfo avatar_list = 7;</code>
+       * <code>repeated .AvatarInfo avatar_list = 2;</code>
        */
       public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder addAvatarListBuilder() {
         return getAvatarListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .AvatarInfo avatar_list = 7;</code>
+       * <code>repeated .AvatarInfo avatar_list = 2;</code>
        */
       public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder addAvatarListBuilder(
           int index) {
@@ -1630,7 +1661,7 @@ public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder addAvat
             index, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .AvatarInfo avatar_list = 7;</code>
+       * <code>repeated .AvatarInfo avatar_list = 2;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder> 
            getAvatarListBuilderList() {
@@ -1678,7 +1709,7 @@ public int getAvatarTeamMapCount() {
         return internalGetAvatarTeamMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 9;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 15;</code>
        */
 
       @java.lang.Override
@@ -1696,7 +1727,7 @@ public java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOute
         return getAvatarTeamMapMap();
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 9;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 15;</code>
        */
       @java.lang.Override
 
@@ -1704,7 +1735,7 @@ public java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOute
         return internalGetAvatarTeamMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 9;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 15;</code>
        */
       @java.lang.Override
 
@@ -1717,7 +1748,7 @@ public emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam getAvatarTeamMa
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 9;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 15;</code>
        */
       @java.lang.Override
 
@@ -1738,7 +1769,7 @@ public Builder clearAvatarTeamMap() {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 9;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 15;</code>
        */
 
       public Builder removeAvatarTeamMap(
@@ -1757,7 +1788,7 @@ public Builder removeAvatarTeamMap(
         return internalGetMutableAvatarTeamMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 9;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 15;</code>
        */
       public Builder putAvatarTeamMap(
           int key,
@@ -1769,7 +1800,7 @@ public Builder putAvatarTeamMap(
         return this;
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 9;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 15;</code>
        */
 
       public Builder putAllAvatarTeamMap(
@@ -1779,31 +1810,110 @@ public Builder putAllAvatarTeamMap(
         return this;
       }
 
+      private com.google.protobuf.Internal.LongList tempAvatarGuidList_ = emptyLongList();
+      private void ensureTempAvatarGuidListIsMutable() {
+        if (!((bitField0_ & 0x00000004) != 0)) {
+          tempAvatarGuidList_ = mutableCopy(tempAvatarGuidList_);
+          bitField0_ |= 0x00000004;
+         }
+      }
+      /**
+       * <code>repeated uint64 temp_avatar_guid_list = 12;</code>
+       * @return A list containing the tempAvatarGuidList.
+       */
+      public java.util.List<java.lang.Long>
+          getTempAvatarGuidListList() {
+        return ((bitField0_ & 0x00000004) != 0) ?
+                 java.util.Collections.unmodifiableList(tempAvatarGuidList_) : tempAvatarGuidList_;
+      }
+      /**
+       * <code>repeated uint64 temp_avatar_guid_list = 12;</code>
+       * @return The count of tempAvatarGuidList.
+       */
+      public int getTempAvatarGuidListCount() {
+        return tempAvatarGuidList_.size();
+      }
+      /**
+       * <code>repeated uint64 temp_avatar_guid_list = 12;</code>
+       * @param index The index of the element to return.
+       * @return The tempAvatarGuidList at the given index.
+       */
+      public long getTempAvatarGuidList(int index) {
+        return tempAvatarGuidList_.getLong(index);
+      }
+      /**
+       * <code>repeated uint64 temp_avatar_guid_list = 12;</code>
+       * @param index The index to set the value at.
+       * @param value The tempAvatarGuidList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTempAvatarGuidList(
+          int index, long value) {
+        ensureTempAvatarGuidListIsMutable();
+        tempAvatarGuidList_.setLong(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 temp_avatar_guid_list = 12;</code>
+       * @param value The tempAvatarGuidList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addTempAvatarGuidList(long value) {
+        ensureTempAvatarGuidListIsMutable();
+        tempAvatarGuidList_.addLong(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 temp_avatar_guid_list = 12;</code>
+       * @param values The tempAvatarGuidList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllTempAvatarGuidList(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureTempAvatarGuidListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, tempAvatarGuidList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 temp_avatar_guid_list = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTempAvatarGuidList() {
+        tempAvatarGuidList_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x00000004);
+        onChanged();
+        return this;
+      }
+
       private com.google.protobuf.Internal.IntList ownedFlycloakList_ = emptyIntList();
       private void ensureOwnedFlycloakListIsMutable() {
-        if (!((bitField0_ & 0x00000004) != 0)) {
+        if (!((bitField0_ & 0x00000008) != 0)) {
           ownedFlycloakList_ = mutableCopy(ownedFlycloakList_);
-          bitField0_ |= 0x00000004;
+          bitField0_ |= 0x00000008;
          }
       }
       /**
-       * <code>repeated uint32 owned_flycloak_list = 12;</code>
+       * <code>repeated uint32 owned_flycloak_list = 14;</code>
        * @return A list containing the ownedFlycloakList.
        */
       public java.util.List<java.lang.Integer>
           getOwnedFlycloakListList() {
-        return ((bitField0_ & 0x00000004) != 0) ?
+        return ((bitField0_ & 0x00000008) != 0) ?
                  java.util.Collections.unmodifiableList(ownedFlycloakList_) : ownedFlycloakList_;
       }
       /**
-       * <code>repeated uint32 owned_flycloak_list = 12;</code>
+       * <code>repeated uint32 owned_flycloak_list = 14;</code>
        * @return The count of ownedFlycloakList.
        */
       public int getOwnedFlycloakListCount() {
         return ownedFlycloakList_.size();
       }
       /**
-       * <code>repeated uint32 owned_flycloak_list = 12;</code>
+       * <code>repeated uint32 owned_flycloak_list = 14;</code>
        * @param index The index of the element to return.
        * @return The ownedFlycloakList at the given index.
        */
@@ -1811,7 +1921,7 @@ public int getOwnedFlycloakList(int index) {
         return ownedFlycloakList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 owned_flycloak_list = 12;</code>
+       * <code>repeated uint32 owned_flycloak_list = 14;</code>
        * @param index The index to set the value at.
        * @param value The ownedFlycloakList to set.
        * @return This builder for chaining.
@@ -1824,7 +1934,7 @@ public Builder setOwnedFlycloakList(
         return this;
       }
       /**
-       * <code>repeated uint32 owned_flycloak_list = 12;</code>
+       * <code>repeated uint32 owned_flycloak_list = 14;</code>
        * @param value The ownedFlycloakList to add.
        * @return This builder for chaining.
        */
@@ -1835,7 +1945,7 @@ public Builder addOwnedFlycloakList(int value) {
         return this;
       }
       /**
-       * <code>repeated uint32 owned_flycloak_list = 12;</code>
+       * <code>repeated uint32 owned_flycloak_list = 14;</code>
        * @param values The ownedFlycloakList to add.
        * @return This builder for chaining.
        */
@@ -1848,41 +1958,41 @@ public Builder addAllOwnedFlycloakList(
         return this;
       }
       /**
-       * <code>repeated uint32 owned_flycloak_list = 12;</code>
+       * <code>repeated uint32 owned_flycloak_list = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearOwnedFlycloakList() {
         ownedFlycloakList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000004);
+        bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
         return this;
       }
 
       private com.google.protobuf.Internal.IntList ownedCostumeList_ = emptyIntList();
       private void ensureOwnedCostumeListIsMutable() {
-        if (!((bitField0_ & 0x00000008) != 0)) {
+        if (!((bitField0_ & 0x00000010) != 0)) {
           ownedCostumeList_ = mutableCopy(ownedCostumeList_);
-          bitField0_ |= 0x00000008;
+          bitField0_ |= 0x00000010;
          }
       }
       /**
-       * <code>repeated uint32 owned_costume_list = 4;</code>
+       * <code>repeated uint32 owned_costume_list = 10;</code>
        * @return A list containing the ownedCostumeList.
        */
       public java.util.List<java.lang.Integer>
           getOwnedCostumeListList() {
-        return ((bitField0_ & 0x00000008) != 0) ?
+        return ((bitField0_ & 0x00000010) != 0) ?
                  java.util.Collections.unmodifiableList(ownedCostumeList_) : ownedCostumeList_;
       }
       /**
-       * <code>repeated uint32 owned_costume_list = 4;</code>
+       * <code>repeated uint32 owned_costume_list = 10;</code>
        * @return The count of ownedCostumeList.
        */
       public int getOwnedCostumeListCount() {
         return ownedCostumeList_.size();
       }
       /**
-       * <code>repeated uint32 owned_costume_list = 4;</code>
+       * <code>repeated uint32 owned_costume_list = 10;</code>
        * @param index The index of the element to return.
        * @return The ownedCostumeList at the given index.
        */
@@ -1890,7 +2000,7 @@ public int getOwnedCostumeList(int index) {
         return ownedCostumeList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 owned_costume_list = 4;</code>
+       * <code>repeated uint32 owned_costume_list = 10;</code>
        * @param index The index to set the value at.
        * @param value The ownedCostumeList to set.
        * @return This builder for chaining.
@@ -1903,7 +2013,7 @@ public Builder setOwnedCostumeList(
         return this;
       }
       /**
-       * <code>repeated uint32 owned_costume_list = 4;</code>
+       * <code>repeated uint32 owned_costume_list = 10;</code>
        * @param value The ownedCostumeList to add.
        * @return This builder for chaining.
        */
@@ -1914,7 +2024,7 @@ public Builder addOwnedCostumeList(int value) {
         return this;
       }
       /**
-       * <code>repeated uint32 owned_costume_list = 4;</code>
+       * <code>repeated uint32 owned_costume_list = 10;</code>
        * @param values The ownedCostumeList to add.
        * @return This builder for chaining.
        */
@@ -1927,12 +2037,12 @@ public Builder addAllOwnedCostumeList(
         return this;
       }
       /**
-       * <code>repeated uint32 owned_costume_list = 4;</code>
+       * <code>repeated uint32 owned_costume_list = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearOwnedCostumeList() {
         ownedCostumeList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000008);
+        bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
         return this;
       }
@@ -1940,9 +2050,9 @@ public Builder clearOwnedCostumeList() {
       private java.util.List<emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo> avatarRenameList_ =
         java.util.Collections.emptyList();
       private void ensureAvatarRenameListIsMutable() {
-        if (!((bitField0_ & 0x00000010) != 0)) {
+        if (!((bitField0_ & 0x00000020) != 0)) {
           avatarRenameList_ = new java.util.ArrayList<emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo>(avatarRenameList_);
-          bitField0_ |= 0x00000010;
+          bitField0_ |= 0x00000020;
          }
       }
 
@@ -1950,7 +2060,7 @@ private void ensureAvatarRenameListIsMutable() {
           emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo, emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.Builder, emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfoOrBuilder> avatarRenameListBuilder_;
 
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 15;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo> getAvatarRenameListList() {
         if (avatarRenameListBuilder_ == null) {
@@ -1960,7 +2070,7 @@ public java.util.List<emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.Avata
         }
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 15;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
        */
       public int getAvatarRenameListCount() {
         if (avatarRenameListBuilder_ == null) {
@@ -1970,7 +2080,7 @@ public int getAvatarRenameListCount() {
         }
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 15;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
        */
       public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo getAvatarRenameList(int index) {
         if (avatarRenameListBuilder_ == null) {
@@ -1980,7 +2090,7 @@ public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo get
         }
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 15;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
        */
       public Builder setAvatarRenameList(
           int index, emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo value) {
@@ -1997,7 +2107,7 @@ public Builder setAvatarRenameList(
         return this;
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 15;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
        */
       public Builder setAvatarRenameList(
           int index, emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.Builder builderForValue) {
@@ -2011,7 +2121,7 @@ public Builder setAvatarRenameList(
         return this;
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 15;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
        */
       public Builder addAvatarRenameList(emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo value) {
         if (avatarRenameListBuilder_ == null) {
@@ -2027,7 +2137,7 @@ public Builder addAvatarRenameList(emu.grasscutter.net.proto.AvatarRenameInfoOut
         return this;
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 15;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
        */
       public Builder addAvatarRenameList(
           int index, emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo value) {
@@ -2044,7 +2154,7 @@ public Builder addAvatarRenameList(
         return this;
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 15;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
        */
       public Builder addAvatarRenameList(
           emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.Builder builderForValue) {
@@ -2058,7 +2168,7 @@ public Builder addAvatarRenameList(
         return this;
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 15;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
        */
       public Builder addAvatarRenameList(
           int index, emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.Builder builderForValue) {
@@ -2072,7 +2182,7 @@ public Builder addAvatarRenameList(
         return this;
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 15;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
        */
       public Builder addAllAvatarRenameList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo> values) {
@@ -2087,12 +2197,12 @@ public Builder addAllAvatarRenameList(
         return this;
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 15;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
        */
       public Builder clearAvatarRenameList() {
         if (avatarRenameListBuilder_ == null) {
           avatarRenameList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000010);
+          bitField0_ = (bitField0_ & ~0x00000020);
           onChanged();
         } else {
           avatarRenameListBuilder_.clear();
@@ -2100,7 +2210,7 @@ public Builder clearAvatarRenameList() {
         return this;
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 15;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
        */
       public Builder removeAvatarRenameList(int index) {
         if (avatarRenameListBuilder_ == null) {
@@ -2113,14 +2223,14 @@ public Builder removeAvatarRenameList(int index) {
         return this;
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 15;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
        */
       public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.Builder getAvatarRenameListBuilder(
           int index) {
         return getAvatarRenameListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 15;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
        */
       public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfoOrBuilder getAvatarRenameListOrBuilder(
           int index) {
@@ -2130,7 +2240,7 @@ public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfoOrBu
         }
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 15;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfoOrBuilder> 
            getAvatarRenameListOrBuilderList() {
@@ -2141,14 +2251,14 @@ public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfoOrBu
         }
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 15;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
        */
       public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.Builder addAvatarRenameListBuilder() {
         return getAvatarRenameListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 15;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
        */
       public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.Builder addAvatarRenameListBuilder(
           int index) {
@@ -2156,7 +2266,7 @@ public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.Bui
             index, emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 15;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.Builder> 
            getAvatarRenameListBuilderList() {
@@ -2169,7 +2279,7 @@ public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.Bui
           avatarRenameListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo, emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.Builder, emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfoOrBuilder>(
                   avatarRenameList_,
-                  ((bitField0_ & 0x00000010) != 0),
+                  ((bitField0_ & 0x00000020) != 0),
                   getParentForChildren(),
                   isClean());
           avatarRenameList_ = null;
@@ -2177,62 +2287,31 @@ public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.Bui
         return avatarRenameListBuilder_;
       }
 
-      private long chooseAvatarGuid_ ;
-      /**
-       * <code>uint64 choose_avatar_guid = 1;</code>
-       * @return The chooseAvatarGuid.
-       */
-      @java.lang.Override
-      public long getChooseAvatarGuid() {
-        return chooseAvatarGuid_;
-      }
-      /**
-       * <code>uint64 choose_avatar_guid = 1;</code>
-       * @param value The chooseAvatarGuid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setChooseAvatarGuid(long value) {
-        
-        chooseAvatarGuid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 choose_avatar_guid = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearChooseAvatarGuid() {
-        
-        chooseAvatarGuid_ = 0L;
-        onChanged();
-        return this;
-      }
-
       private com.google.protobuf.Internal.IntList backupAvatarTeamOrderList_ = emptyIntList();
       private void ensureBackupAvatarTeamOrderListIsMutable() {
-        if (!((bitField0_ & 0x00000020) != 0)) {
+        if (!((bitField0_ & 0x00000040) != 0)) {
           backupAvatarTeamOrderList_ = mutableCopy(backupAvatarTeamOrderList_);
-          bitField0_ |= 0x00000020;
+          bitField0_ |= 0x00000040;
          }
       }
       /**
-       * <code>repeated uint32 backup_avatar_team_order_list = 90;</code>
+       * <code>repeated uint32 backup_avatar_team_order_list = 1;</code>
        * @return A list containing the backupAvatarTeamOrderList.
        */
       public java.util.List<java.lang.Integer>
           getBackupAvatarTeamOrderListList() {
-        return ((bitField0_ & 0x00000020) != 0) ?
+        return ((bitField0_ & 0x00000040) != 0) ?
                  java.util.Collections.unmodifiableList(backupAvatarTeamOrderList_) : backupAvatarTeamOrderList_;
       }
       /**
-       * <code>repeated uint32 backup_avatar_team_order_list = 90;</code>
+       * <code>repeated uint32 backup_avatar_team_order_list = 1;</code>
        * @return The count of backupAvatarTeamOrderList.
        */
       public int getBackupAvatarTeamOrderListCount() {
         return backupAvatarTeamOrderList_.size();
       }
       /**
-       * <code>repeated uint32 backup_avatar_team_order_list = 90;</code>
+       * <code>repeated uint32 backup_avatar_team_order_list = 1;</code>
        * @param index The index of the element to return.
        * @return The backupAvatarTeamOrderList at the given index.
        */
@@ -2240,7 +2319,7 @@ public int getBackupAvatarTeamOrderList(int index) {
         return backupAvatarTeamOrderList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 backup_avatar_team_order_list = 90;</code>
+       * <code>repeated uint32 backup_avatar_team_order_list = 1;</code>
        * @param index The index to set the value at.
        * @param value The backupAvatarTeamOrderList to set.
        * @return This builder for chaining.
@@ -2253,7 +2332,7 @@ public Builder setBackupAvatarTeamOrderList(
         return this;
       }
       /**
-       * <code>repeated uint32 backup_avatar_team_order_list = 90;</code>
+       * <code>repeated uint32 backup_avatar_team_order_list = 1;</code>
        * @param value The backupAvatarTeamOrderList to add.
        * @return This builder for chaining.
        */
@@ -2264,7 +2343,7 @@ public Builder addBackupAvatarTeamOrderList(int value) {
         return this;
       }
       /**
-       * <code>repeated uint32 backup_avatar_team_order_list = 90;</code>
+       * <code>repeated uint32 backup_avatar_team_order_list = 1;</code>
        * @param values The backupAvatarTeamOrderList to add.
        * @return This builder for chaining.
        */
@@ -2277,90 +2356,11 @@ public Builder addAllBackupAvatarTeamOrderList(
         return this;
       }
       /**
-       * <code>repeated uint32 backup_avatar_team_order_list = 90;</code>
+       * <code>repeated uint32 backup_avatar_team_order_list = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearBackupAvatarTeamOrderList() {
         backupAvatarTeamOrderList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000020);
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.Internal.LongList tempAvatarGuidList_ = emptyLongList();
-      private void ensureTempAvatarGuidListIsMutable() {
-        if (!((bitField0_ & 0x00000040) != 0)) {
-          tempAvatarGuidList_ = mutableCopy(tempAvatarGuidList_);
-          bitField0_ |= 0x00000040;
-         }
-      }
-      /**
-       * <code>repeated uint64 temp_avatar_guid_list = 40;</code>
-       * @return A list containing the tempAvatarGuidList.
-       */
-      public java.util.List<java.lang.Long>
-          getTempAvatarGuidListList() {
-        return ((bitField0_ & 0x00000040) != 0) ?
-                 java.util.Collections.unmodifiableList(tempAvatarGuidList_) : tempAvatarGuidList_;
-      }
-      /**
-       * <code>repeated uint64 temp_avatar_guid_list = 40;</code>
-       * @return The count of tempAvatarGuidList.
-       */
-      public int getTempAvatarGuidListCount() {
-        return tempAvatarGuidList_.size();
-      }
-      /**
-       * <code>repeated uint64 temp_avatar_guid_list = 40;</code>
-       * @param index The index of the element to return.
-       * @return The tempAvatarGuidList at the given index.
-       */
-      public long getTempAvatarGuidList(int index) {
-        return tempAvatarGuidList_.getLong(index);
-      }
-      /**
-       * <code>repeated uint64 temp_avatar_guid_list = 40;</code>
-       * @param index The index to set the value at.
-       * @param value The tempAvatarGuidList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTempAvatarGuidList(
-          int index, long value) {
-        ensureTempAvatarGuidListIsMutable();
-        tempAvatarGuidList_.setLong(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint64 temp_avatar_guid_list = 40;</code>
-       * @param value The tempAvatarGuidList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addTempAvatarGuidList(long value) {
-        ensureTempAvatarGuidListIsMutable();
-        tempAvatarGuidList_.addLong(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint64 temp_avatar_guid_list = 40;</code>
-       * @param values The tempAvatarGuidList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllTempAvatarGuidList(
-          java.lang.Iterable<? extends java.lang.Long> values) {
-        ensureTempAvatarGuidListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, tempAvatarGuidList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint64 temp_avatar_guid_list = 40;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTempAvatarGuidList() {
-        tempAvatarGuidList_ = emptyLongList();
         bitField0_ = (bitField0_ & ~0x00000040);
         onChanged();
         return this;
@@ -2440,14 +2440,14 @@ public emu.grasscutter.net.proto.AvatarDataNotifyOuterClass.AvatarDataNotify get
       "\n\026AvatarDataNotify.proto\032\020AvatarInfo.pro" +
       "to\032\020AvatarTeam.proto\032\026AvatarRenameInfo.p" +
       "roto\"\234\003\n\020AvatarDataNotify\022\032\n\022cur_avatar_" +
-      "team_id\030\006 \001(\r\022 \n\013avatar_list\030\007 \003(\0132\013.Ava" +
-      "tarInfo\022=\n\017avatar_team_map\030\t \003(\0132$.Avata" +
-      "rDataNotify.AvatarTeamMapEntry\022\033\n\023owned_" +
-      "flycloak_list\030\014 \003(\r\022\032\n\022owned_costume_lis" +
-      "t\030\004 \003(\r\022-\n\022avatar_rename_list\030\017 \003(\0132\021.Av" +
-      "atarRenameInfo\022\032\n\022choose_avatar_guid\030\001 \001" +
-      "(\004\022%\n\035backup_avatar_team_order_list\030Z \003(" +
-      "\r\022\035\n\025temp_avatar_guid_list\030( \003(\004\032A\n\022Avat" +
+      "team_id\030\005 \001(\r\022\032\n\022choose_avatar_guid\030\r \001(" +
+      "\004\022 \n\013avatar_list\030\002 \003(\0132\013.AvatarInfo\022=\n\017a" +
+      "vatar_team_map\030\017 \003(\0132$.AvatarDataNotify." +
+      "AvatarTeamMapEntry\022\035\n\025temp_avatar_guid_l" +
+      "ist\030\014 \003(\004\022\033\n\023owned_flycloak_list\030\016 \003(\r\022\032" +
+      "\n\022owned_costume_list\030\n \003(\r\022-\n\022avatar_ren" +
+      "ame_list\030\013 \003(\0132\021.AvatarRenameInfo\022%\n\035bac" +
+      "kup_avatar_team_order_list\030\001 \003(\r\032A\n\022Avat" +
       "arTeamMapEntry\022\013\n\003key\030\001 \001(\r\022\032\n\005value\030\002 \001" +
       "(\0132\013.AvatarTeam:\0028\001B\033\n\031emu.grasscutter.n" +
       "et.protob\006proto3"
@@ -2464,7 +2464,7 @@ public emu.grasscutter.net.proto.AvatarDataNotifyOuterClass.AvatarDataNotify get
     internal_static_AvatarDataNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarDataNotify_descriptor,
-        new java.lang.String[] { "CurAvatarTeamId", "AvatarList", "AvatarTeamMap", "OwnedFlycloakList", "OwnedCostumeList", "AvatarRenameList", "ChooseAvatarGuid", "BackupAvatarTeamOrderList", "TempAvatarGuidList", });
+        new java.lang.String[] { "CurAvatarTeamId", "ChooseAvatarGuid", "AvatarList", "AvatarTeamMap", "TempAvatarGuidList", "OwnedFlycloakList", "OwnedCostumeList", "AvatarRenameList", "BackupAvatarTeamOrderList", });
     internal_static_AvatarDataNotify_AvatarTeamMapEntry_descriptor =
       internal_static_AvatarDataNotify_descriptor.getNestedTypes().get(0);
     internal_static_AvatarDataNotify_AvatarTeamMapEntry_fieldAccessorTable = new
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarDieAnimationEndReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarDieAnimationEndReqOuterClass.java
index 9df232fa39c..8d27c645166 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarDieAnimationEndReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarDieAnimationEndReqOuterClass.java
@@ -19,35 +19,55 @@ public interface AvatarDieAnimationEndReqOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.Vector reborn_pos = 13;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.Vector reborn_pos = 12;</code>
      * @return Whether the rebornPos field is set.
      */
     boolean hasRebornPos();
     /**
-     * <code>.Vector reborn_pos = 13;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.Vector reborn_pos = 12;</code>
      * @return The rebornPos.
      */
     emu.grasscutter.net.proto.VectorOuterClass.Vector getRebornPos();
     /**
-     * <code>.Vector reborn_pos = 13;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.Vector reborn_pos = 12;</code>
      */
     emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRebornPosOrBuilder();
 
     /**
-     * <code>uint64 die_guid = 12;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint64 die_guid = 11;</code>
      * @return The dieGuid.
      */
     long getDieGuid();
 
     /**
-     * <code>uint32 skill_id = 7;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>uint32 skill_id = 14;</code>
      * @return The skillId.
      */
     int getSkillId();
   }
   /**
    * <pre>
-   * CmdId: 943
+   * CmdId: 26240
    * </pre>
    *
    * Protobuf type {@code AvatarDieAnimationEndReq}
@@ -94,17 +114,12 @@ private AvatarDieAnimationEndReq(
             case 0:
               done = true;
               break;
-            case 56: {
-
-              skillId_ = input.readUInt32();
-              break;
-            }
-            case 96: {
+            case 88: {
 
               dieGuid_ = input.readUInt64();
               break;
             }
-            case 106: {
+            case 98: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (rebornPos_ != null) {
                 subBuilder = rebornPos_.toBuilder();
@@ -117,6 +132,11 @@ private AvatarDieAnimationEndReq(
 
               break;
             }
+            case 112: {
+
+              skillId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -149,10 +169,14 @@ private AvatarDieAnimationEndReq(
               emu.grasscutter.net.proto.AvatarDieAnimationEndReqOuterClass.AvatarDieAnimationEndReq.class, emu.grasscutter.net.proto.AvatarDieAnimationEndReqOuterClass.AvatarDieAnimationEndReq.Builder.class);
     }
 
-    public static final int REBORN_POS_FIELD_NUMBER = 13;
+    public static final int REBORN_POS_FIELD_NUMBER = 12;
     private emu.grasscutter.net.proto.VectorOuterClass.Vector rebornPos_;
     /**
-     * <code>.Vector reborn_pos = 13;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.Vector reborn_pos = 12;</code>
      * @return Whether the rebornPos field is set.
      */
     @java.lang.Override
@@ -160,7 +184,11 @@ public boolean hasRebornPos() {
       return rebornPos_ != null;
     }
     /**
-     * <code>.Vector reborn_pos = 13;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.Vector reborn_pos = 12;</code>
      * @return The rebornPos.
      */
     @java.lang.Override
@@ -168,17 +196,25 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getRebornPos() {
       return rebornPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rebornPos_;
     }
     /**
-     * <code>.Vector reborn_pos = 13;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.Vector reborn_pos = 12;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRebornPosOrBuilder() {
       return getRebornPos();
     }
 
-    public static final int DIE_GUID_FIELD_NUMBER = 12;
+    public static final int DIE_GUID_FIELD_NUMBER = 11;
     private long dieGuid_;
     /**
-     * <code>uint64 die_guid = 12;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint64 die_guid = 11;</code>
      * @return The dieGuid.
      */
     @java.lang.Override
@@ -186,10 +222,14 @@ public long getDieGuid() {
       return dieGuid_;
     }
 
-    public static final int SKILL_ID_FIELD_NUMBER = 7;
+    public static final int SKILL_ID_FIELD_NUMBER = 14;
     private int skillId_;
     /**
-     * <code>uint32 skill_id = 7;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>uint32 skill_id = 14;</code>
      * @return The skillId.
      */
     @java.lang.Override
@@ -211,14 +251,14 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (skillId_ != 0) {
-        output.writeUInt32(7, skillId_);
-      }
       if (dieGuid_ != 0L) {
-        output.writeUInt64(12, dieGuid_);
+        output.writeUInt64(11, dieGuid_);
       }
       if (rebornPos_ != null) {
-        output.writeMessage(13, getRebornPos());
+        output.writeMessage(12, getRebornPos());
+      }
+      if (skillId_ != 0) {
+        output.writeUInt32(14, skillId_);
       }
       unknownFields.writeTo(output);
     }
@@ -229,17 +269,17 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (skillId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, skillId_);
-      }
       if (dieGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(12, dieGuid_);
+          .computeUInt64Size(11, dieGuid_);
       }
       if (rebornPos_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(13, getRebornPos());
+          .computeMessageSize(12, getRebornPos());
+      }
+      if (skillId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, skillId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -382,7 +422,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 943
+     * CmdId: 26240
      * </pre>
      *
      * Protobuf type {@code AvatarDieAnimationEndReq}
@@ -555,14 +595,22 @@ public Builder mergeFrom(
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> rebornPosBuilder_;
       /**
-       * <code>.Vector reborn_pos = 13;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.Vector reborn_pos = 12;</code>
        * @return Whether the rebornPos field is set.
        */
       public boolean hasRebornPos() {
         return rebornPosBuilder_ != null || rebornPos_ != null;
       }
       /**
-       * <code>.Vector reborn_pos = 13;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.Vector reborn_pos = 12;</code>
        * @return The rebornPos.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getRebornPos() {
@@ -573,7 +621,11 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getRebornPos() {
         }
       }
       /**
-       * <code>.Vector reborn_pos = 13;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.Vector reborn_pos = 12;</code>
        */
       public Builder setRebornPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (rebornPosBuilder_ == null) {
@@ -589,7 +641,11 @@ public Builder setRebornPos(emu.grasscutter.net.proto.VectorOuterClass.Vector va
         return this;
       }
       /**
-       * <code>.Vector reborn_pos = 13;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.Vector reborn_pos = 12;</code>
        */
       public Builder setRebornPos(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -603,7 +659,11 @@ public Builder setRebornPos(
         return this;
       }
       /**
-       * <code>.Vector reborn_pos = 13;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.Vector reborn_pos = 12;</code>
        */
       public Builder mergeRebornPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (rebornPosBuilder_ == null) {
@@ -621,7 +681,11 @@ public Builder mergeRebornPos(emu.grasscutter.net.proto.VectorOuterClass.Vector
         return this;
       }
       /**
-       * <code>.Vector reborn_pos = 13;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.Vector reborn_pos = 12;</code>
        */
       public Builder clearRebornPos() {
         if (rebornPosBuilder_ == null) {
@@ -635,7 +699,11 @@ public Builder clearRebornPos() {
         return this;
       }
       /**
-       * <code>.Vector reborn_pos = 13;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.Vector reborn_pos = 12;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getRebornPosBuilder() {
         
@@ -643,7 +711,11 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getRebornPosBui
         return getRebornPosFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector reborn_pos = 13;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.Vector reborn_pos = 12;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRebornPosOrBuilder() {
         if (rebornPosBuilder_ != null) {
@@ -654,7 +726,11 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRebornPosOr
         }
       }
       /**
-       * <code>.Vector reborn_pos = 13;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.Vector reborn_pos = 12;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
@@ -672,7 +748,11 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRebornPosOr
 
       private long dieGuid_ ;
       /**
-       * <code>uint64 die_guid = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint64 die_guid = 11;</code>
        * @return The dieGuid.
        */
       @java.lang.Override
@@ -680,7 +760,11 @@ public long getDieGuid() {
         return dieGuid_;
       }
       /**
-       * <code>uint64 die_guid = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint64 die_guid = 11;</code>
        * @param value The dieGuid to set.
        * @return This builder for chaining.
        */
@@ -691,7 +775,11 @@ public Builder setDieGuid(long value) {
         return this;
       }
       /**
-       * <code>uint64 die_guid = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint64 die_guid = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearDieGuid() {
@@ -703,7 +791,11 @@ public Builder clearDieGuid() {
 
       private int skillId_ ;
       /**
-       * <code>uint32 skill_id = 7;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint32 skill_id = 14;</code>
        * @return The skillId.
        */
       @java.lang.Override
@@ -711,7 +803,11 @@ public int getSkillId() {
         return skillId_;
       }
       /**
-       * <code>uint32 skill_id = 7;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint32 skill_id = 14;</code>
        * @param value The skillId to set.
        * @return This builder for chaining.
        */
@@ -722,7 +818,11 @@ public Builder setSkillId(int value) {
         return this;
       }
       /**
-       * <code>uint32 skill_id = 7;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint32 skill_id = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearSkillId() {
@@ -800,8 +900,8 @@ public emu.grasscutter.net.proto.AvatarDieAnimationEndReqOuterClass.AvatarDieAni
     java.lang.String[] descriptorData = {
       "\n\036AvatarDieAnimationEndReq.proto\032\014Vector" +
       ".proto\"[\n\030AvatarDieAnimationEndReq\022\033\n\nre" +
-      "born_pos\030\r \001(\0132\007.Vector\022\020\n\010die_guid\030\014 \001(" +
-      "\004\022\020\n\010skill_id\030\007 \001(\rB\033\n\031emu.grasscutter.n" +
+      "born_pos\030\014 \001(\0132\007.Vector\022\020\n\010die_guid\030\013 \001(" +
+      "\004\022\020\n\010skill_id\030\016 \001(\rB\033\n\031emu.grasscutter.n" +
       "et.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarDieAnimationEndRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarDieAnimationEndRspOuterClass.java
index da46e6ec30f..5d30ab51475 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarDieAnimationEndRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarDieAnimationEndRspOuterClass.java
@@ -19,26 +19,38 @@ public interface AvatarDieAnimationEndRspOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>int32 retcode = 2;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>uint64 die_guid = 11;</code>
-     * @return The dieGuid.
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 skill_id = 6;</code>
+     * @return The skillId.
      */
-    long getDieGuid();
+    int getSkillId();
 
     /**
-     * <code>uint32 skill_id = 13;</code>
-     * @return The skillId.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint64 die_guid = 12;</code>
+     * @return The dieGuid.
      */
-    int getSkillId();
+    long getDieGuid();
   }
   /**
    * <pre>
-   * CmdId: 20675
+   * CmdId: 9399
    * </pre>
    *
    * Protobuf type {@code AvatarDieAnimationEndRsp}
@@ -85,19 +97,19 @@ private AvatarDieAnimationEndRsp(
             case 0:
               done = true;
               break;
-            case 48: {
+            case 16: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 88: {
+            case 48: {
 
-              dieGuid_ = input.readUInt64();
+              skillId_ = input.readUInt32();
               break;
             }
-            case 104: {
+            case 96: {
 
-              skillId_ = input.readUInt32();
+              dieGuid_ = input.readUInt64();
               break;
             }
             default: {
@@ -132,10 +144,14 @@ private AvatarDieAnimationEndRsp(
               emu.grasscutter.net.proto.AvatarDieAnimationEndRspOuterClass.AvatarDieAnimationEndRsp.class, emu.grasscutter.net.proto.AvatarDieAnimationEndRspOuterClass.AvatarDieAnimationEndRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 6;
+    public static final int RETCODE_FIELD_NUMBER = 2;
     private int retcode_;
     /**
-     * <code>int32 retcode = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>int32 retcode = 2;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -143,26 +159,34 @@ public int getRetcode() {
       return retcode_;
     }
 
-    public static final int DIE_GUID_FIELD_NUMBER = 11;
-    private long dieGuid_;
+    public static final int SKILL_ID_FIELD_NUMBER = 6;
+    private int skillId_;
     /**
-     * <code>uint64 die_guid = 11;</code>
-     * @return The dieGuid.
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 skill_id = 6;</code>
+     * @return The skillId.
      */
     @java.lang.Override
-    public long getDieGuid() {
-      return dieGuid_;
+    public int getSkillId() {
+      return skillId_;
     }
 
-    public static final int SKILL_ID_FIELD_NUMBER = 13;
-    private int skillId_;
+    public static final int DIE_GUID_FIELD_NUMBER = 12;
+    private long dieGuid_;
     /**
-     * <code>uint32 skill_id = 13;</code>
-     * @return The skillId.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint64 die_guid = 12;</code>
+     * @return The dieGuid.
      */
     @java.lang.Override
-    public int getSkillId() {
-      return skillId_;
+    public long getDieGuid() {
+      return dieGuid_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -180,13 +204,13 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (retcode_ != 0) {
-        output.writeInt32(6, retcode_);
-      }
-      if (dieGuid_ != 0L) {
-        output.writeUInt64(11, dieGuid_);
+        output.writeInt32(2, retcode_);
       }
       if (skillId_ != 0) {
-        output.writeUInt32(13, skillId_);
+        output.writeUInt32(6, skillId_);
+      }
+      if (dieGuid_ != 0L) {
+        output.writeUInt64(12, dieGuid_);
       }
       unknownFields.writeTo(output);
     }
@@ -199,15 +223,15 @@ public int getSerializedSize() {
       size = 0;
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(6, retcode_);
+          .computeInt32Size(2, retcode_);
       }
-      if (dieGuid_ != 0L) {
+      if (skillId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(11, dieGuid_);
+          .computeUInt32Size(6, skillId_);
       }
-      if (skillId_ != 0) {
+      if (dieGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, skillId_);
+          .computeUInt64Size(12, dieGuid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -226,10 +250,10 @@ public boolean equals(final java.lang.Object obj) {
 
       if (getRetcode()
           != other.getRetcode()) return false;
-      if (getDieGuid()
-          != other.getDieGuid()) return false;
       if (getSkillId()
           != other.getSkillId()) return false;
+      if (getDieGuid()
+          != other.getDieGuid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -243,11 +267,11 @@ public int hashCode() {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + SKILL_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getSkillId();
       hash = (37 * hash) + DIE_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getDieGuid());
-      hash = (37 * hash) + SKILL_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getSkillId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -345,7 +369,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 20675
+     * CmdId: 9399
      * </pre>
      *
      * Protobuf type {@code AvatarDieAnimationEndRsp}
@@ -387,10 +411,10 @@ public Builder clear() {
         super.clear();
         retcode_ = 0;
 
-        dieGuid_ = 0L;
-
         skillId_ = 0;
 
+        dieGuid_ = 0L;
+
         return this;
       }
 
@@ -418,8 +442,8 @@ public emu.grasscutter.net.proto.AvatarDieAnimationEndRspOuterClass.AvatarDieAni
       public emu.grasscutter.net.proto.AvatarDieAnimationEndRspOuterClass.AvatarDieAnimationEndRsp buildPartial() {
         emu.grasscutter.net.proto.AvatarDieAnimationEndRspOuterClass.AvatarDieAnimationEndRsp result = new emu.grasscutter.net.proto.AvatarDieAnimationEndRspOuterClass.AvatarDieAnimationEndRsp(this);
         result.retcode_ = retcode_;
-        result.dieGuid_ = dieGuid_;
         result.skillId_ = skillId_;
+        result.dieGuid_ = dieGuid_;
         onBuilt();
         return result;
       }
@@ -471,12 +495,12 @@ public Builder mergeFrom(emu.grasscutter.net.proto.AvatarDieAnimationEndRspOuter
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
-        if (other.getDieGuid() != 0L) {
-          setDieGuid(other.getDieGuid());
-        }
         if (other.getSkillId() != 0) {
           setSkillId(other.getSkillId());
         }
+        if (other.getDieGuid() != 0L) {
+          setDieGuid(other.getDieGuid());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -508,7 +532,11 @@ public Builder mergeFrom(
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>int32 retcode = 2;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -516,7 +544,11 @@ public int getRetcode() {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>int32 retcode = 2;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -527,7 +559,11 @@ public Builder setRetcode(int value) {
         return this;
       }
       /**
-       * <code>int32 retcode = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>int32 retcode = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -537,64 +573,88 @@ public Builder clearRetcode() {
         return this;
       }
 
-      private long dieGuid_ ;
+      private int skillId_ ;
       /**
-       * <code>uint64 die_guid = 11;</code>
-       * @return The dieGuid.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 skill_id = 6;</code>
+       * @return The skillId.
        */
       @java.lang.Override
-      public long getDieGuid() {
-        return dieGuid_;
+      public int getSkillId() {
+        return skillId_;
       }
       /**
-       * <code>uint64 die_guid = 11;</code>
-       * @param value The dieGuid to set.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 skill_id = 6;</code>
+       * @param value The skillId to set.
        * @return This builder for chaining.
        */
-      public Builder setDieGuid(long value) {
+      public Builder setSkillId(int value) {
         
-        dieGuid_ = value;
+        skillId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint64 die_guid = 11;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 skill_id = 6;</code>
        * @return This builder for chaining.
        */
-      public Builder clearDieGuid() {
+      public Builder clearSkillId() {
         
-        dieGuid_ = 0L;
+        skillId_ = 0;
         onChanged();
         return this;
       }
 
-      private int skillId_ ;
+      private long dieGuid_ ;
       /**
-       * <code>uint32 skill_id = 13;</code>
-       * @return The skillId.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint64 die_guid = 12;</code>
+       * @return The dieGuid.
        */
       @java.lang.Override
-      public int getSkillId() {
-        return skillId_;
+      public long getDieGuid() {
+        return dieGuid_;
       }
       /**
-       * <code>uint32 skill_id = 13;</code>
-       * @param value The skillId to set.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint64 die_guid = 12;</code>
+       * @param value The dieGuid to set.
        * @return This builder for chaining.
        */
-      public Builder setSkillId(int value) {
+      public Builder setDieGuid(long value) {
         
-        skillId_ = value;
+        dieGuid_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 skill_id = 13;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint64 die_guid = 12;</code>
        * @return This builder for chaining.
        */
-      public Builder clearSkillId() {
+      public Builder clearDieGuid() {
         
-        skillId_ = 0;
+        dieGuid_ = 0L;
         onChanged();
         return this;
       }
@@ -666,8 +726,8 @@ public emu.grasscutter.net.proto.AvatarDieAnimationEndRspOuterClass.AvatarDieAni
   static {
     java.lang.String[] descriptorData = {
       "\n\036AvatarDieAnimationEndRsp.proto\"O\n\030Avat" +
-      "arDieAnimationEndRsp\022\017\n\007retcode\030\006 \001(\005\022\020\n" +
-      "\010die_guid\030\013 \001(\004\022\020\n\010skill_id\030\r \001(\rB\033\n\031emu" +
+      "arDieAnimationEndRsp\022\017\n\007retcode\030\002 \001(\005\022\020\n" +
+      "\010skill_id\030\006 \001(\r\022\020\n\010die_guid\030\014 \001(\004B\033\n\031emu" +
       ".grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -679,7 +739,7 @@ public emu.grasscutter.net.proto.AvatarDieAnimationEndRspOuterClass.AvatarDieAni
     internal_static_AvatarDieAnimationEndRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarDieAnimationEndRsp_descriptor,
-        new java.lang.String[] { "Retcode", "DieGuid", "SkillId", });
+        new java.lang.String[] { "Retcode", "SkillId", "DieGuid", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarEnterSceneInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarEnterSceneInfoOuterClass.java
index caea8f7af83..d821b81072f 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarEnterSceneInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarEnterSceneInfoOuterClass.java
@@ -19,99 +19,171 @@ public interface AvatarEnterSceneInfoOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 weapon_entity_id = 3;</code>
-     * @return The weaponEntityId.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 MJAONINHIIB = 3;</code>
+     * @return A list containing the mJAONINHIIB.
      */
-    int getWeaponEntityId();
+    java.util.List<java.lang.Integer> getMJAONINHIIBList();
+    /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 MJAONINHIIB = 3;</code>
+     * @return The count of mJAONINHIIB.
+     */
+    int getMJAONINHIIBCount();
+    /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 MJAONINHIIB = 3;</code>
+     * @param index The index of the element to return.
+     * @return The mJAONINHIIB at the given index.
+     */
+    int getMJAONINHIIB(int index);
 
     /**
-     * <code>.AbilitySyncStateInfo weapon_ability_info = 4;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.AbilitySyncStateInfo weapon_ability_info = 8;</code>
      * @return Whether the weaponAbilityInfo field is set.
      */
     boolean hasWeaponAbilityInfo();
     /**
-     * <code>.AbilitySyncStateInfo weapon_ability_info = 4;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.AbilitySyncStateInfo weapon_ability_info = 8;</code>
      * @return The weaponAbilityInfo.
      */
     emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getWeaponAbilityInfo();
     /**
-     * <code>.AbilitySyncStateInfo weapon_ability_info = 4;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.AbilitySyncStateInfo weapon_ability_info = 8;</code>
      */
     emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getWeaponAbilityInfoOrBuilder();
 
     /**
-     * <code>uint32 avatar_entity_id = 6;</code>
-     * @return The avatarEntityId.
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>.AbilitySyncStateInfo avatar_ability_info = 5;</code>
+     * @return Whether the avatarAbilityInfo field is set.
      */
-    int getAvatarEntityId();
-
+    boolean hasAvatarAbilityInfo();
     /**
-     * <code>uint64 weapon_guid = 7;</code>
-     * @return The weaponGuid.
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>.AbilitySyncStateInfo avatar_ability_info = 5;</code>
+     * @return The avatarAbilityInfo.
      */
-    long getWeaponGuid();
+    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getAvatarAbilityInfo();
+    /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>.AbilitySyncStateInfo avatar_ability_info = 5;</code>
+     */
+    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getAvatarAbilityInfoOrBuilder();
 
     /**
-     * <code>repeated .ServerBuff server_buff_list = 8;</code>
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 2;</code>
      */
     java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> 
         getServerBuffListList();
     /**
-     * <code>repeated .ServerBuff server_buff_list = 8;</code>
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 2;</code>
      */
     emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff getServerBuffList(int index);
     /**
-     * <code>repeated .ServerBuff server_buff_list = 8;</code>
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 2;</code>
      */
     int getServerBuffListCount();
     /**
-     * <code>repeated .ServerBuff server_buff_list = 8;</code>
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 2;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> 
         getServerBuffListOrBuilderList();
     /**
-     * <code>repeated .ServerBuff server_buff_list = 8;</code>
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 2;</code>
      */
     emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getServerBuffListOrBuilder(
         int index);
 
     /**
-     * <code>.AbilitySyncStateInfo avatar_ability_info = 9;</code>
-     * @return Whether the avatarAbilityInfo field is set.
-     */
-    boolean hasAvatarAbilityInfo();
-    /**
-     * <code>.AbilitySyncStateInfo avatar_ability_info = 9;</code>
-     * @return The avatarAbilityInfo.
-     */
-    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getAvatarAbilityInfo();
-    /**
-     * <code>.AbilitySyncStateInfo avatar_ability_info = 9;</code>
+     * <pre>
+     * Offset: 0x40
+     * </pre>
+     *
+     * <code>uint64 avatar_guid = 1;</code>
+     * @return The avatarGuid.
      */
-    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getAvatarAbilityInfoOrBuilder();
+    long getAvatarGuid();
 
     /**
-     * <code>repeated uint32 buff_id_list = 10;</code>
-     * @return A list containing the buffIdList.
-     */
-    java.util.List<java.lang.Integer> getBuffIdListList();
-    /**
-     * <code>repeated uint32 buff_id_list = 10;</code>
-     * @return The count of buffIdList.
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>uint32 avatar_entity_id = 9;</code>
+     * @return The avatarEntityId.
      */
-    int getBuffIdListCount();
+    int getAvatarEntityId();
+
     /**
-     * <code>repeated uint32 buff_id_list = 10;</code>
-     * @param index The index of the element to return.
-     * @return The buffIdList at the given index.
+     * <pre>
+     * Offset: 0x4C
+     * </pre>
+     *
+     * <code>uint32 weapon_entity_id = 11;</code>
+     * @return The weaponEntityId.
      */
-    int getBuffIdList(int index);
+    int getWeaponEntityId();
 
     /**
-     * <code>uint64 avatar_guid = 12;</code>
-     * @return The avatarGuid.
+     * <pre>
+     * Offset: 0x50
+     * </pre>
+     *
+     * <code>uint64 weapon_guid = 4;</code>
+     * @return The weaponGuid.
      */
-    long getAvatarGuid();
+    long getWeaponGuid();
   }
   /**
    * Protobuf type {@code AvatarEnterSceneInfo}
@@ -126,8 +198,8 @@ private AvatarEnterSceneInfo(com.google.protobuf.GeneratedMessageV3.Builder<?> b
       super(builder);
     }
     private AvatarEnterSceneInfo() {
+      mJAONINHIIB_ = emptyIntList();
       serverBuffList_ = java.util.Collections.emptyList();
-      buffIdList_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -161,44 +233,47 @@ private AvatarEnterSceneInfo(
             case 0:
               done = true;
               break;
-            case 24: {
+            case 8: {
 
-              weaponEntityId_ = input.readUInt32();
+              avatarGuid_ = input.readUInt64();
               break;
             }
-            case 34: {
-              emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder subBuilder = null;
-              if (weaponAbilityInfo_ != null) {
-                subBuilder = weaponAbilityInfo_.toBuilder();
+            case 18: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                serverBuffList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff>();
+                mutable_bitField0_ |= 0x00000002;
               }
-              weaponAbilityInfo_ = input.readMessage(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(weaponAbilityInfo_);
-                weaponAbilityInfo_ = subBuilder.buildPartial();
+              serverBuffList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.parser(), extensionRegistry));
+              break;
+            }
+            case 24: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                mJAONINHIIB_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
               }
-
+              mJAONINHIIB_.addInt(input.readUInt32());
               break;
             }
-            case 48: {
-
-              avatarEntityId_ = input.readUInt32();
+            case 26: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
+                mJAONINHIIB_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                mJAONINHIIB_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
               break;
             }
-            case 56: {
+            case 32: {
 
               weaponGuid_ = input.readUInt64();
               break;
             }
-            case 66: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                serverBuffList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff>();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              serverBuffList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.parser(), extensionRegistry));
-              break;
-            }
-            case 74: {
+            case 42: {
               emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder subBuilder = null;
               if (avatarAbilityInfo_ != null) {
                 subBuilder = avatarAbilityInfo_.toBuilder();
@@ -211,30 +286,27 @@ private AvatarEnterSceneInfo(
 
               break;
             }
-            case 80: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                buffIdList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
+            case 66: {
+              emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder subBuilder = null;
+              if (weaponAbilityInfo_ != null) {
+                subBuilder = weaponAbilityInfo_.toBuilder();
+              }
+              weaponAbilityInfo_ = input.readMessage(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(weaponAbilityInfo_);
+                weaponAbilityInfo_ = subBuilder.buildPartial();
               }
-              buffIdList_.addInt(input.readUInt32());
+
               break;
             }
-            case 82: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
-                buffIdList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                buffIdList_.addInt(input.readUInt32());
-              }
-              input.popLimit(limit);
+            case 72: {
+
+              avatarEntityId_ = input.readUInt32();
               break;
             }
-            case 96: {
+            case 88: {
 
-              avatarGuid_ = input.readUInt64();
+              weaponEntityId_ = input.readUInt32();
               break;
             }
             default: {
@@ -252,11 +324,11 @@ private AvatarEnterSceneInfo(
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
           serverBuffList_ = java.util.Collections.unmodifiableList(serverBuffList_);
         }
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          buffIdList_.makeImmutable(); // C
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          mJAONINHIIB_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -275,21 +347,54 @@ private AvatarEnterSceneInfo(
               emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo.class, emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo.Builder.class);
     }
 
-    public static final int WEAPON_ENTITY_ID_FIELD_NUMBER = 3;
-    private int weaponEntityId_;
+    public static final int MJAONINHIIB_FIELD_NUMBER = 3;
+    private com.google.protobuf.Internal.IntList mJAONINHIIB_;
     /**
-     * <code>uint32 weapon_entity_id = 3;</code>
-     * @return The weaponEntityId.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 MJAONINHIIB = 3;</code>
+     * @return A list containing the mJAONINHIIB.
      */
     @java.lang.Override
-    public int getWeaponEntityId() {
-      return weaponEntityId_;
+    public java.util.List<java.lang.Integer>
+        getMJAONINHIIBList() {
+      return mJAONINHIIB_;
+    }
+    /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 MJAONINHIIB = 3;</code>
+     * @return The count of mJAONINHIIB.
+     */
+    public int getMJAONINHIIBCount() {
+      return mJAONINHIIB_.size();
+    }
+    /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 MJAONINHIIB = 3;</code>
+     * @param index The index of the element to return.
+     * @return The mJAONINHIIB at the given index.
+     */
+    public int getMJAONINHIIB(int index) {
+      return mJAONINHIIB_.getInt(index);
     }
+    private int mJAONINHIIBMemoizedSerializedSize = -1;
 
-    public static final int WEAPON_ABILITY_INFO_FIELD_NUMBER = 4;
+    public static final int WEAPON_ABILITY_INFO_FIELD_NUMBER = 8;
     private emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo weaponAbilityInfo_;
     /**
-     * <code>.AbilitySyncStateInfo weapon_ability_info = 4;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.AbilitySyncStateInfo weapon_ability_info = 8;</code>
      * @return Whether the weaponAbilityInfo field is set.
      */
     @java.lang.Override
@@ -297,7 +402,11 @@ public boolean hasWeaponAbilityInfo() {
       return weaponAbilityInfo_ != null;
     }
     /**
-     * <code>.AbilitySyncStateInfo weapon_ability_info = 4;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.AbilitySyncStateInfo weapon_ability_info = 8;</code>
      * @return The weaponAbilityInfo.
      */
     @java.lang.Override
@@ -305,46 +414,74 @@ public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncState
       return weaponAbilityInfo_ == null ? emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : weaponAbilityInfo_;
     }
     /**
-     * <code>.AbilitySyncStateInfo weapon_ability_info = 4;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.AbilitySyncStateInfo weapon_ability_info = 8;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getWeaponAbilityInfoOrBuilder() {
       return getWeaponAbilityInfo();
     }
 
-    public static final int AVATAR_ENTITY_ID_FIELD_NUMBER = 6;
-    private int avatarEntityId_;
+    public static final int AVATAR_ABILITY_INFO_FIELD_NUMBER = 5;
+    private emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo avatarAbilityInfo_;
     /**
-     * <code>uint32 avatar_entity_id = 6;</code>
-     * @return The avatarEntityId.
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>.AbilitySyncStateInfo avatar_ability_info = 5;</code>
+     * @return Whether the avatarAbilityInfo field is set.
      */
     @java.lang.Override
-    public int getAvatarEntityId() {
-      return avatarEntityId_;
+    public boolean hasAvatarAbilityInfo() {
+      return avatarAbilityInfo_ != null;
     }
-
-    public static final int WEAPON_GUID_FIELD_NUMBER = 7;
-    private long weaponGuid_;
     /**
-     * <code>uint64 weapon_guid = 7;</code>
-     * @return The weaponGuid.
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>.AbilitySyncStateInfo avatar_ability_info = 5;</code>
+     * @return The avatarAbilityInfo.
      */
     @java.lang.Override
-    public long getWeaponGuid() {
-      return weaponGuid_;
+    public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getAvatarAbilityInfo() {
+      return avatarAbilityInfo_ == null ? emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : avatarAbilityInfo_;
+    }
+    /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>.AbilitySyncStateInfo avatar_ability_info = 5;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getAvatarAbilityInfoOrBuilder() {
+      return getAvatarAbilityInfo();
     }
 
-    public static final int SERVER_BUFF_LIST_FIELD_NUMBER = 8;
+    public static final int SERVER_BUFF_LIST_FIELD_NUMBER = 2;
     private java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> serverBuffList_;
     /**
-     * <code>repeated .ServerBuff server_buff_list = 8;</code>
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 2;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> getServerBuffListList() {
       return serverBuffList_;
     }
     /**
-     * <code>repeated .ServerBuff server_buff_list = 8;</code>
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 2;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> 
@@ -352,21 +489,33 @@ public java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff>
       return serverBuffList_;
     }
     /**
-     * <code>repeated .ServerBuff server_buff_list = 8;</code>
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 2;</code>
      */
     @java.lang.Override
     public int getServerBuffListCount() {
       return serverBuffList_.size();
     }
     /**
-     * <code>repeated .ServerBuff server_buff_list = 8;</code>
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 2;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff getServerBuffList(int index) {
       return serverBuffList_.get(index);
     }
     /**
-     * <code>repeated .ServerBuff server_buff_list = 8;</code>
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 2;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getServerBuffListOrBuilder(
@@ -374,69 +523,64 @@ public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getSer
       return serverBuffList_.get(index);
     }
 
-    public static final int AVATAR_ABILITY_INFO_FIELD_NUMBER = 9;
-    private emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo avatarAbilityInfo_;
-    /**
-     * <code>.AbilitySyncStateInfo avatar_ability_info = 9;</code>
-     * @return Whether the avatarAbilityInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasAvatarAbilityInfo() {
-      return avatarAbilityInfo_ != null;
-    }
+    public static final int AVATAR_GUID_FIELD_NUMBER = 1;
+    private long avatarGuid_;
     /**
-     * <code>.AbilitySyncStateInfo avatar_ability_info = 9;</code>
-     * @return The avatarAbilityInfo.
+     * <pre>
+     * Offset: 0x40
+     * </pre>
+     *
+     * <code>uint64 avatar_guid = 1;</code>
+     * @return The avatarGuid.
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getAvatarAbilityInfo() {
-      return avatarAbilityInfo_ == null ? emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : avatarAbilityInfo_;
+    public long getAvatarGuid() {
+      return avatarGuid_;
     }
+
+    public static final int AVATAR_ENTITY_ID_FIELD_NUMBER = 9;
+    private int avatarEntityId_;
     /**
-     * <code>.AbilitySyncStateInfo avatar_ability_info = 9;</code>
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>uint32 avatar_entity_id = 9;</code>
+     * @return The avatarEntityId.
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getAvatarAbilityInfoOrBuilder() {
-      return getAvatarAbilityInfo();
+    public int getAvatarEntityId() {
+      return avatarEntityId_;
     }
 
-    public static final int BUFF_ID_LIST_FIELD_NUMBER = 10;
-    private com.google.protobuf.Internal.IntList buffIdList_;
+    public static final int WEAPON_ENTITY_ID_FIELD_NUMBER = 11;
+    private int weaponEntityId_;
     /**
-     * <code>repeated uint32 buff_id_list = 10;</code>
-     * @return A list containing the buffIdList.
+     * <pre>
+     * Offset: 0x4C
+     * </pre>
+     *
+     * <code>uint32 weapon_entity_id = 11;</code>
+     * @return The weaponEntityId.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getBuffIdListList() {
-      return buffIdList_;
-    }
-    /**
-     * <code>repeated uint32 buff_id_list = 10;</code>
-     * @return The count of buffIdList.
-     */
-    public int getBuffIdListCount() {
-      return buffIdList_.size();
-    }
-    /**
-     * <code>repeated uint32 buff_id_list = 10;</code>
-     * @param index The index of the element to return.
-     * @return The buffIdList at the given index.
-     */
-    public int getBuffIdList(int index) {
-      return buffIdList_.getInt(index);
+    public int getWeaponEntityId() {
+      return weaponEntityId_;
     }
-    private int buffIdListMemoizedSerializedSize = -1;
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 12;
-    private long avatarGuid_;
+    public static final int WEAPON_GUID_FIELD_NUMBER = 4;
+    private long weaponGuid_;
     /**
-     * <code>uint64 avatar_guid = 12;</code>
-     * @return The avatarGuid.
+     * <pre>
+     * Offset: 0x50
+     * </pre>
+     *
+     * <code>uint64 weapon_guid = 4;</code>
+     * @return The weaponGuid.
      */
     @java.lang.Override
-    public long getAvatarGuid() {
-      return avatarGuid_;
+    public long getWeaponGuid() {
+      return weaponGuid_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -454,33 +598,33 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (weaponEntityId_ != 0) {
-        output.writeUInt32(3, weaponEntityId_);
+      if (avatarGuid_ != 0L) {
+        output.writeUInt64(1, avatarGuid_);
       }
-      if (weaponAbilityInfo_ != null) {
-        output.writeMessage(4, getWeaponAbilityInfo());
+      for (int i = 0; i < serverBuffList_.size(); i++) {
+        output.writeMessage(2, serverBuffList_.get(i));
       }
-      if (avatarEntityId_ != 0) {
-        output.writeUInt32(6, avatarEntityId_);
+      if (getMJAONINHIIBList().size() > 0) {
+        output.writeUInt32NoTag(26);
+        output.writeUInt32NoTag(mJAONINHIIBMemoizedSerializedSize);
       }
-      if (weaponGuid_ != 0L) {
-        output.writeUInt64(7, weaponGuid_);
+      for (int i = 0; i < mJAONINHIIB_.size(); i++) {
+        output.writeUInt32NoTag(mJAONINHIIB_.getInt(i));
       }
-      for (int i = 0; i < serverBuffList_.size(); i++) {
-        output.writeMessage(8, serverBuffList_.get(i));
+      if (weaponGuid_ != 0L) {
+        output.writeUInt64(4, weaponGuid_);
       }
       if (avatarAbilityInfo_ != null) {
-        output.writeMessage(9, getAvatarAbilityInfo());
+        output.writeMessage(5, getAvatarAbilityInfo());
       }
-      if (getBuffIdListList().size() > 0) {
-        output.writeUInt32NoTag(82);
-        output.writeUInt32NoTag(buffIdListMemoizedSerializedSize);
+      if (weaponAbilityInfo_ != null) {
+        output.writeMessage(8, getWeaponAbilityInfo());
       }
-      for (int i = 0; i < buffIdList_.size(); i++) {
-        output.writeUInt32NoTag(buffIdList_.getInt(i));
+      if (avatarEntityId_ != 0) {
+        output.writeUInt32(9, avatarEntityId_);
       }
-      if (avatarGuid_ != 0L) {
-        output.writeUInt64(12, avatarGuid_);
+      if (weaponEntityId_ != 0) {
+        output.writeUInt32(11, weaponEntityId_);
       }
       unknownFields.writeTo(output);
     }
@@ -491,47 +635,47 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (weaponEntityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, weaponEntityId_);
-      }
-      if (weaponAbilityInfo_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, getWeaponAbilityInfo());
-      }
-      if (avatarEntityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, avatarEntityId_);
-      }
-      if (weaponGuid_ != 0L) {
+      if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(7, weaponGuid_);
+          .computeUInt64Size(1, avatarGuid_);
       }
       for (int i = 0; i < serverBuffList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(8, serverBuffList_.get(i));
-      }
-      if (avatarAbilityInfo_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, getAvatarAbilityInfo());
+          .computeMessageSize(2, serverBuffList_.get(i));
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < buffIdList_.size(); i++) {
+        for (int i = 0; i < mJAONINHIIB_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(buffIdList_.getInt(i));
+            .computeUInt32SizeNoTag(mJAONINHIIB_.getInt(i));
         }
         size += dataSize;
-        if (!getBuffIdListList().isEmpty()) {
+        if (!getMJAONINHIIBList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        buffIdListMemoizedSerializedSize = dataSize;
+        mJAONINHIIBMemoizedSerializedSize = dataSize;
       }
-      if (avatarGuid_ != 0L) {
+      if (weaponGuid_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(4, weaponGuid_);
+      }
+      if (avatarAbilityInfo_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(5, getAvatarAbilityInfo());
+      }
+      if (weaponAbilityInfo_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(8, getWeaponAbilityInfo());
+      }
+      if (avatarEntityId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(9, avatarEntityId_);
+      }
+      if (weaponEntityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(12, avatarGuid_);
+          .computeUInt32Size(11, weaponEntityId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -548,28 +692,28 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo other = (emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo) obj;
 
-      if (getWeaponEntityId()
-          != other.getWeaponEntityId()) return false;
+      if (!getMJAONINHIIBList()
+          .equals(other.getMJAONINHIIBList())) return false;
       if (hasWeaponAbilityInfo() != other.hasWeaponAbilityInfo()) return false;
       if (hasWeaponAbilityInfo()) {
         if (!getWeaponAbilityInfo()
             .equals(other.getWeaponAbilityInfo())) return false;
       }
-      if (getAvatarEntityId()
-          != other.getAvatarEntityId()) return false;
-      if (getWeaponGuid()
-          != other.getWeaponGuid()) return false;
-      if (!getServerBuffListList()
-          .equals(other.getServerBuffListList())) return false;
       if (hasAvatarAbilityInfo() != other.hasAvatarAbilityInfo()) return false;
       if (hasAvatarAbilityInfo()) {
         if (!getAvatarAbilityInfo()
             .equals(other.getAvatarAbilityInfo())) return false;
       }
-      if (!getBuffIdListList()
-          .equals(other.getBuffIdListList())) return false;
+      if (!getServerBuffListList()
+          .equals(other.getServerBuffListList())) return false;
       if (getAvatarGuid()
           != other.getAvatarGuid()) return false;
+      if (getAvatarEntityId()
+          != other.getAvatarEntityId()) return false;
+      if (getWeaponEntityId()
+          != other.getWeaponEntityId()) return false;
+      if (getWeaponGuid()
+          != other.getWeaponGuid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -581,33 +725,33 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + WEAPON_ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getWeaponEntityId();
+      if (getMJAONINHIIBCount() > 0) {
+        hash = (37 * hash) + MJAONINHIIB_FIELD_NUMBER;
+        hash = (53 * hash) + getMJAONINHIIBList().hashCode();
+      }
       if (hasWeaponAbilityInfo()) {
         hash = (37 * hash) + WEAPON_ABILITY_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getWeaponAbilityInfo().hashCode();
       }
-      hash = (37 * hash) + AVATAR_ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getAvatarEntityId();
-      hash = (37 * hash) + WEAPON_GUID_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getWeaponGuid());
-      if (getServerBuffListCount() > 0) {
-        hash = (37 * hash) + SERVER_BUFF_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getServerBuffListList().hashCode();
-      }
       if (hasAvatarAbilityInfo()) {
         hash = (37 * hash) + AVATAR_ABILITY_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getAvatarAbilityInfo().hashCode();
       }
-      if (getBuffIdListCount() > 0) {
-        hash = (37 * hash) + BUFF_ID_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getBuffIdListList().hashCode();
+      if (getServerBuffListCount() > 0) {
+        hash = (37 * hash) + SERVER_BUFF_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getServerBuffListList().hashCode();
       }
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getAvatarGuid());
-      hash = (29 * hash) + unknownFields.hashCode();
+      hash = (37 * hash) + AVATAR_ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getAvatarEntityId();
+      hash = (37 * hash) + WEAPON_ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getWeaponEntityId();
+      hash = (37 * hash) + WEAPON_GUID_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getWeaponGuid());
+      hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
     }
@@ -741,34 +885,34 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        weaponEntityId_ = 0;
-
+        mJAONINHIIB_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
         if (weaponAbilityInfoBuilder_ == null) {
           weaponAbilityInfo_ = null;
         } else {
           weaponAbilityInfo_ = null;
           weaponAbilityInfoBuilder_ = null;
         }
-        avatarEntityId_ = 0;
-
-        weaponGuid_ = 0L;
-
-        if (serverBuffListBuilder_ == null) {
-          serverBuffList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        } else {
-          serverBuffListBuilder_.clear();
-        }
         if (avatarAbilityInfoBuilder_ == null) {
           avatarAbilityInfo_ = null;
         } else {
           avatarAbilityInfo_ = null;
           avatarAbilityInfoBuilder_ = null;
         }
-        buffIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        if (serverBuffListBuilder_ == null) {
+          serverBuffList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        } else {
+          serverBuffListBuilder_.clear();
+        }
         avatarGuid_ = 0L;
 
+        avatarEntityId_ = 0;
+
+        weaponEntityId_ = 0;
+
+        weaponGuid_ = 0L;
+
         return this;
       }
 
@@ -796,34 +940,34 @@ public emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterScene
       public emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo buildPartial() {
         emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo result = new emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo(this);
         int from_bitField0_ = bitField0_;
-        result.weaponEntityId_ = weaponEntityId_;
+        if (((bitField0_ & 0x00000001) != 0)) {
+          mJAONINHIIB_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.mJAONINHIIB_ = mJAONINHIIB_;
         if (weaponAbilityInfoBuilder_ == null) {
           result.weaponAbilityInfo_ = weaponAbilityInfo_;
         } else {
           result.weaponAbilityInfo_ = weaponAbilityInfoBuilder_.build();
         }
-        result.avatarEntityId_ = avatarEntityId_;
-        result.weaponGuid_ = weaponGuid_;
+        if (avatarAbilityInfoBuilder_ == null) {
+          result.avatarAbilityInfo_ = avatarAbilityInfo_;
+        } else {
+          result.avatarAbilityInfo_ = avatarAbilityInfoBuilder_.build();
+        }
         if (serverBuffListBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) != 0)) {
+          if (((bitField0_ & 0x00000002) != 0)) {
             serverBuffList_ = java.util.Collections.unmodifiableList(serverBuffList_);
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
           }
           result.serverBuffList_ = serverBuffList_;
         } else {
           result.serverBuffList_ = serverBuffListBuilder_.build();
         }
-        if (avatarAbilityInfoBuilder_ == null) {
-          result.avatarAbilityInfo_ = avatarAbilityInfo_;
-        } else {
-          result.avatarAbilityInfo_ = avatarAbilityInfoBuilder_.build();
-        }
-        if (((bitField0_ & 0x00000002) != 0)) {
-          buffIdList_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000002);
-        }
-        result.buffIdList_ = buffIdList_;
         result.avatarGuid_ = avatarGuid_;
+        result.avatarEntityId_ = avatarEntityId_;
+        result.weaponEntityId_ = weaponEntityId_;
+        result.weaponGuid_ = weaponGuid_;
         onBuilt();
         return result;
       }
@@ -872,23 +1016,27 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo other) {
         if (other == emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo.getDefaultInstance()) return this;
-        if (other.getWeaponEntityId() != 0) {
-          setWeaponEntityId(other.getWeaponEntityId());
+        if (!other.mJAONINHIIB_.isEmpty()) {
+          if (mJAONINHIIB_.isEmpty()) {
+            mJAONINHIIB_ = other.mJAONINHIIB_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureMJAONINHIIBIsMutable();
+            mJAONINHIIB_.addAll(other.mJAONINHIIB_);
+          }
+          onChanged();
         }
         if (other.hasWeaponAbilityInfo()) {
           mergeWeaponAbilityInfo(other.getWeaponAbilityInfo());
         }
-        if (other.getAvatarEntityId() != 0) {
-          setAvatarEntityId(other.getAvatarEntityId());
-        }
-        if (other.getWeaponGuid() != 0L) {
-          setWeaponGuid(other.getWeaponGuid());
+        if (other.hasAvatarAbilityInfo()) {
+          mergeAvatarAbilityInfo(other.getAvatarAbilityInfo());
         }
         if (serverBuffListBuilder_ == null) {
           if (!other.serverBuffList_.isEmpty()) {
             if (serverBuffList_.isEmpty()) {
               serverBuffList_ = other.serverBuffList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000002);
             } else {
               ensureServerBuffListIsMutable();
               serverBuffList_.addAll(other.serverBuffList_);
@@ -901,7 +1049,7 @@ public Builder mergeFrom(emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClas
               serverBuffListBuilder_.dispose();
               serverBuffListBuilder_ = null;
               serverBuffList_ = other.serverBuffList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000002);
               serverBuffListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getServerBuffListFieldBuilder() : null;
@@ -910,22 +1058,18 @@ public Builder mergeFrom(emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClas
             }
           }
         }
-        if (other.hasAvatarAbilityInfo()) {
-          mergeAvatarAbilityInfo(other.getAvatarAbilityInfo());
-        }
-        if (!other.buffIdList_.isEmpty()) {
-          if (buffIdList_.isEmpty()) {
-            buffIdList_ = other.buffIdList_;
-            bitField0_ = (bitField0_ & ~0x00000002);
-          } else {
-            ensureBuffIdListIsMutable();
-            buffIdList_.addAll(other.buffIdList_);
-          }
-          onChanged();
-        }
         if (other.getAvatarGuid() != 0L) {
           setAvatarGuid(other.getAvatarGuid());
         }
+        if (other.getAvatarEntityId() != 0) {
+          setAvatarEntityId(other.getAvatarEntityId());
+        }
+        if (other.getWeaponEntityId() != 0) {
+          setWeaponEntityId(other.getWeaponEntityId());
+        }
+        if (other.getWeaponGuid() != 0L) {
+          setWeaponGuid(other.getWeaponGuid());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -956,33 +1100,109 @@ public Builder mergeFrom(
       }
       private int bitField0_;
 
-      private int weaponEntityId_ ;
+      private com.google.protobuf.Internal.IntList mJAONINHIIB_ = emptyIntList();
+      private void ensureMJAONINHIIBIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          mJAONINHIIB_ = mutableCopy(mJAONINHIIB_);
+          bitField0_ |= 0x00000001;
+         }
+      }
       /**
-       * <code>uint32 weapon_entity_id = 3;</code>
-       * @return The weaponEntityId.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 MJAONINHIIB = 3;</code>
+       * @return A list containing the mJAONINHIIB.
        */
-      @java.lang.Override
-      public int getWeaponEntityId() {
-        return weaponEntityId_;
+      public java.util.List<java.lang.Integer>
+          getMJAONINHIIBList() {
+        return ((bitField0_ & 0x00000001) != 0) ?
+                 java.util.Collections.unmodifiableList(mJAONINHIIB_) : mJAONINHIIB_;
       }
       /**
-       * <code>uint32 weapon_entity_id = 3;</code>
-       * @param value The weaponEntityId to set.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 MJAONINHIIB = 3;</code>
+       * @return The count of mJAONINHIIB.
+       */
+      public int getMJAONINHIIBCount() {
+        return mJAONINHIIB_.size();
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 MJAONINHIIB = 3;</code>
+       * @param index The index of the element to return.
+       * @return The mJAONINHIIB at the given index.
+       */
+      public int getMJAONINHIIB(int index) {
+        return mJAONINHIIB_.getInt(index);
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 MJAONINHIIB = 3;</code>
+       * @param index The index to set the value at.
+       * @param value The mJAONINHIIB to set.
        * @return This builder for chaining.
        */
-      public Builder setWeaponEntityId(int value) {
-        
-        weaponEntityId_ = value;
+      public Builder setMJAONINHIIB(
+          int index, int value) {
+        ensureMJAONINHIIBIsMutable();
+        mJAONINHIIB_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 weapon_entity_id = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 MJAONINHIIB = 3;</code>
+       * @param value The mJAONINHIIB to add.
        * @return This builder for chaining.
        */
-      public Builder clearWeaponEntityId() {
-        
-        weaponEntityId_ = 0;
+      public Builder addMJAONINHIIB(int value) {
+        ensureMJAONINHIIBIsMutable();
+        mJAONINHIIB_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 MJAONINHIIB = 3;</code>
+       * @param values The mJAONINHIIB to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllMJAONINHIIB(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureMJAONINHIIBIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, mJAONINHIIB_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 MJAONINHIIB = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearMJAONINHIIB() {
+        mJAONINHIIB_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -991,14 +1211,22 @@ public Builder clearWeaponEntityId() {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder> weaponAbilityInfoBuilder_;
       /**
-       * <code>.AbilitySyncStateInfo weapon_ability_info = 4;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo weapon_ability_info = 8;</code>
        * @return Whether the weaponAbilityInfo field is set.
        */
       public boolean hasWeaponAbilityInfo() {
         return weaponAbilityInfoBuilder_ != null || weaponAbilityInfo_ != null;
       }
       /**
-       * <code>.AbilitySyncStateInfo weapon_ability_info = 4;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo weapon_ability_info = 8;</code>
        * @return The weaponAbilityInfo.
        */
       public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getWeaponAbilityInfo() {
@@ -1009,7 +1237,11 @@ public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncState
         }
       }
       /**
-       * <code>.AbilitySyncStateInfo weapon_ability_info = 4;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo weapon_ability_info = 8;</code>
        */
       public Builder setWeaponAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
         if (weaponAbilityInfoBuilder_ == null) {
@@ -1025,7 +1257,11 @@ public Builder setWeaponAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateIn
         return this;
       }
       /**
-       * <code>.AbilitySyncStateInfo weapon_ability_info = 4;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo weapon_ability_info = 8;</code>
        */
       public Builder setWeaponAbilityInfo(
           emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder builderForValue) {
@@ -1039,7 +1275,11 @@ public Builder setWeaponAbilityInfo(
         return this;
       }
       /**
-       * <code>.AbilitySyncStateInfo weapon_ability_info = 4;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo weapon_ability_info = 8;</code>
        */
       public Builder mergeWeaponAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
         if (weaponAbilityInfoBuilder_ == null) {
@@ -1057,7 +1297,11 @@ public Builder mergeWeaponAbilityInfo(emu.grasscutter.net.proto.AbilitySyncState
         return this;
       }
       /**
-       * <code>.AbilitySyncStateInfo weapon_ability_info = 4;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo weapon_ability_info = 8;</code>
        */
       public Builder clearWeaponAbilityInfo() {
         if (weaponAbilityInfoBuilder_ == null) {
@@ -1071,7 +1315,11 @@ public Builder clearWeaponAbilityInfo() {
         return this;
       }
       /**
-       * <code>.AbilitySyncStateInfo weapon_ability_info = 4;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo weapon_ability_info = 8;</code>
        */
       public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder getWeaponAbilityInfoBuilder() {
         
@@ -1079,7 +1327,11 @@ public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncState
         return getWeaponAbilityInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.AbilitySyncStateInfo weapon_ability_info = 4;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo weapon_ability_info = 8;</code>
        */
       public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getWeaponAbilityInfoOrBuilder() {
         if (weaponAbilityInfoBuilder_ != null) {
@@ -1090,7 +1342,11 @@ public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncState
         }
       }
       /**
-       * <code>.AbilitySyncStateInfo weapon_ability_info = 4;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo weapon_ability_info = 8;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder> 
@@ -1106,74 +1362,167 @@ public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncState
         return weaponAbilityInfoBuilder_;
       }
 
-      private int avatarEntityId_ ;
+      private emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo avatarAbilityInfo_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder> avatarAbilityInfoBuilder_;
       /**
-       * <code>uint32 avatar_entity_id = 6;</code>
-       * @return The avatarEntityId.
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo avatar_ability_info = 5;</code>
+       * @return Whether the avatarAbilityInfo field is set.
        */
-      @java.lang.Override
-      public int getAvatarEntityId() {
-        return avatarEntityId_;
+      public boolean hasAvatarAbilityInfo() {
+        return avatarAbilityInfoBuilder_ != null || avatarAbilityInfo_ != null;
       }
       /**
-       * <code>uint32 avatar_entity_id = 6;</code>
-       * @param value The avatarEntityId to set.
-       * @return This builder for chaining.
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo avatar_ability_info = 5;</code>
+       * @return The avatarAbilityInfo.
        */
-      public Builder setAvatarEntityId(int value) {
-        
-        avatarEntityId_ = value;
-        onChanged();
-        return this;
+      public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getAvatarAbilityInfo() {
+        if (avatarAbilityInfoBuilder_ == null) {
+          return avatarAbilityInfo_ == null ? emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : avatarAbilityInfo_;
+        } else {
+          return avatarAbilityInfoBuilder_.getMessage();
+        }
       }
       /**
-       * <code>uint32 avatar_entity_id = 6;</code>
-       * @return This builder for chaining.
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo avatar_ability_info = 5;</code>
        */
-      public Builder clearAvatarEntityId() {
-        
-        avatarEntityId_ = 0;
-        onChanged();
+      public Builder setAvatarAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
+        if (avatarAbilityInfoBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          avatarAbilityInfo_ = value;
+          onChanged();
+        } else {
+          avatarAbilityInfoBuilder_.setMessage(value);
+        }
+
         return this;
       }
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo avatar_ability_info = 5;</code>
+       */
+      public Builder setAvatarAbilityInfo(
+          emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder builderForValue) {
+        if (avatarAbilityInfoBuilder_ == null) {
+          avatarAbilityInfo_ = builderForValue.build();
+          onChanged();
+        } else {
+          avatarAbilityInfoBuilder_.setMessage(builderForValue.build());
+        }
 
-      private long weaponGuid_ ;
+        return this;
+      }
       /**
-       * <code>uint64 weapon_guid = 7;</code>
-       * @return The weaponGuid.
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo avatar_ability_info = 5;</code>
        */
-      @java.lang.Override
-      public long getWeaponGuid() {
-        return weaponGuid_;
+      public Builder mergeAvatarAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
+        if (avatarAbilityInfoBuilder_ == null) {
+          if (avatarAbilityInfo_ != null) {
+            avatarAbilityInfo_ =
+              emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.newBuilder(avatarAbilityInfo_).mergeFrom(value).buildPartial();
+          } else {
+            avatarAbilityInfo_ = value;
+          }
+          onChanged();
+        } else {
+          avatarAbilityInfoBuilder_.mergeFrom(value);
+        }
+
+        return this;
       }
       /**
-       * <code>uint64 weapon_guid = 7;</code>
-       * @param value The weaponGuid to set.
-       * @return This builder for chaining.
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo avatar_ability_info = 5;</code>
        */
-      public Builder setWeaponGuid(long value) {
-        
-        weaponGuid_ = value;
-        onChanged();
+      public Builder clearAvatarAbilityInfo() {
+        if (avatarAbilityInfoBuilder_ == null) {
+          avatarAbilityInfo_ = null;
+          onChanged();
+        } else {
+          avatarAbilityInfo_ = null;
+          avatarAbilityInfoBuilder_ = null;
+        }
+
         return this;
       }
       /**
-       * <code>uint64 weapon_guid = 7;</code>
-       * @return This builder for chaining.
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo avatar_ability_info = 5;</code>
        */
-      public Builder clearWeaponGuid() {
+      public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder getAvatarAbilityInfoBuilder() {
         
-        weaponGuid_ = 0L;
         onChanged();
-        return this;
+        return getAvatarAbilityInfoFieldBuilder().getBuilder();
+      }
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo avatar_ability_info = 5;</code>
+       */
+      public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getAvatarAbilityInfoOrBuilder() {
+        if (avatarAbilityInfoBuilder_ != null) {
+          return avatarAbilityInfoBuilder_.getMessageOrBuilder();
+        } else {
+          return avatarAbilityInfo_ == null ?
+              emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : avatarAbilityInfo_;
+        }
+      }
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo avatar_ability_info = 5;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder> 
+          getAvatarAbilityInfoFieldBuilder() {
+        if (avatarAbilityInfoBuilder_ == null) {
+          avatarAbilityInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder>(
+                  getAvatarAbilityInfo(),
+                  getParentForChildren(),
+                  isClean());
+          avatarAbilityInfo_ = null;
+        }
+        return avatarAbilityInfoBuilder_;
       }
 
       private java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> serverBuffList_ =
         java.util.Collections.emptyList();
       private void ensureServerBuffListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
+        if (!((bitField0_ & 0x00000002) != 0)) {
           serverBuffList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff>(serverBuffList_);
-          bitField0_ |= 0x00000001;
+          bitField0_ |= 0x00000002;
          }
       }
 
@@ -1181,7 +1530,11 @@ private void ensureServerBuffListIsMutable() {
           emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> serverBuffListBuilder_;
 
       /**
-       * <code>repeated .ServerBuff server_buff_list = 8;</code>
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 2;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> getServerBuffListList() {
         if (serverBuffListBuilder_ == null) {
@@ -1191,7 +1544,11 @@ public java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff>
         }
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 8;</code>
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 2;</code>
        */
       public int getServerBuffListCount() {
         if (serverBuffListBuilder_ == null) {
@@ -1201,7 +1558,11 @@ public int getServerBuffListCount() {
         }
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 8;</code>
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 2;</code>
        */
       public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff getServerBuffList(int index) {
         if (serverBuffListBuilder_ == null) {
@@ -1211,7 +1572,11 @@ public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff getServerBuffLi
         }
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 8;</code>
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 2;</code>
        */
       public Builder setServerBuffList(
           int index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff value) {
@@ -1228,7 +1593,11 @@ public Builder setServerBuffList(
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 8;</code>
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 2;</code>
        */
       public Builder setServerBuffList(
           int index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder builderForValue) {
@@ -1242,7 +1611,11 @@ public Builder setServerBuffList(
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 8;</code>
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 2;</code>
        */
       public Builder addServerBuffList(emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff value) {
         if (serverBuffListBuilder_ == null) {
@@ -1258,7 +1631,11 @@ public Builder addServerBuffList(emu.grasscutter.net.proto.ServerBuffOuterClass.
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 8;</code>
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 2;</code>
        */
       public Builder addServerBuffList(
           int index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff value) {
@@ -1275,7 +1652,11 @@ public Builder addServerBuffList(
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 8;</code>
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 2;</code>
        */
       public Builder addServerBuffList(
           emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder builderForValue) {
@@ -1289,7 +1670,11 @@ public Builder addServerBuffList(
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 8;</code>
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 2;</code>
        */
       public Builder addServerBuffList(
           int index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder builderForValue) {
@@ -1303,7 +1688,11 @@ public Builder addServerBuffList(
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 8;</code>
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 2;</code>
        */
       public Builder addAllServerBuffList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> values) {
@@ -1318,12 +1707,16 @@ public Builder addAllServerBuffList(
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 8;</code>
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 2;</code>
        */
       public Builder clearServerBuffList() {
         if (serverBuffListBuilder_ == null) {
           serverBuffList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
           onChanged();
         } else {
           serverBuffListBuilder_.clear();
@@ -1331,7 +1724,11 @@ public Builder clearServerBuffList() {
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 8;</code>
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 2;</code>
        */
       public Builder removeServerBuffList(int index) {
         if (serverBuffListBuilder_ == null) {
@@ -1344,14 +1741,22 @@ public Builder removeServerBuffList(int index) {
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 8;</code>
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 2;</code>
        */
       public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder getServerBuffListBuilder(
           int index) {
         return getServerBuffListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 8;</code>
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 2;</code>
        */
       public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getServerBuffListOrBuilder(
           int index) {
@@ -1361,7 +1766,11 @@ public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getSer
         }
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 8;</code>
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 2;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> 
            getServerBuffListOrBuilderList() {
@@ -1372,14 +1781,22 @@ public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getSer
         }
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 8;</code>
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 2;</code>
        */
       public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder addServerBuffListBuilder() {
         return getServerBuffListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.getDefaultInstance());
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 8;</code>
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 2;</code>
        */
       public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder addServerBuffListBuilder(
           int index) {
@@ -1387,7 +1804,11 @@ public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder addServ
             index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.getDefaultInstance());
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 8;</code>
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 2;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder> 
            getServerBuffListBuilderList() {
@@ -1400,7 +1821,7 @@ public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder addServ
           serverBuffListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder>(
                   serverBuffList_,
-                  ((bitField0_ & 0x00000001) != 0),
+                  ((bitField0_ & 0x00000002) != 0),
                   getParentForChildren(),
                   isClean());
           serverBuffList_ = null;
@@ -1408,231 +1829,174 @@ public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder addServ
         return serverBuffListBuilder_;
       }
 
-      private emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo avatarAbilityInfo_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder> avatarAbilityInfoBuilder_;
-      /**
-       * <code>.AbilitySyncStateInfo avatar_ability_info = 9;</code>
-       * @return Whether the avatarAbilityInfo field is set.
-       */
-      public boolean hasAvatarAbilityInfo() {
-        return avatarAbilityInfoBuilder_ != null || avatarAbilityInfo_ != null;
-      }
+      private long avatarGuid_ ;
       /**
-       * <code>.AbilitySyncStateInfo avatar_ability_info = 9;</code>
-       * @return The avatarAbilityInfo.
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>uint64 avatar_guid = 1;</code>
+       * @return The avatarGuid.
        */
-      public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getAvatarAbilityInfo() {
-        if (avatarAbilityInfoBuilder_ == null) {
-          return avatarAbilityInfo_ == null ? emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : avatarAbilityInfo_;
-        } else {
-          return avatarAbilityInfoBuilder_.getMessage();
-        }
+      @java.lang.Override
+      public long getAvatarGuid() {
+        return avatarGuid_;
       }
       /**
-       * <code>.AbilitySyncStateInfo avatar_ability_info = 9;</code>
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>uint64 avatar_guid = 1;</code>
+       * @param value The avatarGuid to set.
+       * @return This builder for chaining.
        */
-      public Builder setAvatarAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
-        if (avatarAbilityInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          avatarAbilityInfo_ = value;
-          onChanged();
-        } else {
-          avatarAbilityInfoBuilder_.setMessage(value);
-        }
-
+      public Builder setAvatarGuid(long value) {
+        
+        avatarGuid_ = value;
+        onChanged();
         return this;
       }
       /**
-       * <code>.AbilitySyncStateInfo avatar_ability_info = 9;</code>
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>uint64 avatar_guid = 1;</code>
+       * @return This builder for chaining.
        */
-      public Builder setAvatarAbilityInfo(
-          emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder builderForValue) {
-        if (avatarAbilityInfoBuilder_ == null) {
-          avatarAbilityInfo_ = builderForValue.build();
-          onChanged();
-        } else {
-          avatarAbilityInfoBuilder_.setMessage(builderForValue.build());
-        }
-
+      public Builder clearAvatarGuid() {
+        
+        avatarGuid_ = 0L;
+        onChanged();
         return this;
       }
-      /**
-       * <code>.AbilitySyncStateInfo avatar_ability_info = 9;</code>
-       */
-      public Builder mergeAvatarAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
-        if (avatarAbilityInfoBuilder_ == null) {
-          if (avatarAbilityInfo_ != null) {
-            avatarAbilityInfo_ =
-              emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.newBuilder(avatarAbilityInfo_).mergeFrom(value).buildPartial();
-          } else {
-            avatarAbilityInfo_ = value;
-          }
-          onChanged();
-        } else {
-          avatarAbilityInfoBuilder_.mergeFrom(value);
-        }
 
-        return this;
-      }
+      private int avatarEntityId_ ;
       /**
-       * <code>.AbilitySyncStateInfo avatar_ability_info = 9;</code>
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>uint32 avatar_entity_id = 9;</code>
+       * @return The avatarEntityId.
        */
-      public Builder clearAvatarAbilityInfo() {
-        if (avatarAbilityInfoBuilder_ == null) {
-          avatarAbilityInfo_ = null;
-          onChanged();
-        } else {
-          avatarAbilityInfo_ = null;
-          avatarAbilityInfoBuilder_ = null;
-        }
-
-        return this;
+      @java.lang.Override
+      public int getAvatarEntityId() {
+        return avatarEntityId_;
       }
       /**
-       * <code>.AbilitySyncStateInfo avatar_ability_info = 9;</code>
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>uint32 avatar_entity_id = 9;</code>
+       * @param value The avatarEntityId to set.
+       * @return This builder for chaining.
        */
-      public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder getAvatarAbilityInfoBuilder() {
+      public Builder setAvatarEntityId(int value) {
         
+        avatarEntityId_ = value;
         onChanged();
-        return getAvatarAbilityInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.AbilitySyncStateInfo avatar_ability_info = 9;</code>
-       */
-      public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getAvatarAbilityInfoOrBuilder() {
-        if (avatarAbilityInfoBuilder_ != null) {
-          return avatarAbilityInfoBuilder_.getMessageOrBuilder();
-        } else {
-          return avatarAbilityInfo_ == null ?
-              emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : avatarAbilityInfo_;
-        }
-      }
-      /**
-       * <code>.AbilitySyncStateInfo avatar_ability_info = 9;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder> 
-          getAvatarAbilityInfoFieldBuilder() {
-        if (avatarAbilityInfoBuilder_ == null) {
-          avatarAbilityInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder>(
-                  getAvatarAbilityInfo(),
-                  getParentForChildren(),
-                  isClean());
-          avatarAbilityInfo_ = null;
-        }
-        return avatarAbilityInfoBuilder_;
-      }
-
-      private com.google.protobuf.Internal.IntList buffIdList_ = emptyIntList();
-      private void ensureBuffIdListIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
-          buffIdList_ = mutableCopy(buffIdList_);
-          bitField0_ |= 0x00000002;
-         }
-      }
-      /**
-       * <code>repeated uint32 buff_id_list = 10;</code>
-       * @return A list containing the buffIdList.
-       */
-      public java.util.List<java.lang.Integer>
-          getBuffIdListList() {
-        return ((bitField0_ & 0x00000002) != 0) ?
-                 java.util.Collections.unmodifiableList(buffIdList_) : buffIdList_;
-      }
-      /**
-       * <code>repeated uint32 buff_id_list = 10;</code>
-       * @return The count of buffIdList.
-       */
-      public int getBuffIdListCount() {
-        return buffIdList_.size();
-      }
-      /**
-       * <code>repeated uint32 buff_id_list = 10;</code>
-       * @param index The index of the element to return.
-       * @return The buffIdList at the given index.
-       */
-      public int getBuffIdList(int index) {
-        return buffIdList_.getInt(index);
+        return this;
       }
       /**
-       * <code>repeated uint32 buff_id_list = 10;</code>
-       * @param index The index to set the value at.
-       * @param value The buffIdList to set.
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>uint32 avatar_entity_id = 9;</code>
        * @return This builder for chaining.
        */
-      public Builder setBuffIdList(
-          int index, int value) {
-        ensureBuffIdListIsMutable();
-        buffIdList_.setInt(index, value);
+      public Builder clearAvatarEntityId() {
+        
+        avatarEntityId_ = 0;
         onChanged();
         return this;
       }
+
+      private int weaponEntityId_ ;
       /**
-       * <code>repeated uint32 buff_id_list = 10;</code>
-       * @param value The buffIdList to add.
-       * @return This builder for chaining.
+       * <pre>
+       * Offset: 0x4C
+       * </pre>
+       *
+       * <code>uint32 weapon_entity_id = 11;</code>
+       * @return The weaponEntityId.
        */
-      public Builder addBuffIdList(int value) {
-        ensureBuffIdListIsMutable();
-        buffIdList_.addInt(value);
-        onChanged();
-        return this;
+      @java.lang.Override
+      public int getWeaponEntityId() {
+        return weaponEntityId_;
       }
       /**
-       * <code>repeated uint32 buff_id_list = 10;</code>
-       * @param values The buffIdList to add.
+       * <pre>
+       * Offset: 0x4C
+       * </pre>
+       *
+       * <code>uint32 weapon_entity_id = 11;</code>
+       * @param value The weaponEntityId to set.
        * @return This builder for chaining.
        */
-      public Builder addAllBuffIdList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureBuffIdListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, buffIdList_);
+      public Builder setWeaponEntityId(int value) {
+        
+        weaponEntityId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 buff_id_list = 10;</code>
+       * <pre>
+       * Offset: 0x4C
+       * </pre>
+       *
+       * <code>uint32 weapon_entity_id = 11;</code>
        * @return This builder for chaining.
        */
-      public Builder clearBuffIdList() {
-        buffIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+      public Builder clearWeaponEntityId() {
+        
+        weaponEntityId_ = 0;
         onChanged();
         return this;
       }
 
-      private long avatarGuid_ ;
+      private long weaponGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 12;</code>
-       * @return The avatarGuid.
+       * <pre>
+       * Offset: 0x50
+       * </pre>
+       *
+       * <code>uint64 weapon_guid = 4;</code>
+       * @return The weaponGuid.
        */
       @java.lang.Override
-      public long getAvatarGuid() {
-        return avatarGuid_;
+      public long getWeaponGuid() {
+        return weaponGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 12;</code>
-       * @param value The avatarGuid to set.
+       * <pre>
+       * Offset: 0x50
+       * </pre>
+       *
+       * <code>uint64 weapon_guid = 4;</code>
+       * @param value The weaponGuid to set.
        * @return This builder for chaining.
        */
-      public Builder setAvatarGuid(long value) {
+      public Builder setWeaponGuid(long value) {
         
-        avatarGuid_ = value;
+        weaponGuid_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 12;</code>
+       * <pre>
+       * Offset: 0x50
+       * </pre>
+       *
+       * <code>uint64 weapon_guid = 4;</code>
        * @return This builder for chaining.
        */
-      public Builder clearAvatarGuid() {
+      public Builder clearWeaponGuid() {
         
-        avatarGuid_ = 0L;
+        weaponGuid_ = 0L;
         onChanged();
         return this;
       }
@@ -1704,15 +2068,15 @@ public emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterScene
   static {
     java.lang.String[] descriptorData = {
       "\n\032AvatarEnterSceneInfo.proto\032\032AbilitySyn" +
-      "cStateInfo.proto\032\020ServerBuff.proto\"\231\002\n\024A" +
-      "vatarEnterSceneInfo\022\030\n\020weapon_entity_id\030" +
-      "\003 \001(\r\0222\n\023weapon_ability_info\030\004 \001(\0132\025.Abi" +
-      "litySyncStateInfo\022\030\n\020avatar_entity_id\030\006 " +
-      "\001(\r\022\023\n\013weapon_guid\030\007 \001(\004\022%\n\020server_buff_" +
-      "list\030\010 \003(\0132\013.ServerBuff\0222\n\023avatar_abilit" +
-      "y_info\030\t \001(\0132\025.AbilitySyncStateInfo\022\024\n\014b" +
-      "uff_id_list\030\n \003(\r\022\023\n\013avatar_guid\030\014 \001(\004B\033" +
-      "\n\031emu.grasscutter.net.protob\006proto3"
+      "cStateInfo.proto\032\020ServerBuff.proto\"\230\002\n\024A" +
+      "vatarEnterSceneInfo\022\023\n\013MJAONINHIIB\030\003 \003(\r" +
+      "\0222\n\023weapon_ability_info\030\010 \001(\0132\025.AbilityS" +
+      "yncStateInfo\0222\n\023avatar_ability_info\030\005 \001(" +
+      "\0132\025.AbilitySyncStateInfo\022%\n\020server_buff_" +
+      "list\030\002 \003(\0132\013.ServerBuff\022\023\n\013avatar_guid\030\001" +
+      " \001(\004\022\030\n\020avatar_entity_id\030\t \001(\r\022\030\n\020weapon" +
+      "_entity_id\030\013 \001(\r\022\023\n\013weapon_guid\030\004 \001(\004B\033\n" +
+      "\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1725,7 +2089,7 @@ public emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterScene
     internal_static_AvatarEnterSceneInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarEnterSceneInfo_descriptor,
-        new java.lang.String[] { "WeaponEntityId", "WeaponAbilityInfo", "AvatarEntityId", "WeaponGuid", "ServerBuffList", "AvatarAbilityInfo", "BuffIdList", "AvatarGuid", });
+        new java.lang.String[] { "MJAONINHIIB", "WeaponAbilityInfo", "AvatarAbilityInfo", "ServerBuffList", "AvatarGuid", "AvatarEntityId", "WeaponEntityId", "WeaponGuid", });
     emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.ServerBuffOuterClass.getDescriptor();
   }
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarEquipChangeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarEquipChangeNotifyOuterClass.java
index a18e5182d4b..9fb93cc7b5f 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarEquipChangeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarEquipChangeNotifyOuterClass.java
@@ -19,62 +19,102 @@ public interface AvatarEquipChangeNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 avatar_guid = 1;</code>
-     * @return The avatarGuid.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.SceneReliquaryInfo reliquary = 2;</code>
+     * @return Whether the reliquary field is set.
      */
-    long getAvatarGuid();
+    boolean hasReliquary();
+    /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.SceneReliquaryInfo reliquary = 2;</code>
+     * @return The reliquary.
+     */
+    emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo getReliquary();
+    /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.SceneReliquaryInfo reliquary = 2;</code>
+     */
+    emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfoOrBuilder getReliquaryOrBuilder();
 
     /**
-     * <code>.SceneWeaponInfo weapon = 4;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.SceneWeaponInfo weapon = 5;</code>
      * @return Whether the weapon field is set.
      */
     boolean hasWeapon();
     /**
-     * <code>.SceneWeaponInfo weapon = 4;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.SceneWeaponInfo weapon = 5;</code>
      * @return The weapon.
      */
     emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo getWeapon();
     /**
-     * <code>.SceneWeaponInfo weapon = 4;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.SceneWeaponInfo weapon = 5;</code>
      */
     emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfoOrBuilder getWeaponOrBuilder();
 
     /**
-     * <code>uint64 equip_guid = 7;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>uint64 avatar_guid = 12;</code>
+     * @return The avatarGuid.
+     */
+    long getAvatarGuid();
+
+    /**
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>uint64 equip_guid = 15;</code>
      * @return The equipGuid.
      */
     long getEquipGuid();
 
     /**
-     * <code>uint32 equip_type = 10;</code>
+     * <pre>
+     * Offset: 0x40
+     * </pre>
+     *
+     * <code>uint32 equip_type = 7;</code>
      * @return The equipType.
      */
     int getEquipType();
 
     /**
-     * <code>.SceneReliquaryInfo reliquary = 11;</code>
-     * @return Whether the reliquary field is set.
-     */
-    boolean hasReliquary();
-    /**
-     * <code>.SceneReliquaryInfo reliquary = 11;</code>
-     * @return The reliquary.
-     */
-    emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo getReliquary();
-    /**
-     * <code>.SceneReliquaryInfo reliquary = 11;</code>
-     */
-    emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfoOrBuilder getReliquaryOrBuilder();
-
-    /**
-     * <code>uint32 item_id = 12;</code>
+     * <pre>
+     * Offset: 0x44
+     * </pre>
+     *
+     * <code>uint32 item_id = 6;</code>
      * @return The itemId.
      */
     int getItemId();
   }
   /**
    * <pre>
-   * CmdId: 6767
+   * CmdId: 1124
    * </pre>
    *
    * Protobuf type {@code AvatarEquipChangeNotify}
@@ -121,12 +161,20 @@ private AvatarEquipChangeNotify(
             case 0:
               done = true;
               break;
-            case 8: {
+            case 18: {
+              emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo.Builder subBuilder = null;
+              if (reliquary_ != null) {
+                subBuilder = reliquary_.toBuilder();
+              }
+              reliquary_ = input.readMessage(emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(reliquary_);
+                reliquary_ = subBuilder.buildPartial();
+              }
 
-              avatarGuid_ = input.readUInt64();
               break;
             }
-            case 34: {
+            case 42: {
               emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo.Builder subBuilder = null;
               if (weapon_ != null) {
                 subBuilder = weapon_.toBuilder();
@@ -139,32 +187,24 @@ private AvatarEquipChangeNotify(
 
               break;
             }
-            case 56: {
+            case 48: {
 
-              equipGuid_ = input.readUInt64();
+              itemId_ = input.readUInt32();
               break;
             }
-            case 80: {
+            case 56: {
 
               equipType_ = input.readUInt32();
               break;
             }
-            case 90: {
-              emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo.Builder subBuilder = null;
-              if (reliquary_ != null) {
-                subBuilder = reliquary_.toBuilder();
-              }
-              reliquary_ = input.readMessage(emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(reliquary_);
-                reliquary_ = subBuilder.buildPartial();
-              }
+            case 96: {
 
+              avatarGuid_ = input.readUInt64();
               break;
             }
-            case 96: {
+            case 120: {
 
-              itemId_ = input.readUInt32();
+              equipGuid_ = input.readUInt64();
               break;
             }
             default: {
@@ -199,21 +239,52 @@ private AvatarEquipChangeNotify(
               emu.grasscutter.net.proto.AvatarEquipChangeNotifyOuterClass.AvatarEquipChangeNotify.class, emu.grasscutter.net.proto.AvatarEquipChangeNotifyOuterClass.AvatarEquipChangeNotify.Builder.class);
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 1;
-    private long avatarGuid_;
+    public static final int RELIQUARY_FIELD_NUMBER = 2;
+    private emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo reliquary_;
     /**
-     * <code>uint64 avatar_guid = 1;</code>
-     * @return The avatarGuid.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.SceneReliquaryInfo reliquary = 2;</code>
+     * @return Whether the reliquary field is set.
      */
     @java.lang.Override
-    public long getAvatarGuid() {
-      return avatarGuid_;
+    public boolean hasReliquary() {
+      return reliquary_ != null;
+    }
+    /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.SceneReliquaryInfo reliquary = 2;</code>
+     * @return The reliquary.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo getReliquary() {
+      return reliquary_ == null ? emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo.getDefaultInstance() : reliquary_;
+    }
+    /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.SceneReliquaryInfo reliquary = 2;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfoOrBuilder getReliquaryOrBuilder() {
+      return getReliquary();
     }
 
-    public static final int WEAPON_FIELD_NUMBER = 4;
+    public static final int WEAPON_FIELD_NUMBER = 5;
     private emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo weapon_;
     /**
-     * <code>.SceneWeaponInfo weapon = 4;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.SceneWeaponInfo weapon = 5;</code>
      * @return Whether the weapon field is set.
      */
     @java.lang.Override
@@ -221,7 +292,11 @@ public boolean hasWeapon() {
       return weapon_ != null;
     }
     /**
-     * <code>.SceneWeaponInfo weapon = 4;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.SceneWeaponInfo weapon = 5;</code>
      * @return The weapon.
      */
     @java.lang.Override
@@ -229,17 +304,40 @@ public emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo getWe
       return weapon_ == null ? emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo.getDefaultInstance() : weapon_;
     }
     /**
-     * <code>.SceneWeaponInfo weapon = 4;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.SceneWeaponInfo weapon = 5;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfoOrBuilder getWeaponOrBuilder() {
       return getWeapon();
     }
 
-    public static final int EQUIP_GUID_FIELD_NUMBER = 7;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 12;
+    private long avatarGuid_;
+    /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>uint64 avatar_guid = 12;</code>
+     * @return The avatarGuid.
+     */
+    @java.lang.Override
+    public long getAvatarGuid() {
+      return avatarGuid_;
+    }
+
+    public static final int EQUIP_GUID_FIELD_NUMBER = 15;
     private long equipGuid_;
     /**
-     * <code>uint64 equip_guid = 7;</code>
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>uint64 equip_guid = 15;</code>
      * @return The equipGuid.
      */
     @java.lang.Override
@@ -247,10 +345,14 @@ public long getEquipGuid() {
       return equipGuid_;
     }
 
-    public static final int EQUIP_TYPE_FIELD_NUMBER = 10;
+    public static final int EQUIP_TYPE_FIELD_NUMBER = 7;
     private int equipType_;
     /**
-     * <code>uint32 equip_type = 10;</code>
+     * <pre>
+     * Offset: 0x40
+     * </pre>
+     *
+     * <code>uint32 equip_type = 7;</code>
      * @return The equipType.
      */
     @java.lang.Override
@@ -258,36 +360,14 @@ public int getEquipType() {
       return equipType_;
     }
 
-    public static final int RELIQUARY_FIELD_NUMBER = 11;
-    private emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo reliquary_;
-    /**
-     * <code>.SceneReliquaryInfo reliquary = 11;</code>
-     * @return Whether the reliquary field is set.
-     */
-    @java.lang.Override
-    public boolean hasReliquary() {
-      return reliquary_ != null;
-    }
-    /**
-     * <code>.SceneReliquaryInfo reliquary = 11;</code>
-     * @return The reliquary.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo getReliquary() {
-      return reliquary_ == null ? emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo.getDefaultInstance() : reliquary_;
-    }
-    /**
-     * <code>.SceneReliquaryInfo reliquary = 11;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfoOrBuilder getReliquaryOrBuilder() {
-      return getReliquary();
-    }
-
-    public static final int ITEM_ID_FIELD_NUMBER = 12;
+    public static final int ITEM_ID_FIELD_NUMBER = 6;
     private int itemId_;
     /**
-     * <code>uint32 item_id = 12;</code>
+     * <pre>
+     * Offset: 0x44
+     * </pre>
+     *
+     * <code>uint32 item_id = 6;</code>
      * @return The itemId.
      */
     @java.lang.Override
@@ -309,23 +389,23 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (avatarGuid_ != 0L) {
-        output.writeUInt64(1, avatarGuid_);
+      if (reliquary_ != null) {
+        output.writeMessage(2, getReliquary());
       }
       if (weapon_ != null) {
-        output.writeMessage(4, getWeapon());
+        output.writeMessage(5, getWeapon());
       }
-      if (equipGuid_ != 0L) {
-        output.writeUInt64(7, equipGuid_);
+      if (itemId_ != 0) {
+        output.writeUInt32(6, itemId_);
       }
       if (equipType_ != 0) {
-        output.writeUInt32(10, equipType_);
+        output.writeUInt32(7, equipType_);
       }
-      if (reliquary_ != null) {
-        output.writeMessage(11, getReliquary());
+      if (avatarGuid_ != 0L) {
+        output.writeUInt64(12, avatarGuid_);
       }
-      if (itemId_ != 0) {
-        output.writeUInt32(12, itemId_);
+      if (equipGuid_ != 0L) {
+        output.writeUInt64(15, equipGuid_);
       }
       unknownFields.writeTo(output);
     }
@@ -336,29 +416,29 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (avatarGuid_ != 0L) {
+      if (reliquary_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(1, avatarGuid_);
+          .computeMessageSize(2, getReliquary());
       }
       if (weapon_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, getWeapon());
+          .computeMessageSize(5, getWeapon());
       }
-      if (equipGuid_ != 0L) {
+      if (itemId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(7, equipGuid_);
+          .computeUInt32Size(6, itemId_);
       }
       if (equipType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, equipType_);
+          .computeUInt32Size(7, equipType_);
       }
-      if (reliquary_ != null) {
+      if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(11, getReliquary());
+          .computeUInt64Size(12, avatarGuid_);
       }
-      if (itemId_ != 0) {
+      if (equipGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, itemId_);
+          .computeUInt64Size(15, equipGuid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -375,22 +455,22 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.AvatarEquipChangeNotifyOuterClass.AvatarEquipChangeNotify other = (emu.grasscutter.net.proto.AvatarEquipChangeNotifyOuterClass.AvatarEquipChangeNotify) obj;
 
-      if (getAvatarGuid()
-          != other.getAvatarGuid()) return false;
+      if (hasReliquary() != other.hasReliquary()) return false;
+      if (hasReliquary()) {
+        if (!getReliquary()
+            .equals(other.getReliquary())) return false;
+      }
       if (hasWeapon() != other.hasWeapon()) return false;
       if (hasWeapon()) {
         if (!getWeapon()
             .equals(other.getWeapon())) return false;
       }
+      if (getAvatarGuid()
+          != other.getAvatarGuid()) return false;
       if (getEquipGuid()
           != other.getEquipGuid()) return false;
       if (getEquipType()
           != other.getEquipType()) return false;
-      if (hasReliquary() != other.hasReliquary()) return false;
-      if (hasReliquary()) {
-        if (!getReliquary()
-            .equals(other.getReliquary())) return false;
-      }
       if (getItemId()
           != other.getItemId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -404,22 +484,22 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getAvatarGuid());
+      if (hasReliquary()) {
+        hash = (37 * hash) + RELIQUARY_FIELD_NUMBER;
+        hash = (53 * hash) + getReliquary().hashCode();
+      }
       if (hasWeapon()) {
         hash = (37 * hash) + WEAPON_FIELD_NUMBER;
         hash = (53 * hash) + getWeapon().hashCode();
       }
+      hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getAvatarGuid());
       hash = (37 * hash) + EQUIP_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getEquipGuid());
       hash = (37 * hash) + EQUIP_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + getEquipType();
-      if (hasReliquary()) {
-        hash = (37 * hash) + RELIQUARY_FIELD_NUMBER;
-        hash = (53 * hash) + getReliquary().hashCode();
-      }
       hash = (37 * hash) + ITEM_ID_FIELD_NUMBER;
       hash = (53 * hash) + getItemId();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -519,7 +599,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 6767
+     * CmdId: 1124
      * </pre>
      *
      * Protobuf type {@code AvatarEquipChangeNotify}
@@ -559,24 +639,24 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        avatarGuid_ = 0L;
-
+        if (reliquaryBuilder_ == null) {
+          reliquary_ = null;
+        } else {
+          reliquary_ = null;
+          reliquaryBuilder_ = null;
+        }
         if (weaponBuilder_ == null) {
           weapon_ = null;
         } else {
           weapon_ = null;
           weaponBuilder_ = null;
         }
+        avatarGuid_ = 0L;
+
         equipGuid_ = 0L;
 
         equipType_ = 0;
 
-        if (reliquaryBuilder_ == null) {
-          reliquary_ = null;
-        } else {
-          reliquary_ = null;
-          reliquaryBuilder_ = null;
-        }
         itemId_ = 0;
 
         return this;
@@ -605,19 +685,19 @@ public emu.grasscutter.net.proto.AvatarEquipChangeNotifyOuterClass.AvatarEquipCh
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarEquipChangeNotifyOuterClass.AvatarEquipChangeNotify buildPartial() {
         emu.grasscutter.net.proto.AvatarEquipChangeNotifyOuterClass.AvatarEquipChangeNotify result = new emu.grasscutter.net.proto.AvatarEquipChangeNotifyOuterClass.AvatarEquipChangeNotify(this);
-        result.avatarGuid_ = avatarGuid_;
+        if (reliquaryBuilder_ == null) {
+          result.reliquary_ = reliquary_;
+        } else {
+          result.reliquary_ = reliquaryBuilder_.build();
+        }
         if (weaponBuilder_ == null) {
           result.weapon_ = weapon_;
         } else {
           result.weapon_ = weaponBuilder_.build();
         }
+        result.avatarGuid_ = avatarGuid_;
         result.equipGuid_ = equipGuid_;
         result.equipType_ = equipType_;
-        if (reliquaryBuilder_ == null) {
-          result.reliquary_ = reliquary_;
-        } else {
-          result.reliquary_ = reliquaryBuilder_.build();
-        }
         result.itemId_ = itemId_;
         onBuilt();
         return result;
@@ -667,21 +747,21 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarEquipChangeNotifyOuterClass.AvatarEquipChangeNotify other) {
         if (other == emu.grasscutter.net.proto.AvatarEquipChangeNotifyOuterClass.AvatarEquipChangeNotify.getDefaultInstance()) return this;
-        if (other.getAvatarGuid() != 0L) {
-          setAvatarGuid(other.getAvatarGuid());
+        if (other.hasReliquary()) {
+          mergeReliquary(other.getReliquary());
         }
         if (other.hasWeapon()) {
           mergeWeapon(other.getWeapon());
         }
+        if (other.getAvatarGuid() != 0L) {
+          setAvatarGuid(other.getAvatarGuid());
+        }
         if (other.getEquipGuid() != 0L) {
           setEquipGuid(other.getEquipGuid());
         }
         if (other.getEquipType() != 0) {
           setEquipType(other.getEquipType());
         }
-        if (other.hasReliquary()) {
-          mergeReliquary(other.getReliquary());
-        }
         if (other.getItemId() != 0) {
           setItemId(other.getItemId());
         }
@@ -714,49 +794,181 @@ public Builder mergeFrom(
         return this;
       }
 
-      private long avatarGuid_ ;
+      private emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo reliquary_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo, emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo.Builder, emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfoOrBuilder> reliquaryBuilder_;
       /**
-       * <code>uint64 avatar_guid = 1;</code>
-       * @return The avatarGuid.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.SceneReliquaryInfo reliquary = 2;</code>
+       * @return Whether the reliquary field is set.
        */
-      @java.lang.Override
-      public long getAvatarGuid() {
-        return avatarGuid_;
+      public boolean hasReliquary() {
+        return reliquaryBuilder_ != null || reliquary_ != null;
       }
       /**
-       * <code>uint64 avatar_guid = 1;</code>
-       * @param value The avatarGuid to set.
-       * @return This builder for chaining.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.SceneReliquaryInfo reliquary = 2;</code>
+       * @return The reliquary.
        */
-      public Builder setAvatarGuid(long value) {
-        
-        avatarGuid_ = value;
-        onChanged();
+      public emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo getReliquary() {
+        if (reliquaryBuilder_ == null) {
+          return reliquary_ == null ? emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo.getDefaultInstance() : reliquary_;
+        } else {
+          return reliquaryBuilder_.getMessage();
+        }
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.SceneReliquaryInfo reliquary = 2;</code>
+       */
+      public Builder setReliquary(emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo value) {
+        if (reliquaryBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          reliquary_ = value;
+          onChanged();
+        } else {
+          reliquaryBuilder_.setMessage(value);
+        }
+
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 1;</code>
-       * @return This builder for chaining.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.SceneReliquaryInfo reliquary = 2;</code>
        */
-      public Builder clearAvatarGuid() {
+      public Builder setReliquary(
+          emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo.Builder builderForValue) {
+        if (reliquaryBuilder_ == null) {
+          reliquary_ = builderForValue.build();
+          onChanged();
+        } else {
+          reliquaryBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.SceneReliquaryInfo reliquary = 2;</code>
+       */
+      public Builder mergeReliquary(emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo value) {
+        if (reliquaryBuilder_ == null) {
+          if (reliquary_ != null) {
+            reliquary_ =
+              emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo.newBuilder(reliquary_).mergeFrom(value).buildPartial();
+          } else {
+            reliquary_ = value;
+          }
+          onChanged();
+        } else {
+          reliquaryBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.SceneReliquaryInfo reliquary = 2;</code>
+       */
+      public Builder clearReliquary() {
+        if (reliquaryBuilder_ == null) {
+          reliquary_ = null;
+          onChanged();
+        } else {
+          reliquary_ = null;
+          reliquaryBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.SceneReliquaryInfo reliquary = 2;</code>
+       */
+      public emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo.Builder getReliquaryBuilder() {
         
-        avatarGuid_ = 0L;
         onChanged();
-        return this;
+        return getReliquaryFieldBuilder().getBuilder();
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.SceneReliquaryInfo reliquary = 2;</code>
+       */
+      public emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfoOrBuilder getReliquaryOrBuilder() {
+        if (reliquaryBuilder_ != null) {
+          return reliquaryBuilder_.getMessageOrBuilder();
+        } else {
+          return reliquary_ == null ?
+              emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo.getDefaultInstance() : reliquary_;
+        }
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.SceneReliquaryInfo reliquary = 2;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo, emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo.Builder, emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfoOrBuilder> 
+          getReliquaryFieldBuilder() {
+        if (reliquaryBuilder_ == null) {
+          reliquaryBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo, emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo.Builder, emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfoOrBuilder>(
+                  getReliquary(),
+                  getParentForChildren(),
+                  isClean());
+          reliquary_ = null;
+        }
+        return reliquaryBuilder_;
       }
 
       private emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo weapon_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo, emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo.Builder, emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfoOrBuilder> weaponBuilder_;
       /**
-       * <code>.SceneWeaponInfo weapon = 4;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.SceneWeaponInfo weapon = 5;</code>
        * @return Whether the weapon field is set.
        */
       public boolean hasWeapon() {
         return weaponBuilder_ != null || weapon_ != null;
       }
       /**
-       * <code>.SceneWeaponInfo weapon = 4;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.SceneWeaponInfo weapon = 5;</code>
        * @return The weapon.
        */
       public emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo getWeapon() {
@@ -767,7 +979,11 @@ public emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo getWe
         }
       }
       /**
-       * <code>.SceneWeaponInfo weapon = 4;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.SceneWeaponInfo weapon = 5;</code>
        */
       public Builder setWeapon(emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo value) {
         if (weaponBuilder_ == null) {
@@ -783,7 +999,11 @@ public Builder setWeapon(emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.Sce
         return this;
       }
       /**
-       * <code>.SceneWeaponInfo weapon = 4;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.SceneWeaponInfo weapon = 5;</code>
        */
       public Builder setWeapon(
           emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo.Builder builderForValue) {
@@ -797,7 +1017,11 @@ public Builder setWeapon(
         return this;
       }
       /**
-       * <code>.SceneWeaponInfo weapon = 4;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.SceneWeaponInfo weapon = 5;</code>
        */
       public Builder mergeWeapon(emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo value) {
         if (weaponBuilder_ == null) {
@@ -815,7 +1039,11 @@ public Builder mergeWeapon(emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.S
         return this;
       }
       /**
-       * <code>.SceneWeaponInfo weapon = 4;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.SceneWeaponInfo weapon = 5;</code>
        */
       public Builder clearWeapon() {
         if (weaponBuilder_ == null) {
@@ -829,7 +1057,11 @@ public Builder clearWeapon() {
         return this;
       }
       /**
-       * <code>.SceneWeaponInfo weapon = 4;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.SceneWeaponInfo weapon = 5;</code>
        */
       public emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo.Builder getWeaponBuilder() {
         
@@ -837,7 +1069,11 @@ public emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo.Build
         return getWeaponFieldBuilder().getBuilder();
       }
       /**
-       * <code>.SceneWeaponInfo weapon = 4;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.SceneWeaponInfo weapon = 5;</code>
        */
       public emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfoOrBuilder getWeaponOrBuilder() {
         if (weaponBuilder_ != null) {
@@ -848,7 +1084,11 @@ public emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfoOrBuil
         }
       }
       /**
-       * <code>.SceneWeaponInfo weapon = 4;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.SceneWeaponInfo weapon = 5;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo, emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo.Builder, emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfoOrBuilder> 
@@ -864,9 +1104,56 @@ public emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfoOrBuil
         return weaponBuilder_;
       }
 
+      private long avatarGuid_ ;
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint64 avatar_guid = 12;</code>
+       * @return The avatarGuid.
+       */
+      @java.lang.Override
+      public long getAvatarGuid() {
+        return avatarGuid_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint64 avatar_guid = 12;</code>
+       * @param value The avatarGuid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAvatarGuid(long value) {
+        
+        avatarGuid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint64 avatar_guid = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAvatarGuid() {
+        
+        avatarGuid_ = 0L;
+        onChanged();
+        return this;
+      }
+
       private long equipGuid_ ;
       /**
-       * <code>uint64 equip_guid = 7;</code>
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>uint64 equip_guid = 15;</code>
        * @return The equipGuid.
        */
       @java.lang.Override
@@ -874,7 +1161,11 @@ public long getEquipGuid() {
         return equipGuid_;
       }
       /**
-       * <code>uint64 equip_guid = 7;</code>
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>uint64 equip_guid = 15;</code>
        * @param value The equipGuid to set.
        * @return This builder for chaining.
        */
@@ -885,7 +1176,11 @@ public Builder setEquipGuid(long value) {
         return this;
       }
       /**
-       * <code>uint64 equip_guid = 7;</code>
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>uint64 equip_guid = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearEquipGuid() {
@@ -897,7 +1192,11 @@ public Builder clearEquipGuid() {
 
       private int equipType_ ;
       /**
-       * <code>uint32 equip_type = 10;</code>
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>uint32 equip_type = 7;</code>
        * @return The equipType.
        */
       @java.lang.Override
@@ -905,7 +1204,11 @@ public int getEquipType() {
         return equipType_;
       }
       /**
-       * <code>uint32 equip_type = 10;</code>
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>uint32 equip_type = 7;</code>
        * @param value The equipType to set.
        * @return This builder for chaining.
        */
@@ -916,7 +1219,11 @@ public Builder setEquipType(int value) {
         return this;
       }
       /**
-       * <code>uint32 equip_type = 10;</code>
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>uint32 equip_type = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearEquipType() {
@@ -926,128 +1233,13 @@ public Builder clearEquipType() {
         return this;
       }
 
-      private emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo reliquary_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo, emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo.Builder, emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfoOrBuilder> reliquaryBuilder_;
-      /**
-       * <code>.SceneReliquaryInfo reliquary = 11;</code>
-       * @return Whether the reliquary field is set.
-       */
-      public boolean hasReliquary() {
-        return reliquaryBuilder_ != null || reliquary_ != null;
-      }
-      /**
-       * <code>.SceneReliquaryInfo reliquary = 11;</code>
-       * @return The reliquary.
-       */
-      public emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo getReliquary() {
-        if (reliquaryBuilder_ == null) {
-          return reliquary_ == null ? emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo.getDefaultInstance() : reliquary_;
-        } else {
-          return reliquaryBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.SceneReliquaryInfo reliquary = 11;</code>
-       */
-      public Builder setReliquary(emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo value) {
-        if (reliquaryBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          reliquary_ = value;
-          onChanged();
-        } else {
-          reliquaryBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.SceneReliquaryInfo reliquary = 11;</code>
-       */
-      public Builder setReliquary(
-          emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo.Builder builderForValue) {
-        if (reliquaryBuilder_ == null) {
-          reliquary_ = builderForValue.build();
-          onChanged();
-        } else {
-          reliquaryBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.SceneReliquaryInfo reliquary = 11;</code>
-       */
-      public Builder mergeReliquary(emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo value) {
-        if (reliquaryBuilder_ == null) {
-          if (reliquary_ != null) {
-            reliquary_ =
-              emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo.newBuilder(reliquary_).mergeFrom(value).buildPartial();
-          } else {
-            reliquary_ = value;
-          }
-          onChanged();
-        } else {
-          reliquaryBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.SceneReliquaryInfo reliquary = 11;</code>
-       */
-      public Builder clearReliquary() {
-        if (reliquaryBuilder_ == null) {
-          reliquary_ = null;
-          onChanged();
-        } else {
-          reliquary_ = null;
-          reliquaryBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.SceneReliquaryInfo reliquary = 11;</code>
-       */
-      public emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo.Builder getReliquaryBuilder() {
-        
-        onChanged();
-        return getReliquaryFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.SceneReliquaryInfo reliquary = 11;</code>
-       */
-      public emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfoOrBuilder getReliquaryOrBuilder() {
-        if (reliquaryBuilder_ != null) {
-          return reliquaryBuilder_.getMessageOrBuilder();
-        } else {
-          return reliquary_ == null ?
-              emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo.getDefaultInstance() : reliquary_;
-        }
-      }
-      /**
-       * <code>.SceneReliquaryInfo reliquary = 11;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo, emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo.Builder, emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfoOrBuilder> 
-          getReliquaryFieldBuilder() {
-        if (reliquaryBuilder_ == null) {
-          reliquaryBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo, emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo.Builder, emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfoOrBuilder>(
-                  getReliquary(),
-                  getParentForChildren(),
-                  isClean());
-          reliquary_ = null;
-        }
-        return reliquaryBuilder_;
-      }
-
       private int itemId_ ;
       /**
-       * <code>uint32 item_id = 12;</code>
+       * <pre>
+       * Offset: 0x44
+       * </pre>
+       *
+       * <code>uint32 item_id = 6;</code>
        * @return The itemId.
        */
       @java.lang.Override
@@ -1055,7 +1247,11 @@ public int getItemId() {
         return itemId_;
       }
       /**
-       * <code>uint32 item_id = 12;</code>
+       * <pre>
+       * Offset: 0x44
+       * </pre>
+       *
+       * <code>uint32 item_id = 6;</code>
        * @param value The itemId to set.
        * @return This builder for chaining.
        */
@@ -1066,7 +1262,11 @@ public Builder setItemId(int value) {
         return this;
       }
       /**
-       * <code>uint32 item_id = 12;</code>
+       * <pre>
+       * Offset: 0x44
+       * </pre>
+       *
+       * <code>uint32 item_id = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearItemId() {
@@ -1144,11 +1344,11 @@ public emu.grasscutter.net.proto.AvatarEquipChangeNotifyOuterClass.AvatarEquipCh
     java.lang.String[] descriptorData = {
       "\n\035AvatarEquipChangeNotify.proto\032\025SceneWe" +
       "aponInfo.proto\032\030SceneReliquaryInfo.proto" +
-      "\"\261\001\n\027AvatarEquipChangeNotify\022\023\n\013avatar_g" +
-      "uid\030\001 \001(\004\022 \n\006weapon\030\004 \001(\0132\020.SceneWeaponI" +
-      "nfo\022\022\n\nequip_guid\030\007 \001(\004\022\022\n\nequip_type\030\n " +
-      "\001(\r\022&\n\treliquary\030\013 \001(\0132\023.SceneReliquaryI" +
-      "nfo\022\017\n\007item_id\030\014 \001(\rB\033\n\031emu.grasscutter." +
+      "\"\261\001\n\027AvatarEquipChangeNotify\022&\n\treliquar" +
+      "y\030\002 \001(\0132\023.SceneReliquaryInfo\022 \n\006weapon\030\005" +
+      " \001(\0132\020.SceneWeaponInfo\022\023\n\013avatar_guid\030\014 " +
+      "\001(\004\022\022\n\nequip_guid\030\017 \001(\004\022\022\n\nequip_type\030\007 " +
+      "\001(\r\022\017\n\007item_id\030\006 \001(\rB\033\n\031emu.grasscutter." +
       "net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1162,7 +1362,7 @@ public emu.grasscutter.net.proto.AvatarEquipChangeNotifyOuterClass.AvatarEquipCh
     internal_static_AvatarEquipChangeNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarEquipChangeNotify_descriptor,
-        new java.lang.String[] { "AvatarGuid", "Weapon", "EquipGuid", "EquipType", "Reliquary", "ItemId", });
+        new java.lang.String[] { "Reliquary", "Weapon", "AvatarGuid", "EquipGuid", "EquipType", "ItemId", });
     emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.getDescriptor();
   }
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarFlycloakChangeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarFlycloakChangeNotifyOuterClass.java
index df4904d3e7b..7e42c05e384 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarFlycloakChangeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarFlycloakChangeNotifyOuterClass.java
@@ -19,20 +19,28 @@ public interface AvatarFlycloakChangeNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 flycloak_id = 4;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 flycloak_id = 1;</code>
      * @return The flycloakId.
      */
     int getFlycloakId();
 
     /**
-     * <code>uint64 avatar_guid = 10;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint64 avatar_guid = 11;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
   }
   /**
    * <pre>
-   * CmdId: 28644
+   * CmdId: 9820
    * </pre>
    *
    * Protobuf type {@code AvatarFlycloakChangeNotify}
@@ -79,12 +87,12 @@ private AvatarFlycloakChangeNotify(
             case 0:
               done = true;
               break;
-            case 32: {
+            case 8: {
 
               flycloakId_ = input.readUInt32();
               break;
             }
-            case 80: {
+            case 88: {
 
               avatarGuid_ = input.readUInt64();
               break;
@@ -121,10 +129,14 @@ private AvatarFlycloakChangeNotify(
               emu.grasscutter.net.proto.AvatarFlycloakChangeNotifyOuterClass.AvatarFlycloakChangeNotify.class, emu.grasscutter.net.proto.AvatarFlycloakChangeNotifyOuterClass.AvatarFlycloakChangeNotify.Builder.class);
     }
 
-    public static final int FLYCLOAK_ID_FIELD_NUMBER = 4;
+    public static final int FLYCLOAK_ID_FIELD_NUMBER = 1;
     private int flycloakId_;
     /**
-     * <code>uint32 flycloak_id = 4;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 flycloak_id = 1;</code>
      * @return The flycloakId.
      */
     @java.lang.Override
@@ -132,10 +144,14 @@ public int getFlycloakId() {
       return flycloakId_;
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 10;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 11;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 10;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint64 avatar_guid = 11;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -158,10 +174,10 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (flycloakId_ != 0) {
-        output.writeUInt32(4, flycloakId_);
+        output.writeUInt32(1, flycloakId_);
       }
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(10, avatarGuid_);
+        output.writeUInt64(11, avatarGuid_);
       }
       unknownFields.writeTo(output);
     }
@@ -174,11 +190,11 @@ public int getSerializedSize() {
       size = 0;
       if (flycloakId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, flycloakId_);
+          .computeUInt32Size(1, flycloakId_);
       }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(10, avatarGuid_);
+          .computeUInt64Size(11, avatarGuid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -312,7 +328,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 28644
+     * CmdId: 9820
      * </pre>
      *
      * Protobuf type {@code AvatarFlycloakChangeNotify}
@@ -469,7 +485,11 @@ public Builder mergeFrom(
 
       private int flycloakId_ ;
       /**
-       * <code>uint32 flycloak_id = 4;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 flycloak_id = 1;</code>
        * @return The flycloakId.
        */
       @java.lang.Override
@@ -477,7 +497,11 @@ public int getFlycloakId() {
         return flycloakId_;
       }
       /**
-       * <code>uint32 flycloak_id = 4;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 flycloak_id = 1;</code>
        * @param value The flycloakId to set.
        * @return This builder for chaining.
        */
@@ -488,7 +512,11 @@ public Builder setFlycloakId(int value) {
         return this;
       }
       /**
-       * <code>uint32 flycloak_id = 4;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 flycloak_id = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearFlycloakId() {
@@ -500,7 +528,11 @@ public Builder clearFlycloakId() {
 
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 10;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint64 avatar_guid = 11;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -508,7 +540,11 @@ public long getAvatarGuid() {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 10;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint64 avatar_guid = 11;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -519,7 +555,11 @@ public Builder setAvatarGuid(long value) {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 10;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint64 avatar_guid = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -597,7 +637,7 @@ public emu.grasscutter.net.proto.AvatarFlycloakChangeNotifyOuterClass.AvatarFlyc
     java.lang.String[] descriptorData = {
       "\n AvatarFlycloakChangeNotify.proto\"F\n\032Av" +
       "atarFlycloakChangeNotify\022\023\n\013flycloak_id\030" +
-      "\004 \001(\r\022\023\n\013avatar_guid\030\n \001(\004B\033\n\031emu.grassc" +
+      "\001 \001(\r\022\023\n\013avatar_guid\030\013 \001(\004B\033\n\031emu.grassc" +
       "utter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarLifeStateChangeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarLifeStateChangeNotifyOuterClass.java
index a236e7ceb0d..031db9e6c24 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarLifeStateChangeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarLifeStateChangeNotifyOuterClass.java
@@ -19,104 +19,172 @@ public interface AvatarLifeStateChangeNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 source_entity_id = 2;</code>
-     * @return The sourceEntityId.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 3;</code>
      */
-    int getSourceEntityId();
+    java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> 
+        getServerBuffListList();
+    /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 3;</code>
+     */
+    emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff getServerBuffList(int index);
+    /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 3;</code>
+     */
+    int getServerBuffListCount();
+    /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 3;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> 
+        getServerBuffListOrBuilderList();
+    /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 3;</code>
+     */
+    emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getServerBuffListOrBuilder(
+        int index);
 
     /**
-     * <code>repeated string EPGOBHIEDOI = 3;</code>
-     * @return A list containing the ePGOBHIEDOI.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated string OHMKBGAMEIM = 13;</code>
+     * @return A list containing the oHMKBGAMEIM.
      */
     java.util.List<java.lang.String>
-        getEPGOBHIEDOIList();
+        getOHMKBGAMEIMList();
     /**
-     * <code>repeated string EPGOBHIEDOI = 3;</code>
-     * @return The count of ePGOBHIEDOI.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated string OHMKBGAMEIM = 13;</code>
+     * @return The count of oHMKBGAMEIM.
      */
-    int getEPGOBHIEDOICount();
+    int getOHMKBGAMEIMCount();
     /**
-     * <code>repeated string EPGOBHIEDOI = 3;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated string OHMKBGAMEIM = 13;</code>
      * @param index The index of the element to return.
-     * @return The ePGOBHIEDOI at the given index.
+     * @return The oHMKBGAMEIM at the given index.
      */
-    java.lang.String getEPGOBHIEDOI(int index);
+    java.lang.String getOHMKBGAMEIM(int index);
     /**
-     * <code>repeated string EPGOBHIEDOI = 3;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated string OHMKBGAMEIM = 13;</code>
      * @param index The index of the value to return.
-     * @return The bytes of the ePGOBHIEDOI at the given index.
+     * @return The bytes of the oHMKBGAMEIM at the given index.
+     */
+    com.google.protobuf.ByteString
+        getOHMKBGAMEIMBytes(int index);
+
+    /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>string attack_tag = 8;</code>
+     * @return The attackTag.
+     */
+    java.lang.String getAttackTag();
+    /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>string attack_tag = 8;</code>
+     * @return The bytes for attackTag.
      */
     com.google.protobuf.ByteString
-        getEPGOBHIEDOIBytes(int index);
+        getAttackTagBytes();
 
     /**
-     * <code>.PlayerDieType die_type = 5;</code>
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>.PlayerDieType die_type = 14;</code>
      * @return The enum numeric value on the wire for dieType.
      */
     int getDieTypeValue();
     /**
-     * <code>.PlayerDieType die_type = 5;</code>
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>.PlayerDieType die_type = 14;</code>
      * @return The dieType.
      */
     emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType getDieType();
 
     /**
-     * <code>uint64 avatar_guid = 9;</code>
-     * @return The avatarGuid.
-     */
-    long getAvatarGuid();
-
-    /**
-     * <code>uint32 move_reliable_seq = 10;</code>
+     * <pre>
+     * Offset: 0x3C
+     * </pre>
+     *
+     * <code>uint32 move_reliable_seq = 11;</code>
      * @return The moveReliableSeq.
      */
     int getMoveReliableSeq();
 
     /**
-     * <code>uint32 life_state = 11;</code>
-     * @return The lifeState.
+     * <pre>
+     * Offset: 0x40
+     * </pre>
+     *
+     * <code>uint64 avatar_guid = 5;</code>
+     * @return The avatarGuid.
      */
-    int getLifeState();
+    long getAvatarGuid();
 
     /**
-     * <code>repeated .ServerBuff server_buff_list = 14;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> 
-        getServerBuffListList();
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 14;</code>
-     */
-    emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff getServerBuffList(int index);
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 14;</code>
-     */
-    int getServerBuffListCount();
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 14;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> 
-        getServerBuffListOrBuilderList();
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 14;</code>
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>uint32 life_state = 7;</code>
+     * @return The lifeState.
      */
-    emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getServerBuffListOrBuilder(
-        int index);
+    int getLifeState();
 
     /**
-     * <code>string attack_tag = 15;</code>
-     * @return The attackTag.
-     */
-    java.lang.String getAttackTag();
-    /**
-     * <code>string attack_tag = 15;</code>
-     * @return The bytes for attackTag.
+     * <pre>
+     * Offset: 0x4C
+     * </pre>
+     *
+     * <code>uint32 source_entity_id = 12;</code>
+     * @return The sourceEntityId.
      */
-    com.google.protobuf.ByteString
-        getAttackTagBytes();
+    int getSourceEntityId();
   }
   /**
    * <pre>
-   * CmdId: 4653
+   * CmdId: 24346
    * </pre>
    *
    * Protobuf type {@code AvatarLifeStateChangeNotify}
@@ -131,10 +199,10 @@ private AvatarLifeStateChangeNotify(com.google.protobuf.GeneratedMessageV3.Build
       super(builder);
     }
     private AvatarLifeStateChangeNotify() {
-      ePGOBHIEDOI_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      dieType_ = 0;
       serverBuffList_ = java.util.Collections.emptyList();
+      oHMKBGAMEIM_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       attackTag_ = "";
+      dieType_ = 0;
     }
 
     @java.lang.Override
@@ -168,54 +236,54 @@ private AvatarLifeStateChangeNotify(
             case 0:
               done = true;
               break;
-            case 16: {
-
-              sourceEntityId_ = input.readUInt32();
-              break;
-            }
             case 26: {
-              java.lang.String s = input.readStringRequireUtf8();
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                ePGOBHIEDOI_ = new com.google.protobuf.LazyStringArrayList();
+                serverBuffList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff>();
                 mutable_bitField0_ |= 0x00000001;
               }
-              ePGOBHIEDOI_.add(s);
+              serverBuffList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.parser(), extensionRegistry));
               break;
             }
             case 40: {
-              int rawValue = input.readEnum();
 
-              dieType_ = rawValue;
+              avatarGuid_ = input.readUInt64();
               break;
             }
-            case 72: {
+            case 56: {
 
-              avatarGuid_ = input.readUInt64();
+              lifeState_ = input.readUInt32();
               break;
             }
-            case 80: {
+            case 66: {
+              java.lang.String s = input.readStringRequireUtf8();
 
-              moveReliableSeq_ = input.readUInt32();
+              attackTag_ = s;
               break;
             }
             case 88: {
 
-              lifeState_ = input.readUInt32();
+              moveReliableSeq_ = input.readUInt32();
+              break;
+            }
+            case 96: {
+
+              sourceEntityId_ = input.readUInt32();
               break;
             }
-            case 114: {
+            case 106: {
+              java.lang.String s = input.readStringRequireUtf8();
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                serverBuffList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff>();
+                oHMKBGAMEIM_ = new com.google.protobuf.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              serverBuffList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.parser(), extensionRegistry));
+              oHMKBGAMEIM_.add(s);
               break;
             }
-            case 122: {
-              java.lang.String s = input.readStringRequireUtf8();
+            case 112: {
+              int rawValue = input.readEnum();
 
-              attackTag_ = s;
+              dieType_ = rawValue;
               break;
             }
             default: {
@@ -234,10 +302,10 @@ private AvatarLifeStateChangeNotify(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          ePGOBHIEDOI_ = ePGOBHIEDOI_.getUnmodifiableView();
+          serverBuffList_ = java.util.Collections.unmodifiableList(serverBuffList_);
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          serverBuffList_ = java.util.Collections.unmodifiableList(serverBuffList_);
+          oHMKBGAMEIM_ = oHMKBGAMEIM_.getUnmodifiableView();
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -256,115 +324,25 @@ private AvatarLifeStateChangeNotify(
               emu.grasscutter.net.proto.AvatarLifeStateChangeNotifyOuterClass.AvatarLifeStateChangeNotify.class, emu.grasscutter.net.proto.AvatarLifeStateChangeNotifyOuterClass.AvatarLifeStateChangeNotify.Builder.class);
     }
 
-    public static final int SOURCE_ENTITY_ID_FIELD_NUMBER = 2;
-    private int sourceEntityId_;
-    /**
-     * <code>uint32 source_entity_id = 2;</code>
-     * @return The sourceEntityId.
-     */
-    @java.lang.Override
-    public int getSourceEntityId() {
-      return sourceEntityId_;
-    }
-
-    public static final int EPGOBHIEDOI_FIELD_NUMBER = 3;
-    private com.google.protobuf.LazyStringList ePGOBHIEDOI_;
-    /**
-     * <code>repeated string EPGOBHIEDOI = 3;</code>
-     * @return A list containing the ePGOBHIEDOI.
-     */
-    public com.google.protobuf.ProtocolStringList
-        getEPGOBHIEDOIList() {
-      return ePGOBHIEDOI_;
-    }
-    /**
-     * <code>repeated string EPGOBHIEDOI = 3;</code>
-     * @return The count of ePGOBHIEDOI.
-     */
-    public int getEPGOBHIEDOICount() {
-      return ePGOBHIEDOI_.size();
-    }
-    /**
-     * <code>repeated string EPGOBHIEDOI = 3;</code>
-     * @param index The index of the element to return.
-     * @return The ePGOBHIEDOI at the given index.
-     */
-    public java.lang.String getEPGOBHIEDOI(int index) {
-      return ePGOBHIEDOI_.get(index);
-    }
-    /**
-     * <code>repeated string EPGOBHIEDOI = 3;</code>
-     * @param index The index of the value to return.
-     * @return The bytes of the ePGOBHIEDOI at the given index.
-     */
-    public com.google.protobuf.ByteString
-        getEPGOBHIEDOIBytes(int index) {
-      return ePGOBHIEDOI_.getByteString(index);
-    }
-
-    public static final int DIE_TYPE_FIELD_NUMBER = 5;
-    private int dieType_;
-    /**
-     * <code>.PlayerDieType die_type = 5;</code>
-     * @return The enum numeric value on the wire for dieType.
-     */
-    @java.lang.Override public int getDieTypeValue() {
-      return dieType_;
-    }
-    /**
-     * <code>.PlayerDieType die_type = 5;</code>
-     * @return The dieType.
-     */
-    @java.lang.Override public emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType getDieType() {
-      @SuppressWarnings("deprecation")
-      emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType result = emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.valueOf(dieType_);
-      return result == null ? emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.UNRECOGNIZED : result;
-    }
-
-    public static final int AVATAR_GUID_FIELD_NUMBER = 9;
-    private long avatarGuid_;
-    /**
-     * <code>uint64 avatar_guid = 9;</code>
-     * @return The avatarGuid.
-     */
-    @java.lang.Override
-    public long getAvatarGuid() {
-      return avatarGuid_;
-    }
-
-    public static final int MOVE_RELIABLE_SEQ_FIELD_NUMBER = 10;
-    private int moveReliableSeq_;
-    /**
-     * <code>uint32 move_reliable_seq = 10;</code>
-     * @return The moveReliableSeq.
-     */
-    @java.lang.Override
-    public int getMoveReliableSeq() {
-      return moveReliableSeq_;
-    }
-
-    public static final int LIFE_STATE_FIELD_NUMBER = 11;
-    private int lifeState_;
-    /**
-     * <code>uint32 life_state = 11;</code>
-     * @return The lifeState.
-     */
-    @java.lang.Override
-    public int getLifeState() {
-      return lifeState_;
-    }
-
-    public static final int SERVER_BUFF_LIST_FIELD_NUMBER = 14;
+    public static final int SERVER_BUFF_LIST_FIELD_NUMBER = 3;
     private java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> serverBuffList_;
     /**
-     * <code>repeated .ServerBuff server_buff_list = 14;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 3;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> getServerBuffListList() {
       return serverBuffList_;
     }
     /**
-     * <code>repeated .ServerBuff server_buff_list = 14;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 3;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> 
@@ -372,21 +350,33 @@ public java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff>
       return serverBuffList_;
     }
     /**
-     * <code>repeated .ServerBuff server_buff_list = 14;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 3;</code>
      */
     @java.lang.Override
     public int getServerBuffListCount() {
       return serverBuffList_.size();
     }
     /**
-     * <code>repeated .ServerBuff server_buff_list = 14;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 3;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff getServerBuffList(int index) {
       return serverBuffList_.get(index);
     }
     /**
-     * <code>repeated .ServerBuff server_buff_list = 14;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 3;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getServerBuffListOrBuilder(
@@ -394,30 +384,89 @@ public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getSer
       return serverBuffList_.get(index);
     }
 
-    public static final int ATTACK_TAG_FIELD_NUMBER = 15;
-    private volatile java.lang.Object attackTag_;
+    public static final int OHMKBGAMEIM_FIELD_NUMBER = 13;
+    private com.google.protobuf.LazyStringList oHMKBGAMEIM_;
     /**
-     * <code>string attack_tag = 15;</code>
-     * @return The attackTag.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated string OHMKBGAMEIM = 13;</code>
+     * @return A list containing the oHMKBGAMEIM.
      */
-    @java.lang.Override
-    public java.lang.String getAttackTag() {
-      java.lang.Object ref = attackTag_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        attackTag_ = s;
-        return s;
-      }
+    public com.google.protobuf.ProtocolStringList
+        getOHMKBGAMEIMList() {
+      return oHMKBGAMEIM_;
     }
     /**
-     * <code>string attack_tag = 15;</code>
-     * @return The bytes for attackTag.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated string OHMKBGAMEIM = 13;</code>
+     * @return The count of oHMKBGAMEIM.
      */
-    @java.lang.Override
+    public int getOHMKBGAMEIMCount() {
+      return oHMKBGAMEIM_.size();
+    }
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated string OHMKBGAMEIM = 13;</code>
+     * @param index The index of the element to return.
+     * @return The oHMKBGAMEIM at the given index.
+     */
+    public java.lang.String getOHMKBGAMEIM(int index) {
+      return oHMKBGAMEIM_.get(index);
+    }
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated string OHMKBGAMEIM = 13;</code>
+     * @param index The index of the value to return.
+     * @return The bytes of the oHMKBGAMEIM at the given index.
+     */
+    public com.google.protobuf.ByteString
+        getOHMKBGAMEIMBytes(int index) {
+      return oHMKBGAMEIM_.getByteString(index);
+    }
+
+    public static final int ATTACK_TAG_FIELD_NUMBER = 8;
+    private volatile java.lang.Object attackTag_;
+    /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>string attack_tag = 8;</code>
+     * @return The attackTag.
+     */
+    @java.lang.Override
+    public java.lang.String getAttackTag() {
+      java.lang.Object ref = attackTag_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        attackTag_ = s;
+        return s;
+      }
+    }
+    /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>string attack_tag = 8;</code>
+     * @return The bytes for attackTag.
+     */
+    @java.lang.Override
     public com.google.protobuf.ByteString
         getAttackTagBytes() {
       java.lang.Object ref = attackTag_;
@@ -432,6 +481,93 @@ public java.lang.String getAttackTag() {
       }
     }
 
+    public static final int DIE_TYPE_FIELD_NUMBER = 14;
+    private int dieType_;
+    /**
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>.PlayerDieType die_type = 14;</code>
+     * @return The enum numeric value on the wire for dieType.
+     */
+    @java.lang.Override public int getDieTypeValue() {
+      return dieType_;
+    }
+    /**
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>.PlayerDieType die_type = 14;</code>
+     * @return The dieType.
+     */
+    @java.lang.Override public emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType getDieType() {
+      @SuppressWarnings("deprecation")
+      emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType result = emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.valueOf(dieType_);
+      return result == null ? emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.UNRECOGNIZED : result;
+    }
+
+    public static final int MOVE_RELIABLE_SEQ_FIELD_NUMBER = 11;
+    private int moveReliableSeq_;
+    /**
+     * <pre>
+     * Offset: 0x3C
+     * </pre>
+     *
+     * <code>uint32 move_reliable_seq = 11;</code>
+     * @return The moveReliableSeq.
+     */
+    @java.lang.Override
+    public int getMoveReliableSeq() {
+      return moveReliableSeq_;
+    }
+
+    public static final int AVATAR_GUID_FIELD_NUMBER = 5;
+    private long avatarGuid_;
+    /**
+     * <pre>
+     * Offset: 0x40
+     * </pre>
+     *
+     * <code>uint64 avatar_guid = 5;</code>
+     * @return The avatarGuid.
+     */
+    @java.lang.Override
+    public long getAvatarGuid() {
+      return avatarGuid_;
+    }
+
+    public static final int LIFE_STATE_FIELD_NUMBER = 7;
+    private int lifeState_;
+    /**
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>uint32 life_state = 7;</code>
+     * @return The lifeState.
+     */
+    @java.lang.Override
+    public int getLifeState() {
+      return lifeState_;
+    }
+
+    public static final int SOURCE_ENTITY_ID_FIELD_NUMBER = 12;
+    private int sourceEntityId_;
+    /**
+     * <pre>
+     * Offset: 0x4C
+     * </pre>
+     *
+     * <code>uint32 source_entity_id = 12;</code>
+     * @return The sourceEntityId.
+     */
+    @java.lang.Override
+    public int getSourceEntityId() {
+      return sourceEntityId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -446,29 +582,29 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (sourceEntityId_ != 0) {
-        output.writeUInt32(2, sourceEntityId_);
+      for (int i = 0; i < serverBuffList_.size(); i++) {
+        output.writeMessage(3, serverBuffList_.get(i));
       }
-      for (int i = 0; i < ePGOBHIEDOI_.size(); i++) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 3, ePGOBHIEDOI_.getRaw(i));
+      if (avatarGuid_ != 0L) {
+        output.writeUInt64(5, avatarGuid_);
       }
-      if (dieType_ != emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.PLAYER_DIE_TYPE_NONE.getNumber()) {
-        output.writeEnum(5, dieType_);
+      if (lifeState_ != 0) {
+        output.writeUInt32(7, lifeState_);
       }
-      if (avatarGuid_ != 0L) {
-        output.writeUInt64(9, avatarGuid_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(attackTag_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 8, attackTag_);
       }
       if (moveReliableSeq_ != 0) {
-        output.writeUInt32(10, moveReliableSeq_);
+        output.writeUInt32(11, moveReliableSeq_);
       }
-      if (lifeState_ != 0) {
-        output.writeUInt32(11, lifeState_);
+      if (sourceEntityId_ != 0) {
+        output.writeUInt32(12, sourceEntityId_);
       }
-      for (int i = 0; i < serverBuffList_.size(); i++) {
-        output.writeMessage(14, serverBuffList_.get(i));
+      for (int i = 0; i < oHMKBGAMEIM_.size(); i++) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 13, oHMKBGAMEIM_.getRaw(i));
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(attackTag_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 15, attackTag_);
+      if (dieType_ != emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.PLAYER_DIE_TYPE_NONE.getNumber()) {
+        output.writeEnum(14, dieType_);
       }
       unknownFields.writeTo(output);
     }
@@ -479,40 +615,40 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (sourceEntityId_ != 0) {
+      for (int i = 0; i < serverBuffList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, sourceEntityId_);
+          .computeMessageSize(3, serverBuffList_.get(i));
       }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < ePGOBHIEDOI_.size(); i++) {
-          dataSize += computeStringSizeNoTag(ePGOBHIEDOI_.getRaw(i));
-        }
-        size += dataSize;
-        size += 1 * getEPGOBHIEDOIList().size();
-      }
-      if (dieType_ != emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.PLAYER_DIE_TYPE_NONE.getNumber()) {
+      if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(5, dieType_);
+          .computeUInt64Size(5, avatarGuid_);
       }
-      if (avatarGuid_ != 0L) {
+      if (lifeState_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(9, avatarGuid_);
+          .computeUInt32Size(7, lifeState_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(attackTag_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, attackTag_);
       }
       if (moveReliableSeq_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, moveReliableSeq_);
+          .computeUInt32Size(11, moveReliableSeq_);
       }
-      if (lifeState_ != 0) {
+      if (sourceEntityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, lifeState_);
+          .computeUInt32Size(12, sourceEntityId_);
       }
-      for (int i = 0; i < serverBuffList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(14, serverBuffList_.get(i));
+      {
+        int dataSize = 0;
+        for (int i = 0; i < oHMKBGAMEIM_.size(); i++) {
+          dataSize += computeStringSizeNoTag(oHMKBGAMEIM_.getRaw(i));
+        }
+        size += dataSize;
+        size += 1 * getOHMKBGAMEIMList().size();
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(attackTag_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(15, attackTag_);
+      if (dieType_ != emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.PLAYER_DIE_TYPE_NONE.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(14, dieType_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -529,21 +665,21 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.AvatarLifeStateChangeNotifyOuterClass.AvatarLifeStateChangeNotify other = (emu.grasscutter.net.proto.AvatarLifeStateChangeNotifyOuterClass.AvatarLifeStateChangeNotify) obj;
 
-      if (getSourceEntityId()
-          != other.getSourceEntityId()) return false;
-      if (!getEPGOBHIEDOIList()
-          .equals(other.getEPGOBHIEDOIList())) return false;
+      if (!getServerBuffListList()
+          .equals(other.getServerBuffListList())) return false;
+      if (!getOHMKBGAMEIMList()
+          .equals(other.getOHMKBGAMEIMList())) return false;
+      if (!getAttackTag()
+          .equals(other.getAttackTag())) return false;
       if (dieType_ != other.dieType_) return false;
-      if (getAvatarGuid()
-          != other.getAvatarGuid()) return false;
       if (getMoveReliableSeq()
           != other.getMoveReliableSeq()) return false;
+      if (getAvatarGuid()
+          != other.getAvatarGuid()) return false;
       if (getLifeState()
           != other.getLifeState()) return false;
-      if (!getServerBuffListList()
-          .equals(other.getServerBuffListList())) return false;
-      if (!getAttackTag()
-          .equals(other.getAttackTag())) return false;
+      if (getSourceEntityId()
+          != other.getSourceEntityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -555,27 +691,27 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + SOURCE_ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getSourceEntityId();
-      if (getEPGOBHIEDOICount() > 0) {
-        hash = (37 * hash) + EPGOBHIEDOI_FIELD_NUMBER;
-        hash = (53 * hash) + getEPGOBHIEDOIList().hashCode();
+      if (getServerBuffListCount() > 0) {
+        hash = (37 * hash) + SERVER_BUFF_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getServerBuffListList().hashCode();
+      }
+      if (getOHMKBGAMEIMCount() > 0) {
+        hash = (37 * hash) + OHMKBGAMEIM_FIELD_NUMBER;
+        hash = (53 * hash) + getOHMKBGAMEIMList().hashCode();
       }
+      hash = (37 * hash) + ATTACK_TAG_FIELD_NUMBER;
+      hash = (53 * hash) + getAttackTag().hashCode();
       hash = (37 * hash) + DIE_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + dieType_;
+      hash = (37 * hash) + MOVE_RELIABLE_SEQ_FIELD_NUMBER;
+      hash = (53 * hash) + getMoveReliableSeq();
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getAvatarGuid());
-      hash = (37 * hash) + MOVE_RELIABLE_SEQ_FIELD_NUMBER;
-      hash = (53 * hash) + getMoveReliableSeq();
       hash = (37 * hash) + LIFE_STATE_FIELD_NUMBER;
       hash = (53 * hash) + getLifeState();
-      if (getServerBuffListCount() > 0) {
-        hash = (37 * hash) + SERVER_BUFF_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getServerBuffListList().hashCode();
-      }
-      hash = (37 * hash) + ATTACK_TAG_FIELD_NUMBER;
-      hash = (53 * hash) + getAttackTag().hashCode();
+      hash = (37 * hash) + SOURCE_ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getSourceEntityId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -673,7 +809,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 4653
+     * CmdId: 24346
      * </pre>
      *
      * Protobuf type {@code AvatarLifeStateChangeNotify}
@@ -714,25 +850,25 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        sourceEntityId_ = 0;
+        if (serverBuffListBuilder_ == null) {
+          serverBuffList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        } else {
+          serverBuffListBuilder_.clear();
+        }
+        oHMKBGAMEIM_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000002);
+        attackTag_ = "";
 
-        ePGOBHIEDOI_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000001);
         dieType_ = 0;
 
-        avatarGuid_ = 0L;
-
         moveReliableSeq_ = 0;
 
+        avatarGuid_ = 0L;
+
         lifeState_ = 0;
 
-        if (serverBuffListBuilder_ == null) {
-          serverBuffList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
-        } else {
-          serverBuffListBuilder_.clear();
-        }
-        attackTag_ = "";
+        sourceEntityId_ = 0;
 
         return this;
       }
@@ -761,26 +897,26 @@ public emu.grasscutter.net.proto.AvatarLifeStateChangeNotifyOuterClass.AvatarLif
       public emu.grasscutter.net.proto.AvatarLifeStateChangeNotifyOuterClass.AvatarLifeStateChangeNotify buildPartial() {
         emu.grasscutter.net.proto.AvatarLifeStateChangeNotifyOuterClass.AvatarLifeStateChangeNotify result = new emu.grasscutter.net.proto.AvatarLifeStateChangeNotifyOuterClass.AvatarLifeStateChangeNotify(this);
         int from_bitField0_ = bitField0_;
-        result.sourceEntityId_ = sourceEntityId_;
-        if (((bitField0_ & 0x00000001) != 0)) {
-          ePGOBHIEDOI_ = ePGOBHIEDOI_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        }
-        result.ePGOBHIEDOI_ = ePGOBHIEDOI_;
-        result.dieType_ = dieType_;
-        result.avatarGuid_ = avatarGuid_;
-        result.moveReliableSeq_ = moveReliableSeq_;
-        result.lifeState_ = lifeState_;
         if (serverBuffListBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) != 0)) {
+          if (((bitField0_ & 0x00000001) != 0)) {
             serverBuffList_ = java.util.Collections.unmodifiableList(serverBuffList_);
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           }
           result.serverBuffList_ = serverBuffList_;
         } else {
           result.serverBuffList_ = serverBuffListBuilder_.build();
         }
+        if (((bitField0_ & 0x00000002) != 0)) {
+          oHMKBGAMEIM_ = oHMKBGAMEIM_.getUnmodifiableView();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        }
+        result.oHMKBGAMEIM_ = oHMKBGAMEIM_;
         result.attackTag_ = attackTag_;
+        result.dieType_ = dieType_;
+        result.moveReliableSeq_ = moveReliableSeq_;
+        result.avatarGuid_ = avatarGuid_;
+        result.lifeState_ = lifeState_;
+        result.sourceEntityId_ = sourceEntityId_;
         onBuilt();
         return result;
       }
@@ -829,36 +965,11 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarLifeStateChangeNotifyOuterClass.AvatarLifeStateChangeNotify other) {
         if (other == emu.grasscutter.net.proto.AvatarLifeStateChangeNotifyOuterClass.AvatarLifeStateChangeNotify.getDefaultInstance()) return this;
-        if (other.getSourceEntityId() != 0) {
-          setSourceEntityId(other.getSourceEntityId());
-        }
-        if (!other.ePGOBHIEDOI_.isEmpty()) {
-          if (ePGOBHIEDOI_.isEmpty()) {
-            ePGOBHIEDOI_ = other.ePGOBHIEDOI_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-          } else {
-            ensureEPGOBHIEDOIIsMutable();
-            ePGOBHIEDOI_.addAll(other.ePGOBHIEDOI_);
-          }
-          onChanged();
-        }
-        if (other.dieType_ != 0) {
-          setDieTypeValue(other.getDieTypeValue());
-        }
-        if (other.getAvatarGuid() != 0L) {
-          setAvatarGuid(other.getAvatarGuid());
-        }
-        if (other.getMoveReliableSeq() != 0) {
-          setMoveReliableSeq(other.getMoveReliableSeq());
-        }
-        if (other.getLifeState() != 0) {
-          setLifeState(other.getLifeState());
-        }
         if (serverBuffListBuilder_ == null) {
           if (!other.serverBuffList_.isEmpty()) {
             if (serverBuffList_.isEmpty()) {
               serverBuffList_ = other.serverBuffList_;
-              bitField0_ = (bitField0_ & ~0x00000002);
+              bitField0_ = (bitField0_ & ~0x00000001);
             } else {
               ensureServerBuffListIsMutable();
               serverBuffList_.addAll(other.serverBuffList_);
@@ -871,7 +982,7 @@ public Builder mergeFrom(emu.grasscutter.net.proto.AvatarLifeStateChangeNotifyOu
               serverBuffListBuilder_.dispose();
               serverBuffListBuilder_ = null;
               serverBuffList_ = other.serverBuffList_;
-              bitField0_ = (bitField0_ & ~0x00000002);
+              bitField0_ = (bitField0_ & ~0x00000001);
               serverBuffListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getServerBuffListFieldBuilder() : null;
@@ -880,334 +991,71 @@ public Builder mergeFrom(emu.grasscutter.net.proto.AvatarLifeStateChangeNotifyOu
             }
           }
         }
+        if (!other.oHMKBGAMEIM_.isEmpty()) {
+          if (oHMKBGAMEIM_.isEmpty()) {
+            oHMKBGAMEIM_ = other.oHMKBGAMEIM_;
+            bitField0_ = (bitField0_ & ~0x00000002);
+          } else {
+            ensureOHMKBGAMEIMIsMutable();
+            oHMKBGAMEIM_.addAll(other.oHMKBGAMEIM_);
+          }
+          onChanged();
+        }
         if (!other.getAttackTag().isEmpty()) {
           attackTag_ = other.attackTag_;
           onChanged();
         }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      @java.lang.Override
-      public final boolean isInitialized() {
-        return true;
-      }
-
-      @java.lang.Override
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        emu.grasscutter.net.proto.AvatarLifeStateChangeNotifyOuterClass.AvatarLifeStateChangeNotify parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (emu.grasscutter.net.proto.AvatarLifeStateChangeNotifyOuterClass.AvatarLifeStateChangeNotify) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
+        if (other.dieType_ != 0) {
+          setDieTypeValue(other.getDieTypeValue());
         }
-        return this;
-      }
-      private int bitField0_;
-
-      private int sourceEntityId_ ;
-      /**
-       * <code>uint32 source_entity_id = 2;</code>
-       * @return The sourceEntityId.
-       */
-      @java.lang.Override
-      public int getSourceEntityId() {
-        return sourceEntityId_;
-      }
-      /**
-       * <code>uint32 source_entity_id = 2;</code>
-       * @param value The sourceEntityId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSourceEntityId(int value) {
-        
-        sourceEntityId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 source_entity_id = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSourceEntityId() {
-        
-        sourceEntityId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.LazyStringList ePGOBHIEDOI_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      private void ensureEPGOBHIEDOIIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          ePGOBHIEDOI_ = new com.google.protobuf.LazyStringArrayList(ePGOBHIEDOI_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-      /**
-       * <code>repeated string EPGOBHIEDOI = 3;</code>
-       * @return A list containing the ePGOBHIEDOI.
-       */
-      public com.google.protobuf.ProtocolStringList
-          getEPGOBHIEDOIList() {
-        return ePGOBHIEDOI_.getUnmodifiableView();
-      }
-      /**
-       * <code>repeated string EPGOBHIEDOI = 3;</code>
-       * @return The count of ePGOBHIEDOI.
-       */
-      public int getEPGOBHIEDOICount() {
-        return ePGOBHIEDOI_.size();
-      }
-      /**
-       * <code>repeated string EPGOBHIEDOI = 3;</code>
-       * @param index The index of the element to return.
-       * @return The ePGOBHIEDOI at the given index.
-       */
-      public java.lang.String getEPGOBHIEDOI(int index) {
-        return ePGOBHIEDOI_.get(index);
-      }
-      /**
-       * <code>repeated string EPGOBHIEDOI = 3;</code>
-       * @param index The index of the value to return.
-       * @return The bytes of the ePGOBHIEDOI at the given index.
-       */
-      public com.google.protobuf.ByteString
-          getEPGOBHIEDOIBytes(int index) {
-        return ePGOBHIEDOI_.getByteString(index);
-      }
-      /**
-       * <code>repeated string EPGOBHIEDOI = 3;</code>
-       * @param index The index to set the value at.
-       * @param value The ePGOBHIEDOI to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEPGOBHIEDOI(
-          int index, java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureEPGOBHIEDOIIsMutable();
-        ePGOBHIEDOI_.set(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated string EPGOBHIEDOI = 3;</code>
-       * @param value The ePGOBHIEDOI to add.
-       * @return This builder for chaining.
-       */
-      public Builder addEPGOBHIEDOI(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureEPGOBHIEDOIIsMutable();
-        ePGOBHIEDOI_.add(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated string EPGOBHIEDOI = 3;</code>
-       * @param values The ePGOBHIEDOI to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllEPGOBHIEDOI(
-          java.lang.Iterable<java.lang.String> values) {
-        ensureEPGOBHIEDOIIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, ePGOBHIEDOI_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated string EPGOBHIEDOI = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEPGOBHIEDOI() {
-        ePGOBHIEDOI_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated string EPGOBHIEDOI = 3;</code>
-       * @param value The bytes of the ePGOBHIEDOI to add.
-       * @return This builder for chaining.
-       */
-      public Builder addEPGOBHIEDOIBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        ensureEPGOBHIEDOIIsMutable();
-        ePGOBHIEDOI_.add(value);
-        onChanged();
-        return this;
-      }
-
-      private int dieType_ = 0;
-      /**
-       * <code>.PlayerDieType die_type = 5;</code>
-       * @return The enum numeric value on the wire for dieType.
-       */
-      @java.lang.Override public int getDieTypeValue() {
-        return dieType_;
-      }
-      /**
-       * <code>.PlayerDieType die_type = 5;</code>
-       * @param value The enum numeric value on the wire for dieType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDieTypeValue(int value) {
-        
-        dieType_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.PlayerDieType die_type = 5;</code>
-       * @return The dieType.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType getDieType() {
-        @SuppressWarnings("deprecation")
-        emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType result = emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.valueOf(dieType_);
-        return result == null ? emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.UNRECOGNIZED : result;
-      }
-      /**
-       * <code>.PlayerDieType die_type = 5;</code>
-       * @param value The dieType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDieType(emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType value) {
-        if (value == null) {
-          throw new NullPointerException();
+        if (other.getMoveReliableSeq() != 0) {
+          setMoveReliableSeq(other.getMoveReliableSeq());
         }
-        
-        dieType_ = value.getNumber();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.PlayerDieType die_type = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearDieType() {
-        
-        dieType_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private long avatarGuid_ ;
-      /**
-       * <code>uint64 avatar_guid = 9;</code>
-       * @return The avatarGuid.
-       */
-      @java.lang.Override
-      public long getAvatarGuid() {
-        return avatarGuid_;
-      }
-      /**
-       * <code>uint64 avatar_guid = 9;</code>
-       * @param value The avatarGuid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAvatarGuid(long value) {
-        
-        avatarGuid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 avatar_guid = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAvatarGuid() {
-        
-        avatarGuid_ = 0L;
-        onChanged();
-        return this;
-      }
-
-      private int moveReliableSeq_ ;
-      /**
-       * <code>uint32 move_reliable_seq = 10;</code>
-       * @return The moveReliableSeq.
-       */
-      @java.lang.Override
-      public int getMoveReliableSeq() {
-        return moveReliableSeq_;
-      }
-      /**
-       * <code>uint32 move_reliable_seq = 10;</code>
-       * @param value The moveReliableSeq to set.
-       * @return This builder for chaining.
-       */
-      public Builder setMoveReliableSeq(int value) {
-        
-        moveReliableSeq_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 move_reliable_seq = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearMoveReliableSeq() {
-        
-        moveReliableSeq_ = 0;
+        if (other.getAvatarGuid() != 0L) {
+          setAvatarGuid(other.getAvatarGuid());
+        }
+        if (other.getLifeState() != 0) {
+          setLifeState(other.getLifeState());
+        }
+        if (other.getSourceEntityId() != 0) {
+          setSourceEntityId(other.getSourceEntityId());
+        }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
 
-      private int lifeState_ ;
-      /**
-       * <code>uint32 life_state = 11;</code>
-       * @return The lifeState.
-       */
-      @java.lang.Override
-      public int getLifeState() {
-        return lifeState_;
-      }
-      /**
-       * <code>uint32 life_state = 11;</code>
-       * @param value The lifeState to set.
-       * @return This builder for chaining.
-       */
-      public Builder setLifeState(int value) {
-        
-        lifeState_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 life_state = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearLifeState() {
-        
-        lifeState_ = 0;
-        onChanged();
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        emu.grasscutter.net.proto.AvatarLifeStateChangeNotifyOuterClass.AvatarLifeStateChangeNotify parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.AvatarLifeStateChangeNotifyOuterClass.AvatarLifeStateChangeNotify) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
+      private int bitField0_;
 
       private java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> serverBuffList_ =
         java.util.Collections.emptyList();
       private void ensureServerBuffListIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
+        if (!((bitField0_ & 0x00000001) != 0)) {
           serverBuffList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff>(serverBuffList_);
-          bitField0_ |= 0x00000002;
+          bitField0_ |= 0x00000001;
          }
       }
 
@@ -1215,7 +1063,11 @@ private void ensureServerBuffListIsMutable() {
           emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> serverBuffListBuilder_;
 
       /**
-       * <code>repeated .ServerBuff server_buff_list = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 3;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> getServerBuffListList() {
         if (serverBuffListBuilder_ == null) {
@@ -1225,7 +1077,11 @@ public java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff>
         }
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 3;</code>
        */
       public int getServerBuffListCount() {
         if (serverBuffListBuilder_ == null) {
@@ -1235,7 +1091,11 @@ public int getServerBuffListCount() {
         }
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 3;</code>
        */
       public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff getServerBuffList(int index) {
         if (serverBuffListBuilder_ == null) {
@@ -1245,7 +1105,11 @@ public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff getServerBuffLi
         }
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 3;</code>
        */
       public Builder setServerBuffList(
           int index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff value) {
@@ -1262,7 +1126,11 @@ public Builder setServerBuffList(
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 3;</code>
        */
       public Builder setServerBuffList(
           int index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder builderForValue) {
@@ -1276,7 +1144,11 @@ public Builder setServerBuffList(
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 3;</code>
        */
       public Builder addServerBuffList(emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff value) {
         if (serverBuffListBuilder_ == null) {
@@ -1292,7 +1164,11 @@ public Builder addServerBuffList(emu.grasscutter.net.proto.ServerBuffOuterClass.
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 3;</code>
        */
       public Builder addServerBuffList(
           int index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff value) {
@@ -1309,7 +1185,11 @@ public Builder addServerBuffList(
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 3;</code>
        */
       public Builder addServerBuffList(
           emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder builderForValue) {
@@ -1323,7 +1203,11 @@ public Builder addServerBuffList(
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 3;</code>
        */
       public Builder addServerBuffList(
           int index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder builderForValue) {
@@ -1337,7 +1221,11 @@ public Builder addServerBuffList(
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 3;</code>
        */
       public Builder addAllServerBuffList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> values) {
@@ -1352,12 +1240,16 @@ public Builder addAllServerBuffList(
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 3;</code>
        */
       public Builder clearServerBuffList() {
         if (serverBuffListBuilder_ == null) {
           serverBuffList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
         } else {
           serverBuffListBuilder_.clear();
@@ -1365,7 +1257,11 @@ public Builder clearServerBuffList() {
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 3;</code>
        */
       public Builder removeServerBuffList(int index) {
         if (serverBuffListBuilder_ == null) {
@@ -1378,14 +1274,22 @@ public Builder removeServerBuffList(int index) {
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 3;</code>
        */
       public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder getServerBuffListBuilder(
           int index) {
         return getServerBuffListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 3;</code>
        */
       public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getServerBuffListOrBuilder(
           int index) {
@@ -1395,7 +1299,11 @@ public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getSer
         }
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 3;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> 
            getServerBuffListOrBuilderList() {
@@ -1406,14 +1314,22 @@ public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getSer
         }
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 3;</code>
        */
       public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder addServerBuffListBuilder() {
         return getServerBuffListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.getDefaultInstance());
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 3;</code>
        */
       public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder addServerBuffListBuilder(
           int index) {
@@ -1421,7 +1337,11 @@ public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder addServ
             index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.getDefaultInstance());
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 3;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder> 
            getServerBuffListBuilderList() {
@@ -1434,7 +1354,7 @@ public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder addServ
           serverBuffListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder>(
                   serverBuffList_,
-                  ((bitField0_ & 0x00000002) != 0),
+                  ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
                   isClean());
           serverBuffList_ = null;
@@ -1442,9 +1362,159 @@ public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder addServ
         return serverBuffListBuilder_;
       }
 
+      private com.google.protobuf.LazyStringList oHMKBGAMEIM_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      private void ensureOHMKBGAMEIMIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          oHMKBGAMEIM_ = new com.google.protobuf.LazyStringArrayList(oHMKBGAMEIM_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated string OHMKBGAMEIM = 13;</code>
+       * @return A list containing the oHMKBGAMEIM.
+       */
+      public com.google.protobuf.ProtocolStringList
+          getOHMKBGAMEIMList() {
+        return oHMKBGAMEIM_.getUnmodifiableView();
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated string OHMKBGAMEIM = 13;</code>
+       * @return The count of oHMKBGAMEIM.
+       */
+      public int getOHMKBGAMEIMCount() {
+        return oHMKBGAMEIM_.size();
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated string OHMKBGAMEIM = 13;</code>
+       * @param index The index of the element to return.
+       * @return The oHMKBGAMEIM at the given index.
+       */
+      public java.lang.String getOHMKBGAMEIM(int index) {
+        return oHMKBGAMEIM_.get(index);
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated string OHMKBGAMEIM = 13;</code>
+       * @param index The index of the value to return.
+       * @return The bytes of the oHMKBGAMEIM at the given index.
+       */
+      public com.google.protobuf.ByteString
+          getOHMKBGAMEIMBytes(int index) {
+        return oHMKBGAMEIM_.getByteString(index);
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated string OHMKBGAMEIM = 13;</code>
+       * @param index The index to set the value at.
+       * @param value The oHMKBGAMEIM to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOHMKBGAMEIM(
+          int index, java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureOHMKBGAMEIMIsMutable();
+        oHMKBGAMEIM_.set(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated string OHMKBGAMEIM = 13;</code>
+       * @param value The oHMKBGAMEIM to add.
+       * @return This builder for chaining.
+       */
+      public Builder addOHMKBGAMEIM(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  ensureOHMKBGAMEIMIsMutable();
+        oHMKBGAMEIM_.add(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated string OHMKBGAMEIM = 13;</code>
+       * @param values The oHMKBGAMEIM to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllOHMKBGAMEIM(
+          java.lang.Iterable<java.lang.String> values) {
+        ensureOHMKBGAMEIMIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, oHMKBGAMEIM_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated string OHMKBGAMEIM = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOHMKBGAMEIM() {
+        oHMKBGAMEIM_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000002);
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated string OHMKBGAMEIM = 13;</code>
+       * @param value The bytes of the oHMKBGAMEIM to add.
+       * @return This builder for chaining.
+       */
+      public Builder addOHMKBGAMEIMBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        ensureOHMKBGAMEIMIsMutable();
+        oHMKBGAMEIM_.add(value);
+        onChanged();
+        return this;
+      }
+
       private java.lang.Object attackTag_ = "";
       /**
-       * <code>string attack_tag = 15;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>string attack_tag = 8;</code>
        * @return The attackTag.
        */
       public java.lang.String getAttackTag() {
@@ -1460,7 +1530,11 @@ public java.lang.String getAttackTag() {
         }
       }
       /**
-       * <code>string attack_tag = 15;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>string attack_tag = 8;</code>
        * @return The bytes for attackTag.
        */
       public com.google.protobuf.ByteString
@@ -1477,7 +1551,11 @@ public java.lang.String getAttackTag() {
         }
       }
       /**
-       * <code>string attack_tag = 15;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>string attack_tag = 8;</code>
        * @param value The attackTag to set.
        * @return This builder for chaining.
        */
@@ -1492,7 +1570,11 @@ public Builder setAttackTag(
         return this;
       }
       /**
-       * <code>string attack_tag = 15;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>string attack_tag = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearAttackTag() {
@@ -1502,7 +1584,11 @@ public Builder clearAttackTag() {
         return this;
       }
       /**
-       * <code>string attack_tag = 15;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>string attack_tag = 8;</code>
        * @param value The bytes for attackTag to set.
        * @return This builder for chaining.
        */
@@ -1517,6 +1603,252 @@ public Builder setAttackTagBytes(
         onChanged();
         return this;
       }
+
+      private int dieType_ = 0;
+      /**
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>.PlayerDieType die_type = 14;</code>
+       * @return The enum numeric value on the wire for dieType.
+       */
+      @java.lang.Override public int getDieTypeValue() {
+        return dieType_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>.PlayerDieType die_type = 14;</code>
+       * @param value The enum numeric value on the wire for dieType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDieTypeValue(int value) {
+        
+        dieType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>.PlayerDieType die_type = 14;</code>
+       * @return The dieType.
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType getDieType() {
+        @SuppressWarnings("deprecation")
+        emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType result = emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.valueOf(dieType_);
+        return result == null ? emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.UNRECOGNIZED : result;
+      }
+      /**
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>.PlayerDieType die_type = 14;</code>
+       * @param value The dieType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDieType(emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        
+        dieType_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>.PlayerDieType die_type = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDieType() {
+        
+        dieType_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int moveReliableSeq_ ;
+      /**
+       * <pre>
+       * Offset: 0x3C
+       * </pre>
+       *
+       * <code>uint32 move_reliable_seq = 11;</code>
+       * @return The moveReliableSeq.
+       */
+      @java.lang.Override
+      public int getMoveReliableSeq() {
+        return moveReliableSeq_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x3C
+       * </pre>
+       *
+       * <code>uint32 move_reliable_seq = 11;</code>
+       * @param value The moveReliableSeq to set.
+       * @return This builder for chaining.
+       */
+      public Builder setMoveReliableSeq(int value) {
+        
+        moveReliableSeq_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x3C
+       * </pre>
+       *
+       * <code>uint32 move_reliable_seq = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearMoveReliableSeq() {
+        
+        moveReliableSeq_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private long avatarGuid_ ;
+      /**
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>uint64 avatar_guid = 5;</code>
+       * @return The avatarGuid.
+       */
+      @java.lang.Override
+      public long getAvatarGuid() {
+        return avatarGuid_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>uint64 avatar_guid = 5;</code>
+       * @param value The avatarGuid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAvatarGuid(long value) {
+        
+        avatarGuid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>uint64 avatar_guid = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAvatarGuid() {
+        
+        avatarGuid_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private int lifeState_ ;
+      /**
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>uint32 life_state = 7;</code>
+       * @return The lifeState.
+       */
+      @java.lang.Override
+      public int getLifeState() {
+        return lifeState_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>uint32 life_state = 7;</code>
+       * @param value The lifeState to set.
+       * @return This builder for chaining.
+       */
+      public Builder setLifeState(int value) {
+        
+        lifeState_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>uint32 life_state = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearLifeState() {
+        
+        lifeState_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int sourceEntityId_ ;
+      /**
+       * <pre>
+       * Offset: 0x4C
+       * </pre>
+       *
+       * <code>uint32 source_entity_id = 12;</code>
+       * @return The sourceEntityId.
+       */
+      @java.lang.Override
+      public int getSourceEntityId() {
+        return sourceEntityId_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x4C
+       * </pre>
+       *
+       * <code>uint32 source_entity_id = 12;</code>
+       * @param value The sourceEntityId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSourceEntityId(int value) {
+        
+        sourceEntityId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x4C
+       * </pre>
+       *
+       * <code>uint32 source_entity_id = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearSourceEntityId() {
+        
+        sourceEntityId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1586,12 +1918,12 @@ public emu.grasscutter.net.proto.AvatarLifeStateChangeNotifyOuterClass.AvatarLif
     java.lang.String[] descriptorData = {
       "\n!AvatarLifeStateChangeNotify.proto\032\020Ser" +
       "verBuff.proto\032\023PlayerDieType.proto\"\355\001\n\033A" +
-      "vatarLifeStateChangeNotify\022\030\n\020source_ent" +
-      "ity_id\030\002 \001(\r\022\023\n\013EPGOBHIEDOI\030\003 \003(\t\022 \n\010die" +
-      "_type\030\005 \001(\0162\016.PlayerDieType\022\023\n\013avatar_gu" +
-      "id\030\t \001(\004\022\031\n\021move_reliable_seq\030\n \001(\r\022\022\n\nl" +
-      "ife_state\030\013 \001(\r\022%\n\020server_buff_list\030\016 \003(" +
-      "\0132\013.ServerBuff\022\022\n\nattack_tag\030\017 \001(\tB\033\n\031em" +
+      "vatarLifeStateChangeNotify\022%\n\020server_buf" +
+      "f_list\030\003 \003(\0132\013.ServerBuff\022\023\n\013OHMKBGAMEIM" +
+      "\030\r \003(\t\022\022\n\nattack_tag\030\010 \001(\t\022 \n\010die_type\030\016" +
+      " \001(\0162\016.PlayerDieType\022\031\n\021move_reliable_se" +
+      "q\030\013 \001(\r\022\023\n\013avatar_guid\030\005 \001(\004\022\022\n\nlife_sta" +
+      "te\030\007 \001(\r\022\030\n\020source_entity_id\030\014 \001(\rB\033\n\031em" +
       "u.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1605,7 +1937,7 @@ public emu.grasscutter.net.proto.AvatarLifeStateChangeNotifyOuterClass.AvatarLif
     internal_static_AvatarLifeStateChangeNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarLifeStateChangeNotify_descriptor,
-        new java.lang.String[] { "SourceEntityId", "EPGOBHIEDOI", "DieType", "AvatarGuid", "MoveReliableSeq", "LifeState", "ServerBuffList", "AttackTag", });
+        new java.lang.String[] { "ServerBuffList", "OHMKBGAMEIM", "AttackTag", "DieType", "MoveReliableSeq", "AvatarGuid", "LifeState", "SourceEntityId", });
     emu.grasscutter.net.proto.ServerBuffOuterClass.getDescriptor();
     emu.grasscutter.net.proto.PlayerDieTypeOuterClass.getDescriptor();
   }
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarPropNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarPropNotifyOuterClass.java
index c9a7d941adf..5f6588cb7b8 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarPropNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarPropNotifyOuterClass.java
@@ -19,17 +19,19 @@ public interface AvatarPropNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 avatar_guid = 6;</code>
-     * @return The avatarGuid.
-     */
-    long getAvatarGuid();
-
-    /**
-     * <code>map&lt;uint32, int64&gt; prop_map = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, int64&gt; prop_map = 10;</code>
      */
     int getPropMapCount();
     /**
-     * <code>map&lt;uint32, int64&gt; prop_map = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, int64&gt; prop_map = 10;</code>
      */
     boolean containsPropMap(
         int key);
@@ -40,27 +42,49 @@ boolean containsPropMap(
     java.util.Map<java.lang.Integer, java.lang.Long>
     getPropMap();
     /**
-     * <code>map&lt;uint32, int64&gt; prop_map = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, int64&gt; prop_map = 10;</code>
      */
     java.util.Map<java.lang.Integer, java.lang.Long>
     getPropMapMap();
     /**
-     * <code>map&lt;uint32, int64&gt; prop_map = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, int64&gt; prop_map = 10;</code>
      */
 
     long getPropMapOrDefault(
         int key,
         long defaultValue);
     /**
-     * <code>map&lt;uint32, int64&gt; prop_map = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, int64&gt; prop_map = 10;</code>
      */
 
     long getPropMapOrThrow(
         int key);
+
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint64 avatar_guid = 9;</code>
+     * @return The avatarGuid.
+     */
+    long getAvatarGuid();
   }
   /**
    * <pre>
-   * CmdId: 21114
+   * CmdId: 3178
    * </pre>
    *
    * Protobuf type {@code AvatarPropNotify}
@@ -108,12 +132,12 @@ private AvatarPropNotify(
             case 0:
               done = true;
               break;
-            case 48: {
+            case 72: {
 
               avatarGuid_ = input.readUInt64();
               break;
             }
-            case 66: {
+            case 82: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 propMap_ = com.google.protobuf.MapField.newMapField(
                     PropMapDefaultEntryHolder.defaultEntry);
@@ -155,7 +179,7 @@ private AvatarPropNotify(
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 8:
+        case 10:
           return internalGetPropMap();
         default:
           throw new RuntimeException(
@@ -170,18 +194,7 @@ protected com.google.protobuf.MapField internalGetMapField(
               emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify.class, emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify.Builder.class);
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 6;
-    private long avatarGuid_;
-    /**
-     * <code>uint64 avatar_guid = 6;</code>
-     * @return The avatarGuid.
-     */
-    @java.lang.Override
-    public long getAvatarGuid() {
-      return avatarGuid_;
-    }
-
-    public static final int PROP_MAP_FIELD_NUMBER = 8;
+    public static final int PROP_MAP_FIELD_NUMBER = 10;
     private static final class PropMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, java.lang.Long> defaultEntry =
@@ -208,7 +221,11 @@ public int getPropMapCount() {
       return internalGetPropMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, int64&gt; prop_map = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, int64&gt; prop_map = 10;</code>
      */
 
     @java.lang.Override
@@ -226,7 +243,11 @@ public java.util.Map<java.lang.Integer, java.lang.Long> getPropMap() {
       return getPropMapMap();
     }
     /**
-     * <code>map&lt;uint32, int64&gt; prop_map = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, int64&gt; prop_map = 10;</code>
      */
     @java.lang.Override
 
@@ -234,7 +255,11 @@ public java.util.Map<java.lang.Integer, java.lang.Long> getPropMapMap() {
       return internalGetPropMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, int64&gt; prop_map = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, int64&gt; prop_map = 10;</code>
      */
     @java.lang.Override
 
@@ -247,7 +272,11 @@ public long getPropMapOrDefault(
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, int64&gt; prop_map = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, int64&gt; prop_map = 10;</code>
      */
     @java.lang.Override
 
@@ -262,6 +291,21 @@ public long getPropMapOrThrow(
       return map.get(key);
     }
 
+    public static final int AVATAR_GUID_FIELD_NUMBER = 9;
+    private long avatarGuid_;
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint64 avatar_guid = 9;</code>
+     * @return The avatarGuid.
+     */
+    @java.lang.Override
+    public long getAvatarGuid() {
+      return avatarGuid_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -277,14 +321,14 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(6, avatarGuid_);
+        output.writeUInt64(9, avatarGuid_);
       }
       com.google.protobuf.GeneratedMessageV3
         .serializeIntegerMapTo(
           output,
           internalGetPropMap(),
           PropMapDefaultEntryHolder.defaultEntry,
-          8);
+          10);
       unknownFields.writeTo(output);
     }
 
@@ -296,7 +340,7 @@ public int getSerializedSize() {
       size = 0;
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(6, avatarGuid_);
+          .computeUInt64Size(9, avatarGuid_);
       }
       for (java.util.Map.Entry<java.lang.Integer, java.lang.Long> entry
            : internalGetPropMap().getMap().entrySet()) {
@@ -306,7 +350,7 @@ public int getSerializedSize() {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(8, propMap__);
+            .computeMessageSize(10, propMap__);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -323,10 +367,10 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify other = (emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify) obj;
 
-      if (getAvatarGuid()
-          != other.getAvatarGuid()) return false;
       if (!internalGetPropMap().equals(
           other.internalGetPropMap())) return false;
+      if (getAvatarGuid()
+          != other.getAvatarGuid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -338,13 +382,13 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getAvatarGuid());
       if (!internalGetPropMap().getMap().isEmpty()) {
         hash = (37 * hash) + PROP_MAP_FIELD_NUMBER;
         hash = (53 * hash) + internalGetPropMap().hashCode();
       }
+      hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getAvatarGuid());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -442,7 +486,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 21114
+     * CmdId: 3178
      * </pre>
      *
      * Protobuf type {@code AvatarPropNotify}
@@ -460,7 +504,7 @@ public static final class Builder extends
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 8:
+          case 10:
             return internalGetPropMap();
           default:
             throw new RuntimeException(
@@ -471,7 +515,7 @@ protected com.google.protobuf.MapField internalGetMapField(
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 8:
+          case 10:
             return internalGetMutablePropMap();
           default:
             throw new RuntimeException(
@@ -504,9 +548,9 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        internalGetMutablePropMap().clear();
         avatarGuid_ = 0L;
 
-        internalGetMutablePropMap().clear();
         return this;
       }
 
@@ -534,9 +578,9 @@ public emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify bui
       public emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify buildPartial() {
         emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify result = new emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify(this);
         int from_bitField0_ = bitField0_;
-        result.avatarGuid_ = avatarGuid_;
         result.propMap_ = internalGetPropMap();
         result.propMap_.makeImmutable();
+        result.avatarGuid_ = avatarGuid_;
         onBuilt();
         return result;
       }
@@ -585,11 +629,11 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify other) {
         if (other == emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify.getDefaultInstance()) return this;
+        internalGetMutablePropMap().mergeFrom(
+            other.internalGetPropMap());
         if (other.getAvatarGuid() != 0L) {
           setAvatarGuid(other.getAvatarGuid());
         }
-        internalGetMutablePropMap().mergeFrom(
-            other.internalGetPropMap());
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -620,37 +664,6 @@ public Builder mergeFrom(
       }
       private int bitField0_;
 
-      private long avatarGuid_ ;
-      /**
-       * <code>uint64 avatar_guid = 6;</code>
-       * @return The avatarGuid.
-       */
-      @java.lang.Override
-      public long getAvatarGuid() {
-        return avatarGuid_;
-      }
-      /**
-       * <code>uint64 avatar_guid = 6;</code>
-       * @param value The avatarGuid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAvatarGuid(long value) {
-        
-        avatarGuid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 avatar_guid = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAvatarGuid() {
-        
-        avatarGuid_ = 0L;
-        onChanged();
-        return this;
-      }
-
       private com.google.protobuf.MapField<
           java.lang.Integer, java.lang.Long> propMap_;
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Long>
@@ -678,7 +691,11 @@ public int getPropMapCount() {
         return internalGetPropMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, int64&gt; prop_map = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, int64&gt; prop_map = 10;</code>
        */
 
       @java.lang.Override
@@ -696,7 +713,11 @@ public java.util.Map<java.lang.Integer, java.lang.Long> getPropMap() {
         return getPropMapMap();
       }
       /**
-       * <code>map&lt;uint32, int64&gt; prop_map = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, int64&gt; prop_map = 10;</code>
        */
       @java.lang.Override
 
@@ -704,7 +725,11 @@ public java.util.Map<java.lang.Integer, java.lang.Long> getPropMapMap() {
         return internalGetPropMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, int64&gt; prop_map = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, int64&gt; prop_map = 10;</code>
        */
       @java.lang.Override
 
@@ -717,7 +742,11 @@ public long getPropMapOrDefault(
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, int64&gt; prop_map = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, int64&gt; prop_map = 10;</code>
        */
       @java.lang.Override
 
@@ -738,7 +767,11 @@ public Builder clearPropMap() {
         return this;
       }
       /**
-       * <code>map&lt;uint32, int64&gt; prop_map = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, int64&gt; prop_map = 10;</code>
        */
 
       public Builder removePropMap(
@@ -757,7 +790,11 @@ public Builder removePropMap(
         return internalGetMutablePropMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, int64&gt; prop_map = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, int64&gt; prop_map = 10;</code>
        */
       public Builder putPropMap(
           int key,
@@ -769,7 +806,11 @@ public Builder putPropMap(
         return this;
       }
       /**
-       * <code>map&lt;uint32, int64&gt; prop_map = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, int64&gt; prop_map = 10;</code>
        */
 
       public Builder putAllPropMap(
@@ -778,6 +819,49 @@ public Builder putAllPropMap(
             .putAll(values);
         return this;
       }
+
+      private long avatarGuid_ ;
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint64 avatar_guid = 9;</code>
+       * @return The avatarGuid.
+       */
+      @java.lang.Override
+      public long getAvatarGuid() {
+        return avatarGuid_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint64 avatar_guid = 9;</code>
+       * @param value The avatarGuid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAvatarGuid(long value) {
+        
+        avatarGuid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint64 avatar_guid = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAvatarGuid() {
+        
+        avatarGuid_ = 0L;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -851,8 +935,8 @@ public emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify get
   static {
     java.lang.String[] descriptorData = {
       "\n\026AvatarPropNotify.proto\"\211\001\n\020AvatarPropN" +
-      "otify\022\023\n\013avatar_guid\030\006 \001(\004\0220\n\010prop_map\030\010" +
-      " \003(\0132\036.AvatarPropNotify.PropMapEntry\032.\n\014" +
+      "otify\0220\n\010prop_map\030\n \003(\0132\036.AvatarPropNoti" +
+      "fy.PropMapEntry\022\023\n\013avatar_guid\030\t \001(\004\032.\n\014" +
       "PropMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\003" +
       ":\0028\001B\033\n\031emu.grasscutter.net.protob\006proto" +
       "3"
@@ -866,7 +950,7 @@ public emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify get
     internal_static_AvatarPropNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarPropNotify_descriptor,
-        new java.lang.String[] { "AvatarGuid", "PropMap", });
+        new java.lang.String[] { "PropMap", "AvatarGuid", });
     internal_static_AvatarPropNotify_PropMapEntry_descriptor =
       internal_static_AvatarPropNotify_descriptor.getNestedTypes().get(0);
     internal_static_AvatarPropNotify_PropMapEntry_fieldAccessorTable = new
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarRenameInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarRenameInfoOuterClass.java
index a8b9dea72f6..4f003e0b4c7 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarRenameInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarRenameInfoOuterClass.java
@@ -19,22 +19,34 @@ public interface AvatarRenameInfoOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 avatar_id = 13;</code>
-     * @return The avatarId.
-     */
-    int getAvatarId();
-
-    /**
-     * <code>string avatar_name = 15;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>string avatar_name = 9;</code>
      * @return The avatarName.
      */
     java.lang.String getAvatarName();
     /**
-     * <code>string avatar_name = 15;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>string avatar_name = 9;</code>
      * @return The bytes for avatarName.
      */
     com.google.protobuf.ByteString
         getAvatarNameBytes();
+
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 avatar_id = 6;</code>
+     * @return The avatarId.
+     */
+    int getAvatarId();
   }
   /**
    * Protobuf type {@code AvatarRenameInfo}
@@ -82,12 +94,12 @@ private AvatarRenameInfo(
             case 0:
               done = true;
               break;
-            case 104: {
+            case 48: {
 
               avatarId_ = input.readUInt32();
               break;
             }
-            case 122: {
+            case 74: {
               java.lang.String s = input.readStringRequireUtf8();
 
               avatarName_ = s;
@@ -125,21 +137,14 @@ private AvatarRenameInfo(
               emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.class, emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.Builder.class);
     }
 
-    public static final int AVATAR_ID_FIELD_NUMBER = 13;
-    private int avatarId_;
-    /**
-     * <code>uint32 avatar_id = 13;</code>
-     * @return The avatarId.
-     */
-    @java.lang.Override
-    public int getAvatarId() {
-      return avatarId_;
-    }
-
-    public static final int AVATAR_NAME_FIELD_NUMBER = 15;
+    public static final int AVATAR_NAME_FIELD_NUMBER = 9;
     private volatile java.lang.Object avatarName_;
     /**
-     * <code>string avatar_name = 15;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>string avatar_name = 9;</code>
      * @return The avatarName.
      */
     @java.lang.Override
@@ -156,7 +161,11 @@ public java.lang.String getAvatarName() {
       }
     }
     /**
-     * <code>string avatar_name = 15;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>string avatar_name = 9;</code>
      * @return The bytes for avatarName.
      */
     @java.lang.Override
@@ -174,6 +183,21 @@ public java.lang.String getAvatarName() {
       }
     }
 
+    public static final int AVATAR_ID_FIELD_NUMBER = 6;
+    private int avatarId_;
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 avatar_id = 6;</code>
+     * @return The avatarId.
+     */
+    @java.lang.Override
+    public int getAvatarId() {
+      return avatarId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -189,10 +213,10 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (avatarId_ != 0) {
-        output.writeUInt32(13, avatarId_);
+        output.writeUInt32(6, avatarId_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(avatarName_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 15, avatarName_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 9, avatarName_);
       }
       unknownFields.writeTo(output);
     }
@@ -205,10 +229,10 @@ public int getSerializedSize() {
       size = 0;
       if (avatarId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, avatarId_);
+          .computeUInt32Size(6, avatarId_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(avatarName_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(15, avatarName_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, avatarName_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,10 +249,10 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo other = (emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo) obj;
 
-      if (getAvatarId()
-          != other.getAvatarId()) return false;
       if (!getAvatarName()
           .equals(other.getAvatarName())) return false;
+      if (getAvatarId()
+          != other.getAvatarId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -240,10 +264,10 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getAvatarId();
       hash = (37 * hash) + AVATAR_NAME_FIELD_NUMBER;
       hash = (53 * hash) + getAvatarName().hashCode();
+      hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getAvatarId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -377,10 +401,10 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        avatarId_ = 0;
-
         avatarName_ = "";
 
+        avatarId_ = 0;
+
         return this;
       }
 
@@ -407,8 +431,8 @@ public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo bui
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo buildPartial() {
         emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo result = new emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo(this);
-        result.avatarId_ = avatarId_;
         result.avatarName_ = avatarName_;
+        result.avatarId_ = avatarId_;
         onBuilt();
         return result;
       }
@@ -457,13 +481,13 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo other) {
         if (other == emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.getDefaultInstance()) return this;
-        if (other.getAvatarId() != 0) {
-          setAvatarId(other.getAvatarId());
-        }
         if (!other.getAvatarName().isEmpty()) {
           avatarName_ = other.avatarName_;
           onChanged();
         }
+        if (other.getAvatarId() != 0) {
+          setAvatarId(other.getAvatarId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -493,40 +517,13 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int avatarId_ ;
-      /**
-       * <code>uint32 avatar_id = 13;</code>
-       * @return The avatarId.
-       */
-      @java.lang.Override
-      public int getAvatarId() {
-        return avatarId_;
-      }
-      /**
-       * <code>uint32 avatar_id = 13;</code>
-       * @param value The avatarId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAvatarId(int value) {
-        
-        avatarId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 avatar_id = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAvatarId() {
-        
-        avatarId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private java.lang.Object avatarName_ = "";
       /**
-       * <code>string avatar_name = 15;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>string avatar_name = 9;</code>
        * @return The avatarName.
        */
       public java.lang.String getAvatarName() {
@@ -542,7 +539,11 @@ public java.lang.String getAvatarName() {
         }
       }
       /**
-       * <code>string avatar_name = 15;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>string avatar_name = 9;</code>
        * @return The bytes for avatarName.
        */
       public com.google.protobuf.ByteString
@@ -559,7 +560,11 @@ public java.lang.String getAvatarName() {
         }
       }
       /**
-       * <code>string avatar_name = 15;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>string avatar_name = 9;</code>
        * @param value The avatarName to set.
        * @return This builder for chaining.
        */
@@ -574,7 +579,11 @@ public Builder setAvatarName(
         return this;
       }
       /**
-       * <code>string avatar_name = 15;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>string avatar_name = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarName() {
@@ -584,7 +593,11 @@ public Builder clearAvatarName() {
         return this;
       }
       /**
-       * <code>string avatar_name = 15;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>string avatar_name = 9;</code>
        * @param value The bytes for avatarName to set.
        * @return This builder for chaining.
        */
@@ -599,6 +612,49 @@ public Builder setAvatarNameBytes(
         onChanged();
         return this;
       }
+
+      private int avatarId_ ;
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 avatar_id = 6;</code>
+       * @return The avatarId.
+       */
+      @java.lang.Override
+      public int getAvatarId() {
+        return avatarId_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 avatar_id = 6;</code>
+       * @param value The avatarId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAvatarId(int value) {
+        
+        avatarId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 avatar_id = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAvatarId() {
+        
+        avatarId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -667,8 +723,8 @@ public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo get
   static {
     java.lang.String[] descriptorData = {
       "\n\026AvatarRenameInfo.proto\":\n\020AvatarRename" +
-      "Info\022\021\n\tavatar_id\030\r \001(\r\022\023\n\013avatar_name\030\017" +
-      " \001(\tB\033\n\031emu.grasscutter.net.protob\006proto" +
+      "Info\022\023\n\013avatar_name\030\t \001(\t\022\021\n\tavatar_id\030\006" +
+      " \001(\rB\033\n\031emu.grasscutter.net.protob\006proto" +
       "3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -680,7 +736,7 @@ public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo get
     internal_static_AvatarRenameInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarRenameInfo_descriptor,
-        new java.lang.String[] { "AvatarId", "AvatarName", });
+        new java.lang.String[] { "AvatarName", "AvatarId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarTeamUpdateNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarTeamUpdateNotifyOuterClass.java
index fa50f57efc9..f90cdf6f387 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarTeamUpdateNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarTeamUpdateNotifyOuterClass.java
@@ -19,28 +19,48 @@ public interface AvatarTeamUpdateNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint64 temp_avatar_guid_list = 1;</code>
      * @return A list containing the tempAvatarGuidList.
      */
     java.util.List<java.lang.Long> getTempAvatarGuidListList();
     /**
-     * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint64 temp_avatar_guid_list = 1;</code>
      * @return The count of tempAvatarGuidList.
      */
     int getTempAvatarGuidListCount();
     /**
-     * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint64 temp_avatar_guid_list = 1;</code>
      * @param index The index of the element to return.
      * @return The tempAvatarGuidList at the given index.
      */
     long getTempAvatarGuidList(int index);
 
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 10;</code>
      */
     int getAvatarTeamMapCount();
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 10;</code>
      */
     boolean containsAvatarTeamMap(
         int key);
@@ -51,19 +71,31 @@ boolean containsAvatarTeamMap(
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam>
     getAvatarTeamMap();
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 10;</code>
      */
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam>
     getAvatarTeamMapMap();
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 10;</code>
      */
 
     emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam getAvatarTeamMapOrDefault(
         int key,
         emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam defaultValue);
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 10;</code>
      */
 
     emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam getAvatarTeamMapOrThrow(
@@ -71,7 +103,7 @@ emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam getAvatarTeamMapOrThro
   }
   /**
    * <pre>
-   * CmdId: 28759
+   * CmdId: 26216
    * </pre>
    *
    * Protobuf type {@code AvatarTeamUpdateNotify}
@@ -120,7 +152,7 @@ private AvatarTeamUpdateNotify(
             case 0:
               done = true;
               break;
-            case 80: {
+            case 8: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 tempAvatarGuidList_ = newLongList();
                 mutable_bitField0_ |= 0x00000001;
@@ -128,7 +160,7 @@ private AvatarTeamUpdateNotify(
               tempAvatarGuidList_.addLong(input.readUInt64());
               break;
             }
-            case 82: {
+            case 10: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -141,7 +173,7 @@ private AvatarTeamUpdateNotify(
               input.popLimit(limit);
               break;
             }
-            case 98: {
+            case 82: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 avatarTeamMap_ = com.google.protobuf.MapField.newMapField(
                     AvatarTeamMapDefaultEntryHolder.defaultEntry);
@@ -186,7 +218,7 @@ private AvatarTeamUpdateNotify(
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 12:
+        case 10:
           return internalGetAvatarTeamMap();
         default:
           throw new RuntimeException(
@@ -201,10 +233,14 @@ protected com.google.protobuf.MapField internalGetMapField(
               emu.grasscutter.net.proto.AvatarTeamUpdateNotifyOuterClass.AvatarTeamUpdateNotify.class, emu.grasscutter.net.proto.AvatarTeamUpdateNotifyOuterClass.AvatarTeamUpdateNotify.Builder.class);
     }
 
-    public static final int TEMP_AVATAR_GUID_LIST_FIELD_NUMBER = 10;
+    public static final int TEMP_AVATAR_GUID_LIST_FIELD_NUMBER = 1;
     private com.google.protobuf.Internal.LongList tempAvatarGuidList_;
     /**
-     * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint64 temp_avatar_guid_list = 1;</code>
      * @return A list containing the tempAvatarGuidList.
      */
     @java.lang.Override
@@ -213,14 +249,22 @@ protected com.google.protobuf.MapField internalGetMapField(
       return tempAvatarGuidList_;
     }
     /**
-     * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint64 temp_avatar_guid_list = 1;</code>
      * @return The count of tempAvatarGuidList.
      */
     public int getTempAvatarGuidListCount() {
       return tempAvatarGuidList_.size();
     }
     /**
-     * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint64 temp_avatar_guid_list = 1;</code>
      * @param index The index of the element to return.
      * @return The tempAvatarGuidList at the given index.
      */
@@ -229,7 +273,7 @@ public long getTempAvatarGuidList(int index) {
     }
     private int tempAvatarGuidListMemoizedSerializedSize = -1;
 
-    public static final int AVATAR_TEAM_MAP_FIELD_NUMBER = 12;
+    public static final int AVATAR_TEAM_MAP_FIELD_NUMBER = 10;
     private static final class AvatarTeamMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam> defaultEntry =
@@ -256,7 +300,11 @@ public int getAvatarTeamMapCount() {
       return internalGetAvatarTeamMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 10;</code>
      */
 
     @java.lang.Override
@@ -274,7 +322,11 @@ public java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOute
       return getAvatarTeamMapMap();
     }
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 10;</code>
      */
     @java.lang.Override
 
@@ -282,7 +334,11 @@ public java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOute
       return internalGetAvatarTeamMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 10;</code>
      */
     @java.lang.Override
 
@@ -295,7 +351,11 @@ public emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam getAvatarTeamMa
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 10;</code>
      */
     @java.lang.Override
 
@@ -326,7 +386,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
       if (getTempAvatarGuidListList().size() > 0) {
-        output.writeUInt32NoTag(82);
+        output.writeUInt32NoTag(10);
         output.writeUInt32NoTag(tempAvatarGuidListMemoizedSerializedSize);
       }
       for (int i = 0; i < tempAvatarGuidList_.size(); i++) {
@@ -337,7 +397,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
           output,
           internalGetAvatarTeamMap(),
           AvatarTeamMapDefaultEntryHolder.defaultEntry,
-          12);
+          10);
       unknownFields.writeTo(output);
     }
 
@@ -369,7 +429,7 @@ public int getSerializedSize() {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(12, avatarTeamMap__);
+            .computeMessageSize(10, avatarTeamMap__);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -506,7 +566,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 28759
+     * CmdId: 26216
      * </pre>
      *
      * Protobuf type {@code AvatarTeamUpdateNotify}
@@ -524,7 +584,7 @@ public static final class Builder extends
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 12:
+          case 10:
             return internalGetAvatarTeamMap();
           default:
             throw new RuntimeException(
@@ -535,7 +595,7 @@ protected com.google.protobuf.MapField internalGetMapField(
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 12:
+          case 10:
             return internalGetMutableAvatarTeamMap();
           default:
             throw new RuntimeException(
@@ -703,7 +763,11 @@ private void ensureTempAvatarGuidListIsMutable() {
          }
       }
       /**
-       * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint64 temp_avatar_guid_list = 1;</code>
        * @return A list containing the tempAvatarGuidList.
        */
       public java.util.List<java.lang.Long>
@@ -712,14 +776,22 @@ private void ensureTempAvatarGuidListIsMutable() {
                  java.util.Collections.unmodifiableList(tempAvatarGuidList_) : tempAvatarGuidList_;
       }
       /**
-       * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint64 temp_avatar_guid_list = 1;</code>
        * @return The count of tempAvatarGuidList.
        */
       public int getTempAvatarGuidListCount() {
         return tempAvatarGuidList_.size();
       }
       /**
-       * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint64 temp_avatar_guid_list = 1;</code>
        * @param index The index of the element to return.
        * @return The tempAvatarGuidList at the given index.
        */
@@ -727,7 +799,11 @@ public long getTempAvatarGuidList(int index) {
         return tempAvatarGuidList_.getLong(index);
       }
       /**
-       * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint64 temp_avatar_guid_list = 1;</code>
        * @param index The index to set the value at.
        * @param value The tempAvatarGuidList to set.
        * @return This builder for chaining.
@@ -740,7 +816,11 @@ public Builder setTempAvatarGuidList(
         return this;
       }
       /**
-       * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint64 temp_avatar_guid_list = 1;</code>
        * @param value The tempAvatarGuidList to add.
        * @return This builder for chaining.
        */
@@ -751,7 +831,11 @@ public Builder addTempAvatarGuidList(long value) {
         return this;
       }
       /**
-       * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint64 temp_avatar_guid_list = 1;</code>
        * @param values The tempAvatarGuidList to add.
        * @return This builder for chaining.
        */
@@ -764,7 +848,11 @@ public Builder addAllTempAvatarGuidList(
         return this;
       }
       /**
-       * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint64 temp_avatar_guid_list = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearTempAvatarGuidList() {
@@ -801,7 +889,11 @@ public int getAvatarTeamMapCount() {
         return internalGetAvatarTeamMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 10;</code>
        */
 
       @java.lang.Override
@@ -819,7 +911,11 @@ public java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOute
         return getAvatarTeamMapMap();
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 10;</code>
        */
       @java.lang.Override
 
@@ -827,7 +923,11 @@ public java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOute
         return internalGetAvatarTeamMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 10;</code>
        */
       @java.lang.Override
 
@@ -840,7 +940,11 @@ public emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam getAvatarTeamMa
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 10;</code>
        */
       @java.lang.Override
 
@@ -861,7 +965,11 @@ public Builder clearAvatarTeamMap() {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 10;</code>
        */
 
       public Builder removeAvatarTeamMap(
@@ -880,7 +988,11 @@ public Builder removeAvatarTeamMap(
         return internalGetMutableAvatarTeamMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 10;</code>
        */
       public Builder putAvatarTeamMap(
           int key,
@@ -892,7 +1004,11 @@ public Builder putAvatarTeamMap(
         return this;
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 10;</code>
        */
 
       public Builder putAllAvatarTeamMap(
@@ -975,8 +1091,8 @@ public emu.grasscutter.net.proto.AvatarTeamUpdateNotifyOuterClass.AvatarTeamUpda
     java.lang.String[] descriptorData = {
       "\n\034AvatarTeamUpdateNotify.proto\032\020AvatarTe" +
       "am.proto\"\277\001\n\026AvatarTeamUpdateNotify\022\035\n\025t" +
-      "emp_avatar_guid_list\030\n \003(\004\022C\n\017avatar_tea" +
-      "m_map\030\014 \003(\0132*.AvatarTeamUpdateNotify.Ava" +
+      "emp_avatar_guid_list\030\001 \003(\004\022C\n\017avatar_tea" +
+      "m_map\030\n \003(\0132*.AvatarTeamUpdateNotify.Ava" +
       "tarTeamMapEntry\032A\n\022AvatarTeamMapEntry\022\013\n" +
       "\003key\030\001 \001(\r\022\032\n\005value\030\002 \001(\0132\013.AvatarTeam:\002" +
       "8\001B\033\n\031emu.grasscutter.net.protob\006proto3"
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ChangeAvatarReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChangeAvatarReqOuterClass.java
index c7ee994f536..6d23a23f040 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ChangeAvatarReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ChangeAvatarReqOuterClass.java
@@ -19,47 +19,75 @@ public interface ChangeAvatarReqOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.Vector move_pos = 4;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.Vector move_pos = 7;</code>
      * @return Whether the movePos field is set.
      */
     boolean hasMovePos();
     /**
-     * <code>.Vector move_pos = 4;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.Vector move_pos = 7;</code>
      * @return The movePos.
      */
     emu.grasscutter.net.proto.VectorOuterClass.Vector getMovePos();
     /**
-     * <code>.Vector move_pos = 4;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.Vector move_pos = 7;</code>
      */
     emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getMovePosOrBuilder();
 
     /**
-     * <code>uint32 skill_id = 8;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 skill_id = 3;</code>
      * @return The skillId.
      */
     int getSkillId();
 
     /**
-     * <code>bool IMPLCNKLFED = 9;</code>
-     * @return The iMPLCNKLFED.
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>bool is_move = 15;</code>
+     * @return The isMove.
      */
-    boolean getIMPLCNKLFED();
+    boolean getIsMove();
 
     /**
-     * <code>bool is_move = 5;</code>
-     * @return The isMove.
+     * <pre>
+     * Offset: 0x2D
+     * </pre>
+     *
+     * <code>bool NKMBBFHGMKB = 4;</code>
+     * @return The nKMBBFHGMKB.
      */
-    boolean getIsMove();
+    boolean getNKMBBFHGMKB();
 
     /**
-     * <code>uint64 guid = 10;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>uint64 guid = 6;</code>
      * @return The guid.
      */
     long getGuid();
   }
   /**
    * <pre>
-   * CmdId: 3470
+   * CmdId: 25492
    * </pre>
    *
    * Protobuf type {@code ChangeAvatarReq}
@@ -106,7 +134,22 @@ private ChangeAvatarReq(
             case 0:
               done = true;
               break;
-            case 34: {
+            case 24: {
+
+              skillId_ = input.readUInt32();
+              break;
+            }
+            case 32: {
+
+              nKMBBFHGMKB_ = input.readBool();
+              break;
+            }
+            case 48: {
+
+              guid_ = input.readUInt64();
+              break;
+            }
+            case 58: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (movePos_ != null) {
                 subBuilder = movePos_.toBuilder();
@@ -119,26 +162,11 @@ private ChangeAvatarReq(
 
               break;
             }
-            case 40: {
+            case 120: {
 
               isMove_ = input.readBool();
               break;
             }
-            case 64: {
-
-              skillId_ = input.readUInt32();
-              break;
-            }
-            case 72: {
-
-              iMPLCNKLFED_ = input.readBool();
-              break;
-            }
-            case 80: {
-
-              guid_ = input.readUInt64();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -171,10 +199,14 @@ private ChangeAvatarReq(
               emu.grasscutter.net.proto.ChangeAvatarReqOuterClass.ChangeAvatarReq.class, emu.grasscutter.net.proto.ChangeAvatarReqOuterClass.ChangeAvatarReq.Builder.class);
     }
 
-    public static final int MOVE_POS_FIELD_NUMBER = 4;
+    public static final int MOVE_POS_FIELD_NUMBER = 7;
     private emu.grasscutter.net.proto.VectorOuterClass.Vector movePos_;
     /**
-     * <code>.Vector move_pos = 4;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.Vector move_pos = 7;</code>
      * @return Whether the movePos field is set.
      */
     @java.lang.Override
@@ -182,7 +214,11 @@ public boolean hasMovePos() {
       return movePos_ != null;
     }
     /**
-     * <code>.Vector move_pos = 4;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.Vector move_pos = 7;</code>
      * @return The movePos.
      */
     @java.lang.Override
@@ -190,17 +226,25 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getMovePos() {
       return movePos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : movePos_;
     }
     /**
-     * <code>.Vector move_pos = 4;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.Vector move_pos = 7;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getMovePosOrBuilder() {
       return getMovePos();
     }
 
-    public static final int SKILL_ID_FIELD_NUMBER = 8;
+    public static final int SKILL_ID_FIELD_NUMBER = 3;
     private int skillId_;
     /**
-     * <code>uint32 skill_id = 8;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 skill_id = 3;</code>
      * @return The skillId.
      */
     @java.lang.Override
@@ -208,32 +252,44 @@ public int getSkillId() {
       return skillId_;
     }
 
-    public static final int IMPLCNKLFED_FIELD_NUMBER = 9;
-    private boolean iMPLCNKLFED_;
+    public static final int IS_MOVE_FIELD_NUMBER = 15;
+    private boolean isMove_;
     /**
-     * <code>bool IMPLCNKLFED = 9;</code>
-     * @return The iMPLCNKLFED.
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>bool is_move = 15;</code>
+     * @return The isMove.
      */
     @java.lang.Override
-    public boolean getIMPLCNKLFED() {
-      return iMPLCNKLFED_;
+    public boolean getIsMove() {
+      return isMove_;
     }
 
-    public static final int IS_MOVE_FIELD_NUMBER = 5;
-    private boolean isMove_;
+    public static final int NKMBBFHGMKB_FIELD_NUMBER = 4;
+    private boolean nKMBBFHGMKB_;
     /**
-     * <code>bool is_move = 5;</code>
-     * @return The isMove.
+     * <pre>
+     * Offset: 0x2D
+     * </pre>
+     *
+     * <code>bool NKMBBFHGMKB = 4;</code>
+     * @return The nKMBBFHGMKB.
      */
     @java.lang.Override
-    public boolean getIsMove() {
-      return isMove_;
+    public boolean getNKMBBFHGMKB() {
+      return nKMBBFHGMKB_;
     }
 
-    public static final int GUID_FIELD_NUMBER = 10;
+    public static final int GUID_FIELD_NUMBER = 6;
     private long guid_;
     /**
-     * <code>uint64 guid = 10;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>uint64 guid = 6;</code>
      * @return The guid.
      */
     @java.lang.Override
@@ -255,20 +311,20 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (movePos_ != null) {
-        output.writeMessage(4, getMovePos());
-      }
-      if (isMove_ != false) {
-        output.writeBool(5, isMove_);
-      }
       if (skillId_ != 0) {
-        output.writeUInt32(8, skillId_);
+        output.writeUInt32(3, skillId_);
       }
-      if (iMPLCNKLFED_ != false) {
-        output.writeBool(9, iMPLCNKLFED_);
+      if (nKMBBFHGMKB_ != false) {
+        output.writeBool(4, nKMBBFHGMKB_);
       }
       if (guid_ != 0L) {
-        output.writeUInt64(10, guid_);
+        output.writeUInt64(6, guid_);
+      }
+      if (movePos_ != null) {
+        output.writeMessage(7, getMovePos());
+      }
+      if (isMove_ != false) {
+        output.writeBool(15, isMove_);
       }
       unknownFields.writeTo(output);
     }
@@ -279,25 +335,25 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (movePos_ != null) {
+      if (skillId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, getMovePos());
+          .computeUInt32Size(3, skillId_);
       }
-      if (isMove_ != false) {
+      if (nKMBBFHGMKB_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(5, isMove_);
+          .computeBoolSize(4, nKMBBFHGMKB_);
       }
-      if (skillId_ != 0) {
+      if (guid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, skillId_);
+          .computeUInt64Size(6, guid_);
       }
-      if (iMPLCNKLFED_ != false) {
+      if (movePos_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(9, iMPLCNKLFED_);
+          .computeMessageSize(7, getMovePos());
       }
-      if (guid_ != 0L) {
+      if (isMove_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(10, guid_);
+          .computeBoolSize(15, isMove_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -321,10 +377,10 @@ public boolean equals(final java.lang.Object obj) {
       }
       if (getSkillId()
           != other.getSkillId()) return false;
-      if (getIMPLCNKLFED()
-          != other.getIMPLCNKLFED()) return false;
       if (getIsMove()
           != other.getIsMove()) return false;
+      if (getNKMBBFHGMKB()
+          != other.getNKMBBFHGMKB()) return false;
       if (getGuid()
           != other.getGuid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -344,12 +400,12 @@ public int hashCode() {
       }
       hash = (37 * hash) + SKILL_ID_FIELD_NUMBER;
       hash = (53 * hash) + getSkillId();
-      hash = (37 * hash) + IMPLCNKLFED_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIMPLCNKLFED());
       hash = (37 * hash) + IS_MOVE_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsMove());
+      hash = (37 * hash) + NKMBBFHGMKB_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getNKMBBFHGMKB());
       hash = (37 * hash) + GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getGuid());
@@ -450,7 +506,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 3470
+     * CmdId: 25492
      * </pre>
      *
      * Protobuf type {@code ChangeAvatarReq}
@@ -498,10 +554,10 @@ public Builder clear() {
         }
         skillId_ = 0;
 
-        iMPLCNKLFED_ = false;
-
         isMove_ = false;
 
+        nKMBBFHGMKB_ = false;
+
         guid_ = 0L;
 
         return this;
@@ -536,8 +592,8 @@ public emu.grasscutter.net.proto.ChangeAvatarReqOuterClass.ChangeAvatarReq build
           result.movePos_ = movePosBuilder_.build();
         }
         result.skillId_ = skillId_;
-        result.iMPLCNKLFED_ = iMPLCNKLFED_;
         result.isMove_ = isMove_;
+        result.nKMBBFHGMKB_ = nKMBBFHGMKB_;
         result.guid_ = guid_;
         onBuilt();
         return result;
@@ -593,12 +649,12 @@ public Builder mergeFrom(emu.grasscutter.net.proto.ChangeAvatarReqOuterClass.Cha
         if (other.getSkillId() != 0) {
           setSkillId(other.getSkillId());
         }
-        if (other.getIMPLCNKLFED() != false) {
-          setIMPLCNKLFED(other.getIMPLCNKLFED());
-        }
         if (other.getIsMove() != false) {
           setIsMove(other.getIsMove());
         }
+        if (other.getNKMBBFHGMKB() != false) {
+          setNKMBBFHGMKB(other.getNKMBBFHGMKB());
+        }
         if (other.getGuid() != 0L) {
           setGuid(other.getGuid());
         }
@@ -635,14 +691,22 @@ public Builder mergeFrom(
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> movePosBuilder_;
       /**
-       * <code>.Vector move_pos = 4;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.Vector move_pos = 7;</code>
        * @return Whether the movePos field is set.
        */
       public boolean hasMovePos() {
         return movePosBuilder_ != null || movePos_ != null;
       }
       /**
-       * <code>.Vector move_pos = 4;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.Vector move_pos = 7;</code>
        * @return The movePos.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getMovePos() {
@@ -653,7 +717,11 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getMovePos() {
         }
       }
       /**
-       * <code>.Vector move_pos = 4;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.Vector move_pos = 7;</code>
        */
       public Builder setMovePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (movePosBuilder_ == null) {
@@ -669,7 +737,11 @@ public Builder setMovePos(emu.grasscutter.net.proto.VectorOuterClass.Vector valu
         return this;
       }
       /**
-       * <code>.Vector move_pos = 4;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.Vector move_pos = 7;</code>
        */
       public Builder setMovePos(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -683,7 +755,11 @@ public Builder setMovePos(
         return this;
       }
       /**
-       * <code>.Vector move_pos = 4;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.Vector move_pos = 7;</code>
        */
       public Builder mergeMovePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (movePosBuilder_ == null) {
@@ -701,7 +777,11 @@ public Builder mergeMovePos(emu.grasscutter.net.proto.VectorOuterClass.Vector va
         return this;
       }
       /**
-       * <code>.Vector move_pos = 4;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.Vector move_pos = 7;</code>
        */
       public Builder clearMovePos() {
         if (movePosBuilder_ == null) {
@@ -715,7 +795,11 @@ public Builder clearMovePos() {
         return this;
       }
       /**
-       * <code>.Vector move_pos = 4;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.Vector move_pos = 7;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getMovePosBuilder() {
         
@@ -723,7 +807,11 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getMovePosBuild
         return getMovePosFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector move_pos = 4;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.Vector move_pos = 7;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getMovePosOrBuilder() {
         if (movePosBuilder_ != null) {
@@ -734,7 +822,11 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getMovePosOrBu
         }
       }
       /**
-       * <code>.Vector move_pos = 4;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.Vector move_pos = 7;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
@@ -752,7 +844,11 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getMovePosOrBu
 
       private int skillId_ ;
       /**
-       * <code>uint32 skill_id = 8;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 skill_id = 3;</code>
        * @return The skillId.
        */
       @java.lang.Override
@@ -760,7 +856,11 @@ public int getSkillId() {
         return skillId_;
       }
       /**
-       * <code>uint32 skill_id = 8;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 skill_id = 3;</code>
        * @param value The skillId to set.
        * @return This builder for chaining.
        */
@@ -771,7 +871,11 @@ public Builder setSkillId(int value) {
         return this;
       }
       /**
-       * <code>uint32 skill_id = 8;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 skill_id = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearSkillId() {
@@ -781,71 +885,99 @@ public Builder clearSkillId() {
         return this;
       }
 
-      private boolean iMPLCNKLFED_ ;
+      private boolean isMove_ ;
       /**
-       * <code>bool IMPLCNKLFED = 9;</code>
-       * @return The iMPLCNKLFED.
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>bool is_move = 15;</code>
+       * @return The isMove.
        */
       @java.lang.Override
-      public boolean getIMPLCNKLFED() {
-        return iMPLCNKLFED_;
+      public boolean getIsMove() {
+        return isMove_;
       }
       /**
-       * <code>bool IMPLCNKLFED = 9;</code>
-       * @param value The iMPLCNKLFED to set.
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>bool is_move = 15;</code>
+       * @param value The isMove to set.
        * @return This builder for chaining.
        */
-      public Builder setIMPLCNKLFED(boolean value) {
+      public Builder setIsMove(boolean value) {
         
-        iMPLCNKLFED_ = value;
+        isMove_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bool IMPLCNKLFED = 9;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>bool is_move = 15;</code>
        * @return This builder for chaining.
        */
-      public Builder clearIMPLCNKLFED() {
+      public Builder clearIsMove() {
         
-        iMPLCNKLFED_ = false;
+        isMove_ = false;
         onChanged();
         return this;
       }
 
-      private boolean isMove_ ;
+      private boolean nKMBBFHGMKB_ ;
       /**
-       * <code>bool is_move = 5;</code>
-       * @return The isMove.
+       * <pre>
+       * Offset: 0x2D
+       * </pre>
+       *
+       * <code>bool NKMBBFHGMKB = 4;</code>
+       * @return The nKMBBFHGMKB.
        */
       @java.lang.Override
-      public boolean getIsMove() {
-        return isMove_;
+      public boolean getNKMBBFHGMKB() {
+        return nKMBBFHGMKB_;
       }
       /**
-       * <code>bool is_move = 5;</code>
-       * @param value The isMove to set.
+       * <pre>
+       * Offset: 0x2D
+       * </pre>
+       *
+       * <code>bool NKMBBFHGMKB = 4;</code>
+       * @param value The nKMBBFHGMKB to set.
        * @return This builder for chaining.
        */
-      public Builder setIsMove(boolean value) {
+      public Builder setNKMBBFHGMKB(boolean value) {
         
-        isMove_ = value;
+        nKMBBFHGMKB_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bool is_move = 5;</code>
+       * <pre>
+       * Offset: 0x2D
+       * </pre>
+       *
+       * <code>bool NKMBBFHGMKB = 4;</code>
        * @return This builder for chaining.
        */
-      public Builder clearIsMove() {
+      public Builder clearNKMBBFHGMKB() {
         
-        isMove_ = false;
+        nKMBBFHGMKB_ = false;
         onChanged();
         return this;
       }
 
       private long guid_ ;
       /**
-       * <code>uint64 guid = 10;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint64 guid = 6;</code>
        * @return The guid.
        */
       @java.lang.Override
@@ -853,7 +985,11 @@ public long getGuid() {
         return guid_;
       }
       /**
-       * <code>uint64 guid = 10;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint64 guid = 6;</code>
        * @param value The guid to set.
        * @return This builder for chaining.
        */
@@ -864,7 +1000,11 @@ public Builder setGuid(long value) {
         return this;
       }
       /**
-       * <code>uint64 guid = 10;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint64 guid = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearGuid() {
@@ -941,9 +1081,9 @@ public emu.grasscutter.net.proto.ChangeAvatarReqOuterClass.ChangeAvatarReq getDe
   static {
     java.lang.String[] descriptorData = {
       "\n\025ChangeAvatarReq.proto\032\014Vector.proto\"r\n" +
-      "\017ChangeAvatarReq\022\031\n\010move_pos\030\004 \001(\0132\007.Vec" +
-      "tor\022\020\n\010skill_id\030\010 \001(\r\022\023\n\013IMPLCNKLFED\030\t \001" +
-      "(\010\022\017\n\007is_move\030\005 \001(\010\022\014\n\004guid\030\n \001(\004B\033\n\031emu" +
+      "\017ChangeAvatarReq\022\031\n\010move_pos\030\007 \001(\0132\007.Vec" +
+      "tor\022\020\n\010skill_id\030\003 \001(\r\022\017\n\007is_move\030\017 \001(\010\022\023" +
+      "\n\013NKMBBFHGMKB\030\004 \001(\010\022\014\n\004guid\030\006 \001(\004B\033\n\031emu" +
       ".grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -956,7 +1096,7 @@ public emu.grasscutter.net.proto.ChangeAvatarReqOuterClass.ChangeAvatarReq getDe
     internal_static_ChangeAvatarReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ChangeAvatarReq_descriptor,
-        new java.lang.String[] { "MovePos", "SkillId", "IMPLCNKLFED", "IsMove", "Guid", });
+        new java.lang.String[] { "MovePos", "SkillId", "IsMove", "NKMBBFHGMKB", "Guid", });
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ChangeAvatarRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChangeAvatarRspOuterClass.java
index 6571c48c527..432f5b4a46b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ChangeAvatarRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ChangeAvatarRspOuterClass.java
@@ -19,26 +19,38 @@ public interface ChangeAvatarRspOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 3;</code>
-     * @return The retcode.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint64 cur_guid = 12;</code>
+     * @return The curGuid.
      */
-    int getRetcode();
+    long getCurGuid();
 
     /**
-     * <code>uint64 cur_guid = 6;</code>
-     * @return The curGuid.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>int32 retcode = 5;</code>
+     * @return The retcode.
      */
-    long getCurGuid();
+    int getRetcode();
 
     /**
-     * <code>uint32 skill_id = 8;</code>
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>uint32 skill_id = 15;</code>
      * @return The skillId.
      */
     int getSkillId();
   }
   /**
    * <pre>
-   * CmdId: 2046
+   * CmdId: 25243
    * </pre>
    *
    * Protobuf type {@code ChangeAvatarRsp}
@@ -85,17 +97,17 @@ private ChangeAvatarRsp(
             case 0:
               done = true;
               break;
-            case 24: {
+            case 40: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 48: {
+            case 96: {
 
               curGuid_ = input.readUInt64();
               break;
             }
-            case 64: {
+            case 120: {
 
               skillId_ = input.readUInt32();
               break;
@@ -132,32 +144,44 @@ private ChangeAvatarRsp(
               emu.grasscutter.net.proto.ChangeAvatarRspOuterClass.ChangeAvatarRsp.class, emu.grasscutter.net.proto.ChangeAvatarRspOuterClass.ChangeAvatarRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 3;
-    private int retcode_;
+    public static final int CUR_GUID_FIELD_NUMBER = 12;
+    private long curGuid_;
     /**
-     * <code>int32 retcode = 3;</code>
-     * @return The retcode.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint64 cur_guid = 12;</code>
+     * @return The curGuid.
      */
     @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
+    public long getCurGuid() {
+      return curGuid_;
     }
 
-    public static final int CUR_GUID_FIELD_NUMBER = 6;
-    private long curGuid_;
+    public static final int RETCODE_FIELD_NUMBER = 5;
+    private int retcode_;
     /**
-     * <code>uint64 cur_guid = 6;</code>
-     * @return The curGuid.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>int32 retcode = 5;</code>
+     * @return The retcode.
      */
     @java.lang.Override
-    public long getCurGuid() {
-      return curGuid_;
+    public int getRetcode() {
+      return retcode_;
     }
 
-    public static final int SKILL_ID_FIELD_NUMBER = 8;
+    public static final int SKILL_ID_FIELD_NUMBER = 15;
     private int skillId_;
     /**
-     * <code>uint32 skill_id = 8;</code>
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>uint32 skill_id = 15;</code>
      * @return The skillId.
      */
     @java.lang.Override
@@ -180,13 +204,13 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (retcode_ != 0) {
-        output.writeInt32(3, retcode_);
+        output.writeInt32(5, retcode_);
       }
       if (curGuid_ != 0L) {
-        output.writeUInt64(6, curGuid_);
+        output.writeUInt64(12, curGuid_);
       }
       if (skillId_ != 0) {
-        output.writeUInt32(8, skillId_);
+        output.writeUInt32(15, skillId_);
       }
       unknownFields.writeTo(output);
     }
@@ -199,15 +223,15 @@ public int getSerializedSize() {
       size = 0;
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(3, retcode_);
+          .computeInt32Size(5, retcode_);
       }
       if (curGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(6, curGuid_);
+          .computeUInt64Size(12, curGuid_);
       }
       if (skillId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, skillId_);
+          .computeUInt32Size(15, skillId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -224,10 +248,10 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.ChangeAvatarRspOuterClass.ChangeAvatarRsp other = (emu.grasscutter.net.proto.ChangeAvatarRspOuterClass.ChangeAvatarRsp) obj;
 
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (getCurGuid()
           != other.getCurGuid()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (getSkillId()
           != other.getSkillId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -241,11 +265,11 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + CUR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getCurGuid());
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + SKILL_ID_FIELD_NUMBER;
       hash = (53 * hash) + getSkillId();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -345,7 +369,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 2046
+     * CmdId: 25243
      * </pre>
      *
      * Protobuf type {@code ChangeAvatarRsp}
@@ -385,10 +409,10 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        retcode_ = 0;
-
         curGuid_ = 0L;
 
+        retcode_ = 0;
+
         skillId_ = 0;
 
         return this;
@@ -417,8 +441,8 @@ public emu.grasscutter.net.proto.ChangeAvatarRspOuterClass.ChangeAvatarRsp build
       @java.lang.Override
       public emu.grasscutter.net.proto.ChangeAvatarRspOuterClass.ChangeAvatarRsp buildPartial() {
         emu.grasscutter.net.proto.ChangeAvatarRspOuterClass.ChangeAvatarRsp result = new emu.grasscutter.net.proto.ChangeAvatarRspOuterClass.ChangeAvatarRsp(this);
-        result.retcode_ = retcode_;
         result.curGuid_ = curGuid_;
+        result.retcode_ = retcode_;
         result.skillId_ = skillId_;
         onBuilt();
         return result;
@@ -468,12 +492,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ChangeAvatarRspOuterClass.ChangeAvatarRsp other) {
         if (other == emu.grasscutter.net.proto.ChangeAvatarRspOuterClass.ChangeAvatarRsp.getDefaultInstance()) return this;
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         if (other.getCurGuid() != 0L) {
           setCurGuid(other.getCurGuid());
         }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         if (other.getSkillId() != 0) {
           setSkillId(other.getSkillId());
         }
@@ -506,71 +530,99 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int retcode_ ;
+      private long curGuid_ ;
       /**
-       * <code>int32 retcode = 3;</code>
-       * @return The retcode.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint64 cur_guid = 12;</code>
+       * @return The curGuid.
        */
       @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
+      public long getCurGuid() {
+        return curGuid_;
       }
       /**
-       * <code>int32 retcode = 3;</code>
-       * @param value The retcode to set.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint64 cur_guid = 12;</code>
+       * @param value The curGuid to set.
        * @return This builder for chaining.
        */
-      public Builder setRetcode(int value) {
+      public Builder setCurGuid(long value) {
         
-        retcode_ = value;
+        curGuid_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>int32 retcode = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint64 cur_guid = 12;</code>
        * @return This builder for chaining.
        */
-      public Builder clearRetcode() {
+      public Builder clearCurGuid() {
         
-        retcode_ = 0;
+        curGuid_ = 0L;
         onChanged();
         return this;
       }
 
-      private long curGuid_ ;
+      private int retcode_ ;
       /**
-       * <code>uint64 cur_guid = 6;</code>
-       * @return The curGuid.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>int32 retcode = 5;</code>
+       * @return The retcode.
        */
       @java.lang.Override
-      public long getCurGuid() {
-        return curGuid_;
+      public int getRetcode() {
+        return retcode_;
       }
       /**
-       * <code>uint64 cur_guid = 6;</code>
-       * @param value The curGuid to set.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>int32 retcode = 5;</code>
+       * @param value The retcode to set.
        * @return This builder for chaining.
        */
-      public Builder setCurGuid(long value) {
+      public Builder setRetcode(int value) {
         
-        curGuid_ = value;
+        retcode_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint64 cur_guid = 6;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>int32 retcode = 5;</code>
        * @return This builder for chaining.
        */
-      public Builder clearCurGuid() {
+      public Builder clearRetcode() {
         
-        curGuid_ = 0L;
+        retcode_ = 0;
         onChanged();
         return this;
       }
 
       private int skillId_ ;
       /**
-       * <code>uint32 skill_id = 8;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 skill_id = 15;</code>
        * @return The skillId.
        */
       @java.lang.Override
@@ -578,7 +630,11 @@ public int getSkillId() {
         return skillId_;
       }
       /**
-       * <code>uint32 skill_id = 8;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 skill_id = 15;</code>
        * @param value The skillId to set.
        * @return This builder for chaining.
        */
@@ -589,7 +645,11 @@ public Builder setSkillId(int value) {
         return this;
       }
       /**
-       * <code>uint32 skill_id = 8;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 skill_id = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearSkillId() {
@@ -666,8 +726,8 @@ public emu.grasscutter.net.proto.ChangeAvatarRspOuterClass.ChangeAvatarRsp getDe
   static {
     java.lang.String[] descriptorData = {
       "\n\025ChangeAvatarRsp.proto\"F\n\017ChangeAvatarR" +
-      "sp\022\017\n\007retcode\030\003 \001(\005\022\020\n\010cur_guid\030\006 \001(\004\022\020\n" +
-      "\010skill_id\030\010 \001(\rB\033\n\031emu.grasscutter.net.p" +
+      "sp\022\020\n\010cur_guid\030\014 \001(\004\022\017\n\007retcode\030\005 \001(\005\022\020\n" +
+      "\010skill_id\030\017 \001(\rB\033\n\031emu.grasscutter.net.p" +
       "rotob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -679,7 +739,7 @@ public emu.grasscutter.net.proto.ChangeAvatarRspOuterClass.ChangeAvatarRsp getDe
     internal_static_ChangeAvatarRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ChangeAvatarRsp_descriptor,
-        new java.lang.String[] { "Retcode", "CurGuid", "SkillId", });
+        new java.lang.String[] { "CurGuid", "Retcode", "SkillId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ChangeGameTimeReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChangeGameTimeReqOuterClass.java
index 879a35cfcde..da42add531e 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ChangeGameTimeReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ChangeGameTimeReqOuterClass.java
@@ -19,26 +19,38 @@ public interface ChangeGameTimeReqOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>bool is_force_set = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>bool is_force_set = 11;</code>
      * @return The isForceSet.
      */
     boolean getIsForceSet();
 
     /**
-     * <code>uint32 game_time = 9;</code>
-     * @return The gameTime.
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 extra_days = 3;</code>
+     * @return The extraDays.
      */
-    int getGameTime();
+    int getExtraDays();
 
     /**
-     * <code>uint32 extra_days = 2;</code>
-     * @return The extraDays.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 game_time = 13;</code>
+     * @return The gameTime.
      */
-    int getExtraDays();
+    int getGameTime();
   }
   /**
    * <pre>
-   * CmdId: 23019
+   * CmdId: 25379
    * </pre>
    *
    * Protobuf type {@code ChangeGameTimeReq}
@@ -85,17 +97,17 @@ private ChangeGameTimeReq(
             case 0:
               done = true;
               break;
-            case 8: {
+            case 24: {
 
-              isForceSet_ = input.readBool();
+              extraDays_ = input.readUInt32();
               break;
             }
-            case 16: {
+            case 88: {
 
-              extraDays_ = input.readUInt32();
+              isForceSet_ = input.readBool();
               break;
             }
-            case 72: {
+            case 104: {
 
               gameTime_ = input.readUInt32();
               break;
@@ -132,10 +144,14 @@ private ChangeGameTimeReq(
               emu.grasscutter.net.proto.ChangeGameTimeReqOuterClass.ChangeGameTimeReq.class, emu.grasscutter.net.proto.ChangeGameTimeReqOuterClass.ChangeGameTimeReq.Builder.class);
     }
 
-    public static final int IS_FORCE_SET_FIELD_NUMBER = 1;
+    public static final int IS_FORCE_SET_FIELD_NUMBER = 11;
     private boolean isForceSet_;
     /**
-     * <code>bool is_force_set = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>bool is_force_set = 11;</code>
      * @return The isForceSet.
      */
     @java.lang.Override
@@ -143,26 +159,34 @@ public boolean getIsForceSet() {
       return isForceSet_;
     }
 
-    public static final int GAME_TIME_FIELD_NUMBER = 9;
-    private int gameTime_;
+    public static final int EXTRA_DAYS_FIELD_NUMBER = 3;
+    private int extraDays_;
     /**
-     * <code>uint32 game_time = 9;</code>
-     * @return The gameTime.
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 extra_days = 3;</code>
+     * @return The extraDays.
      */
     @java.lang.Override
-    public int getGameTime() {
-      return gameTime_;
+    public int getExtraDays() {
+      return extraDays_;
     }
 
-    public static final int EXTRA_DAYS_FIELD_NUMBER = 2;
-    private int extraDays_;
+    public static final int GAME_TIME_FIELD_NUMBER = 13;
+    private int gameTime_;
     /**
-     * <code>uint32 extra_days = 2;</code>
-     * @return The extraDays.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 game_time = 13;</code>
+     * @return The gameTime.
      */
     @java.lang.Override
-    public int getExtraDays() {
-      return extraDays_;
+    public int getGameTime() {
+      return gameTime_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -179,14 +203,14 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (isForceSet_ != false) {
-        output.writeBool(1, isForceSet_);
-      }
       if (extraDays_ != 0) {
-        output.writeUInt32(2, extraDays_);
+        output.writeUInt32(3, extraDays_);
+      }
+      if (isForceSet_ != false) {
+        output.writeBool(11, isForceSet_);
       }
       if (gameTime_ != 0) {
-        output.writeUInt32(9, gameTime_);
+        output.writeUInt32(13, gameTime_);
       }
       unknownFields.writeTo(output);
     }
@@ -197,17 +221,17 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (isForceSet_ != false) {
+      if (extraDays_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(1, isForceSet_);
+          .computeUInt32Size(3, extraDays_);
       }
-      if (extraDays_ != 0) {
+      if (isForceSet_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, extraDays_);
+          .computeBoolSize(11, isForceSet_);
       }
       if (gameTime_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, gameTime_);
+          .computeUInt32Size(13, gameTime_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -226,10 +250,10 @@ public boolean equals(final java.lang.Object obj) {
 
       if (getIsForceSet()
           != other.getIsForceSet()) return false;
-      if (getGameTime()
-          != other.getGameTime()) return false;
       if (getExtraDays()
           != other.getExtraDays()) return false;
+      if (getGameTime()
+          != other.getGameTime()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -244,10 +268,10 @@ public int hashCode() {
       hash = (37 * hash) + IS_FORCE_SET_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsForceSet());
-      hash = (37 * hash) + GAME_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getGameTime();
       hash = (37 * hash) + EXTRA_DAYS_FIELD_NUMBER;
       hash = (53 * hash) + getExtraDays();
+      hash = (37 * hash) + GAME_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getGameTime();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -345,7 +369,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 23019
+     * CmdId: 25379
      * </pre>
      *
      * Protobuf type {@code ChangeGameTimeReq}
@@ -387,10 +411,10 @@ public Builder clear() {
         super.clear();
         isForceSet_ = false;
 
-        gameTime_ = 0;
-
         extraDays_ = 0;
 
+        gameTime_ = 0;
+
         return this;
       }
 
@@ -418,8 +442,8 @@ public emu.grasscutter.net.proto.ChangeGameTimeReqOuterClass.ChangeGameTimeReq b
       public emu.grasscutter.net.proto.ChangeGameTimeReqOuterClass.ChangeGameTimeReq buildPartial() {
         emu.grasscutter.net.proto.ChangeGameTimeReqOuterClass.ChangeGameTimeReq result = new emu.grasscutter.net.proto.ChangeGameTimeReqOuterClass.ChangeGameTimeReq(this);
         result.isForceSet_ = isForceSet_;
-        result.gameTime_ = gameTime_;
         result.extraDays_ = extraDays_;
+        result.gameTime_ = gameTime_;
         onBuilt();
         return result;
       }
@@ -471,12 +495,12 @@ public Builder mergeFrom(emu.grasscutter.net.proto.ChangeGameTimeReqOuterClass.C
         if (other.getIsForceSet() != false) {
           setIsForceSet(other.getIsForceSet());
         }
-        if (other.getGameTime() != 0) {
-          setGameTime(other.getGameTime());
-        }
         if (other.getExtraDays() != 0) {
           setExtraDays(other.getExtraDays());
         }
+        if (other.getGameTime() != 0) {
+          setGameTime(other.getGameTime());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -508,7 +532,11 @@ public Builder mergeFrom(
 
       private boolean isForceSet_ ;
       /**
-       * <code>bool is_force_set = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>bool is_force_set = 11;</code>
        * @return The isForceSet.
        */
       @java.lang.Override
@@ -516,7 +544,11 @@ public boolean getIsForceSet() {
         return isForceSet_;
       }
       /**
-       * <code>bool is_force_set = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>bool is_force_set = 11;</code>
        * @param value The isForceSet to set.
        * @return This builder for chaining.
        */
@@ -527,7 +559,11 @@ public Builder setIsForceSet(boolean value) {
         return this;
       }
       /**
-       * <code>bool is_force_set = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>bool is_force_set = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsForceSet() {
@@ -537,64 +573,88 @@ public Builder clearIsForceSet() {
         return this;
       }
 
-      private int gameTime_ ;
+      private int extraDays_ ;
       /**
-       * <code>uint32 game_time = 9;</code>
-       * @return The gameTime.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 extra_days = 3;</code>
+       * @return The extraDays.
        */
       @java.lang.Override
-      public int getGameTime() {
-        return gameTime_;
+      public int getExtraDays() {
+        return extraDays_;
       }
       /**
-       * <code>uint32 game_time = 9;</code>
-       * @param value The gameTime to set.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 extra_days = 3;</code>
+       * @param value The extraDays to set.
        * @return This builder for chaining.
        */
-      public Builder setGameTime(int value) {
+      public Builder setExtraDays(int value) {
         
-        gameTime_ = value;
+        extraDays_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 game_time = 9;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 extra_days = 3;</code>
        * @return This builder for chaining.
        */
-      public Builder clearGameTime() {
+      public Builder clearExtraDays() {
         
-        gameTime_ = 0;
+        extraDays_ = 0;
         onChanged();
         return this;
       }
 
-      private int extraDays_ ;
+      private int gameTime_ ;
       /**
-       * <code>uint32 extra_days = 2;</code>
-       * @return The extraDays.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 game_time = 13;</code>
+       * @return The gameTime.
        */
       @java.lang.Override
-      public int getExtraDays() {
-        return extraDays_;
+      public int getGameTime() {
+        return gameTime_;
       }
       /**
-       * <code>uint32 extra_days = 2;</code>
-       * @param value The extraDays to set.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 game_time = 13;</code>
+       * @param value The gameTime to set.
        * @return This builder for chaining.
        */
-      public Builder setExtraDays(int value) {
+      public Builder setGameTime(int value) {
         
-        extraDays_ = value;
+        gameTime_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 extra_days = 2;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 game_time = 13;</code>
        * @return This builder for chaining.
        */
-      public Builder clearExtraDays() {
+      public Builder clearGameTime() {
         
-        extraDays_ = 0;
+        gameTime_ = 0;
         onChanged();
         return this;
       }
@@ -666,8 +726,8 @@ public emu.grasscutter.net.proto.ChangeGameTimeReqOuterClass.ChangeGameTimeReq g
   static {
     java.lang.String[] descriptorData = {
       "\n\027ChangeGameTimeReq.proto\"P\n\021ChangeGameT" +
-      "imeReq\022\024\n\014is_force_set\030\001 \001(\010\022\021\n\tgame_tim" +
-      "e\030\t \001(\r\022\022\n\nextra_days\030\002 \001(\rB\033\n\031emu.grass" +
+      "imeReq\022\024\n\014is_force_set\030\013 \001(\010\022\022\n\nextra_da" +
+      "ys\030\003 \001(\r\022\021\n\tgame_time\030\r \001(\rB\033\n\031emu.grass" +
       "cutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -679,7 +739,7 @@ public emu.grasscutter.net.proto.ChangeGameTimeReqOuterClass.ChangeGameTimeReq g
     internal_static_ChangeGameTimeReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ChangeGameTimeReq_descriptor,
-        new java.lang.String[] { "IsForceSet", "GameTime", "ExtraDays", });
+        new java.lang.String[] { "IsForceSet", "ExtraDays", "GameTime", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ChangeGameTimeRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChangeGameTimeRspOuterClass.java
index e56a1f5c31a..99941e13ea3 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ChangeGameTimeRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ChangeGameTimeRspOuterClass.java
@@ -19,26 +19,38 @@ public interface ChangeGameTimeRspOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 5;</code>
-     * @return The retcode.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 cur_game_time = 3;</code>
+     * @return The curGameTime.
      */
-    int getRetcode();
+    int getCurGameTime();
 
     /**
-     * <code>uint32 cur_game_time = 12;</code>
-     * @return The curGameTime.
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>int32 retcode = 10;</code>
+     * @return The retcode.
      */
-    int getCurGameTime();
+    int getRetcode();
 
     /**
-     * <code>uint32 extra_days = 4;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 extra_days = 8;</code>
      * @return The extraDays.
      */
     int getExtraDays();
   }
   /**
    * <pre>
-   * CmdId: 274
+   * CmdId: 23828
    * </pre>
    *
    * Protobuf type {@code ChangeGameTimeRsp}
@@ -85,19 +97,19 @@ private ChangeGameTimeRsp(
             case 0:
               done = true;
               break;
-            case 32: {
+            case 24: {
 
-              extraDays_ = input.readUInt32();
+              curGameTime_ = input.readUInt32();
               break;
             }
-            case 40: {
+            case 64: {
 
-              retcode_ = input.readInt32();
+              extraDays_ = input.readUInt32();
               break;
             }
-            case 96: {
+            case 80: {
 
-              curGameTime_ = input.readUInt32();
+              retcode_ = input.readInt32();
               break;
             }
             default: {
@@ -132,32 +144,44 @@ private ChangeGameTimeRsp(
               emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.ChangeGameTimeRsp.class, emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.ChangeGameTimeRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 5;
-    private int retcode_;
+    public static final int CUR_GAME_TIME_FIELD_NUMBER = 3;
+    private int curGameTime_;
     /**
-     * <code>int32 retcode = 5;</code>
-     * @return The retcode.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 cur_game_time = 3;</code>
+     * @return The curGameTime.
      */
     @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
+    public int getCurGameTime() {
+      return curGameTime_;
     }
 
-    public static final int CUR_GAME_TIME_FIELD_NUMBER = 12;
-    private int curGameTime_;
+    public static final int RETCODE_FIELD_NUMBER = 10;
+    private int retcode_;
     /**
-     * <code>uint32 cur_game_time = 12;</code>
-     * @return The curGameTime.
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>int32 retcode = 10;</code>
+     * @return The retcode.
      */
     @java.lang.Override
-    public int getCurGameTime() {
-      return curGameTime_;
+    public int getRetcode() {
+      return retcode_;
     }
 
-    public static final int EXTRA_DAYS_FIELD_NUMBER = 4;
+    public static final int EXTRA_DAYS_FIELD_NUMBER = 8;
     private int extraDays_;
     /**
-     * <code>uint32 extra_days = 4;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 extra_days = 8;</code>
      * @return The extraDays.
      */
     @java.lang.Override
@@ -179,14 +203,14 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      if (curGameTime_ != 0) {
+        output.writeUInt32(3, curGameTime_);
+      }
       if (extraDays_ != 0) {
-        output.writeUInt32(4, extraDays_);
+        output.writeUInt32(8, extraDays_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(5, retcode_);
-      }
-      if (curGameTime_ != 0) {
-        output.writeUInt32(12, curGameTime_);
+        output.writeInt32(10, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -197,17 +221,17 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (extraDays_ != 0) {
+      if (curGameTime_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, extraDays_);
+          .computeUInt32Size(3, curGameTime_);
       }
-      if (retcode_ != 0) {
+      if (extraDays_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(5, retcode_);
+          .computeUInt32Size(8, extraDays_);
       }
-      if (curGameTime_ != 0) {
+      if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, curGameTime_);
+          .computeInt32Size(10, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -224,10 +248,10 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.ChangeGameTimeRsp other = (emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.ChangeGameTimeRsp) obj;
 
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (getCurGameTime()
           != other.getCurGameTime()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (getExtraDays()
           != other.getExtraDays()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -241,10 +265,10 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + CUR_GAME_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getCurGameTime();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + EXTRA_DAYS_FIELD_NUMBER;
       hash = (53 * hash) + getExtraDays();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -344,7 +368,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 274
+     * CmdId: 23828
      * </pre>
      *
      * Protobuf type {@code ChangeGameTimeRsp}
@@ -384,10 +408,10 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        retcode_ = 0;
-
         curGameTime_ = 0;
 
+        retcode_ = 0;
+
         extraDays_ = 0;
 
         return this;
@@ -416,8 +440,8 @@ public emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.ChangeGameTimeRsp b
       @java.lang.Override
       public emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.ChangeGameTimeRsp buildPartial() {
         emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.ChangeGameTimeRsp result = new emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.ChangeGameTimeRsp(this);
-        result.retcode_ = retcode_;
         result.curGameTime_ = curGameTime_;
+        result.retcode_ = retcode_;
         result.extraDays_ = extraDays_;
         onBuilt();
         return result;
@@ -467,12 +491,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.ChangeGameTimeRsp other) {
         if (other == emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.ChangeGameTimeRsp.getDefaultInstance()) return this;
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         if (other.getCurGameTime() != 0) {
           setCurGameTime(other.getCurGameTime());
         }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         if (other.getExtraDays() != 0) {
           setExtraDays(other.getExtraDays());
         }
@@ -505,71 +529,99 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int retcode_ ;
+      private int curGameTime_ ;
       /**
-       * <code>int32 retcode = 5;</code>
-       * @return The retcode.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 cur_game_time = 3;</code>
+       * @return The curGameTime.
        */
       @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
+      public int getCurGameTime() {
+        return curGameTime_;
       }
       /**
-       * <code>int32 retcode = 5;</code>
-       * @param value The retcode to set.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 cur_game_time = 3;</code>
+       * @param value The curGameTime to set.
        * @return This builder for chaining.
        */
-      public Builder setRetcode(int value) {
+      public Builder setCurGameTime(int value) {
         
-        retcode_ = value;
+        curGameTime_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>int32 retcode = 5;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 cur_game_time = 3;</code>
        * @return This builder for chaining.
        */
-      public Builder clearRetcode() {
+      public Builder clearCurGameTime() {
         
-        retcode_ = 0;
+        curGameTime_ = 0;
         onChanged();
         return this;
       }
 
-      private int curGameTime_ ;
+      private int retcode_ ;
       /**
-       * <code>uint32 cur_game_time = 12;</code>
-       * @return The curGameTime.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>int32 retcode = 10;</code>
+       * @return The retcode.
        */
       @java.lang.Override
-      public int getCurGameTime() {
-        return curGameTime_;
+      public int getRetcode() {
+        return retcode_;
       }
       /**
-       * <code>uint32 cur_game_time = 12;</code>
-       * @param value The curGameTime to set.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>int32 retcode = 10;</code>
+       * @param value The retcode to set.
        * @return This builder for chaining.
        */
-      public Builder setCurGameTime(int value) {
+      public Builder setRetcode(int value) {
         
-        curGameTime_ = value;
+        retcode_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 cur_game_time = 12;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>int32 retcode = 10;</code>
        * @return This builder for chaining.
        */
-      public Builder clearCurGameTime() {
+      public Builder clearRetcode() {
         
-        curGameTime_ = 0;
+        retcode_ = 0;
         onChanged();
         return this;
       }
 
       private int extraDays_ ;
       /**
-       * <code>uint32 extra_days = 4;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 extra_days = 8;</code>
        * @return The extraDays.
        */
       @java.lang.Override
@@ -577,7 +629,11 @@ public int getExtraDays() {
         return extraDays_;
       }
       /**
-       * <code>uint32 extra_days = 4;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 extra_days = 8;</code>
        * @param value The extraDays to set.
        * @return This builder for chaining.
        */
@@ -588,7 +644,11 @@ public Builder setExtraDays(int value) {
         return this;
       }
       /**
-       * <code>uint32 extra_days = 4;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 extra_days = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearExtraDays() {
@@ -665,8 +725,8 @@ public emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.ChangeGameTimeRsp g
   static {
     java.lang.String[] descriptorData = {
       "\n\027ChangeGameTimeRsp.proto\"O\n\021ChangeGameT" +
-      "imeRsp\022\017\n\007retcode\030\005 \001(\005\022\025\n\rcur_game_time" +
-      "\030\014 \001(\r\022\022\n\nextra_days\030\004 \001(\rB\033\n\031emu.grassc" +
+      "imeRsp\022\025\n\rcur_game_time\030\003 \001(\r\022\017\n\007retcode" +
+      "\030\n \001(\005\022\022\n\nextra_days\030\010 \001(\rB\033\n\031emu.grassc" +
       "utter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -678,7 +738,7 @@ public emu.grasscutter.net.proto.ChangeGameTimeRspOuterClass.ChangeGameTimeRsp g
     internal_static_ChangeGameTimeRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ChangeGameTimeRsp_descriptor,
-        new java.lang.String[] { "Retcode", "CurGameTime", "ExtraDays", });
+        new java.lang.String[] { "CurGameTime", "Retcode", "ExtraDays", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ChildQuestOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChildQuestOuterClass.java
index 3472db5af37..db23419ecae 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ChildQuestOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ChildQuestOuterClass.java
@@ -19,22 +19,34 @@ public interface ChildQuestOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 quest_config_id = 2;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 quest_config_id = 7;</code>
      * @return The questConfigId.
      */
     int getQuestConfigId();
 
     /**
-     * <code>uint32 quest_id = 11;</code>
-     * @return The questId.
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 state = 8;</code>
+     * @return The state.
      */
-    int getQuestId();
+    int getState();
 
     /**
-     * <code>uint32 state = 14;</code>
-     * @return The state.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 quest_id = 9;</code>
+     * @return The questId.
      */
-    int getState();
+    int getQuestId();
   }
   /**
    * Protobuf type {@code ChildQuest}
@@ -81,19 +93,19 @@ private ChildQuest(
             case 0:
               done = true;
               break;
-            case 16: {
+            case 56: {
 
               questConfigId_ = input.readUInt32();
               break;
             }
-            case 88: {
+            case 64: {
 
-              questId_ = input.readUInt32();
+              state_ = input.readUInt32();
               break;
             }
-            case 112: {
+            case 72: {
 
-              state_ = input.readUInt32();
+              questId_ = input.readUInt32();
               break;
             }
             default: {
@@ -128,10 +140,14 @@ private ChildQuest(
               emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.class, emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.Builder.class);
     }
 
-    public static final int QUEST_CONFIG_ID_FIELD_NUMBER = 2;
+    public static final int QUEST_CONFIG_ID_FIELD_NUMBER = 7;
     private int questConfigId_;
     /**
-     * <code>uint32 quest_config_id = 2;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 quest_config_id = 7;</code>
      * @return The questConfigId.
      */
     @java.lang.Override
@@ -139,26 +155,34 @@ public int getQuestConfigId() {
       return questConfigId_;
     }
 
-    public static final int QUEST_ID_FIELD_NUMBER = 11;
-    private int questId_;
+    public static final int STATE_FIELD_NUMBER = 8;
+    private int state_;
     /**
-     * <code>uint32 quest_id = 11;</code>
-     * @return The questId.
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 state = 8;</code>
+     * @return The state.
      */
     @java.lang.Override
-    public int getQuestId() {
-      return questId_;
+    public int getState() {
+      return state_;
     }
 
-    public static final int STATE_FIELD_NUMBER = 14;
-    private int state_;
+    public static final int QUEST_ID_FIELD_NUMBER = 9;
+    private int questId_;
     /**
-     * <code>uint32 state = 14;</code>
-     * @return The state.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 quest_id = 9;</code>
+     * @return The questId.
      */
     @java.lang.Override
-    public int getState() {
-      return state_;
+    public int getQuestId() {
+      return questId_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -176,13 +200,13 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (questConfigId_ != 0) {
-        output.writeUInt32(2, questConfigId_);
-      }
-      if (questId_ != 0) {
-        output.writeUInt32(11, questId_);
+        output.writeUInt32(7, questConfigId_);
       }
       if (state_ != 0) {
-        output.writeUInt32(14, state_);
+        output.writeUInt32(8, state_);
+      }
+      if (questId_ != 0) {
+        output.writeUInt32(9, questId_);
       }
       unknownFields.writeTo(output);
     }
@@ -195,15 +219,15 @@ public int getSerializedSize() {
       size = 0;
       if (questConfigId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, questConfigId_);
+          .computeUInt32Size(7, questConfigId_);
       }
-      if (questId_ != 0) {
+      if (state_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, questId_);
+          .computeUInt32Size(8, state_);
       }
-      if (state_ != 0) {
+      if (questId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, state_);
+          .computeUInt32Size(9, questId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -222,10 +246,10 @@ public boolean equals(final java.lang.Object obj) {
 
       if (getQuestConfigId()
           != other.getQuestConfigId()) return false;
-      if (getQuestId()
-          != other.getQuestId()) return false;
       if (getState()
           != other.getState()) return false;
+      if (getQuestId()
+          != other.getQuestId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -239,10 +263,10 @@ public int hashCode() {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + QUEST_CONFIG_ID_FIELD_NUMBER;
       hash = (53 * hash) + getQuestConfigId();
-      hash = (37 * hash) + QUEST_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getQuestId();
       hash = (37 * hash) + STATE_FIELD_NUMBER;
       hash = (53 * hash) + getState();
+      hash = (37 * hash) + QUEST_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getQuestId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -378,10 +402,10 @@ public Builder clear() {
         super.clear();
         questConfigId_ = 0;
 
-        questId_ = 0;
-
         state_ = 0;
 
+        questId_ = 0;
+
         return this;
       }
 
@@ -409,8 +433,8 @@ public emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest build() {
       public emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest buildPartial() {
         emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest result = new emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest(this);
         result.questConfigId_ = questConfigId_;
-        result.questId_ = questId_;
         result.state_ = state_;
+        result.questId_ = questId_;
         onBuilt();
         return result;
       }
@@ -462,12 +486,12 @@ public Builder mergeFrom(emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQue
         if (other.getQuestConfigId() != 0) {
           setQuestConfigId(other.getQuestConfigId());
         }
-        if (other.getQuestId() != 0) {
-          setQuestId(other.getQuestId());
-        }
         if (other.getState() != 0) {
           setState(other.getState());
         }
+        if (other.getQuestId() != 0) {
+          setQuestId(other.getQuestId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -499,7 +523,11 @@ public Builder mergeFrom(
 
       private int questConfigId_ ;
       /**
-       * <code>uint32 quest_config_id = 2;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 quest_config_id = 7;</code>
        * @return The questConfigId.
        */
       @java.lang.Override
@@ -507,7 +535,11 @@ public int getQuestConfigId() {
         return questConfigId_;
       }
       /**
-       * <code>uint32 quest_config_id = 2;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 quest_config_id = 7;</code>
        * @param value The questConfigId to set.
        * @return This builder for chaining.
        */
@@ -518,7 +550,11 @@ public Builder setQuestConfigId(int value) {
         return this;
       }
       /**
-       * <code>uint32 quest_config_id = 2;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 quest_config_id = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearQuestConfigId() {
@@ -528,64 +564,88 @@ public Builder clearQuestConfigId() {
         return this;
       }
 
-      private int questId_ ;
+      private int state_ ;
       /**
-       * <code>uint32 quest_id = 11;</code>
-       * @return The questId.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 state = 8;</code>
+       * @return The state.
        */
       @java.lang.Override
-      public int getQuestId() {
-        return questId_;
+      public int getState() {
+        return state_;
       }
       /**
-       * <code>uint32 quest_id = 11;</code>
-       * @param value The questId to set.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 state = 8;</code>
+       * @param value The state to set.
        * @return This builder for chaining.
        */
-      public Builder setQuestId(int value) {
+      public Builder setState(int value) {
         
-        questId_ = value;
+        state_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 quest_id = 11;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 state = 8;</code>
        * @return This builder for chaining.
        */
-      public Builder clearQuestId() {
+      public Builder clearState() {
         
-        questId_ = 0;
+        state_ = 0;
         onChanged();
         return this;
       }
 
-      private int state_ ;
+      private int questId_ ;
       /**
-       * <code>uint32 state = 14;</code>
-       * @return The state.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 quest_id = 9;</code>
+       * @return The questId.
        */
       @java.lang.Override
-      public int getState() {
-        return state_;
+      public int getQuestId() {
+        return questId_;
       }
       /**
-       * <code>uint32 state = 14;</code>
-       * @param value The state to set.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 quest_id = 9;</code>
+       * @param value The questId to set.
        * @return This builder for chaining.
        */
-      public Builder setState(int value) {
+      public Builder setQuestId(int value) {
         
-        state_ = value;
+        questId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 state = 14;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 quest_id = 9;</code>
        * @return This builder for chaining.
        */
-      public Builder clearState() {
+      public Builder clearQuestId() {
         
-        state_ = 0;
+        questId_ = 0;
         onChanged();
         return this;
       }
@@ -657,8 +717,8 @@ public emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest getDefaultInsta
   static {
     java.lang.String[] descriptorData = {
       "\n\020ChildQuest.proto\"F\n\nChildQuest\022\027\n\017ques" +
-      "t_config_id\030\002 \001(\r\022\020\n\010quest_id\030\013 \001(\r\022\r\n\005s" +
-      "tate\030\016 \001(\rB\033\n\031emu.grasscutter.net.protob" +
+      "t_config_id\030\007 \001(\r\022\r\n\005state\030\010 \001(\r\022\020\n\010ques" +
+      "t_id\030\t \001(\rB\033\n\031emu.grasscutter.net.protob" +
       "\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -670,7 +730,7 @@ public emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest getDefaultInsta
     internal_static_ChildQuest_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ChildQuest_descriptor,
-        new java.lang.String[] { "QuestConfigId", "QuestId", "State", });
+        new java.lang.String[] { "QuestConfigId", "State", "QuestId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CityInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CityInfoOuterClass.java
index 2c0e3d562d2..a689b095df9 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/CityInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/CityInfoOuterClass.java
@@ -19,19 +19,31 @@ public interface CityInfoOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 crystal_num = 13;</code>
-     * @return The crystalNum.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 city_id = 2;</code>
+     * @return The cityId.
      */
-    int getCrystalNum();
+    int getCityId();
 
     /**
-     * <code>uint32 city_id = 15;</code>
-     * @return The cityId.
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 crystal_num = 1;</code>
+     * @return The crystalNum.
      */
-    int getCityId();
+    int getCrystalNum();
 
     /**
-     * <code>uint32 level = 12;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 level = 8;</code>
      * @return The level.
      */
     int getLevel();
@@ -81,19 +93,19 @@ private CityInfo(
             case 0:
               done = true;
               break;
-            case 96: {
+            case 8: {
 
-              level_ = input.readUInt32();
+              crystalNum_ = input.readUInt32();
               break;
             }
-            case 104: {
+            case 16: {
 
-              crystalNum_ = input.readUInt32();
+              cityId_ = input.readUInt32();
               break;
             }
-            case 120: {
+            case 64: {
 
-              cityId_ = input.readUInt32();
+              level_ = input.readUInt32();
               break;
             }
             default: {
@@ -128,32 +140,44 @@ private CityInfo(
               emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.class, emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.Builder.class);
     }
 
-    public static final int CRYSTAL_NUM_FIELD_NUMBER = 13;
-    private int crystalNum_;
+    public static final int CITY_ID_FIELD_NUMBER = 2;
+    private int cityId_;
     /**
-     * <code>uint32 crystal_num = 13;</code>
-     * @return The crystalNum.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 city_id = 2;</code>
+     * @return The cityId.
      */
     @java.lang.Override
-    public int getCrystalNum() {
-      return crystalNum_;
+    public int getCityId() {
+      return cityId_;
     }
 
-    public static final int CITY_ID_FIELD_NUMBER = 15;
-    private int cityId_;
+    public static final int CRYSTAL_NUM_FIELD_NUMBER = 1;
+    private int crystalNum_;
     /**
-     * <code>uint32 city_id = 15;</code>
-     * @return The cityId.
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 crystal_num = 1;</code>
+     * @return The crystalNum.
      */
     @java.lang.Override
-    public int getCityId() {
-      return cityId_;
+    public int getCrystalNum() {
+      return crystalNum_;
     }
 
-    public static final int LEVEL_FIELD_NUMBER = 12;
+    public static final int LEVEL_FIELD_NUMBER = 8;
     private int level_;
     /**
-     * <code>uint32 level = 12;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 level = 8;</code>
      * @return The level.
      */
     @java.lang.Override
@@ -175,14 +199,14 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (level_ != 0) {
-        output.writeUInt32(12, level_);
-      }
       if (crystalNum_ != 0) {
-        output.writeUInt32(13, crystalNum_);
+        output.writeUInt32(1, crystalNum_);
       }
       if (cityId_ != 0) {
-        output.writeUInt32(15, cityId_);
+        output.writeUInt32(2, cityId_);
+      }
+      if (level_ != 0) {
+        output.writeUInt32(8, level_);
       }
       unknownFields.writeTo(output);
     }
@@ -193,17 +217,17 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (level_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, level_);
-      }
       if (crystalNum_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, crystalNum_);
+          .computeUInt32Size(1, crystalNum_);
       }
       if (cityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, cityId_);
+          .computeUInt32Size(2, cityId_);
+      }
+      if (level_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(8, level_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -220,10 +244,10 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo other = (emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo) obj;
 
-      if (getCrystalNum()
-          != other.getCrystalNum()) return false;
       if (getCityId()
           != other.getCityId()) return false;
+      if (getCrystalNum()
+          != other.getCrystalNum()) return false;
       if (getLevel()
           != other.getLevel()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -237,10 +261,10 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + CRYSTAL_NUM_FIELD_NUMBER;
-      hash = (53 * hash) + getCrystalNum();
       hash = (37 * hash) + CITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getCityId();
+      hash = (37 * hash) + CRYSTAL_NUM_FIELD_NUMBER;
+      hash = (53 * hash) + getCrystalNum();
       hash = (37 * hash) + LEVEL_FIELD_NUMBER;
       hash = (53 * hash) + getLevel();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -376,10 +400,10 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        crystalNum_ = 0;
-
         cityId_ = 0;
 
+        crystalNum_ = 0;
+
         level_ = 0;
 
         return this;
@@ -408,8 +432,8 @@ public emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo build() {
       @java.lang.Override
       public emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo buildPartial() {
         emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo result = new emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo(this);
-        result.crystalNum_ = crystalNum_;
         result.cityId_ = cityId_;
+        result.crystalNum_ = crystalNum_;
         result.level_ = level_;
         onBuilt();
         return result;
@@ -459,12 +483,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo other) {
         if (other == emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.getDefaultInstance()) return this;
-        if (other.getCrystalNum() != 0) {
-          setCrystalNum(other.getCrystalNum());
-        }
         if (other.getCityId() != 0) {
           setCityId(other.getCityId());
         }
+        if (other.getCrystalNum() != 0) {
+          setCrystalNum(other.getCrystalNum());
+        }
         if (other.getLevel() != 0) {
           setLevel(other.getLevel());
         }
@@ -497,71 +521,99 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int crystalNum_ ;
+      private int cityId_ ;
       /**
-       * <code>uint32 crystal_num = 13;</code>
-       * @return The crystalNum.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 city_id = 2;</code>
+       * @return The cityId.
        */
       @java.lang.Override
-      public int getCrystalNum() {
-        return crystalNum_;
+      public int getCityId() {
+        return cityId_;
       }
       /**
-       * <code>uint32 crystal_num = 13;</code>
-       * @param value The crystalNum to set.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 city_id = 2;</code>
+       * @param value The cityId to set.
        * @return This builder for chaining.
        */
-      public Builder setCrystalNum(int value) {
+      public Builder setCityId(int value) {
         
-        crystalNum_ = value;
+        cityId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 crystal_num = 13;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 city_id = 2;</code>
        * @return This builder for chaining.
        */
-      public Builder clearCrystalNum() {
+      public Builder clearCityId() {
         
-        crystalNum_ = 0;
+        cityId_ = 0;
         onChanged();
         return this;
       }
 
-      private int cityId_ ;
+      private int crystalNum_ ;
       /**
-       * <code>uint32 city_id = 15;</code>
-       * @return The cityId.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 crystal_num = 1;</code>
+       * @return The crystalNum.
        */
       @java.lang.Override
-      public int getCityId() {
-        return cityId_;
+      public int getCrystalNum() {
+        return crystalNum_;
       }
       /**
-       * <code>uint32 city_id = 15;</code>
-       * @param value The cityId to set.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 crystal_num = 1;</code>
+       * @param value The crystalNum to set.
        * @return This builder for chaining.
        */
-      public Builder setCityId(int value) {
+      public Builder setCrystalNum(int value) {
         
-        cityId_ = value;
+        crystalNum_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 city_id = 15;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 crystal_num = 1;</code>
        * @return This builder for chaining.
        */
-      public Builder clearCityId() {
+      public Builder clearCrystalNum() {
         
-        cityId_ = 0;
+        crystalNum_ = 0;
         onChanged();
         return this;
       }
 
       private int level_ ;
       /**
-       * <code>uint32 level = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 level = 8;</code>
        * @return The level.
        */
       @java.lang.Override
@@ -569,7 +621,11 @@ public int getLevel() {
         return level_;
       }
       /**
-       * <code>uint32 level = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 level = 8;</code>
        * @param value The level to set.
        * @return This builder for chaining.
        */
@@ -580,7 +636,11 @@ public Builder setLevel(int value) {
         return this;
       }
       /**
-       * <code>uint32 level = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 level = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearLevel() {
@@ -656,8 +716,8 @@ public emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo getDefaultInstanceF
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\016CityInfo.proto\"?\n\010CityInfo\022\023\n\013crystal_" +
-      "num\030\r \001(\r\022\017\n\007city_id\030\017 \001(\r\022\r\n\005level\030\014 \001(" +
+      "\n\016CityInfo.proto\"?\n\010CityInfo\022\017\n\007city_id\030" +
+      "\002 \001(\r\022\023\n\013crystal_num\030\001 \001(\r\022\r\n\005level\030\010 \001(" +
       "\rB\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -669,7 +729,7 @@ public emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo getDefaultInstanceF
     internal_static_CityInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_CityInfo_descriptor,
-        new java.lang.String[] { "CrystalNum", "CityId", "Level", });
+        new java.lang.String[] { "CityId", "CrystalNum", "Level", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ClientAbilityChangeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ClientAbilityChangeNotifyOuterClass.java
index efc6f2dfe56..7c79f32f621 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ClientAbilityChangeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ClientAbilityChangeNotifyOuterClass.java
@@ -19,44 +19,72 @@ public interface ClientAbilityChangeNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 entity_id = 1;</code>
-     * @return The entityId.
-     */
-    int getEntityId();
-
-    /**
-     * <code>repeated .AbilityInvokeEntry invokes = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
      */
     java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> 
         getInvokesList();
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
      */
     emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvokes(int index);
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
      */
     int getInvokesCount();
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder> 
         getInvokesOrBuilderList();
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
      */
     emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokesOrBuilder(
         int index);
 
     /**
-     * <code>bool is_init_hash = 4;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>bool is_init_hash = 12;</code>
      * @return The isInitHash.
      */
     boolean getIsInitHash();
+
+    /**
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>uint32 entity_id = 10;</code>
+     * @return The entityId.
+     */
+    int getEntityId();
   }
   /**
    * <pre>
-   * CmdId: 27339
+   * CmdId: 8119
    * </pre>
    *
    * Protobuf type {@code ClientAbilityChangeNotify}
@@ -105,12 +133,17 @@ private ClientAbilityChangeNotify(
             case 0:
               done = true;
               break;
-            case 8: {
+            case 80: {
 
               entityId_ = input.readUInt32();
               break;
             }
-            case 26: {
+            case 96: {
+
+              isInitHash_ = input.readBool();
+              break;
+            }
+            case 122: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 invokes_ = new java.util.ArrayList<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry>();
                 mutable_bitField0_ |= 0x00000001;
@@ -119,11 +152,6 @@ private ClientAbilityChangeNotify(
                   input.readMessage(emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.parser(), extensionRegistry));
               break;
             }
-            case 32: {
-
-              isInitHash_ = input.readBool();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -159,28 +187,25 @@ private ClientAbilityChangeNotify(
               emu.grasscutter.net.proto.ClientAbilityChangeNotifyOuterClass.ClientAbilityChangeNotify.class, emu.grasscutter.net.proto.ClientAbilityChangeNotifyOuterClass.ClientAbilityChangeNotify.Builder.class);
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 1;
-    private int entityId_;
-    /**
-     * <code>uint32 entity_id = 1;</code>
-     * @return The entityId.
-     */
-    @java.lang.Override
-    public int getEntityId() {
-      return entityId_;
-    }
-
-    public static final int INVOKES_FIELD_NUMBER = 3;
+    public static final int INVOKES_FIELD_NUMBER = 15;
     private java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> invokes_;
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> getInvokesList() {
       return invokes_;
     }
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder> 
@@ -188,21 +213,33 @@ public java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.Abi
       return invokes_;
     }
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
      */
     @java.lang.Override
     public int getInvokesCount() {
       return invokes_.size();
     }
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvokes(int index) {
       return invokes_.get(index);
     }
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokesOrBuilder(
@@ -210,10 +247,14 @@ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry
       return invokes_.get(index);
     }
 
-    public static final int IS_INIT_HASH_FIELD_NUMBER = 4;
+    public static final int IS_INIT_HASH_FIELD_NUMBER = 12;
     private boolean isInitHash_;
     /**
-     * <code>bool is_init_hash = 4;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>bool is_init_hash = 12;</code>
      * @return The isInitHash.
      */
     @java.lang.Override
@@ -221,6 +262,21 @@ public boolean getIsInitHash() {
       return isInitHash_;
     }
 
+    public static final int ENTITY_ID_FIELD_NUMBER = 10;
+    private int entityId_;
+    /**
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>uint32 entity_id = 10;</code>
+     * @return The entityId.
+     */
+    @java.lang.Override
+    public int getEntityId() {
+      return entityId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -236,13 +292,13 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (entityId_ != 0) {
-        output.writeUInt32(1, entityId_);
-      }
-      for (int i = 0; i < invokes_.size(); i++) {
-        output.writeMessage(3, invokes_.get(i));
+        output.writeUInt32(10, entityId_);
       }
       if (isInitHash_ != false) {
-        output.writeBool(4, isInitHash_);
+        output.writeBool(12, isInitHash_);
+      }
+      for (int i = 0; i < invokes_.size(); i++) {
+        output.writeMessage(15, invokes_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -255,15 +311,15 @@ public int getSerializedSize() {
       size = 0;
       if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, entityId_);
+          .computeUInt32Size(10, entityId_);
       }
-      for (int i = 0; i < invokes_.size(); i++) {
+      if (isInitHash_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, invokes_.get(i));
+          .computeBoolSize(12, isInitHash_);
       }
-      if (isInitHash_ != false) {
+      for (int i = 0; i < invokes_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(4, isInitHash_);
+          .computeMessageSize(15, invokes_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -280,12 +336,12 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.ClientAbilityChangeNotifyOuterClass.ClientAbilityChangeNotify other = (emu.grasscutter.net.proto.ClientAbilityChangeNotifyOuterClass.ClientAbilityChangeNotify) obj;
 
-      if (getEntityId()
-          != other.getEntityId()) return false;
       if (!getInvokesList()
           .equals(other.getInvokesList())) return false;
       if (getIsInitHash()
           != other.getIsInitHash()) return false;
+      if (getEntityId()
+          != other.getEntityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -297,8 +353,6 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getEntityId();
       if (getInvokesCount() > 0) {
         hash = (37 * hash) + INVOKES_FIELD_NUMBER;
         hash = (53 * hash) + getInvokesList().hashCode();
@@ -306,6 +360,8 @@ public int hashCode() {
       hash = (37 * hash) + IS_INIT_HASH_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsInitHash());
+      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getEntityId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -403,7 +459,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 27339
+     * CmdId: 8119
      * </pre>
      *
      * Protobuf type {@code ClientAbilityChangeNotify}
@@ -444,8 +500,6 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        entityId_ = 0;
-
         if (invokesBuilder_ == null) {
           invokes_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
@@ -454,6 +508,8 @@ public Builder clear() {
         }
         isInitHash_ = false;
 
+        entityId_ = 0;
+
         return this;
       }
 
@@ -481,7 +537,6 @@ public emu.grasscutter.net.proto.ClientAbilityChangeNotifyOuterClass.ClientAbili
       public emu.grasscutter.net.proto.ClientAbilityChangeNotifyOuterClass.ClientAbilityChangeNotify buildPartial() {
         emu.grasscutter.net.proto.ClientAbilityChangeNotifyOuterClass.ClientAbilityChangeNotify result = new emu.grasscutter.net.proto.ClientAbilityChangeNotifyOuterClass.ClientAbilityChangeNotify(this);
         int from_bitField0_ = bitField0_;
-        result.entityId_ = entityId_;
         if (invokesBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             invokes_ = java.util.Collections.unmodifiableList(invokes_);
@@ -492,6 +547,7 @@ public emu.grasscutter.net.proto.ClientAbilityChangeNotifyOuterClass.ClientAbili
           result.invokes_ = invokesBuilder_.build();
         }
         result.isInitHash_ = isInitHash_;
+        result.entityId_ = entityId_;
         onBuilt();
         return result;
       }
@@ -540,9 +596,6 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ClientAbilityChangeNotifyOuterClass.ClientAbilityChangeNotify other) {
         if (other == emu.grasscutter.net.proto.ClientAbilityChangeNotifyOuterClass.ClientAbilityChangeNotify.getDefaultInstance()) return this;
-        if (other.getEntityId() != 0) {
-          setEntityId(other.getEntityId());
-        }
         if (invokesBuilder_ == null) {
           if (!other.invokes_.isEmpty()) {
             if (invokes_.isEmpty()) {
@@ -572,6 +625,9 @@ public Builder mergeFrom(emu.grasscutter.net.proto.ClientAbilityChangeNotifyOute
         if (other.getIsInitHash() != false) {
           setIsInitHash(other.getIsInitHash());
         }
+        if (other.getEntityId() != 0) {
+          setEntityId(other.getEntityId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -602,37 +658,6 @@ public Builder mergeFrom(
       }
       private int bitField0_;
 
-      private int entityId_ ;
-      /**
-       * <code>uint32 entity_id = 1;</code>
-       * @return The entityId.
-       */
-      @java.lang.Override
-      public int getEntityId() {
-        return entityId_;
-      }
-      /**
-       * <code>uint32 entity_id = 1;</code>
-       * @param value The entityId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEntityId(int value) {
-        
-        entityId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 entity_id = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEntityId() {
-        
-        entityId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> invokes_ =
         java.util.Collections.emptyList();
       private void ensureInvokesIsMutable() {
@@ -646,7 +671,11 @@ private void ensureInvokesIsMutable() {
           emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder> invokesBuilder_;
 
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> getInvokesList() {
         if (invokesBuilder_ == null) {
@@ -656,7 +685,11 @@ public java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.Abi
         }
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
        */
       public int getInvokesCount() {
         if (invokesBuilder_ == null) {
@@ -666,7 +699,11 @@ public int getInvokesCount() {
         }
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvokes(int index) {
         if (invokesBuilder_ == null) {
@@ -676,7 +713,11 @@ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry
         }
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
        */
       public Builder setInvokes(
           int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry value) {
@@ -693,7 +734,11 @@ public Builder setInvokes(
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
        */
       public Builder setInvokes(
           int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder builderForValue) {
@@ -707,7 +752,11 @@ public Builder setInvokes(
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
        */
       public Builder addInvokes(emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry value) {
         if (invokesBuilder_ == null) {
@@ -723,7 +772,11 @@ public Builder addInvokes(emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
        */
       public Builder addInvokes(
           int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry value) {
@@ -740,7 +793,11 @@ public Builder addInvokes(
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
        */
       public Builder addInvokes(
           emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder builderForValue) {
@@ -754,7 +811,11 @@ public Builder addInvokes(
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
        */
       public Builder addInvokes(
           int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder builderForValue) {
@@ -768,7 +829,11 @@ public Builder addInvokes(
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
        */
       public Builder addAllInvokes(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> values) {
@@ -783,7 +848,11 @@ public Builder addAllInvokes(
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
        */
       public Builder clearInvokes() {
         if (invokesBuilder_ == null) {
@@ -796,7 +865,11 @@ public Builder clearInvokes() {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
        */
       public Builder removeInvokes(int index) {
         if (invokesBuilder_ == null) {
@@ -809,14 +882,22 @@ public Builder removeInvokes(int index) {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder getInvokesBuilder(
           int index) {
         return getInvokesFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokesOrBuilder(
           int index) {
@@ -826,7 +907,11 @@ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry
         }
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder> 
            getInvokesOrBuilderList() {
@@ -837,14 +922,22 @@ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry
         }
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder addInvokesBuilder() {
         return getInvokesFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.getDefaultInstance());
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder addInvokesBuilder(
           int index) {
@@ -852,7 +945,11 @@ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry
             index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.getDefaultInstance());
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder> 
            getInvokesBuilderList() {
@@ -875,7 +972,11 @@ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry
 
       private boolean isInitHash_ ;
       /**
-       * <code>bool is_init_hash = 4;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>bool is_init_hash = 12;</code>
        * @return The isInitHash.
        */
       @java.lang.Override
@@ -883,7 +984,11 @@ public boolean getIsInitHash() {
         return isInitHash_;
       }
       /**
-       * <code>bool is_init_hash = 4;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>bool is_init_hash = 12;</code>
        * @param value The isInitHash to set.
        * @return This builder for chaining.
        */
@@ -894,7 +999,11 @@ public Builder setIsInitHash(boolean value) {
         return this;
       }
       /**
-       * <code>bool is_init_hash = 4;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>bool is_init_hash = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsInitHash() {
@@ -903,6 +1012,49 @@ public Builder clearIsInitHash() {
         onChanged();
         return this;
       }
+
+      private int entityId_ ;
+      /**
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 entity_id = 10;</code>
+       * @return The entityId.
+       */
+      @java.lang.Override
+      public int getEntityId() {
+        return entityId_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 entity_id = 10;</code>
+       * @param value The entityId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setEntityId(int value) {
+        
+        entityId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 entity_id = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEntityId() {
+        
+        entityId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -972,9 +1124,9 @@ public emu.grasscutter.net.proto.ClientAbilityChangeNotifyOuterClass.ClientAbili
     java.lang.String[] descriptorData = {
       "\n\037ClientAbilityChangeNotify.proto\032\030Abili" +
       "tyInvokeEntry.proto\"j\n\031ClientAbilityChan" +
-      "geNotify\022\021\n\tentity_id\030\001 \001(\r\022$\n\007invokes\030\003" +
-      " \003(\0132\023.AbilityInvokeEntry\022\024\n\014is_init_has" +
-      "h\030\004 \001(\010B\033\n\031emu.grasscutter.net.protob\006pr" +
+      "geNotify\022$\n\007invokes\030\017 \003(\0132\023.AbilityInvok" +
+      "eEntry\022\024\n\014is_init_hash\030\014 \001(\010\022\021\n\tentity_i" +
+      "d\030\n \001(\rB\033\n\031emu.grasscutter.net.protob\006pr" +
       "oto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -987,7 +1139,7 @@ public emu.grasscutter.net.proto.ClientAbilityChangeNotifyOuterClass.ClientAbili
     internal_static_ClientAbilityChangeNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ClientAbilityChangeNotify_descriptor,
-        new java.lang.String[] { "EntityId", "Invokes", "IsInitHash", });
+        new java.lang.String[] { "Invokes", "IsInitHash", "EntityId", });
     emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ClientAbilityInitFinishNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ClientAbilityInitFinishNotifyOuterClass.java
index 50bd4ce42b8..0f1434dc20c 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ClientAbilityInitFinishNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ClientAbilityInitFinishNotifyOuterClass.java
@@ -19,38 +19,62 @@ public interface ClientAbilityInitFinishNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 entity_id = 4;</code>
-     * @return The entityId.
-     */
-    int getEntityId();
-
-    /**
-     * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
      */
     java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> 
         getInvokesList();
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
      */
     emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvokes(int index);
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
      */
     int getInvokesCount();
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder> 
         getInvokesOrBuilderList();
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
      */
     emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokesOrBuilder(
         int index);
+
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 entity_id = 4;</code>
+     * @return The entityId.
+     */
+    int getEntityId();
   }
   /**
    * <pre>
-   * CmdId: 28413
+   * CmdId: 22991
    * </pre>
    *
    * Protobuf type {@code ClientAbilityInitFinishNotify}
@@ -104,7 +128,7 @@ private ClientAbilityInitFinishNotify(
               entityId_ = input.readUInt32();
               break;
             }
-            case 50: {
+            case 122: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 invokes_ = new java.util.ArrayList<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry>();
                 mutable_bitField0_ |= 0x00000001;
@@ -148,28 +172,25 @@ private ClientAbilityInitFinishNotify(
               emu.grasscutter.net.proto.ClientAbilityInitFinishNotifyOuterClass.ClientAbilityInitFinishNotify.class, emu.grasscutter.net.proto.ClientAbilityInitFinishNotifyOuterClass.ClientAbilityInitFinishNotify.Builder.class);
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 4;
-    private int entityId_;
-    /**
-     * <code>uint32 entity_id = 4;</code>
-     * @return The entityId.
-     */
-    @java.lang.Override
-    public int getEntityId() {
-      return entityId_;
-    }
-
-    public static final int INVOKES_FIELD_NUMBER = 6;
+    public static final int INVOKES_FIELD_NUMBER = 15;
     private java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> invokes_;
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> getInvokesList() {
       return invokes_;
     }
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder> 
@@ -177,21 +198,33 @@ public java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.Abi
       return invokes_;
     }
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
      */
     @java.lang.Override
     public int getInvokesCount() {
       return invokes_.size();
     }
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvokes(int index) {
       return invokes_.get(index);
     }
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokesOrBuilder(
@@ -199,6 +232,21 @@ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry
       return invokes_.get(index);
     }
 
+    public static final int ENTITY_ID_FIELD_NUMBER = 4;
+    private int entityId_;
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 entity_id = 4;</code>
+     * @return The entityId.
+     */
+    @java.lang.Override
+    public int getEntityId() {
+      return entityId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -217,7 +265,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
         output.writeUInt32(4, entityId_);
       }
       for (int i = 0; i < invokes_.size(); i++) {
-        output.writeMessage(6, invokes_.get(i));
+        output.writeMessage(15, invokes_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -234,7 +282,7 @@ public int getSerializedSize() {
       }
       for (int i = 0; i < invokes_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, invokes_.get(i));
+          .computeMessageSize(15, invokes_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -251,10 +299,10 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.ClientAbilityInitFinishNotifyOuterClass.ClientAbilityInitFinishNotify other = (emu.grasscutter.net.proto.ClientAbilityInitFinishNotifyOuterClass.ClientAbilityInitFinishNotify) obj;
 
-      if (getEntityId()
-          != other.getEntityId()) return false;
       if (!getInvokesList()
           .equals(other.getInvokesList())) return false;
+      if (getEntityId()
+          != other.getEntityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -266,12 +314,12 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getEntityId();
       if (getInvokesCount() > 0) {
         hash = (37 * hash) + INVOKES_FIELD_NUMBER;
         hash = (53 * hash) + getInvokesList().hashCode();
       }
+      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getEntityId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -369,7 +417,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 28413
+     * CmdId: 22991
      * </pre>
      *
      * Protobuf type {@code ClientAbilityInitFinishNotify}
@@ -410,14 +458,14 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        entityId_ = 0;
-
         if (invokesBuilder_ == null) {
           invokes_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           invokesBuilder_.clear();
         }
+        entityId_ = 0;
+
         return this;
       }
 
@@ -445,7 +493,6 @@ public emu.grasscutter.net.proto.ClientAbilityInitFinishNotifyOuterClass.ClientA
       public emu.grasscutter.net.proto.ClientAbilityInitFinishNotifyOuterClass.ClientAbilityInitFinishNotify buildPartial() {
         emu.grasscutter.net.proto.ClientAbilityInitFinishNotifyOuterClass.ClientAbilityInitFinishNotify result = new emu.grasscutter.net.proto.ClientAbilityInitFinishNotifyOuterClass.ClientAbilityInitFinishNotify(this);
         int from_bitField0_ = bitField0_;
-        result.entityId_ = entityId_;
         if (invokesBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             invokes_ = java.util.Collections.unmodifiableList(invokes_);
@@ -455,6 +502,7 @@ public emu.grasscutter.net.proto.ClientAbilityInitFinishNotifyOuterClass.ClientA
         } else {
           result.invokes_ = invokesBuilder_.build();
         }
+        result.entityId_ = entityId_;
         onBuilt();
         return result;
       }
@@ -503,9 +551,6 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ClientAbilityInitFinishNotifyOuterClass.ClientAbilityInitFinishNotify other) {
         if (other == emu.grasscutter.net.proto.ClientAbilityInitFinishNotifyOuterClass.ClientAbilityInitFinishNotify.getDefaultInstance()) return this;
-        if (other.getEntityId() != 0) {
-          setEntityId(other.getEntityId());
-        }
         if (invokesBuilder_ == null) {
           if (!other.invokes_.isEmpty()) {
             if (invokes_.isEmpty()) {
@@ -532,6 +577,9 @@ public Builder mergeFrom(emu.grasscutter.net.proto.ClientAbilityInitFinishNotify
             }
           }
         }
+        if (other.getEntityId() != 0) {
+          setEntityId(other.getEntityId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -562,37 +610,6 @@ public Builder mergeFrom(
       }
       private int bitField0_;
 
-      private int entityId_ ;
-      /**
-       * <code>uint32 entity_id = 4;</code>
-       * @return The entityId.
-       */
-      @java.lang.Override
-      public int getEntityId() {
-        return entityId_;
-      }
-      /**
-       * <code>uint32 entity_id = 4;</code>
-       * @param value The entityId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEntityId(int value) {
-        
-        entityId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 entity_id = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEntityId() {
-        
-        entityId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> invokes_ =
         java.util.Collections.emptyList();
       private void ensureInvokesIsMutable() {
@@ -606,7 +623,11 @@ private void ensureInvokesIsMutable() {
           emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder> invokesBuilder_;
 
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> getInvokesList() {
         if (invokesBuilder_ == null) {
@@ -616,7 +637,11 @@ public java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.Abi
         }
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
        */
       public int getInvokesCount() {
         if (invokesBuilder_ == null) {
@@ -626,7 +651,11 @@ public int getInvokesCount() {
         }
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvokes(int index) {
         if (invokesBuilder_ == null) {
@@ -636,7 +665,11 @@ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry
         }
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
        */
       public Builder setInvokes(
           int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry value) {
@@ -653,7 +686,11 @@ public Builder setInvokes(
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
        */
       public Builder setInvokes(
           int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder builderForValue) {
@@ -667,7 +704,11 @@ public Builder setInvokes(
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
        */
       public Builder addInvokes(emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry value) {
         if (invokesBuilder_ == null) {
@@ -683,7 +724,11 @@ public Builder addInvokes(emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
        */
       public Builder addInvokes(
           int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry value) {
@@ -700,7 +745,11 @@ public Builder addInvokes(
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
        */
       public Builder addInvokes(
           emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder builderForValue) {
@@ -714,7 +763,11 @@ public Builder addInvokes(
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
        */
       public Builder addInvokes(
           int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder builderForValue) {
@@ -728,7 +781,11 @@ public Builder addInvokes(
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
        */
       public Builder addAllInvokes(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> values) {
@@ -743,7 +800,11 @@ public Builder addAllInvokes(
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
        */
       public Builder clearInvokes() {
         if (invokesBuilder_ == null) {
@@ -756,7 +817,11 @@ public Builder clearInvokes() {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
        */
       public Builder removeInvokes(int index) {
         if (invokesBuilder_ == null) {
@@ -769,14 +834,22 @@ public Builder removeInvokes(int index) {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder getInvokesBuilder(
           int index) {
         return getInvokesFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokesOrBuilder(
           int index) {
@@ -786,7 +859,11 @@ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry
         }
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder> 
            getInvokesOrBuilderList() {
@@ -797,14 +874,22 @@ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry
         }
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder addInvokesBuilder() {
         return getInvokesFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.getDefaultInstance());
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder addInvokesBuilder(
           int index) {
@@ -812,7 +897,11 @@ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry
             index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.getDefaultInstance());
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder> 
            getInvokesBuilderList() {
@@ -832,6 +921,49 @@ public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry
         }
         return invokesBuilder_;
       }
+
+      private int entityId_ ;
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 entity_id = 4;</code>
+       * @return The entityId.
+       */
+      @java.lang.Override
+      public int getEntityId() {
+        return entityId_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 entity_id = 4;</code>
+       * @param value The entityId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setEntityId(int value) {
+        
+        entityId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 entity_id = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEntityId() {
+        
+        entityId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -901,8 +1033,8 @@ public emu.grasscutter.net.proto.ClientAbilityInitFinishNotifyOuterClass.ClientA
     java.lang.String[] descriptorData = {
       "\n#ClientAbilityInitFinishNotify.proto\032\030A" +
       "bilityInvokeEntry.proto\"X\n\035ClientAbility" +
-      "InitFinishNotify\022\021\n\tentity_id\030\004 \001(\r\022$\n\007i" +
-      "nvokes\030\006 \003(\0132\023.AbilityInvokeEntryB\033\n\031emu" +
+      "InitFinishNotify\022$\n\007invokes\030\017 \003(\0132\023.Abil" +
+      "ityInvokeEntry\022\021\n\tentity_id\030\004 \001(\rB\033\n\031emu" +
       ".grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -915,7 +1047,7 @@ public emu.grasscutter.net.proto.ClientAbilityInitFinishNotifyOuterClass.ClientA
     internal_static_ClientAbilityInitFinishNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ClientAbilityInitFinishNotify_descriptor,
-        new java.lang.String[] { "EntityId", "Invokes", });
+        new java.lang.String[] { "Invokes", "EntityId", });
     emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CombatInvocationsNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CombatInvocationsNotifyOuterClass.java
index d8ddc310b11..61b553baeb6 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/CombatInvocationsNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/CombatInvocationsNotifyOuterClass.java
@@ -19,32 +19,52 @@ public interface CombatInvocationsNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .CombatInvokeEntry invoke_list = 10;</code>
      */
     java.util.List<emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry> 
         getInvokeListList();
     /**
-     * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .CombatInvokeEntry invoke_list = 10;</code>
      */
     emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry getInvokeList(int index);
     /**
-     * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .CombatInvokeEntry invoke_list = 10;</code>
      */
     int getInvokeListCount();
     /**
-     * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .CombatInvokeEntry invoke_list = 10;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntryOrBuilder> 
         getInvokeListOrBuilderList();
     /**
-     * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .CombatInvokeEntry invoke_list = 10;</code>
      */
     emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntryOrBuilder getInvokeListOrBuilder(
         int index);
   }
   /**
    * <pre>
-   * CmdId: 5253
+   * CmdId: 5355
    * </pre>
    *
    * Protobuf type {@code CombatInvocationsNotify}
@@ -93,7 +113,7 @@ private CombatInvocationsNotify(
             case 0:
               done = true;
               break;
-            case 10: {
+            case 82: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 invokeList_ = new java.util.ArrayList<emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry>();
                 mutable_bitField0_ |= 0x00000001;
@@ -137,17 +157,25 @@ private CombatInvocationsNotify(
               emu.grasscutter.net.proto.CombatInvocationsNotifyOuterClass.CombatInvocationsNotify.class, emu.grasscutter.net.proto.CombatInvocationsNotifyOuterClass.CombatInvocationsNotify.Builder.class);
     }
 
-    public static final int INVOKE_LIST_FIELD_NUMBER = 1;
+    public static final int INVOKE_LIST_FIELD_NUMBER = 10;
     private java.util.List<emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry> invokeList_;
     /**
-     * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .CombatInvokeEntry invoke_list = 10;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry> getInvokeListList() {
       return invokeList_;
     }
     /**
-     * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .CombatInvokeEntry invoke_list = 10;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntryOrBuilder> 
@@ -155,21 +183,33 @@ public java.util.List<emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.Comb
       return invokeList_;
     }
     /**
-     * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .CombatInvokeEntry invoke_list = 10;</code>
      */
     @java.lang.Override
     public int getInvokeListCount() {
       return invokeList_.size();
     }
     /**
-     * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .CombatInvokeEntry invoke_list = 10;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry getInvokeList(int index) {
       return invokeList_.get(index);
     }
     /**
-     * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .CombatInvokeEntry invoke_list = 10;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntryOrBuilder getInvokeListOrBuilder(
@@ -192,7 +232,7 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < invokeList_.size(); i++) {
-        output.writeMessage(1, invokeList_.get(i));
+        output.writeMessage(10, invokeList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -205,7 +245,7 @@ public int getSerializedSize() {
       size = 0;
       for (int i = 0; i < invokeList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, invokeList_.get(i));
+          .computeMessageSize(10, invokeList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -336,7 +376,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 5253
+     * CmdId: 5355
      * </pre>
      *
      * Protobuf type {@code CombatInvocationsNotify}
@@ -536,7 +576,11 @@ private void ensureInvokeListIsMutable() {
           emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry, emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry.Builder, emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntryOrBuilder> invokeListBuilder_;
 
       /**
-       * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .CombatInvokeEntry invoke_list = 10;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry> getInvokeListList() {
         if (invokeListBuilder_ == null) {
@@ -546,7 +590,11 @@ public java.util.List<emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.Comb
         }
       }
       /**
-       * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .CombatInvokeEntry invoke_list = 10;</code>
        */
       public int getInvokeListCount() {
         if (invokeListBuilder_ == null) {
@@ -556,7 +604,11 @@ public int getInvokeListCount() {
         }
       }
       /**
-       * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .CombatInvokeEntry invoke_list = 10;</code>
        */
       public emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry getInvokeList(int index) {
         if (invokeListBuilder_ == null) {
@@ -566,7 +618,11 @@ public emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry g
         }
       }
       /**
-       * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .CombatInvokeEntry invoke_list = 10;</code>
        */
       public Builder setInvokeList(
           int index, emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry value) {
@@ -583,7 +639,11 @@ public Builder setInvokeList(
         return this;
       }
       /**
-       * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .CombatInvokeEntry invoke_list = 10;</code>
        */
       public Builder setInvokeList(
           int index, emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry.Builder builderForValue) {
@@ -597,7 +657,11 @@ public Builder setInvokeList(
         return this;
       }
       /**
-       * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .CombatInvokeEntry invoke_list = 10;</code>
        */
       public Builder addInvokeList(emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry value) {
         if (invokeListBuilder_ == null) {
@@ -613,7 +677,11 @@ public Builder addInvokeList(emu.grasscutter.net.proto.CombatInvokeEntryOuterCla
         return this;
       }
       /**
-       * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .CombatInvokeEntry invoke_list = 10;</code>
        */
       public Builder addInvokeList(
           int index, emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry value) {
@@ -630,7 +698,11 @@ public Builder addInvokeList(
         return this;
       }
       /**
-       * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .CombatInvokeEntry invoke_list = 10;</code>
        */
       public Builder addInvokeList(
           emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry.Builder builderForValue) {
@@ -644,7 +716,11 @@ public Builder addInvokeList(
         return this;
       }
       /**
-       * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .CombatInvokeEntry invoke_list = 10;</code>
        */
       public Builder addInvokeList(
           int index, emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry.Builder builderForValue) {
@@ -658,7 +734,11 @@ public Builder addInvokeList(
         return this;
       }
       /**
-       * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .CombatInvokeEntry invoke_list = 10;</code>
        */
       public Builder addAllInvokeList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry> values) {
@@ -673,7 +753,11 @@ public Builder addAllInvokeList(
         return this;
       }
       /**
-       * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .CombatInvokeEntry invoke_list = 10;</code>
        */
       public Builder clearInvokeList() {
         if (invokeListBuilder_ == null) {
@@ -686,7 +770,11 @@ public Builder clearInvokeList() {
         return this;
       }
       /**
-       * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .CombatInvokeEntry invoke_list = 10;</code>
        */
       public Builder removeInvokeList(int index) {
         if (invokeListBuilder_ == null) {
@@ -699,14 +787,22 @@ public Builder removeInvokeList(int index) {
         return this;
       }
       /**
-       * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .CombatInvokeEntry invoke_list = 10;</code>
        */
       public emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry.Builder getInvokeListBuilder(
           int index) {
         return getInvokeListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .CombatInvokeEntry invoke_list = 10;</code>
        */
       public emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntryOrBuilder getInvokeListOrBuilder(
           int index) {
@@ -716,7 +812,11 @@ public emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntryOr
         }
       }
       /**
-       * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .CombatInvokeEntry invoke_list = 10;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntryOrBuilder> 
            getInvokeListOrBuilderList() {
@@ -727,14 +827,22 @@ public emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntryOr
         }
       }
       /**
-       * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .CombatInvokeEntry invoke_list = 10;</code>
        */
       public emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry.Builder addInvokeListBuilder() {
         return getInvokeListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry.getDefaultInstance());
       }
       /**
-       * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .CombatInvokeEntry invoke_list = 10;</code>
        */
       public emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry.Builder addInvokeListBuilder(
           int index) {
@@ -742,7 +850,11 @@ public emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry.B
             index, emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry.getDefaultInstance());
       }
       /**
-       * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .CombatInvokeEntry invoke_list = 10;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry.Builder> 
            getInvokeListBuilderList() {
@@ -831,7 +943,7 @@ public emu.grasscutter.net.proto.CombatInvocationsNotifyOuterClass.CombatInvocat
     java.lang.String[] descriptorData = {
       "\n\035CombatInvocationsNotify.proto\032\027CombatI" +
       "nvokeEntry.proto\"B\n\027CombatInvocationsNot" +
-      "ify\022\'\n\013invoke_list\030\001 \003(\0132\022.CombatInvokeE" +
+      "ify\022\'\n\013invoke_list\030\n \003(\0132\022.CombatInvokeE" +
       "ntryB\033\n\031emu.grasscutter.net.protob\006proto" +
       "3"
     };
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EnterSceneDoneReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EnterSceneDoneReqOuterClass.java
index 6d9799f70e7..a2d710caac0 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EnterSceneDoneReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EnterSceneDoneReqOuterClass.java
@@ -19,14 +19,18 @@ public interface EnterSceneDoneReqOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 enter_scene_token = 4;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 enter_scene_token = 5;</code>
      * @return The enterSceneToken.
      */
     int getEnterSceneToken();
   }
   /**
    * <pre>
-   * CmdId: 26406
+   * CmdId: 7223
    * </pre>
    *
    * Protobuf type {@code EnterSceneDoneReq}
@@ -73,7 +77,7 @@ private EnterSceneDoneReq(
             case 0:
               done = true;
               break;
-            case 32: {
+            case 40: {
 
               enterSceneToken_ = input.readUInt32();
               break;
@@ -110,10 +114,14 @@ private EnterSceneDoneReq(
               emu.grasscutter.net.proto.EnterSceneDoneReqOuterClass.EnterSceneDoneReq.class, emu.grasscutter.net.proto.EnterSceneDoneReqOuterClass.EnterSceneDoneReq.Builder.class);
     }
 
-    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 4;
+    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 5;
     private int enterSceneToken_;
     /**
-     * <code>uint32 enter_scene_token = 4;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 enter_scene_token = 5;</code>
      * @return The enterSceneToken.
      */
     @java.lang.Override
@@ -136,7 +144,7 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (enterSceneToken_ != 0) {
-        output.writeUInt32(4, enterSceneToken_);
+        output.writeUInt32(5, enterSceneToken_);
       }
       unknownFields.writeTo(output);
     }
@@ -149,7 +157,7 @@ public int getSerializedSize() {
       size = 0;
       if (enterSceneToken_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, enterSceneToken_);
+          .computeUInt32Size(5, enterSceneToken_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,7 +286,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 26406
+     * CmdId: 7223
      * </pre>
      *
      * Protobuf type {@code EnterSceneDoneReq}
@@ -429,7 +437,11 @@ public Builder mergeFrom(
 
       private int enterSceneToken_ ;
       /**
-       * <code>uint32 enter_scene_token = 4;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 enter_scene_token = 5;</code>
        * @return The enterSceneToken.
        */
       @java.lang.Override
@@ -437,7 +449,11 @@ public int getEnterSceneToken() {
         return enterSceneToken_;
       }
       /**
-       * <code>uint32 enter_scene_token = 4;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 enter_scene_token = 5;</code>
        * @param value The enterSceneToken to set.
        * @return This builder for chaining.
        */
@@ -448,7 +464,11 @@ public Builder setEnterSceneToken(int value) {
         return this;
       }
       /**
-       * <code>uint32 enter_scene_token = 4;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 enter_scene_token = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearEnterSceneToken() {
@@ -525,7 +545,7 @@ public emu.grasscutter.net.proto.EnterSceneDoneReqOuterClass.EnterSceneDoneReq g
   static {
     java.lang.String[] descriptorData = {
       "\n\027EnterSceneDoneReq.proto\".\n\021EnterSceneD" +
-      "oneReq\022\031\n\021enter_scene_token\030\004 \001(\rB\033\n\031emu" +
+      "oneReq\022\031\n\021enter_scene_token\030\005 \001(\rB\033\n\031emu" +
       ".grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EnterSceneDoneRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EnterSceneDoneRspOuterClass.java
index 530a17f1899..9578597308f 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EnterSceneDoneRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EnterSceneDoneRspOuterClass.java
@@ -23,24 +23,24 @@ public interface EnterSceneDoneRspOrBuilder extends
      * Offset: 0x20
      * </pre>
      *
-     * <code>int32 retcode = 14;</code>
-     * @return The retcode.
+     * <code>uint32 enter_scene_token = 1;</code>
+     * @return The enterSceneToken.
      */
-    int getRetcode();
+    int getEnterSceneToken();
 
     /**
      * <pre>
      * Offset: 0x24
      * </pre>
      *
-     * <code>uint32 enter_scene_token = 2;</code>
-     * @return The enterSceneToken.
+     * <code>int32 retcode = 11;</code>
+     * @return The retcode.
      */
-    int getEnterSceneToken();
+    int getRetcode();
   }
   /**
    * <pre>
-   * CmdId: 3918
+   * CmdId: 2896
    * </pre>
    *
    * Protobuf type {@code EnterSceneDoneRsp}
@@ -87,12 +87,12 @@ private EnterSceneDoneRsp(
             case 0:
               done = true;
               break;
-            case 16: {
+            case 8: {
 
               enterSceneToken_ = input.readUInt32();
               break;
             }
-            case 112: {
+            case 88: {
 
               retcode_ = input.readInt32();
               break;
@@ -129,34 +129,34 @@ private EnterSceneDoneRsp(
               emu.grasscutter.net.proto.EnterSceneDoneRspOuterClass.EnterSceneDoneRsp.class, emu.grasscutter.net.proto.EnterSceneDoneRspOuterClass.EnterSceneDoneRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 14;
-    private int retcode_;
+    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 1;
+    private int enterSceneToken_;
     /**
      * <pre>
      * Offset: 0x20
      * </pre>
      *
-     * <code>int32 retcode = 14;</code>
-     * @return The retcode.
+     * <code>uint32 enter_scene_token = 1;</code>
+     * @return The enterSceneToken.
      */
     @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
+    public int getEnterSceneToken() {
+      return enterSceneToken_;
     }
 
-    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 2;
-    private int enterSceneToken_;
+    public static final int RETCODE_FIELD_NUMBER = 11;
+    private int retcode_;
     /**
      * <pre>
      * Offset: 0x24
      * </pre>
      *
-     * <code>uint32 enter_scene_token = 2;</code>
-     * @return The enterSceneToken.
+     * <code>int32 retcode = 11;</code>
+     * @return The retcode.
      */
     @java.lang.Override
-    public int getEnterSceneToken() {
-      return enterSceneToken_;
+    public int getRetcode() {
+      return retcode_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -174,10 +174,10 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (enterSceneToken_ != 0) {
-        output.writeUInt32(2, enterSceneToken_);
+        output.writeUInt32(1, enterSceneToken_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(14, retcode_);
+        output.writeInt32(11, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -190,11 +190,11 @@ public int getSerializedSize() {
       size = 0;
       if (enterSceneToken_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, enterSceneToken_);
+          .computeUInt32Size(1, enterSceneToken_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(14, retcode_);
+          .computeInt32Size(11, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -211,10 +211,10 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.EnterSceneDoneRspOuterClass.EnterSceneDoneRsp other = (emu.grasscutter.net.proto.EnterSceneDoneRspOuterClass.EnterSceneDoneRsp) obj;
 
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (getEnterSceneToken()
           != other.getEnterSceneToken()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -226,10 +226,10 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + ENTER_SCENE_TOKEN_FIELD_NUMBER;
       hash = (53 * hash) + getEnterSceneToken();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -327,7 +327,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 3918
+     * CmdId: 2896
      * </pre>
      *
      * Protobuf type {@code EnterSceneDoneRsp}
@@ -367,10 +367,10 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        retcode_ = 0;
-
         enterSceneToken_ = 0;
 
+        retcode_ = 0;
+
         return this;
       }
 
@@ -397,8 +397,8 @@ public emu.grasscutter.net.proto.EnterSceneDoneRspOuterClass.EnterSceneDoneRsp b
       @java.lang.Override
       public emu.grasscutter.net.proto.EnterSceneDoneRspOuterClass.EnterSceneDoneRsp buildPartial() {
         emu.grasscutter.net.proto.EnterSceneDoneRspOuterClass.EnterSceneDoneRsp result = new emu.grasscutter.net.proto.EnterSceneDoneRspOuterClass.EnterSceneDoneRsp(this);
-        result.retcode_ = retcode_;
         result.enterSceneToken_ = enterSceneToken_;
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -447,12 +447,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.EnterSceneDoneRspOuterClass.EnterSceneDoneRsp other) {
         if (other == emu.grasscutter.net.proto.EnterSceneDoneRspOuterClass.EnterSceneDoneRsp.getDefaultInstance()) return this;
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         if (other.getEnterSceneToken() != 0) {
           setEnterSceneToken(other.getEnterSceneToken());
         }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -482,31 +482,31 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int retcode_ ;
+      private int enterSceneToken_ ;
       /**
        * <pre>
        * Offset: 0x20
        * </pre>
        *
-       * <code>int32 retcode = 14;</code>
-       * @return The retcode.
+       * <code>uint32 enter_scene_token = 1;</code>
+       * @return The enterSceneToken.
        */
       @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
+      public int getEnterSceneToken() {
+        return enterSceneToken_;
       }
       /**
        * <pre>
        * Offset: 0x20
        * </pre>
        *
-       * <code>int32 retcode = 14;</code>
-       * @param value The retcode to set.
+       * <code>uint32 enter_scene_token = 1;</code>
+       * @param value The enterSceneToken to set.
        * @return This builder for chaining.
        */
-      public Builder setRetcode(int value) {
+      public Builder setEnterSceneToken(int value) {
         
-        retcode_ = value;
+        enterSceneToken_ = value;
         onChanged();
         return this;
       }
@@ -515,41 +515,41 @@ public Builder setRetcode(int value) {
        * Offset: 0x20
        * </pre>
        *
-       * <code>int32 retcode = 14;</code>
+       * <code>uint32 enter_scene_token = 1;</code>
        * @return This builder for chaining.
        */
-      public Builder clearRetcode() {
+      public Builder clearEnterSceneToken() {
         
-        retcode_ = 0;
+        enterSceneToken_ = 0;
         onChanged();
         return this;
       }
 
-      private int enterSceneToken_ ;
+      private int retcode_ ;
       /**
        * <pre>
        * Offset: 0x24
        * </pre>
        *
-       * <code>uint32 enter_scene_token = 2;</code>
-       * @return The enterSceneToken.
+       * <code>int32 retcode = 11;</code>
+       * @return The retcode.
        */
       @java.lang.Override
-      public int getEnterSceneToken() {
-        return enterSceneToken_;
+      public int getRetcode() {
+        return retcode_;
       }
       /**
        * <pre>
        * Offset: 0x24
        * </pre>
        *
-       * <code>uint32 enter_scene_token = 2;</code>
-       * @param value The enterSceneToken to set.
+       * <code>int32 retcode = 11;</code>
+       * @param value The retcode to set.
        * @return This builder for chaining.
        */
-      public Builder setEnterSceneToken(int value) {
+      public Builder setRetcode(int value) {
         
-        enterSceneToken_ = value;
+        retcode_ = value;
         onChanged();
         return this;
       }
@@ -558,12 +558,12 @@ public Builder setEnterSceneToken(int value) {
        * Offset: 0x24
        * </pre>
        *
-       * <code>uint32 enter_scene_token = 2;</code>
+       * <code>int32 retcode = 11;</code>
        * @return This builder for chaining.
        */
-      public Builder clearEnterSceneToken() {
+      public Builder clearRetcode() {
         
-        enterSceneToken_ = 0;
+        retcode_ = 0;
         onChanged();
         return this;
       }
@@ -635,8 +635,8 @@ public emu.grasscutter.net.proto.EnterSceneDoneRspOuterClass.EnterSceneDoneRsp g
   static {
     java.lang.String[] descriptorData = {
       "\n\027EnterSceneDoneRsp.proto\"?\n\021EnterSceneD" +
-      "oneRsp\022\017\n\007retcode\030\016 \001(\005\022\031\n\021enter_scene_t" +
-      "oken\030\002 \001(\rB\033\n\031emu.grasscutter.net.protob" +
+      "oneRsp\022\031\n\021enter_scene_token\030\001 \001(\r\022\017\n\007ret" +
+      "code\030\013 \001(\005B\033\n\031emu.grasscutter.net.protob" +
       "\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -648,7 +648,7 @@ public emu.grasscutter.net.proto.EnterSceneDoneRspOuterClass.EnterSceneDoneRsp g
     internal_static_EnterSceneDoneRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EnterSceneDoneRsp_descriptor,
-        new java.lang.String[] { "Retcode", "EnterSceneToken", });
+        new java.lang.String[] { "EnterSceneToken", "Retcode", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EnterScenePeerNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EnterScenePeerNotifyOuterClass.java
index 6e9634ea946..430c2c841d3 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EnterScenePeerNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EnterScenePeerNotifyOuterClass.java
@@ -19,32 +19,48 @@ public interface EnterScenePeerNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 enter_scene_token = 12;</code>
-     * @return The enterSceneToken.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 peer_id = 1;</code>
+     * @return The peerId.
      */
-    int getEnterSceneToken();
+    int getPeerId();
 
     /**
-     * <code>uint32 dest_scene_id = 13;</code>
-     * @return The destSceneId.
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 host_peer_id = 14;</code>
+     * @return The hostPeerId.
      */
-    int getDestSceneId();
+    int getHostPeerId();
 
     /**
-     * <code>uint32 peer_id = 1;</code>
-     * @return The peerId.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 dest_scene_id = 11;</code>
+     * @return The destSceneId.
      */
-    int getPeerId();
+    int getDestSceneId();
 
     /**
-     * <code>uint32 host_peer_id = 15;</code>
-     * @return The hostPeerId.
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>uint32 enter_scene_token = 10;</code>
+     * @return The enterSceneToken.
      */
-    int getHostPeerId();
+    int getEnterSceneToken();
   }
   /**
    * <pre>
-   * CmdId: 502
+   * CmdId: 26301
    * </pre>
    *
    * Protobuf type {@code EnterScenePeerNotify}
@@ -96,17 +112,17 @@ private EnterScenePeerNotify(
               peerId_ = input.readUInt32();
               break;
             }
-            case 96: {
+            case 80: {
 
               enterSceneToken_ = input.readUInt32();
               break;
             }
-            case 104: {
+            case 88: {
 
               destSceneId_ = input.readUInt32();
               break;
             }
-            case 120: {
+            case 112: {
 
               hostPeerId_ = input.readUInt32();
               break;
@@ -143,31 +159,13 @@ private EnterScenePeerNotify(
               emu.grasscutter.net.proto.EnterScenePeerNotifyOuterClass.EnterScenePeerNotify.class, emu.grasscutter.net.proto.EnterScenePeerNotifyOuterClass.EnterScenePeerNotify.Builder.class);
     }
 
-    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 12;
-    private int enterSceneToken_;
-    /**
-     * <code>uint32 enter_scene_token = 12;</code>
-     * @return The enterSceneToken.
-     */
-    @java.lang.Override
-    public int getEnterSceneToken() {
-      return enterSceneToken_;
-    }
-
-    public static final int DEST_SCENE_ID_FIELD_NUMBER = 13;
-    private int destSceneId_;
-    /**
-     * <code>uint32 dest_scene_id = 13;</code>
-     * @return The destSceneId.
-     */
-    @java.lang.Override
-    public int getDestSceneId() {
-      return destSceneId_;
-    }
-
     public static final int PEER_ID_FIELD_NUMBER = 1;
     private int peerId_;
     /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
      * <code>uint32 peer_id = 1;</code>
      * @return The peerId.
      */
@@ -176,10 +174,14 @@ public int getPeerId() {
       return peerId_;
     }
 
-    public static final int HOST_PEER_ID_FIELD_NUMBER = 15;
+    public static final int HOST_PEER_ID_FIELD_NUMBER = 14;
     private int hostPeerId_;
     /**
-     * <code>uint32 host_peer_id = 15;</code>
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 host_peer_id = 14;</code>
      * @return The hostPeerId.
      */
     @java.lang.Override
@@ -187,6 +189,36 @@ public int getHostPeerId() {
       return hostPeerId_;
     }
 
+    public static final int DEST_SCENE_ID_FIELD_NUMBER = 11;
+    private int destSceneId_;
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 dest_scene_id = 11;</code>
+     * @return The destSceneId.
+     */
+    @java.lang.Override
+    public int getDestSceneId() {
+      return destSceneId_;
+    }
+
+    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 10;
+    private int enterSceneToken_;
+    /**
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>uint32 enter_scene_token = 10;</code>
+     * @return The enterSceneToken.
+     */
+    @java.lang.Override
+    public int getEnterSceneToken() {
+      return enterSceneToken_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -205,13 +237,13 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
         output.writeUInt32(1, peerId_);
       }
       if (enterSceneToken_ != 0) {
-        output.writeUInt32(12, enterSceneToken_);
+        output.writeUInt32(10, enterSceneToken_);
       }
       if (destSceneId_ != 0) {
-        output.writeUInt32(13, destSceneId_);
+        output.writeUInt32(11, destSceneId_);
       }
       if (hostPeerId_ != 0) {
-        output.writeUInt32(15, hostPeerId_);
+        output.writeUInt32(14, hostPeerId_);
       }
       unknownFields.writeTo(output);
     }
@@ -228,15 +260,15 @@ public int getSerializedSize() {
       }
       if (enterSceneToken_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, enterSceneToken_);
+          .computeUInt32Size(10, enterSceneToken_);
       }
       if (destSceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, destSceneId_);
+          .computeUInt32Size(11, destSceneId_);
       }
       if (hostPeerId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, hostPeerId_);
+          .computeUInt32Size(14, hostPeerId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -253,14 +285,14 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.EnterScenePeerNotifyOuterClass.EnterScenePeerNotify other = (emu.grasscutter.net.proto.EnterScenePeerNotifyOuterClass.EnterScenePeerNotify) obj;
 
-      if (getEnterSceneToken()
-          != other.getEnterSceneToken()) return false;
-      if (getDestSceneId()
-          != other.getDestSceneId()) return false;
       if (getPeerId()
           != other.getPeerId()) return false;
       if (getHostPeerId()
           != other.getHostPeerId()) return false;
+      if (getDestSceneId()
+          != other.getDestSceneId()) return false;
+      if (getEnterSceneToken()
+          != other.getEnterSceneToken()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -272,14 +304,14 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + ENTER_SCENE_TOKEN_FIELD_NUMBER;
-      hash = (53 * hash) + getEnterSceneToken();
-      hash = (37 * hash) + DEST_SCENE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getDestSceneId();
       hash = (37 * hash) + PEER_ID_FIELD_NUMBER;
       hash = (53 * hash) + getPeerId();
       hash = (37 * hash) + HOST_PEER_ID_FIELD_NUMBER;
       hash = (53 * hash) + getHostPeerId();
+      hash = (37 * hash) + DEST_SCENE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getDestSceneId();
+      hash = (37 * hash) + ENTER_SCENE_TOKEN_FIELD_NUMBER;
+      hash = (53 * hash) + getEnterSceneToken();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -377,7 +409,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 502
+     * CmdId: 26301
      * </pre>
      *
      * Protobuf type {@code EnterScenePeerNotify}
@@ -417,14 +449,14 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        enterSceneToken_ = 0;
-
-        destSceneId_ = 0;
-
         peerId_ = 0;
 
         hostPeerId_ = 0;
 
+        destSceneId_ = 0;
+
+        enterSceneToken_ = 0;
+
         return this;
       }
 
@@ -451,10 +483,10 @@ public emu.grasscutter.net.proto.EnterScenePeerNotifyOuterClass.EnterScenePeerNo
       @java.lang.Override
       public emu.grasscutter.net.proto.EnterScenePeerNotifyOuterClass.EnterScenePeerNotify buildPartial() {
         emu.grasscutter.net.proto.EnterScenePeerNotifyOuterClass.EnterScenePeerNotify result = new emu.grasscutter.net.proto.EnterScenePeerNotifyOuterClass.EnterScenePeerNotify(this);
-        result.enterSceneToken_ = enterSceneToken_;
-        result.destSceneId_ = destSceneId_;
         result.peerId_ = peerId_;
         result.hostPeerId_ = hostPeerId_;
+        result.destSceneId_ = destSceneId_;
+        result.enterSceneToken_ = enterSceneToken_;
         onBuilt();
         return result;
       }
@@ -503,18 +535,18 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.EnterScenePeerNotifyOuterClass.EnterScenePeerNotify other) {
         if (other == emu.grasscutter.net.proto.EnterScenePeerNotifyOuterClass.EnterScenePeerNotify.getDefaultInstance()) return this;
-        if (other.getEnterSceneToken() != 0) {
-          setEnterSceneToken(other.getEnterSceneToken());
-        }
-        if (other.getDestSceneId() != 0) {
-          setDestSceneId(other.getDestSceneId());
-        }
         if (other.getPeerId() != 0) {
           setPeerId(other.getPeerId());
         }
         if (other.getHostPeerId() != 0) {
           setHostPeerId(other.getHostPeerId());
         }
+        if (other.getDestSceneId() != 0) {
+          setDestSceneId(other.getDestSceneId());
+        }
+        if (other.getEnterSceneToken() != 0) {
+          setEnterSceneToken(other.getEnterSceneToken());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -544,126 +576,174 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int enterSceneToken_ ;
+      private int peerId_ ;
       /**
-       * <code>uint32 enter_scene_token = 12;</code>
-       * @return The enterSceneToken.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 peer_id = 1;</code>
+       * @return The peerId.
        */
       @java.lang.Override
-      public int getEnterSceneToken() {
-        return enterSceneToken_;
+      public int getPeerId() {
+        return peerId_;
       }
       /**
-       * <code>uint32 enter_scene_token = 12;</code>
-       * @param value The enterSceneToken to set.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 peer_id = 1;</code>
+       * @param value The peerId to set.
        * @return This builder for chaining.
        */
-      public Builder setEnterSceneToken(int value) {
+      public Builder setPeerId(int value) {
         
-        enterSceneToken_ = value;
+        peerId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 enter_scene_token = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 peer_id = 1;</code>
        * @return This builder for chaining.
        */
-      public Builder clearEnterSceneToken() {
+      public Builder clearPeerId() {
         
-        enterSceneToken_ = 0;
+        peerId_ = 0;
         onChanged();
         return this;
       }
 
-      private int destSceneId_ ;
+      private int hostPeerId_ ;
       /**
-       * <code>uint32 dest_scene_id = 13;</code>
-       * @return The destSceneId.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 host_peer_id = 14;</code>
+       * @return The hostPeerId.
        */
       @java.lang.Override
-      public int getDestSceneId() {
-        return destSceneId_;
+      public int getHostPeerId() {
+        return hostPeerId_;
       }
       /**
-       * <code>uint32 dest_scene_id = 13;</code>
-       * @param value The destSceneId to set.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 host_peer_id = 14;</code>
+       * @param value The hostPeerId to set.
        * @return This builder for chaining.
        */
-      public Builder setDestSceneId(int value) {
+      public Builder setHostPeerId(int value) {
         
-        destSceneId_ = value;
+        hostPeerId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 dest_scene_id = 13;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 host_peer_id = 14;</code>
        * @return This builder for chaining.
        */
-      public Builder clearDestSceneId() {
+      public Builder clearHostPeerId() {
         
-        destSceneId_ = 0;
+        hostPeerId_ = 0;
         onChanged();
         return this;
       }
 
-      private int peerId_ ;
+      private int destSceneId_ ;
       /**
-       * <code>uint32 peer_id = 1;</code>
-       * @return The peerId.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 dest_scene_id = 11;</code>
+       * @return The destSceneId.
        */
       @java.lang.Override
-      public int getPeerId() {
-        return peerId_;
+      public int getDestSceneId() {
+        return destSceneId_;
       }
       /**
-       * <code>uint32 peer_id = 1;</code>
-       * @param value The peerId to set.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 dest_scene_id = 11;</code>
+       * @param value The destSceneId to set.
        * @return This builder for chaining.
        */
-      public Builder setPeerId(int value) {
+      public Builder setDestSceneId(int value) {
         
-        peerId_ = value;
+        destSceneId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 peer_id = 1;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 dest_scene_id = 11;</code>
        * @return This builder for chaining.
        */
-      public Builder clearPeerId() {
+      public Builder clearDestSceneId() {
         
-        peerId_ = 0;
+        destSceneId_ = 0;
         onChanged();
         return this;
       }
 
-      private int hostPeerId_ ;
+      private int enterSceneToken_ ;
       /**
-       * <code>uint32 host_peer_id = 15;</code>
-       * @return The hostPeerId.
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 enter_scene_token = 10;</code>
+       * @return The enterSceneToken.
        */
       @java.lang.Override
-      public int getHostPeerId() {
-        return hostPeerId_;
+      public int getEnterSceneToken() {
+        return enterSceneToken_;
       }
       /**
-       * <code>uint32 host_peer_id = 15;</code>
-       * @param value The hostPeerId to set.
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 enter_scene_token = 10;</code>
+       * @param value The enterSceneToken to set.
        * @return This builder for chaining.
        */
-      public Builder setHostPeerId(int value) {
+      public Builder setEnterSceneToken(int value) {
         
-        hostPeerId_ = value;
+        enterSceneToken_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 host_peer_id = 15;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 enter_scene_token = 10;</code>
        * @return This builder for chaining.
        */
-      public Builder clearHostPeerId() {
+      public Builder clearEnterSceneToken() {
         
-        hostPeerId_ = 0;
+        enterSceneToken_ = 0;
         onChanged();
         return this;
       }
@@ -735,9 +815,9 @@ public emu.grasscutter.net.proto.EnterScenePeerNotifyOuterClass.EnterScenePeerNo
   static {
     java.lang.String[] descriptorData = {
       "\n\032EnterScenePeerNotify.proto\"o\n\024EnterSce" +
-      "nePeerNotify\022\031\n\021enter_scene_token\030\014 \001(\r\022" +
-      "\025\n\rdest_scene_id\030\r \001(\r\022\017\n\007peer_id\030\001 \001(\r\022" +
-      "\024\n\014host_peer_id\030\017 \001(\rB\033\n\031emu.grasscutter" +
+      "nePeerNotify\022\017\n\007peer_id\030\001 \001(\r\022\024\n\014host_pe" +
+      "er_id\030\016 \001(\r\022\025\n\rdest_scene_id\030\013 \001(\r\022\031\n\021en" +
+      "ter_scene_token\030\n \001(\rB\033\n\031emu.grasscutter" +
       ".net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -749,7 +829,7 @@ public emu.grasscutter.net.proto.EnterScenePeerNotifyOuterClass.EnterScenePeerNo
     internal_static_EnterScenePeerNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EnterScenePeerNotify_descriptor,
-        new java.lang.String[] { "EnterSceneToken", "DestSceneId", "PeerId", "HostPeerId", });
+        new java.lang.String[] { "PeerId", "HostPeerId", "DestSceneId", "EnterSceneToken", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EnterSceneReadyReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EnterSceneReadyReqOuterClass.java
index 1d2f89d6c9c..3c1fd28935c 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EnterSceneReadyReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EnterSceneReadyReqOuterClass.java
@@ -19,14 +19,18 @@ public interface EnterSceneReadyReqOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 enter_scene_token = 5;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 enter_scene_token = 11;</code>
      * @return The enterSceneToken.
      */
     int getEnterSceneToken();
   }
   /**
    * <pre>
-   * CmdId: 23920
+   * CmdId: 6733
    * </pre>
    *
    * Protobuf type {@code EnterSceneReadyReq}
@@ -73,7 +77,7 @@ private EnterSceneReadyReq(
             case 0:
               done = true;
               break;
-            case 40: {
+            case 88: {
 
               enterSceneToken_ = input.readUInt32();
               break;
@@ -110,10 +114,14 @@ private EnterSceneReadyReq(
               emu.grasscutter.net.proto.EnterSceneReadyReqOuterClass.EnterSceneReadyReq.class, emu.grasscutter.net.proto.EnterSceneReadyReqOuterClass.EnterSceneReadyReq.Builder.class);
     }
 
-    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 5;
+    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 11;
     private int enterSceneToken_;
     /**
-     * <code>uint32 enter_scene_token = 5;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 enter_scene_token = 11;</code>
      * @return The enterSceneToken.
      */
     @java.lang.Override
@@ -136,7 +144,7 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (enterSceneToken_ != 0) {
-        output.writeUInt32(5, enterSceneToken_);
+        output.writeUInt32(11, enterSceneToken_);
       }
       unknownFields.writeTo(output);
     }
@@ -149,7 +157,7 @@ public int getSerializedSize() {
       size = 0;
       if (enterSceneToken_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, enterSceneToken_);
+          .computeUInt32Size(11, enterSceneToken_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,7 +286,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 23920
+     * CmdId: 6733
      * </pre>
      *
      * Protobuf type {@code EnterSceneReadyReq}
@@ -429,7 +437,11 @@ public Builder mergeFrom(
 
       private int enterSceneToken_ ;
       /**
-       * <code>uint32 enter_scene_token = 5;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 enter_scene_token = 11;</code>
        * @return The enterSceneToken.
        */
       @java.lang.Override
@@ -437,7 +449,11 @@ public int getEnterSceneToken() {
         return enterSceneToken_;
       }
       /**
-       * <code>uint32 enter_scene_token = 5;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 enter_scene_token = 11;</code>
        * @param value The enterSceneToken to set.
        * @return This builder for chaining.
        */
@@ -448,7 +464,11 @@ public Builder setEnterSceneToken(int value) {
         return this;
       }
       /**
-       * <code>uint32 enter_scene_token = 5;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 enter_scene_token = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearEnterSceneToken() {
@@ -525,7 +545,7 @@ public emu.grasscutter.net.proto.EnterSceneReadyReqOuterClass.EnterSceneReadyReq
   static {
     java.lang.String[] descriptorData = {
       "\n\030EnterSceneReadyReq.proto\"/\n\022EnterScene" +
-      "ReadyReq\022\031\n\021enter_scene_token\030\005 \001(\rB\033\n\031e" +
+      "ReadyReq\022\031\n\021enter_scene_token\030\013 \001(\rB\033\n\031e" +
       "mu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EnterSceneReadyRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EnterSceneReadyRspOuterClass.java
index cf2b9250972..f8cdcb98cd8 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EnterSceneReadyRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EnterSceneReadyRspOuterClass.java
@@ -23,24 +23,24 @@ public interface EnterSceneReadyRspOrBuilder extends
      * Offset: 0x20
      * </pre>
      *
-     * <code>int32 retcode = 11;</code>
-     * @return The retcode.
+     * <code>uint32 enter_scene_token = 15;</code>
+     * @return The enterSceneToken.
      */
-    int getRetcode();
+    int getEnterSceneToken();
 
     /**
      * <pre>
      * Offset: 0x24
      * </pre>
      *
-     * <code>uint32 enter_scene_token = 5;</code>
-     * @return The enterSceneToken.
+     * <code>int32 retcode = 5;</code>
+     * @return The retcode.
      */
-    int getEnterSceneToken();
+    int getRetcode();
   }
   /**
    * <pre>
-   * CmdId: 2248
+   * CmdId: 25386
    * </pre>
    *
    * Protobuf type {@code EnterSceneReadyRsp}
@@ -89,12 +89,12 @@ private EnterSceneReadyRsp(
               break;
             case 40: {
 
-              enterSceneToken_ = input.readUInt32();
+              retcode_ = input.readInt32();
               break;
             }
-            case 88: {
+            case 120: {
 
-              retcode_ = input.readInt32();
+              enterSceneToken_ = input.readUInt32();
               break;
             }
             default: {
@@ -129,34 +129,34 @@ private EnterSceneReadyRsp(
               emu.grasscutter.net.proto.EnterSceneReadyRspOuterClass.EnterSceneReadyRsp.class, emu.grasscutter.net.proto.EnterSceneReadyRspOuterClass.EnterSceneReadyRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 11;
-    private int retcode_;
+    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 15;
+    private int enterSceneToken_;
     /**
      * <pre>
      * Offset: 0x20
      * </pre>
      *
-     * <code>int32 retcode = 11;</code>
-     * @return The retcode.
+     * <code>uint32 enter_scene_token = 15;</code>
+     * @return The enterSceneToken.
      */
     @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
+    public int getEnterSceneToken() {
+      return enterSceneToken_;
     }
 
-    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 5;
-    private int enterSceneToken_;
+    public static final int RETCODE_FIELD_NUMBER = 5;
+    private int retcode_;
     /**
      * <pre>
      * Offset: 0x24
      * </pre>
      *
-     * <code>uint32 enter_scene_token = 5;</code>
-     * @return The enterSceneToken.
+     * <code>int32 retcode = 5;</code>
+     * @return The retcode.
      */
     @java.lang.Override
-    public int getEnterSceneToken() {
-      return enterSceneToken_;
+    public int getRetcode() {
+      return retcode_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -173,11 +173,11 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (enterSceneToken_ != 0) {
-        output.writeUInt32(5, enterSceneToken_);
-      }
       if (retcode_ != 0) {
-        output.writeInt32(11, retcode_);
+        output.writeInt32(5, retcode_);
+      }
+      if (enterSceneToken_ != 0) {
+        output.writeUInt32(15, enterSceneToken_);
       }
       unknownFields.writeTo(output);
     }
@@ -188,13 +188,13 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (enterSceneToken_ != 0) {
+      if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, enterSceneToken_);
+          .computeInt32Size(5, retcode_);
       }
-      if (retcode_ != 0) {
+      if (enterSceneToken_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(11, retcode_);
+          .computeUInt32Size(15, enterSceneToken_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -211,10 +211,10 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.EnterSceneReadyRspOuterClass.EnterSceneReadyRsp other = (emu.grasscutter.net.proto.EnterSceneReadyRspOuterClass.EnterSceneReadyRsp) obj;
 
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (getEnterSceneToken()
           != other.getEnterSceneToken()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -226,10 +226,10 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + ENTER_SCENE_TOKEN_FIELD_NUMBER;
       hash = (53 * hash) + getEnterSceneToken();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -327,7 +327,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 2248
+     * CmdId: 25386
      * </pre>
      *
      * Protobuf type {@code EnterSceneReadyRsp}
@@ -367,10 +367,10 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        retcode_ = 0;
-
         enterSceneToken_ = 0;
 
+        retcode_ = 0;
+
         return this;
       }
 
@@ -397,8 +397,8 @@ public emu.grasscutter.net.proto.EnterSceneReadyRspOuterClass.EnterSceneReadyRsp
       @java.lang.Override
       public emu.grasscutter.net.proto.EnterSceneReadyRspOuterClass.EnterSceneReadyRsp buildPartial() {
         emu.grasscutter.net.proto.EnterSceneReadyRspOuterClass.EnterSceneReadyRsp result = new emu.grasscutter.net.proto.EnterSceneReadyRspOuterClass.EnterSceneReadyRsp(this);
-        result.retcode_ = retcode_;
         result.enterSceneToken_ = enterSceneToken_;
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -447,12 +447,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.EnterSceneReadyRspOuterClass.EnterSceneReadyRsp other) {
         if (other == emu.grasscutter.net.proto.EnterSceneReadyRspOuterClass.EnterSceneReadyRsp.getDefaultInstance()) return this;
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         if (other.getEnterSceneToken() != 0) {
           setEnterSceneToken(other.getEnterSceneToken());
         }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -482,31 +482,31 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int retcode_ ;
+      private int enterSceneToken_ ;
       /**
        * <pre>
        * Offset: 0x20
        * </pre>
        *
-       * <code>int32 retcode = 11;</code>
-       * @return The retcode.
+       * <code>uint32 enter_scene_token = 15;</code>
+       * @return The enterSceneToken.
        */
       @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
+      public int getEnterSceneToken() {
+        return enterSceneToken_;
       }
       /**
        * <pre>
        * Offset: 0x20
        * </pre>
        *
-       * <code>int32 retcode = 11;</code>
-       * @param value The retcode to set.
+       * <code>uint32 enter_scene_token = 15;</code>
+       * @param value The enterSceneToken to set.
        * @return This builder for chaining.
        */
-      public Builder setRetcode(int value) {
+      public Builder setEnterSceneToken(int value) {
         
-        retcode_ = value;
+        enterSceneToken_ = value;
         onChanged();
         return this;
       }
@@ -515,41 +515,41 @@ public Builder setRetcode(int value) {
        * Offset: 0x20
        * </pre>
        *
-       * <code>int32 retcode = 11;</code>
+       * <code>uint32 enter_scene_token = 15;</code>
        * @return This builder for chaining.
        */
-      public Builder clearRetcode() {
+      public Builder clearEnterSceneToken() {
         
-        retcode_ = 0;
+        enterSceneToken_ = 0;
         onChanged();
         return this;
       }
 
-      private int enterSceneToken_ ;
+      private int retcode_ ;
       /**
        * <pre>
        * Offset: 0x24
        * </pre>
        *
-       * <code>uint32 enter_scene_token = 5;</code>
-       * @return The enterSceneToken.
+       * <code>int32 retcode = 5;</code>
+       * @return The retcode.
        */
       @java.lang.Override
-      public int getEnterSceneToken() {
-        return enterSceneToken_;
+      public int getRetcode() {
+        return retcode_;
       }
       /**
        * <pre>
        * Offset: 0x24
        * </pre>
        *
-       * <code>uint32 enter_scene_token = 5;</code>
-       * @param value The enterSceneToken to set.
+       * <code>int32 retcode = 5;</code>
+       * @param value The retcode to set.
        * @return This builder for chaining.
        */
-      public Builder setEnterSceneToken(int value) {
+      public Builder setRetcode(int value) {
         
-        enterSceneToken_ = value;
+        retcode_ = value;
         onChanged();
         return this;
       }
@@ -558,12 +558,12 @@ public Builder setEnterSceneToken(int value) {
        * Offset: 0x24
        * </pre>
        *
-       * <code>uint32 enter_scene_token = 5;</code>
+       * <code>int32 retcode = 5;</code>
        * @return This builder for chaining.
        */
-      public Builder clearEnterSceneToken() {
+      public Builder clearRetcode() {
         
-        enterSceneToken_ = 0;
+        retcode_ = 0;
         onChanged();
         return this;
       }
@@ -635,8 +635,8 @@ public emu.grasscutter.net.proto.EnterSceneReadyRspOuterClass.EnterSceneReadyRsp
   static {
     java.lang.String[] descriptorData = {
       "\n\030EnterSceneReadyRsp.proto\"@\n\022EnterScene" +
-      "ReadyRsp\022\017\n\007retcode\030\013 \001(\005\022\031\n\021enter_scene" +
-      "_token\030\005 \001(\rB\033\n\031emu.grasscutter.net.prot" +
+      "ReadyRsp\022\031\n\021enter_scene_token\030\017 \001(\r\022\017\n\007r" +
+      "etcode\030\005 \001(\005B\033\n\031emu.grasscutter.net.prot" +
       "ob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -648,7 +648,7 @@ public emu.grasscutter.net.proto.EnterSceneReadyRspOuterClass.EnterSceneReadyRsp
     internal_static_EnterSceneReadyRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EnterSceneReadyRsp_descriptor,
-        new java.lang.String[] { "Retcode", "EnterSceneToken", });
+        new java.lang.String[] { "EnterSceneToken", "Retcode", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EntityFightPropChangeReasonNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EntityFightPropChangeReasonNotifyOuterClass.java
index c0c02a5c264..0a2adacc0a3 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EntityFightPropChangeReasonNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EntityFightPropChangeReasonNotifyOuterClass.java
@@ -19,93 +19,134 @@ public interface EntityFightPropChangeReasonNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 entity_id = 2;</code>
-     * @return The entityId.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 param_list = 11;</code>
+     * @return A list containing the paramList.
      */
-    int getEntityId();
-
+    java.util.List<java.lang.Integer> getParamListList();
     /**
-     * <code>.PropChangeReason reason = 3;</code>
-     * @return The enum numeric value on the wire for reason.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 param_list = 11;</code>
+     * @return The count of paramList.
      */
-    int getReasonValue();
+    int getParamListCount();
     /**
-     * <code>.PropChangeReason reason = 3;</code>
-     * @return The reason.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 param_list = 11;</code>
+     * @param index The index of the element to return.
+     * @return The paramList at the given index.
      */
-    emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason getReason();
+    int getParamList(int index);
 
     /**
-     * <code>.ChangeHpDebtsReason change_hp_debts_reason = 7;</code>
-     * @return The enum numeric value on the wire for changeHpDebtsReason.
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>uint32 prop_type = 8;</code>
+     * @return The propType.
      */
-    int getChangeHpDebtsReasonValue();
+    int getPropType();
+
     /**
-     * <code>.ChangeHpDebtsReason change_hp_debts_reason = 7;</code>
-     * @return The changeHpDebtsReason.
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>float paid_hp_debts = 12;</code>
+     * @return The paidHpDebts.
      */
-    emu.grasscutter.net.proto.ChangeHpDebtsReasonOuterClass.ChangeHpDebtsReason getChangeHpDebtsReason();
+    float getPaidHpDebts();
 
     /**
-     * <code>repeated uint32 param_list = 8;</code>
-     * @return A list containing the paramList.
+     * <pre>
+     * Offset: 0x3C
+     * </pre>
+     *
+     * <code>uint32 entity_id = 3;</code>
+     * @return The entityId.
      */
-    java.util.List<java.lang.Integer> getParamListList();
+    int getEntityId();
+
     /**
-     * <code>repeated uint32 param_list = 8;</code>
-     * @return The count of paramList.
+     * <pre>
+     * Offset: 0x40
+     * </pre>
+     *
+     * <code>.PropChangeReason reason = 15;</code>
+     * @return The enum numeric value on the wire for reason.
      */
-    int getParamListCount();
+    int getReasonValue();
     /**
-     * <code>repeated uint32 param_list = 8;</code>
-     * @param index The index of the element to return.
-     * @return The paramList at the given index.
+     * <pre>
+     * Offset: 0x40
+     * </pre>
+     *
+     * <code>.PropChangeReason reason = 15;</code>
+     * @return The reason.
      */
-    int getParamList(int index);
+    emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason getReason();
 
     /**
-     * <code>float prop_delta = 10;</code>
+     * <pre>
+     * Offset: 0x44
+     * </pre>
+     *
+     * <code>float prop_delta = 6;</code>
      * @return The propDelta.
      */
     float getPropDelta();
 
     /**
-     * <code>uint32 prop_type = 11;</code>
-     * @return The propType.
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>.ChangeEnergyReason change_energy_reason = 10;</code>
+     * @return The enum numeric value on the wire for changeEnergyReason.
      */
-    int getPropType();
-
+    int getChangeEnergyReasonValue();
     /**
-     * <code>float NNFONEOHGHE = 12;</code>
-     * @return The nNFONEOHGHE.
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>.ChangeEnergyReason change_energy_reason = 10;</code>
+     * @return The changeEnergyReason.
      */
-    float getNNFONEOHGHE();
+    emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason getChangeEnergyReason();
 
     /**
-     * <code>.ChangeHpReason change_hp_reason = 13;</code>
+     * <pre>
+     * Offset: 0x4C
+     * </pre>
+     *
+     * <code>.ChangeHpReason change_hp_reason = 4;</code>
      * @return The enum numeric value on the wire for changeHpReason.
      */
     int getChangeHpReasonValue();
     /**
-     * <code>.ChangeHpReason change_hp_reason = 13;</code>
+     * <pre>
+     * Offset: 0x4C
+     * </pre>
+     *
+     * <code>.ChangeHpReason change_hp_reason = 4;</code>
      * @return The changeHpReason.
      */
     emu.grasscutter.net.proto.ChangeHpReasonOuterClass.ChangeHpReason getChangeHpReason();
-
-    /**
-     * <code>.ChangeEnergyReason change_energy_reason = 15;</code>
-     * @return The enum numeric value on the wire for changeEnergyReason.
-     */
-    int getChangeEnergyReasonValue();
-    /**
-     * <code>.ChangeEnergyReason change_energy_reason = 15;</code>
-     * @return The changeEnergyReason.
-     */
-    emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason getChangeEnergyReason();
   }
   /**
    * <pre>
-   * CmdId: 7107
+   * CmdId: 20950
    * </pre>
    *
    * Protobuf type {@code EntityFightPropChangeReasonNotify}
@@ -120,11 +161,10 @@ private EntityFightPropChangeReasonNotify(com.google.protobuf.GeneratedMessageV3
       super(builder);
     }
     private EntityFightPropChangeReasonNotify() {
-      reason_ = 0;
-      changeHpDebtsReason_ = 0;
       paramList_ = emptyIntList();
-      changeHpReason_ = 0;
+      reason_ = 0;
       changeEnergyReason_ = 0;
+      changeHpReason_ = 0;
     }
 
     @java.lang.Override
@@ -158,24 +198,34 @@ private EntityFightPropChangeReasonNotify(
             case 0:
               done = true;
               break;
-            case 16: {
+            case 24: {
 
               entityId_ = input.readUInt32();
               break;
             }
-            case 24: {
+            case 32: {
               int rawValue = input.readEnum();
 
-              reason_ = rawValue;
+              changeHpReason_ = rawValue;
               break;
             }
-            case 56: {
-              int rawValue = input.readEnum();
+            case 53: {
 
-              changeHpDebtsReason_ = rawValue;
+              propDelta_ = input.readFloat();
               break;
             }
             case 64: {
+
+              propType_ = input.readUInt32();
+              break;
+            }
+            case 80: {
+              int rawValue = input.readEnum();
+
+              changeEnergyReason_ = rawValue;
+              break;
+            }
+            case 88: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 paramList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -183,7 +233,7 @@ private EntityFightPropChangeReasonNotify(
               paramList_.addInt(input.readUInt32());
               break;
             }
-            case 66: {
+            case 90: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -196,31 +246,15 @@ private EntityFightPropChangeReasonNotify(
               input.popLimit(limit);
               break;
             }
-            case 85: {
-
-              propDelta_ = input.readFloat();
-              break;
-            }
-            case 88: {
-
-              propType_ = input.readUInt32();
-              break;
-            }
             case 101: {
 
-              nNFONEOHGHE_ = input.readFloat();
-              break;
-            }
-            case 104: {
-              int rawValue = input.readEnum();
-
-              changeHpReason_ = rawValue;
+              paidHpDebts_ = input.readFloat();
               break;
             }
             case 120: {
               int rawValue = input.readEnum();
 
-              changeEnergyReason_ = rawValue;
+              reason_ = rawValue;
               break;
             }
             default: {
@@ -258,59 +292,14 @@ private EntityFightPropChangeReasonNotify(
               emu.grasscutter.net.proto.EntityFightPropChangeReasonNotifyOuterClass.EntityFightPropChangeReasonNotify.class, emu.grasscutter.net.proto.EntityFightPropChangeReasonNotifyOuterClass.EntityFightPropChangeReasonNotify.Builder.class);
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 2;
-    private int entityId_;
-    /**
-     * <code>uint32 entity_id = 2;</code>
-     * @return The entityId.
-     */
-    @java.lang.Override
-    public int getEntityId() {
-      return entityId_;
-    }
-
-    public static final int REASON_FIELD_NUMBER = 3;
-    private int reason_;
-    /**
-     * <code>.PropChangeReason reason = 3;</code>
-     * @return The enum numeric value on the wire for reason.
-     */
-    @java.lang.Override public int getReasonValue() {
-      return reason_;
-    }
-    /**
-     * <code>.PropChangeReason reason = 3;</code>
-     * @return The reason.
-     */
-    @java.lang.Override public emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason getReason() {
-      @SuppressWarnings("deprecation")
-      emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason result = emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason.valueOf(reason_);
-      return result == null ? emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason.UNRECOGNIZED : result;
-    }
-
-    public static final int CHANGE_HP_DEBTS_REASON_FIELD_NUMBER = 7;
-    private int changeHpDebtsReason_;
-    /**
-     * <code>.ChangeHpDebtsReason change_hp_debts_reason = 7;</code>
-     * @return The enum numeric value on the wire for changeHpDebtsReason.
-     */
-    @java.lang.Override public int getChangeHpDebtsReasonValue() {
-      return changeHpDebtsReason_;
-    }
-    /**
-     * <code>.ChangeHpDebtsReason change_hp_debts_reason = 7;</code>
-     * @return The changeHpDebtsReason.
-     */
-    @java.lang.Override public emu.grasscutter.net.proto.ChangeHpDebtsReasonOuterClass.ChangeHpDebtsReason getChangeHpDebtsReason() {
-      @SuppressWarnings("deprecation")
-      emu.grasscutter.net.proto.ChangeHpDebtsReasonOuterClass.ChangeHpDebtsReason result = emu.grasscutter.net.proto.ChangeHpDebtsReasonOuterClass.ChangeHpDebtsReason.valueOf(changeHpDebtsReason_);
-      return result == null ? emu.grasscutter.net.proto.ChangeHpDebtsReasonOuterClass.ChangeHpDebtsReason.UNRECOGNIZED : result;
-    }
-
-    public static final int PARAM_LIST_FIELD_NUMBER = 8;
+    public static final int PARAM_LIST_FIELD_NUMBER = 11;
     private com.google.protobuf.Internal.IntList paramList_;
     /**
-     * <code>repeated uint32 param_list = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 param_list = 11;</code>
      * @return A list containing the paramList.
      */
     @java.lang.Override
@@ -319,14 +308,22 @@ public int getEntityId() {
       return paramList_;
     }
     /**
-     * <code>repeated uint32 param_list = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 param_list = 11;</code>
      * @return The count of paramList.
      */
     public int getParamListCount() {
       return paramList_.size();
     }
     /**
-     * <code>repeated uint32 param_list = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 param_list = 11;</code>
      * @param index The index of the element to return.
      * @return The paramList at the given index.
      */
@@ -335,69 +332,112 @@ public int getParamList(int index) {
     }
     private int paramListMemoizedSerializedSize = -1;
 
-    public static final int PROP_DELTA_FIELD_NUMBER = 10;
-    private float propDelta_;
+    public static final int PROP_TYPE_FIELD_NUMBER = 8;
+    private int propType_;
     /**
-     * <code>float prop_delta = 10;</code>
-     * @return The propDelta.
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>uint32 prop_type = 8;</code>
+     * @return The propType.
      */
     @java.lang.Override
-    public float getPropDelta() {
-      return propDelta_;
+    public int getPropType() {
+      return propType_;
     }
 
-    public static final int PROP_TYPE_FIELD_NUMBER = 11;
-    private int propType_;
+    public static final int PAID_HP_DEBTS_FIELD_NUMBER = 12;
+    private float paidHpDebts_;
     /**
-     * <code>uint32 prop_type = 11;</code>
-     * @return The propType.
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>float paid_hp_debts = 12;</code>
+     * @return The paidHpDebts.
      */
     @java.lang.Override
-    public int getPropType() {
-      return propType_;
+    public float getPaidHpDebts() {
+      return paidHpDebts_;
     }
 
-    public static final int NNFONEOHGHE_FIELD_NUMBER = 12;
-    private float nNFONEOHGHE_;
+    public static final int ENTITY_ID_FIELD_NUMBER = 3;
+    private int entityId_;
     /**
-     * <code>float NNFONEOHGHE = 12;</code>
-     * @return The nNFONEOHGHE.
+     * <pre>
+     * Offset: 0x3C
+     * </pre>
+     *
+     * <code>uint32 entity_id = 3;</code>
+     * @return The entityId.
      */
     @java.lang.Override
-    public float getNNFONEOHGHE() {
-      return nNFONEOHGHE_;
+    public int getEntityId() {
+      return entityId_;
     }
 
-    public static final int CHANGE_HP_REASON_FIELD_NUMBER = 13;
-    private int changeHpReason_;
+    public static final int REASON_FIELD_NUMBER = 15;
+    private int reason_;
     /**
-     * <code>.ChangeHpReason change_hp_reason = 13;</code>
-     * @return The enum numeric value on the wire for changeHpReason.
+     * <pre>
+     * Offset: 0x40
+     * </pre>
+     *
+     * <code>.PropChangeReason reason = 15;</code>
+     * @return The enum numeric value on the wire for reason.
      */
-    @java.lang.Override public int getChangeHpReasonValue() {
-      return changeHpReason_;
+    @java.lang.Override public int getReasonValue() {
+      return reason_;
     }
     /**
-     * <code>.ChangeHpReason change_hp_reason = 13;</code>
-     * @return The changeHpReason.
+     * <pre>
+     * Offset: 0x40
+     * </pre>
+     *
+     * <code>.PropChangeReason reason = 15;</code>
+     * @return The reason.
      */
-    @java.lang.Override public emu.grasscutter.net.proto.ChangeHpReasonOuterClass.ChangeHpReason getChangeHpReason() {
+    @java.lang.Override public emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason getReason() {
       @SuppressWarnings("deprecation")
-      emu.grasscutter.net.proto.ChangeHpReasonOuterClass.ChangeHpReason result = emu.grasscutter.net.proto.ChangeHpReasonOuterClass.ChangeHpReason.valueOf(changeHpReason_);
-      return result == null ? emu.grasscutter.net.proto.ChangeHpReasonOuterClass.ChangeHpReason.UNRECOGNIZED : result;
+      emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason result = emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason.valueOf(reason_);
+      return result == null ? emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason.UNRECOGNIZED : result;
+    }
+
+    public static final int PROP_DELTA_FIELD_NUMBER = 6;
+    private float propDelta_;
+    /**
+     * <pre>
+     * Offset: 0x44
+     * </pre>
+     *
+     * <code>float prop_delta = 6;</code>
+     * @return The propDelta.
+     */
+    @java.lang.Override
+    public float getPropDelta() {
+      return propDelta_;
     }
 
-    public static final int CHANGE_ENERGY_REASON_FIELD_NUMBER = 15;
+    public static final int CHANGE_ENERGY_REASON_FIELD_NUMBER = 10;
     private int changeEnergyReason_;
     /**
-     * <code>.ChangeEnergyReason change_energy_reason = 15;</code>
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>.ChangeEnergyReason change_energy_reason = 10;</code>
      * @return The enum numeric value on the wire for changeEnergyReason.
      */
     @java.lang.Override public int getChangeEnergyReasonValue() {
       return changeEnergyReason_;
     }
     /**
-     * <code>.ChangeEnergyReason change_energy_reason = 15;</code>
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>.ChangeEnergyReason change_energy_reason = 10;</code>
      * @return The changeEnergyReason.
      */
     @java.lang.Override public emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason getChangeEnergyReason() {
@@ -406,6 +446,33 @@ public float getNNFONEOHGHE() {
       return result == null ? emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason.UNRECOGNIZED : result;
     }
 
+    public static final int CHANGE_HP_REASON_FIELD_NUMBER = 4;
+    private int changeHpReason_;
+    /**
+     * <pre>
+     * Offset: 0x4C
+     * </pre>
+     *
+     * <code>.ChangeHpReason change_hp_reason = 4;</code>
+     * @return The enum numeric value on the wire for changeHpReason.
+     */
+    @java.lang.Override public int getChangeHpReasonValue() {
+      return changeHpReason_;
+    }
+    /**
+     * <pre>
+     * Offset: 0x4C
+     * </pre>
+     *
+     * <code>.ChangeHpReason change_hp_reason = 4;</code>
+     * @return The changeHpReason.
+     */
+    @java.lang.Override public emu.grasscutter.net.proto.ChangeHpReasonOuterClass.ChangeHpReason getChangeHpReason() {
+      @SuppressWarnings("deprecation")
+      emu.grasscutter.net.proto.ChangeHpReasonOuterClass.ChangeHpReason result = emu.grasscutter.net.proto.ChangeHpReasonOuterClass.ChangeHpReason.valueOf(changeHpReason_);
+      return result == null ? emu.grasscutter.net.proto.ChangeHpReasonOuterClass.ChangeHpReason.UNRECOGNIZED : result;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -422,35 +489,32 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
       if (entityId_ != 0) {
-        output.writeUInt32(2, entityId_);
+        output.writeUInt32(3, entityId_);
       }
-      if (reason_ != emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason.PROP_CHANGE_REASON_NONE.getNumber()) {
-        output.writeEnum(3, reason_);
+      if (changeHpReason_ != emu.grasscutter.net.proto.ChangeHpReasonOuterClass.ChangeHpReason.CHANGE_HP_REASON_NONE.getNumber()) {
+        output.writeEnum(4, changeHpReason_);
       }
-      if (changeHpDebtsReason_ != emu.grasscutter.net.proto.ChangeHpDebtsReasonOuterClass.ChangeHpDebtsReason.CHANGE_HP_DEBTS_NONE.getNumber()) {
-        output.writeEnum(7, changeHpDebtsReason_);
+      if (propDelta_ != 0F) {
+        output.writeFloat(6, propDelta_);
       }
-      if (getParamListList().size() > 0) {
-        output.writeUInt32NoTag(66);
-        output.writeUInt32NoTag(paramListMemoizedSerializedSize);
-      }
-      for (int i = 0; i < paramList_.size(); i++) {
-        output.writeUInt32NoTag(paramList_.getInt(i));
+      if (propType_ != 0) {
+        output.writeUInt32(8, propType_);
       }
-      if (propDelta_ != 0F) {
-        output.writeFloat(10, propDelta_);
+      if (changeEnergyReason_ != emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason.CHANGE_ENERGY_REASON_NONE.getNumber()) {
+        output.writeEnum(10, changeEnergyReason_);
       }
-      if (propType_ != 0) {
-        output.writeUInt32(11, propType_);
+      if (getParamListList().size() > 0) {
+        output.writeUInt32NoTag(90);
+        output.writeUInt32NoTag(paramListMemoizedSerializedSize);
       }
-      if (nNFONEOHGHE_ != 0F) {
-        output.writeFloat(12, nNFONEOHGHE_);
+      for (int i = 0; i < paramList_.size(); i++) {
+        output.writeUInt32NoTag(paramList_.getInt(i));
       }
-      if (changeHpReason_ != emu.grasscutter.net.proto.ChangeHpReasonOuterClass.ChangeHpReason.CHANGE_HP_REASON_NONE.getNumber()) {
-        output.writeEnum(13, changeHpReason_);
+      if (paidHpDebts_ != 0F) {
+        output.writeFloat(12, paidHpDebts_);
       }
-      if (changeEnergyReason_ != emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason.CHANGE_ENERGY_REASON_NONE.getNumber()) {
-        output.writeEnum(15, changeEnergyReason_);
+      if (reason_ != emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason.PROP_CHANGE_REASON_NONE.getNumber()) {
+        output.writeEnum(15, reason_);
       }
       unknownFields.writeTo(output);
     }
@@ -463,15 +527,23 @@ public int getSerializedSize() {
       size = 0;
       if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, entityId_);
+          .computeUInt32Size(3, entityId_);
       }
-      if (reason_ != emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason.PROP_CHANGE_REASON_NONE.getNumber()) {
+      if (changeHpReason_ != emu.grasscutter.net.proto.ChangeHpReasonOuterClass.ChangeHpReason.CHANGE_HP_REASON_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(3, reason_);
+          .computeEnumSize(4, changeHpReason_);
       }
-      if (changeHpDebtsReason_ != emu.grasscutter.net.proto.ChangeHpDebtsReasonOuterClass.ChangeHpDebtsReason.CHANGE_HP_DEBTS_NONE.getNumber()) {
+      if (propDelta_ != 0F) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeFloatSize(6, propDelta_);
+      }
+      if (propType_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(8, propType_);
+      }
+      if (changeEnergyReason_ != emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason.CHANGE_ENERGY_REASON_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(7, changeHpDebtsReason_);
+          .computeEnumSize(10, changeEnergyReason_);
       }
       {
         int dataSize = 0;
@@ -487,25 +559,13 @@ public int getSerializedSize() {
         }
         paramListMemoizedSerializedSize = dataSize;
       }
-      if (propDelta_ != 0F) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(10, propDelta_);
-      }
-      if (propType_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, propType_);
-      }
-      if (nNFONEOHGHE_ != 0F) {
+      if (paidHpDebts_ != 0F) {
         size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(12, nNFONEOHGHE_);
+          .computeFloatSize(12, paidHpDebts_);
       }
-      if (changeHpReason_ != emu.grasscutter.net.proto.ChangeHpReasonOuterClass.ChangeHpReason.CHANGE_HP_REASON_NONE.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(13, changeHpReason_);
-      }
-      if (changeEnergyReason_ != emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason.CHANGE_ENERGY_REASON_NONE.getNumber()) {
+      if (reason_ != emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason.PROP_CHANGE_REASON_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(15, changeEnergyReason_);
+          .computeEnumSize(15, reason_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -522,22 +582,21 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.EntityFightPropChangeReasonNotifyOuterClass.EntityFightPropChangeReasonNotify other = (emu.grasscutter.net.proto.EntityFightPropChangeReasonNotifyOuterClass.EntityFightPropChangeReasonNotify) obj;
 
+      if (!getParamListList()
+          .equals(other.getParamListList())) return false;
+      if (getPropType()
+          != other.getPropType()) return false;
+      if (java.lang.Float.floatToIntBits(getPaidHpDebts())
+          != java.lang.Float.floatToIntBits(
+              other.getPaidHpDebts())) return false;
       if (getEntityId()
           != other.getEntityId()) return false;
       if (reason_ != other.reason_) return false;
-      if (changeHpDebtsReason_ != other.changeHpDebtsReason_) return false;
-      if (!getParamListList()
-          .equals(other.getParamListList())) return false;
       if (java.lang.Float.floatToIntBits(getPropDelta())
           != java.lang.Float.floatToIntBits(
               other.getPropDelta())) return false;
-      if (getPropType()
-          != other.getPropType()) return false;
-      if (java.lang.Float.floatToIntBits(getNNFONEOHGHE())
-          != java.lang.Float.floatToIntBits(
-              other.getNNFONEOHGHE())) return false;
-      if (changeHpReason_ != other.changeHpReason_) return false;
       if (changeEnergyReason_ != other.changeEnergyReason_) return false;
+      if (changeHpReason_ != other.changeHpReason_) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -549,28 +608,26 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getEntityId();
-      hash = (37 * hash) + REASON_FIELD_NUMBER;
-      hash = (53 * hash) + reason_;
-      hash = (37 * hash) + CHANGE_HP_DEBTS_REASON_FIELD_NUMBER;
-      hash = (53 * hash) + changeHpDebtsReason_;
       if (getParamListCount() > 0) {
         hash = (37 * hash) + PARAM_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getParamListList().hashCode();
       }
-      hash = (37 * hash) + PROP_DELTA_FIELD_NUMBER;
-      hash = (53 * hash) + java.lang.Float.floatToIntBits(
-          getPropDelta());
       hash = (37 * hash) + PROP_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + getPropType();
-      hash = (37 * hash) + NNFONEOHGHE_FIELD_NUMBER;
+      hash = (37 * hash) + PAID_HP_DEBTS_FIELD_NUMBER;
       hash = (53 * hash) + java.lang.Float.floatToIntBits(
-          getNNFONEOHGHE());
-      hash = (37 * hash) + CHANGE_HP_REASON_FIELD_NUMBER;
-      hash = (53 * hash) + changeHpReason_;
+          getPaidHpDebts());
+      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getEntityId();
+      hash = (37 * hash) + REASON_FIELD_NUMBER;
+      hash = (53 * hash) + reason_;
+      hash = (37 * hash) + PROP_DELTA_FIELD_NUMBER;
+      hash = (53 * hash) + java.lang.Float.floatToIntBits(
+          getPropDelta());
       hash = (37 * hash) + CHANGE_ENERGY_REASON_FIELD_NUMBER;
       hash = (53 * hash) + changeEnergyReason_;
+      hash = (37 * hash) + CHANGE_HP_REASON_FIELD_NUMBER;
+      hash = (53 * hash) + changeHpReason_;
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -668,7 +725,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 7107
+     * CmdId: 20950
      * </pre>
      *
      * Protobuf type {@code EntityFightPropChangeReasonNotify}
@@ -708,24 +765,22 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        paramList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        propType_ = 0;
+
+        paidHpDebts_ = 0F;
+
         entityId_ = 0;
 
         reason_ = 0;
 
-        changeHpDebtsReason_ = 0;
-
-        paramList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
         propDelta_ = 0F;
 
-        propType_ = 0;
-
-        nNFONEOHGHE_ = 0F;
+        changeEnergyReason_ = 0;
 
         changeHpReason_ = 0;
 
-        changeEnergyReason_ = 0;
-
         return this;
       }
 
@@ -753,19 +808,18 @@ public emu.grasscutter.net.proto.EntityFightPropChangeReasonNotifyOuterClass.Ent
       public emu.grasscutter.net.proto.EntityFightPropChangeReasonNotifyOuterClass.EntityFightPropChangeReasonNotify buildPartial() {
         emu.grasscutter.net.proto.EntityFightPropChangeReasonNotifyOuterClass.EntityFightPropChangeReasonNotify result = new emu.grasscutter.net.proto.EntityFightPropChangeReasonNotifyOuterClass.EntityFightPropChangeReasonNotify(this);
         int from_bitField0_ = bitField0_;
-        result.entityId_ = entityId_;
-        result.reason_ = reason_;
-        result.changeHpDebtsReason_ = changeHpDebtsReason_;
         if (((bitField0_ & 0x00000001) != 0)) {
           paramList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.paramList_ = paramList_;
-        result.propDelta_ = propDelta_;
         result.propType_ = propType_;
-        result.nNFONEOHGHE_ = nNFONEOHGHE_;
-        result.changeHpReason_ = changeHpReason_;
+        result.paidHpDebts_ = paidHpDebts_;
+        result.entityId_ = entityId_;
+        result.reason_ = reason_;
+        result.propDelta_ = propDelta_;
         result.changeEnergyReason_ = changeEnergyReason_;
+        result.changeHpReason_ = changeHpReason_;
         onBuilt();
         return result;
       }
@@ -814,15 +868,6 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.EntityFightPropChangeReasonNotifyOuterClass.EntityFightPropChangeReasonNotify other) {
         if (other == emu.grasscutter.net.proto.EntityFightPropChangeReasonNotifyOuterClass.EntityFightPropChangeReasonNotify.getDefaultInstance()) return this;
-        if (other.getEntityId() != 0) {
-          setEntityId(other.getEntityId());
-        }
-        if (other.reason_ != 0) {
-          setReasonValue(other.getReasonValue());
-        }
-        if (other.changeHpDebtsReason_ != 0) {
-          setChangeHpDebtsReasonValue(other.getChangeHpDebtsReasonValue());
-        }
         if (!other.paramList_.isEmpty()) {
           if (paramList_.isEmpty()) {
             paramList_ = other.paramList_;
@@ -833,21 +878,27 @@ public Builder mergeFrom(emu.grasscutter.net.proto.EntityFightPropChangeReasonNo
           }
           onChanged();
         }
-        if (other.getPropDelta() != 0F) {
-          setPropDelta(other.getPropDelta());
-        }
         if (other.getPropType() != 0) {
           setPropType(other.getPropType());
         }
-        if (other.getNNFONEOHGHE() != 0F) {
-          setNNFONEOHGHE(other.getNNFONEOHGHE());
+        if (other.getPaidHpDebts() != 0F) {
+          setPaidHpDebts(other.getPaidHpDebts());
         }
-        if (other.changeHpReason_ != 0) {
-          setChangeHpReasonValue(other.getChangeHpReasonValue());
+        if (other.getEntityId() != 0) {
+          setEntityId(other.getEntityId());
+        }
+        if (other.reason_ != 0) {
+          setReasonValue(other.getReasonValue());
+        }
+        if (other.getPropDelta() != 0F) {
+          setPropDelta(other.getPropDelta());
         }
         if (other.changeEnergyReason_ != 0) {
           setChangeEnergyReasonValue(other.getChangeEnergyReasonValue());
         }
+        if (other.changeHpReason_ != 0) {
+          setChangeHpReasonValue(other.getChangeHpReasonValue());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -878,145 +929,6 @@ public Builder mergeFrom(
       }
       private int bitField0_;
 
-      private int entityId_ ;
-      /**
-       * <code>uint32 entity_id = 2;</code>
-       * @return The entityId.
-       */
-      @java.lang.Override
-      public int getEntityId() {
-        return entityId_;
-      }
-      /**
-       * <code>uint32 entity_id = 2;</code>
-       * @param value The entityId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEntityId(int value) {
-        
-        entityId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 entity_id = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEntityId() {
-        
-        entityId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int reason_ = 0;
-      /**
-       * <code>.PropChangeReason reason = 3;</code>
-       * @return The enum numeric value on the wire for reason.
-       */
-      @java.lang.Override public int getReasonValue() {
-        return reason_;
-      }
-      /**
-       * <code>.PropChangeReason reason = 3;</code>
-       * @param value The enum numeric value on the wire for reason to set.
-       * @return This builder for chaining.
-       */
-      public Builder setReasonValue(int value) {
-        
-        reason_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.PropChangeReason reason = 3;</code>
-       * @return The reason.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason getReason() {
-        @SuppressWarnings("deprecation")
-        emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason result = emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason.valueOf(reason_);
-        return result == null ? emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason.UNRECOGNIZED : result;
-      }
-      /**
-       * <code>.PropChangeReason reason = 3;</code>
-       * @param value The reason to set.
-       * @return This builder for chaining.
-       */
-      public Builder setReason(emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        
-        reason_ = value.getNumber();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.PropChangeReason reason = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearReason() {
-        
-        reason_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int changeHpDebtsReason_ = 0;
-      /**
-       * <code>.ChangeHpDebtsReason change_hp_debts_reason = 7;</code>
-       * @return The enum numeric value on the wire for changeHpDebtsReason.
-       */
-      @java.lang.Override public int getChangeHpDebtsReasonValue() {
-        return changeHpDebtsReason_;
-      }
-      /**
-       * <code>.ChangeHpDebtsReason change_hp_debts_reason = 7;</code>
-       * @param value The enum numeric value on the wire for changeHpDebtsReason to set.
-       * @return This builder for chaining.
-       */
-      public Builder setChangeHpDebtsReasonValue(int value) {
-        
-        changeHpDebtsReason_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.ChangeHpDebtsReason change_hp_debts_reason = 7;</code>
-       * @return The changeHpDebtsReason.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.ChangeHpDebtsReasonOuterClass.ChangeHpDebtsReason getChangeHpDebtsReason() {
-        @SuppressWarnings("deprecation")
-        emu.grasscutter.net.proto.ChangeHpDebtsReasonOuterClass.ChangeHpDebtsReason result = emu.grasscutter.net.proto.ChangeHpDebtsReasonOuterClass.ChangeHpDebtsReason.valueOf(changeHpDebtsReason_);
-        return result == null ? emu.grasscutter.net.proto.ChangeHpDebtsReasonOuterClass.ChangeHpDebtsReason.UNRECOGNIZED : result;
-      }
-      /**
-       * <code>.ChangeHpDebtsReason change_hp_debts_reason = 7;</code>
-       * @param value The changeHpDebtsReason to set.
-       * @return This builder for chaining.
-       */
-      public Builder setChangeHpDebtsReason(emu.grasscutter.net.proto.ChangeHpDebtsReasonOuterClass.ChangeHpDebtsReason value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        
-        changeHpDebtsReason_ = value.getNumber();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.ChangeHpDebtsReason change_hp_debts_reason = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearChangeHpDebtsReason() {
-        
-        changeHpDebtsReason_ = 0;
-        onChanged();
-        return this;
-      }
-
       private com.google.protobuf.Internal.IntList paramList_ = emptyIntList();
       private void ensureParamListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
@@ -1025,7 +937,11 @@ private void ensureParamListIsMutable() {
          }
       }
       /**
-       * <code>repeated uint32 param_list = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 param_list = 11;</code>
        * @return A list containing the paramList.
        */
       public java.util.List<java.lang.Integer>
@@ -1034,14 +950,22 @@ private void ensureParamListIsMutable() {
                  java.util.Collections.unmodifiableList(paramList_) : paramList_;
       }
       /**
-       * <code>repeated uint32 param_list = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 param_list = 11;</code>
        * @return The count of paramList.
        */
       public int getParamListCount() {
         return paramList_.size();
       }
       /**
-       * <code>repeated uint32 param_list = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 param_list = 11;</code>
        * @param index The index of the element to return.
        * @return The paramList at the given index.
        */
@@ -1049,7 +973,11 @@ public int getParamList(int index) {
         return paramList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 param_list = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 param_list = 11;</code>
        * @param index The index to set the value at.
        * @param value The paramList to set.
        * @return This builder for chaining.
@@ -1062,7 +990,11 @@ public Builder setParamList(
         return this;
       }
       /**
-       * <code>repeated uint32 param_list = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 param_list = 11;</code>
        * @param value The paramList to add.
        * @return This builder for chaining.
        */
@@ -1073,7 +1005,11 @@ public Builder addParamList(int value) {
         return this;
       }
       /**
-       * <code>repeated uint32 param_list = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 param_list = 11;</code>
        * @param values The paramList to add.
        * @return This builder for chaining.
        */
@@ -1086,7 +1022,11 @@ public Builder addAllParamList(
         return this;
       }
       /**
-       * <code>repeated uint32 param_list = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 param_list = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearParamList() {
@@ -1096,163 +1036,270 @@ public Builder clearParamList() {
         return this;
       }
 
-      private float propDelta_ ;
+      private int propType_ ;
       /**
-       * <code>float prop_delta = 10;</code>
-       * @return The propDelta.
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint32 prop_type = 8;</code>
+       * @return The propType.
        */
       @java.lang.Override
-      public float getPropDelta() {
-        return propDelta_;
+      public int getPropType() {
+        return propType_;
       }
       /**
-       * <code>float prop_delta = 10;</code>
-       * @param value The propDelta to set.
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint32 prop_type = 8;</code>
+       * @param value The propType to set.
        * @return This builder for chaining.
        */
-      public Builder setPropDelta(float value) {
+      public Builder setPropType(int value) {
         
-        propDelta_ = value;
+        propType_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>float prop_delta = 10;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint32 prop_type = 8;</code>
        * @return This builder for chaining.
        */
-      public Builder clearPropDelta() {
+      public Builder clearPropType() {
         
-        propDelta_ = 0F;
+        propType_ = 0;
         onChanged();
         return this;
       }
 
-      private int propType_ ;
+      private float paidHpDebts_ ;
       /**
-       * <code>uint32 prop_type = 11;</code>
-       * @return The propType.
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>float paid_hp_debts = 12;</code>
+       * @return The paidHpDebts.
        */
       @java.lang.Override
-      public int getPropType() {
-        return propType_;
+      public float getPaidHpDebts() {
+        return paidHpDebts_;
       }
       /**
-       * <code>uint32 prop_type = 11;</code>
-       * @param value The propType to set.
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>float paid_hp_debts = 12;</code>
+       * @param value The paidHpDebts to set.
        * @return This builder for chaining.
        */
-      public Builder setPropType(int value) {
+      public Builder setPaidHpDebts(float value) {
         
-        propType_ = value;
+        paidHpDebts_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 prop_type = 11;</code>
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>float paid_hp_debts = 12;</code>
        * @return This builder for chaining.
        */
-      public Builder clearPropType() {
+      public Builder clearPaidHpDebts() {
         
-        propType_ = 0;
+        paidHpDebts_ = 0F;
         onChanged();
         return this;
       }
 
-      private float nNFONEOHGHE_ ;
+      private int entityId_ ;
       /**
-       * <code>float NNFONEOHGHE = 12;</code>
-       * @return The nNFONEOHGHE.
+       * <pre>
+       * Offset: 0x3C
+       * </pre>
+       *
+       * <code>uint32 entity_id = 3;</code>
+       * @return The entityId.
        */
       @java.lang.Override
-      public float getNNFONEOHGHE() {
-        return nNFONEOHGHE_;
+      public int getEntityId() {
+        return entityId_;
       }
       /**
-       * <code>float NNFONEOHGHE = 12;</code>
-       * @param value The nNFONEOHGHE to set.
+       * <pre>
+       * Offset: 0x3C
+       * </pre>
+       *
+       * <code>uint32 entity_id = 3;</code>
+       * @param value The entityId to set.
        * @return This builder for chaining.
        */
-      public Builder setNNFONEOHGHE(float value) {
+      public Builder setEntityId(int value) {
         
-        nNFONEOHGHE_ = value;
+        entityId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>float NNFONEOHGHE = 12;</code>
+       * <pre>
+       * Offset: 0x3C
+       * </pre>
+       *
+       * <code>uint32 entity_id = 3;</code>
        * @return This builder for chaining.
        */
-      public Builder clearNNFONEOHGHE() {
+      public Builder clearEntityId() {
         
-        nNFONEOHGHE_ = 0F;
+        entityId_ = 0;
         onChanged();
         return this;
       }
 
-      private int changeHpReason_ = 0;
+      private int reason_ = 0;
       /**
-       * <code>.ChangeHpReason change_hp_reason = 13;</code>
-       * @return The enum numeric value on the wire for changeHpReason.
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>.PropChangeReason reason = 15;</code>
+       * @return The enum numeric value on the wire for reason.
        */
-      @java.lang.Override public int getChangeHpReasonValue() {
-        return changeHpReason_;
+      @java.lang.Override public int getReasonValue() {
+        return reason_;
       }
       /**
-       * <code>.ChangeHpReason change_hp_reason = 13;</code>
-       * @param value The enum numeric value on the wire for changeHpReason to set.
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>.PropChangeReason reason = 15;</code>
+       * @param value The enum numeric value on the wire for reason to set.
        * @return This builder for chaining.
        */
-      public Builder setChangeHpReasonValue(int value) {
+      public Builder setReasonValue(int value) {
         
-        changeHpReason_ = value;
+        reason_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>.ChangeHpReason change_hp_reason = 13;</code>
-       * @return The changeHpReason.
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>.PropChangeReason reason = 15;</code>
+       * @return The reason.
        */
       @java.lang.Override
-      public emu.grasscutter.net.proto.ChangeHpReasonOuterClass.ChangeHpReason getChangeHpReason() {
+      public emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason getReason() {
         @SuppressWarnings("deprecation")
-        emu.grasscutter.net.proto.ChangeHpReasonOuterClass.ChangeHpReason result = emu.grasscutter.net.proto.ChangeHpReasonOuterClass.ChangeHpReason.valueOf(changeHpReason_);
-        return result == null ? emu.grasscutter.net.proto.ChangeHpReasonOuterClass.ChangeHpReason.UNRECOGNIZED : result;
+        emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason result = emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason.valueOf(reason_);
+        return result == null ? emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason.UNRECOGNIZED : result;
       }
       /**
-       * <code>.ChangeHpReason change_hp_reason = 13;</code>
-       * @param value The changeHpReason to set.
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>.PropChangeReason reason = 15;</code>
+       * @param value The reason to set.
        * @return This builder for chaining.
        */
-      public Builder setChangeHpReason(emu.grasscutter.net.proto.ChangeHpReasonOuterClass.ChangeHpReason value) {
+      public Builder setReason(emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason value) {
         if (value == null) {
           throw new NullPointerException();
         }
         
-        changeHpReason_ = value.getNumber();
+        reason_ = value.getNumber();
         onChanged();
         return this;
       }
       /**
-       * <code>.ChangeHpReason change_hp_reason = 13;</code>
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>.PropChangeReason reason = 15;</code>
        * @return This builder for chaining.
        */
-      public Builder clearChangeHpReason() {
+      public Builder clearReason() {
         
-        changeHpReason_ = 0;
+        reason_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private float propDelta_ ;
+      /**
+       * <pre>
+       * Offset: 0x44
+       * </pre>
+       *
+       * <code>float prop_delta = 6;</code>
+       * @return The propDelta.
+       */
+      @java.lang.Override
+      public float getPropDelta() {
+        return propDelta_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x44
+       * </pre>
+       *
+       * <code>float prop_delta = 6;</code>
+       * @param value The propDelta to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPropDelta(float value) {
+        
+        propDelta_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x44
+       * </pre>
+       *
+       * <code>float prop_delta = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPropDelta() {
+        
+        propDelta_ = 0F;
         onChanged();
         return this;
       }
 
       private int changeEnergyReason_ = 0;
       /**
-       * <code>.ChangeEnergyReason change_energy_reason = 15;</code>
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>.ChangeEnergyReason change_energy_reason = 10;</code>
        * @return The enum numeric value on the wire for changeEnergyReason.
        */
       @java.lang.Override public int getChangeEnergyReasonValue() {
         return changeEnergyReason_;
       }
       /**
-       * <code>.ChangeEnergyReason change_energy_reason = 15;</code>
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>.ChangeEnergyReason change_energy_reason = 10;</code>
        * @param value The enum numeric value on the wire for changeEnergyReason to set.
        * @return This builder for chaining.
        */
@@ -1263,7 +1310,11 @@ public Builder setChangeEnergyReasonValue(int value) {
         return this;
       }
       /**
-       * <code>.ChangeEnergyReason change_energy_reason = 15;</code>
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>.ChangeEnergyReason change_energy_reason = 10;</code>
        * @return The changeEnergyReason.
        */
       @java.lang.Override
@@ -1273,7 +1324,11 @@ public emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason
         return result == null ? emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason.UNRECOGNIZED : result;
       }
       /**
-       * <code>.ChangeEnergyReason change_energy_reason = 15;</code>
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>.ChangeEnergyReason change_energy_reason = 10;</code>
        * @param value The changeEnergyReason to set.
        * @return This builder for chaining.
        */
@@ -1287,7 +1342,11 @@ public Builder setChangeEnergyReason(emu.grasscutter.net.proto.ChangeEnergyReaso
         return this;
       }
       /**
-       * <code>.ChangeEnergyReason change_energy_reason = 15;</code>
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>.ChangeEnergyReason change_energy_reason = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearChangeEnergyReason() {
@@ -1296,6 +1355,80 @@ public Builder clearChangeEnergyReason() {
         onChanged();
         return this;
       }
+
+      private int changeHpReason_ = 0;
+      /**
+       * <pre>
+       * Offset: 0x4C
+       * </pre>
+       *
+       * <code>.ChangeHpReason change_hp_reason = 4;</code>
+       * @return The enum numeric value on the wire for changeHpReason.
+       */
+      @java.lang.Override public int getChangeHpReasonValue() {
+        return changeHpReason_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x4C
+       * </pre>
+       *
+       * <code>.ChangeHpReason change_hp_reason = 4;</code>
+       * @param value The enum numeric value on the wire for changeHpReason to set.
+       * @return This builder for chaining.
+       */
+      public Builder setChangeHpReasonValue(int value) {
+        
+        changeHpReason_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x4C
+       * </pre>
+       *
+       * <code>.ChangeHpReason change_hp_reason = 4;</code>
+       * @return The changeHpReason.
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.ChangeHpReasonOuterClass.ChangeHpReason getChangeHpReason() {
+        @SuppressWarnings("deprecation")
+        emu.grasscutter.net.proto.ChangeHpReasonOuterClass.ChangeHpReason result = emu.grasscutter.net.proto.ChangeHpReasonOuterClass.ChangeHpReason.valueOf(changeHpReason_);
+        return result == null ? emu.grasscutter.net.proto.ChangeHpReasonOuterClass.ChangeHpReason.UNRECOGNIZED : result;
+      }
+      /**
+       * <pre>
+       * Offset: 0x4C
+       * </pre>
+       *
+       * <code>.ChangeHpReason change_hp_reason = 4;</code>
+       * @param value The changeHpReason to set.
+       * @return This builder for chaining.
+       */
+      public Builder setChangeHpReason(emu.grasscutter.net.proto.ChangeHpReasonOuterClass.ChangeHpReason value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        
+        changeHpReason_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x4C
+       * </pre>
+       *
+       * <code>.ChangeHpReason change_hp_reason = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearChangeHpReason() {
+        
+        changeHpReason_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1366,16 +1499,15 @@ public emu.grasscutter.net.proto.EntityFightPropChangeReasonNotifyOuterClass.Ent
       "\n\'EntityFightPropChangeReasonNotify.prot" +
       "o\032\024ChangeHpReason.proto\032\031ChangeHpDebtsRe" +
       "ason.proto\032\030ChangeEnergyReason.proto\032\026Pr" +
-      "opChangeReason.proto\"\275\002\n!EntityFightProp" +
-      "ChangeReasonNotify\022\021\n\tentity_id\030\002 \001(\r\022!\n" +
-      "\006reason\030\003 \001(\0162\021.PropChangeReason\0224\n\026chan" +
-      "ge_hp_debts_reason\030\007 \001(\0162\024.ChangeHpDebts" +
-      "Reason\022\022\n\nparam_list\030\010 \003(\r\022\022\n\nprop_delta" +
-      "\030\n \001(\002\022\021\n\tprop_type\030\013 \001(\r\022\023\n\013NNFONEOHGHE" +
-      "\030\014 \001(\002\022)\n\020change_hp_reason\030\r \001(\0162\017.Chang" +
-      "eHpReason\0221\n\024change_energy_reason\030\017 \001(\0162" +
-      "\023.ChangeEnergyReasonB\033\n\031emu.grasscutter." +
-      "net.protob\006proto3"
+      "opChangeReason.proto\"\211\002\n!EntityFightProp" +
+      "ChangeReasonNotify\022\022\n\nparam_list\030\013 \003(\r\022\021" +
+      "\n\tprop_type\030\010 \001(\r\022\025\n\rpaid_hp_debts\030\014 \001(\002" +
+      "\022\021\n\tentity_id\030\003 \001(\r\022!\n\006reason\030\017 \001(\0162\021.Pr" +
+      "opChangeReason\022\022\n\nprop_delta\030\006 \001(\002\0221\n\024ch" +
+      "ange_energy_reason\030\n \001(\0162\023.ChangeEnergyR" +
+      "eason\022)\n\020change_hp_reason\030\004 \001(\0162\017.Change" +
+      "HpReasonB\033\n\031emu.grasscutter.net.protob\006p" +
+      "roto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1390,7 +1522,7 @@ public emu.grasscutter.net.proto.EntityFightPropChangeReasonNotifyOuterClass.Ent
     internal_static_EntityFightPropChangeReasonNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EntityFightPropChangeReasonNotify_descriptor,
-        new java.lang.String[] { "EntityId", "Reason", "ChangeHpDebtsReason", "ParamList", "PropDelta", "PropType", "NNFONEOHGHE", "ChangeHpReason", "ChangeEnergyReason", });
+        new java.lang.String[] { "ParamList", "PropType", "PaidHpDebts", "EntityId", "Reason", "PropDelta", "ChangeEnergyReason", "ChangeHpReason", });
     emu.grasscutter.net.proto.ChangeHpReasonOuterClass.getDescriptor();
     emu.grasscutter.net.proto.ChangeHpDebtsReasonOuterClass.getDescriptor();
     emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.getDescriptor();
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EntityFightPropUpdateNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EntityFightPropUpdateNotifyOuterClass.java
index fb56fab3384..b4b679122b2 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EntityFightPropUpdateNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EntityFightPropUpdateNotifyOuterClass.java
@@ -19,11 +19,19 @@ public interface EntityFightPropUpdateNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 13;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 10;</code>
      */
     int getFightPropMapCount();
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 13;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 10;</code>
      */
     boolean containsFightPropMap(
         int key);
@@ -34,25 +42,41 @@ boolean containsFightPropMap(
     java.util.Map<java.lang.Integer, java.lang.Float>
     getFightPropMap();
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 13;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 10;</code>
      */
     java.util.Map<java.lang.Integer, java.lang.Float>
     getFightPropMapMap();
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 13;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 10;</code>
      */
 
     float getFightPropMapOrDefault(
         int key,
         float defaultValue);
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 13;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 10;</code>
      */
 
     float getFightPropMapOrThrow(
         int key);
 
     /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
      * <code>uint32 entity_id = 14;</code>
      * @return The entityId.
      */
@@ -60,7 +84,7 @@ float getFightPropMapOrThrow(
   }
   /**
    * <pre>
-   * CmdId: 6590
+   * CmdId: 27166
    * </pre>
    *
    * Protobuf type {@code EntityFightPropUpdateNotify}
@@ -108,7 +132,7 @@ private EntityFightPropUpdateNotify(
             case 0:
               done = true;
               break;
-            case 106: {
+            case 82: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 fightPropMap_ = com.google.protobuf.MapField.newMapField(
                     FightPropMapDefaultEntryHolder.defaultEntry);
@@ -155,7 +179,7 @@ private EntityFightPropUpdateNotify(
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 13:
+        case 10:
           return internalGetFightPropMap();
         default:
           throw new RuntimeException(
@@ -170,7 +194,7 @@ protected com.google.protobuf.MapField internalGetMapField(
               emu.grasscutter.net.proto.EntityFightPropUpdateNotifyOuterClass.EntityFightPropUpdateNotify.class, emu.grasscutter.net.proto.EntityFightPropUpdateNotifyOuterClass.EntityFightPropUpdateNotify.Builder.class);
     }
 
-    public static final int FIGHT_PROP_MAP_FIELD_NUMBER = 13;
+    public static final int FIGHT_PROP_MAP_FIELD_NUMBER = 10;
     private static final class FightPropMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, java.lang.Float> defaultEntry =
@@ -197,7 +221,11 @@ public int getFightPropMapCount() {
       return internalGetFightPropMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 13;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 10;</code>
      */
 
     @java.lang.Override
@@ -215,7 +243,11 @@ public java.util.Map<java.lang.Integer, java.lang.Float> getFightPropMap() {
       return getFightPropMapMap();
     }
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 13;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 10;</code>
      */
     @java.lang.Override
 
@@ -223,7 +255,11 @@ public java.util.Map<java.lang.Integer, java.lang.Float> getFightPropMapMap() {
       return internalGetFightPropMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 13;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 10;</code>
      */
     @java.lang.Override
 
@@ -236,7 +272,11 @@ public float getFightPropMapOrDefault(
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 13;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 10;</code>
      */
     @java.lang.Override
 
@@ -254,6 +294,10 @@ public float getFightPropMapOrThrow(
     public static final int ENTITY_ID_FIELD_NUMBER = 14;
     private int entityId_;
     /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
      * <code>uint32 entity_id = 14;</code>
      * @return The entityId.
      */
@@ -281,7 +325,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
           output,
           internalGetFightPropMap(),
           FightPropMapDefaultEntryHolder.defaultEntry,
-          13);
+          10);
       if (entityId_ != 0) {
         output.writeUInt32(14, entityId_);
       }
@@ -302,7 +346,7 @@ public int getSerializedSize() {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(13, fightPropMap__);
+            .computeMessageSize(10, fightPropMap__);
       }
       if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -441,7 +485,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 6590
+     * CmdId: 27166
      * </pre>
      *
      * Protobuf type {@code EntityFightPropUpdateNotify}
@@ -459,7 +503,7 @@ public static final class Builder extends
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 13:
+          case 10:
             return internalGetFightPropMap();
           default:
             throw new RuntimeException(
@@ -470,7 +514,7 @@ protected com.google.protobuf.MapField internalGetMapField(
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 13:
+          case 10:
             return internalGetMutableFightPropMap();
           default:
             throw new RuntimeException(
@@ -646,7 +690,11 @@ public int getFightPropMapCount() {
         return internalGetFightPropMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 13;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 10;</code>
        */
 
       @java.lang.Override
@@ -664,7 +712,11 @@ public java.util.Map<java.lang.Integer, java.lang.Float> getFightPropMap() {
         return getFightPropMapMap();
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 13;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 10;</code>
        */
       @java.lang.Override
 
@@ -672,7 +724,11 @@ public java.util.Map<java.lang.Integer, java.lang.Float> getFightPropMapMap() {
         return internalGetFightPropMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 13;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 10;</code>
        */
       @java.lang.Override
 
@@ -685,7 +741,11 @@ public float getFightPropMapOrDefault(
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 13;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 10;</code>
        */
       @java.lang.Override
 
@@ -706,7 +766,11 @@ public Builder clearFightPropMap() {
         return this;
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 13;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 10;</code>
        */
 
       public Builder removeFightPropMap(
@@ -725,7 +789,11 @@ public Builder removeFightPropMap(
         return internalGetMutableFightPropMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 13;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 10;</code>
        */
       public Builder putFightPropMap(
           int key,
@@ -737,7 +805,11 @@ public Builder putFightPropMap(
         return this;
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 13;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 10;</code>
        */
 
       public Builder putAllFightPropMap(
@@ -749,6 +821,10 @@ public Builder putAllFightPropMap(
 
       private int entityId_ ;
       /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
        * <code>uint32 entity_id = 14;</code>
        * @return The entityId.
        */
@@ -757,6 +833,10 @@ public int getEntityId() {
         return entityId_;
       }
       /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
        * <code>uint32 entity_id = 14;</code>
        * @param value The entityId to set.
        * @return This builder for chaining.
@@ -768,6 +848,10 @@ public Builder setEntityId(int value) {
         return this;
       }
       /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
        * <code>uint32 entity_id = 14;</code>
        * @return This builder for chaining.
        */
@@ -851,7 +935,7 @@ public emu.grasscutter.net.proto.EntityFightPropUpdateNotifyOuterClass.EntityFig
     java.lang.String[] descriptorData = {
       "\n!EntityFightPropUpdateNotify.proto\"\255\001\n\033" +
       "EntityFightPropUpdateNotify\022F\n\016fight_pro" +
-      "p_map\030\r \003(\0132..EntityFightPropUpdateNotif" +
+      "p_map\030\n \003(\0132..EntityFightPropUpdateNotif" +
       "y.FightPropMapEntry\022\021\n\tentity_id\030\016 \001(\r\0323" +
       "\n\021FightPropMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005valu" +
       "e\030\002 \001(\002:\0028\001B\033\n\031emu.grasscutter.net.proto" +
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarLockChairRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarLockChairRspOuterClass.java
index f82f6b70dd7..32f59e710dd 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarLockChairRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarLockChairRspOuterClass.java
@@ -19,47 +19,75 @@ public interface EvtAvatarLockChairRspOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 entity_id = 1;</code>
-     * @return The entityId.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.Vector position = 4;</code>
+     * @return Whether the position field is set.
      */
-    int getEntityId();
+    boolean hasPosition();
+    /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.Vector position = 4;</code>
+     * @return The position.
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition();
+    /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.Vector position = 4;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder();
 
     /**
-     * <code>int32 direction = 4;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>int32 direction = 10;</code>
      * @return The direction.
      */
     int getDirection();
 
     /**
-     * <code>int32 retcode = 5;</code>
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>int32 retcode = 14;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>uint64 chair_id = 8;</code>
-     * @return The chairId.
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>uint32 entity_id = 3;</code>
+     * @return The entityId.
      */
-    long getChairId();
+    int getEntityId();
 
     /**
-     * <code>.Vector position = 12;</code>
-     * @return Whether the position field is set.
-     */
-    boolean hasPosition();
-    /**
-     * <code>.Vector position = 12;</code>
-     * @return The position.
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition();
-    /**
-     * <code>.Vector position = 12;</code>
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>uint64 chair_id = 6;</code>
+     * @return The chairId.
      */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder();
+    long getChairId();
   }
   /**
    * <pre>
-   * CmdId: 5831
+   * CmdId: 25542
    * </pre>
    *
    * Protobuf type {@code EvtAvatarLockChairRsp}
@@ -106,27 +134,12 @@ private EvtAvatarLockChairRsp(
             case 0:
               done = true;
               break;
-            case 8: {
+            case 24: {
 
               entityId_ = input.readUInt32();
               break;
             }
-            case 32: {
-
-              direction_ = input.readInt32();
-              break;
-            }
-            case 40: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 64: {
-
-              chairId_ = input.readUInt64();
-              break;
-            }
-            case 98: {
+            case 34: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (position_ != null) {
                 subBuilder = position_.toBuilder();
@@ -139,6 +152,21 @@ private EvtAvatarLockChairRsp(
 
               break;
             }
+            case 48: {
+
+              chairId_ = input.readUInt64();
+              break;
+            }
+            case 80: {
+
+              direction_ = input.readInt32();
+              break;
+            }
+            case 112: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -171,21 +199,52 @@ private EvtAvatarLockChairRsp(
               emu.grasscutter.net.proto.EvtAvatarLockChairRspOuterClass.EvtAvatarLockChairRsp.class, emu.grasscutter.net.proto.EvtAvatarLockChairRspOuterClass.EvtAvatarLockChairRsp.Builder.class);
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 1;
-    private int entityId_;
+    public static final int POSITION_FIELD_NUMBER = 4;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector position_;
     /**
-     * <code>uint32 entity_id = 1;</code>
-     * @return The entityId.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.Vector position = 4;</code>
+     * @return Whether the position field is set.
      */
     @java.lang.Override
-    public int getEntityId() {
-      return entityId_;
+    public boolean hasPosition() {
+      return position_ != null;
+    }
+    /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.Vector position = 4;</code>
+     * @return The position.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition() {
+      return position_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : position_;
+    }
+    /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.Vector position = 4;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder() {
+      return getPosition();
     }
 
-    public static final int DIRECTION_FIELD_NUMBER = 4;
+    public static final int DIRECTION_FIELD_NUMBER = 10;
     private int direction_;
     /**
-     * <code>int32 direction = 4;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>int32 direction = 10;</code>
      * @return The direction.
      */
     @java.lang.Override
@@ -193,10 +252,14 @@ public int getDirection() {
       return direction_;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 5;
+    public static final int RETCODE_FIELD_NUMBER = 14;
     private int retcode_;
     /**
-     * <code>int32 retcode = 5;</code>
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>int32 retcode = 14;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -204,41 +267,34 @@ public int getRetcode() {
       return retcode_;
     }
 
-    public static final int CHAIR_ID_FIELD_NUMBER = 8;
-    private long chairId_;
+    public static final int ENTITY_ID_FIELD_NUMBER = 3;
+    private int entityId_;
     /**
-     * <code>uint64 chair_id = 8;</code>
-     * @return The chairId.
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>uint32 entity_id = 3;</code>
+     * @return The entityId.
      */
     @java.lang.Override
-    public long getChairId() {
-      return chairId_;
+    public int getEntityId() {
+      return entityId_;
     }
 
-    public static final int POSITION_FIELD_NUMBER = 12;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector position_;
-    /**
-     * <code>.Vector position = 12;</code>
-     * @return Whether the position field is set.
-     */
-    @java.lang.Override
-    public boolean hasPosition() {
-      return position_ != null;
-    }
-    /**
-     * <code>.Vector position = 12;</code>
-     * @return The position.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition() {
-      return position_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : position_;
-    }
+    public static final int CHAIR_ID_FIELD_NUMBER = 6;
+    private long chairId_;
     /**
-     * <code>.Vector position = 12;</code>
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>uint64 chair_id = 6;</code>
+     * @return The chairId.
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder() {
-      return getPosition();
+    public long getChairId() {
+      return chairId_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -256,19 +312,19 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (entityId_ != 0) {
-        output.writeUInt32(1, entityId_);
+        output.writeUInt32(3, entityId_);
       }
-      if (direction_ != 0) {
-        output.writeInt32(4, direction_);
-      }
-      if (retcode_ != 0) {
-        output.writeInt32(5, retcode_);
+      if (position_ != null) {
+        output.writeMessage(4, getPosition());
       }
       if (chairId_ != 0L) {
-        output.writeUInt64(8, chairId_);
+        output.writeUInt64(6, chairId_);
       }
-      if (position_ != null) {
-        output.writeMessage(12, getPosition());
+      if (direction_ != 0) {
+        output.writeInt32(10, direction_);
+      }
+      if (retcode_ != 0) {
+        output.writeInt32(14, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -281,23 +337,23 @@ public int getSerializedSize() {
       size = 0;
       if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, entityId_);
+          .computeUInt32Size(3, entityId_);
       }
-      if (direction_ != 0) {
+      if (position_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(4, direction_);
+          .computeMessageSize(4, getPosition());
       }
-      if (retcode_ != 0) {
+      if (chairId_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(5, retcode_);
+          .computeUInt64Size(6, chairId_);
       }
-      if (chairId_ != 0L) {
+      if (direction_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(8, chairId_);
+          .computeInt32Size(10, direction_);
       }
-      if (position_ != null) {
+      if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(12, getPosition());
+          .computeInt32Size(14, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -314,19 +370,19 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.EvtAvatarLockChairRspOuterClass.EvtAvatarLockChairRsp other = (emu.grasscutter.net.proto.EvtAvatarLockChairRspOuterClass.EvtAvatarLockChairRsp) obj;
 
-      if (getEntityId()
-          != other.getEntityId()) return false;
+      if (hasPosition() != other.hasPosition()) return false;
+      if (hasPosition()) {
+        if (!getPosition()
+            .equals(other.getPosition())) return false;
+      }
       if (getDirection()
           != other.getDirection()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (getEntityId()
+          != other.getEntityId()) return false;
       if (getChairId()
           != other.getChairId()) return false;
-      if (hasPosition() != other.hasPosition()) return false;
-      if (hasPosition()) {
-        if (!getPosition()
-            .equals(other.getPosition())) return false;
-      }
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -338,19 +394,19 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getEntityId();
+      if (hasPosition()) {
+        hash = (37 * hash) + POSITION_FIELD_NUMBER;
+        hash = (53 * hash) + getPosition().hashCode();
+      }
       hash = (37 * hash) + DIRECTION_FIELD_NUMBER;
       hash = (53 * hash) + getDirection();
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getEntityId();
       hash = (37 * hash) + CHAIR_ID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getChairId());
-      if (hasPosition()) {
-        hash = (37 * hash) + POSITION_FIELD_NUMBER;
-        hash = (53 * hash) + getPosition().hashCode();
-      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -448,7 +504,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 5831
+     * CmdId: 25542
      * </pre>
      *
      * Protobuf type {@code EvtAvatarLockChairRsp}
@@ -488,20 +544,20 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        entityId_ = 0;
-
-        direction_ = 0;
-
-        retcode_ = 0;
-
-        chairId_ = 0L;
-
         if (positionBuilder_ == null) {
           position_ = null;
         } else {
           position_ = null;
           positionBuilder_ = null;
         }
+        direction_ = 0;
+
+        retcode_ = 0;
+
+        entityId_ = 0;
+
+        chairId_ = 0L;
+
         return this;
       }
 
@@ -528,15 +584,15 @@ public emu.grasscutter.net.proto.EvtAvatarLockChairRspOuterClass.EvtAvatarLockCh
       @java.lang.Override
       public emu.grasscutter.net.proto.EvtAvatarLockChairRspOuterClass.EvtAvatarLockChairRsp buildPartial() {
         emu.grasscutter.net.proto.EvtAvatarLockChairRspOuterClass.EvtAvatarLockChairRsp result = new emu.grasscutter.net.proto.EvtAvatarLockChairRspOuterClass.EvtAvatarLockChairRsp(this);
-        result.entityId_ = entityId_;
-        result.direction_ = direction_;
-        result.retcode_ = retcode_;
-        result.chairId_ = chairId_;
         if (positionBuilder_ == null) {
           result.position_ = position_;
         } else {
           result.position_ = positionBuilder_.build();
         }
+        result.direction_ = direction_;
+        result.retcode_ = retcode_;
+        result.entityId_ = entityId_;
+        result.chairId_ = chairId_;
         onBuilt();
         return result;
       }
@@ -585,8 +641,8 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.EvtAvatarLockChairRspOuterClass.EvtAvatarLockChairRsp other) {
         if (other == emu.grasscutter.net.proto.EvtAvatarLockChairRspOuterClass.EvtAvatarLockChairRsp.getDefaultInstance()) return this;
-        if (other.getEntityId() != 0) {
-          setEntityId(other.getEntityId());
+        if (other.hasPosition()) {
+          mergePosition(other.getPosition());
         }
         if (other.getDirection() != 0) {
           setDirection(other.getDirection());
@@ -594,12 +650,12 @@ public Builder mergeFrom(emu.grasscutter.net.proto.EvtAvatarLockChairRspOuterCla
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
+        if (other.getEntityId() != 0) {
+          setEntityId(other.getEntityId());
+        }
         if (other.getChairId() != 0L) {
           setChairId(other.getChairId());
         }
-        if (other.hasPosition()) {
-          mergePosition(other.getPosition());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -629,142 +685,26 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int entityId_ ;
-      /**
-       * <code>uint32 entity_id = 1;</code>
-       * @return The entityId.
-       */
-      @java.lang.Override
-      public int getEntityId() {
-        return entityId_;
-      }
-      /**
-       * <code>uint32 entity_id = 1;</code>
-       * @param value The entityId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEntityId(int value) {
-        
-        entityId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 entity_id = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEntityId() {
-        
-        entityId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int direction_ ;
-      /**
-       * <code>int32 direction = 4;</code>
-       * @return The direction.
-       */
-      @java.lang.Override
-      public int getDirection() {
-        return direction_;
-      }
-      /**
-       * <code>int32 direction = 4;</code>
-       * @param value The direction to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDirection(int value) {
-        
-        direction_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>int32 direction = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearDirection() {
-        
-        direction_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 5;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <code>int32 retcode = 5;</code>
-       * @param value The retcode to set.
-       * @return This builder for chaining.
-       */
-      public Builder setRetcode(int value) {
-        
-        retcode_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>int32 retcode = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private long chairId_ ;
-      /**
-       * <code>uint64 chair_id = 8;</code>
-       * @return The chairId.
-       */
-      @java.lang.Override
-      public long getChairId() {
-        return chairId_;
-      }
-      /**
-       * <code>uint64 chair_id = 8;</code>
-       * @param value The chairId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setChairId(long value) {
-        
-        chairId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 chair_id = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearChairId() {
-        
-        chairId_ = 0L;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.VectorOuterClass.Vector position_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> positionBuilder_;
       /**
-       * <code>.Vector position = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.Vector position = 4;</code>
        * @return Whether the position field is set.
        */
       public boolean hasPosition() {
         return positionBuilder_ != null || position_ != null;
       }
       /**
-       * <code>.Vector position = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.Vector position = 4;</code>
        * @return The position.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition() {
@@ -775,7 +715,11 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition() {
         }
       }
       /**
-       * <code>.Vector position = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.Vector position = 4;</code>
        */
       public Builder setPosition(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (positionBuilder_ == null) {
@@ -791,7 +735,11 @@ public Builder setPosition(emu.grasscutter.net.proto.VectorOuterClass.Vector val
         return this;
       }
       /**
-       * <code>.Vector position = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.Vector position = 4;</code>
        */
       public Builder setPosition(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -805,7 +753,11 @@ public Builder setPosition(
         return this;
       }
       /**
-       * <code>.Vector position = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.Vector position = 4;</code>
        */
       public Builder mergePosition(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (positionBuilder_ == null) {
@@ -823,7 +775,11 @@ public Builder mergePosition(emu.grasscutter.net.proto.VectorOuterClass.Vector v
         return this;
       }
       /**
-       * <code>.Vector position = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.Vector position = 4;</code>
        */
       public Builder clearPosition() {
         if (positionBuilder_ == null) {
@@ -837,7 +793,11 @@ public Builder clearPosition() {
         return this;
       }
       /**
-       * <code>.Vector position = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.Vector position = 4;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPositionBuilder() {
         
@@ -845,7 +805,11 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPositionBuil
         return getPositionFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector position = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.Vector position = 4;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder() {
         if (positionBuilder_ != null) {
@@ -856,7 +820,11 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrB
         }
       }
       /**
-       * <code>.Vector position = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.Vector position = 4;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
@@ -871,6 +839,178 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrB
         }
         return positionBuilder_;
       }
+
+      private int direction_ ;
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>int32 direction = 10;</code>
+       * @return The direction.
+       */
+      @java.lang.Override
+      public int getDirection() {
+        return direction_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>int32 direction = 10;</code>
+       * @param value The direction to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDirection(int value) {
+        
+        direction_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>int32 direction = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDirection() {
+        
+        direction_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int retcode_ ;
+      /**
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>int32 retcode = 14;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>int32 retcode = 14;</code>
+       * @param value The retcode to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRetcode(int value) {
+        
+        retcode_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>int32 retcode = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRetcode() {
+        
+        retcode_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int entityId_ ;
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint32 entity_id = 3;</code>
+       * @return The entityId.
+       */
+      @java.lang.Override
+      public int getEntityId() {
+        return entityId_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint32 entity_id = 3;</code>
+       * @param value The entityId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setEntityId(int value) {
+        
+        entityId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint32 entity_id = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEntityId() {
+        
+        entityId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private long chairId_ ;
+      /**
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>uint64 chair_id = 6;</code>
+       * @return The chairId.
+       */
+      @java.lang.Override
+      public long getChairId() {
+        return chairId_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>uint64 chair_id = 6;</code>
+       * @param value The chairId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setChairId(long value) {
+        
+        chairId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>uint64 chair_id = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearChairId() {
+        
+        chairId_ = 0L;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -939,10 +1079,10 @@ public emu.grasscutter.net.proto.EvtAvatarLockChairRspOuterClass.EvtAvatarLockCh
   static {
     java.lang.String[] descriptorData = {
       "\n\033EvtAvatarLockChairRsp.proto\032\014Vector.pr" +
-      "oto\"{\n\025EvtAvatarLockChairRsp\022\021\n\tentity_i" +
-      "d\030\001 \001(\r\022\021\n\tdirection\030\004 \001(\005\022\017\n\007retcode\030\005 " +
-      "\001(\005\022\020\n\010chair_id\030\010 \001(\004\022\031\n\010position\030\014 \001(\0132" +
-      "\007.VectorB\033\n\031emu.grasscutter.net.protob\006p" +
+      "oto\"{\n\025EvtAvatarLockChairRsp\022\031\n\010position" +
+      "\030\004 \001(\0132\007.Vector\022\021\n\tdirection\030\n \001(\005\022\017\n\007re" +
+      "tcode\030\016 \001(\005\022\021\n\tentity_id\030\003 \001(\r\022\020\n\010chair_" +
+      "id\030\006 \001(\004B\033\n\031emu.grasscutter.net.protob\006p" +
       "roto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -955,7 +1095,7 @@ public emu.grasscutter.net.proto.EvtAvatarLockChairRspOuterClass.EvtAvatarLockCh
     internal_static_EvtAvatarLockChairRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EvtAvatarLockChairRsp_descriptor,
-        new java.lang.String[] { "EntityId", "Direction", "Retcode", "ChairId", "Position", });
+        new java.lang.String[] { "Position", "Direction", "Retcode", "EntityId", "ChairId", });
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarStandUpNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarStandUpNotifyOuterClass.java
index 6e04ab5098c..b16668b2522 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarStandUpNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarStandUpNotifyOuterClass.java
@@ -19,32 +19,48 @@ public interface EvtAvatarStandUpNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 chair_id = 3;</code>
-     * @return The chairId.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>int32 perform_id = 3;</code>
+     * @return The performId.
      */
-    long getChairId();
+    int getPerformId();
 
     /**
-     * <code>int32 perform_id = 7;</code>
-     * @return The performId.
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>int32 direction = 9;</code>
+     * @return The direction.
      */
-    int getPerformId();
+    int getDirection();
 
     /**
-     * <code>uint32 entity_id = 13;</code>
-     * @return The entityId.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint64 chair_id = 15;</code>
+     * @return The chairId.
      */
-    int getEntityId();
+    long getChairId();
 
     /**
-     * <code>int32 direction = 14;</code>
-     * @return The direction.
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>uint32 entity_id = 11;</code>
+     * @return The entityId.
      */
-    int getDirection();
+    int getEntityId();
   }
   /**
    * <pre>
-   * CmdId: 28594
+   * CmdId: 9534
    * </pre>
    *
    * Protobuf type {@code EvtAvatarStandUpNotify}
@@ -93,22 +109,22 @@ private EvtAvatarStandUpNotify(
               break;
             case 24: {
 
-              chairId_ = input.readUInt64();
+              performId_ = input.readInt32();
               break;
             }
-            case 56: {
+            case 72: {
 
-              performId_ = input.readInt32();
+              direction_ = input.readInt32();
               break;
             }
-            case 104: {
+            case 88: {
 
               entityId_ = input.readUInt32();
               break;
             }
-            case 112: {
+            case 120: {
 
-              direction_ = input.readInt32();
+              chairId_ = input.readUInt64();
               break;
             }
             default: {
@@ -143,48 +159,64 @@ private EvtAvatarStandUpNotify(
               emu.grasscutter.net.proto.EvtAvatarStandUpNotifyOuterClass.EvtAvatarStandUpNotify.class, emu.grasscutter.net.proto.EvtAvatarStandUpNotifyOuterClass.EvtAvatarStandUpNotify.Builder.class);
     }
 
-    public static final int CHAIR_ID_FIELD_NUMBER = 3;
-    private long chairId_;
+    public static final int PERFORM_ID_FIELD_NUMBER = 3;
+    private int performId_;
     /**
-     * <code>uint64 chair_id = 3;</code>
-     * @return The chairId.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>int32 perform_id = 3;</code>
+     * @return The performId.
      */
     @java.lang.Override
-    public long getChairId() {
-      return chairId_;
+    public int getPerformId() {
+      return performId_;
     }
 
-    public static final int PERFORM_ID_FIELD_NUMBER = 7;
-    private int performId_;
+    public static final int DIRECTION_FIELD_NUMBER = 9;
+    private int direction_;
     /**
-     * <code>int32 perform_id = 7;</code>
-     * @return The performId.
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>int32 direction = 9;</code>
+     * @return The direction.
      */
     @java.lang.Override
-    public int getPerformId() {
-      return performId_;
+    public int getDirection() {
+      return direction_;
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 13;
-    private int entityId_;
+    public static final int CHAIR_ID_FIELD_NUMBER = 15;
+    private long chairId_;
     /**
-     * <code>uint32 entity_id = 13;</code>
-     * @return The entityId.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint64 chair_id = 15;</code>
+     * @return The chairId.
      */
     @java.lang.Override
-    public int getEntityId() {
-      return entityId_;
+    public long getChairId() {
+      return chairId_;
     }
 
-    public static final int DIRECTION_FIELD_NUMBER = 14;
-    private int direction_;
+    public static final int ENTITY_ID_FIELD_NUMBER = 11;
+    private int entityId_;
     /**
-     * <code>int32 direction = 14;</code>
-     * @return The direction.
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>uint32 entity_id = 11;</code>
+     * @return The entityId.
      */
     @java.lang.Override
-    public int getDirection() {
-      return direction_;
+    public int getEntityId() {
+      return entityId_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -201,17 +233,17 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (chairId_ != 0L) {
-        output.writeUInt64(3, chairId_);
-      }
       if (performId_ != 0) {
-        output.writeInt32(7, performId_);
+        output.writeInt32(3, performId_);
+      }
+      if (direction_ != 0) {
+        output.writeInt32(9, direction_);
       }
       if (entityId_ != 0) {
-        output.writeUInt32(13, entityId_);
+        output.writeUInt32(11, entityId_);
       }
-      if (direction_ != 0) {
-        output.writeInt32(14, direction_);
+      if (chairId_ != 0L) {
+        output.writeUInt64(15, chairId_);
       }
       unknownFields.writeTo(output);
     }
@@ -222,21 +254,21 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (chairId_ != 0L) {
+      if (performId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(3, chairId_);
+          .computeInt32Size(3, performId_);
       }
-      if (performId_ != 0) {
+      if (direction_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(7, performId_);
+          .computeInt32Size(9, direction_);
       }
       if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, entityId_);
+          .computeUInt32Size(11, entityId_);
       }
-      if (direction_ != 0) {
+      if (chairId_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(14, direction_);
+          .computeUInt64Size(15, chairId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -253,14 +285,14 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.EvtAvatarStandUpNotifyOuterClass.EvtAvatarStandUpNotify other = (emu.grasscutter.net.proto.EvtAvatarStandUpNotifyOuterClass.EvtAvatarStandUpNotify) obj;
 
-      if (getChairId()
-          != other.getChairId()) return false;
       if (getPerformId()
           != other.getPerformId()) return false;
-      if (getEntityId()
-          != other.getEntityId()) return false;
       if (getDirection()
           != other.getDirection()) return false;
+      if (getChairId()
+          != other.getChairId()) return false;
+      if (getEntityId()
+          != other.getEntityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -272,15 +304,15 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + PERFORM_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getPerformId();
+      hash = (37 * hash) + DIRECTION_FIELD_NUMBER;
+      hash = (53 * hash) + getDirection();
       hash = (37 * hash) + CHAIR_ID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getChairId());
-      hash = (37 * hash) + PERFORM_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getPerformId();
       hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getEntityId();
-      hash = (37 * hash) + DIRECTION_FIELD_NUMBER;
-      hash = (53 * hash) + getDirection();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -378,7 +410,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 28594
+     * CmdId: 9534
      * </pre>
      *
      * Protobuf type {@code EvtAvatarStandUpNotify}
@@ -418,14 +450,14 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        chairId_ = 0L;
-
         performId_ = 0;
 
-        entityId_ = 0;
-
         direction_ = 0;
 
+        chairId_ = 0L;
+
+        entityId_ = 0;
+
         return this;
       }
 
@@ -452,10 +484,10 @@ public emu.grasscutter.net.proto.EvtAvatarStandUpNotifyOuterClass.EvtAvatarStand
       @java.lang.Override
       public emu.grasscutter.net.proto.EvtAvatarStandUpNotifyOuterClass.EvtAvatarStandUpNotify buildPartial() {
         emu.grasscutter.net.proto.EvtAvatarStandUpNotifyOuterClass.EvtAvatarStandUpNotify result = new emu.grasscutter.net.proto.EvtAvatarStandUpNotifyOuterClass.EvtAvatarStandUpNotify(this);
-        result.chairId_ = chairId_;
         result.performId_ = performId_;
-        result.entityId_ = entityId_;
         result.direction_ = direction_;
+        result.chairId_ = chairId_;
+        result.entityId_ = entityId_;
         onBuilt();
         return result;
       }
@@ -504,18 +536,18 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.EvtAvatarStandUpNotifyOuterClass.EvtAvatarStandUpNotify other) {
         if (other == emu.grasscutter.net.proto.EvtAvatarStandUpNotifyOuterClass.EvtAvatarStandUpNotify.getDefaultInstance()) return this;
-        if (other.getChairId() != 0L) {
-          setChairId(other.getChairId());
-        }
         if (other.getPerformId() != 0) {
           setPerformId(other.getPerformId());
         }
-        if (other.getEntityId() != 0) {
-          setEntityId(other.getEntityId());
-        }
         if (other.getDirection() != 0) {
           setDirection(other.getDirection());
         }
+        if (other.getChairId() != 0L) {
+          setChairId(other.getChairId());
+        }
+        if (other.getEntityId() != 0) {
+          setEntityId(other.getEntityId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -545,126 +577,174 @@ public Builder mergeFrom(
         return this;
       }
 
-      private long chairId_ ;
+      private int performId_ ;
       /**
-       * <code>uint64 chair_id = 3;</code>
-       * @return The chairId.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>int32 perform_id = 3;</code>
+       * @return The performId.
        */
       @java.lang.Override
-      public long getChairId() {
-        return chairId_;
+      public int getPerformId() {
+        return performId_;
       }
       /**
-       * <code>uint64 chair_id = 3;</code>
-       * @param value The chairId to set.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>int32 perform_id = 3;</code>
+       * @param value The performId to set.
        * @return This builder for chaining.
        */
-      public Builder setChairId(long value) {
+      public Builder setPerformId(int value) {
         
-        chairId_ = value;
+        performId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint64 chair_id = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>int32 perform_id = 3;</code>
        * @return This builder for chaining.
        */
-      public Builder clearChairId() {
+      public Builder clearPerformId() {
         
-        chairId_ = 0L;
+        performId_ = 0;
         onChanged();
         return this;
       }
 
-      private int performId_ ;
+      private int direction_ ;
       /**
-       * <code>int32 perform_id = 7;</code>
-       * @return The performId.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>int32 direction = 9;</code>
+       * @return The direction.
        */
       @java.lang.Override
-      public int getPerformId() {
-        return performId_;
+      public int getDirection() {
+        return direction_;
       }
       /**
-       * <code>int32 perform_id = 7;</code>
-       * @param value The performId to set.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>int32 direction = 9;</code>
+       * @param value The direction to set.
        * @return This builder for chaining.
        */
-      public Builder setPerformId(int value) {
+      public Builder setDirection(int value) {
         
-        performId_ = value;
+        direction_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>int32 perform_id = 7;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>int32 direction = 9;</code>
        * @return This builder for chaining.
        */
-      public Builder clearPerformId() {
+      public Builder clearDirection() {
         
-        performId_ = 0;
+        direction_ = 0;
         onChanged();
         return this;
       }
 
-      private int entityId_ ;
+      private long chairId_ ;
       /**
-       * <code>uint32 entity_id = 13;</code>
-       * @return The entityId.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint64 chair_id = 15;</code>
+       * @return The chairId.
        */
       @java.lang.Override
-      public int getEntityId() {
-        return entityId_;
+      public long getChairId() {
+        return chairId_;
       }
       /**
-       * <code>uint32 entity_id = 13;</code>
-       * @param value The entityId to set.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint64 chair_id = 15;</code>
+       * @param value The chairId to set.
        * @return This builder for chaining.
        */
-      public Builder setEntityId(int value) {
+      public Builder setChairId(long value) {
         
-        entityId_ = value;
+        chairId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 entity_id = 13;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint64 chair_id = 15;</code>
        * @return This builder for chaining.
        */
-      public Builder clearEntityId() {
+      public Builder clearChairId() {
         
-        entityId_ = 0;
+        chairId_ = 0L;
         onChanged();
         return this;
       }
 
-      private int direction_ ;
+      private int entityId_ ;
       /**
-       * <code>int32 direction = 14;</code>
-       * @return The direction.
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint32 entity_id = 11;</code>
+       * @return The entityId.
        */
       @java.lang.Override
-      public int getDirection() {
-        return direction_;
+      public int getEntityId() {
+        return entityId_;
       }
       /**
-       * <code>int32 direction = 14;</code>
-       * @param value The direction to set.
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint32 entity_id = 11;</code>
+       * @param value The entityId to set.
        * @return This builder for chaining.
        */
-      public Builder setDirection(int value) {
+      public Builder setEntityId(int value) {
         
-        direction_ = value;
+        entityId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>int32 direction = 14;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint32 entity_id = 11;</code>
        * @return This builder for chaining.
        */
-      public Builder clearDirection() {
+      public Builder clearEntityId() {
         
-        direction_ = 0;
+        entityId_ = 0;
         onChanged();
         return this;
       }
@@ -736,9 +816,9 @@ public emu.grasscutter.net.proto.EvtAvatarStandUpNotifyOuterClass.EvtAvatarStand
   static {
     java.lang.String[] descriptorData = {
       "\n\034EvtAvatarStandUpNotify.proto\"d\n\026EvtAva" +
-      "tarStandUpNotify\022\020\n\010chair_id\030\003 \001(\004\022\022\n\npe" +
-      "rform_id\030\007 \001(\005\022\021\n\tentity_id\030\r \001(\r\022\021\n\tdir" +
-      "ection\030\016 \001(\005B\033\n\031emu.grasscutter.net.prot" +
+      "tarStandUpNotify\022\022\n\nperform_id\030\003 \001(\005\022\021\n\t" +
+      "direction\030\t \001(\005\022\020\n\010chair_id\030\017 \001(\004\022\021\n\tent" +
+      "ity_id\030\013 \001(\rB\033\n\031emu.grasscutter.net.prot" +
       "ob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -750,7 +830,7 @@ public emu.grasscutter.net.proto.EvtAvatarStandUpNotifyOuterClass.EvtAvatarStand
     internal_static_EvtAvatarStandUpNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EvtAvatarStandUpNotify_descriptor,
-        new java.lang.String[] { "ChairId", "PerformId", "EntityId", "Direction", });
+        new java.lang.String[] { "PerformId", "Direction", "ChairId", "EntityId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EvtBeingHitInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EvtBeingHitInfoOuterClass.java
index 68d043f848a..f05e9be427d 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EvtBeingHitInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EvtBeingHitInfoOuterClass.java
@@ -19,31 +19,51 @@ public interface EvtBeingHitInfoOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 frame_num = 4;</code>
-     * @return The frameNum.
-     */
-    int getFrameNum();
-
-    /**
-     * <code>uint32 peer_id = 9;</code>
-     * @return The peerId.
-     */
-    int getPeerId();
-
-    /**
-     * <code>.AttackResult attack_result = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.AttackResult attack_result = 6;</code>
      * @return Whether the attackResult field is set.
      */
     boolean hasAttackResult();
     /**
-     * <code>.AttackResult attack_result = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.AttackResult attack_result = 6;</code>
      * @return The attackResult.
      */
     emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult getAttackResult();
     /**
-     * <code>.AttackResult attack_result = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.AttackResult attack_result = 6;</code>
      */
     emu.grasscutter.net.proto.AttackResultOuterClass.AttackResultOrBuilder getAttackResultOrBuilder();
+
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 peer_id = 5;</code>
+     * @return The peerId.
+     */
+    int getPeerId();
+
+    /**
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>uint32 frame_num = 13;</code>
+     * @return The frameNum.
+     */
+    int getFrameNum();
   }
   /**
    * Protobuf type {@code EvtBeingHitInfo}
@@ -90,17 +110,12 @@ private EvtBeingHitInfo(
             case 0:
               done = true;
               break;
-            case 32: {
-
-              frameNum_ = input.readUInt32();
-              break;
-            }
-            case 72: {
+            case 40: {
 
               peerId_ = input.readUInt32();
               break;
             }
-            case 98: {
+            case 50: {
               emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult.Builder subBuilder = null;
               if (attackResult_ != null) {
                 subBuilder = attackResult_.toBuilder();
@@ -113,6 +128,11 @@ private EvtBeingHitInfo(
 
               break;
             }
+            case 104: {
+
+              frameNum_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -145,32 +165,14 @@ private EvtBeingHitInfo(
               emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo.class, emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo.Builder.class);
     }
 
-    public static final int FRAME_NUM_FIELD_NUMBER = 4;
-    private int frameNum_;
-    /**
-     * <code>uint32 frame_num = 4;</code>
-     * @return The frameNum.
-     */
-    @java.lang.Override
-    public int getFrameNum() {
-      return frameNum_;
-    }
-
-    public static final int PEER_ID_FIELD_NUMBER = 9;
-    private int peerId_;
-    /**
-     * <code>uint32 peer_id = 9;</code>
-     * @return The peerId.
-     */
-    @java.lang.Override
-    public int getPeerId() {
-      return peerId_;
-    }
-
-    public static final int ATTACK_RESULT_FIELD_NUMBER = 12;
+    public static final int ATTACK_RESULT_FIELD_NUMBER = 6;
     private emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult attackResult_;
     /**
-     * <code>.AttackResult attack_result = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.AttackResult attack_result = 6;</code>
      * @return Whether the attackResult field is set.
      */
     @java.lang.Override
@@ -178,7 +180,11 @@ public boolean hasAttackResult() {
       return attackResult_ != null;
     }
     /**
-     * <code>.AttackResult attack_result = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.AttackResult attack_result = 6;</code>
      * @return The attackResult.
      */
     @java.lang.Override
@@ -186,13 +192,47 @@ public emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult getAttackRe
       return attackResult_ == null ? emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult.getDefaultInstance() : attackResult_;
     }
     /**
-     * <code>.AttackResult attack_result = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.AttackResult attack_result = 6;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AttackResultOuterClass.AttackResultOrBuilder getAttackResultOrBuilder() {
       return getAttackResult();
     }
 
+    public static final int PEER_ID_FIELD_NUMBER = 5;
+    private int peerId_;
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 peer_id = 5;</code>
+     * @return The peerId.
+     */
+    @java.lang.Override
+    public int getPeerId() {
+      return peerId_;
+    }
+
+    public static final int FRAME_NUM_FIELD_NUMBER = 13;
+    private int frameNum_;
+    /**
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>uint32 frame_num = 13;</code>
+     * @return The frameNum.
+     */
+    @java.lang.Override
+    public int getFrameNum() {
+      return frameNum_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -207,14 +247,14 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (frameNum_ != 0) {
-        output.writeUInt32(4, frameNum_);
-      }
       if (peerId_ != 0) {
-        output.writeUInt32(9, peerId_);
+        output.writeUInt32(5, peerId_);
       }
       if (attackResult_ != null) {
-        output.writeMessage(12, getAttackResult());
+        output.writeMessage(6, getAttackResult());
+      }
+      if (frameNum_ != 0) {
+        output.writeUInt32(13, frameNum_);
       }
       unknownFields.writeTo(output);
     }
@@ -225,17 +265,17 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (frameNum_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, frameNum_);
-      }
       if (peerId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, peerId_);
+          .computeUInt32Size(5, peerId_);
       }
       if (attackResult_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(12, getAttackResult());
+          .computeMessageSize(6, getAttackResult());
+      }
+      if (frameNum_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(13, frameNum_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -252,15 +292,15 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo other = (emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo) obj;
 
-      if (getFrameNum()
-          != other.getFrameNum()) return false;
-      if (getPeerId()
-          != other.getPeerId()) return false;
       if (hasAttackResult() != other.hasAttackResult()) return false;
       if (hasAttackResult()) {
         if (!getAttackResult()
             .equals(other.getAttackResult())) return false;
       }
+      if (getPeerId()
+          != other.getPeerId()) return false;
+      if (getFrameNum()
+          != other.getFrameNum()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -272,14 +312,14 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + FRAME_NUM_FIELD_NUMBER;
-      hash = (53 * hash) + getFrameNum();
-      hash = (37 * hash) + PEER_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getPeerId();
       if (hasAttackResult()) {
         hash = (37 * hash) + ATTACK_RESULT_FIELD_NUMBER;
         hash = (53 * hash) + getAttackResult().hashCode();
       }
+      hash = (37 * hash) + PEER_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getPeerId();
+      hash = (37 * hash) + FRAME_NUM_FIELD_NUMBER;
+      hash = (53 * hash) + getFrameNum();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -413,16 +453,16 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        frameNum_ = 0;
-
-        peerId_ = 0;
-
         if (attackResultBuilder_ == null) {
           attackResult_ = null;
         } else {
           attackResult_ = null;
           attackResultBuilder_ = null;
         }
+        peerId_ = 0;
+
+        frameNum_ = 0;
+
         return this;
       }
 
@@ -449,13 +489,13 @@ public emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo build
       @java.lang.Override
       public emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo buildPartial() {
         emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo result = new emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo(this);
-        result.frameNum_ = frameNum_;
-        result.peerId_ = peerId_;
         if (attackResultBuilder_ == null) {
           result.attackResult_ = attackResult_;
         } else {
           result.attackResult_ = attackResultBuilder_.build();
         }
+        result.peerId_ = peerId_;
+        result.frameNum_ = frameNum_;
         onBuilt();
         return result;
       }
@@ -504,14 +544,14 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo other) {
         if (other == emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo.getDefaultInstance()) return this;
-        if (other.getFrameNum() != 0) {
-          setFrameNum(other.getFrameNum());
+        if (other.hasAttackResult()) {
+          mergeAttackResult(other.getAttackResult());
         }
         if (other.getPeerId() != 0) {
           setPeerId(other.getPeerId());
         }
-        if (other.hasAttackResult()) {
-          mergeAttackResult(other.getAttackResult());
+        if (other.getFrameNum() != 0) {
+          setFrameNum(other.getFrameNum());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -542,80 +582,26 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int frameNum_ ;
-      /**
-       * <code>uint32 frame_num = 4;</code>
-       * @return The frameNum.
-       */
-      @java.lang.Override
-      public int getFrameNum() {
-        return frameNum_;
-      }
-      /**
-       * <code>uint32 frame_num = 4;</code>
-       * @param value The frameNum to set.
-       * @return This builder for chaining.
-       */
-      public Builder setFrameNum(int value) {
-        
-        frameNum_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 frame_num = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearFrameNum() {
-        
-        frameNum_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int peerId_ ;
-      /**
-       * <code>uint32 peer_id = 9;</code>
-       * @return The peerId.
-       */
-      @java.lang.Override
-      public int getPeerId() {
-        return peerId_;
-      }
-      /**
-       * <code>uint32 peer_id = 9;</code>
-       * @param value The peerId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPeerId(int value) {
-        
-        peerId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 peer_id = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPeerId() {
-        
-        peerId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult attackResult_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult, emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult.Builder, emu.grasscutter.net.proto.AttackResultOuterClass.AttackResultOrBuilder> attackResultBuilder_;
       /**
-       * <code>.AttackResult attack_result = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.AttackResult attack_result = 6;</code>
        * @return Whether the attackResult field is set.
        */
       public boolean hasAttackResult() {
         return attackResultBuilder_ != null || attackResult_ != null;
       }
       /**
-       * <code>.AttackResult attack_result = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.AttackResult attack_result = 6;</code>
        * @return The attackResult.
        */
       public emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult getAttackResult() {
@@ -626,7 +612,11 @@ public emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult getAttackRe
         }
       }
       /**
-       * <code>.AttackResult attack_result = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.AttackResult attack_result = 6;</code>
        */
       public Builder setAttackResult(emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult value) {
         if (attackResultBuilder_ == null) {
@@ -642,7 +632,11 @@ public Builder setAttackResult(emu.grasscutter.net.proto.AttackResultOuterClass.
         return this;
       }
       /**
-       * <code>.AttackResult attack_result = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.AttackResult attack_result = 6;</code>
        */
       public Builder setAttackResult(
           emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult.Builder builderForValue) {
@@ -656,7 +650,11 @@ public Builder setAttackResult(
         return this;
       }
       /**
-       * <code>.AttackResult attack_result = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.AttackResult attack_result = 6;</code>
        */
       public Builder mergeAttackResult(emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult value) {
         if (attackResultBuilder_ == null) {
@@ -674,7 +672,11 @@ public Builder mergeAttackResult(emu.grasscutter.net.proto.AttackResultOuterClas
         return this;
       }
       /**
-       * <code>.AttackResult attack_result = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.AttackResult attack_result = 6;</code>
        */
       public Builder clearAttackResult() {
         if (attackResultBuilder_ == null) {
@@ -688,7 +690,11 @@ public Builder clearAttackResult() {
         return this;
       }
       /**
-       * <code>.AttackResult attack_result = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.AttackResult attack_result = 6;</code>
        */
       public emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult.Builder getAttackResultBuilder() {
         
@@ -696,7 +702,11 @@ public emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult.Builder get
         return getAttackResultFieldBuilder().getBuilder();
       }
       /**
-       * <code>.AttackResult attack_result = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.AttackResult attack_result = 6;</code>
        */
       public emu.grasscutter.net.proto.AttackResultOuterClass.AttackResultOrBuilder getAttackResultOrBuilder() {
         if (attackResultBuilder_ != null) {
@@ -707,7 +717,11 @@ public emu.grasscutter.net.proto.AttackResultOuterClass.AttackResultOrBuilder ge
         }
       }
       /**
-       * <code>.AttackResult attack_result = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.AttackResult attack_result = 6;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult, emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult.Builder, emu.grasscutter.net.proto.AttackResultOuterClass.AttackResultOrBuilder> 
@@ -722,6 +736,92 @@ public emu.grasscutter.net.proto.AttackResultOuterClass.AttackResultOrBuilder ge
         }
         return attackResultBuilder_;
       }
+
+      private int peerId_ ;
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 peer_id = 5;</code>
+       * @return The peerId.
+       */
+      @java.lang.Override
+      public int getPeerId() {
+        return peerId_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 peer_id = 5;</code>
+       * @param value The peerId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPeerId(int value) {
+        
+        peerId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 peer_id = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPeerId() {
+        
+        peerId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int frameNum_ ;
+      /**
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 frame_num = 13;</code>
+       * @return The frameNum.
+       */
+      @java.lang.Override
+      public int getFrameNum() {
+        return frameNum_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 frame_num = 13;</code>
+       * @param value The frameNum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setFrameNum(int value) {
+        
+        frameNum_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 frame_num = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearFrameNum() {
+        
+        frameNum_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -790,9 +890,9 @@ public emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo getDe
   static {
     java.lang.String[] descriptorData = {
       "\n\025EvtBeingHitInfo.proto\032\022AttackResult.pr" +
-      "oto\"[\n\017EvtBeingHitInfo\022\021\n\tframe_num\030\004 \001(" +
-      "\r\022\017\n\007peer_id\030\t \001(\r\022$\n\rattack_result\030\014 \001(" +
-      "\0132\r.AttackResultB\033\n\031emu.grasscutter.net." +
+      "oto\"[\n\017EvtBeingHitInfo\022$\n\rattack_result\030" +
+      "\006 \001(\0132\r.AttackResult\022\017\n\007peer_id\030\005 \001(\r\022\021\n" +
+      "\tframe_num\030\r \001(\rB\033\n\031emu.grasscutter.net." +
       "protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -805,7 +905,7 @@ public emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo getDe
     internal_static_EvtBeingHitInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EvtBeingHitInfo_descriptor,
-        new java.lang.String[] { "FrameNum", "PeerId", "AttackResult", });
+        new java.lang.String[] { "AttackResult", "PeerId", "FrameNum", });
     emu.grasscutter.net.proto.AttackResultOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EvtDoSkillSuccNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EvtDoSkillSuccNotifyOuterClass.java
index 7eccf6d18b9..b4ccff5f722 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EvtDoSkillSuccNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EvtDoSkillSuccNotifyOuterClass.java
@@ -19,46 +19,74 @@ public interface EvtDoSkillSuccNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.Vector forward = 4;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.Vector forward = 2;</code>
      * @return Whether the forward field is set.
      */
     boolean hasForward();
     /**
-     * <code>.Vector forward = 4;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.Vector forward = 2;</code>
      * @return The forward.
      */
     emu.grasscutter.net.proto.VectorOuterClass.Vector getForward();
     /**
-     * <code>.Vector forward = 4;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.Vector forward = 2;</code>
      */
     emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getForwardOrBuilder();
 
     /**
-     * <code>uint32 skill_id = 11;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 skill_id = 15;</code>
      * @return The skillId.
      */
     int getSkillId();
 
     /**
-     * <code>.ForwardType forward_type = 6;</code>
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>uint32 caster_id = 10;</code>
+     * @return The casterId.
+     */
+    int getCasterId();
+
+    /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>.ForwardType forward_type = 11;</code>
      * @return The enum numeric value on the wire for forwardType.
      */
     int getForwardTypeValue();
     /**
-     * <code>.ForwardType forward_type = 6;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>.ForwardType forward_type = 11;</code>
      * @return The forwardType.
      */
     emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType();
-
-    /**
-     * <code>uint32 caster_id = 9;</code>
-     * @return The casterId.
-     */
-    int getCasterId();
   }
   /**
    * <pre>
-   * CmdId: 1941
+   * CmdId: 26782
    * </pre>
    *
    * Protobuf type {@code EvtDoSkillSuccNotify}
@@ -106,7 +134,7 @@ private EvtDoSkillSuccNotify(
             case 0:
               done = true;
               break;
-            case 34: {
+            case 18: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (forward_ != null) {
                 subBuilder = forward_.toBuilder();
@@ -119,18 +147,18 @@ private EvtDoSkillSuccNotify(
 
               break;
             }
-            case 48: {
-              int rawValue = input.readEnum();
+            case 80: {
 
-              forwardType_ = rawValue;
+              casterId_ = input.readUInt32();
               break;
             }
-            case 72: {
+            case 88: {
+              int rawValue = input.readEnum();
 
-              casterId_ = input.readUInt32();
+              forwardType_ = rawValue;
               break;
             }
-            case 88: {
+            case 120: {
 
               skillId_ = input.readUInt32();
               break;
@@ -167,10 +195,14 @@ private EvtDoSkillSuccNotify(
               emu.grasscutter.net.proto.EvtDoSkillSuccNotifyOuterClass.EvtDoSkillSuccNotify.class, emu.grasscutter.net.proto.EvtDoSkillSuccNotifyOuterClass.EvtDoSkillSuccNotify.Builder.class);
     }
 
-    public static final int FORWARD_FIELD_NUMBER = 4;
+    public static final int FORWARD_FIELD_NUMBER = 2;
     private emu.grasscutter.net.proto.VectorOuterClass.Vector forward_;
     /**
-     * <code>.Vector forward = 4;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.Vector forward = 2;</code>
      * @return Whether the forward field is set.
      */
     @java.lang.Override
@@ -178,7 +210,11 @@ public boolean hasForward() {
       return forward_ != null;
     }
     /**
-     * <code>.Vector forward = 4;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.Vector forward = 2;</code>
      * @return The forward.
      */
     @java.lang.Override
@@ -186,17 +222,25 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getForward() {
       return forward_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : forward_;
     }
     /**
-     * <code>.Vector forward = 4;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.Vector forward = 2;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getForwardOrBuilder() {
       return getForward();
     }
 
-    public static final int SKILL_ID_FIELD_NUMBER = 11;
+    public static final int SKILL_ID_FIELD_NUMBER = 15;
     private int skillId_;
     /**
-     * <code>uint32 skill_id = 11;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 skill_id = 15;</code>
      * @return The skillId.
      */
     @java.lang.Override
@@ -204,17 +248,40 @@ public int getSkillId() {
       return skillId_;
     }
 
-    public static final int FORWARD_TYPE_FIELD_NUMBER = 6;
+    public static final int CASTER_ID_FIELD_NUMBER = 10;
+    private int casterId_;
+    /**
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>uint32 caster_id = 10;</code>
+     * @return The casterId.
+     */
+    @java.lang.Override
+    public int getCasterId() {
+      return casterId_;
+    }
+
+    public static final int FORWARD_TYPE_FIELD_NUMBER = 11;
     private int forwardType_;
     /**
-     * <code>.ForwardType forward_type = 6;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>.ForwardType forward_type = 11;</code>
      * @return The enum numeric value on the wire for forwardType.
      */
     @java.lang.Override public int getForwardTypeValue() {
       return forwardType_;
     }
     /**
-     * <code>.ForwardType forward_type = 6;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>.ForwardType forward_type = 11;</code>
      * @return The forwardType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType() {
@@ -223,17 +290,6 @@ public int getSkillId() {
       return result == null ? emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.UNRECOGNIZED : result;
     }
 
-    public static final int CASTER_ID_FIELD_NUMBER = 9;
-    private int casterId_;
-    /**
-     * <code>uint32 caster_id = 9;</code>
-     * @return The casterId.
-     */
-    @java.lang.Override
-    public int getCasterId() {
-      return casterId_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -249,16 +305,16 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (forward_ != null) {
-        output.writeMessage(4, getForward());
-      }
-      if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) {
-        output.writeEnum(6, forwardType_);
+        output.writeMessage(2, getForward());
       }
       if (casterId_ != 0) {
-        output.writeUInt32(9, casterId_);
+        output.writeUInt32(10, casterId_);
+      }
+      if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) {
+        output.writeEnum(11, forwardType_);
       }
       if (skillId_ != 0) {
-        output.writeUInt32(11, skillId_);
+        output.writeUInt32(15, skillId_);
       }
       unknownFields.writeTo(output);
     }
@@ -271,19 +327,19 @@ public int getSerializedSize() {
       size = 0;
       if (forward_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, getForward());
+          .computeMessageSize(2, getForward());
       }
-      if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) {
+      if (casterId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(6, forwardType_);
+          .computeUInt32Size(10, casterId_);
       }
-      if (casterId_ != 0) {
+      if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, casterId_);
+          .computeEnumSize(11, forwardType_);
       }
       if (skillId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, skillId_);
+          .computeUInt32Size(15, skillId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -307,9 +363,9 @@ public boolean equals(final java.lang.Object obj) {
       }
       if (getSkillId()
           != other.getSkillId()) return false;
-      if (forwardType_ != other.forwardType_) return false;
       if (getCasterId()
           != other.getCasterId()) return false;
+      if (forwardType_ != other.forwardType_) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -327,10 +383,10 @@ public int hashCode() {
       }
       hash = (37 * hash) + SKILL_ID_FIELD_NUMBER;
       hash = (53 * hash) + getSkillId();
-      hash = (37 * hash) + FORWARD_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + forwardType_;
       hash = (37 * hash) + CASTER_ID_FIELD_NUMBER;
       hash = (53 * hash) + getCasterId();
+      hash = (37 * hash) + FORWARD_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + forwardType_;
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -428,7 +484,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 1941
+     * CmdId: 26782
      * </pre>
      *
      * Protobuf type {@code EvtDoSkillSuccNotify}
@@ -476,10 +532,10 @@ public Builder clear() {
         }
         skillId_ = 0;
 
-        forwardType_ = 0;
-
         casterId_ = 0;
 
+        forwardType_ = 0;
+
         return this;
       }
 
@@ -512,8 +568,8 @@ public emu.grasscutter.net.proto.EvtDoSkillSuccNotifyOuterClass.EvtDoSkillSuccNo
           result.forward_ = forwardBuilder_.build();
         }
         result.skillId_ = skillId_;
-        result.forwardType_ = forwardType_;
         result.casterId_ = casterId_;
+        result.forwardType_ = forwardType_;
         onBuilt();
         return result;
       }
@@ -568,12 +624,12 @@ public Builder mergeFrom(emu.grasscutter.net.proto.EvtDoSkillSuccNotifyOuterClas
         if (other.getSkillId() != 0) {
           setSkillId(other.getSkillId());
         }
-        if (other.forwardType_ != 0) {
-          setForwardTypeValue(other.getForwardTypeValue());
-        }
         if (other.getCasterId() != 0) {
           setCasterId(other.getCasterId());
         }
+        if (other.forwardType_ != 0) {
+          setForwardTypeValue(other.getForwardTypeValue());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -607,14 +663,22 @@ public Builder mergeFrom(
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> forwardBuilder_;
       /**
-       * <code>.Vector forward = 4;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.Vector forward = 2;</code>
        * @return Whether the forward field is set.
        */
       public boolean hasForward() {
         return forwardBuilder_ != null || forward_ != null;
       }
       /**
-       * <code>.Vector forward = 4;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.Vector forward = 2;</code>
        * @return The forward.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getForward() {
@@ -625,7 +689,11 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getForward() {
         }
       }
       /**
-       * <code>.Vector forward = 4;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.Vector forward = 2;</code>
        */
       public Builder setForward(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (forwardBuilder_ == null) {
@@ -641,7 +709,11 @@ public Builder setForward(emu.grasscutter.net.proto.VectorOuterClass.Vector valu
         return this;
       }
       /**
-       * <code>.Vector forward = 4;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.Vector forward = 2;</code>
        */
       public Builder setForward(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -655,7 +727,11 @@ public Builder setForward(
         return this;
       }
       /**
-       * <code>.Vector forward = 4;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.Vector forward = 2;</code>
        */
       public Builder mergeForward(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (forwardBuilder_ == null) {
@@ -673,7 +749,11 @@ public Builder mergeForward(emu.grasscutter.net.proto.VectorOuterClass.Vector va
         return this;
       }
       /**
-       * <code>.Vector forward = 4;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.Vector forward = 2;</code>
        */
       public Builder clearForward() {
         if (forwardBuilder_ == null) {
@@ -687,7 +767,11 @@ public Builder clearForward() {
         return this;
       }
       /**
-       * <code>.Vector forward = 4;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.Vector forward = 2;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getForwardBuilder() {
         
@@ -695,7 +779,11 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getForwardBuild
         return getForwardFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector forward = 4;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.Vector forward = 2;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getForwardOrBuilder() {
         if (forwardBuilder_ != null) {
@@ -706,7 +794,11 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getForwardOrBu
         }
       }
       /**
-       * <code>.Vector forward = 4;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.Vector forward = 2;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
@@ -724,7 +816,11 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getForwardOrBu
 
       private int skillId_ ;
       /**
-       * <code>uint32 skill_id = 11;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 skill_id = 15;</code>
        * @return The skillId.
        */
       @java.lang.Override
@@ -732,7 +828,11 @@ public int getSkillId() {
         return skillId_;
       }
       /**
-       * <code>uint32 skill_id = 11;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 skill_id = 15;</code>
        * @param value The skillId to set.
        * @return This builder for chaining.
        */
@@ -743,7 +843,11 @@ public Builder setSkillId(int value) {
         return this;
       }
       /**
-       * <code>uint32 skill_id = 11;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 skill_id = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearSkillId() {
@@ -753,16 +857,67 @@ public Builder clearSkillId() {
         return this;
       }
 
+      private int casterId_ ;
+      /**
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 caster_id = 10;</code>
+       * @return The casterId.
+       */
+      @java.lang.Override
+      public int getCasterId() {
+        return casterId_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 caster_id = 10;</code>
+       * @param value The casterId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCasterId(int value) {
+        
+        casterId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 caster_id = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCasterId() {
+        
+        casterId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int forwardType_ = 0;
       /**
-       * <code>.ForwardType forward_type = 6;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>.ForwardType forward_type = 11;</code>
        * @return The enum numeric value on the wire for forwardType.
        */
       @java.lang.Override public int getForwardTypeValue() {
         return forwardType_;
       }
       /**
-       * <code>.ForwardType forward_type = 6;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>.ForwardType forward_type = 11;</code>
        * @param value The enum numeric value on the wire for forwardType to set.
        * @return This builder for chaining.
        */
@@ -773,7 +928,11 @@ public Builder setForwardTypeValue(int value) {
         return this;
       }
       /**
-       * <code>.ForwardType forward_type = 6;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>.ForwardType forward_type = 11;</code>
        * @return The forwardType.
        */
       @java.lang.Override
@@ -783,7 +942,11 @@ public emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardTyp
         return result == null ? emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.ForwardType forward_type = 6;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>.ForwardType forward_type = 11;</code>
        * @param value The forwardType to set.
        * @return This builder for chaining.
        */
@@ -797,7 +960,11 @@ public Builder setForwardType(emu.grasscutter.net.proto.ForwardTypeOuterClass.Fo
         return this;
       }
       /**
-       * <code>.ForwardType forward_type = 6;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>.ForwardType forward_type = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearForwardType() {
@@ -806,37 +973,6 @@ public Builder clearForwardType() {
         onChanged();
         return this;
       }
-
-      private int casterId_ ;
-      /**
-       * <code>uint32 caster_id = 9;</code>
-       * @return The casterId.
-       */
-      @java.lang.Override
-      public int getCasterId() {
-        return casterId_;
-      }
-      /**
-       * <code>uint32 caster_id = 9;</code>
-       * @param value The casterId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCasterId(int value) {
-        
-        casterId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 caster_id = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCasterId() {
-        
-        casterId_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -906,9 +1042,9 @@ public emu.grasscutter.net.proto.EvtDoSkillSuccNotifyOuterClass.EvtDoSkillSuccNo
     java.lang.String[] descriptorData = {
       "\n\032EvtDoSkillSuccNotify.proto\032\014Vector.pro" +
       "to\032\021ForwardType.proto\"y\n\024EvtDoSkillSuccN" +
-      "otify\022\030\n\007forward\030\004 \001(\0132\007.Vector\022\020\n\010skill" +
-      "_id\030\013 \001(\r\022\"\n\014forward_type\030\006 \001(\0162\014.Forwar" +
-      "dType\022\021\n\tcaster_id\030\t \001(\rB\033\n\031emu.grasscut" +
+      "otify\022\030\n\007forward\030\002 \001(\0132\007.Vector\022\020\n\010skill" +
+      "_id\030\017 \001(\r\022\021\n\tcaster_id\030\n \001(\r\022\"\n\014forward_" +
+      "type\030\013 \001(\0162\014.ForwardTypeB\033\n\031emu.grasscut" +
       "ter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -922,7 +1058,7 @@ public emu.grasscutter.net.proto.EvtDoSkillSuccNotifyOuterClass.EvtDoSkillSuccNo
     internal_static_EvtDoSkillSuccNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EvtDoSkillSuccNotify_descriptor,
-        new java.lang.String[] { "Forward", "SkillId", "ForwardType", "CasterId", });
+        new java.lang.String[] { "Forward", "SkillId", "CasterId", "ForwardType", });
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
     emu.grasscutter.net.proto.ForwardTypeOuterClass.getDescriptor();
   }
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/FinishedParentQuestNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/FinishedParentQuestNotifyOuterClass.java
index 708391d885c..6068a71a32d 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/FinishedParentQuestNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/FinishedParentQuestNotifyOuterClass.java
@@ -19,32 +19,52 @@ public interface FinishedParentQuestNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 14;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .ParentQuest parent_quest_list = 12;</code>
      */
     java.util.List<emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest> 
         getParentQuestListList();
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 14;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .ParentQuest parent_quest_list = 12;</code>
      */
     emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest getParentQuestList(int index);
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 14;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .ParentQuest parent_quest_list = 12;</code>
      */
     int getParentQuestListCount();
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 14;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .ParentQuest parent_quest_list = 12;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuestOrBuilder> 
         getParentQuestListOrBuilderList();
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 14;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .ParentQuest parent_quest_list = 12;</code>
      */
     emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuestOrBuilder getParentQuestListOrBuilder(
         int index);
   }
   /**
    * <pre>
-   * CmdId: 25902
+   * CmdId: 4998
    * </pre>
    *
    * Protobuf type {@code FinishedParentQuestNotify}
@@ -93,7 +113,7 @@ private FinishedParentQuestNotify(
             case 0:
               done = true;
               break;
-            case 114: {
+            case 98: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 parentQuestList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest>();
                 mutable_bitField0_ |= 0x00000001;
@@ -137,17 +157,25 @@ private FinishedParentQuestNotify(
               emu.grasscutter.net.proto.FinishedParentQuestNotifyOuterClass.FinishedParentQuestNotify.class, emu.grasscutter.net.proto.FinishedParentQuestNotifyOuterClass.FinishedParentQuestNotify.Builder.class);
     }
 
-    public static final int PARENT_QUEST_LIST_FIELD_NUMBER = 14;
+    public static final int PARENT_QUEST_LIST_FIELD_NUMBER = 12;
     private java.util.List<emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest> parentQuestList_;
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 14;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .ParentQuest parent_quest_list = 12;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest> getParentQuestListList() {
       return parentQuestList_;
     }
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 14;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .ParentQuest parent_quest_list = 12;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuestOrBuilder> 
@@ -155,21 +183,33 @@ public java.util.List<emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQues
       return parentQuestList_;
     }
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 14;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .ParentQuest parent_quest_list = 12;</code>
      */
     @java.lang.Override
     public int getParentQuestListCount() {
       return parentQuestList_.size();
     }
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 14;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .ParentQuest parent_quest_list = 12;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest getParentQuestList(int index) {
       return parentQuestList_.get(index);
     }
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 14;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .ParentQuest parent_quest_list = 12;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuestOrBuilder getParentQuestListOrBuilder(
@@ -192,7 +232,7 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < parentQuestList_.size(); i++) {
-        output.writeMessage(14, parentQuestList_.get(i));
+        output.writeMessage(12, parentQuestList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -205,7 +245,7 @@ public int getSerializedSize() {
       size = 0;
       for (int i = 0; i < parentQuestList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(14, parentQuestList_.get(i));
+          .computeMessageSize(12, parentQuestList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -336,7 +376,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 25902
+     * CmdId: 4998
      * </pre>
      *
      * Protobuf type {@code FinishedParentQuestNotify}
@@ -536,7 +576,11 @@ private void ensureParentQuestListIsMutable() {
           emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest, emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.Builder, emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuestOrBuilder> parentQuestListBuilder_;
 
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ParentQuest parent_quest_list = 12;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest> getParentQuestListList() {
         if (parentQuestListBuilder_ == null) {
@@ -546,7 +590,11 @@ public java.util.List<emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQues
         }
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ParentQuest parent_quest_list = 12;</code>
        */
       public int getParentQuestListCount() {
         if (parentQuestListBuilder_ == null) {
@@ -556,7 +604,11 @@ public int getParentQuestListCount() {
         }
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ParentQuest parent_quest_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest getParentQuestList(int index) {
         if (parentQuestListBuilder_ == null) {
@@ -566,7 +618,11 @@ public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest getParentQues
         }
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ParentQuest parent_quest_list = 12;</code>
        */
       public Builder setParentQuestList(
           int index, emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest value) {
@@ -583,7 +639,11 @@ public Builder setParentQuestList(
         return this;
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ParentQuest parent_quest_list = 12;</code>
        */
       public Builder setParentQuestList(
           int index, emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.Builder builderForValue) {
@@ -597,7 +657,11 @@ public Builder setParentQuestList(
         return this;
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ParentQuest parent_quest_list = 12;</code>
        */
       public Builder addParentQuestList(emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest value) {
         if (parentQuestListBuilder_ == null) {
@@ -613,7 +677,11 @@ public Builder addParentQuestList(emu.grasscutter.net.proto.ParentQuestOuterClas
         return this;
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ParentQuest parent_quest_list = 12;</code>
        */
       public Builder addParentQuestList(
           int index, emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest value) {
@@ -630,7 +698,11 @@ public Builder addParentQuestList(
         return this;
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ParentQuest parent_quest_list = 12;</code>
        */
       public Builder addParentQuestList(
           emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.Builder builderForValue) {
@@ -644,7 +716,11 @@ public Builder addParentQuestList(
         return this;
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ParentQuest parent_quest_list = 12;</code>
        */
       public Builder addParentQuestList(
           int index, emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.Builder builderForValue) {
@@ -658,7 +734,11 @@ public Builder addParentQuestList(
         return this;
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ParentQuest parent_quest_list = 12;</code>
        */
       public Builder addAllParentQuestList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest> values) {
@@ -673,7 +753,11 @@ public Builder addAllParentQuestList(
         return this;
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ParentQuest parent_quest_list = 12;</code>
        */
       public Builder clearParentQuestList() {
         if (parentQuestListBuilder_ == null) {
@@ -686,7 +770,11 @@ public Builder clearParentQuestList() {
         return this;
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ParentQuest parent_quest_list = 12;</code>
        */
       public Builder removeParentQuestList(int index) {
         if (parentQuestListBuilder_ == null) {
@@ -699,14 +787,22 @@ public Builder removeParentQuestList(int index) {
         return this;
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ParentQuest parent_quest_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.Builder getParentQuestListBuilder(
           int index) {
         return getParentQuestListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ParentQuest parent_quest_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuestOrBuilder getParentQuestListOrBuilder(
           int index) {
@@ -716,7 +812,11 @@ public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuestOrBuilder getP
         }
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ParentQuest parent_quest_list = 12;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuestOrBuilder> 
            getParentQuestListOrBuilderList() {
@@ -727,14 +827,22 @@ public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuestOrBuilder getP
         }
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ParentQuest parent_quest_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.Builder addParentQuestListBuilder() {
         return getParentQuestListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.getDefaultInstance());
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ParentQuest parent_quest_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.Builder addParentQuestListBuilder(
           int index) {
@@ -742,7 +850,11 @@ public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.Builder addPa
             index, emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.getDefaultInstance());
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ParentQuest parent_quest_list = 12;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.Builder> 
            getParentQuestListBuilderList() {
@@ -831,7 +943,7 @@ public emu.grasscutter.net.proto.FinishedParentQuestNotifyOuterClass.FinishedPar
     java.lang.String[] descriptorData = {
       "\n\037FinishedParentQuestNotify.proto\032\021Paren" +
       "tQuest.proto\"D\n\031FinishedParentQuestNotif" +
-      "y\022\'\n\021parent_quest_list\030\016 \003(\0132\014.ParentQue" +
+      "y\022\'\n\021parent_quest_list\030\014 \003(\0132\014.ParentQue" +
       "stB\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/FinishedParentQuestUpdateNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/FinishedParentQuestUpdateNotifyOuterClass.java
index 3331df32bc2..e54c4b4eb29 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/FinishedParentQuestUpdateNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/FinishedParentQuestUpdateNotifyOuterClass.java
@@ -19,32 +19,52 @@ public interface FinishedParentQuestUpdateNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 11;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .ParentQuest parent_quest_list = 12;</code>
      */
     java.util.List<emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest> 
         getParentQuestListList();
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 11;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .ParentQuest parent_quest_list = 12;</code>
      */
     emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest getParentQuestList(int index);
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 11;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .ParentQuest parent_quest_list = 12;</code>
      */
     int getParentQuestListCount();
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 11;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .ParentQuest parent_quest_list = 12;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuestOrBuilder> 
         getParentQuestListOrBuilderList();
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 11;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .ParentQuest parent_quest_list = 12;</code>
      */
     emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuestOrBuilder getParentQuestListOrBuilder(
         int index);
   }
   /**
    * <pre>
-   * CmdId: 28362
+   * CmdId: 5859
    * </pre>
    *
    * Protobuf type {@code FinishedParentQuestUpdateNotify}
@@ -93,7 +113,7 @@ private FinishedParentQuestUpdateNotify(
             case 0:
               done = true;
               break;
-            case 90: {
+            case 98: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 parentQuestList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest>();
                 mutable_bitField0_ |= 0x00000001;
@@ -137,17 +157,25 @@ private FinishedParentQuestUpdateNotify(
               emu.grasscutter.net.proto.FinishedParentQuestUpdateNotifyOuterClass.FinishedParentQuestUpdateNotify.class, emu.grasscutter.net.proto.FinishedParentQuestUpdateNotifyOuterClass.FinishedParentQuestUpdateNotify.Builder.class);
     }
 
-    public static final int PARENT_QUEST_LIST_FIELD_NUMBER = 11;
+    public static final int PARENT_QUEST_LIST_FIELD_NUMBER = 12;
     private java.util.List<emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest> parentQuestList_;
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 11;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .ParentQuest parent_quest_list = 12;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest> getParentQuestListList() {
       return parentQuestList_;
     }
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 11;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .ParentQuest parent_quest_list = 12;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuestOrBuilder> 
@@ -155,21 +183,33 @@ public java.util.List<emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQues
       return parentQuestList_;
     }
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 11;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .ParentQuest parent_quest_list = 12;</code>
      */
     @java.lang.Override
     public int getParentQuestListCount() {
       return parentQuestList_.size();
     }
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 11;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .ParentQuest parent_quest_list = 12;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest getParentQuestList(int index) {
       return parentQuestList_.get(index);
     }
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 11;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .ParentQuest parent_quest_list = 12;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuestOrBuilder getParentQuestListOrBuilder(
@@ -192,7 +232,7 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < parentQuestList_.size(); i++) {
-        output.writeMessage(11, parentQuestList_.get(i));
+        output.writeMessage(12, parentQuestList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -205,7 +245,7 @@ public int getSerializedSize() {
       size = 0;
       for (int i = 0; i < parentQuestList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(11, parentQuestList_.get(i));
+          .computeMessageSize(12, parentQuestList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -336,7 +376,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 28362
+     * CmdId: 5859
      * </pre>
      *
      * Protobuf type {@code FinishedParentQuestUpdateNotify}
@@ -536,7 +576,11 @@ private void ensureParentQuestListIsMutable() {
           emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest, emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.Builder, emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuestOrBuilder> parentQuestListBuilder_;
 
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ParentQuest parent_quest_list = 12;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest> getParentQuestListList() {
         if (parentQuestListBuilder_ == null) {
@@ -546,7 +590,11 @@ public java.util.List<emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQues
         }
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ParentQuest parent_quest_list = 12;</code>
        */
       public int getParentQuestListCount() {
         if (parentQuestListBuilder_ == null) {
@@ -556,7 +604,11 @@ public int getParentQuestListCount() {
         }
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ParentQuest parent_quest_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest getParentQuestList(int index) {
         if (parentQuestListBuilder_ == null) {
@@ -566,7 +618,11 @@ public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest getParentQues
         }
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ParentQuest parent_quest_list = 12;</code>
        */
       public Builder setParentQuestList(
           int index, emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest value) {
@@ -583,7 +639,11 @@ public Builder setParentQuestList(
         return this;
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ParentQuest parent_quest_list = 12;</code>
        */
       public Builder setParentQuestList(
           int index, emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.Builder builderForValue) {
@@ -597,7 +657,11 @@ public Builder setParentQuestList(
         return this;
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ParentQuest parent_quest_list = 12;</code>
        */
       public Builder addParentQuestList(emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest value) {
         if (parentQuestListBuilder_ == null) {
@@ -613,7 +677,11 @@ public Builder addParentQuestList(emu.grasscutter.net.proto.ParentQuestOuterClas
         return this;
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ParentQuest parent_quest_list = 12;</code>
        */
       public Builder addParentQuestList(
           int index, emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest value) {
@@ -630,7 +698,11 @@ public Builder addParentQuestList(
         return this;
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ParentQuest parent_quest_list = 12;</code>
        */
       public Builder addParentQuestList(
           emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.Builder builderForValue) {
@@ -644,7 +716,11 @@ public Builder addParentQuestList(
         return this;
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ParentQuest parent_quest_list = 12;</code>
        */
       public Builder addParentQuestList(
           int index, emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.Builder builderForValue) {
@@ -658,7 +734,11 @@ public Builder addParentQuestList(
         return this;
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ParentQuest parent_quest_list = 12;</code>
        */
       public Builder addAllParentQuestList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest> values) {
@@ -673,7 +753,11 @@ public Builder addAllParentQuestList(
         return this;
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ParentQuest parent_quest_list = 12;</code>
        */
       public Builder clearParentQuestList() {
         if (parentQuestListBuilder_ == null) {
@@ -686,7 +770,11 @@ public Builder clearParentQuestList() {
         return this;
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ParentQuest parent_quest_list = 12;</code>
        */
       public Builder removeParentQuestList(int index) {
         if (parentQuestListBuilder_ == null) {
@@ -699,14 +787,22 @@ public Builder removeParentQuestList(int index) {
         return this;
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ParentQuest parent_quest_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.Builder getParentQuestListBuilder(
           int index) {
         return getParentQuestListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ParentQuest parent_quest_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuestOrBuilder getParentQuestListOrBuilder(
           int index) {
@@ -716,7 +812,11 @@ public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuestOrBuilder getP
         }
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ParentQuest parent_quest_list = 12;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuestOrBuilder> 
            getParentQuestListOrBuilderList() {
@@ -727,14 +827,22 @@ public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuestOrBuilder getP
         }
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ParentQuest parent_quest_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.Builder addParentQuestListBuilder() {
         return getParentQuestListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.getDefaultInstance());
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ParentQuest parent_quest_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.Builder addParentQuestListBuilder(
           int index) {
@@ -742,7 +850,11 @@ public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.Builder addPa
             index, emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.getDefaultInstance());
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .ParentQuest parent_quest_list = 12;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.Builder> 
            getParentQuestListBuilderList() {
@@ -831,7 +943,7 @@ public emu.grasscutter.net.proto.FinishedParentQuestUpdateNotifyOuterClass.Finis
     java.lang.String[] descriptorData = {
       "\n%FinishedParentQuestUpdateNotify.proto\032" +
       "\021ParentQuest.proto\"J\n\037FinishedParentQues" +
-      "tUpdateNotify\022\'\n\021parent_quest_list\030\013 \003(\013" +
+      "tUpdateNotify\022\'\n\021parent_quest_list\030\014 \003(\013" +
       "2\014.ParentQuestB\033\n\031emu.grasscutter.net.pr" +
       "otob\006proto3"
     };
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GadgetInteractReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GadgetInteractReqOuterClass.java
index c62d7898887..ccbbc32b83b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GadgetInteractReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GadgetInteractReqOuterClass.java
@@ -19,60 +19,86 @@ public interface GadgetInteractReqOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 ui_interact_id = 5;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>bool is_use_condense_resin = 4;</code>
+     * @return The isUseCondenseResin.
+     */
+    boolean getIsUseCondenseResin();
+
+    /**
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 ui_interact_id = 1;</code>
      * @return The uiInteractId.
      */
     int getUiInteractId();
 
     /**
-     * <code>.InterOpType op_type = 4;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 gadget_entity_id = 5;</code>
+     * @return The gadgetEntityId.
+     */
+    int getGadgetEntityId();
+
+    /**
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>.InterOpType op_type = 3;</code>
      * @return The enum numeric value on the wire for opType.
      */
     int getOpTypeValue();
     /**
-     * <code>.InterOpType op_type = 4;</code>
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>.InterOpType op_type = 3;</code>
      * @return The opType.
      */
     emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType getOpType();
 
     /**
-     * <code>bool is_use_condense_resin = 15;</code>
-     * @return The isUseCondenseResin.
-     */
-    boolean getIsUseCondenseResin();
-
-    /**
-     * <code>uint32 gadget_id = 3;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>uint32 gadget_id = 11;</code>
      * @return The gadgetId.
      */
     int getGadgetId();
 
     /**
-     * <code>.ResinCostType resin_cost_type = 11;</code>
+     * <pre>
+     * Offset: 0x34
+     * </pre>
+     *
+     * <code>.ResinCostType resin_cost_type = 8;</code>
      * @return The enum numeric value on the wire for resinCostType.
      */
     int getResinCostTypeValue();
     /**
-     * <code>.ResinCostType resin_cost_type = 11;</code>
+     * <pre>
+     * Offset: 0x34
+     * </pre>
+     *
+     * <code>.ResinCostType resin_cost_type = 8;</code>
      * @return The resinCostType.
      */
     emu.grasscutter.net.proto.ResinCostTypeOuterClass.ResinCostType getResinCostType();
-
-    /**
-     * <code>uint32 CHDDOFMLBLM = 9;</code>
-     * @return The cHDDOFMLBLM.
-     */
-    int getCHDDOFMLBLM();
-
-    /**
-     * <code>uint32 gadget_entity_id = 12;</code>
-     * @return The gadgetEntityId.
-     */
-    int getGadgetEntityId();
   }
   /**
    * <pre>
-   * CmdId: 26009
+   * CmdId: 25100
    * </pre>
    *
    * Protobuf type {@code GadgetInteractReq}
@@ -121,41 +147,36 @@ private GadgetInteractReq(
             case 0:
               done = true;
               break;
-            case 24: {
+            case 8: {
 
-              gadgetId_ = input.readUInt32();
+              uiInteractId_ = input.readUInt32();
               break;
             }
-            case 32: {
+            case 24: {
               int rawValue = input.readEnum();
 
               opType_ = rawValue;
               break;
             }
-            case 40: {
+            case 32: {
 
-              uiInteractId_ = input.readUInt32();
+              isUseCondenseResin_ = input.readBool();
               break;
             }
-            case 72: {
+            case 40: {
 
-              cHDDOFMLBLM_ = input.readUInt32();
+              gadgetEntityId_ = input.readUInt32();
               break;
             }
-            case 88: {
+            case 64: {
               int rawValue = input.readEnum();
 
               resinCostType_ = rawValue;
               break;
             }
-            case 96: {
-
-              gadgetEntityId_ = input.readUInt32();
-              break;
-            }
-            case 120: {
+            case 88: {
 
-              isUseCondenseResin_ = input.readBool();
+              gadgetId_ = input.readUInt32();
               break;
             }
             default: {
@@ -190,10 +211,29 @@ private GadgetInteractReq(
               emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq.class, emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq.Builder.class);
     }
 
-    public static final int UI_INTERACT_ID_FIELD_NUMBER = 5;
+    public static final int IS_USE_CONDENSE_RESIN_FIELD_NUMBER = 4;
+    private boolean isUseCondenseResin_;
+    /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>bool is_use_condense_resin = 4;</code>
+     * @return The isUseCondenseResin.
+     */
+    @java.lang.Override
+    public boolean getIsUseCondenseResin() {
+      return isUseCondenseResin_;
+    }
+
+    public static final int UI_INTERACT_ID_FIELD_NUMBER = 1;
     private int uiInteractId_;
     /**
-     * <code>uint32 ui_interact_id = 5;</code>
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 ui_interact_id = 1;</code>
      * @return The uiInteractId.
      */
     @java.lang.Override
@@ -201,17 +241,40 @@ public int getUiInteractId() {
       return uiInteractId_;
     }
 
-    public static final int OP_TYPE_FIELD_NUMBER = 4;
+    public static final int GADGET_ENTITY_ID_FIELD_NUMBER = 5;
+    private int gadgetEntityId_;
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 gadget_entity_id = 5;</code>
+     * @return The gadgetEntityId.
+     */
+    @java.lang.Override
+    public int getGadgetEntityId() {
+      return gadgetEntityId_;
+    }
+
+    public static final int OP_TYPE_FIELD_NUMBER = 3;
     private int opType_;
     /**
-     * <code>.InterOpType op_type = 4;</code>
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>.InterOpType op_type = 3;</code>
      * @return The enum numeric value on the wire for opType.
      */
     @java.lang.Override public int getOpTypeValue() {
       return opType_;
     }
     /**
-     * <code>.InterOpType op_type = 4;</code>
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>.InterOpType op_type = 3;</code>
      * @return The opType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType getOpType() {
@@ -220,21 +283,14 @@ public int getUiInteractId() {
       return result == null ? emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType.UNRECOGNIZED : result;
     }
 
-    public static final int IS_USE_CONDENSE_RESIN_FIELD_NUMBER = 15;
-    private boolean isUseCondenseResin_;
-    /**
-     * <code>bool is_use_condense_resin = 15;</code>
-     * @return The isUseCondenseResin.
-     */
-    @java.lang.Override
-    public boolean getIsUseCondenseResin() {
-      return isUseCondenseResin_;
-    }
-
-    public static final int GADGET_ID_FIELD_NUMBER = 3;
+    public static final int GADGET_ID_FIELD_NUMBER = 11;
     private int gadgetId_;
     /**
-     * <code>uint32 gadget_id = 3;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>uint32 gadget_id = 11;</code>
      * @return The gadgetId.
      */
     @java.lang.Override
@@ -242,17 +298,25 @@ public int getGadgetId() {
       return gadgetId_;
     }
 
-    public static final int RESIN_COST_TYPE_FIELD_NUMBER = 11;
+    public static final int RESIN_COST_TYPE_FIELD_NUMBER = 8;
     private int resinCostType_;
     /**
-     * <code>.ResinCostType resin_cost_type = 11;</code>
+     * <pre>
+     * Offset: 0x34
+     * </pre>
+     *
+     * <code>.ResinCostType resin_cost_type = 8;</code>
      * @return The enum numeric value on the wire for resinCostType.
      */
     @java.lang.Override public int getResinCostTypeValue() {
       return resinCostType_;
     }
     /**
-     * <code>.ResinCostType resin_cost_type = 11;</code>
+     * <pre>
+     * Offset: 0x34
+     * </pre>
+     *
+     * <code>.ResinCostType resin_cost_type = 8;</code>
      * @return The resinCostType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.ResinCostTypeOuterClass.ResinCostType getResinCostType() {
@@ -261,28 +325,6 @@ public int getGadgetId() {
       return result == null ? emu.grasscutter.net.proto.ResinCostTypeOuterClass.ResinCostType.UNRECOGNIZED : result;
     }
 
-    public static final int CHDDOFMLBLM_FIELD_NUMBER = 9;
-    private int cHDDOFMLBLM_;
-    /**
-     * <code>uint32 CHDDOFMLBLM = 9;</code>
-     * @return The cHDDOFMLBLM.
-     */
-    @java.lang.Override
-    public int getCHDDOFMLBLM() {
-      return cHDDOFMLBLM_;
-    }
-
-    public static final int GADGET_ENTITY_ID_FIELD_NUMBER = 12;
-    private int gadgetEntityId_;
-    /**
-     * <code>uint32 gadget_entity_id = 12;</code>
-     * @return The gadgetEntityId.
-     */
-    @java.lang.Override
-    public int getGadgetEntityId() {
-      return gadgetEntityId_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -297,26 +339,23 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (gadgetId_ != 0) {
-        output.writeUInt32(3, gadgetId_);
+      if (uiInteractId_ != 0) {
+        output.writeUInt32(1, uiInteractId_);
       }
       if (opType_ != emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType.INTER_OP_TYPE_FINISH.getNumber()) {
-        output.writeEnum(4, opType_);
+        output.writeEnum(3, opType_);
       }
-      if (uiInteractId_ != 0) {
-        output.writeUInt32(5, uiInteractId_);
+      if (isUseCondenseResin_ != false) {
+        output.writeBool(4, isUseCondenseResin_);
       }
-      if (cHDDOFMLBLM_ != 0) {
-        output.writeUInt32(9, cHDDOFMLBLM_);
+      if (gadgetEntityId_ != 0) {
+        output.writeUInt32(5, gadgetEntityId_);
       }
       if (resinCostType_ != emu.grasscutter.net.proto.ResinCostTypeOuterClass.ResinCostType.RESIN_COST_TYPE_NONE.getNumber()) {
-        output.writeEnum(11, resinCostType_);
-      }
-      if (gadgetEntityId_ != 0) {
-        output.writeUInt32(12, gadgetEntityId_);
+        output.writeEnum(8, resinCostType_);
       }
-      if (isUseCondenseResin_ != false) {
-        output.writeBool(15, isUseCondenseResin_);
+      if (gadgetId_ != 0) {
+        output.writeUInt32(11, gadgetId_);
       }
       unknownFields.writeTo(output);
     }
@@ -327,33 +366,29 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (gadgetId_ != 0) {
+      if (uiInteractId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, gadgetId_);
+          .computeUInt32Size(1, uiInteractId_);
       }
       if (opType_ != emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType.INTER_OP_TYPE_FINISH.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(4, opType_);
+          .computeEnumSize(3, opType_);
       }
-      if (uiInteractId_ != 0) {
+      if (isUseCondenseResin_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, uiInteractId_);
+          .computeBoolSize(4, isUseCondenseResin_);
       }
-      if (cHDDOFMLBLM_ != 0) {
+      if (gadgetEntityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, cHDDOFMLBLM_);
+          .computeUInt32Size(5, gadgetEntityId_);
       }
       if (resinCostType_ != emu.grasscutter.net.proto.ResinCostTypeOuterClass.ResinCostType.RESIN_COST_TYPE_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(11, resinCostType_);
-      }
-      if (gadgetEntityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, gadgetEntityId_);
+          .computeEnumSize(8, resinCostType_);
       }
-      if (isUseCondenseResin_ != false) {
+      if (gadgetId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(15, isUseCondenseResin_);
+          .computeUInt32Size(11, gadgetId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -370,18 +405,16 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq other = (emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq) obj;
 
+      if (getIsUseCondenseResin()
+          != other.getIsUseCondenseResin()) return false;
       if (getUiInteractId()
           != other.getUiInteractId()) return false;
+      if (getGadgetEntityId()
+          != other.getGadgetEntityId()) return false;
       if (opType_ != other.opType_) return false;
-      if (getIsUseCondenseResin()
-          != other.getIsUseCondenseResin()) return false;
       if (getGadgetId()
           != other.getGadgetId()) return false;
       if (resinCostType_ != other.resinCostType_) return false;
-      if (getCHDDOFMLBLM()
-          != other.getCHDDOFMLBLM()) return false;
-      if (getGadgetEntityId()
-          != other.getGadgetEntityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -393,21 +426,19 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + IS_USE_CONDENSE_RESIN_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsUseCondenseResin());
       hash = (37 * hash) + UI_INTERACT_ID_FIELD_NUMBER;
       hash = (53 * hash) + getUiInteractId();
+      hash = (37 * hash) + GADGET_ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getGadgetEntityId();
       hash = (37 * hash) + OP_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + opType_;
-      hash = (37 * hash) + IS_USE_CONDENSE_RESIN_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsUseCondenseResin());
       hash = (37 * hash) + GADGET_ID_FIELD_NUMBER;
       hash = (53 * hash) + getGadgetId();
       hash = (37 * hash) + RESIN_COST_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + resinCostType_;
-      hash = (37 * hash) + CHDDOFMLBLM_FIELD_NUMBER;
-      hash = (53 * hash) + getCHDDOFMLBLM();
-      hash = (37 * hash) + GADGET_ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getGadgetEntityId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -505,7 +536,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 26009
+     * CmdId: 25100
      * </pre>
      *
      * Protobuf type {@code GadgetInteractReq}
@@ -545,20 +576,18 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        isUseCondenseResin_ = false;
+
         uiInteractId_ = 0;
 
-        opType_ = 0;
+        gadgetEntityId_ = 0;
 
-        isUseCondenseResin_ = false;
+        opType_ = 0;
 
         gadgetId_ = 0;
 
         resinCostType_ = 0;
 
-        cHDDOFMLBLM_ = 0;
-
-        gadgetEntityId_ = 0;
-
         return this;
       }
 
@@ -585,13 +614,12 @@ public emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq b
       @java.lang.Override
       public emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq buildPartial() {
         emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq result = new emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq(this);
+        result.isUseCondenseResin_ = isUseCondenseResin_;
         result.uiInteractId_ = uiInteractId_;
+        result.gadgetEntityId_ = gadgetEntityId_;
         result.opType_ = opType_;
-        result.isUseCondenseResin_ = isUseCondenseResin_;
         result.gadgetId_ = gadgetId_;
         result.resinCostType_ = resinCostType_;
-        result.cHDDOFMLBLM_ = cHDDOFMLBLM_;
-        result.gadgetEntityId_ = gadgetEntityId_;
         onBuilt();
         return result;
       }
@@ -640,27 +668,24 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq other) {
         if (other == emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq.getDefaultInstance()) return this;
+        if (other.getIsUseCondenseResin() != false) {
+          setIsUseCondenseResin(other.getIsUseCondenseResin());
+        }
         if (other.getUiInteractId() != 0) {
           setUiInteractId(other.getUiInteractId());
         }
+        if (other.getGadgetEntityId() != 0) {
+          setGadgetEntityId(other.getGadgetEntityId());
+        }
         if (other.opType_ != 0) {
           setOpTypeValue(other.getOpTypeValue());
         }
-        if (other.getIsUseCondenseResin() != false) {
-          setIsUseCondenseResin(other.getIsUseCondenseResin());
-        }
         if (other.getGadgetId() != 0) {
           setGadgetId(other.getGadgetId());
         }
         if (other.resinCostType_ != 0) {
           setResinCostTypeValue(other.getResinCostTypeValue());
         }
-        if (other.getCHDDOFMLBLM() != 0) {
-          setCHDDOFMLBLM(other.getCHDDOFMLBLM());
-        }
-        if (other.getGadgetEntityId() != 0) {
-          setGadgetEntityId(other.getGadgetEntityId());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -690,9 +715,56 @@ public Builder mergeFrom(
         return this;
       }
 
+      private boolean isUseCondenseResin_ ;
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>bool is_use_condense_resin = 4;</code>
+       * @return The isUseCondenseResin.
+       */
+      @java.lang.Override
+      public boolean getIsUseCondenseResin() {
+        return isUseCondenseResin_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>bool is_use_condense_resin = 4;</code>
+       * @param value The isUseCondenseResin to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsUseCondenseResin(boolean value) {
+        
+        isUseCondenseResin_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>bool is_use_condense_resin = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsUseCondenseResin() {
+        
+        isUseCondenseResin_ = false;
+        onChanged();
+        return this;
+      }
+
       private int uiInteractId_ ;
       /**
-       * <code>uint32 ui_interact_id = 5;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 ui_interact_id = 1;</code>
        * @return The uiInteractId.
        */
       @java.lang.Override
@@ -700,7 +772,11 @@ public int getUiInteractId() {
         return uiInteractId_;
       }
       /**
-       * <code>uint32 ui_interact_id = 5;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 ui_interact_id = 1;</code>
        * @param value The uiInteractId to set.
        * @return This builder for chaining.
        */
@@ -711,7 +787,11 @@ public Builder setUiInteractId(int value) {
         return this;
       }
       /**
-       * <code>uint32 ui_interact_id = 5;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 ui_interact_id = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearUiInteractId() {
@@ -721,16 +801,67 @@ public Builder clearUiInteractId() {
         return this;
       }
 
+      private int gadgetEntityId_ ;
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 gadget_entity_id = 5;</code>
+       * @return The gadgetEntityId.
+       */
+      @java.lang.Override
+      public int getGadgetEntityId() {
+        return gadgetEntityId_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 gadget_entity_id = 5;</code>
+       * @param value The gadgetEntityId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGadgetEntityId(int value) {
+        
+        gadgetEntityId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 gadget_entity_id = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGadgetEntityId() {
+        
+        gadgetEntityId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int opType_ = 0;
       /**
-       * <code>.InterOpType op_type = 4;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>.InterOpType op_type = 3;</code>
        * @return The enum numeric value on the wire for opType.
        */
       @java.lang.Override public int getOpTypeValue() {
         return opType_;
       }
       /**
-       * <code>.InterOpType op_type = 4;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>.InterOpType op_type = 3;</code>
        * @param value The enum numeric value on the wire for opType to set.
        * @return This builder for chaining.
        */
@@ -741,7 +872,11 @@ public Builder setOpTypeValue(int value) {
         return this;
       }
       /**
-       * <code>.InterOpType op_type = 4;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>.InterOpType op_type = 3;</code>
        * @return The opType.
        */
       @java.lang.Override
@@ -751,7 +886,11 @@ public emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType getOpType() {
         return result == null ? emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.InterOpType op_type = 4;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>.InterOpType op_type = 3;</code>
        * @param value The opType to set.
        * @return This builder for chaining.
        */
@@ -765,7 +904,11 @@ public Builder setOpType(emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOp
         return this;
       }
       /**
-       * <code>.InterOpType op_type = 4;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>.InterOpType op_type = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearOpType() {
@@ -775,40 +918,13 @@ public Builder clearOpType() {
         return this;
       }
 
-      private boolean isUseCondenseResin_ ;
-      /**
-       * <code>bool is_use_condense_resin = 15;</code>
-       * @return The isUseCondenseResin.
-       */
-      @java.lang.Override
-      public boolean getIsUseCondenseResin() {
-        return isUseCondenseResin_;
-      }
-      /**
-       * <code>bool is_use_condense_resin = 15;</code>
-       * @param value The isUseCondenseResin to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsUseCondenseResin(boolean value) {
-        
-        isUseCondenseResin_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_use_condense_resin = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsUseCondenseResin() {
-        
-        isUseCondenseResin_ = false;
-        onChanged();
-        return this;
-      }
-
       private int gadgetId_ ;
       /**
-       * <code>uint32 gadget_id = 3;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint32 gadget_id = 11;</code>
        * @return The gadgetId.
        */
       @java.lang.Override
@@ -816,7 +932,11 @@ public int getGadgetId() {
         return gadgetId_;
       }
       /**
-       * <code>uint32 gadget_id = 3;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint32 gadget_id = 11;</code>
        * @param value The gadgetId to set.
        * @return This builder for chaining.
        */
@@ -827,7 +947,11 @@ public Builder setGadgetId(int value) {
         return this;
       }
       /**
-       * <code>uint32 gadget_id = 3;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint32 gadget_id = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearGadgetId() {
@@ -839,14 +963,22 @@ public Builder clearGadgetId() {
 
       private int resinCostType_ = 0;
       /**
-       * <code>.ResinCostType resin_cost_type = 11;</code>
+       * <pre>
+       * Offset: 0x34
+       * </pre>
+       *
+       * <code>.ResinCostType resin_cost_type = 8;</code>
        * @return The enum numeric value on the wire for resinCostType.
        */
       @java.lang.Override public int getResinCostTypeValue() {
         return resinCostType_;
       }
       /**
-       * <code>.ResinCostType resin_cost_type = 11;</code>
+       * <pre>
+       * Offset: 0x34
+       * </pre>
+       *
+       * <code>.ResinCostType resin_cost_type = 8;</code>
        * @param value The enum numeric value on the wire for resinCostType to set.
        * @return This builder for chaining.
        */
@@ -857,7 +989,11 @@ public Builder setResinCostTypeValue(int value) {
         return this;
       }
       /**
-       * <code>.ResinCostType resin_cost_type = 11;</code>
+       * <pre>
+       * Offset: 0x34
+       * </pre>
+       *
+       * <code>.ResinCostType resin_cost_type = 8;</code>
        * @return The resinCostType.
        */
       @java.lang.Override
@@ -867,7 +1003,11 @@ public emu.grasscutter.net.proto.ResinCostTypeOuterClass.ResinCostType getResinC
         return result == null ? emu.grasscutter.net.proto.ResinCostTypeOuterClass.ResinCostType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.ResinCostType resin_cost_type = 11;</code>
+       * <pre>
+       * Offset: 0x34
+       * </pre>
+       *
+       * <code>.ResinCostType resin_cost_type = 8;</code>
        * @param value The resinCostType to set.
        * @return This builder for chaining.
        */
@@ -881,7 +1021,11 @@ public Builder setResinCostType(emu.grasscutter.net.proto.ResinCostTypeOuterClas
         return this;
       }
       /**
-       * <code>.ResinCostType resin_cost_type = 11;</code>
+       * <pre>
+       * Offset: 0x34
+       * </pre>
+       *
+       * <code>.ResinCostType resin_cost_type = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearResinCostType() {
@@ -890,68 +1034,6 @@ public Builder clearResinCostType() {
         onChanged();
         return this;
       }
-
-      private int cHDDOFMLBLM_ ;
-      /**
-       * <code>uint32 CHDDOFMLBLM = 9;</code>
-       * @return The cHDDOFMLBLM.
-       */
-      @java.lang.Override
-      public int getCHDDOFMLBLM() {
-        return cHDDOFMLBLM_;
-      }
-      /**
-       * <code>uint32 CHDDOFMLBLM = 9;</code>
-       * @param value The cHDDOFMLBLM to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCHDDOFMLBLM(int value) {
-        
-        cHDDOFMLBLM_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 CHDDOFMLBLM = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCHDDOFMLBLM() {
-        
-        cHDDOFMLBLM_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int gadgetEntityId_ ;
-      /**
-       * <code>uint32 gadget_entity_id = 12;</code>
-       * @return The gadgetEntityId.
-       */
-      @java.lang.Override
-      public int getGadgetEntityId() {
-        return gadgetEntityId_;
-      }
-      /**
-       * <code>uint32 gadget_entity_id = 12;</code>
-       * @param value The gadgetEntityId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGadgetEntityId(int value) {
-        
-        gadgetEntityId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 gadget_entity_id = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGadgetEntityId() {
-        
-        gadgetEntityId_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1020,13 +1102,13 @@ public emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq g
   static {
     java.lang.String[] descriptorData = {
       "\n\027GadgetInteractReq.proto\032\023ResinCostType" +
-      ".proto\032\021InterOpType.proto\"\324\001\n\021GadgetInte" +
-      "ractReq\022\026\n\016ui_interact_id\030\005 \001(\r\022\035\n\007op_ty" +
-      "pe\030\004 \001(\0162\014.InterOpType\022\035\n\025is_use_condens" +
-      "e_resin\030\017 \001(\010\022\021\n\tgadget_id\030\003 \001(\r\022\'\n\017resi" +
-      "n_cost_type\030\013 \001(\0162\016.ResinCostType\022\023\n\013CHD" +
-      "DOFMLBLM\030\t \001(\r\022\030\n\020gadget_entity_id\030\014 \001(\r" +
-      "B\033\n\031emu.grasscutter.net.protob\006proto3"
+      ".proto\032\021InterOpType.proto\"\277\001\n\021GadgetInte" +
+      "ractReq\022\035\n\025is_use_condense_resin\030\004 \001(\010\022\026" +
+      "\n\016ui_interact_id\030\001 \001(\r\022\030\n\020gadget_entity_" +
+      "id\030\005 \001(\r\022\035\n\007op_type\030\003 \001(\0162\014.InterOpType\022" +
+      "\021\n\tgadget_id\030\013 \001(\r\022\'\n\017resin_cost_type\030\010 " +
+      "\001(\0162\016.ResinCostTypeB\033\n\031emu.grasscutter.n" +
+      "et.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1039,7 +1121,7 @@ public emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq g
     internal_static_GadgetInteractReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GadgetInteractReq_descriptor,
-        new java.lang.String[] { "UiInteractId", "OpType", "IsUseCondenseResin", "GadgetId", "ResinCostType", "CHDDOFMLBLM", "GadgetEntityId", });
+        new java.lang.String[] { "IsUseCondenseResin", "UiInteractId", "GadgetEntityId", "OpType", "GadgetId", "ResinCostType", });
     emu.grasscutter.net.proto.ResinCostTypeOuterClass.getDescriptor();
     emu.grasscutter.net.proto.InterOpTypeOuterClass.getDescriptor();
   }
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GadgetInteractRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GadgetInteractRspOuterClass.java
index 231199ac9f7..b4b2f7b8d95 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GadgetInteractRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GadgetInteractRspOuterClass.java
@@ -19,54 +19,76 @@ public interface GadgetInteractRspOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.InterOpType op_type = 1;</code>
-     * @return The enum numeric value on the wire for opType.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.InteractType interact_type = 12;</code>
+     * @return The enum numeric value on the wire for interactType.
      */
-    int getOpTypeValue();
+    int getInteractTypeValue();
     /**
-     * <code>.InterOpType op_type = 1;</code>
-     * @return The opType.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.InteractType interact_type = 12;</code>
+     * @return The interactType.
      */
-    emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType getOpType();
+    emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType getInteractType();
 
     /**
-     * <code>int32 retcode = 5;</code>
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>int32 retcode = 4;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>uint32 gadget_entity_id = 6;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 gadget_entity_id = 7;</code>
      * @return The gadgetEntityId.
      */
     int getGadgetEntityId();
 
     /**
-     * <code>.InteractType interact_type = 8;</code>
-     * @return The enum numeric value on the wire for interactType.
-     */
-    int getInteractTypeValue();
-    /**
-     * <code>.InteractType interact_type = 8;</code>
-     * @return The interactType.
-     */
-    emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType getInteractType();
-
-    /**
-     * <code>uint32 gadget_id = 9;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>uint32 gadget_id = 3;</code>
      * @return The gadgetId.
      */
     int getGadgetId();
 
     /**
-     * <code>uint32 CHDDOFMLBLM = 11;</code>
-     * @return The cHDDOFMLBLM.
+     * <pre>
+     * Offset: 0x34
+     * </pre>
+     *
+     * <code>.InterOpType op_type = 9;</code>
+     * @return The enum numeric value on the wire for opType.
+     */
+    int getOpTypeValue();
+    /**
+     * <pre>
+     * Offset: 0x34
+     * </pre>
+     *
+     * <code>.InterOpType op_type = 9;</code>
+     * @return The opType.
      */
-    int getCHDDOFMLBLM();
+    emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType getOpType();
   }
   /**
    * <pre>
-   * CmdId: 28160
+   * CmdId: 1140
    * </pre>
    *
    * Protobuf type {@code GadgetInteractRsp}
@@ -81,8 +103,8 @@ private GadgetInteractRsp(com.google.protobuf.GeneratedMessageV3.Builder<?> buil
       super(builder);
     }
     private GadgetInteractRsp() {
-      opType_ = 0;
       interactType_ = 0;
+      opType_ = 0;
     }
 
     @java.lang.Override
@@ -115,36 +137,31 @@ private GadgetInteractRsp(
             case 0:
               done = true;
               break;
-            case 8: {
-              int rawValue = input.readEnum();
+            case 24: {
 
-              opType_ = rawValue;
+              gadgetId_ = input.readUInt32();
               break;
             }
-            case 40: {
+            case 32: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 48: {
+            case 56: {
 
               gadgetEntityId_ = input.readUInt32();
               break;
             }
-            case 64: {
-              int rawValue = input.readEnum();
-
-              interactType_ = rawValue;
-              break;
-            }
             case 72: {
+              int rawValue = input.readEnum();
 
-              gadgetId_ = input.readUInt32();
+              opType_ = rawValue;
               break;
             }
-            case 88: {
+            case 96: {
+              int rawValue = input.readEnum();
 
-              cHDDOFMLBLM_ = input.readUInt32();
+              interactType_ = rawValue;
               break;
             }
             default: {
@@ -179,29 +196,41 @@ private GadgetInteractRsp(
               emu.grasscutter.net.proto.GadgetInteractRspOuterClass.GadgetInteractRsp.class, emu.grasscutter.net.proto.GadgetInteractRspOuterClass.GadgetInteractRsp.Builder.class);
     }
 
-    public static final int OP_TYPE_FIELD_NUMBER = 1;
-    private int opType_;
+    public static final int INTERACT_TYPE_FIELD_NUMBER = 12;
+    private int interactType_;
     /**
-     * <code>.InterOpType op_type = 1;</code>
-     * @return The enum numeric value on the wire for opType.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.InteractType interact_type = 12;</code>
+     * @return The enum numeric value on the wire for interactType.
      */
-    @java.lang.Override public int getOpTypeValue() {
-      return opType_;
+    @java.lang.Override public int getInteractTypeValue() {
+      return interactType_;
     }
     /**
-     * <code>.InterOpType op_type = 1;</code>
-     * @return The opType.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.InteractType interact_type = 12;</code>
+     * @return The interactType.
      */
-    @java.lang.Override public emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType getOpType() {
+    @java.lang.Override public emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType getInteractType() {
       @SuppressWarnings("deprecation")
-      emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType result = emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType.valueOf(opType_);
-      return result == null ? emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType.UNRECOGNIZED : result;
+      emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType result = emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType.valueOf(interactType_);
+      return result == null ? emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType.UNRECOGNIZED : result;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 5;
+    public static final int RETCODE_FIELD_NUMBER = 4;
     private int retcode_;
     /**
-     * <code>int32 retcode = 5;</code>
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>int32 retcode = 4;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -209,10 +238,14 @@ public int getRetcode() {
       return retcode_;
     }
 
-    public static final int GADGET_ENTITY_ID_FIELD_NUMBER = 6;
+    public static final int GADGET_ENTITY_ID_FIELD_NUMBER = 7;
     private int gadgetEntityId_;
     /**
-     * <code>uint32 gadget_entity_id = 6;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 gadget_entity_id = 7;</code>
      * @return The gadgetEntityId.
      */
     @java.lang.Override
@@ -220,29 +253,14 @@ public int getGadgetEntityId() {
       return gadgetEntityId_;
     }
 
-    public static final int INTERACT_TYPE_FIELD_NUMBER = 8;
-    private int interactType_;
-    /**
-     * <code>.InteractType interact_type = 8;</code>
-     * @return The enum numeric value on the wire for interactType.
-     */
-    @java.lang.Override public int getInteractTypeValue() {
-      return interactType_;
-    }
-    /**
-     * <code>.InteractType interact_type = 8;</code>
-     * @return The interactType.
-     */
-    @java.lang.Override public emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType getInteractType() {
-      @SuppressWarnings("deprecation")
-      emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType result = emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType.valueOf(interactType_);
-      return result == null ? emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType.UNRECOGNIZED : result;
-    }
-
-    public static final int GADGET_ID_FIELD_NUMBER = 9;
+    public static final int GADGET_ID_FIELD_NUMBER = 3;
     private int gadgetId_;
     /**
-     * <code>uint32 gadget_id = 9;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>uint32 gadget_id = 3;</code>
      * @return The gadgetId.
      */
     @java.lang.Override
@@ -250,15 +268,31 @@ public int getGadgetId() {
       return gadgetId_;
     }
 
-    public static final int CHDDOFMLBLM_FIELD_NUMBER = 11;
-    private int cHDDOFMLBLM_;
+    public static final int OP_TYPE_FIELD_NUMBER = 9;
+    private int opType_;
     /**
-     * <code>uint32 CHDDOFMLBLM = 11;</code>
-     * @return The cHDDOFMLBLM.
+     * <pre>
+     * Offset: 0x34
+     * </pre>
+     *
+     * <code>.InterOpType op_type = 9;</code>
+     * @return The enum numeric value on the wire for opType.
      */
-    @java.lang.Override
-    public int getCHDDOFMLBLM() {
-      return cHDDOFMLBLM_;
+    @java.lang.Override public int getOpTypeValue() {
+      return opType_;
+    }
+    /**
+     * <pre>
+     * Offset: 0x34
+     * </pre>
+     *
+     * <code>.InterOpType op_type = 9;</code>
+     * @return The opType.
+     */
+    @java.lang.Override public emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType getOpType() {
+      @SuppressWarnings("deprecation")
+      emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType result = emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType.valueOf(opType_);
+      return result == null ? emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType.UNRECOGNIZED : result;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -275,23 +309,20 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (opType_ != emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType.INTER_OP_TYPE_FINISH.getNumber()) {
-        output.writeEnum(1, opType_);
+      if (gadgetId_ != 0) {
+        output.writeUInt32(3, gadgetId_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(5, retcode_);
+        output.writeInt32(4, retcode_);
       }
       if (gadgetEntityId_ != 0) {
-        output.writeUInt32(6, gadgetEntityId_);
+        output.writeUInt32(7, gadgetEntityId_);
       }
-      if (interactType_ != emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType.INTERACT_TYPE_NONE.getNumber()) {
-        output.writeEnum(8, interactType_);
-      }
-      if (gadgetId_ != 0) {
-        output.writeUInt32(9, gadgetId_);
+      if (opType_ != emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType.INTER_OP_TYPE_FINISH.getNumber()) {
+        output.writeEnum(9, opType_);
       }
-      if (cHDDOFMLBLM_ != 0) {
-        output.writeUInt32(11, cHDDOFMLBLM_);
+      if (interactType_ != emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType.INTERACT_TYPE_NONE.getNumber()) {
+        output.writeEnum(12, interactType_);
       }
       unknownFields.writeTo(output);
     }
@@ -302,29 +333,25 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (opType_ != emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType.INTER_OP_TYPE_FINISH.getNumber()) {
+      if (gadgetId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(1, opType_);
+          .computeUInt32Size(3, gadgetId_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(5, retcode_);
+          .computeInt32Size(4, retcode_);
       }
       if (gadgetEntityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, gadgetEntityId_);
-      }
-      if (interactType_ != emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType.INTERACT_TYPE_NONE.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(8, interactType_);
+          .computeUInt32Size(7, gadgetEntityId_);
       }
-      if (gadgetId_ != 0) {
+      if (opType_ != emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType.INTER_OP_TYPE_FINISH.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, gadgetId_);
+          .computeEnumSize(9, opType_);
       }
-      if (cHDDOFMLBLM_ != 0) {
+      if (interactType_ != emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType.INTERACT_TYPE_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, cHDDOFMLBLM_);
+          .computeEnumSize(12, interactType_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -341,16 +368,14 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.GadgetInteractRspOuterClass.GadgetInteractRsp other = (emu.grasscutter.net.proto.GadgetInteractRspOuterClass.GadgetInteractRsp) obj;
 
-      if (opType_ != other.opType_) return false;
+      if (interactType_ != other.interactType_) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
       if (getGadgetEntityId()
           != other.getGadgetEntityId()) return false;
-      if (interactType_ != other.interactType_) return false;
       if (getGadgetId()
           != other.getGadgetId()) return false;
-      if (getCHDDOFMLBLM()
-          != other.getCHDDOFMLBLM()) return false;
+      if (opType_ != other.opType_) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -362,18 +387,16 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + OP_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + opType_;
+      hash = (37 * hash) + INTERACT_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + interactType_;
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + GADGET_ENTITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getGadgetEntityId();
-      hash = (37 * hash) + INTERACT_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + interactType_;
       hash = (37 * hash) + GADGET_ID_FIELD_NUMBER;
       hash = (53 * hash) + getGadgetId();
-      hash = (37 * hash) + CHDDOFMLBLM_FIELD_NUMBER;
-      hash = (53 * hash) + getCHDDOFMLBLM();
+      hash = (37 * hash) + OP_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + opType_;
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -471,7 +494,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 28160
+     * CmdId: 1140
      * </pre>
      *
      * Protobuf type {@code GadgetInteractRsp}
@@ -511,17 +534,15 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        opType_ = 0;
+        interactType_ = 0;
 
         retcode_ = 0;
 
         gadgetEntityId_ = 0;
 
-        interactType_ = 0;
-
         gadgetId_ = 0;
 
-        cHDDOFMLBLM_ = 0;
+        opType_ = 0;
 
         return this;
       }
@@ -549,12 +570,11 @@ public emu.grasscutter.net.proto.GadgetInteractRspOuterClass.GadgetInteractRsp b
       @java.lang.Override
       public emu.grasscutter.net.proto.GadgetInteractRspOuterClass.GadgetInteractRsp buildPartial() {
         emu.grasscutter.net.proto.GadgetInteractRspOuterClass.GadgetInteractRsp result = new emu.grasscutter.net.proto.GadgetInteractRspOuterClass.GadgetInteractRsp(this);
-        result.opType_ = opType_;
+        result.interactType_ = interactType_;
         result.retcode_ = retcode_;
         result.gadgetEntityId_ = gadgetEntityId_;
-        result.interactType_ = interactType_;
         result.gadgetId_ = gadgetId_;
-        result.cHDDOFMLBLM_ = cHDDOFMLBLM_;
+        result.opType_ = opType_;
         onBuilt();
         return result;
       }
@@ -603,8 +623,8 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.GadgetInteractRspOuterClass.GadgetInteractRsp other) {
         if (other == emu.grasscutter.net.proto.GadgetInteractRspOuterClass.GadgetInteractRsp.getDefaultInstance()) return this;
-        if (other.opType_ != 0) {
-          setOpTypeValue(other.getOpTypeValue());
+        if (other.interactType_ != 0) {
+          setInteractTypeValue(other.getInteractTypeValue());
         }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
@@ -612,14 +632,11 @@ public Builder mergeFrom(emu.grasscutter.net.proto.GadgetInteractRspOuterClass.G
         if (other.getGadgetEntityId() != 0) {
           setGadgetEntityId(other.getGadgetEntityId());
         }
-        if (other.interactType_ != 0) {
-          setInteractTypeValue(other.getInteractTypeValue());
-        }
         if (other.getGadgetId() != 0) {
           setGadgetId(other.getGadgetId());
         }
-        if (other.getCHDDOFMLBLM() != 0) {
-          setCHDDOFMLBLM(other.getCHDDOFMLBLM());
+        if (other.opType_ != 0) {
+          setOpTypeValue(other.getOpTypeValue());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -650,63 +667,87 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int opType_ = 0;
+      private int interactType_ = 0;
       /**
-       * <code>.InterOpType op_type = 1;</code>
-       * @return The enum numeric value on the wire for opType.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.InteractType interact_type = 12;</code>
+       * @return The enum numeric value on the wire for interactType.
        */
-      @java.lang.Override public int getOpTypeValue() {
-        return opType_;
+      @java.lang.Override public int getInteractTypeValue() {
+        return interactType_;
       }
       /**
-       * <code>.InterOpType op_type = 1;</code>
-       * @param value The enum numeric value on the wire for opType to set.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.InteractType interact_type = 12;</code>
+       * @param value The enum numeric value on the wire for interactType to set.
        * @return This builder for chaining.
        */
-      public Builder setOpTypeValue(int value) {
+      public Builder setInteractTypeValue(int value) {
         
-        opType_ = value;
+        interactType_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>.InterOpType op_type = 1;</code>
-       * @return The opType.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.InteractType interact_type = 12;</code>
+       * @return The interactType.
        */
       @java.lang.Override
-      public emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType getOpType() {
+      public emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType getInteractType() {
         @SuppressWarnings("deprecation")
-        emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType result = emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType.valueOf(opType_);
-        return result == null ? emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType.UNRECOGNIZED : result;
+        emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType result = emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType.valueOf(interactType_);
+        return result == null ? emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.InterOpType op_type = 1;</code>
-       * @param value The opType to set.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.InteractType interact_type = 12;</code>
+       * @param value The interactType to set.
        * @return This builder for chaining.
        */
-      public Builder setOpType(emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType value) {
+      public Builder setInteractType(emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType value) {
         if (value == null) {
           throw new NullPointerException();
         }
         
-        opType_ = value.getNumber();
+        interactType_ = value.getNumber();
         onChanged();
         return this;
       }
       /**
-       * <code>.InterOpType op_type = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.InteractType interact_type = 12;</code>
        * @return This builder for chaining.
        */
-      public Builder clearOpType() {
+      public Builder clearInteractType() {
         
-        opType_ = 0;
+        interactType_ = 0;
         onChanged();
         return this;
       }
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 5;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>int32 retcode = 4;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -714,7 +755,11 @@ public int getRetcode() {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 5;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>int32 retcode = 4;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -725,7 +770,11 @@ public Builder setRetcode(int value) {
         return this;
       }
       /**
-       * <code>int32 retcode = 5;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>int32 retcode = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -737,7 +786,11 @@ public Builder clearRetcode() {
 
       private int gadgetEntityId_ ;
       /**
-       * <code>uint32 gadget_entity_id = 6;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 gadget_entity_id = 7;</code>
        * @return The gadgetEntityId.
        */
       @java.lang.Override
@@ -745,7 +798,11 @@ public int getGadgetEntityId() {
         return gadgetEntityId_;
       }
       /**
-       * <code>uint32 gadget_entity_id = 6;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 gadget_entity_id = 7;</code>
        * @param value The gadgetEntityId to set.
        * @return This builder for chaining.
        */
@@ -756,7 +813,11 @@ public Builder setGadgetEntityId(int value) {
         return this;
       }
       /**
-       * <code>uint32 gadget_entity_id = 6;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 gadget_entity_id = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearGadgetEntityId() {
@@ -766,118 +827,119 @@ public Builder clearGadgetEntityId() {
         return this;
       }
 
-      private int interactType_ = 0;
-      /**
-       * <code>.InteractType interact_type = 8;</code>
-       * @return The enum numeric value on the wire for interactType.
-       */
-      @java.lang.Override public int getInteractTypeValue() {
-        return interactType_;
-      }
-      /**
-       * <code>.InteractType interact_type = 8;</code>
-       * @param value The enum numeric value on the wire for interactType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setInteractTypeValue(int value) {
-        
-        interactType_ = value;
-        onChanged();
-        return this;
-      }
+      private int gadgetId_ ;
       /**
-       * <code>.InteractType interact_type = 8;</code>
-       * @return The interactType.
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint32 gadget_id = 3;</code>
+       * @return The gadgetId.
        */
       @java.lang.Override
-      public emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType getInteractType() {
-        @SuppressWarnings("deprecation")
-        emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType result = emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType.valueOf(interactType_);
-        return result == null ? emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType.UNRECOGNIZED : result;
+      public int getGadgetId() {
+        return gadgetId_;
       }
       /**
-       * <code>.InteractType interact_type = 8;</code>
-       * @param value The interactType to set.
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint32 gadget_id = 3;</code>
+       * @param value The gadgetId to set.
        * @return This builder for chaining.
        */
-      public Builder setInteractType(emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder setGadgetId(int value) {
         
-        interactType_ = value.getNumber();
+        gadgetId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>.InteractType interact_type = 8;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint32 gadget_id = 3;</code>
        * @return This builder for chaining.
        */
-      public Builder clearInteractType() {
+      public Builder clearGadgetId() {
         
-        interactType_ = 0;
+        gadgetId_ = 0;
         onChanged();
         return this;
       }
 
-      private int gadgetId_ ;
-      /**
-       * <code>uint32 gadget_id = 9;</code>
-       * @return The gadgetId.
-       */
-      @java.lang.Override
-      public int getGadgetId() {
-        return gadgetId_;
-      }
+      private int opType_ = 0;
       /**
-       * <code>uint32 gadget_id = 9;</code>
-       * @param value The gadgetId to set.
-       * @return This builder for chaining.
+       * <pre>
+       * Offset: 0x34
+       * </pre>
+       *
+       * <code>.InterOpType op_type = 9;</code>
+       * @return The enum numeric value on the wire for opType.
        */
-      public Builder setGadgetId(int value) {
-        
-        gadgetId_ = value;
-        onChanged();
-        return this;
+      @java.lang.Override public int getOpTypeValue() {
+        return opType_;
       }
       /**
-       * <code>uint32 gadget_id = 9;</code>
+       * <pre>
+       * Offset: 0x34
+       * </pre>
+       *
+       * <code>.InterOpType op_type = 9;</code>
+       * @param value The enum numeric value on the wire for opType to set.
        * @return This builder for chaining.
        */
-      public Builder clearGadgetId() {
+      public Builder setOpTypeValue(int value) {
         
-        gadgetId_ = 0;
+        opType_ = value;
         onChanged();
         return this;
       }
-
-      private int cHDDOFMLBLM_ ;
       /**
-       * <code>uint32 CHDDOFMLBLM = 11;</code>
-       * @return The cHDDOFMLBLM.
+       * <pre>
+       * Offset: 0x34
+       * </pre>
+       *
+       * <code>.InterOpType op_type = 9;</code>
+       * @return The opType.
        */
       @java.lang.Override
-      public int getCHDDOFMLBLM() {
-        return cHDDOFMLBLM_;
+      public emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType getOpType() {
+        @SuppressWarnings("deprecation")
+        emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType result = emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType.valueOf(opType_);
+        return result == null ? emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType.UNRECOGNIZED : result;
       }
       /**
-       * <code>uint32 CHDDOFMLBLM = 11;</code>
-       * @param value The cHDDOFMLBLM to set.
+       * <pre>
+       * Offset: 0x34
+       * </pre>
+       *
+       * <code>.InterOpType op_type = 9;</code>
+       * @param value The opType to set.
        * @return This builder for chaining.
        */
-      public Builder setCHDDOFMLBLM(int value) {
+      public Builder setOpType(emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
         
-        cHDDOFMLBLM_ = value;
+        opType_ = value.getNumber();
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 CHDDOFMLBLM = 11;</code>
+       * <pre>
+       * Offset: 0x34
+       * </pre>
+       *
+       * <code>.InterOpType op_type = 9;</code>
        * @return This builder for chaining.
        */
-      public Builder clearCHDDOFMLBLM() {
+      public Builder clearOpType() {
         
-        cHDDOFMLBLM_ = 0;
+        opType_ = 0;
         onChanged();
         return this;
       }
@@ -949,12 +1011,12 @@ public emu.grasscutter.net.proto.GadgetInteractRspOuterClass.GadgetInteractRsp g
   static {
     java.lang.String[] descriptorData = {
       "\n\027GadgetInteractRsp.proto\032\021InterOpType.p" +
-      "roto\032\022InteractType.proto\"\253\001\n\021GadgetInter" +
-      "actRsp\022\035\n\007op_type\030\001 \001(\0162\014.InterOpType\022\017\n" +
-      "\007retcode\030\005 \001(\005\022\030\n\020gadget_entity_id\030\006 \001(\r" +
-      "\022$\n\rinteract_type\030\010 \001(\0162\r.InteractType\022\021" +
-      "\n\tgadget_id\030\t \001(\r\022\023\n\013CHDDOFMLBLM\030\013 \001(\rB\033" +
-      "\n\031emu.grasscutter.net.protob\006proto3"
+      "roto\032\022InteractType.proto\"\226\001\n\021GadgetInter" +
+      "actRsp\022$\n\rinteract_type\030\014 \001(\0162\r.Interact" +
+      "Type\022\017\n\007retcode\030\004 \001(\005\022\030\n\020gadget_entity_i" +
+      "d\030\007 \001(\r\022\021\n\tgadget_id\030\003 \001(\r\022\035\n\007op_type\030\t " +
+      "\001(\0162\014.InterOpTypeB\033\n\031emu.grasscutter.net" +
+      ".protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -967,7 +1029,7 @@ public emu.grasscutter.net.proto.GadgetInteractRspOuterClass.GadgetInteractRsp g
     internal_static_GadgetInteractRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GadgetInteractRsp_descriptor,
-        new java.lang.String[] { "OpType", "Retcode", "GadgetEntityId", "InteractType", "GadgetId", "CHDDOFMLBLM", });
+        new java.lang.String[] { "InteractType", "Retcode", "GadgetEntityId", "GadgetId", "OpType", });
     emu.grasscutter.net.proto.InterOpTypeOuterClass.getDescriptor();
     emu.grasscutter.net.proto.InteractTypeOuterClass.getDescriptor();
   }
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetActivityInfoRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetActivityInfoRspOuterClass.java
index 8c6b958165c..949b6b4024e 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetActivityInfoRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetActivityInfoRspOuterClass.java
@@ -19,79 +19,135 @@ public interface GetActivityInfoRspOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 9;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair> 
-        getDisableTransferPointInteractionListList();
-    /**
-     * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 9;</code>
-     */
-    emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair getDisableTransferPointInteractionList(int index);
-    /**
-     * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 9;</code>
-     */
-    int getDisableTransferPointInteractionListCount();
-    /**
-     * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 9;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder> 
-        getDisableTransferPointInteractionListOrBuilderList();
-    /**
-     * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 9;</code>
-     */
-    emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder getDisableTransferPointInteractionListOrBuilder(
-        int index);
-
-    /**
-     * <code>repeated uint32 activated_sale_id_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 activated_sale_id_list = 5;</code>
      * @return A list containing the activatedSaleIdList.
      */
     java.util.List<java.lang.Integer> getActivatedSaleIdListList();
     /**
-     * <code>repeated uint32 activated_sale_id_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 activated_sale_id_list = 5;</code>
      * @return The count of activatedSaleIdList.
      */
     int getActivatedSaleIdListCount();
     /**
-     * <code>repeated uint32 activated_sale_id_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 activated_sale_id_list = 5;</code>
      * @param index The index of the element to return.
      * @return The activatedSaleIdList at the given index.
      */
     int getActivatedSaleIdList(int index);
 
     /**
-     * <code>repeated .ActivityInfo activity_info_list = 12;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated .ActivityInfo activity_info_list = 6;</code>
      */
     java.util.List<emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo> 
         getActivityInfoListList();
     /**
-     * <code>repeated .ActivityInfo activity_info_list = 12;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated .ActivityInfo activity_info_list = 6;</code>
      */
     emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo getActivityInfoList(int index);
     /**
-     * <code>repeated .ActivityInfo activity_info_list = 12;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated .ActivityInfo activity_info_list = 6;</code>
      */
     int getActivityInfoListCount();
     /**
-     * <code>repeated .ActivityInfo activity_info_list = 12;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated .ActivityInfo activity_info_list = 6;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfoOrBuilder> 
         getActivityInfoListOrBuilderList();
     /**
-     * <code>repeated .ActivityInfo activity_info_list = 12;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated .ActivityInfo activity_info_list = 6;</code>
      */
     emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfoOrBuilder getActivityInfoListOrBuilder(
         int index);
 
     /**
-     * <code>int32 retcode = 14;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 4;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair> 
+        getDisableTransferPointInteractionListList();
+    /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 4;</code>
+     */
+    emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair getDisableTransferPointInteractionList(int index);
+    /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 4;</code>
+     */
+    int getDisableTransferPointInteractionListCount();
+    /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 4;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder> 
+        getDisableTransferPointInteractionListOrBuilderList();
+    /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 4;</code>
+     */
+    emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder getDisableTransferPointInteractionListOrBuilder(
+        int index);
+
+    /**
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>int32 retcode = 2;</code>
      * @return The retcode.
      */
     int getRetcode();
   }
   /**
    * <pre>
-   * CmdId: 27306
+   * CmdId: 3417
    * </pre>
    *
    * Protobuf type {@code GetActivityInfoRsp}
@@ -106,9 +162,9 @@ private GetActivityInfoRsp(com.google.protobuf.GeneratedMessageV3.Builder<?> bui
       super(builder);
     }
     private GetActivityInfoRsp() {
-      disableTransferPointInteractionList_ = java.util.Collections.emptyList();
       activatedSaleIdList_ = emptyIntList();
       activityInfoList_ = java.util.Collections.emptyList();
+      disableTransferPointInteractionList_ = java.util.Collections.emptyList();
     }
 
     @java.lang.Override
@@ -142,29 +198,34 @@ private GetActivityInfoRsp(
             case 0:
               done = true;
               break;
-            case 74: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+            case 16: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 34: {
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
                 disableTransferPointInteractionList_ = new java.util.ArrayList<emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair>();
-                mutable_bitField0_ |= 0x00000001;
+                mutable_bitField0_ |= 0x00000004;
               }
               disableTransferPointInteractionList_.add(
                   input.readMessage(emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.parser(), extensionRegistry));
               break;
             }
-            case 80: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+            case 40: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 activatedSaleIdList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000001;
               }
               activatedSaleIdList_.addInt(input.readUInt32());
               break;
             }
-            case 82: {
+            case 42: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
+              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
                 activatedSaleIdList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000001;
               }
               while (input.getBytesUntilLimit() > 0) {
                 activatedSaleIdList_.addInt(input.readUInt32());
@@ -172,20 +233,15 @@ private GetActivityInfoRsp(
               input.popLimit(limit);
               break;
             }
-            case 98: {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+            case 50: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 activityInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo>();
-                mutable_bitField0_ |= 0x00000004;
+                mutable_bitField0_ |= 0x00000002;
               }
               activityInfoList_.add(
                   input.readMessage(emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.parser(), extensionRegistry));
               break;
             }
-            case 112: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -201,13 +257,13 @@ private GetActivityInfoRsp(
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        if (((mutable_bitField0_ & 0x00000004) != 0)) {
           disableTransferPointInteractionList_ = java.util.Collections.unmodifiableList(disableTransferPointInteractionList_);
         }
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
           activatedSaleIdList_.makeImmutable(); // C
         }
-        if (((mutable_bitField0_ & 0x00000004) != 0)) {
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
           activityInfoList_ = java.util.Collections.unmodifiableList(activityInfoList_);
         }
         this.unknownFields = unknownFields.build();
@@ -227,50 +283,14 @@ private GetActivityInfoRsp(
               emu.grasscutter.net.proto.GetActivityInfoRspOuterClass.GetActivityInfoRsp.class, emu.grasscutter.net.proto.GetActivityInfoRspOuterClass.GetActivityInfoRsp.Builder.class);
     }
 
-    public static final int DISABLE_TRANSFER_POINT_INTERACTION_LIST_FIELD_NUMBER = 9;
-    private java.util.List<emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair> disableTransferPointInteractionList_;
-    /**
-     * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 9;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair> getDisableTransferPointInteractionListList() {
-      return disableTransferPointInteractionList_;
-    }
-    /**
-     * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 9;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder> 
-        getDisableTransferPointInteractionListOrBuilderList() {
-      return disableTransferPointInteractionList_;
-    }
-    /**
-     * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 9;</code>
-     */
-    @java.lang.Override
-    public int getDisableTransferPointInteractionListCount() {
-      return disableTransferPointInteractionList_.size();
-    }
-    /**
-     * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 9;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair getDisableTransferPointInteractionList(int index) {
-      return disableTransferPointInteractionList_.get(index);
-    }
-    /**
-     * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 9;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder getDisableTransferPointInteractionListOrBuilder(
-        int index) {
-      return disableTransferPointInteractionList_.get(index);
-    }
-
-    public static final int ACTIVATED_SALE_ID_LIST_FIELD_NUMBER = 10;
+    public static final int ACTIVATED_SALE_ID_LIST_FIELD_NUMBER = 5;
     private com.google.protobuf.Internal.IntList activatedSaleIdList_;
     /**
-     * <code>repeated uint32 activated_sale_id_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 activated_sale_id_list = 5;</code>
      * @return A list containing the activatedSaleIdList.
      */
     @java.lang.Override
@@ -279,14 +299,22 @@ public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder getDis
       return activatedSaleIdList_;
     }
     /**
-     * <code>repeated uint32 activated_sale_id_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 activated_sale_id_list = 5;</code>
      * @return The count of activatedSaleIdList.
      */
     public int getActivatedSaleIdListCount() {
       return activatedSaleIdList_.size();
     }
     /**
-     * <code>repeated uint32 activated_sale_id_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 activated_sale_id_list = 5;</code>
      * @param index The index of the element to return.
      * @return The activatedSaleIdList at the given index.
      */
@@ -295,17 +323,25 @@ public int getActivatedSaleIdList(int index) {
     }
     private int activatedSaleIdListMemoizedSerializedSize = -1;
 
-    public static final int ACTIVITY_INFO_LIST_FIELD_NUMBER = 12;
+    public static final int ACTIVITY_INFO_LIST_FIELD_NUMBER = 6;
     private java.util.List<emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo> activityInfoList_;
     /**
-     * <code>repeated .ActivityInfo activity_info_list = 12;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated .ActivityInfo activity_info_list = 6;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo> getActivityInfoListList() {
       return activityInfoList_;
     }
     /**
-     * <code>repeated .ActivityInfo activity_info_list = 12;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated .ActivityInfo activity_info_list = 6;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfoOrBuilder> 
@@ -313,21 +349,33 @@ public java.util.List<emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityI
       return activityInfoList_;
     }
     /**
-     * <code>repeated .ActivityInfo activity_info_list = 12;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated .ActivityInfo activity_info_list = 6;</code>
      */
     @java.lang.Override
     public int getActivityInfoListCount() {
       return activityInfoList_.size();
     }
     /**
-     * <code>repeated .ActivityInfo activity_info_list = 12;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated .ActivityInfo activity_info_list = 6;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo getActivityInfoList(int index) {
       return activityInfoList_.get(index);
     }
     /**
-     * <code>repeated .ActivityInfo activity_info_list = 12;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated .ActivityInfo activity_info_list = 6;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfoOrBuilder getActivityInfoListOrBuilder(
@@ -335,10 +383,74 @@ public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfoOrBuilder ge
       return activityInfoList_.get(index);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 14;
+    public static final int DISABLE_TRANSFER_POINT_INTERACTION_LIST_FIELD_NUMBER = 4;
+    private java.util.List<emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair> disableTransferPointInteractionList_;
+    /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 4;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair> getDisableTransferPointInteractionListList() {
+      return disableTransferPointInteractionList_;
+    }
+    /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 4;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder> 
+        getDisableTransferPointInteractionListOrBuilderList() {
+      return disableTransferPointInteractionList_;
+    }
+    /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 4;</code>
+     */
+    @java.lang.Override
+    public int getDisableTransferPointInteractionListCount() {
+      return disableTransferPointInteractionList_.size();
+    }
+    /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 4;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair getDisableTransferPointInteractionList(int index) {
+      return disableTransferPointInteractionList_.get(index);
+    }
+    /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 4;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder getDisableTransferPointInteractionListOrBuilder(
+        int index) {
+      return disableTransferPointInteractionList_.get(index);
+    }
+
+    public static final int RETCODE_FIELD_NUMBER = 2;
     private int retcode_;
     /**
-     * <code>int32 retcode = 14;</code>
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>int32 retcode = 2;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -361,21 +473,21 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
+      if (retcode_ != 0) {
+        output.writeInt32(2, retcode_);
+      }
       for (int i = 0; i < disableTransferPointInteractionList_.size(); i++) {
-        output.writeMessage(9, disableTransferPointInteractionList_.get(i));
+        output.writeMessage(4, disableTransferPointInteractionList_.get(i));
       }
       if (getActivatedSaleIdListList().size() > 0) {
-        output.writeUInt32NoTag(82);
+        output.writeUInt32NoTag(42);
         output.writeUInt32NoTag(activatedSaleIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < activatedSaleIdList_.size(); i++) {
         output.writeUInt32NoTag(activatedSaleIdList_.getInt(i));
       }
       for (int i = 0; i < activityInfoList_.size(); i++) {
-        output.writeMessage(12, activityInfoList_.get(i));
-      }
-      if (retcode_ != 0) {
-        output.writeInt32(14, retcode_);
+        output.writeMessage(6, activityInfoList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -386,9 +498,13 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(2, retcode_);
+      }
       for (int i = 0; i < disableTransferPointInteractionList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, disableTransferPointInteractionList_.get(i));
+          .computeMessageSize(4, disableTransferPointInteractionList_.get(i));
       }
       {
         int dataSize = 0;
@@ -406,11 +522,7 @@ public int getSerializedSize() {
       }
       for (int i = 0; i < activityInfoList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(12, activityInfoList_.get(i));
-      }
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(14, retcode_);
+          .computeMessageSize(6, activityInfoList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -427,12 +539,12 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.GetActivityInfoRspOuterClass.GetActivityInfoRsp other = (emu.grasscutter.net.proto.GetActivityInfoRspOuterClass.GetActivityInfoRsp) obj;
 
-      if (!getDisableTransferPointInteractionListList()
-          .equals(other.getDisableTransferPointInteractionListList())) return false;
       if (!getActivatedSaleIdListList()
           .equals(other.getActivatedSaleIdListList())) return false;
       if (!getActivityInfoListList()
           .equals(other.getActivityInfoListList())) return false;
+      if (!getDisableTransferPointInteractionListList()
+          .equals(other.getDisableTransferPointInteractionListList())) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -446,10 +558,6 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (getDisableTransferPointInteractionListCount() > 0) {
-        hash = (37 * hash) + DISABLE_TRANSFER_POINT_INTERACTION_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getDisableTransferPointInteractionListList().hashCode();
-      }
       if (getActivatedSaleIdListCount() > 0) {
         hash = (37 * hash) + ACTIVATED_SALE_ID_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getActivatedSaleIdListList().hashCode();
@@ -458,6 +566,10 @@ public int hashCode() {
         hash = (37 * hash) + ACTIVITY_INFO_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getActivityInfoListList().hashCode();
       }
+      if (getDisableTransferPointInteractionListCount() > 0) {
+        hash = (37 * hash) + DISABLE_TRANSFER_POINT_INTERACTION_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getDisableTransferPointInteractionListList().hashCode();
+      }
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -557,7 +669,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 27306
+     * CmdId: 3417
      * </pre>
      *
      * Protobuf type {@code GetActivityInfoRsp}
@@ -592,31 +704,31 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
-          getDisableTransferPointInteractionListFieldBuilder();
           getActivityInfoListFieldBuilder();
+          getDisableTransferPointInteractionListFieldBuilder();
         }
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (disableTransferPointInteractionListBuilder_ == null) {
-          disableTransferPointInteractionList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        } else {
-          disableTransferPointInteractionListBuilder_.clear();
-        }
         activatedSaleIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000001);
         if (activityInfoListBuilder_ == null) {
           activityInfoList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000004);
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           activityInfoListBuilder_.clear();
         }
-        retcode_ = 0;
-
-        return this;
-      }
+        if (disableTransferPointInteractionListBuilder_ == null) {
+          disableTransferPointInteractionList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000004);
+        } else {
+          disableTransferPointInteractionListBuilder_.clear();
+        }
+        retcode_ = 0;
+
+        return this;
+      }
 
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
@@ -642,29 +754,29 @@ public emu.grasscutter.net.proto.GetActivityInfoRspOuterClass.GetActivityInfoRsp
       public emu.grasscutter.net.proto.GetActivityInfoRspOuterClass.GetActivityInfoRsp buildPartial() {
         emu.grasscutter.net.proto.GetActivityInfoRspOuterClass.GetActivityInfoRsp result = new emu.grasscutter.net.proto.GetActivityInfoRspOuterClass.GetActivityInfoRsp(this);
         int from_bitField0_ = bitField0_;
-        if (disableTransferPointInteractionListBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) != 0)) {
-            disableTransferPointInteractionList_ = java.util.Collections.unmodifiableList(disableTransferPointInteractionList_);
-            bitField0_ = (bitField0_ & ~0x00000001);
-          }
-          result.disableTransferPointInteractionList_ = disableTransferPointInteractionList_;
-        } else {
-          result.disableTransferPointInteractionList_ = disableTransferPointInteractionListBuilder_.build();
-        }
-        if (((bitField0_ & 0x00000002) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           activatedSaleIdList_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.activatedSaleIdList_ = activatedSaleIdList_;
         if (activityInfoListBuilder_ == null) {
-          if (((bitField0_ & 0x00000004) != 0)) {
+          if (((bitField0_ & 0x00000002) != 0)) {
             activityInfoList_ = java.util.Collections.unmodifiableList(activityInfoList_);
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000002);
           }
           result.activityInfoList_ = activityInfoList_;
         } else {
           result.activityInfoList_ = activityInfoListBuilder_.build();
         }
+        if (disableTransferPointInteractionListBuilder_ == null) {
+          if (((bitField0_ & 0x00000004) != 0)) {
+            disableTransferPointInteractionList_ = java.util.Collections.unmodifiableList(disableTransferPointInteractionList_);
+            bitField0_ = (bitField0_ & ~0x00000004);
+          }
+          result.disableTransferPointInteractionList_ = disableTransferPointInteractionList_;
+        } else {
+          result.disableTransferPointInteractionList_ = disableTransferPointInteractionListBuilder_.build();
+        }
         result.retcode_ = retcode_;
         onBuilt();
         return result;
@@ -714,36 +826,10 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.GetActivityInfoRspOuterClass.GetActivityInfoRsp other) {
         if (other == emu.grasscutter.net.proto.GetActivityInfoRspOuterClass.GetActivityInfoRsp.getDefaultInstance()) return this;
-        if (disableTransferPointInteractionListBuilder_ == null) {
-          if (!other.disableTransferPointInteractionList_.isEmpty()) {
-            if (disableTransferPointInteractionList_.isEmpty()) {
-              disableTransferPointInteractionList_ = other.disableTransferPointInteractionList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-            } else {
-              ensureDisableTransferPointInteractionListIsMutable();
-              disableTransferPointInteractionList_.addAll(other.disableTransferPointInteractionList_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.disableTransferPointInteractionList_.isEmpty()) {
-            if (disableTransferPointInteractionListBuilder_.isEmpty()) {
-              disableTransferPointInteractionListBuilder_.dispose();
-              disableTransferPointInteractionListBuilder_ = null;
-              disableTransferPointInteractionList_ = other.disableTransferPointInteractionList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-              disableTransferPointInteractionListBuilder_ = 
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getDisableTransferPointInteractionListFieldBuilder() : null;
-            } else {
-              disableTransferPointInteractionListBuilder_.addAllMessages(other.disableTransferPointInteractionList_);
-            }
-          }
-        }
         if (!other.activatedSaleIdList_.isEmpty()) {
           if (activatedSaleIdList_.isEmpty()) {
             activatedSaleIdList_ = other.activatedSaleIdList_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureActivatedSaleIdListIsMutable();
             activatedSaleIdList_.addAll(other.activatedSaleIdList_);
@@ -754,7 +840,7 @@ public Builder mergeFrom(emu.grasscutter.net.proto.GetActivityInfoRspOuterClass.
           if (!other.activityInfoList_.isEmpty()) {
             if (activityInfoList_.isEmpty()) {
               activityInfoList_ = other.activityInfoList_;
-              bitField0_ = (bitField0_ & ~0x00000004);
+              bitField0_ = (bitField0_ & ~0x00000002);
             } else {
               ensureActivityInfoListIsMutable();
               activityInfoList_.addAll(other.activityInfoList_);
@@ -767,7 +853,7 @@ public Builder mergeFrom(emu.grasscutter.net.proto.GetActivityInfoRspOuterClass.
               activityInfoListBuilder_.dispose();
               activityInfoListBuilder_ = null;
               activityInfoList_ = other.activityInfoList_;
-              bitField0_ = (bitField0_ & ~0x00000004);
+              bitField0_ = (bitField0_ & ~0x00000002);
               activityInfoListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getActivityInfoListFieldBuilder() : null;
@@ -776,304 +862,102 @@ public Builder mergeFrom(emu.grasscutter.net.proto.GetActivityInfoRspOuterClass.
             }
           }
         }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
-        this.mergeUnknownFields(other.unknownFields);
-        onChanged();
-        return this;
-      }
-
-      @java.lang.Override
-      public final boolean isInitialized() {
-        return true;
-      }
-
-      @java.lang.Override
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        emu.grasscutter.net.proto.GetActivityInfoRspOuterClass.GetActivityInfoRsp parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (emu.grasscutter.net.proto.GetActivityInfoRspOuterClass.GetActivityInfoRsp) e.getUnfinishedMessage();
-          throw e.unwrapIOException();
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-      private int bitField0_;
-
-      private java.util.List<emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair> disableTransferPointInteractionList_ =
-        java.util.Collections.emptyList();
-      private void ensureDisableTransferPointInteractionListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          disableTransferPointInteractionList_ = new java.util.ArrayList<emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair>(disableTransferPointInteractionList_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder> disableTransferPointInteractionListBuilder_;
-
-      /**
-       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 9;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair> getDisableTransferPointInteractionListList() {
-        if (disableTransferPointInteractionListBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(disableTransferPointInteractionList_);
-        } else {
-          return disableTransferPointInteractionListBuilder_.getMessageList();
-        }
-      }
-      /**
-       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 9;</code>
-       */
-      public int getDisableTransferPointInteractionListCount() {
-        if (disableTransferPointInteractionListBuilder_ == null) {
-          return disableTransferPointInteractionList_.size();
-        } else {
-          return disableTransferPointInteractionListBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 9;</code>
-       */
-      public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair getDisableTransferPointInteractionList(int index) {
-        if (disableTransferPointInteractionListBuilder_ == null) {
-          return disableTransferPointInteractionList_.get(index);
-        } else {
-          return disableTransferPointInteractionListBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 9;</code>
-       */
-      public Builder setDisableTransferPointInteractionList(
-          int index, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair value) {
-        if (disableTransferPointInteractionListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureDisableTransferPointInteractionListIsMutable();
-          disableTransferPointInteractionList_.set(index, value);
-          onChanged();
-        } else {
-          disableTransferPointInteractionListBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 9;</code>
-       */
-      public Builder setDisableTransferPointInteractionList(
-          int index, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder builderForValue) {
-        if (disableTransferPointInteractionListBuilder_ == null) {
-          ensureDisableTransferPointInteractionListIsMutable();
-          disableTransferPointInteractionList_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          disableTransferPointInteractionListBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 9;</code>
-       */
-      public Builder addDisableTransferPointInteractionList(emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair value) {
         if (disableTransferPointInteractionListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
+          if (!other.disableTransferPointInteractionList_.isEmpty()) {
+            if (disableTransferPointInteractionList_.isEmpty()) {
+              disableTransferPointInteractionList_ = other.disableTransferPointInteractionList_;
+              bitField0_ = (bitField0_ & ~0x00000004);
+            } else {
+              ensureDisableTransferPointInteractionListIsMutable();
+              disableTransferPointInteractionList_.addAll(other.disableTransferPointInteractionList_);
+            }
+            onChanged();
           }
-          ensureDisableTransferPointInteractionListIsMutable();
-          disableTransferPointInteractionList_.add(value);
-          onChanged();
         } else {
-          disableTransferPointInteractionListBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 9;</code>
-       */
-      public Builder addDisableTransferPointInteractionList(
-          int index, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair value) {
-        if (disableTransferPointInteractionListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
+          if (!other.disableTransferPointInteractionList_.isEmpty()) {
+            if (disableTransferPointInteractionListBuilder_.isEmpty()) {
+              disableTransferPointInteractionListBuilder_.dispose();
+              disableTransferPointInteractionListBuilder_ = null;
+              disableTransferPointInteractionList_ = other.disableTransferPointInteractionList_;
+              bitField0_ = (bitField0_ & ~0x00000004);
+              disableTransferPointInteractionListBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getDisableTransferPointInteractionListFieldBuilder() : null;
+            } else {
+              disableTransferPointInteractionListBuilder_.addAllMessages(other.disableTransferPointInteractionList_);
+            }
           }
-          ensureDisableTransferPointInteractionListIsMutable();
-          disableTransferPointInteractionList_.add(index, value);
-          onChanged();
-        } else {
-          disableTransferPointInteractionListBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 9;</code>
-       */
-      public Builder addDisableTransferPointInteractionList(
-          emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder builderForValue) {
-        if (disableTransferPointInteractionListBuilder_ == null) {
-          ensureDisableTransferPointInteractionListIsMutable();
-          disableTransferPointInteractionList_.add(builderForValue.build());
-          onChanged();
-        } else {
-          disableTransferPointInteractionListBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 9;</code>
-       */
-      public Builder addDisableTransferPointInteractionList(
-          int index, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder builderForValue) {
-        if (disableTransferPointInteractionListBuilder_ == null) {
-          ensureDisableTransferPointInteractionListIsMutable();
-          disableTransferPointInteractionList_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          disableTransferPointInteractionListBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 9;</code>
-       */
-      public Builder addAllDisableTransferPointInteractionList(
-          java.lang.Iterable<? extends emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair> values) {
-        if (disableTransferPointInteractionListBuilder_ == null) {
-          ensureDisableTransferPointInteractionListIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, disableTransferPointInteractionList_);
-          onChanged();
-        } else {
-          disableTransferPointInteractionListBuilder_.addAllMessages(values);
         }
-        return this;
-      }
-      /**
-       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 9;</code>
-       */
-      public Builder clearDisableTransferPointInteractionList() {
-        if (disableTransferPointInteractionListBuilder_ == null) {
-          disableTransferPointInteractionList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-          onChanged();
-        } else {
-          disableTransferPointInteractionListBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 9;</code>
-       */
-      public Builder removeDisableTransferPointInteractionList(int index) {
-        if (disableTransferPointInteractionListBuilder_ == null) {
-          ensureDisableTransferPointInteractionListIsMutable();
-          disableTransferPointInteractionList_.remove(index);
-          onChanged();
-        } else {
-          disableTransferPointInteractionListBuilder_.remove(index);
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
         }
+        this.mergeUnknownFields(other.unknownFields);
+        onChanged();
         return this;
       }
-      /**
-       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 9;</code>
-       */
-      public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder getDisableTransferPointInteractionListBuilder(
-          int index) {
-        return getDisableTransferPointInteractionListFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 9;</code>
-       */
-      public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder getDisableTransferPointInteractionListOrBuilder(
-          int index) {
-        if (disableTransferPointInteractionListBuilder_ == null) {
-          return disableTransferPointInteractionList_.get(index);  } else {
-          return disableTransferPointInteractionListBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 9;</code>
-       */
-      public java.util.List<? extends emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder> 
-           getDisableTransferPointInteractionListOrBuilderList() {
-        if (disableTransferPointInteractionListBuilder_ != null) {
-          return disableTransferPointInteractionListBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(disableTransferPointInteractionList_);
-        }
-      }
-      /**
-       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 9;</code>
-       */
-      public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder addDisableTransferPointInteractionListBuilder() {
-        return getDisableTransferPointInteractionListFieldBuilder().addBuilder(
-            emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 9;</code>
-       */
-      public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder addDisableTransferPointInteractionListBuilder(
-          int index) {
-        return getDisableTransferPointInteractionListFieldBuilder().addBuilder(
-            index, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 9;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder> 
-           getDisableTransferPointInteractionListBuilderList() {
-        return getDisableTransferPointInteractionListFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder> 
-          getDisableTransferPointInteractionListFieldBuilder() {
-        if (disableTransferPointInteractionListBuilder_ == null) {
-          disableTransferPointInteractionListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder>(
-                  disableTransferPointInteractionList_,
-                  ((bitField0_ & 0x00000001) != 0),
-                  getParentForChildren(),
-                  isClean());
-          disableTransferPointInteractionList_ = null;
+
+      @java.lang.Override
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      @java.lang.Override
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        emu.grasscutter.net.proto.GetActivityInfoRspOuterClass.GetActivityInfoRsp parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.GetActivityInfoRspOuterClass.GetActivityInfoRsp) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
         }
-        return disableTransferPointInteractionListBuilder_;
+        return this;
       }
+      private int bitField0_;
 
       private com.google.protobuf.Internal.IntList activatedSaleIdList_ = emptyIntList();
       private void ensureActivatedSaleIdListIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
+        if (!((bitField0_ & 0x00000001) != 0)) {
           activatedSaleIdList_ = mutableCopy(activatedSaleIdList_);
-          bitField0_ |= 0x00000002;
+          bitField0_ |= 0x00000001;
          }
       }
       /**
-       * <code>repeated uint32 activated_sale_id_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 activated_sale_id_list = 5;</code>
        * @return A list containing the activatedSaleIdList.
        */
       public java.util.List<java.lang.Integer>
           getActivatedSaleIdListList() {
-        return ((bitField0_ & 0x00000002) != 0) ?
+        return ((bitField0_ & 0x00000001) != 0) ?
                  java.util.Collections.unmodifiableList(activatedSaleIdList_) : activatedSaleIdList_;
       }
       /**
-       * <code>repeated uint32 activated_sale_id_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 activated_sale_id_list = 5;</code>
        * @return The count of activatedSaleIdList.
        */
       public int getActivatedSaleIdListCount() {
         return activatedSaleIdList_.size();
       }
       /**
-       * <code>repeated uint32 activated_sale_id_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 activated_sale_id_list = 5;</code>
        * @param index The index of the element to return.
        * @return The activatedSaleIdList at the given index.
        */
@@ -1081,7 +965,11 @@ public int getActivatedSaleIdList(int index) {
         return activatedSaleIdList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 activated_sale_id_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 activated_sale_id_list = 5;</code>
        * @param index The index to set the value at.
        * @param value The activatedSaleIdList to set.
        * @return This builder for chaining.
@@ -1094,7 +982,11 @@ public Builder setActivatedSaleIdList(
         return this;
       }
       /**
-       * <code>repeated uint32 activated_sale_id_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 activated_sale_id_list = 5;</code>
        * @param value The activatedSaleIdList to add.
        * @return This builder for chaining.
        */
@@ -1105,7 +997,11 @@ public Builder addActivatedSaleIdList(int value) {
         return this;
       }
       /**
-       * <code>repeated uint32 activated_sale_id_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 activated_sale_id_list = 5;</code>
        * @param values The activatedSaleIdList to add.
        * @return This builder for chaining.
        */
@@ -1118,12 +1014,16 @@ public Builder addAllActivatedSaleIdList(
         return this;
       }
       /**
-       * <code>repeated uint32 activated_sale_id_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 activated_sale_id_list = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearActivatedSaleIdList() {
         activatedSaleIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
@@ -1131,9 +1031,9 @@ public Builder clearActivatedSaleIdList() {
       private java.util.List<emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo> activityInfoList_ =
         java.util.Collections.emptyList();
       private void ensureActivityInfoListIsMutable() {
-        if (!((bitField0_ & 0x00000004) != 0)) {
+        if (!((bitField0_ & 0x00000002) != 0)) {
           activityInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo>(activityInfoList_);
-          bitField0_ |= 0x00000004;
+          bitField0_ |= 0x00000002;
          }
       }
 
@@ -1141,7 +1041,11 @@ private void ensureActivityInfoListIsMutable() {
           emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo, emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.Builder, emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfoOrBuilder> activityInfoListBuilder_;
 
       /**
-       * <code>repeated .ActivityInfo activity_info_list = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .ActivityInfo activity_info_list = 6;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo> getActivityInfoListList() {
         if (activityInfoListBuilder_ == null) {
@@ -1151,7 +1055,11 @@ public java.util.List<emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityI
         }
       }
       /**
-       * <code>repeated .ActivityInfo activity_info_list = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .ActivityInfo activity_info_list = 6;</code>
        */
       public int getActivityInfoListCount() {
         if (activityInfoListBuilder_ == null) {
@@ -1161,7 +1069,11 @@ public int getActivityInfoListCount() {
         }
       }
       /**
-       * <code>repeated .ActivityInfo activity_info_list = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .ActivityInfo activity_info_list = 6;</code>
        */
       public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo getActivityInfoList(int index) {
         if (activityInfoListBuilder_ == null) {
@@ -1171,7 +1083,11 @@ public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo getActivity
         }
       }
       /**
-       * <code>repeated .ActivityInfo activity_info_list = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .ActivityInfo activity_info_list = 6;</code>
        */
       public Builder setActivityInfoList(
           int index, emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo value) {
@@ -1188,7 +1104,11 @@ public Builder setActivityInfoList(
         return this;
       }
       /**
-       * <code>repeated .ActivityInfo activity_info_list = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .ActivityInfo activity_info_list = 6;</code>
        */
       public Builder setActivityInfoList(
           int index, emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.Builder builderForValue) {
@@ -1202,7 +1122,11 @@ public Builder setActivityInfoList(
         return this;
       }
       /**
-       * <code>repeated .ActivityInfo activity_info_list = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .ActivityInfo activity_info_list = 6;</code>
        */
       public Builder addActivityInfoList(emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo value) {
         if (activityInfoListBuilder_ == null) {
@@ -1218,7 +1142,11 @@ public Builder addActivityInfoList(emu.grasscutter.net.proto.ActivityInfoOuterCl
         return this;
       }
       /**
-       * <code>repeated .ActivityInfo activity_info_list = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .ActivityInfo activity_info_list = 6;</code>
        */
       public Builder addActivityInfoList(
           int index, emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo value) {
@@ -1235,7 +1163,11 @@ public Builder addActivityInfoList(
         return this;
       }
       /**
-       * <code>repeated .ActivityInfo activity_info_list = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .ActivityInfo activity_info_list = 6;</code>
        */
       public Builder addActivityInfoList(
           emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.Builder builderForValue) {
@@ -1249,7 +1181,11 @@ public Builder addActivityInfoList(
         return this;
       }
       /**
-       * <code>repeated .ActivityInfo activity_info_list = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .ActivityInfo activity_info_list = 6;</code>
        */
       public Builder addActivityInfoList(
           int index, emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.Builder builderForValue) {
@@ -1263,7 +1199,11 @@ public Builder addActivityInfoList(
         return this;
       }
       /**
-       * <code>repeated .ActivityInfo activity_info_list = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .ActivityInfo activity_info_list = 6;</code>
        */
       public Builder addAllActivityInfoList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo> values) {
@@ -1278,12 +1218,16 @@ public Builder addAllActivityInfoList(
         return this;
       }
       /**
-       * <code>repeated .ActivityInfo activity_info_list = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .ActivityInfo activity_info_list = 6;</code>
        */
       public Builder clearActivityInfoList() {
         if (activityInfoListBuilder_ == null) {
           activityInfoList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000004);
+          bitField0_ = (bitField0_ & ~0x00000002);
           onChanged();
         } else {
           activityInfoListBuilder_.clear();
@@ -1291,7 +1235,11 @@ public Builder clearActivityInfoList() {
         return this;
       }
       /**
-       * <code>repeated .ActivityInfo activity_info_list = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .ActivityInfo activity_info_list = 6;</code>
        */
       public Builder removeActivityInfoList(int index) {
         if (activityInfoListBuilder_ == null) {
@@ -1304,14 +1252,22 @@ public Builder removeActivityInfoList(int index) {
         return this;
       }
       /**
-       * <code>repeated .ActivityInfo activity_info_list = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .ActivityInfo activity_info_list = 6;</code>
        */
       public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.Builder getActivityInfoListBuilder(
           int index) {
         return getActivityInfoListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .ActivityInfo activity_info_list = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .ActivityInfo activity_info_list = 6;</code>
        */
       public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfoOrBuilder getActivityInfoListOrBuilder(
           int index) {
@@ -1321,7 +1277,11 @@ public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfoOrBuilder ge
         }
       }
       /**
-       * <code>repeated .ActivityInfo activity_info_list = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .ActivityInfo activity_info_list = 6;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfoOrBuilder> 
            getActivityInfoListOrBuilderList() {
@@ -1332,14 +1292,22 @@ public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfoOrBuilder ge
         }
       }
       /**
-       * <code>repeated .ActivityInfo activity_info_list = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .ActivityInfo activity_info_list = 6;</code>
        */
       public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.Builder addActivityInfoListBuilder() {
         return getActivityInfoListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .ActivityInfo activity_info_list = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .ActivityInfo activity_info_list = 6;</code>
        */
       public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.Builder addActivityInfoListBuilder(
           int index) {
@@ -1347,7 +1315,11 @@ public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.Builder add
             index, emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .ActivityInfo activity_info_list = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .ActivityInfo activity_info_list = 6;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.Builder> 
            getActivityInfoListBuilderList() {
@@ -1360,7 +1332,7 @@ public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.Builder add
           activityInfoListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo, emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.Builder, emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfoOrBuilder>(
                   activityInfoList_,
-                  ((bitField0_ & 0x00000004) != 0),
+                  ((bitField0_ & 0x00000002) != 0),
                   getParentForChildren(),
                   isClean());
           activityInfoList_ = null;
@@ -1368,9 +1340,325 @@ public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.Builder add
         return activityInfoListBuilder_;
       }
 
+      private java.util.List<emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair> disableTransferPointInteractionList_ =
+        java.util.Collections.emptyList();
+      private void ensureDisableTransferPointInteractionListIsMutable() {
+        if (!((bitField0_ & 0x00000004) != 0)) {
+          disableTransferPointInteractionList_ = new java.util.ArrayList<emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair>(disableTransferPointInteractionList_);
+          bitField0_ |= 0x00000004;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder> disableTransferPointInteractionListBuilder_;
+
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 4;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair> getDisableTransferPointInteractionListList() {
+        if (disableTransferPointInteractionListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(disableTransferPointInteractionList_);
+        } else {
+          return disableTransferPointInteractionListBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 4;</code>
+       */
+      public int getDisableTransferPointInteractionListCount() {
+        if (disableTransferPointInteractionListBuilder_ == null) {
+          return disableTransferPointInteractionList_.size();
+        } else {
+          return disableTransferPointInteractionListBuilder_.getCount();
+        }
+      }
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 4;</code>
+       */
+      public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair getDisableTransferPointInteractionList(int index) {
+        if (disableTransferPointInteractionListBuilder_ == null) {
+          return disableTransferPointInteractionList_.get(index);
+        } else {
+          return disableTransferPointInteractionListBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 4;</code>
+       */
+      public Builder setDisableTransferPointInteractionList(
+          int index, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair value) {
+        if (disableTransferPointInteractionListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureDisableTransferPointInteractionListIsMutable();
+          disableTransferPointInteractionList_.set(index, value);
+          onChanged();
+        } else {
+          disableTransferPointInteractionListBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 4;</code>
+       */
+      public Builder setDisableTransferPointInteractionList(
+          int index, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder builderForValue) {
+        if (disableTransferPointInteractionListBuilder_ == null) {
+          ensureDisableTransferPointInteractionListIsMutable();
+          disableTransferPointInteractionList_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          disableTransferPointInteractionListBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 4;</code>
+       */
+      public Builder addDisableTransferPointInteractionList(emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair value) {
+        if (disableTransferPointInteractionListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureDisableTransferPointInteractionListIsMutable();
+          disableTransferPointInteractionList_.add(value);
+          onChanged();
+        } else {
+          disableTransferPointInteractionListBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 4;</code>
+       */
+      public Builder addDisableTransferPointInteractionList(
+          int index, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair value) {
+        if (disableTransferPointInteractionListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureDisableTransferPointInteractionListIsMutable();
+          disableTransferPointInteractionList_.add(index, value);
+          onChanged();
+        } else {
+          disableTransferPointInteractionListBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 4;</code>
+       */
+      public Builder addDisableTransferPointInteractionList(
+          emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder builderForValue) {
+        if (disableTransferPointInteractionListBuilder_ == null) {
+          ensureDisableTransferPointInteractionListIsMutable();
+          disableTransferPointInteractionList_.add(builderForValue.build());
+          onChanged();
+        } else {
+          disableTransferPointInteractionListBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 4;</code>
+       */
+      public Builder addDisableTransferPointInteractionList(
+          int index, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder builderForValue) {
+        if (disableTransferPointInteractionListBuilder_ == null) {
+          ensureDisableTransferPointInteractionListIsMutable();
+          disableTransferPointInteractionList_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          disableTransferPointInteractionListBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 4;</code>
+       */
+      public Builder addAllDisableTransferPointInteractionList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair> values) {
+        if (disableTransferPointInteractionListBuilder_ == null) {
+          ensureDisableTransferPointInteractionListIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, disableTransferPointInteractionList_);
+          onChanged();
+        } else {
+          disableTransferPointInteractionListBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 4;</code>
+       */
+      public Builder clearDisableTransferPointInteractionList() {
+        if (disableTransferPointInteractionListBuilder_ == null) {
+          disableTransferPointInteractionList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000004);
+          onChanged();
+        } else {
+          disableTransferPointInteractionListBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 4;</code>
+       */
+      public Builder removeDisableTransferPointInteractionList(int index) {
+        if (disableTransferPointInteractionListBuilder_ == null) {
+          ensureDisableTransferPointInteractionListIsMutable();
+          disableTransferPointInteractionList_.remove(index);
+          onChanged();
+        } else {
+          disableTransferPointInteractionListBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 4;</code>
+       */
+      public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder getDisableTransferPointInteractionListBuilder(
+          int index) {
+        return getDisableTransferPointInteractionListFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 4;</code>
+       */
+      public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder getDisableTransferPointInteractionListOrBuilder(
+          int index) {
+        if (disableTransferPointInteractionListBuilder_ == null) {
+          return disableTransferPointInteractionList_.get(index);  } else {
+          return disableTransferPointInteractionListBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 4;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder> 
+           getDisableTransferPointInteractionListOrBuilderList() {
+        if (disableTransferPointInteractionListBuilder_ != null) {
+          return disableTransferPointInteractionListBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(disableTransferPointInteractionList_);
+        }
+      }
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 4;</code>
+       */
+      public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder addDisableTransferPointInteractionListBuilder() {
+        return getDisableTransferPointInteractionListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.getDefaultInstance());
+      }
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 4;</code>
+       */
+      public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder addDisableTransferPointInteractionListBuilder(
+          int index) {
+        return getDisableTransferPointInteractionListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.getDefaultInstance());
+      }
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 4;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder> 
+           getDisableTransferPointInteractionListBuilderList() {
+        return getDisableTransferPointInteractionListFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder> 
+          getDisableTransferPointInteractionListFieldBuilder() {
+        if (disableTransferPointInteractionListBuilder_ == null) {
+          disableTransferPointInteractionListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder>(
+                  disableTransferPointInteractionList_,
+                  ((bitField0_ & 0x00000004) != 0),
+                  getParentForChildren(),
+                  isClean());
+          disableTransferPointInteractionList_ = null;
+        }
+        return disableTransferPointInteractionListBuilder_;
+      }
+
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 14;</code>
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>int32 retcode = 2;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -1378,7 +1666,11 @@ public int getRetcode() {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 14;</code>
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>int32 retcode = 2;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -1389,7 +1681,11 @@ public Builder setRetcode(int value) {
         return this;
       }
       /**
-       * <code>int32 retcode = 14;</code>
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>int32 retcode = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -1467,10 +1763,10 @@ public emu.grasscutter.net.proto.GetActivityInfoRspOuterClass.GetActivityInfoRsp
     java.lang.String[] descriptorData = {
       "\n\030GetActivityInfoRsp.proto\032\022ActivityInfo" +
       ".proto\032\020Uint32Pair.proto\"\256\001\n\022GetActivity" +
-      "InfoRsp\022<\n\'disable_transfer_point_intera" +
-      "ction_list\030\t \003(\0132\013.Uint32Pair\022\036\n\026activat" +
-      "ed_sale_id_list\030\n \003(\r\022)\n\022activity_info_l" +
-      "ist\030\014 \003(\0132\r.ActivityInfo\022\017\n\007retcode\030\016 \001(" +
+      "InfoRsp\022\036\n\026activated_sale_id_list\030\005 \003(\r\022" +
+      ")\n\022activity_info_list\030\006 \003(\0132\r.ActivityIn" +
+      "fo\022<\n\'disable_transfer_point_interaction" +
+      "_list\030\004 \003(\0132\013.Uint32Pair\022\017\n\007retcode\030\002 \001(" +
       "\005B\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1484,7 +1780,7 @@ public emu.grasscutter.net.proto.GetActivityInfoRspOuterClass.GetActivityInfoRsp
     internal_static_GetActivityInfoRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetActivityInfoRsp_descriptor,
-        new java.lang.String[] { "DisableTransferPointInteractionList", "ActivatedSaleIdList", "ActivityInfoList", "Retcode", });
+        new java.lang.String[] { "ActivatedSaleIdList", "ActivityInfoList", "DisableTransferPointInteractionList", "Retcode", });
     emu.grasscutter.net.proto.ActivityInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.Uint32PairOuterClass.getDescriptor();
   }
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetAllUnlockNameCardReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetAllUnlockNameCardReqOuterClass.java
index 4d314974e0d..064698cb618 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetAllUnlockNameCardReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetAllUnlockNameCardReqOuterClass.java
@@ -20,7 +20,7 @@ public interface GetAllUnlockNameCardReqOrBuilder extends
   }
   /**
    * <pre>
-   * CmdId: 5009
+   * CmdId: 22565
    * </pre>
    *
    * Protobuf type {@code GetAllUnlockNameCardReq}
@@ -245,7 +245,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 5009
+     * CmdId: 22565
      * </pre>
      *
      * Protobuf type {@code GetAllUnlockNameCardReq}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetAllUnlockNameCardRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetAllUnlockNameCardRspOuterClass.java
index f13dc6c10ee..822bd462bb5 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetAllUnlockNameCardRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetAllUnlockNameCardRspOuterClass.java
@@ -19,31 +19,47 @@ public interface GetAllUnlockNameCardRspOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 10;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
-    /**
-     * <code>repeated uint32 name_card_list = 11;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 name_card_list = 5;</code>
      * @return A list containing the nameCardList.
      */
     java.util.List<java.lang.Integer> getNameCardListList();
     /**
-     * <code>repeated uint32 name_card_list = 11;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 name_card_list = 5;</code>
      * @return The count of nameCardList.
      */
     int getNameCardListCount();
     /**
-     * <code>repeated uint32 name_card_list = 11;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 name_card_list = 5;</code>
      * @param index The index of the element to return.
      * @return The nameCardList at the given index.
      */
     int getNameCardList(int index);
+
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>int32 retcode = 8;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
   }
   /**
    * <pre>
-   * CmdId: 2632
+   * CmdId: 3223
    * </pre>
    *
    * Protobuf type {@code GetAllUnlockNameCardRsp}
@@ -92,12 +108,7 @@ private GetAllUnlockNameCardRsp(
             case 0:
               done = true;
               break;
-            case 80: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 88: {
+            case 40: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 nameCardList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -105,7 +116,7 @@ private GetAllUnlockNameCardRsp(
               nameCardList_.addInt(input.readUInt32());
               break;
             }
-            case 90: {
+            case 42: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -118,6 +129,11 @@ private GetAllUnlockNameCardRsp(
               input.popLimit(limit);
               break;
             }
+            case 64: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -153,21 +169,14 @@ private GetAllUnlockNameCardRsp(
               emu.grasscutter.net.proto.GetAllUnlockNameCardRspOuterClass.GetAllUnlockNameCardRsp.class, emu.grasscutter.net.proto.GetAllUnlockNameCardRspOuterClass.GetAllUnlockNameCardRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 10;
-    private int retcode_;
-    /**
-     * <code>int32 retcode = 10;</code>
-     * @return The retcode.
-     */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
-    }
-
-    public static final int NAME_CARD_LIST_FIELD_NUMBER = 11;
+    public static final int NAME_CARD_LIST_FIELD_NUMBER = 5;
     private com.google.protobuf.Internal.IntList nameCardList_;
     /**
-     * <code>repeated uint32 name_card_list = 11;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 name_card_list = 5;</code>
      * @return A list containing the nameCardList.
      */
     @java.lang.Override
@@ -176,14 +185,22 @@ public int getRetcode() {
       return nameCardList_;
     }
     /**
-     * <code>repeated uint32 name_card_list = 11;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 name_card_list = 5;</code>
      * @return The count of nameCardList.
      */
     public int getNameCardListCount() {
       return nameCardList_.size();
     }
     /**
-     * <code>repeated uint32 name_card_list = 11;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 name_card_list = 5;</code>
      * @param index The index of the element to return.
      * @return The nameCardList at the given index.
      */
@@ -192,6 +209,21 @@ public int getNameCardList(int index) {
     }
     private int nameCardListMemoizedSerializedSize = -1;
 
+    public static final int RETCODE_FIELD_NUMBER = 8;
+    private int retcode_;
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>int32 retcode = 8;</code>
+     * @return The retcode.
+     */
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -207,16 +239,16 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (retcode_ != 0) {
-        output.writeInt32(10, retcode_);
-      }
       if (getNameCardListList().size() > 0) {
-        output.writeUInt32NoTag(90);
+        output.writeUInt32NoTag(42);
         output.writeUInt32NoTag(nameCardListMemoizedSerializedSize);
       }
       for (int i = 0; i < nameCardList_.size(); i++) {
         output.writeUInt32NoTag(nameCardList_.getInt(i));
       }
+      if (retcode_ != 0) {
+        output.writeInt32(8, retcode_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -226,10 +258,6 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(10, retcode_);
-      }
       {
         int dataSize = 0;
         for (int i = 0; i < nameCardList_.size(); i++) {
@@ -244,6 +272,10 @@ public int getSerializedSize() {
         }
         nameCardListMemoizedSerializedSize = dataSize;
       }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(8, retcode_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -259,10 +291,10 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.GetAllUnlockNameCardRspOuterClass.GetAllUnlockNameCardRsp other = (emu.grasscutter.net.proto.GetAllUnlockNameCardRspOuterClass.GetAllUnlockNameCardRsp) obj;
 
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (!getNameCardListList()
           .equals(other.getNameCardListList())) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -274,12 +306,12 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       if (getNameCardListCount() > 0) {
         hash = (37 * hash) + NAME_CARD_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getNameCardListList().hashCode();
       }
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -377,7 +409,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 2632
+     * CmdId: 3223
      * </pre>
      *
      * Protobuf type {@code GetAllUnlockNameCardRsp}
@@ -417,10 +449,10 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        retcode_ = 0;
-
         nameCardList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
+        retcode_ = 0;
+
         return this;
       }
 
@@ -448,12 +480,12 @@ public emu.grasscutter.net.proto.GetAllUnlockNameCardRspOuterClass.GetAllUnlockN
       public emu.grasscutter.net.proto.GetAllUnlockNameCardRspOuterClass.GetAllUnlockNameCardRsp buildPartial() {
         emu.grasscutter.net.proto.GetAllUnlockNameCardRspOuterClass.GetAllUnlockNameCardRsp result = new emu.grasscutter.net.proto.GetAllUnlockNameCardRspOuterClass.GetAllUnlockNameCardRsp(this);
         int from_bitField0_ = bitField0_;
-        result.retcode_ = retcode_;
         if (((bitField0_ & 0x00000001) != 0)) {
           nameCardList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.nameCardList_ = nameCardList_;
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -502,9 +534,6 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.GetAllUnlockNameCardRspOuterClass.GetAllUnlockNameCardRsp other) {
         if (other == emu.grasscutter.net.proto.GetAllUnlockNameCardRspOuterClass.GetAllUnlockNameCardRsp.getDefaultInstance()) return this;
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         if (!other.nameCardList_.isEmpty()) {
           if (nameCardList_.isEmpty()) {
             nameCardList_ = other.nameCardList_;
@@ -515,6 +544,9 @@ public Builder mergeFrom(emu.grasscutter.net.proto.GetAllUnlockNameCardRspOuterC
           }
           onChanged();
         }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -545,37 +577,6 @@ public Builder mergeFrom(
       }
       private int bitField0_;
 
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 10;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <code>int32 retcode = 10;</code>
-       * @param value The retcode to set.
-       * @return This builder for chaining.
-       */
-      public Builder setRetcode(int value) {
-        
-        retcode_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>int32 retcode = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
       private com.google.protobuf.Internal.IntList nameCardList_ = emptyIntList();
       private void ensureNameCardListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
@@ -584,7 +585,11 @@ private void ensureNameCardListIsMutable() {
          }
       }
       /**
-       * <code>repeated uint32 name_card_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 name_card_list = 5;</code>
        * @return A list containing the nameCardList.
        */
       public java.util.List<java.lang.Integer>
@@ -593,14 +598,22 @@ private void ensureNameCardListIsMutable() {
                  java.util.Collections.unmodifiableList(nameCardList_) : nameCardList_;
       }
       /**
-       * <code>repeated uint32 name_card_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 name_card_list = 5;</code>
        * @return The count of nameCardList.
        */
       public int getNameCardListCount() {
         return nameCardList_.size();
       }
       /**
-       * <code>repeated uint32 name_card_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 name_card_list = 5;</code>
        * @param index The index of the element to return.
        * @return The nameCardList at the given index.
        */
@@ -608,7 +621,11 @@ public int getNameCardList(int index) {
         return nameCardList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 name_card_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 name_card_list = 5;</code>
        * @param index The index to set the value at.
        * @param value The nameCardList to set.
        * @return This builder for chaining.
@@ -621,7 +638,11 @@ public Builder setNameCardList(
         return this;
       }
       /**
-       * <code>repeated uint32 name_card_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 name_card_list = 5;</code>
        * @param value The nameCardList to add.
        * @return This builder for chaining.
        */
@@ -632,7 +653,11 @@ public Builder addNameCardList(int value) {
         return this;
       }
       /**
-       * <code>repeated uint32 name_card_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 name_card_list = 5;</code>
        * @param values The nameCardList to add.
        * @return This builder for chaining.
        */
@@ -645,7 +670,11 @@ public Builder addAllNameCardList(
         return this;
       }
       /**
-       * <code>repeated uint32 name_card_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 name_card_list = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearNameCardList() {
@@ -654,6 +683,49 @@ public Builder clearNameCardList() {
         onChanged();
         return this;
       }
+
+      private int retcode_ ;
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>int32 retcode = 8;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>int32 retcode = 8;</code>
+       * @param value The retcode to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRetcode(int value) {
+        
+        retcode_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>int32 retcode = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRetcode() {
+        
+        retcode_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -722,8 +794,8 @@ public emu.grasscutter.net.proto.GetAllUnlockNameCardRspOuterClass.GetAllUnlockN
   static {
     java.lang.String[] descriptorData = {
       "\n\035GetAllUnlockNameCardRsp.proto\"B\n\027GetAl" +
-      "lUnlockNameCardRsp\022\017\n\007retcode\030\n \001(\005\022\026\n\016n" +
-      "ame_card_list\030\013 \003(\rB\033\n\031emu.grasscutter.n" +
+      "lUnlockNameCardRsp\022\026\n\016name_card_list\030\005 \003" +
+      "(\r\022\017\n\007retcode\030\010 \001(\005B\033\n\031emu.grasscutter.n" +
       "et.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -735,7 +807,7 @@ public emu.grasscutter.net.proto.GetAllUnlockNameCardRspOuterClass.GetAllUnlockN
     internal_static_GetAllUnlockNameCardRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetAllUnlockNameCardRsp_descriptor,
-        new java.lang.String[] { "Retcode", "NameCardList", });
+        new java.lang.String[] { "NameCardList", "Retcode", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetParentQuestVideoKeyRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetParentQuestVideoKeyRspOuterClass.java
index db2a93233e8..b48b2009cdc 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetParentQuestVideoKeyRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetParentQuestVideoKeyRspOuterClass.java
@@ -19,26 +19,38 @@ public interface GetParentQuestVideoKeyRspOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 parent_quest_id = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 parent_quest_id = 15;</code>
      * @return The parentQuestId.
      */
     int getParentQuestId();
 
     /**
-     * <code>int32 retcode = 14;</code>
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>int32 retcode = 10;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>uint64 video_key = 15;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint64 video_key = 13;</code>
      * @return The videoKey.
      */
     long getVideoKey();
   }
   /**
    * <pre>
-   * CmdId: 28710
+   * CmdId: 24426
    * </pre>
    *
    * Protobuf type {@code GetParentQuestVideoKeyRsp}
@@ -87,17 +99,17 @@ private GetParentQuestVideoKeyRsp(
               break;
             case 80: {
 
-              parentQuestId_ = input.readUInt32();
+              retcode_ = input.readInt32();
               break;
             }
-            case 112: {
+            case 104: {
 
-              retcode_ = input.readInt32();
+              videoKey_ = input.readUInt64();
               break;
             }
             case 120: {
 
-              videoKey_ = input.readUInt64();
+              parentQuestId_ = input.readUInt32();
               break;
             }
             default: {
@@ -132,10 +144,14 @@ private GetParentQuestVideoKeyRsp(
               emu.grasscutter.net.proto.GetParentQuestVideoKeyRspOuterClass.GetParentQuestVideoKeyRsp.class, emu.grasscutter.net.proto.GetParentQuestVideoKeyRspOuterClass.GetParentQuestVideoKeyRsp.Builder.class);
     }
 
-    public static final int PARENT_QUEST_ID_FIELD_NUMBER = 10;
+    public static final int PARENT_QUEST_ID_FIELD_NUMBER = 15;
     private int parentQuestId_;
     /**
-     * <code>uint32 parent_quest_id = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 parent_quest_id = 15;</code>
      * @return The parentQuestId.
      */
     @java.lang.Override
@@ -143,10 +159,14 @@ public int getParentQuestId() {
       return parentQuestId_;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 14;
+    public static final int RETCODE_FIELD_NUMBER = 10;
     private int retcode_;
     /**
-     * <code>int32 retcode = 14;</code>
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>int32 retcode = 10;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -154,10 +174,14 @@ public int getRetcode() {
       return retcode_;
     }
 
-    public static final int VIDEO_KEY_FIELD_NUMBER = 15;
+    public static final int VIDEO_KEY_FIELD_NUMBER = 13;
     private long videoKey_;
     /**
-     * <code>uint64 video_key = 15;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint64 video_key = 13;</code>
      * @return The videoKey.
      */
     @java.lang.Override
@@ -179,14 +203,14 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (parentQuestId_ != 0) {
-        output.writeUInt32(10, parentQuestId_);
-      }
       if (retcode_ != 0) {
-        output.writeInt32(14, retcode_);
+        output.writeInt32(10, retcode_);
       }
       if (videoKey_ != 0L) {
-        output.writeUInt64(15, videoKey_);
+        output.writeUInt64(13, videoKey_);
+      }
+      if (parentQuestId_ != 0) {
+        output.writeUInt32(15, parentQuestId_);
       }
       unknownFields.writeTo(output);
     }
@@ -197,17 +221,17 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (parentQuestId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, parentQuestId_);
-      }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(14, retcode_);
+          .computeInt32Size(10, retcode_);
       }
       if (videoKey_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(15, videoKey_);
+          .computeUInt64Size(13, videoKey_);
+      }
+      if (parentQuestId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(15, parentQuestId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -345,7 +369,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 28710
+     * CmdId: 24426
      * </pre>
      *
      * Protobuf type {@code GetParentQuestVideoKeyRsp}
@@ -508,7 +532,11 @@ public Builder mergeFrom(
 
       private int parentQuestId_ ;
       /**
-       * <code>uint32 parent_quest_id = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 parent_quest_id = 15;</code>
        * @return The parentQuestId.
        */
       @java.lang.Override
@@ -516,7 +544,11 @@ public int getParentQuestId() {
         return parentQuestId_;
       }
       /**
-       * <code>uint32 parent_quest_id = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 parent_quest_id = 15;</code>
        * @param value The parentQuestId to set.
        * @return This builder for chaining.
        */
@@ -527,7 +559,11 @@ public Builder setParentQuestId(int value) {
         return this;
       }
       /**
-       * <code>uint32 parent_quest_id = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 parent_quest_id = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearParentQuestId() {
@@ -539,7 +575,11 @@ public Builder clearParentQuestId() {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 14;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>int32 retcode = 10;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -547,7 +587,11 @@ public int getRetcode() {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 14;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>int32 retcode = 10;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -558,7 +602,11 @@ public Builder setRetcode(int value) {
         return this;
       }
       /**
-       * <code>int32 retcode = 14;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>int32 retcode = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -570,7 +618,11 @@ public Builder clearRetcode() {
 
       private long videoKey_ ;
       /**
-       * <code>uint64 video_key = 15;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint64 video_key = 13;</code>
        * @return The videoKey.
        */
       @java.lang.Override
@@ -578,7 +630,11 @@ public long getVideoKey() {
         return videoKey_;
       }
       /**
-       * <code>uint64 video_key = 15;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint64 video_key = 13;</code>
        * @param value The videoKey to set.
        * @return This builder for chaining.
        */
@@ -589,7 +645,11 @@ public Builder setVideoKey(long value) {
         return this;
       }
       /**
-       * <code>uint64 video_key = 15;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint64 video_key = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearVideoKey() {
@@ -667,7 +727,7 @@ public emu.grasscutter.net.proto.GetParentQuestVideoKeyRspOuterClass.GetParentQu
     java.lang.String[] descriptorData = {
       "\n\037GetParentQuestVideoKeyRsp.proto\"X\n\031Get" +
       "ParentQuestVideoKeyRsp\022\027\n\017parent_quest_i" +
-      "d\030\n \001(\r\022\017\n\007retcode\030\016 \001(\005\022\021\n\tvideo_key\030\017 " +
+      "d\030\017 \001(\r\022\017\n\007retcode\030\n \001(\005\022\021\n\tvideo_key\030\r " +
       "\001(\004B\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerFriendListReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerFriendListReqOuterClass.java
index 2482ba8937a..9944f86f1af 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerFriendListReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerFriendListReqOuterClass.java
@@ -20,7 +20,7 @@ public interface GetPlayerFriendListReqOrBuilder extends
   }
   /**
    * <pre>
-   * CmdId: 1509 || 21140
+   * CmdId: 21177
    * </pre>
    *
    * Protobuf type {@code GetPlayerFriendListReq}
@@ -245,7 +245,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 1509 || 21140
+     * CmdId: 21177
      * </pre>
      *
      * Protobuf type {@code GetPlayerFriendListReq}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerSocialDetailReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerSocialDetailReqOuterClass.java
index 731790ce7e5..06098310efe 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerSocialDetailReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerSocialDetailReqOuterClass.java
@@ -19,14 +19,28 @@ public interface GetPlayerSocialDetailReqOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 uid = 14;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 param = 11;</code>
+     * @return The param.
+     */
+    int getParam();
+
+    /**
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 uid = 6;</code>
      * @return The uid.
      */
     int getUid();
   }
   /**
    * <pre>
-   * CmdId: 3597
+   * CmdId: 8346
    * </pre>
    *
    * Protobuf type {@code GetPlayerSocialDetailReq}
@@ -73,11 +87,16 @@ private GetPlayerSocialDetailReq(
             case 0:
               done = true;
               break;
-            case 112: {
+            case 48: {
 
               uid_ = input.readUInt32();
               break;
             }
+            case 88: {
+
+              param_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -110,10 +129,29 @@ private GetPlayerSocialDetailReq(
               emu.grasscutter.net.proto.GetPlayerSocialDetailReqOuterClass.GetPlayerSocialDetailReq.class, emu.grasscutter.net.proto.GetPlayerSocialDetailReqOuterClass.GetPlayerSocialDetailReq.Builder.class);
     }
 
-    public static final int UID_FIELD_NUMBER = 14;
+    public static final int PARAM_FIELD_NUMBER = 11;
+    private int param_;
+    /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 param = 11;</code>
+     * @return The param.
+     */
+    @java.lang.Override
+    public int getParam() {
+      return param_;
+    }
+
+    public static final int UID_FIELD_NUMBER = 6;
     private int uid_;
     /**
-     * <code>uint32 uid = 14;</code>
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 uid = 6;</code>
      * @return The uid.
      */
     @java.lang.Override
@@ -136,7 +174,10 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (uid_ != 0) {
-        output.writeUInt32(14, uid_);
+        output.writeUInt32(6, uid_);
+      }
+      if (param_ != 0) {
+        output.writeUInt32(11, param_);
       }
       unknownFields.writeTo(output);
     }
@@ -149,7 +190,11 @@ public int getSerializedSize() {
       size = 0;
       if (uid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, uid_);
+          .computeUInt32Size(6, uid_);
+      }
+      if (param_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(11, param_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -166,6 +211,8 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.GetPlayerSocialDetailReqOuterClass.GetPlayerSocialDetailReq other = (emu.grasscutter.net.proto.GetPlayerSocialDetailReqOuterClass.GetPlayerSocialDetailReq) obj;
 
+      if (getParam()
+          != other.getParam()) return false;
       if (getUid()
           != other.getUid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -179,6 +226,8 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + PARAM_FIELD_NUMBER;
+      hash = (53 * hash) + getParam();
       hash = (37 * hash) + UID_FIELD_NUMBER;
       hash = (53 * hash) + getUid();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -278,7 +327,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 3597
+     * CmdId: 8346
      * </pre>
      *
      * Protobuf type {@code GetPlayerSocialDetailReq}
@@ -318,6 +367,8 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        param_ = 0;
+
         uid_ = 0;
 
         return this;
@@ -346,6 +397,7 @@ public emu.grasscutter.net.proto.GetPlayerSocialDetailReqOuterClass.GetPlayerSoc
       @java.lang.Override
       public emu.grasscutter.net.proto.GetPlayerSocialDetailReqOuterClass.GetPlayerSocialDetailReq buildPartial() {
         emu.grasscutter.net.proto.GetPlayerSocialDetailReqOuterClass.GetPlayerSocialDetailReq result = new emu.grasscutter.net.proto.GetPlayerSocialDetailReqOuterClass.GetPlayerSocialDetailReq(this);
+        result.param_ = param_;
         result.uid_ = uid_;
         onBuilt();
         return result;
@@ -395,6 +447,9 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.GetPlayerSocialDetailReqOuterClass.GetPlayerSocialDetailReq other) {
         if (other == emu.grasscutter.net.proto.GetPlayerSocialDetailReqOuterClass.GetPlayerSocialDetailReq.getDefaultInstance()) return this;
+        if (other.getParam() != 0) {
+          setParam(other.getParam());
+        }
         if (other.getUid() != 0) {
           setUid(other.getUid());
         }
@@ -427,9 +482,56 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int param_ ;
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 param = 11;</code>
+       * @return The param.
+       */
+      @java.lang.Override
+      public int getParam() {
+        return param_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 param = 11;</code>
+       * @param value The param to set.
+       * @return This builder for chaining.
+       */
+      public Builder setParam(int value) {
+        
+        param_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 param = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearParam() {
+        
+        param_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int uid_ ;
       /**
-       * <code>uint32 uid = 14;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 uid = 6;</code>
        * @return The uid.
        */
       @java.lang.Override
@@ -437,7 +539,11 @@ public int getUid() {
         return uid_;
       }
       /**
-       * <code>uint32 uid = 14;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 uid = 6;</code>
        * @param value The uid to set.
        * @return This builder for chaining.
        */
@@ -448,7 +554,11 @@ public Builder setUid(int value) {
         return this;
       }
       /**
-       * <code>uint32 uid = 14;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 uid = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearUid() {
@@ -524,9 +634,10 @@ public emu.grasscutter.net.proto.GetPlayerSocialDetailReqOuterClass.GetPlayerSoc
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\036GetPlayerSocialDetailReq.proto\"\'\n\030GetP" +
-      "layerSocialDetailReq\022\013\n\003uid\030\016 \001(\rB\033\n\031emu" +
-      ".grasscutter.net.protob\006proto3"
+      "\n\036GetPlayerSocialDetailReq.proto\"6\n\030GetP" +
+      "layerSocialDetailReq\022\r\n\005param\030\013 \001(\r\022\013\n\003u" +
+      "id\030\006 \001(\rB\033\n\031emu.grasscutter.net.protob\006p" +
+      "roto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -537,7 +648,7 @@ public emu.grasscutter.net.proto.GetPlayerSocialDetailReqOuterClass.GetPlayerSoc
     internal_static_GetPlayerSocialDetailReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetPlayerSocialDetailReq_descriptor,
-        new java.lang.String[] { "Uid", });
+        new java.lang.String[] { "Param", "Uid", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerSocialDetailRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerSocialDetailRspOuterClass.java
index 25fecccfb80..f71f8625718 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerSocialDetailRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerSocialDetailRspOuterClass.java
@@ -19,29 +19,55 @@ public interface GetPlayerSocialDetailRspOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 5;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
-    /**
-     * <code>.SocialDetail detail_data = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.SocialDetail detail_data = 4;</code>
      * @return Whether the detailData field is set.
      */
     boolean hasDetailData();
     /**
-     * <code>.SocialDetail detail_data = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.SocialDetail detail_data = 4;</code>
      * @return The detailData.
      */
     emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail getDetailData();
     /**
-     * <code>.SocialDetail detail_data = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.SocialDetail detail_data = 4;</code>
      */
     emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetailOrBuilder getDetailDataOrBuilder();
+
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 param = 11;</code>
+     * @return The param.
+     */
+    int getParam();
+
+    /**
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>int32 retcode = 7;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
   }
   /**
    * <pre>
-   * CmdId: 1771
+   * CmdId: 4953
    * </pre>
    *
    * Protobuf type {@code GetPlayerSocialDetailRsp}
@@ -88,12 +114,7 @@ private GetPlayerSocialDetailRsp(
             case 0:
               done = true;
               break;
-            case 40: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 98: {
+            case 34: {
               emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail.Builder subBuilder = null;
               if (detailData_ != null) {
                 subBuilder = detailData_.toBuilder();
@@ -106,6 +127,16 @@ private GetPlayerSocialDetailRsp(
 
               break;
             }
+            case 56: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 88: {
+
+              param_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -138,21 +169,14 @@ private GetPlayerSocialDetailRsp(
               emu.grasscutter.net.proto.GetPlayerSocialDetailRspOuterClass.GetPlayerSocialDetailRsp.class, emu.grasscutter.net.proto.GetPlayerSocialDetailRspOuterClass.GetPlayerSocialDetailRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 5;
-    private int retcode_;
-    /**
-     * <code>int32 retcode = 5;</code>
-     * @return The retcode.
-     */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
-    }
-
-    public static final int DETAIL_DATA_FIELD_NUMBER = 12;
+    public static final int DETAIL_DATA_FIELD_NUMBER = 4;
     private emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail detailData_;
     /**
-     * <code>.SocialDetail detail_data = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.SocialDetail detail_data = 4;</code>
      * @return Whether the detailData field is set.
      */
     @java.lang.Override
@@ -160,7 +184,11 @@ public boolean hasDetailData() {
       return detailData_ != null;
     }
     /**
-     * <code>.SocialDetail detail_data = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.SocialDetail detail_data = 4;</code>
      * @return The detailData.
      */
     @java.lang.Override
@@ -168,13 +196,47 @@ public emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail getDetailDa
       return detailData_ == null ? emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail.getDefaultInstance() : detailData_;
     }
     /**
-     * <code>.SocialDetail detail_data = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.SocialDetail detail_data = 4;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetailOrBuilder getDetailDataOrBuilder() {
       return getDetailData();
     }
 
+    public static final int PARAM_FIELD_NUMBER = 11;
+    private int param_;
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 param = 11;</code>
+     * @return The param.
+     */
+    @java.lang.Override
+    public int getParam() {
+      return param_;
+    }
+
+    public static final int RETCODE_FIELD_NUMBER = 7;
+    private int retcode_;
+    /**
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>int32 retcode = 7;</code>
+     * @return The retcode.
+     */
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -189,11 +251,14 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      if (detailData_ != null) {
+        output.writeMessage(4, getDetailData());
+      }
       if (retcode_ != 0) {
-        output.writeInt32(5, retcode_);
+        output.writeInt32(7, retcode_);
       }
-      if (detailData_ != null) {
-        output.writeMessage(12, getDetailData());
+      if (param_ != 0) {
+        output.writeUInt32(11, param_);
       }
       unknownFields.writeTo(output);
     }
@@ -204,13 +269,17 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
+      if (detailData_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(4, getDetailData());
+      }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(5, retcode_);
+          .computeInt32Size(7, retcode_);
       }
-      if (detailData_ != null) {
+      if (param_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(12, getDetailData());
+          .computeUInt32Size(11, param_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -227,13 +296,15 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.GetPlayerSocialDetailRspOuterClass.GetPlayerSocialDetailRsp other = (emu.grasscutter.net.proto.GetPlayerSocialDetailRspOuterClass.GetPlayerSocialDetailRsp) obj;
 
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (hasDetailData() != other.hasDetailData()) return false;
       if (hasDetailData()) {
         if (!getDetailData()
             .equals(other.getDetailData())) return false;
       }
+      if (getParam()
+          != other.getParam()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -245,12 +316,14 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       if (hasDetailData()) {
         hash = (37 * hash) + DETAIL_DATA_FIELD_NUMBER;
         hash = (53 * hash) + getDetailData().hashCode();
       }
+      hash = (37 * hash) + PARAM_FIELD_NUMBER;
+      hash = (53 * hash) + getParam();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -348,7 +421,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 1771
+     * CmdId: 4953
      * </pre>
      *
      * Protobuf type {@code GetPlayerSocialDetailRsp}
@@ -388,14 +461,16 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        retcode_ = 0;
-
         if (detailDataBuilder_ == null) {
           detailData_ = null;
         } else {
           detailData_ = null;
           detailDataBuilder_ = null;
         }
+        param_ = 0;
+
+        retcode_ = 0;
+
         return this;
       }
 
@@ -422,12 +497,13 @@ public emu.grasscutter.net.proto.GetPlayerSocialDetailRspOuterClass.GetPlayerSoc
       @java.lang.Override
       public emu.grasscutter.net.proto.GetPlayerSocialDetailRspOuterClass.GetPlayerSocialDetailRsp buildPartial() {
         emu.grasscutter.net.proto.GetPlayerSocialDetailRspOuterClass.GetPlayerSocialDetailRsp result = new emu.grasscutter.net.proto.GetPlayerSocialDetailRspOuterClass.GetPlayerSocialDetailRsp(this);
-        result.retcode_ = retcode_;
         if (detailDataBuilder_ == null) {
           result.detailData_ = detailData_;
         } else {
           result.detailData_ = detailDataBuilder_.build();
         }
+        result.param_ = param_;
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -476,12 +552,15 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.GetPlayerSocialDetailRspOuterClass.GetPlayerSocialDetailRsp other) {
         if (other == emu.grasscutter.net.proto.GetPlayerSocialDetailRspOuterClass.GetPlayerSocialDetailRsp.getDefaultInstance()) return this;
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         if (other.hasDetailData()) {
           mergeDetailData(other.getDetailData());
         }
+        if (other.getParam() != 0) {
+          setParam(other.getParam());
+        }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -511,49 +590,26 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 5;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <code>int32 retcode = 5;</code>
-       * @param value The retcode to set.
-       * @return This builder for chaining.
-       */
-      public Builder setRetcode(int value) {
-        
-        retcode_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>int32 retcode = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail detailData_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail, emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail.Builder, emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetailOrBuilder> detailDataBuilder_;
       /**
-       * <code>.SocialDetail detail_data = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.SocialDetail detail_data = 4;</code>
        * @return Whether the detailData field is set.
        */
       public boolean hasDetailData() {
         return detailDataBuilder_ != null || detailData_ != null;
       }
       /**
-       * <code>.SocialDetail detail_data = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.SocialDetail detail_data = 4;</code>
        * @return The detailData.
        */
       public emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail getDetailData() {
@@ -564,7 +620,11 @@ public emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail getDetailDa
         }
       }
       /**
-       * <code>.SocialDetail detail_data = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.SocialDetail detail_data = 4;</code>
        */
       public Builder setDetailData(emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail value) {
         if (detailDataBuilder_ == null) {
@@ -580,7 +640,11 @@ public Builder setDetailData(emu.grasscutter.net.proto.SocialDetailOuterClass.So
         return this;
       }
       /**
-       * <code>.SocialDetail detail_data = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.SocialDetail detail_data = 4;</code>
        */
       public Builder setDetailData(
           emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail.Builder builderForValue) {
@@ -594,7 +658,11 @@ public Builder setDetailData(
         return this;
       }
       /**
-       * <code>.SocialDetail detail_data = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.SocialDetail detail_data = 4;</code>
        */
       public Builder mergeDetailData(emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail value) {
         if (detailDataBuilder_ == null) {
@@ -612,7 +680,11 @@ public Builder mergeDetailData(emu.grasscutter.net.proto.SocialDetailOuterClass.
         return this;
       }
       /**
-       * <code>.SocialDetail detail_data = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.SocialDetail detail_data = 4;</code>
        */
       public Builder clearDetailData() {
         if (detailDataBuilder_ == null) {
@@ -626,7 +698,11 @@ public Builder clearDetailData() {
         return this;
       }
       /**
-       * <code>.SocialDetail detail_data = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.SocialDetail detail_data = 4;</code>
        */
       public emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail.Builder getDetailDataBuilder() {
         
@@ -634,7 +710,11 @@ public emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail.Builder get
         return getDetailDataFieldBuilder().getBuilder();
       }
       /**
-       * <code>.SocialDetail detail_data = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.SocialDetail detail_data = 4;</code>
        */
       public emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetailOrBuilder getDetailDataOrBuilder() {
         if (detailDataBuilder_ != null) {
@@ -645,7 +725,11 @@ public emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetailOrBuilder ge
         }
       }
       /**
-       * <code>.SocialDetail detail_data = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.SocialDetail detail_data = 4;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail, emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail.Builder, emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetailOrBuilder> 
@@ -660,6 +744,92 @@ public emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetailOrBuilder ge
         }
         return detailDataBuilder_;
       }
+
+      private int param_ ;
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 param = 11;</code>
+       * @return The param.
+       */
+      @java.lang.Override
+      public int getParam() {
+        return param_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 param = 11;</code>
+       * @param value The param to set.
+       * @return This builder for chaining.
+       */
+      public Builder setParam(int value) {
+        
+        param_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 param = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearParam() {
+        
+        param_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int retcode_ ;
+      /**
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>int32 retcode = 7;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>int32 retcode = 7;</code>
+       * @param value The retcode to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRetcode(int value) {
+        
+        retcode_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>int32 retcode = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRetcode() {
+        
+        retcode_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -728,10 +898,10 @@ public emu.grasscutter.net.proto.GetPlayerSocialDetailRspOuterClass.GetPlayerSoc
   static {
     java.lang.String[] descriptorData = {
       "\n\036GetPlayerSocialDetailRsp.proto\032\022Social" +
-      "Detail.proto\"O\n\030GetPlayerSocialDetailRsp" +
-      "\022\017\n\007retcode\030\005 \001(\005\022\"\n\013detail_data\030\014 \001(\0132\r" +
-      ".SocialDetailB\033\n\031emu.grasscutter.net.pro" +
-      "tob\006proto3"
+      "Detail.proto\"^\n\030GetPlayerSocialDetailRsp" +
+      "\022\"\n\013detail_data\030\004 \001(\0132\r.SocialDetail\022\r\n\005" +
+      "param\030\013 \001(\r\022\017\n\007retcode\030\007 \001(\005B\033\n\031emu.gras" +
+      "scutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -743,7 +913,7 @@ public emu.grasscutter.net.proto.GetPlayerSocialDetailRspOuterClass.GetPlayerSoc
     internal_static_GetPlayerSocialDetailRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetPlayerSocialDetailRsp_descriptor,
-        new java.lang.String[] { "Retcode", "DetailData", });
+        new java.lang.String[] { "DetailData", "Param", "Retcode", });
     emu.grasscutter.net.proto.SocialDetailOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerTokenReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerTokenReqOuterClass.java
index ad317b07b39..012c7fcf2bb 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerTokenReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerTokenReqOuterClass.java
@@ -19,72 +19,66 @@ public interface GetPlayerTokenReqOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>string client_rand_key = 1864;</code>
+     * <code>string client_rand_key = 693;</code>
      * @return The clientRandKey.
      */
     java.lang.String getClientRandKey();
     /**
-     * <code>string client_rand_key = 1864;</code>
+     * <code>string client_rand_key = 693;</code>
      * @return The bytes for clientRandKey.
      */
     com.google.protobuf.ByteString
         getClientRandKeyBytes();
 
     /**
-     * <code>string account_uid = 15;</code>
+     * <code>string account_uid = 10;</code>
      * @return The accountUid.
      */
     java.lang.String getAccountUid();
     /**
-     * <code>string account_uid = 15;</code>
+     * <code>string account_uid = 10;</code>
      * @return The bytes for accountUid.
      */
     com.google.protobuf.ByteString
         getAccountUidBytes();
 
     /**
-     * <code>uint32 key_id = 359;</code>
+     * <code>uint32 key_id = 1027;</code>
      * @return The keyId.
      */
     int getKeyId();
 
     /**
-     * <code>string account_token = 4;</code>
+     * <code>string account_token = 7;</code>
      * @return The accountToken.
      */
     java.lang.String getAccountToken();
     /**
-     * <code>string account_token = 4;</code>
+     * <code>string account_token = 7;</code>
      * @return The bytes for accountToken.
      */
     com.google.protobuf.ByteString
         getAccountTokenBytes();
 
     /**
-     * <code>uint32 platform_type = 14;</code>
-     * @return The platformType.
-     */
-    int getPlatformType();
-
-    /**
-     * <code>uint32 language_type = 1173;</code>
-     * @return The languageType.
+     * <code>string country_code = 14;</code>
+     * @return The countryCode.
      */
-    int getLanguageType();
-
+    java.lang.String getCountryCode();
     /**
-     * <code>uint32 account_type = 2;</code>
-     * @return The accountType.
+     * <code>string country_code = 14;</code>
+     * @return The bytes for countryCode.
      */
-    int getAccountType();
+    com.google.protobuf.ByteString
+        getCountryCodeBytes();
 
     /**
-     * <code>string gate_ticket = 912;</code>
+     * <code>string gate_ticket = 479;</code>
      * @return The gateTicket.
      */
     java.lang.String getGateTicket();
     /**
-     * <code>string gate_ticket = 912;</code>
+     * <code>string gate_ticket = 479;</code>
      * @return The bytes for gateTicket.
      */
     com.google.protobuf.ByteString
@@ -95,20 +89,22 @@ public interface GetPlayerTokenReqOrBuilder extends
      * random
      * </pre>
      *
-     * <code>string country_code = 1;</code>
-     * @return The countryCode.
+     * <code>uint32 language_type = 1173;</code>
+     * @return The languageType.
      */
-    java.lang.String getCountryCode();
+    int getLanguageType();
+
     /**
-     * <pre>
-     * random
-     * </pre>
-     *
-     * <code>string country_code = 1;</code>
-     * @return The bytes for countryCode.
+     * <code>uint32 account_type = 2;</code>
+     * @return The accountType.
      */
-    com.google.protobuf.ByteString
-        getCountryCodeBytes();
+    int getAccountType();
+
+    /**
+     * <code>uint32 platform_type = 13;</code>
+     * @return The platformType.
+     */
+    int getPlatformType();
 
     /**
      * <code>bool is_guest = 144;</code>
@@ -165,7 +161,7 @@ public interface GetPlayerTokenReqOrBuilder extends
         getClientIpStrBytes();
 
     /**
-     * <code>uint32 sub_channel_id = 7;</code>
+     * <code>uint32 sub_channel_id = 70;</code>
      * @return The subChannelId.
      */
     int getSubChannelId();
@@ -190,7 +186,7 @@ public interface GetPlayerTokenReqOrBuilder extends
   }
   /**
    * <pre>
-   * CmdId: 8611
+   * CmdId: 8726
    * </pre>
    *
    * Protobuf type {@code GetPlayerTokenReq}
@@ -208,8 +204,8 @@ private GetPlayerTokenReq() {
       clientRandKey_ = "";
       accountUid_ = "";
       accountToken_ = "";
-      gateTicket_ = "";
       countryCode_ = "";
+      gateTicket_ = "";
       psnId_ = "";
       onlineId_ = "";
       clientIpStr_ = "";
@@ -246,23 +242,11 @@ private GetPlayerTokenReq(
             case 0:
               done = true;
               break;
-            case 10: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              countryCode_ = s;
-              break;
-            }
             case 16: {
 
               accountType_ = input.readUInt32();
               break;
             }
-            case 34: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              accountToken_ = s;
-              break;
-            }
             case 42: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -274,9 +258,16 @@ private GetPlayerTokenReq(
               uid_ = input.readUInt32();
               break;
             }
-            case 56: {
+            case 58: {
+              java.lang.String s = input.readStringRequireUtf8();
 
-              subChannelId_ = input.readUInt32();
+              accountToken_ = s;
+              break;
+            }
+            case 82: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              accountUid_ = s;
               break;
             }
             case 98: {
@@ -285,15 +276,15 @@ private GetPlayerTokenReq(
               psnId_ = s;
               break;
             }
-            case 112: {
+            case 104: {
 
               platformType_ = input.readUInt32();
               break;
             }
-            case 122: {
+            case 114: {
               java.lang.String s = input.readStringRequireUtf8();
 
-              accountUid_ = s;
+              countryCode_ = s;
               break;
             }
             case 242: {
@@ -302,6 +293,11 @@ private GetPlayerTokenReq(
               clientIpStr_ = s;
               break;
             }
+            case 560: {
+
+              subChannelId_ = input.readUInt32();
+              break;
+            }
             case 1152: {
 
               isGuest_ = input.readBool();
@@ -312,9 +308,16 @@ private GetPlayerTokenReq(
               cloudClientIp_ = input.readUInt32();
               break;
             }
-            case 2872: {
+            case 3834: {
+              java.lang.String s = input.readStringRequireUtf8();
 
-              keyId_ = input.readUInt32();
+              gateTicket_ = s;
+              break;
+            }
+            case 5546: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              clientRandKey_ = s;
               break;
             }
             case 6626: {
@@ -323,10 +326,9 @@ private GetPlayerTokenReq(
               birthday_ = s;
               break;
             }
-            case 7298: {
-              java.lang.String s = input.readStringRequireUtf8();
+            case 8216: {
 
-              gateTicket_ = s;
+              keyId_ = input.readUInt32();
               break;
             }
             case 9384: {
@@ -339,12 +341,6 @@ private GetPlayerTokenReq(
               channelId_ = input.readUInt32();
               break;
             }
-            case 14914: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              clientRandKey_ = s;
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -377,10 +373,10 @@ private GetPlayerTokenReq(
               emu.grasscutter.net.proto.GetPlayerTokenReqOuterClass.GetPlayerTokenReq.class, emu.grasscutter.net.proto.GetPlayerTokenReqOuterClass.GetPlayerTokenReq.Builder.class);
     }
 
-    public static final int CLIENT_RAND_KEY_FIELD_NUMBER = 1864;
+    public static final int CLIENT_RAND_KEY_FIELD_NUMBER = 693;
     private volatile java.lang.Object clientRandKey_;
     /**
-     * <code>string client_rand_key = 1864;</code>
+     * <code>string client_rand_key = 693;</code>
      * @return The clientRandKey.
      */
     @java.lang.Override
@@ -397,7 +393,7 @@ public java.lang.String getClientRandKey() {
       }
     }
     /**
-     * <code>string client_rand_key = 1864;</code>
+     * <code>string client_rand_key = 693;</code>
      * @return The bytes for clientRandKey.
      */
     @java.lang.Override
@@ -415,10 +411,10 @@ public java.lang.String getClientRandKey() {
       }
     }
 
-    public static final int ACCOUNT_UID_FIELD_NUMBER = 15;
+    public static final int ACCOUNT_UID_FIELD_NUMBER = 10;
     private volatile java.lang.Object accountUid_;
     /**
-     * <code>string account_uid = 15;</code>
+     * <code>string account_uid = 10;</code>
      * @return The accountUid.
      */
     @java.lang.Override
@@ -435,7 +431,7 @@ public java.lang.String getAccountUid() {
       }
     }
     /**
-     * <code>string account_uid = 15;</code>
+     * <code>string account_uid = 10;</code>
      * @return The bytes for accountUid.
      */
     @java.lang.Override
@@ -453,10 +449,10 @@ public java.lang.String getAccountUid() {
       }
     }
 
-    public static final int KEY_ID_FIELD_NUMBER = 359;
+    public static final int KEY_ID_FIELD_NUMBER = 1027;
     private int keyId_;
     /**
-     * <code>uint32 key_id = 359;</code>
+     * <code>uint32 key_id = 1027;</code>
      * @return The keyId.
      */
     @java.lang.Override
@@ -464,10 +460,10 @@ public int getKeyId() {
       return keyId_;
     }
 
-    public static final int ACCOUNT_TOKEN_FIELD_NUMBER = 4;
+    public static final int ACCOUNT_TOKEN_FIELD_NUMBER = 7;
     private volatile java.lang.Object accountToken_;
     /**
-     * <code>string account_token = 4;</code>
+     * <code>string account_token = 7;</code>
      * @return The accountToken.
      */
     @java.lang.Override
@@ -484,7 +480,7 @@ public java.lang.String getAccountToken() {
       }
     }
     /**
-     * <code>string account_token = 4;</code>
+     * <code>string account_token = 7;</code>
      * @return The bytes for accountToken.
      */
     @java.lang.Override
@@ -502,43 +498,48 @@ public java.lang.String getAccountToken() {
       }
     }
 
-    public static final int PLATFORM_TYPE_FIELD_NUMBER = 14;
-    private int platformType_;
-    /**
-     * <code>uint32 platform_type = 14;</code>
-     * @return The platformType.
-     */
-    @java.lang.Override
-    public int getPlatformType() {
-      return platformType_;
-    }
-
-    public static final int LANGUAGE_TYPE_FIELD_NUMBER = 1173;
-    private int languageType_;
+    public static final int COUNTRY_CODE_FIELD_NUMBER = 14;
+    private volatile java.lang.Object countryCode_;
     /**
-     * <code>uint32 language_type = 1173;</code>
-     * @return The languageType.
+     * <code>string country_code = 14;</code>
+     * @return The countryCode.
      */
     @java.lang.Override
-    public int getLanguageType() {
-      return languageType_;
+    public java.lang.String getCountryCode() {
+      java.lang.Object ref = countryCode_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        countryCode_ = s;
+        return s;
+      }
     }
-
-    public static final int ACCOUNT_TYPE_FIELD_NUMBER = 2;
-    private int accountType_;
     /**
-     * <code>uint32 account_type = 2;</code>
-     * @return The accountType.
+     * <code>string country_code = 14;</code>
+     * @return The bytes for countryCode.
      */
     @java.lang.Override
-    public int getAccountType() {
-      return accountType_;
+    public com.google.protobuf.ByteString
+        getCountryCodeBytes() {
+      java.lang.Object ref = countryCode_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        countryCode_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
     }
 
-    public static final int GATE_TICKET_FIELD_NUMBER = 912;
+    public static final int GATE_TICKET_FIELD_NUMBER = 479;
     private volatile java.lang.Object gateTicket_;
     /**
-     * <code>string gate_ticket = 912;</code>
+     * <code>string gate_ticket = 479;</code>
      * @return The gateTicket.
      */
     @java.lang.Override
@@ -555,7 +556,7 @@ public java.lang.String getGateTicket() {
       }
     }
     /**
-     * <code>string gate_ticket = 912;</code>
+     * <code>string gate_ticket = 479;</code>
      * @return The bytes for gateTicket.
      */
     @java.lang.Override
@@ -573,50 +574,41 @@ public java.lang.String getGateTicket() {
       }
     }
 
-    public static final int COUNTRY_CODE_FIELD_NUMBER = 1;
-    private volatile java.lang.Object countryCode_;
+    public static final int LANGUAGE_TYPE_FIELD_NUMBER = 1173;
+    private int languageType_;
     /**
      * <pre>
      * random
      * </pre>
      *
-     * <code>string country_code = 1;</code>
-     * @return The countryCode.
+     * <code>uint32 language_type = 1173;</code>
+     * @return The languageType.
      */
     @java.lang.Override
-    public java.lang.String getCountryCode() {
-      java.lang.Object ref = countryCode_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        countryCode_ = s;
-        return s;
-      }
+    public int getLanguageType() {
+      return languageType_;
     }
+
+    public static final int ACCOUNT_TYPE_FIELD_NUMBER = 2;
+    private int accountType_;
     /**
-     * <pre>
-     * random
-     * </pre>
-     *
-     * <code>string country_code = 1;</code>
-     * @return The bytes for countryCode.
+     * <code>uint32 account_type = 2;</code>
+     * @return The accountType.
      */
     @java.lang.Override
-    public com.google.protobuf.ByteString
-        getCountryCodeBytes() {
-      java.lang.Object ref = countryCode_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        countryCode_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
+    public int getAccountType() {
+      return accountType_;
+    }
+
+    public static final int PLATFORM_TYPE_FIELD_NUMBER = 13;
+    private int platformType_;
+    /**
+     * <code>uint32 platform_type = 13;</code>
+     * @return The platformType.
+     */
+    @java.lang.Override
+    public int getPlatformType() {
+      return platformType_;
     }
 
     public static final int IS_GUEST_FIELD_NUMBER = 144;
@@ -766,10 +758,10 @@ public java.lang.String getClientIpStr() {
       }
     }
 
-    public static final int SUB_CHANNEL_ID_FIELD_NUMBER = 7;
+    public static final int SUB_CHANNEL_ID_FIELD_NUMBER = 70;
     private int subChannelId_;
     /**
-     * <code>uint32 sub_channel_id = 7;</code>
+     * <code>uint32 sub_channel_id = 70;</code>
      * @return The subChannelId.
      */
     @java.lang.Override
@@ -840,50 +832,53 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(countryCode_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1, countryCode_);
-      }
       if (accountType_ != 0) {
         output.writeUInt32(2, accountType_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(accountToken_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 4, accountToken_);
-      }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(onlineId_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 5, onlineId_);
       }
       if (uid_ != 0) {
         output.writeUInt32(6, uid_);
       }
-      if (subChannelId_ != 0) {
-        output.writeUInt32(7, subChannelId_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(accountToken_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 7, accountToken_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(accountUid_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 10, accountUid_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(psnId_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 12, psnId_);
       }
       if (platformType_ != 0) {
-        output.writeUInt32(14, platformType_);
+        output.writeUInt32(13, platformType_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(accountUid_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 15, accountUid_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(countryCode_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 14, countryCode_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientIpStr_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 30, clientIpStr_);
       }
+      if (subChannelId_ != 0) {
+        output.writeUInt32(70, subChannelId_);
+      }
       if (isGuest_ != false) {
         output.writeBool(144, isGuest_);
       }
       if (cloudClientIp_ != 0) {
         output.writeUInt32(177, cloudClientIp_);
       }
-      if (keyId_ != 0) {
-        output.writeUInt32(359, keyId_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gateTicket_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 479, gateTicket_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientRandKey_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 693, clientRandKey_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(birthday_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 828, birthday_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gateTicket_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 912, gateTicket_);
+      if (keyId_ != 0) {
+        output.writeUInt32(1027, keyId_);
       }
       if (languageType_ != 0) {
         output.writeUInt32(1173, languageType_);
@@ -891,9 +886,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (channelId_ != 0) {
         output.writeUInt32(1776, channelId_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientRandKey_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1864, clientRandKey_);
-      }
       unknownFields.writeTo(output);
     }
 
@@ -903,16 +895,10 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(countryCode_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, countryCode_);
-      }
       if (accountType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(2, accountType_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(accountToken_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, accountToken_);
-      }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(onlineId_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, onlineId_);
       }
@@ -920,23 +906,29 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(6, uid_);
       }
-      if (subChannelId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, subChannelId_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(accountToken_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, accountToken_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(accountUid_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, accountUid_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(psnId_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(12, psnId_);
       }
       if (platformType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, platformType_);
+          .computeUInt32Size(13, platformType_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(accountUid_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(15, accountUid_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(countryCode_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(14, countryCode_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientIpStr_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(30, clientIpStr_);
       }
+      if (subChannelId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(70, subChannelId_);
+      }
       if (isGuest_ != false) {
         size += com.google.protobuf.CodedOutputStream
           .computeBoolSize(144, isGuest_);
@@ -945,15 +937,18 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(177, cloudClientIp_);
       }
-      if (keyId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(359, keyId_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gateTicket_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(479, gateTicket_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientRandKey_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(693, clientRandKey_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(birthday_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(828, birthday_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gateTicket_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(912, gateTicket_);
+      if (keyId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1027, keyId_);
       }
       if (languageType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -963,9 +958,6 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(1776, channelId_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientRandKey_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1864, clientRandKey_);
-      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -989,16 +981,16 @@ public boolean equals(final java.lang.Object obj) {
           != other.getKeyId()) return false;
       if (!getAccountToken()
           .equals(other.getAccountToken())) return false;
-      if (getPlatformType()
-          != other.getPlatformType()) return false;
+      if (!getCountryCode()
+          .equals(other.getCountryCode())) return false;
+      if (!getGateTicket()
+          .equals(other.getGateTicket())) return false;
       if (getLanguageType()
           != other.getLanguageType()) return false;
       if (getAccountType()
           != other.getAccountType()) return false;
-      if (!getGateTicket()
-          .equals(other.getGateTicket())) return false;
-      if (!getCountryCode()
-          .equals(other.getCountryCode())) return false;
+      if (getPlatformType()
+          != other.getPlatformType()) return false;
       if (getIsGuest()
           != other.getIsGuest()) return false;
       if (getUid()
@@ -1036,16 +1028,16 @@ public int hashCode() {
       hash = (53 * hash) + getKeyId();
       hash = (37 * hash) + ACCOUNT_TOKEN_FIELD_NUMBER;
       hash = (53 * hash) + getAccountToken().hashCode();
-      hash = (37 * hash) + PLATFORM_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + getPlatformType();
+      hash = (37 * hash) + COUNTRY_CODE_FIELD_NUMBER;
+      hash = (53 * hash) + getCountryCode().hashCode();
+      hash = (37 * hash) + GATE_TICKET_FIELD_NUMBER;
+      hash = (53 * hash) + getGateTicket().hashCode();
       hash = (37 * hash) + LANGUAGE_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + getLanguageType();
       hash = (37 * hash) + ACCOUNT_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + getAccountType();
-      hash = (37 * hash) + GATE_TICKET_FIELD_NUMBER;
-      hash = (53 * hash) + getGateTicket().hashCode();
-      hash = (37 * hash) + COUNTRY_CODE_FIELD_NUMBER;
-      hash = (53 * hash) + getCountryCode().hashCode();
+      hash = (37 * hash) + PLATFORM_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + getPlatformType();
       hash = (37 * hash) + IS_GUEST_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsGuest());
@@ -1162,7 +1154,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 8611
+     * CmdId: 8726
      * </pre>
      *
      * Protobuf type {@code GetPlayerTokenReq}
@@ -1210,15 +1202,15 @@ public Builder clear() {
 
         accountToken_ = "";
 
-        platformType_ = 0;
+        countryCode_ = "";
+
+        gateTicket_ = "";
 
         languageType_ = 0;
 
         accountType_ = 0;
 
-        gateTicket_ = "";
-
-        countryCode_ = "";
+        platformType_ = 0;
 
         isGuest_ = false;
 
@@ -1268,11 +1260,11 @@ public emu.grasscutter.net.proto.GetPlayerTokenReqOuterClass.GetPlayerTokenReq b
         result.accountUid_ = accountUid_;
         result.keyId_ = keyId_;
         result.accountToken_ = accountToken_;
-        result.platformType_ = platformType_;
+        result.countryCode_ = countryCode_;
+        result.gateTicket_ = gateTicket_;
         result.languageType_ = languageType_;
         result.accountType_ = accountType_;
-        result.gateTicket_ = gateTicket_;
-        result.countryCode_ = countryCode_;
+        result.platformType_ = platformType_;
         result.isGuest_ = isGuest_;
         result.uid_ = uid_;
         result.channelId_ = channelId_;
@@ -1345,8 +1337,13 @@ public Builder mergeFrom(emu.grasscutter.net.proto.GetPlayerTokenReqOuterClass.G
           accountToken_ = other.accountToken_;
           onChanged();
         }
-        if (other.getPlatformType() != 0) {
-          setPlatformType(other.getPlatformType());
+        if (!other.getCountryCode().isEmpty()) {
+          countryCode_ = other.countryCode_;
+          onChanged();
+        }
+        if (!other.getGateTicket().isEmpty()) {
+          gateTicket_ = other.gateTicket_;
+          onChanged();
         }
         if (other.getLanguageType() != 0) {
           setLanguageType(other.getLanguageType());
@@ -1354,13 +1351,8 @@ public Builder mergeFrom(emu.grasscutter.net.proto.GetPlayerTokenReqOuterClass.G
         if (other.getAccountType() != 0) {
           setAccountType(other.getAccountType());
         }
-        if (!other.getGateTicket().isEmpty()) {
-          gateTicket_ = other.gateTicket_;
-          onChanged();
-        }
-        if (!other.getCountryCode().isEmpty()) {
-          countryCode_ = other.countryCode_;
-          onChanged();
+        if (other.getPlatformType() != 0) {
+          setPlatformType(other.getPlatformType());
         }
         if (other.getIsGuest() != false) {
           setIsGuest(other.getIsGuest());
@@ -1424,7 +1416,7 @@ public Builder mergeFrom(
 
       private java.lang.Object clientRandKey_ = "";
       /**
-       * <code>string client_rand_key = 1864;</code>
+       * <code>string client_rand_key = 693;</code>
        * @return The clientRandKey.
        */
       public java.lang.String getClientRandKey() {
@@ -1440,7 +1432,7 @@ public java.lang.String getClientRandKey() {
         }
       }
       /**
-       * <code>string client_rand_key = 1864;</code>
+       * <code>string client_rand_key = 693;</code>
        * @return The bytes for clientRandKey.
        */
       public com.google.protobuf.ByteString
@@ -1457,7 +1449,7 @@ public java.lang.String getClientRandKey() {
         }
       }
       /**
-       * <code>string client_rand_key = 1864;</code>
+       * <code>string client_rand_key = 693;</code>
        * @param value The clientRandKey to set.
        * @return This builder for chaining.
        */
@@ -1472,7 +1464,7 @@ public Builder setClientRandKey(
         return this;
       }
       /**
-       * <code>string client_rand_key = 1864;</code>
+       * <code>string client_rand_key = 693;</code>
        * @return This builder for chaining.
        */
       public Builder clearClientRandKey() {
@@ -1482,7 +1474,7 @@ public Builder clearClientRandKey() {
         return this;
       }
       /**
-       * <code>string client_rand_key = 1864;</code>
+       * <code>string client_rand_key = 693;</code>
        * @param value The bytes for clientRandKey to set.
        * @return This builder for chaining.
        */
@@ -1500,7 +1492,7 @@ public Builder setClientRandKeyBytes(
 
       private java.lang.Object accountUid_ = "";
       /**
-       * <code>string account_uid = 15;</code>
+       * <code>string account_uid = 10;</code>
        * @return The accountUid.
        */
       public java.lang.String getAccountUid() {
@@ -1516,7 +1508,7 @@ public java.lang.String getAccountUid() {
         }
       }
       /**
-       * <code>string account_uid = 15;</code>
+       * <code>string account_uid = 10;</code>
        * @return The bytes for accountUid.
        */
       public com.google.protobuf.ByteString
@@ -1533,7 +1525,7 @@ public java.lang.String getAccountUid() {
         }
       }
       /**
-       * <code>string account_uid = 15;</code>
+       * <code>string account_uid = 10;</code>
        * @param value The accountUid to set.
        * @return This builder for chaining.
        */
@@ -1548,7 +1540,7 @@ public Builder setAccountUid(
         return this;
       }
       /**
-       * <code>string account_uid = 15;</code>
+       * <code>string account_uid = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearAccountUid() {
@@ -1558,7 +1550,7 @@ public Builder clearAccountUid() {
         return this;
       }
       /**
-       * <code>string account_uid = 15;</code>
+       * <code>string account_uid = 10;</code>
        * @param value The bytes for accountUid to set.
        * @return This builder for chaining.
        */
@@ -1576,7 +1568,7 @@ public Builder setAccountUidBytes(
 
       private int keyId_ ;
       /**
-       * <code>uint32 key_id = 359;</code>
+       * <code>uint32 key_id = 1027;</code>
        * @return The keyId.
        */
       @java.lang.Override
@@ -1584,7 +1576,7 @@ public int getKeyId() {
         return keyId_;
       }
       /**
-       * <code>uint32 key_id = 359;</code>
+       * <code>uint32 key_id = 1027;</code>
        * @param value The keyId to set.
        * @return This builder for chaining.
        */
@@ -1595,7 +1587,7 @@ public Builder setKeyId(int value) {
         return this;
       }
       /**
-       * <code>uint32 key_id = 359;</code>
+       * <code>uint32 key_id = 1027;</code>
        * @return This builder for chaining.
        */
       public Builder clearKeyId() {
@@ -1607,7 +1599,7 @@ public Builder clearKeyId() {
 
       private java.lang.Object accountToken_ = "";
       /**
-       * <code>string account_token = 4;</code>
+       * <code>string account_token = 7;</code>
        * @return The accountToken.
        */
       public java.lang.String getAccountToken() {
@@ -1623,7 +1615,7 @@ public java.lang.String getAccountToken() {
         }
       }
       /**
-       * <code>string account_token = 4;</code>
+       * <code>string account_token = 7;</code>
        * @return The bytes for accountToken.
        */
       public com.google.protobuf.ByteString
@@ -1640,7 +1632,7 @@ public java.lang.String getAccountToken() {
         }
       }
       /**
-       * <code>string account_token = 4;</code>
+       * <code>string account_token = 7;</code>
        * @param value The accountToken to set.
        * @return This builder for chaining.
        */
@@ -1655,7 +1647,7 @@ public Builder setAccountToken(
         return this;
       }
       /**
-       * <code>string account_token = 4;</code>
+       * <code>string account_token = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearAccountToken() {
@@ -1665,7 +1657,7 @@ public Builder clearAccountToken() {
         return this;
       }
       /**
-       * <code>string account_token = 4;</code>
+       * <code>string account_token = 7;</code>
        * @param value The bytes for accountToken to set.
        * @return This builder for chaining.
        */
@@ -1681,102 +1673,85 @@ public Builder setAccountTokenBytes(
         return this;
       }
 
-      private int platformType_ ;
-      /**
-       * <code>uint32 platform_type = 14;</code>
-       * @return The platformType.
-       */
-      @java.lang.Override
-      public int getPlatformType() {
-        return platformType_;
-      }
-      /**
-       * <code>uint32 platform_type = 14;</code>
-       * @param value The platformType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPlatformType(int value) {
-        
-        platformType_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 platform_type = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPlatformType() {
-        
-        platformType_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int languageType_ ;
+      private java.lang.Object countryCode_ = "";
       /**
-       * <code>uint32 language_type = 1173;</code>
-       * @return The languageType.
+       * <code>string country_code = 14;</code>
+       * @return The countryCode.
        */
-      @java.lang.Override
-      public int getLanguageType() {
-        return languageType_;
+      public java.lang.String getCountryCode() {
+        java.lang.Object ref = countryCode_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          countryCode_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
       }
       /**
-       * <code>uint32 language_type = 1173;</code>
-       * @param value The languageType to set.
-       * @return This builder for chaining.
+       * <code>string country_code = 14;</code>
+       * @return The bytes for countryCode.
        */
-      public Builder setLanguageType(int value) {
-        
-        languageType_ = value;
-        onChanged();
-        return this;
+      public com.google.protobuf.ByteString
+          getCountryCodeBytes() {
+        java.lang.Object ref = countryCode_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          countryCode_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
       }
       /**
-       * <code>uint32 language_type = 1173;</code>
+       * <code>string country_code = 14;</code>
+       * @param value The countryCode to set.
        * @return This builder for chaining.
        */
-      public Builder clearLanguageType() {
-        
-        languageType_ = 0;
+      public Builder setCountryCode(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        countryCode_ = value;
         onChanged();
         return this;
       }
-
-      private int accountType_ ;
       /**
-       * <code>uint32 account_type = 2;</code>
-       * @return The accountType.
-       */
-      @java.lang.Override
-      public int getAccountType() {
-        return accountType_;
-      }
-      /**
-       * <code>uint32 account_type = 2;</code>
-       * @param value The accountType to set.
+       * <code>string country_code = 14;</code>
        * @return This builder for chaining.
        */
-      public Builder setAccountType(int value) {
+      public Builder clearCountryCode() {
         
-        accountType_ = value;
+        countryCode_ = getDefaultInstance().getCountryCode();
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 account_type = 2;</code>
+       * <code>string country_code = 14;</code>
+       * @param value The bytes for countryCode to set.
        * @return This builder for chaining.
        */
-      public Builder clearAccountType() {
+      public Builder setCountryCodeBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
         
-        accountType_ = 0;
+        countryCode_ = value;
         onChanged();
         return this;
       }
 
       private java.lang.Object gateTicket_ = "";
       /**
-       * <code>string gate_ticket = 912;</code>
+       * <code>string gate_ticket = 479;</code>
        * @return The gateTicket.
        */
       public java.lang.String getGateTicket() {
@@ -1792,7 +1767,7 @@ public java.lang.String getGateTicket() {
         }
       }
       /**
-       * <code>string gate_ticket = 912;</code>
+       * <code>string gate_ticket = 479;</code>
        * @return The bytes for gateTicket.
        */
       public com.google.protobuf.ByteString
@@ -1809,7 +1784,7 @@ public java.lang.String getGateTicket() {
         }
       }
       /**
-       * <code>string gate_ticket = 912;</code>
+       * <code>string gate_ticket = 479;</code>
        * @param value The gateTicket to set.
        * @return This builder for chaining.
        */
@@ -1824,7 +1799,7 @@ public Builder setGateTicket(
         return this;
       }
       /**
-       * <code>string gate_ticket = 912;</code>
+       * <code>string gate_ticket = 479;</code>
        * @return This builder for chaining.
        */
       public Builder clearGateTicket() {
@@ -1834,7 +1809,7 @@ public Builder clearGateTicket() {
         return this;
       }
       /**
-       * <code>string gate_ticket = 912;</code>
+       * <code>string gate_ticket = 479;</code>
        * @param value The bytes for gateTicket to set.
        * @return This builder for chaining.
        */
@@ -1850,98 +1825,107 @@ public Builder setGateTicketBytes(
         return this;
       }
 
-      private java.lang.Object countryCode_ = "";
+      private int languageType_ ;
       /**
        * <pre>
        * random
        * </pre>
        *
-       * <code>string country_code = 1;</code>
-       * @return The countryCode.
+       * <code>uint32 language_type = 1173;</code>
+       * @return The languageType.
        */
-      public java.lang.String getCountryCode() {
-        java.lang.Object ref = countryCode_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          countryCode_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
+      @java.lang.Override
+      public int getLanguageType() {
+        return languageType_;
       }
       /**
        * <pre>
        * random
        * </pre>
        *
-       * <code>string country_code = 1;</code>
-       * @return The bytes for countryCode.
+       * <code>uint32 language_type = 1173;</code>
+       * @param value The languageType to set.
+       * @return This builder for chaining.
        */
-      public com.google.protobuf.ByteString
-          getCountryCodeBytes() {
-        java.lang.Object ref = countryCode_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          countryCode_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
+      public Builder setLanguageType(int value) {
+        
+        languageType_ = value;
+        onChanged();
+        return this;
       }
       /**
        * <pre>
        * random
        * </pre>
        *
-       * <code>string country_code = 1;</code>
-       * @param value The countryCode to set.
+       * <code>uint32 language_type = 1173;</code>
        * @return This builder for chaining.
        */
-      public Builder setCountryCode(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        countryCode_ = value;
+      public Builder clearLanguageType() {
+        
+        languageType_ = 0;
         onChanged();
         return this;
       }
+
+      private int accountType_ ;
       /**
-       * <pre>
-       * random
-       * </pre>
-       *
-       * <code>string country_code = 1;</code>
+       * <code>uint32 account_type = 2;</code>
+       * @return The accountType.
+       */
+      @java.lang.Override
+      public int getAccountType() {
+        return accountType_;
+      }
+      /**
+       * <code>uint32 account_type = 2;</code>
+       * @param value The accountType to set.
        * @return This builder for chaining.
        */
-      public Builder clearCountryCode() {
+      public Builder setAccountType(int value) {
         
-        countryCode_ = getDefaultInstance().getCountryCode();
+        accountType_ = value;
         onChanged();
         return this;
       }
       /**
-       * <pre>
-       * random
-       * </pre>
-       *
-       * <code>string country_code = 1;</code>
-       * @param value The bytes for countryCode to set.
+       * <code>uint32 account_type = 2;</code>
        * @return This builder for chaining.
        */
-      public Builder setCountryCodeBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
+      public Builder clearAccountType() {
         
-        countryCode_ = value;
+        accountType_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int platformType_ ;
+      /**
+       * <code>uint32 platform_type = 13;</code>
+       * @return The platformType.
+       */
+      @java.lang.Override
+      public int getPlatformType() {
+        return platformType_;
+      }
+      /**
+       * <code>uint32 platform_type = 13;</code>
+       * @param value The platformType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPlatformType(int value) {
+        
+        platformType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 platform_type = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPlatformType() {
+        
+        platformType_ = 0;
         onChanged();
         return this;
       }
@@ -2269,7 +2253,7 @@ public Builder setClientIpStrBytes(
 
       private int subChannelId_ ;
       /**
-       * <code>uint32 sub_channel_id = 7;</code>
+       * <code>uint32 sub_channel_id = 70;</code>
        * @return The subChannelId.
        */
       @java.lang.Override
@@ -2277,7 +2261,7 @@ public int getSubChannelId() {
         return subChannelId_;
       }
       /**
-       * <code>uint32 sub_channel_id = 7;</code>
+       * <code>uint32 sub_channel_id = 70;</code>
        * @param value The subChannelId to set.
        * @return This builder for chaining.
        */
@@ -2288,7 +2272,7 @@ public Builder setSubChannelId(int value) {
         return this;
       }
       /**
-       * <code>uint32 sub_channel_id = 7;</code>
+       * <code>uint32 sub_channel_id = 70;</code>
        * @return This builder for chaining.
        */
       public Builder clearSubChannelId() {
@@ -2472,15 +2456,15 @@ public emu.grasscutter.net.proto.GetPlayerTokenReqOuterClass.GetPlayerTokenReq g
   static {
     java.lang.String[] descriptorData = {
       "\n\027GetPlayerTokenReq.proto\"\217\003\n\021GetPlayerT" +
-      "okenReq\022\030\n\017client_rand_key\030\310\016 \001(\t\022\023\n\013acc" +
-      "ount_uid\030\017 \001(\t\022\017\n\006key_id\030\347\002 \001(\r\022\025\n\raccou" +
-      "nt_token\030\004 \001(\t\022\025\n\rplatform_type\030\016 \001(\r\022\026\n" +
-      "\rlanguage_type\030\225\t \001(\r\022\024\n\014account_type\030\002 " +
-      "\001(\r\022\024\n\013gate_ticket\030\220\007 \001(\t\022\024\n\014country_cod" +
-      "e\030\001 \001(\t\022\021\n\010is_guest\030\220\001 \001(\010\022\013\n\003uid\030\006 \001(\r\022" +
+      "okenReq\022\030\n\017client_rand_key\030\265\005 \001(\t\022\023\n\013acc" +
+      "ount_uid\030\n \001(\t\022\017\n\006key_id\030\203\010 \001(\r\022\025\n\raccou" +
+      "nt_token\030\007 \001(\t\022\024\n\014country_code\030\016 \001(\t\022\024\n\013" +
+      "gate_ticket\030\337\003 \001(\t\022\026\n\rlanguage_type\030\225\t \001" +
+      "(\r\022\024\n\014account_type\030\002 \001(\r\022\025\n\rplatform_typ" +
+      "e\030\r \001(\r\022\021\n\010is_guest\030\220\001 \001(\010\022\013\n\003uid\030\006 \001(\r\022" +
       "\023\n\nchannel_id\030\360\r \001(\r\022\016\n\006psn_id\030\014 \001(\t\022\021\n\t" +
       "online_id\030\005 \001(\t\022\025\n\rclient_ip_str\030\036 \001(\t\022\026" +
-      "\n\016sub_channel_id\030\007 \001(\r\022\030\n\017cloud_client_i" +
+      "\n\016sub_channel_id\030F \001(\r\022\030\n\017cloud_client_i" +
       "p\030\261\001 \001(\r\022\021\n\010birthday\030\274\006 \001(\tB\033\n\031emu.grass" +
       "cutter.net.protob\006proto3"
     };
@@ -2493,7 +2477,7 @@ public emu.grasscutter.net.proto.GetPlayerTokenReqOuterClass.GetPlayerTokenReq g
     internal_static_GetPlayerTokenReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetPlayerTokenReq_descriptor,
-        new java.lang.String[] { "ClientRandKey", "AccountUid", "KeyId", "AccountToken", "PlatformType", "LanguageType", "AccountType", "GateTicket", "CountryCode", "IsGuest", "Uid", "ChannelId", "PsnId", "OnlineId", "ClientIpStr", "SubChannelId", "CloudClientIp", "Birthday", });
+        new java.lang.String[] { "ClientRandKey", "AccountUid", "KeyId", "AccountToken", "CountryCode", "GateTicket", "LanguageType", "AccountType", "PlatformType", "IsGuest", "Uid", "ChannelId", "PsnId", "OnlineId", "ClientIpStr", "SubChannelId", "CloudClientIp", "Birthday", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerTokenRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerTokenRspOuterClass.java
index fb5d8d5b1de..ac2cac20128 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerTokenRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerTokenRspOuterClass.java
@@ -19,25 +19,25 @@ public interface GetPlayerTokenRspOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>bytes security_cmd_buffer = 3;</code>
+     * <code>bytes security_cmd_buffer = 10;</code>
      * @return The securityCmdBuffer.
      */
     com.google.protobuf.ByteString getSecurityCmdBuffer();
 
     /**
-     * <code>string account_uid = 1;</code>
+     * <code>string account_uid = 13;</code>
      * @return The accountUid.
      */
     java.lang.String getAccountUid();
     /**
-     * <code>string account_uid = 1;</code>
+     * <code>string account_uid = 13;</code>
      * @return The bytes for accountUid.
      */
     com.google.protobuf.ByteString
         getAccountUidBytes();
 
     /**
-     * <code>uint32 uid = 5;</code>
+     * <code>uint32 uid = 7;</code>
      * @return The uid.
      */
     int getUid();
@@ -49,31 +49,31 @@ public interface GetPlayerTokenRspOrBuilder extends
     int getPlatformType();
 
     /**
-     * <code>string token = 8;</code>
+     * <code>string token = 15;</code>
      * @return The token.
      */
     java.lang.String getToken();
     /**
-     * <code>string token = 8;</code>
+     * <code>string token = 15;</code>
      * @return The bytes for token.
      */
     com.google.protobuf.ByteString
         getTokenBytes();
 
     /**
-     * <code>string server_rand_key = 668;</code>
+     * <code>string server_rand_key = 1681;</code>
      * @return The serverRandKey.
      */
     java.lang.String getServerRandKey();
     /**
-     * <code>string server_rand_key = 668;</code>
+     * <code>string server_rand_key = 1681;</code>
      * @return The bytes for serverRandKey.
      */
     com.google.protobuf.ByteString
         getServerRandKeyBytes();
 
     /**
-     * <code>uint32 key_id = 1305;</code>
+     * <code>uint32 key_id = 884;</code>
      * @return The keyId.
      */
     int getKeyId();
@@ -90,18 +90,6 @@ public interface GetPlayerTokenRspOrBuilder extends
     com.google.protobuf.ByteString
         getClientIpStrBytes();
 
-    /**
-     * <code>string msg = 14;</code>
-     * @return The msg.
-     */
-    java.lang.String getMsg();
-    /**
-     * <code>string msg = 14;</code>
-     * @return The bytes for msg.
-     */
-    com.google.protobuf.ByteString
-        getMsgBytes();
-
     /**
      * <code>string country_code = 555;</code>
      * @return The countryCode.
@@ -144,23 +132,57 @@ public interface GetPlayerTokenRspOrBuilder extends
     int getFinishCollectionIdList(int index);
 
     /**
-     * <code>string sign = 1499;</code>
+     * <code>string sign = 1742;</code>
      * @return The sign.
      */
     java.lang.String getSign();
     /**
-     * <code>string sign = 1499;</code>
+     * <code>string sign = 1742;</code>
      * @return The bytes for sign.
      */
     com.google.protobuf.ByteString
         getSignBytes();
 
+    /**
+     * <code>uint32 tag = 1801;</code>
+     * @return The tag.
+     */
+    int getTag();
+
+    /**
+     * <code>uint64 secret_key_seed = 6;</code>
+     * @return The secretKeySeed.
+     */
+    long getSecretKeySeed();
+
+    /**
+     * <code>int32 retcode = 14;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
+
+    /**
+     * <pre>
+     * random
+     * </pre>
+     *
+     * <code>string msg = 140;</code>
+     * @return The msg.
+     */
+    java.lang.String getMsg();
     /**
      * <pre>
      * random
      * </pre>
      *
-     * <code>uint32 black_uid_end_time = 7;</code>
+     * <code>string msg = 140;</code>
+     * @return The bytes for msg.
+     */
+    com.google.protobuf.ByteString
+        getMsgBytes();
+
+    /**
+     * <code>uint32 black_uid_end_time = 70;</code>
      * @return The blackUidEndTime.
      */
     int getBlackUidEndTime();
@@ -177,18 +199,6 @@ public interface GetPlayerTokenRspOrBuilder extends
      */
     boolean getIsProficientPlayer();
 
-    /**
-     * <code>int32 retcode = 100;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
-    /**
-     * <code>uint64 secret_key_seed = 2;</code>
-     * @return The secretKeySeed.
-     */
-    long getSecretKeySeed();
-
     /**
      * <code>bool is_guest = 300;</code>
      * @return The isGuest.
@@ -202,7 +212,7 @@ public interface GetPlayerTokenRspOrBuilder extends
     com.google.protobuf.ByteString getExtraBinData();
 
     /**
-     * <code>uint32 gm_uid = 10;</code>
+     * <code>uint32 gm_uid = 100;</code>
      * @return The gmUid.
      */
     int getGmUid();
@@ -234,12 +244,6 @@ public interface GetPlayerTokenRspOrBuilder extends
      */
     emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfoOrBuilder getStopServerOrBuilder();
 
-    /**
-     * <code>uint32 tag = 853;</code>
-     * @return The tag.
-     */
-    int getTag();
-
     /**
      * <code>string psn_id = 1402;</code>
      * @return The psnId.
@@ -302,7 +306,7 @@ public interface GetPlayerTokenRspOrBuilder extends
   }
   /**
    * <pre>
-   * CmdId: 23639
+   * CmdId: 87
    * </pre>
    *
    * Protobuf type {@code GetPlayerTokenRsp}
@@ -322,11 +326,11 @@ private GetPlayerTokenRsp() {
       token_ = "";
       serverRandKey_ = "";
       clientIpStr_ = "";
-      msg_ = "";
       countryCode_ = "";
       gameBiz_ = "";
       finishCollectionIdList_ = emptyIntList();
       sign_ = "";
+      msg_ = "";
       extraBinData_ = com.google.protobuf.ByteString.EMPTY;
       secretKey_ = "";
       psnId_ = "";
@@ -365,68 +369,62 @@ private GetPlayerTokenRsp(
             case 0:
               done = true;
               break;
-            case 10: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              accountUid_ = s;
-              break;
-            }
-            case 16: {
+            case 48: {
 
               secretKeySeed_ = input.readUInt64();
               break;
             }
-            case 26: {
+            case 56: {
 
-              securityCmdBuffer_ = input.readBytes();
+              uid_ = input.readUInt32();
               break;
             }
-            case 40: {
+            case 74: {
 
-              uid_ = input.readUInt32();
+              extraBinData_ = input.readBytes();
               break;
             }
-            case 56: {
+            case 82: {
 
-              blackUidEndTime_ = input.readUInt32();
+              securityCmdBuffer_ = input.readBytes();
               break;
             }
-            case 66: {
+            case 90: {
               java.lang.String s = input.readStringRequireUtf8();
 
-              token_ = s;
+              secretKey_ = s;
               break;
             }
-            case 74: {
+            case 96: {
 
-              extraBinData_ = input.readBytes();
+              platformType_ = input.readUInt32();
               break;
             }
-            case 80: {
+            case 106: {
+              java.lang.String s = input.readStringRequireUtf8();
 
-              gmUid_ = input.readUInt32();
+              accountUid_ = s;
               break;
             }
-            case 90: {
-              java.lang.String s = input.readStringRequireUtf8();
+            case 112: {
 
-              secretKey_ = s;
+              retcode_ = input.readInt32();
               break;
             }
-            case 96: {
+            case 122: {
+              java.lang.String s = input.readStringRequireUtf8();
 
-              platformType_ = input.readUInt32();
+              token_ = s;
               break;
             }
-            case 114: {
-              java.lang.String s = input.readStringRequireUtf8();
+            case 560: {
 
-              msg_ = s;
+              blackUidEndTime_ = input.readUInt32();
               break;
             }
             case 800: {
 
-              retcode_ = input.readInt32();
+              gmUid_ = input.readUInt32();
               break;
             }
             case 960: {
@@ -434,6 +432,12 @@ private GetPlayerTokenRsp(
               accountType_ = input.readUInt32();
               break;
             }
+            case 1122: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              msg_ = s;
+              break;
+            }
             case 1128: {
 
               subChannelId_ = input.readUInt32();
@@ -505,21 +509,15 @@ private GetPlayerTokenRsp(
 
               break;
             }
-            case 5346: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              serverRandKey_ = s;
-              break;
-            }
             case 5426: {
               java.lang.String s = input.readStringRequireUtf8();
 
               clientVersionRandomKey_ = s;
               break;
             }
-            case 6824: {
+            case 7072: {
 
-              tag_ = input.readUInt32();
+              keyId_ = input.readUInt32();
               break;
             }
             case 9618: {
@@ -533,11 +531,6 @@ private GetPlayerTokenRsp(
               regPlatform_ = input.readUInt32();
               break;
             }
-            case 10440: {
-
-              keyId_ = input.readUInt32();
-              break;
-            }
             case 11218: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -550,12 +543,23 @@ private GetPlayerTokenRsp(
               birthday_ = s;
               break;
             }
-            case 11994: {
+            case 13450: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              serverRandKey_ = s;
+              break;
+            }
+            case 13938: {
               java.lang.String s = input.readStringRequireUtf8();
 
               sign_ = s;
               break;
             }
+            case 14408: {
+
+              tag_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -591,10 +595,10 @@ private GetPlayerTokenRsp(
               emu.grasscutter.net.proto.GetPlayerTokenRspOuterClass.GetPlayerTokenRsp.class, emu.grasscutter.net.proto.GetPlayerTokenRspOuterClass.GetPlayerTokenRsp.Builder.class);
     }
 
-    public static final int SECURITY_CMD_BUFFER_FIELD_NUMBER = 3;
+    public static final int SECURITY_CMD_BUFFER_FIELD_NUMBER = 10;
     private com.google.protobuf.ByteString securityCmdBuffer_;
     /**
-     * <code>bytes security_cmd_buffer = 3;</code>
+     * <code>bytes security_cmd_buffer = 10;</code>
      * @return The securityCmdBuffer.
      */
     @java.lang.Override
@@ -602,10 +606,10 @@ public com.google.protobuf.ByteString getSecurityCmdBuffer() {
       return securityCmdBuffer_;
     }
 
-    public static final int ACCOUNT_UID_FIELD_NUMBER = 1;
+    public static final int ACCOUNT_UID_FIELD_NUMBER = 13;
     private volatile java.lang.Object accountUid_;
     /**
-     * <code>string account_uid = 1;</code>
+     * <code>string account_uid = 13;</code>
      * @return The accountUid.
      */
     @java.lang.Override
@@ -622,7 +626,7 @@ public java.lang.String getAccountUid() {
       }
     }
     /**
-     * <code>string account_uid = 1;</code>
+     * <code>string account_uid = 13;</code>
      * @return The bytes for accountUid.
      */
     @java.lang.Override
@@ -640,10 +644,10 @@ public java.lang.String getAccountUid() {
       }
     }
 
-    public static final int UID_FIELD_NUMBER = 5;
+    public static final int UID_FIELD_NUMBER = 7;
     private int uid_;
     /**
-     * <code>uint32 uid = 5;</code>
+     * <code>uint32 uid = 7;</code>
      * @return The uid.
      */
     @java.lang.Override
@@ -662,10 +666,10 @@ public int getPlatformType() {
       return platformType_;
     }
 
-    public static final int TOKEN_FIELD_NUMBER = 8;
+    public static final int TOKEN_FIELD_NUMBER = 15;
     private volatile java.lang.Object token_;
     /**
-     * <code>string token = 8;</code>
+     * <code>string token = 15;</code>
      * @return The token.
      */
     @java.lang.Override
@@ -682,7 +686,7 @@ public java.lang.String getToken() {
       }
     }
     /**
-     * <code>string token = 8;</code>
+     * <code>string token = 15;</code>
      * @return The bytes for token.
      */
     @java.lang.Override
@@ -700,10 +704,10 @@ public java.lang.String getToken() {
       }
     }
 
-    public static final int SERVER_RAND_KEY_FIELD_NUMBER = 668;
+    public static final int SERVER_RAND_KEY_FIELD_NUMBER = 1681;
     private volatile java.lang.Object serverRandKey_;
     /**
-     * <code>string server_rand_key = 668;</code>
+     * <code>string server_rand_key = 1681;</code>
      * @return The serverRandKey.
      */
     @java.lang.Override
@@ -720,7 +724,7 @@ public java.lang.String getServerRandKey() {
       }
     }
     /**
-     * <code>string server_rand_key = 668;</code>
+     * <code>string server_rand_key = 1681;</code>
      * @return The bytes for serverRandKey.
      */
     @java.lang.Override
@@ -738,10 +742,10 @@ public java.lang.String getServerRandKey() {
       }
     }
 
-    public static final int KEY_ID_FIELD_NUMBER = 1305;
+    public static final int KEY_ID_FIELD_NUMBER = 884;
     private int keyId_;
     /**
-     * <code>uint32 key_id = 1305;</code>
+     * <code>uint32 key_id = 884;</code>
      * @return The keyId.
      */
     @java.lang.Override
@@ -787,44 +791,6 @@ public java.lang.String getClientIpStr() {
       }
     }
 
-    public static final int MSG_FIELD_NUMBER = 14;
-    private volatile java.lang.Object msg_;
-    /**
-     * <code>string msg = 14;</code>
-     * @return The msg.
-     */
-    @java.lang.Override
-    public java.lang.String getMsg() {
-      java.lang.Object ref = msg_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        msg_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string msg = 14;</code>
-     * @return The bytes for msg.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getMsgBytes() {
-      java.lang.Object ref = msg_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        msg_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
     public static final int COUNTRY_CODE_FIELD_NUMBER = 555;
     private volatile java.lang.Object countryCode_;
     /**
@@ -929,10 +895,10 @@ public int getFinishCollectionIdList(int index) {
     }
     private int finishCollectionIdListMemoizedSerializedSize = -1;
 
-    public static final int SIGN_FIELD_NUMBER = 1499;
+    public static final int SIGN_FIELD_NUMBER = 1742;
     private volatile java.lang.Object sign_;
     /**
-     * <code>string sign = 1499;</code>
+     * <code>string sign = 1742;</code>
      * @return The sign.
      */
     @java.lang.Override
@@ -949,7 +915,7 @@ public java.lang.String getSign() {
       }
     }
     /**
-     * <code>string sign = 1499;</code>
+     * <code>string sign = 1742;</code>
      * @return The bytes for sign.
      */
     @java.lang.Override
@@ -967,14 +933,89 @@ public java.lang.String getSign() {
       }
     }
 
-    public static final int BLACK_UID_END_TIME_FIELD_NUMBER = 7;
-    private int blackUidEndTime_;
+    public static final int TAG_FIELD_NUMBER = 1801;
+    private int tag_;
+    /**
+     * <code>uint32 tag = 1801;</code>
+     * @return The tag.
+     */
+    @java.lang.Override
+    public int getTag() {
+      return tag_;
+    }
+
+    public static final int SECRET_KEY_SEED_FIELD_NUMBER = 6;
+    private long secretKeySeed_;
+    /**
+     * <code>uint64 secret_key_seed = 6;</code>
+     * @return The secretKeySeed.
+     */
+    @java.lang.Override
+    public long getSecretKeySeed() {
+      return secretKeySeed_;
+    }
+
+    public static final int RETCODE_FIELD_NUMBER = 14;
+    private int retcode_;
+    /**
+     * <code>int32 retcode = 14;</code>
+     * @return The retcode.
+     */
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
+    }
+
+    public static final int MSG_FIELD_NUMBER = 140;
+    private volatile java.lang.Object msg_;
+    /**
+     * <pre>
+     * random
+     * </pre>
+     *
+     * <code>string msg = 140;</code>
+     * @return The msg.
+     */
+    @java.lang.Override
+    public java.lang.String getMsg() {
+      java.lang.Object ref = msg_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        msg_ = s;
+        return s;
+      }
+    }
     /**
      * <pre>
      * random
      * </pre>
      *
-     * <code>uint32 black_uid_end_time = 7;</code>
+     * <code>string msg = 140;</code>
+     * @return The bytes for msg.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getMsgBytes() {
+      java.lang.Object ref = msg_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        msg_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int BLACK_UID_END_TIME_FIELD_NUMBER = 70;
+    private int blackUidEndTime_;
+    /**
+     * <code>uint32 black_uid_end_time = 70;</code>
      * @return The blackUidEndTime.
      */
     @java.lang.Override
@@ -1004,28 +1045,6 @@ public boolean getIsProficientPlayer() {
       return isProficientPlayer_;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 100;
-    private int retcode_;
-    /**
-     * <code>int32 retcode = 100;</code>
-     * @return The retcode.
-     */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
-    }
-
-    public static final int SECRET_KEY_SEED_FIELD_NUMBER = 2;
-    private long secretKeySeed_;
-    /**
-     * <code>uint64 secret_key_seed = 2;</code>
-     * @return The secretKeySeed.
-     */
-    @java.lang.Override
-    public long getSecretKeySeed() {
-      return secretKeySeed_;
-    }
-
     public static final int IS_GUEST_FIELD_NUMBER = 300;
     private boolean isGuest_;
     /**
@@ -1048,10 +1067,10 @@ public com.google.protobuf.ByteString getExtraBinData() {
       return extraBinData_;
     }
 
-    public static final int GM_UID_FIELD_NUMBER = 10;
+    public static final int GM_UID_FIELD_NUMBER = 100;
     private int gmUid_;
     /**
-     * <code>uint32 gm_uid = 10;</code>
+     * <code>uint32 gm_uid = 100;</code>
      * @return The gmUid.
      */
     @java.lang.Override
@@ -1123,17 +1142,6 @@ public emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfoOrBuilde
       return getStopServer();
     }
 
-    public static final int TAG_FIELD_NUMBER = 853;
-    private int tag_;
-    /**
-     * <code>uint32 tag = 853;</code>
-     * @return The tag.
-     */
-    @java.lang.Override
-    public int getTag() {
-      return tag_;
-    }
-
     public static final int PSN_ID_FIELD_NUMBER = 1402;
     private volatile java.lang.Object psnId_;
     /**
@@ -1307,29 +1315,17 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(accountUid_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1, accountUid_);
-      }
       if (secretKeySeed_ != 0L) {
-        output.writeUInt64(2, secretKeySeed_);
-      }
-      if (!securityCmdBuffer_.isEmpty()) {
-        output.writeBytes(3, securityCmdBuffer_);
+        output.writeUInt64(6, secretKeySeed_);
       }
       if (uid_ != 0) {
-        output.writeUInt32(5, uid_);
-      }
-      if (blackUidEndTime_ != 0) {
-        output.writeUInt32(7, blackUidEndTime_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(token_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 8, token_);
+        output.writeUInt32(7, uid_);
       }
       if (!extraBinData_.isEmpty()) {
         output.writeBytes(9, extraBinData_);
       }
-      if (gmUid_ != 0) {
-        output.writeUInt32(10, gmUid_);
+      if (!securityCmdBuffer_.isEmpty()) {
+        output.writeBytes(10, securityCmdBuffer_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(secretKey_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 11, secretKey_);
@@ -1337,15 +1333,27 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (platformType_ != 0) {
         output.writeUInt32(12, platformType_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(msg_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 14, msg_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(accountUid_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 13, accountUid_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(100, retcode_);
+        output.writeInt32(14, retcode_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(token_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 15, token_);
+      }
+      if (blackUidEndTime_ != 0) {
+        output.writeUInt32(70, blackUidEndTime_);
+      }
+      if (gmUid_ != 0) {
+        output.writeUInt32(100, gmUid_);
       }
       if (accountType_ != 0) {
         output.writeUInt32(120, accountType_);
       }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(msg_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 140, msg_);
+      }
       if (subChannelId_ != 0) {
         output.writeUInt32(141, subChannelId_);
       }
@@ -1377,14 +1385,11 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (stopServer_ != null) {
         output.writeMessage(563, getStopServer());
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(serverRandKey_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 668, serverRandKey_);
-      }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientVersionRandomKey_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 678, clientVersionRandomKey_);
       }
-      if (tag_ != 0) {
-        output.writeUInt32(853, tag_);
+      if (keyId_ != 0) {
+        output.writeUInt32(884, keyId_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientIpStr_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 1202, clientIpStr_);
@@ -1392,17 +1397,20 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (regPlatform_ != 0) {
         output.writeUInt32(1241, regPlatform_);
       }
-      if (keyId_ != 0) {
-        output.writeUInt32(1305, keyId_);
-      }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(psnId_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 1402, psnId_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(birthday_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 1437, birthday_);
       }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(serverRandKey_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1681, serverRandKey_);
+      }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(sign_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1499, sign_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1742, sign_);
+      }
+      if (tag_ != 0) {
+        output.writeUInt32(1801, tag_);
       }
       unknownFields.writeTo(output);
     }
@@ -1413,35 +1421,21 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(accountUid_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, accountUid_);
-      }
       if (secretKeySeed_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(2, secretKeySeed_);
-      }
-      if (!securityCmdBuffer_.isEmpty()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(3, securityCmdBuffer_);
+          .computeUInt64Size(6, secretKeySeed_);
       }
       if (uid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, uid_);
-      }
-      if (blackUidEndTime_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, blackUidEndTime_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(token_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, token_);
+          .computeUInt32Size(7, uid_);
       }
       if (!extraBinData_.isEmpty()) {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(9, extraBinData_);
       }
-      if (gmUid_ != 0) {
+      if (!securityCmdBuffer_.isEmpty()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, gmUid_);
+          .computeBytesSize(10, securityCmdBuffer_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(secretKey_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(11, secretKey_);
@@ -1450,17 +1444,31 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(12, platformType_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(msg_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(14, msg_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(accountUid_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(13, accountUid_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(100, retcode_);
+          .computeInt32Size(14, retcode_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(token_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(15, token_);
+      }
+      if (blackUidEndTime_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(70, blackUidEndTime_);
+      }
+      if (gmUid_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(100, gmUid_);
       }
       if (accountType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(120, accountType_);
       }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(msg_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(140, msg_);
+      }
       if (subChannelId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(141, subChannelId_);
@@ -1505,15 +1513,12 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(563, getStopServer());
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(serverRandKey_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(668, serverRandKey_);
-      }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientVersionRandomKey_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(678, clientVersionRandomKey_);
       }
-      if (tag_ != 0) {
+      if (keyId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(853, tag_);
+          .computeUInt32Size(884, keyId_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientIpStr_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1202, clientIpStr_);
@@ -1522,18 +1527,21 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(1241, regPlatform_);
       }
-      if (keyId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1305, keyId_);
-      }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(psnId_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1402, psnId_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(birthday_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1437, birthday_);
       }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(serverRandKey_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1681, serverRandKey_);
+      }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(sign_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1499, sign_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1742, sign_);
+      }
+      if (tag_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1801, tag_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -1566,8 +1574,6 @@ public boolean equals(final java.lang.Object obj) {
           != other.getKeyId()) return false;
       if (!getClientIpStr()
           .equals(other.getClientIpStr())) return false;
-      if (!getMsg()
-          .equals(other.getMsg())) return false;
       if (!getCountryCode()
           .equals(other.getCountryCode())) return false;
       if (!getGameBiz()
@@ -1576,16 +1582,20 @@ public boolean equals(final java.lang.Object obj) {
           .equals(other.getFinishCollectionIdListList())) return false;
       if (!getSign()
           .equals(other.getSign())) return false;
+      if (getTag()
+          != other.getTag()) return false;
+      if (getSecretKeySeed()
+          != other.getSecretKeySeed()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
+      if (!getMsg()
+          .equals(other.getMsg())) return false;
       if (getBlackUidEndTime()
           != other.getBlackUidEndTime()) return false;
       if (getAccountType()
           != other.getAccountType()) return false;
       if (getIsProficientPlayer()
           != other.getIsProficientPlayer()) return false;
-      if (getRetcode()
-          != other.getRetcode()) return false;
-      if (getSecretKeySeed()
-          != other.getSecretKeySeed()) return false;
       if (getIsGuest()
           != other.getIsGuest()) return false;
       if (!getExtraBinData()
@@ -1599,8 +1609,6 @@ public boolean equals(final java.lang.Object obj) {
         if (!getStopServer()
             .equals(other.getStopServer())) return false;
       }
-      if (getTag()
-          != other.getTag()) return false;
       if (!getPsnId()
           .equals(other.getPsnId())) return false;
       if (!getClientVersionRandomKey()
@@ -1642,8 +1650,6 @@ public int hashCode() {
       hash = (53 * hash) + getKeyId();
       hash = (37 * hash) + CLIENT_IP_STR_FIELD_NUMBER;
       hash = (53 * hash) + getClientIpStr().hashCode();
-      hash = (37 * hash) + MSG_FIELD_NUMBER;
-      hash = (53 * hash) + getMsg().hashCode();
       hash = (37 * hash) + COUNTRY_CODE_FIELD_NUMBER;
       hash = (53 * hash) + getCountryCode().hashCode();
       hash = (37 * hash) + GAME_BIZ_FIELD_NUMBER;
@@ -1654,6 +1660,15 @@ public int hashCode() {
       }
       hash = (37 * hash) + SIGN_FIELD_NUMBER;
       hash = (53 * hash) + getSign().hashCode();
+      hash = (37 * hash) + TAG_FIELD_NUMBER;
+      hash = (53 * hash) + getTag();
+      hash = (37 * hash) + SECRET_KEY_SEED_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getSecretKeySeed());
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + MSG_FIELD_NUMBER;
+      hash = (53 * hash) + getMsg().hashCode();
       hash = (37 * hash) + BLACK_UID_END_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getBlackUidEndTime();
       hash = (37 * hash) + ACCOUNT_TYPE_FIELD_NUMBER;
@@ -1661,11 +1676,6 @@ public int hashCode() {
       hash = (37 * hash) + IS_PROFICIENT_PLAYER_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsProficientPlayer());
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
-      hash = (37 * hash) + SECRET_KEY_SEED_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getSecretKeySeed());
       hash = (37 * hash) + IS_GUEST_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsGuest());
@@ -1679,8 +1689,6 @@ public int hashCode() {
         hash = (37 * hash) + STOP_SERVER_FIELD_NUMBER;
         hash = (53 * hash) + getStopServer().hashCode();
       }
-      hash = (37 * hash) + TAG_FIELD_NUMBER;
-      hash = (53 * hash) + getTag();
       hash = (37 * hash) + PSN_ID_FIELD_NUMBER;
       hash = (53 * hash) + getPsnId().hashCode();
       hash = (37 * hash) + CLIENT_VERSION_RANDOM_KEY_FIELD_NUMBER;
@@ -1792,7 +1800,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 23639
+     * CmdId: 87
      * </pre>
      *
      * Protobuf type {@code GetPlayerTokenRsp}
@@ -1848,8 +1856,6 @@ public Builder clear() {
 
         clientIpStr_ = "";
 
-        msg_ = "";
-
         countryCode_ = "";
 
         gameBiz_ = "";
@@ -1858,16 +1864,20 @@ public Builder clear() {
         bitField0_ = (bitField0_ & ~0x00000001);
         sign_ = "";
 
+        tag_ = 0;
+
+        secretKeySeed_ = 0L;
+
+        retcode_ = 0;
+
+        msg_ = "";
+
         blackUidEndTime_ = 0;
 
         accountType_ = 0;
 
         isProficientPlayer_ = false;
 
-        retcode_ = 0;
-
-        secretKeySeed_ = 0L;
-
         isGuest_ = false;
 
         extraBinData_ = com.google.protobuf.ByteString.EMPTY;
@@ -1882,8 +1892,6 @@ public Builder clear() {
           stopServer_ = null;
           stopServerBuilder_ = null;
         }
-        tag_ = 0;
-
         psnId_ = "";
 
         clientVersionRandomKey_ = "";
@@ -1933,7 +1941,6 @@ public emu.grasscutter.net.proto.GetPlayerTokenRspOuterClass.GetPlayerTokenRsp b
         result.serverRandKey_ = serverRandKey_;
         result.keyId_ = keyId_;
         result.clientIpStr_ = clientIpStr_;
-        result.msg_ = msg_;
         result.countryCode_ = countryCode_;
         result.gameBiz_ = gameBiz_;
         if (((bitField0_ & 0x00000001) != 0)) {
@@ -1942,11 +1949,13 @@ public emu.grasscutter.net.proto.GetPlayerTokenRspOuterClass.GetPlayerTokenRsp b
         }
         result.finishCollectionIdList_ = finishCollectionIdList_;
         result.sign_ = sign_;
+        result.tag_ = tag_;
+        result.secretKeySeed_ = secretKeySeed_;
+        result.retcode_ = retcode_;
+        result.msg_ = msg_;
         result.blackUidEndTime_ = blackUidEndTime_;
         result.accountType_ = accountType_;
         result.isProficientPlayer_ = isProficientPlayer_;
-        result.retcode_ = retcode_;
-        result.secretKeySeed_ = secretKeySeed_;
         result.isGuest_ = isGuest_;
         result.extraBinData_ = extraBinData_;
         result.gmUid_ = gmUid_;
@@ -1956,7 +1965,6 @@ public emu.grasscutter.net.proto.GetPlayerTokenRspOuterClass.GetPlayerTokenRsp b
         } else {
           result.stopServer_ = stopServerBuilder_.build();
         }
-        result.tag_ = tag_;
         result.psnId_ = psnId_;
         result.clientVersionRandomKey_ = clientVersionRandomKey_;
         result.channelId_ = channelId_;
@@ -2040,10 +2048,6 @@ public Builder mergeFrom(emu.grasscutter.net.proto.GetPlayerTokenRspOuterClass.G
           clientIpStr_ = other.clientIpStr_;
           onChanged();
         }
-        if (!other.getMsg().isEmpty()) {
-          msg_ = other.msg_;
-          onChanged();
-        }
         if (!other.getCountryCode().isEmpty()) {
           countryCode_ = other.countryCode_;
           onChanged();
@@ -2066,6 +2070,19 @@ public Builder mergeFrom(emu.grasscutter.net.proto.GetPlayerTokenRspOuterClass.G
           sign_ = other.sign_;
           onChanged();
         }
+        if (other.getTag() != 0) {
+          setTag(other.getTag());
+        }
+        if (other.getSecretKeySeed() != 0L) {
+          setSecretKeySeed(other.getSecretKeySeed());
+        }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
+        if (!other.getMsg().isEmpty()) {
+          msg_ = other.msg_;
+          onChanged();
+        }
         if (other.getBlackUidEndTime() != 0) {
           setBlackUidEndTime(other.getBlackUidEndTime());
         }
@@ -2075,12 +2092,6 @@ public Builder mergeFrom(emu.grasscutter.net.proto.GetPlayerTokenRspOuterClass.G
         if (other.getIsProficientPlayer() != false) {
           setIsProficientPlayer(other.getIsProficientPlayer());
         }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
-        if (other.getSecretKeySeed() != 0L) {
-          setSecretKeySeed(other.getSecretKeySeed());
-        }
         if (other.getIsGuest() != false) {
           setIsGuest(other.getIsGuest());
         }
@@ -2097,9 +2108,6 @@ public Builder mergeFrom(emu.grasscutter.net.proto.GetPlayerTokenRspOuterClass.G
         if (other.hasStopServer()) {
           mergeStopServer(other.getStopServer());
         }
-        if (other.getTag() != 0) {
-          setTag(other.getTag());
-        }
         if (!other.getPsnId().isEmpty()) {
           psnId_ = other.psnId_;
           onChanged();
@@ -2156,7 +2164,7 @@ public Builder mergeFrom(
 
       private com.google.protobuf.ByteString securityCmdBuffer_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>bytes security_cmd_buffer = 3;</code>
+       * <code>bytes security_cmd_buffer = 10;</code>
        * @return The securityCmdBuffer.
        */
       @java.lang.Override
@@ -2164,7 +2172,7 @@ public com.google.protobuf.ByteString getSecurityCmdBuffer() {
         return securityCmdBuffer_;
       }
       /**
-       * <code>bytes security_cmd_buffer = 3;</code>
+       * <code>bytes security_cmd_buffer = 10;</code>
        * @param value The securityCmdBuffer to set.
        * @return This builder for chaining.
        */
@@ -2178,7 +2186,7 @@ public Builder setSecurityCmdBuffer(com.google.protobuf.ByteString value) {
         return this;
       }
       /**
-       * <code>bytes security_cmd_buffer = 3;</code>
+       * <code>bytes security_cmd_buffer = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearSecurityCmdBuffer() {
@@ -2190,7 +2198,7 @@ public Builder clearSecurityCmdBuffer() {
 
       private java.lang.Object accountUid_ = "";
       /**
-       * <code>string account_uid = 1;</code>
+       * <code>string account_uid = 13;</code>
        * @return The accountUid.
        */
       public java.lang.String getAccountUid() {
@@ -2206,7 +2214,7 @@ public java.lang.String getAccountUid() {
         }
       }
       /**
-       * <code>string account_uid = 1;</code>
+       * <code>string account_uid = 13;</code>
        * @return The bytes for accountUid.
        */
       public com.google.protobuf.ByteString
@@ -2223,7 +2231,7 @@ public java.lang.String getAccountUid() {
         }
       }
       /**
-       * <code>string account_uid = 1;</code>
+       * <code>string account_uid = 13;</code>
        * @param value The accountUid to set.
        * @return This builder for chaining.
        */
@@ -2238,7 +2246,7 @@ public Builder setAccountUid(
         return this;
       }
       /**
-       * <code>string account_uid = 1;</code>
+       * <code>string account_uid = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearAccountUid() {
@@ -2248,7 +2256,7 @@ public Builder clearAccountUid() {
         return this;
       }
       /**
-       * <code>string account_uid = 1;</code>
+       * <code>string account_uid = 13;</code>
        * @param value The bytes for accountUid to set.
        * @return This builder for chaining.
        */
@@ -2266,7 +2274,7 @@ public Builder setAccountUidBytes(
 
       private int uid_ ;
       /**
-       * <code>uint32 uid = 5;</code>
+       * <code>uint32 uid = 7;</code>
        * @return The uid.
        */
       @java.lang.Override
@@ -2274,7 +2282,7 @@ public int getUid() {
         return uid_;
       }
       /**
-       * <code>uint32 uid = 5;</code>
+       * <code>uint32 uid = 7;</code>
        * @param value The uid to set.
        * @return This builder for chaining.
        */
@@ -2285,7 +2293,7 @@ public Builder setUid(int value) {
         return this;
       }
       /**
-       * <code>uint32 uid = 5;</code>
+       * <code>uint32 uid = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearUid() {
@@ -2328,7 +2336,7 @@ public Builder clearPlatformType() {
 
       private java.lang.Object token_ = "";
       /**
-       * <code>string token = 8;</code>
+       * <code>string token = 15;</code>
        * @return The token.
        */
       public java.lang.String getToken() {
@@ -2344,7 +2352,7 @@ public java.lang.String getToken() {
         }
       }
       /**
-       * <code>string token = 8;</code>
+       * <code>string token = 15;</code>
        * @return The bytes for token.
        */
       public com.google.protobuf.ByteString
@@ -2361,7 +2369,7 @@ public java.lang.String getToken() {
         }
       }
       /**
-       * <code>string token = 8;</code>
+       * <code>string token = 15;</code>
        * @param value The token to set.
        * @return This builder for chaining.
        */
@@ -2376,7 +2384,7 @@ public Builder setToken(
         return this;
       }
       /**
-       * <code>string token = 8;</code>
+       * <code>string token = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearToken() {
@@ -2386,7 +2394,7 @@ public Builder clearToken() {
         return this;
       }
       /**
-       * <code>string token = 8;</code>
+       * <code>string token = 15;</code>
        * @param value The bytes for token to set.
        * @return This builder for chaining.
        */
@@ -2404,7 +2412,7 @@ public Builder setTokenBytes(
 
       private java.lang.Object serverRandKey_ = "";
       /**
-       * <code>string server_rand_key = 668;</code>
+       * <code>string server_rand_key = 1681;</code>
        * @return The serverRandKey.
        */
       public java.lang.String getServerRandKey() {
@@ -2420,7 +2428,7 @@ public java.lang.String getServerRandKey() {
         }
       }
       /**
-       * <code>string server_rand_key = 668;</code>
+       * <code>string server_rand_key = 1681;</code>
        * @return The bytes for serverRandKey.
        */
       public com.google.protobuf.ByteString
@@ -2437,7 +2445,7 @@ public java.lang.String getServerRandKey() {
         }
       }
       /**
-       * <code>string server_rand_key = 668;</code>
+       * <code>string server_rand_key = 1681;</code>
        * @param value The serverRandKey to set.
        * @return This builder for chaining.
        */
@@ -2452,7 +2460,7 @@ public Builder setServerRandKey(
         return this;
       }
       /**
-       * <code>string server_rand_key = 668;</code>
+       * <code>string server_rand_key = 1681;</code>
        * @return This builder for chaining.
        */
       public Builder clearServerRandKey() {
@@ -2462,7 +2470,7 @@ public Builder clearServerRandKey() {
         return this;
       }
       /**
-       * <code>string server_rand_key = 668;</code>
+       * <code>string server_rand_key = 1681;</code>
        * @param value The bytes for serverRandKey to set.
        * @return This builder for chaining.
        */
@@ -2480,7 +2488,7 @@ public Builder setServerRandKeyBytes(
 
       private int keyId_ ;
       /**
-       * <code>uint32 key_id = 1305;</code>
+       * <code>uint32 key_id = 884;</code>
        * @return The keyId.
        */
       @java.lang.Override
@@ -2488,7 +2496,7 @@ public int getKeyId() {
         return keyId_;
       }
       /**
-       * <code>uint32 key_id = 1305;</code>
+       * <code>uint32 key_id = 884;</code>
        * @param value The keyId to set.
        * @return This builder for chaining.
        */
@@ -2499,7 +2507,7 @@ public Builder setKeyId(int value) {
         return this;
       }
       /**
-       * <code>uint32 key_id = 1305;</code>
+       * <code>uint32 key_id = 884;</code>
        * @return This builder for chaining.
        */
       public Builder clearKeyId() {
@@ -2585,82 +2593,6 @@ public Builder setClientIpStrBytes(
         return this;
       }
 
-      private java.lang.Object msg_ = "";
-      /**
-       * <code>string msg = 14;</code>
-       * @return The msg.
-       */
-      public java.lang.String getMsg() {
-        java.lang.Object ref = msg_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          msg_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string msg = 14;</code>
-       * @return The bytes for msg.
-       */
-      public com.google.protobuf.ByteString
-          getMsgBytes() {
-        java.lang.Object ref = msg_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          msg_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string msg = 14;</code>
-       * @param value The msg to set.
-       * @return This builder for chaining.
-       */
-      public Builder setMsg(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        msg_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string msg = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearMsg() {
-        
-        msg_ = getDefaultInstance().getMsg();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string msg = 14;</code>
-       * @param value The bytes for msg to set.
-       * @return This builder for chaining.
-       */
-      public Builder setMsgBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        msg_ = value;
-        onChanged();
-        return this;
-      }
-
       private java.lang.Object countryCode_ = "";
       /**
        * <code>string country_code = 555;</code>
@@ -2894,7 +2826,7 @@ public Builder clearFinishCollectionIdList() {
 
       private java.lang.Object sign_ = "";
       /**
-       * <code>string sign = 1499;</code>
+       * <code>string sign = 1742;</code>
        * @return The sign.
        */
       public java.lang.String getSign() {
@@ -2910,7 +2842,7 @@ public java.lang.String getSign() {
         }
       }
       /**
-       * <code>string sign = 1499;</code>
+       * <code>string sign = 1742;</code>
        * @return The bytes for sign.
        */
       public com.google.protobuf.ByteString
@@ -2927,7 +2859,7 @@ public java.lang.String getSign() {
         }
       }
       /**
-       * <code>string sign = 1499;</code>
+       * <code>string sign = 1742;</code>
        * @param value The sign to set.
        * @return This builder for chaining.
        */
@@ -2942,7 +2874,7 @@ public Builder setSign(
         return this;
       }
       /**
-       * <code>string sign = 1499;</code>
+       * <code>string sign = 1742;</code>
        * @return This builder for chaining.
        */
       public Builder clearSign() {
@@ -2952,7 +2884,7 @@ public Builder clearSign() {
         return this;
       }
       /**
-       * <code>string sign = 1499;</code>
+       * <code>string sign = 1742;</code>
        * @param value The bytes for sign to set.
        * @return This builder for chaining.
        */
@@ -2968,169 +2900,284 @@ public Builder setSignBytes(
         return this;
       }
 
-      private int blackUidEndTime_ ;
+      private int tag_ ;
+      /**
+       * <code>uint32 tag = 1801;</code>
+       * @return The tag.
+       */
+      @java.lang.Override
+      public int getTag() {
+        return tag_;
+      }
+      /**
+       * <code>uint32 tag = 1801;</code>
+       * @param value The tag to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTag(int value) {
+        
+        tag_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 tag = 1801;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTag() {
+        
+        tag_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private long secretKeySeed_ ;
+      /**
+       * <code>uint64 secret_key_seed = 6;</code>
+       * @return The secretKeySeed.
+       */
+      @java.lang.Override
+      public long getSecretKeySeed() {
+        return secretKeySeed_;
+      }
+      /**
+       * <code>uint64 secret_key_seed = 6;</code>
+       * @param value The secretKeySeed to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSecretKeySeed(long value) {
+        
+        secretKeySeed_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 secret_key_seed = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearSecretKeySeed() {
+        
+        secretKeySeed_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 14;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <code>int32 retcode = 14;</code>
+       * @param value The retcode to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRetcode(int value) {
+        
+        retcode_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>int32 retcode = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRetcode() {
+        
+        retcode_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object msg_ = "";
       /**
        * <pre>
        * random
        * </pre>
        *
-       * <code>uint32 black_uid_end_time = 7;</code>
-       * @return The blackUidEndTime.
+       * <code>string msg = 140;</code>
+       * @return The msg.
        */
-      @java.lang.Override
-      public int getBlackUidEndTime() {
-        return blackUidEndTime_;
+      public java.lang.String getMsg() {
+        java.lang.Object ref = msg_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          msg_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
       }
       /**
        * <pre>
        * random
        * </pre>
        *
-       * <code>uint32 black_uid_end_time = 7;</code>
-       * @param value The blackUidEndTime to set.
-       * @return This builder for chaining.
+       * <code>string msg = 140;</code>
+       * @return The bytes for msg.
        */
-      public Builder setBlackUidEndTime(int value) {
-        
-        blackUidEndTime_ = value;
-        onChanged();
-        return this;
+      public com.google.protobuf.ByteString
+          getMsgBytes() {
+        java.lang.Object ref = msg_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          msg_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
       }
       /**
        * <pre>
        * random
        * </pre>
        *
-       * <code>uint32 black_uid_end_time = 7;</code>
+       * <code>string msg = 140;</code>
+       * @param value The msg to set.
        * @return This builder for chaining.
        */
-      public Builder clearBlackUidEndTime() {
-        
-        blackUidEndTime_ = 0;
+      public Builder setMsg(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        msg_ = value;
         onChanged();
         return this;
       }
-
-      private int accountType_ ;
-      /**
-       * <code>uint32 account_type = 120;</code>
-       * @return The accountType.
-       */
-      @java.lang.Override
-      public int getAccountType() {
-        return accountType_;
-      }
       /**
-       * <code>uint32 account_type = 120;</code>
-       * @param value The accountType to set.
+       * <pre>
+       * random
+       * </pre>
+       *
+       * <code>string msg = 140;</code>
        * @return This builder for chaining.
        */
-      public Builder setAccountType(int value) {
+      public Builder clearMsg() {
         
-        accountType_ = value;
+        msg_ = getDefaultInstance().getMsg();
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 account_type = 120;</code>
+       * <pre>
+       * random
+       * </pre>
+       *
+       * <code>string msg = 140;</code>
+       * @param value The bytes for msg to set.
        * @return This builder for chaining.
        */
-      public Builder clearAccountType() {
+      public Builder setMsgBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
         
-        accountType_ = 0;
+        msg_ = value;
         onChanged();
         return this;
       }
 
-      private boolean isProficientPlayer_ ;
+      private int blackUidEndTime_ ;
       /**
-       * <code>bool is_proficient_player = 500;</code>
-       * @return The isProficientPlayer.
+       * <code>uint32 black_uid_end_time = 70;</code>
+       * @return The blackUidEndTime.
        */
       @java.lang.Override
-      public boolean getIsProficientPlayer() {
-        return isProficientPlayer_;
+      public int getBlackUidEndTime() {
+        return blackUidEndTime_;
       }
       /**
-       * <code>bool is_proficient_player = 500;</code>
-       * @param value The isProficientPlayer to set.
+       * <code>uint32 black_uid_end_time = 70;</code>
+       * @param value The blackUidEndTime to set.
        * @return This builder for chaining.
        */
-      public Builder setIsProficientPlayer(boolean value) {
+      public Builder setBlackUidEndTime(int value) {
         
-        isProficientPlayer_ = value;
+        blackUidEndTime_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bool is_proficient_player = 500;</code>
+       * <code>uint32 black_uid_end_time = 70;</code>
        * @return This builder for chaining.
        */
-      public Builder clearIsProficientPlayer() {
+      public Builder clearBlackUidEndTime() {
         
-        isProficientPlayer_ = false;
+        blackUidEndTime_ = 0;
         onChanged();
         return this;
       }
 
-      private int retcode_ ;
+      private int accountType_ ;
       /**
-       * <code>int32 retcode = 100;</code>
-       * @return The retcode.
+       * <code>uint32 account_type = 120;</code>
+       * @return The accountType.
        */
       @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
+      public int getAccountType() {
+        return accountType_;
       }
       /**
-       * <code>int32 retcode = 100;</code>
-       * @param value The retcode to set.
+       * <code>uint32 account_type = 120;</code>
+       * @param value The accountType to set.
        * @return This builder for chaining.
        */
-      public Builder setRetcode(int value) {
+      public Builder setAccountType(int value) {
         
-        retcode_ = value;
+        accountType_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>int32 retcode = 100;</code>
+       * <code>uint32 account_type = 120;</code>
        * @return This builder for chaining.
        */
-      public Builder clearRetcode() {
+      public Builder clearAccountType() {
         
-        retcode_ = 0;
+        accountType_ = 0;
         onChanged();
         return this;
       }
 
-      private long secretKeySeed_ ;
+      private boolean isProficientPlayer_ ;
       /**
-       * <code>uint64 secret_key_seed = 2;</code>
-       * @return The secretKeySeed.
+       * <code>bool is_proficient_player = 500;</code>
+       * @return The isProficientPlayer.
        */
       @java.lang.Override
-      public long getSecretKeySeed() {
-        return secretKeySeed_;
+      public boolean getIsProficientPlayer() {
+        return isProficientPlayer_;
       }
       /**
-       * <code>uint64 secret_key_seed = 2;</code>
-       * @param value The secretKeySeed to set.
+       * <code>bool is_proficient_player = 500;</code>
+       * @param value The isProficientPlayer to set.
        * @return This builder for chaining.
        */
-      public Builder setSecretKeySeed(long value) {
+      public Builder setIsProficientPlayer(boolean value) {
         
-        secretKeySeed_ = value;
+        isProficientPlayer_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint64 secret_key_seed = 2;</code>
+       * <code>bool is_proficient_player = 500;</code>
        * @return This builder for chaining.
        */
-      public Builder clearSecretKeySeed() {
+      public Builder clearIsProficientPlayer() {
         
-        secretKeySeed_ = 0L;
+        isProficientPlayer_ = false;
         onChanged();
         return this;
       }
@@ -3202,7 +3249,7 @@ public Builder clearExtraBinData() {
 
       private int gmUid_ ;
       /**
-       * <code>uint32 gm_uid = 10;</code>
+       * <code>uint32 gm_uid = 100;</code>
        * @return The gmUid.
        */
       @java.lang.Override
@@ -3210,7 +3257,7 @@ public int getGmUid() {
         return gmUid_;
       }
       /**
-       * <code>uint32 gm_uid = 10;</code>
+       * <code>uint32 gm_uid = 100;</code>
        * @param value The gmUid to set.
        * @return This builder for chaining.
        */
@@ -3221,7 +3268,7 @@ public Builder setGmUid(int value) {
         return this;
       }
       /**
-       * <code>uint32 gm_uid = 10;</code>
+       * <code>uint32 gm_uid = 100;</code>
        * @return This builder for chaining.
        */
       public Builder clearGmUid() {
@@ -3426,37 +3473,6 @@ public emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfoOrBuilde
         return stopServerBuilder_;
       }
 
-      private int tag_ ;
-      /**
-       * <code>uint32 tag = 853;</code>
-       * @return The tag.
-       */
-      @java.lang.Override
-      public int getTag() {
-        return tag_;
-      }
-      /**
-       * <code>uint32 tag = 853;</code>
-       * @param value The tag to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTag(int value) {
-        
-        tag_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 tag = 853;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTag() {
-        
-        tag_ = 0;
-        onChanged();
-        return this;
-      }
-
       private java.lang.Object psnId_ = "";
       /**
        * <code>string psn_id = 1402;</code>
@@ -3876,26 +3892,26 @@ public emu.grasscutter.net.proto.GetPlayerTokenRspOuterClass.GetPlayerTokenRsp g
   static {
     java.lang.String[] descriptorData = {
       "\n\027GetPlayerTokenRsp.proto\032\024StopServerInf" +
-      "o.proto\"\313\005\n\021GetPlayerTokenRsp\022\033\n\023securit" +
-      "y_cmd_buffer\030\003 \001(\014\022\023\n\013account_uid\030\001 \001(\t\022" +
-      "\013\n\003uid\030\005 \001(\r\022\025\n\rplatform_type\030\014 \001(\r\022\r\n\005t" +
-      "oken\030\010 \001(\t\022\030\n\017server_rand_key\030\234\005 \001(\t\022\017\n\006" +
-      "key_id\030\231\n \001(\r\022\026\n\rclient_ip_str\030\262\t \001(\t\022\013\n" +
-      "\003msg\030\016 \001(\t\022\025\n\014country_code\030\253\004 \001(\t\022\021\n\010gam" +
-      "e_biz\030\315\002 \001(\t\022\"\n\031finish_collection_id_lis" +
-      "t\030\244\001 \003(\r\022\r\n\004sign\030\333\013 \001(\t\022\032\n\022black_uid_end" +
-      "_time\030\007 \001(\r\022\024\n\014account_type\030x \001(\r\022\035\n\024is_" +
-      "proficient_player\030\364\003 \001(\010\022\017\n\007retcode\030d \001(" +
-      "\005\022\027\n\017secret_key_seed\030\002 \001(\004\022\021\n\010is_guest\030\254" +
-      "\002 \001(\010\022\026\n\016extra_bin_data\030\t \001(\014\022\016\n\006gm_uid\030" +
-      "\n \001(\r\022\022\n\nsecret_key\030\013 \001(\t\022%\n\013stop_server" +
-      "\030\263\004 \001(\0132\017.StopServerInfo\022\014\n\003tag\030\325\006 \001(\r\022\017" +
-      "\n\006psn_id\030\372\n \001(\t\022\"\n\031client_version_random" +
-      "_key\030\246\005 \001(\t\022\023\n\nchannel_id\030\203\002 \001(\r\022\025\n\014reg_" +
-      "platform\030\331\t \001(\r\022\021\n\010birthday\030\235\013 \001(\t\022\027\n\016su" +
-      "b_channel_id\030\215\001 \001(\r\022\030\n\017cloud_client_ip\030\374" +
-      "\003 \001(\rB\033\n\031emu.grasscutter.net.protob\006prot" +
-      "o3"
+      "o.proto\"\314\005\n\021GetPlayerTokenRsp\022\033\n\023securit" +
+      "y_cmd_buffer\030\n \001(\014\022\023\n\013account_uid\030\r \001(\t\022" +
+      "\013\n\003uid\030\007 \001(\r\022\025\n\rplatform_type\030\014 \001(\r\022\r\n\005t" +
+      "oken\030\017 \001(\t\022\030\n\017server_rand_key\030\221\r \001(\t\022\017\n\006" +
+      "key_id\030\364\006 \001(\r\022\026\n\rclient_ip_str\030\262\t \001(\t\022\025\n" +
+      "\014country_code\030\253\004 \001(\t\022\021\n\010game_biz\030\315\002 \001(\t\022" +
+      "\"\n\031finish_collection_id_list\030\244\001 \003(\r\022\r\n\004s" +
+      "ign\030\316\r \001(\t\022\014\n\003tag\030\211\016 \001(\r\022\027\n\017secret_key_s" +
+      "eed\030\006 \001(\004\022\017\n\007retcode\030\016 \001(\005\022\014\n\003msg\030\214\001 \001(\t" +
+      "\022\032\n\022black_uid_end_time\030F \001(\r\022\024\n\014account_" +
+      "type\030x \001(\r\022\035\n\024is_proficient_player\030\364\003 \001(" +
+      "\010\022\021\n\010is_guest\030\254\002 \001(\010\022\026\n\016extra_bin_data\030\t" +
+      " \001(\014\022\016\n\006gm_uid\030d \001(\r\022\022\n\nsecret_key\030\013 \001(\t" +
+      "\022%\n\013stop_server\030\263\004 \001(\0132\017.StopServerInfo\022" +
+      "\017\n\006psn_id\030\372\n \001(\t\022\"\n\031client_version_rando" +
+      "m_key\030\246\005 \001(\t\022\023\n\nchannel_id\030\203\002 \001(\r\022\025\n\014reg" +
+      "_platform\030\331\t \001(\r\022\021\n\010birthday\030\235\013 \001(\t\022\027\n\016s" +
+      "ub_channel_id\030\215\001 \001(\r\022\030\n\017cloud_client_ip\030" +
+      "\374\003 \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" +
+      "to3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -3907,7 +3923,7 @@ public emu.grasscutter.net.proto.GetPlayerTokenRspOuterClass.GetPlayerTokenRsp g
     internal_static_GetPlayerTokenRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetPlayerTokenRsp_descriptor,
-        new java.lang.String[] { "SecurityCmdBuffer", "AccountUid", "Uid", "PlatformType", "Token", "ServerRandKey", "KeyId", "ClientIpStr", "Msg", "CountryCode", "GameBiz", "FinishCollectionIdList", "Sign", "BlackUidEndTime", "AccountType", "IsProficientPlayer", "Retcode", "SecretKeySeed", "IsGuest", "ExtraBinData", "GmUid", "SecretKey", "StopServer", "Tag", "PsnId", "ClientVersionRandomKey", "ChannelId", "RegPlatform", "Birthday", "SubChannelId", "CloudClientIp", });
+        new java.lang.String[] { "SecurityCmdBuffer", "AccountUid", "Uid", "PlatformType", "Token", "ServerRandKey", "KeyId", "ClientIpStr", "CountryCode", "GameBiz", "FinishCollectionIdList", "Sign", "Tag", "SecretKeySeed", "Retcode", "Msg", "BlackUidEndTime", "AccountType", "IsProficientPlayer", "IsGuest", "ExtraBinData", "GmUid", "SecretKey", "StopServer", "PsnId", "ClientVersionRandomKey", "ChannelId", "RegPlatform", "Birthday", "SubChannelId", "CloudClientIp", });
     emu.grasscutter.net.proto.StopServerInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetProfilePictureDataReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetProfilePictureDataReqOuterClass.java
index af624259a80..c7cd4821c0a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetProfilePictureDataReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetProfilePictureDataReqOuterClass.java
@@ -20,7 +20,7 @@ public interface GetProfilePictureDataReqOrBuilder extends
   }
   /**
    * <pre>
-   * CmdId: 22511
+   * CmdId: 9548
    * </pre>
    *
    * Protobuf type {@code GetProfilePictureDataReq}
@@ -245,7 +245,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 22511
+     * CmdId: 9548
      * </pre>
      *
      * Protobuf type {@code GetProfilePictureDataReq}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetProfilePictureDataRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetProfilePictureDataRspOuterClass.java
index b489913d6d5..8cf0a1a456b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetProfilePictureDataRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetProfilePictureDataRspOuterClass.java
@@ -19,31 +19,47 @@ public interface GetProfilePictureDataRspOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 special_profile_picture_list = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 special_profile_picture_list = 13;</code>
      * @return A list containing the specialProfilePictureList.
      */
     java.util.List<java.lang.Integer> getSpecialProfilePictureListList();
     /**
-     * <code>repeated uint32 special_profile_picture_list = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 special_profile_picture_list = 13;</code>
      * @return The count of specialProfilePictureList.
      */
     int getSpecialProfilePictureListCount();
     /**
-     * <code>repeated uint32 special_profile_picture_list = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 special_profile_picture_list = 13;</code>
      * @param index The index of the element to return.
      * @return The specialProfilePictureList at the given index.
      */
     int getSpecialProfilePictureList(int index);
 
     /**
-     * <code>int32 retcode = 11;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>int32 retcode = 4;</code>
      * @return The retcode.
      */
     int getRetcode();
   }
   /**
    * <pre>
-   * CmdId: 1846
+   * CmdId: 9376
    * </pre>
    *
    * Protobuf type {@code GetProfilePictureDataRsp}
@@ -92,7 +108,12 @@ private GetProfilePictureDataRsp(
             case 0:
               done = true;
               break;
-            case 24: {
+            case 32: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 104: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 specialProfilePictureList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -100,7 +121,7 @@ private GetProfilePictureDataRsp(
               specialProfilePictureList_.addInt(input.readUInt32());
               break;
             }
-            case 26: {
+            case 106: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -113,11 +134,6 @@ private GetProfilePictureDataRsp(
               input.popLimit(limit);
               break;
             }
-            case 88: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -153,10 +169,14 @@ private GetProfilePictureDataRsp(
               emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp.class, emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp.Builder.class);
     }
 
-    public static final int SPECIAL_PROFILE_PICTURE_LIST_FIELD_NUMBER = 3;
+    public static final int SPECIAL_PROFILE_PICTURE_LIST_FIELD_NUMBER = 13;
     private com.google.protobuf.Internal.IntList specialProfilePictureList_;
     /**
-     * <code>repeated uint32 special_profile_picture_list = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 special_profile_picture_list = 13;</code>
      * @return A list containing the specialProfilePictureList.
      */
     @java.lang.Override
@@ -165,14 +185,22 @@ private GetProfilePictureDataRsp(
       return specialProfilePictureList_;
     }
     /**
-     * <code>repeated uint32 special_profile_picture_list = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 special_profile_picture_list = 13;</code>
      * @return The count of specialProfilePictureList.
      */
     public int getSpecialProfilePictureListCount() {
       return specialProfilePictureList_.size();
     }
     /**
-     * <code>repeated uint32 special_profile_picture_list = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 special_profile_picture_list = 13;</code>
      * @param index The index of the element to return.
      * @return The specialProfilePictureList at the given index.
      */
@@ -181,10 +209,14 @@ public int getSpecialProfilePictureList(int index) {
     }
     private int specialProfilePictureListMemoizedSerializedSize = -1;
 
-    public static final int RETCODE_FIELD_NUMBER = 11;
+    public static final int RETCODE_FIELD_NUMBER = 4;
     private int retcode_;
     /**
-     * <code>int32 retcode = 11;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>int32 retcode = 4;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -207,16 +239,16 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
+      if (retcode_ != 0) {
+        output.writeInt32(4, retcode_);
+      }
       if (getSpecialProfilePictureListList().size() > 0) {
-        output.writeUInt32NoTag(26);
+        output.writeUInt32NoTag(106);
         output.writeUInt32NoTag(specialProfilePictureListMemoizedSerializedSize);
       }
       for (int i = 0; i < specialProfilePictureList_.size(); i++) {
         output.writeUInt32NoTag(specialProfilePictureList_.getInt(i));
       }
-      if (retcode_ != 0) {
-        output.writeInt32(11, retcode_);
-      }
       unknownFields.writeTo(output);
     }
 
@@ -226,6 +258,10 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(4, retcode_);
+      }
       {
         int dataSize = 0;
         for (int i = 0; i < specialProfilePictureList_.size(); i++) {
@@ -240,10 +276,6 @@ public int getSerializedSize() {
         }
         specialProfilePictureListMemoizedSerializedSize = dataSize;
       }
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(11, retcode_);
-      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -377,7 +409,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 1846
+     * CmdId: 9376
      * </pre>
      *
      * Protobuf type {@code GetProfilePictureDataRsp}
@@ -553,7 +585,11 @@ private void ensureSpecialProfilePictureListIsMutable() {
          }
       }
       /**
-       * <code>repeated uint32 special_profile_picture_list = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 special_profile_picture_list = 13;</code>
        * @return A list containing the specialProfilePictureList.
        */
       public java.util.List<java.lang.Integer>
@@ -562,14 +598,22 @@ private void ensureSpecialProfilePictureListIsMutable() {
                  java.util.Collections.unmodifiableList(specialProfilePictureList_) : specialProfilePictureList_;
       }
       /**
-       * <code>repeated uint32 special_profile_picture_list = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 special_profile_picture_list = 13;</code>
        * @return The count of specialProfilePictureList.
        */
       public int getSpecialProfilePictureListCount() {
         return specialProfilePictureList_.size();
       }
       /**
-       * <code>repeated uint32 special_profile_picture_list = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 special_profile_picture_list = 13;</code>
        * @param index The index of the element to return.
        * @return The specialProfilePictureList at the given index.
        */
@@ -577,7 +621,11 @@ public int getSpecialProfilePictureList(int index) {
         return specialProfilePictureList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 special_profile_picture_list = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 special_profile_picture_list = 13;</code>
        * @param index The index to set the value at.
        * @param value The specialProfilePictureList to set.
        * @return This builder for chaining.
@@ -590,7 +638,11 @@ public Builder setSpecialProfilePictureList(
         return this;
       }
       /**
-       * <code>repeated uint32 special_profile_picture_list = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 special_profile_picture_list = 13;</code>
        * @param value The specialProfilePictureList to add.
        * @return This builder for chaining.
        */
@@ -601,7 +653,11 @@ public Builder addSpecialProfilePictureList(int value) {
         return this;
       }
       /**
-       * <code>repeated uint32 special_profile_picture_list = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 special_profile_picture_list = 13;</code>
        * @param values The specialProfilePictureList to add.
        * @return This builder for chaining.
        */
@@ -614,7 +670,11 @@ public Builder addAllSpecialProfilePictureList(
         return this;
       }
       /**
-       * <code>repeated uint32 special_profile_picture_list = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 special_profile_picture_list = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearSpecialProfilePictureList() {
@@ -626,7 +686,11 @@ public Builder clearSpecialProfilePictureList() {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 11;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>int32 retcode = 4;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -634,7 +698,11 @@ public int getRetcode() {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 11;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>int32 retcode = 4;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -645,7 +713,11 @@ public Builder setRetcode(int value) {
         return this;
       }
       /**
-       * <code>int32 retcode = 11;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>int32 retcode = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -723,7 +795,7 @@ public emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePi
     java.lang.String[] descriptorData = {
       "\n\036GetProfilePictureDataRsp.proto\"Q\n\030GetP" +
       "rofilePictureDataRsp\022$\n\034special_profile_" +
-      "picture_list\030\003 \003(\r\022\017\n\007retcode\030\013 \001(\005B\033\n\031e" +
+      "picture_list\030\r \003(\r\022\017\n\007retcode\030\004 \001(\005B\033\n\031e" +
       "mu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetSceneAreaReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetSceneAreaReqOuterClass.java
index 00dddf751ee..d98fc74b497 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetSceneAreaReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetSceneAreaReqOuterClass.java
@@ -19,20 +19,28 @@ public interface GetSceneAreaReqOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 scene_id = 5;</code>
-     * @return The sceneId.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 belong_uid = 7;</code>
+     * @return The belongUid.
      */
-    int getSceneId();
+    int getBelongUid();
 
     /**
-     * <code>uint32 belong_uid = 4;</code>
-     * @return The belongUid.
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 scene_id = 2;</code>
+     * @return The sceneId.
      */
-    int getBelongUid();
+    int getSceneId();
   }
   /**
    * <pre>
-   * CmdId: 28474
+   * CmdId: 1854
    * </pre>
    *
    * Protobuf type {@code GetSceneAreaReq}
@@ -79,14 +87,14 @@ private GetSceneAreaReq(
             case 0:
               done = true;
               break;
-            case 32: {
+            case 16: {
 
-              belongUid_ = input.readUInt32();
+              sceneId_ = input.readUInt32();
               break;
             }
-            case 40: {
+            case 56: {
 
-              sceneId_ = input.readUInt32();
+              belongUid_ = input.readUInt32();
               break;
             }
             default: {
@@ -121,26 +129,34 @@ private GetSceneAreaReq(
               emu.grasscutter.net.proto.GetSceneAreaReqOuterClass.GetSceneAreaReq.class, emu.grasscutter.net.proto.GetSceneAreaReqOuterClass.GetSceneAreaReq.Builder.class);
     }
 
-    public static final int SCENE_ID_FIELD_NUMBER = 5;
-    private int sceneId_;
+    public static final int BELONG_UID_FIELD_NUMBER = 7;
+    private int belongUid_;
     /**
-     * <code>uint32 scene_id = 5;</code>
-     * @return The sceneId.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 belong_uid = 7;</code>
+     * @return The belongUid.
      */
     @java.lang.Override
-    public int getSceneId() {
-      return sceneId_;
+    public int getBelongUid() {
+      return belongUid_;
     }
 
-    public static final int BELONG_UID_FIELD_NUMBER = 4;
-    private int belongUid_;
+    public static final int SCENE_ID_FIELD_NUMBER = 2;
+    private int sceneId_;
     /**
-     * <code>uint32 belong_uid = 4;</code>
-     * @return The belongUid.
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 scene_id = 2;</code>
+     * @return The sceneId.
      */
     @java.lang.Override
-    public int getBelongUid() {
-      return belongUid_;
+    public int getSceneId() {
+      return sceneId_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -157,11 +173,11 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (belongUid_ != 0) {
-        output.writeUInt32(4, belongUid_);
-      }
       if (sceneId_ != 0) {
-        output.writeUInt32(5, sceneId_);
+        output.writeUInt32(2, sceneId_);
+      }
+      if (belongUid_ != 0) {
+        output.writeUInt32(7, belongUid_);
       }
       unknownFields.writeTo(output);
     }
@@ -172,13 +188,13 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (belongUid_ != 0) {
+      if (sceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, belongUid_);
+          .computeUInt32Size(2, sceneId_);
       }
-      if (sceneId_ != 0) {
+      if (belongUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, sceneId_);
+          .computeUInt32Size(7, belongUid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -195,10 +211,10 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.GetSceneAreaReqOuterClass.GetSceneAreaReq other = (emu.grasscutter.net.proto.GetSceneAreaReqOuterClass.GetSceneAreaReq) obj;
 
-      if (getSceneId()
-          != other.getSceneId()) return false;
       if (getBelongUid()
           != other.getBelongUid()) return false;
+      if (getSceneId()
+          != other.getSceneId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -210,10 +226,10 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getSceneId();
       hash = (37 * hash) + BELONG_UID_FIELD_NUMBER;
       hash = (53 * hash) + getBelongUid();
+      hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getSceneId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -311,7 +327,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 28474
+     * CmdId: 1854
      * </pre>
      *
      * Protobuf type {@code GetSceneAreaReq}
@@ -351,10 +367,10 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        sceneId_ = 0;
-
         belongUid_ = 0;
 
+        sceneId_ = 0;
+
         return this;
       }
 
@@ -381,8 +397,8 @@ public emu.grasscutter.net.proto.GetSceneAreaReqOuterClass.GetSceneAreaReq build
       @java.lang.Override
       public emu.grasscutter.net.proto.GetSceneAreaReqOuterClass.GetSceneAreaReq buildPartial() {
         emu.grasscutter.net.proto.GetSceneAreaReqOuterClass.GetSceneAreaReq result = new emu.grasscutter.net.proto.GetSceneAreaReqOuterClass.GetSceneAreaReq(this);
-        result.sceneId_ = sceneId_;
         result.belongUid_ = belongUid_;
+        result.sceneId_ = sceneId_;
         onBuilt();
         return result;
       }
@@ -431,12 +447,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.GetSceneAreaReqOuterClass.GetSceneAreaReq other) {
         if (other == emu.grasscutter.net.proto.GetSceneAreaReqOuterClass.GetSceneAreaReq.getDefaultInstance()) return this;
-        if (other.getSceneId() != 0) {
-          setSceneId(other.getSceneId());
-        }
         if (other.getBelongUid() != 0) {
           setBelongUid(other.getBelongUid());
         }
+        if (other.getSceneId() != 0) {
+          setSceneId(other.getSceneId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -466,64 +482,88 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int sceneId_ ;
+      private int belongUid_ ;
       /**
-       * <code>uint32 scene_id = 5;</code>
-       * @return The sceneId.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 belong_uid = 7;</code>
+       * @return The belongUid.
        */
       @java.lang.Override
-      public int getSceneId() {
-        return sceneId_;
+      public int getBelongUid() {
+        return belongUid_;
       }
       /**
-       * <code>uint32 scene_id = 5;</code>
-       * @param value The sceneId to set.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 belong_uid = 7;</code>
+       * @param value The belongUid to set.
        * @return This builder for chaining.
        */
-      public Builder setSceneId(int value) {
+      public Builder setBelongUid(int value) {
         
-        sceneId_ = value;
+        belongUid_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 scene_id = 5;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 belong_uid = 7;</code>
        * @return This builder for chaining.
        */
-      public Builder clearSceneId() {
+      public Builder clearBelongUid() {
         
-        sceneId_ = 0;
+        belongUid_ = 0;
         onChanged();
         return this;
       }
 
-      private int belongUid_ ;
+      private int sceneId_ ;
       /**
-       * <code>uint32 belong_uid = 4;</code>
-       * @return The belongUid.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 scene_id = 2;</code>
+       * @return The sceneId.
        */
       @java.lang.Override
-      public int getBelongUid() {
-        return belongUid_;
+      public int getSceneId() {
+        return sceneId_;
       }
       /**
-       * <code>uint32 belong_uid = 4;</code>
-       * @param value The belongUid to set.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 scene_id = 2;</code>
+       * @param value The sceneId to set.
        * @return This builder for chaining.
        */
-      public Builder setBelongUid(int value) {
+      public Builder setSceneId(int value) {
         
-        belongUid_ = value;
+        sceneId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 belong_uid = 4;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 scene_id = 2;</code>
        * @return This builder for chaining.
        */
-      public Builder clearBelongUid() {
+      public Builder clearSceneId() {
         
-        belongUid_ = 0;
+        sceneId_ = 0;
         onChanged();
         return this;
       }
@@ -595,7 +635,7 @@ public emu.grasscutter.net.proto.GetSceneAreaReqOuterClass.GetSceneAreaReq getDe
   static {
     java.lang.String[] descriptorData = {
       "\n\025GetSceneAreaReq.proto\"7\n\017GetSceneAreaR" +
-      "eq\022\020\n\010scene_id\030\005 \001(\r\022\022\n\nbelong_uid\030\004 \001(\r" +
+      "eq\022\022\n\nbelong_uid\030\007 \001(\r\022\020\n\010scene_id\030\002 \001(\r" +
       "B\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -607,7 +647,7 @@ public emu.grasscutter.net.proto.GetSceneAreaReqOuterClass.GetSceneAreaReq getDe
     internal_static_GetSceneAreaReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetSceneAreaReq_descriptor,
-        new java.lang.String[] { "SceneId", "BelongUid", });
+        new java.lang.String[] { "BelongUid", "SceneId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetSceneAreaRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetSceneAreaRspOuterClass.java
index cb57ca4b546..8b5affe63e0 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetSceneAreaRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetSceneAreaRspOuterClass.java
@@ -19,61 +19,101 @@ public interface GetSceneAreaRspOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 scene_id = 8;</code>
-     * @return The sceneId.
-     */
-    int getSceneId();
-
-    /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
      * <code>repeated .CityInfo city_info_list = 11;</code>
      */
     java.util.List<emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo> 
         getCityInfoListList();
     /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
      * <code>repeated .CityInfo city_info_list = 11;</code>
      */
     emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo getCityInfoList(int index);
     /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
      * <code>repeated .CityInfo city_info_list = 11;</code>
      */
     int getCityInfoListCount();
     /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
      * <code>repeated .CityInfo city_info_list = 11;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.CityInfoOuterClass.CityInfoOrBuilder> 
         getCityInfoListOrBuilderList();
     /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
      * <code>repeated .CityInfo city_info_list = 11;</code>
      */
     emu.grasscutter.net.proto.CityInfoOuterClass.CityInfoOrBuilder getCityInfoListOrBuilder(
         int index);
 
     /**
-     * <code>repeated uint32 area_id_list = 12;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated uint32 area_id_list = 5;</code>
      * @return A list containing the areaIdList.
      */
     java.util.List<java.lang.Integer> getAreaIdListList();
     /**
-     * <code>repeated uint32 area_id_list = 12;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated uint32 area_id_list = 5;</code>
      * @return The count of areaIdList.
      */
     int getAreaIdListCount();
     /**
-     * <code>repeated uint32 area_id_list = 12;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated uint32 area_id_list = 5;</code>
      * @param index The index of the element to return.
      * @return The areaIdList at the given index.
      */
     int getAreaIdList(int index);
 
     /**
-     * <code>int32 retcode = 7;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>uint32 scene_id = 12;</code>
+     * @return The sceneId.
+     */
+    int getSceneId();
+
+    /**
+     * <pre>
+     * Offset: 0x34
+     * </pre>
+     *
+     * <code>int32 retcode = 6;</code>
      * @return The retcode.
      */
     int getRetcode();
   }
   /**
    * <pre>
-   * CmdId: 23079
+   * CmdId: 28096
    * </pre>
    *
    * Protobuf type {@code GetSceneAreaRsp}
@@ -123,26 +163,7 @@ private GetSceneAreaRsp(
             case 0:
               done = true;
               break;
-            case 56: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 64: {
-
-              sceneId_ = input.readUInt32();
-              break;
-            }
-            case 90: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                cityInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo>();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              cityInfoList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.parser(), extensionRegistry));
-              break;
-            }
-            case 96: {
+            case 40: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 areaIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
@@ -150,7 +171,7 @@ private GetSceneAreaRsp(
               areaIdList_.addInt(input.readUInt32());
               break;
             }
-            case 98: {
+            case 42: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
@@ -163,6 +184,25 @@ private GetSceneAreaRsp(
               input.popLimit(limit);
               break;
             }
+            case 48: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 90: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                cityInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo>();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              cityInfoList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.parser(), extensionRegistry));
+              break;
+            }
+            case 96: {
+
+              sceneId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -178,12 +218,12 @@ private GetSceneAreaRsp(
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          cityInfoList_ = java.util.Collections.unmodifiableList(cityInfoList_);
-        }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
           areaIdList_.makeImmutable(); // C
         }
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          cityInfoList_ = java.util.Collections.unmodifiableList(cityInfoList_);
+        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -201,20 +241,13 @@ private GetSceneAreaRsp(
               emu.grasscutter.net.proto.GetSceneAreaRspOuterClass.GetSceneAreaRsp.class, emu.grasscutter.net.proto.GetSceneAreaRspOuterClass.GetSceneAreaRsp.Builder.class);
     }
 
-    public static final int SCENE_ID_FIELD_NUMBER = 8;
-    private int sceneId_;
-    /**
-     * <code>uint32 scene_id = 8;</code>
-     * @return The sceneId.
-     */
-    @java.lang.Override
-    public int getSceneId() {
-      return sceneId_;
-    }
-
     public static final int CITY_INFO_LIST_FIELD_NUMBER = 11;
     private java.util.List<emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo> cityInfoList_;
     /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
      * <code>repeated .CityInfo city_info_list = 11;</code>
      */
     @java.lang.Override
@@ -222,6 +255,10 @@ public java.util.List<emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo> get
       return cityInfoList_;
     }
     /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
      * <code>repeated .CityInfo city_info_list = 11;</code>
      */
     @java.lang.Override
@@ -230,6 +267,10 @@ public java.util.List<emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo> get
       return cityInfoList_;
     }
     /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
      * <code>repeated .CityInfo city_info_list = 11;</code>
      */
     @java.lang.Override
@@ -237,6 +278,10 @@ public int getCityInfoListCount() {
       return cityInfoList_.size();
     }
     /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
      * <code>repeated .CityInfo city_info_list = 11;</code>
      */
     @java.lang.Override
@@ -244,6 +289,10 @@ public emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo getCityInfoList(int
       return cityInfoList_.get(index);
     }
     /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
      * <code>repeated .CityInfo city_info_list = 11;</code>
      */
     @java.lang.Override
@@ -252,10 +301,14 @@ public emu.grasscutter.net.proto.CityInfoOuterClass.CityInfoOrBuilder getCityInf
       return cityInfoList_.get(index);
     }
 
-    public static final int AREA_ID_LIST_FIELD_NUMBER = 12;
+    public static final int AREA_ID_LIST_FIELD_NUMBER = 5;
     private com.google.protobuf.Internal.IntList areaIdList_;
     /**
-     * <code>repeated uint32 area_id_list = 12;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated uint32 area_id_list = 5;</code>
      * @return A list containing the areaIdList.
      */
     @java.lang.Override
@@ -264,14 +317,22 @@ public emu.grasscutter.net.proto.CityInfoOuterClass.CityInfoOrBuilder getCityInf
       return areaIdList_;
     }
     /**
-     * <code>repeated uint32 area_id_list = 12;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated uint32 area_id_list = 5;</code>
      * @return The count of areaIdList.
      */
     public int getAreaIdListCount() {
       return areaIdList_.size();
     }
     /**
-     * <code>repeated uint32 area_id_list = 12;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated uint32 area_id_list = 5;</code>
      * @param index The index of the element to return.
      * @return The areaIdList at the given index.
      */
@@ -280,10 +341,29 @@ public int getAreaIdList(int index) {
     }
     private int areaIdListMemoizedSerializedSize = -1;
 
-    public static final int RETCODE_FIELD_NUMBER = 7;
+    public static final int SCENE_ID_FIELD_NUMBER = 12;
+    private int sceneId_;
+    /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>uint32 scene_id = 12;</code>
+     * @return The sceneId.
+     */
+    @java.lang.Override
+    public int getSceneId() {
+      return sceneId_;
+    }
+
+    public static final int RETCODE_FIELD_NUMBER = 6;
     private int retcode_;
     /**
-     * <code>int32 retcode = 7;</code>
+     * <pre>
+     * Offset: 0x34
+     * </pre>
+     *
+     * <code>int32 retcode = 6;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -306,22 +386,22 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (retcode_ != 0) {
-        output.writeInt32(7, retcode_);
-      }
-      if (sceneId_ != 0) {
-        output.writeUInt32(8, sceneId_);
-      }
-      for (int i = 0; i < cityInfoList_.size(); i++) {
-        output.writeMessage(11, cityInfoList_.get(i));
-      }
       if (getAreaIdListList().size() > 0) {
-        output.writeUInt32NoTag(98);
+        output.writeUInt32NoTag(42);
         output.writeUInt32NoTag(areaIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < areaIdList_.size(); i++) {
         output.writeUInt32NoTag(areaIdList_.getInt(i));
       }
+      if (retcode_ != 0) {
+        output.writeInt32(6, retcode_);
+      }
+      for (int i = 0; i < cityInfoList_.size(); i++) {
+        output.writeMessage(11, cityInfoList_.get(i));
+      }
+      if (sceneId_ != 0) {
+        output.writeUInt32(12, sceneId_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -331,18 +411,6 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(7, retcode_);
-      }
-      if (sceneId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, sceneId_);
-      }
-      for (int i = 0; i < cityInfoList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(11, cityInfoList_.get(i));
-      }
       {
         int dataSize = 0;
         for (int i = 0; i < areaIdList_.size(); i++) {
@@ -357,6 +425,18 @@ public int getSerializedSize() {
         }
         areaIdListMemoizedSerializedSize = dataSize;
       }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(6, retcode_);
+      }
+      for (int i = 0; i < cityInfoList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(11, cityInfoList_.get(i));
+      }
+      if (sceneId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(12, sceneId_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -372,12 +452,12 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.GetSceneAreaRspOuterClass.GetSceneAreaRsp other = (emu.grasscutter.net.proto.GetSceneAreaRspOuterClass.GetSceneAreaRsp) obj;
 
-      if (getSceneId()
-          != other.getSceneId()) return false;
       if (!getCityInfoListList()
           .equals(other.getCityInfoListList())) return false;
       if (!getAreaIdListList()
           .equals(other.getAreaIdListList())) return false;
+      if (getSceneId()
+          != other.getSceneId()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -391,8 +471,6 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getSceneId();
       if (getCityInfoListCount() > 0) {
         hash = (37 * hash) + CITY_INFO_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getCityInfoListList().hashCode();
@@ -401,6 +479,8 @@ public int hashCode() {
         hash = (37 * hash) + AREA_ID_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getAreaIdListList().hashCode();
       }
+      hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getSceneId();
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -500,7 +580,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 23079
+     * CmdId: 28096
      * </pre>
      *
      * Protobuf type {@code GetSceneAreaRsp}
@@ -541,8 +621,6 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        sceneId_ = 0;
-
         if (cityInfoListBuilder_ == null) {
           cityInfoList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
@@ -551,6 +629,8 @@ public Builder clear() {
         }
         areaIdList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
+        sceneId_ = 0;
+
         retcode_ = 0;
 
         return this;
@@ -580,7 +660,6 @@ public emu.grasscutter.net.proto.GetSceneAreaRspOuterClass.GetSceneAreaRsp build
       public emu.grasscutter.net.proto.GetSceneAreaRspOuterClass.GetSceneAreaRsp buildPartial() {
         emu.grasscutter.net.proto.GetSceneAreaRspOuterClass.GetSceneAreaRsp result = new emu.grasscutter.net.proto.GetSceneAreaRspOuterClass.GetSceneAreaRsp(this);
         int from_bitField0_ = bitField0_;
-        result.sceneId_ = sceneId_;
         if (cityInfoListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             cityInfoList_ = java.util.Collections.unmodifiableList(cityInfoList_);
@@ -595,6 +674,7 @@ public emu.grasscutter.net.proto.GetSceneAreaRspOuterClass.GetSceneAreaRsp build
           bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.areaIdList_ = areaIdList_;
+        result.sceneId_ = sceneId_;
         result.retcode_ = retcode_;
         onBuilt();
         return result;
@@ -644,9 +724,6 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.GetSceneAreaRspOuterClass.GetSceneAreaRsp other) {
         if (other == emu.grasscutter.net.proto.GetSceneAreaRspOuterClass.GetSceneAreaRsp.getDefaultInstance()) return this;
-        if (other.getSceneId() != 0) {
-          setSceneId(other.getSceneId());
-        }
         if (cityInfoListBuilder_ == null) {
           if (!other.cityInfoList_.isEmpty()) {
             if (cityInfoList_.isEmpty()) {
@@ -683,6 +760,9 @@ public Builder mergeFrom(emu.grasscutter.net.proto.GetSceneAreaRspOuterClass.Get
           }
           onChanged();
         }
+        if (other.getSceneId() != 0) {
+          setSceneId(other.getSceneId());
+        }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
@@ -716,37 +796,6 @@ public Builder mergeFrom(
       }
       private int bitField0_;
 
-      private int sceneId_ ;
-      /**
-       * <code>uint32 scene_id = 8;</code>
-       * @return The sceneId.
-       */
-      @java.lang.Override
-      public int getSceneId() {
-        return sceneId_;
-      }
-      /**
-       * <code>uint32 scene_id = 8;</code>
-       * @param value The sceneId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSceneId(int value) {
-        
-        sceneId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 scene_id = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSceneId() {
-        
-        sceneId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private java.util.List<emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo> cityInfoList_ =
         java.util.Collections.emptyList();
       private void ensureCityInfoListIsMutable() {
@@ -760,6 +809,10 @@ private void ensureCityInfoListIsMutable() {
           emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo, emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.Builder, emu.grasscutter.net.proto.CityInfoOuterClass.CityInfoOrBuilder> cityInfoListBuilder_;
 
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>repeated .CityInfo city_info_list = 11;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo> getCityInfoListList() {
@@ -770,6 +823,10 @@ public java.util.List<emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo> get
         }
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>repeated .CityInfo city_info_list = 11;</code>
        */
       public int getCityInfoListCount() {
@@ -780,6 +837,10 @@ public int getCityInfoListCount() {
         }
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>repeated .CityInfo city_info_list = 11;</code>
        */
       public emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo getCityInfoList(int index) {
@@ -790,6 +851,10 @@ public emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo getCityInfoList(int
         }
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>repeated .CityInfo city_info_list = 11;</code>
        */
       public Builder setCityInfoList(
@@ -807,6 +872,10 @@ public Builder setCityInfoList(
         return this;
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>repeated .CityInfo city_info_list = 11;</code>
        */
       public Builder setCityInfoList(
@@ -821,6 +890,10 @@ public Builder setCityInfoList(
         return this;
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>repeated .CityInfo city_info_list = 11;</code>
        */
       public Builder addCityInfoList(emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo value) {
@@ -837,6 +910,10 @@ public Builder addCityInfoList(emu.grasscutter.net.proto.CityInfoOuterClass.City
         return this;
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>repeated .CityInfo city_info_list = 11;</code>
        */
       public Builder addCityInfoList(
@@ -854,6 +931,10 @@ public Builder addCityInfoList(
         return this;
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>repeated .CityInfo city_info_list = 11;</code>
        */
       public Builder addCityInfoList(
@@ -868,6 +949,10 @@ public Builder addCityInfoList(
         return this;
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>repeated .CityInfo city_info_list = 11;</code>
        */
       public Builder addCityInfoList(
@@ -882,6 +967,10 @@ public Builder addCityInfoList(
         return this;
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>repeated .CityInfo city_info_list = 11;</code>
        */
       public Builder addAllCityInfoList(
@@ -897,6 +986,10 @@ public Builder addAllCityInfoList(
         return this;
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>repeated .CityInfo city_info_list = 11;</code>
        */
       public Builder clearCityInfoList() {
@@ -910,6 +1003,10 @@ public Builder clearCityInfoList() {
         return this;
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>repeated .CityInfo city_info_list = 11;</code>
        */
       public Builder removeCityInfoList(int index) {
@@ -923,6 +1020,10 @@ public Builder removeCityInfoList(int index) {
         return this;
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>repeated .CityInfo city_info_list = 11;</code>
        */
       public emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.Builder getCityInfoListBuilder(
@@ -930,6 +1031,10 @@ public emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.Builder getCityInfo
         return getCityInfoListFieldBuilder().getBuilder(index);
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>repeated .CityInfo city_info_list = 11;</code>
        */
       public emu.grasscutter.net.proto.CityInfoOuterClass.CityInfoOrBuilder getCityInfoListOrBuilder(
@@ -940,6 +1045,10 @@ public emu.grasscutter.net.proto.CityInfoOuterClass.CityInfoOrBuilder getCityInf
         }
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>repeated .CityInfo city_info_list = 11;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.CityInfoOuterClass.CityInfoOrBuilder> 
@@ -951,6 +1060,10 @@ public emu.grasscutter.net.proto.CityInfoOuterClass.CityInfoOrBuilder getCityInf
         }
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>repeated .CityInfo city_info_list = 11;</code>
        */
       public emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.Builder addCityInfoListBuilder() {
@@ -958,6 +1071,10 @@ public emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.Builder addCityInfo
             emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.getDefaultInstance());
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>repeated .CityInfo city_info_list = 11;</code>
        */
       public emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.Builder addCityInfoListBuilder(
@@ -966,6 +1083,10 @@ public emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.Builder addCityInfo
             index, emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.getDefaultInstance());
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>repeated .CityInfo city_info_list = 11;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.Builder> 
@@ -995,7 +1116,11 @@ private void ensureAreaIdListIsMutable() {
          }
       }
       /**
-       * <code>repeated uint32 area_id_list = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated uint32 area_id_list = 5;</code>
        * @return A list containing the areaIdList.
        */
       public java.util.List<java.lang.Integer>
@@ -1004,14 +1129,22 @@ private void ensureAreaIdListIsMutable() {
                  java.util.Collections.unmodifiableList(areaIdList_) : areaIdList_;
       }
       /**
-       * <code>repeated uint32 area_id_list = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated uint32 area_id_list = 5;</code>
        * @return The count of areaIdList.
        */
       public int getAreaIdListCount() {
         return areaIdList_.size();
       }
       /**
-       * <code>repeated uint32 area_id_list = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated uint32 area_id_list = 5;</code>
        * @param index The index of the element to return.
        * @return The areaIdList at the given index.
        */
@@ -1019,7 +1152,11 @@ public int getAreaIdList(int index) {
         return areaIdList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 area_id_list = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated uint32 area_id_list = 5;</code>
        * @param index The index to set the value at.
        * @param value The areaIdList to set.
        * @return This builder for chaining.
@@ -1032,7 +1169,11 @@ public Builder setAreaIdList(
         return this;
       }
       /**
-       * <code>repeated uint32 area_id_list = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated uint32 area_id_list = 5;</code>
        * @param value The areaIdList to add.
        * @return This builder for chaining.
        */
@@ -1043,7 +1184,11 @@ public Builder addAreaIdList(int value) {
         return this;
       }
       /**
-       * <code>repeated uint32 area_id_list = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated uint32 area_id_list = 5;</code>
        * @param values The areaIdList to add.
        * @return This builder for chaining.
        */
@@ -1056,7 +1201,11 @@ public Builder addAllAreaIdList(
         return this;
       }
       /**
-       * <code>repeated uint32 area_id_list = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated uint32 area_id_list = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearAreaIdList() {
@@ -1066,9 +1215,56 @@ public Builder clearAreaIdList() {
         return this;
       }
 
+      private int sceneId_ ;
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint32 scene_id = 12;</code>
+       * @return The sceneId.
+       */
+      @java.lang.Override
+      public int getSceneId() {
+        return sceneId_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint32 scene_id = 12;</code>
+       * @param value The sceneId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSceneId(int value) {
+        
+        sceneId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint32 scene_id = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearSceneId() {
+        
+        sceneId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 7;</code>
+       * <pre>
+       * Offset: 0x34
+       * </pre>
+       *
+       * <code>int32 retcode = 6;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -1076,7 +1272,11 @@ public int getRetcode() {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 7;</code>
+       * <pre>
+       * Offset: 0x34
+       * </pre>
+       *
+       * <code>int32 retcode = 6;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -1087,7 +1287,11 @@ public Builder setRetcode(int value) {
         return this;
       }
       /**
-       * <code>int32 retcode = 7;</code>
+       * <pre>
+       * Offset: 0x34
+       * </pre>
+       *
+       * <code>int32 retcode = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -1164,9 +1368,9 @@ public emu.grasscutter.net.proto.GetSceneAreaRspOuterClass.GetSceneAreaRsp getDe
   static {
     java.lang.String[] descriptorData = {
       "\n\025GetSceneAreaRsp.proto\032\016CityInfo.proto\"" +
-      "m\n\017GetSceneAreaRsp\022\020\n\010scene_id\030\010 \001(\r\022!\n\016" +
-      "city_info_list\030\013 \003(\0132\t.CityInfo\022\024\n\014area_" +
-      "id_list\030\014 \003(\r\022\017\n\007retcode\030\007 \001(\005B\033\n\031emu.gr" +
+      "m\n\017GetSceneAreaRsp\022!\n\016city_info_list\030\013 \003" +
+      "(\0132\t.CityInfo\022\024\n\014area_id_list\030\005 \003(\r\022\020\n\010s" +
+      "cene_id\030\014 \001(\r\022\017\n\007retcode\030\006 \001(\005B\033\n\031emu.gr" +
       "asscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1179,7 +1383,7 @@ public emu.grasscutter.net.proto.GetSceneAreaRspOuterClass.GetSceneAreaRsp getDe
     internal_static_GetSceneAreaRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetSceneAreaRsp_descriptor,
-        new java.lang.String[] { "SceneId", "CityInfoList", "AreaIdList", "Retcode", });
+        new java.lang.String[] { "CityInfoList", "AreaIdList", "SceneId", "Retcode", });
     emu.grasscutter.net.proto.CityInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetScenePointReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetScenePointReqOuterClass.java
index 9fc841cfc82..18702e76dac 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetScenePointReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetScenePointReqOuterClass.java
@@ -19,26 +19,38 @@ public interface GetScenePointReqOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>bool is_new_player = 12;</code>
-     * @return The isNewPlayer.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 belong_uid = 6;</code>
+     * @return The belongUid.
      */
-    boolean getIsNewPlayer();
+    int getBelongUid();
 
     /**
-     * <code>uint32 belong_uid = 10;</code>
-     * @return The belongUid.
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>bool is_relogin = 2;</code>
+     * @return The isRelogin.
      */
-    int getBelongUid();
+    boolean getIsRelogin();
 
     /**
-     * <code>uint32 scene_id = 14;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 scene_id = 11;</code>
      * @return The sceneId.
      */
     int getSceneId();
   }
   /**
    * <pre>
-   * CmdId: 22769
+   * CmdId: 23975
    * </pre>
    *
    * Protobuf type {@code GetScenePointReq}
@@ -85,17 +97,17 @@ private GetScenePointReq(
             case 0:
               done = true;
               break;
-            case 80: {
+            case 16: {
 
-              belongUid_ = input.readUInt32();
+              isRelogin_ = input.readBool();
               break;
             }
-            case 96: {
+            case 48: {
 
-              isNewPlayer_ = input.readBool();
+              belongUid_ = input.readUInt32();
               break;
             }
-            case 112: {
+            case 88: {
 
               sceneId_ = input.readUInt32();
               break;
@@ -132,32 +144,44 @@ private GetScenePointReq(
               emu.grasscutter.net.proto.GetScenePointReqOuterClass.GetScenePointReq.class, emu.grasscutter.net.proto.GetScenePointReqOuterClass.GetScenePointReq.Builder.class);
     }
 
-    public static final int IS_NEW_PLAYER_FIELD_NUMBER = 12;
-    private boolean isNewPlayer_;
+    public static final int BELONG_UID_FIELD_NUMBER = 6;
+    private int belongUid_;
     /**
-     * <code>bool is_new_player = 12;</code>
-     * @return The isNewPlayer.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 belong_uid = 6;</code>
+     * @return The belongUid.
      */
     @java.lang.Override
-    public boolean getIsNewPlayer() {
-      return isNewPlayer_;
+    public int getBelongUid() {
+      return belongUid_;
     }
 
-    public static final int BELONG_UID_FIELD_NUMBER = 10;
-    private int belongUid_;
+    public static final int IS_RELOGIN_FIELD_NUMBER = 2;
+    private boolean isRelogin_;
     /**
-     * <code>uint32 belong_uid = 10;</code>
-     * @return The belongUid.
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>bool is_relogin = 2;</code>
+     * @return The isRelogin.
      */
     @java.lang.Override
-    public int getBelongUid() {
-      return belongUid_;
+    public boolean getIsRelogin() {
+      return isRelogin_;
     }
 
-    public static final int SCENE_ID_FIELD_NUMBER = 14;
+    public static final int SCENE_ID_FIELD_NUMBER = 11;
     private int sceneId_;
     /**
-     * <code>uint32 scene_id = 14;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 scene_id = 11;</code>
      * @return The sceneId.
      */
     @java.lang.Override
@@ -179,14 +203,14 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (belongUid_ != 0) {
-        output.writeUInt32(10, belongUid_);
+      if (isRelogin_ != false) {
+        output.writeBool(2, isRelogin_);
       }
-      if (isNewPlayer_ != false) {
-        output.writeBool(12, isNewPlayer_);
+      if (belongUid_ != 0) {
+        output.writeUInt32(6, belongUid_);
       }
       if (sceneId_ != 0) {
-        output.writeUInt32(14, sceneId_);
+        output.writeUInt32(11, sceneId_);
       }
       unknownFields.writeTo(output);
     }
@@ -197,17 +221,17 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (belongUid_ != 0) {
+      if (isRelogin_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, belongUid_);
+          .computeBoolSize(2, isRelogin_);
       }
-      if (isNewPlayer_ != false) {
+      if (belongUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(12, isNewPlayer_);
+          .computeUInt32Size(6, belongUid_);
       }
       if (sceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, sceneId_);
+          .computeUInt32Size(11, sceneId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -224,10 +248,10 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.GetScenePointReqOuterClass.GetScenePointReq other = (emu.grasscutter.net.proto.GetScenePointReqOuterClass.GetScenePointReq) obj;
 
-      if (getIsNewPlayer()
-          != other.getIsNewPlayer()) return false;
       if (getBelongUid()
           != other.getBelongUid()) return false;
+      if (getIsRelogin()
+          != other.getIsRelogin()) return false;
       if (getSceneId()
           != other.getSceneId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -241,11 +265,11 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + IS_NEW_PLAYER_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsNewPlayer());
       hash = (37 * hash) + BELONG_UID_FIELD_NUMBER;
       hash = (53 * hash) + getBelongUid();
+      hash = (37 * hash) + IS_RELOGIN_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsRelogin());
       hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getSceneId();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -345,7 +369,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 22769
+     * CmdId: 23975
      * </pre>
      *
      * Protobuf type {@code GetScenePointReq}
@@ -385,10 +409,10 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        isNewPlayer_ = false;
-
         belongUid_ = 0;
 
+        isRelogin_ = false;
+
         sceneId_ = 0;
 
         return this;
@@ -417,8 +441,8 @@ public emu.grasscutter.net.proto.GetScenePointReqOuterClass.GetScenePointReq bui
       @java.lang.Override
       public emu.grasscutter.net.proto.GetScenePointReqOuterClass.GetScenePointReq buildPartial() {
         emu.grasscutter.net.proto.GetScenePointReqOuterClass.GetScenePointReq result = new emu.grasscutter.net.proto.GetScenePointReqOuterClass.GetScenePointReq(this);
-        result.isNewPlayer_ = isNewPlayer_;
         result.belongUid_ = belongUid_;
+        result.isRelogin_ = isRelogin_;
         result.sceneId_ = sceneId_;
         onBuilt();
         return result;
@@ -468,12 +492,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.GetScenePointReqOuterClass.GetScenePointReq other) {
         if (other == emu.grasscutter.net.proto.GetScenePointReqOuterClass.GetScenePointReq.getDefaultInstance()) return this;
-        if (other.getIsNewPlayer() != false) {
-          setIsNewPlayer(other.getIsNewPlayer());
-        }
         if (other.getBelongUid() != 0) {
           setBelongUid(other.getBelongUid());
         }
+        if (other.getIsRelogin() != false) {
+          setIsRelogin(other.getIsRelogin());
+        }
         if (other.getSceneId() != 0) {
           setSceneId(other.getSceneId());
         }
@@ -506,71 +530,99 @@ public Builder mergeFrom(
         return this;
       }
 
-      private boolean isNewPlayer_ ;
+      private int belongUid_ ;
       /**
-       * <code>bool is_new_player = 12;</code>
-       * @return The isNewPlayer.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 belong_uid = 6;</code>
+       * @return The belongUid.
        */
       @java.lang.Override
-      public boolean getIsNewPlayer() {
-        return isNewPlayer_;
+      public int getBelongUid() {
+        return belongUid_;
       }
       /**
-       * <code>bool is_new_player = 12;</code>
-       * @param value The isNewPlayer to set.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 belong_uid = 6;</code>
+       * @param value The belongUid to set.
        * @return This builder for chaining.
        */
-      public Builder setIsNewPlayer(boolean value) {
+      public Builder setBelongUid(int value) {
         
-        isNewPlayer_ = value;
+        belongUid_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bool is_new_player = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 belong_uid = 6;</code>
        * @return This builder for chaining.
        */
-      public Builder clearIsNewPlayer() {
+      public Builder clearBelongUid() {
         
-        isNewPlayer_ = false;
+        belongUid_ = 0;
         onChanged();
         return this;
       }
 
-      private int belongUid_ ;
+      private boolean isRelogin_ ;
       /**
-       * <code>uint32 belong_uid = 10;</code>
-       * @return The belongUid.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>bool is_relogin = 2;</code>
+       * @return The isRelogin.
        */
       @java.lang.Override
-      public int getBelongUid() {
-        return belongUid_;
+      public boolean getIsRelogin() {
+        return isRelogin_;
       }
       /**
-       * <code>uint32 belong_uid = 10;</code>
-       * @param value The belongUid to set.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>bool is_relogin = 2;</code>
+       * @param value The isRelogin to set.
        * @return This builder for chaining.
        */
-      public Builder setBelongUid(int value) {
+      public Builder setIsRelogin(boolean value) {
         
-        belongUid_ = value;
+        isRelogin_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 belong_uid = 10;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>bool is_relogin = 2;</code>
        * @return This builder for chaining.
        */
-      public Builder clearBelongUid() {
+      public Builder clearIsRelogin() {
         
-        belongUid_ = 0;
+        isRelogin_ = false;
         onChanged();
         return this;
       }
 
       private int sceneId_ ;
       /**
-       * <code>uint32 scene_id = 14;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 scene_id = 11;</code>
        * @return The sceneId.
        */
       @java.lang.Override
@@ -578,7 +630,11 @@ public int getSceneId() {
         return sceneId_;
       }
       /**
-       * <code>uint32 scene_id = 14;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 scene_id = 11;</code>
        * @param value The sceneId to set.
        * @return This builder for chaining.
        */
@@ -589,7 +645,11 @@ public Builder setSceneId(int value) {
         return this;
       }
       /**
-       * <code>uint32 scene_id = 14;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 scene_id = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearSceneId() {
@@ -665,10 +725,10 @@ public emu.grasscutter.net.proto.GetScenePointReqOuterClass.GetScenePointReq get
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\026GetScenePointReq.proto\"O\n\020GetScenePoin" +
-      "tReq\022\025\n\ris_new_player\030\014 \001(\010\022\022\n\nbelong_ui" +
-      "d\030\n \001(\r\022\020\n\010scene_id\030\016 \001(\rB\033\n\031emu.grasscu" +
-      "tter.net.protob\006proto3"
+      "\n\026GetScenePointReq.proto\"L\n\020GetScenePoin" +
+      "tReq\022\022\n\nbelong_uid\030\006 \001(\r\022\022\n\nis_relogin\030\002" +
+      " \001(\010\022\020\n\010scene_id\030\013 \001(\rB\033\n\031emu.grasscutte" +
+      "r.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -679,7 +739,7 @@ public emu.grasscutter.net.proto.GetScenePointReqOuterClass.GetScenePointReq get
     internal_static_GetScenePointReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetScenePointReq_descriptor,
-        new java.lang.String[] { "IsNewPlayer", "BelongUid", "SceneId", });
+        new java.lang.String[] { "BelongUid", "IsRelogin", "SceneId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetScenePointRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetScenePointRspOuterClass.java
index 2006cb82d46..58aa2dd17e6 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetScenePointRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetScenePointRspOuterClass.java
@@ -19,185 +19,309 @@ public interface GetScenePointRspOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 unlocked_point_list = 1;</code>
-     * @return A list containing the unlockedPointList.
-     */
-    java.util.List<java.lang.Integer> getUnlockedPointListList();
-    /**
-     * <code>repeated uint32 unlocked_point_list = 1;</code>
-     * @return The count of unlockedPointList.
-     */
-    int getUnlockedPointListCount();
-    /**
-     * <code>repeated uint32 unlocked_point_list = 1;</code>
-     * @param index The index of the element to return.
-     * @return The unlockedPointList at the given index.
-     */
-    int getUnlockedPointList(int index);
-
-    /**
-     * <code>repeated uint32 unlock_area_list = 5;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 unlock_area_list = 13;</code>
      * @return A list containing the unlockAreaList.
      */
     java.util.List<java.lang.Integer> getUnlockAreaListList();
     /**
-     * <code>repeated uint32 unlock_area_list = 5;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 unlock_area_list = 13;</code>
      * @return The count of unlockAreaList.
      */
     int getUnlockAreaListCount();
     /**
-     * <code>repeated uint32 unlock_area_list = 5;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 unlock_area_list = 13;</code>
      * @param index The index of the element to return.
      * @return The unlockAreaList at the given index.
      */
     int getUnlockAreaList(int index);
 
     /**
-     * <code>repeated uint32 locked_point_list = 10;</code>
-     * @return A list containing the lockedPointList.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated uint32 unlocked_point_list = 9;</code>
+     * @return A list containing the unlockedPointList.
      */
-    java.util.List<java.lang.Integer> getLockedPointListList();
+    java.util.List<java.lang.Integer> getUnlockedPointListList();
     /**
-     * <code>repeated uint32 locked_point_list = 10;</code>
-     * @return The count of lockedPointList.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated uint32 unlocked_point_list = 9;</code>
+     * @return The count of unlockedPointList.
      */
-    int getLockedPointListCount();
+    int getUnlockedPointListCount();
     /**
-     * <code>repeated uint32 locked_point_list = 10;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated uint32 unlocked_point_list = 9;</code>
      * @param index The index of the element to return.
-     * @return The lockedPointList at the given index.
+     * @return The unlockedPointList at the given index.
      */
-    int getLockedPointList(int index);
+    int getUnlockedPointList(int index);
 
     /**
-     * <code>repeated uint32 point_list = 14;</code>
-     * @return A list containing the pointList.
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated uint32 hide_point_list = 14;</code>
+     * @return A list containing the hidePointList.
      */
-    java.util.List<java.lang.Integer> getPointListList();
+    java.util.List<java.lang.Integer> getHidePointListList();
     /**
-     * <code>repeated uint32 point_list = 14;</code>
-     * @return The count of pointList.
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated uint32 hide_point_list = 14;</code>
+     * @return The count of hidePointList.
      */
-    int getPointListCount();
+    int getHidePointListCount();
     /**
-     * <code>repeated uint32 point_list = 14;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated uint32 hide_point_list = 14;</code>
      * @param index The index of the element to return.
-     * @return The pointList at the given index.
+     * @return The hidePointList at the given index.
      */
-    int getPointList(int index);
+    int getHidePointList(int index);
 
     /**
-     * <code>uint32 scene_id = 13;</code>
-     * @return The sceneId.
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>repeated uint32 unhide_point_list = 6;</code>
+     * @return A list containing the unhidePointList.
      */
-    int getSceneId();
-
+    java.util.List<java.lang.Integer> getUnhidePointListList();
     /**
-     * <code>uint32 belong_uid = 6;</code>
-     * @return The belongUid.
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>repeated uint32 unhide_point_list = 6;</code>
+     * @return The count of unhidePointList.
      */
-    int getBelongUid();
-
+    int getUnhidePointListCount();
     /**
-     * <code>int32 retcode = 8;</code>
-     * @return The retcode.
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>repeated uint32 unhide_point_list = 6;</code>
+     * @param index The index of the element to return.
+     * @return The unhidePointList at the given index.
      */
-    int getRetcode();
+    int getUnhidePointList(int index);
 
     /**
-     * <code>bool is_new_player = 15;</code>
-     * @return The isNewPlayer.
+     * <pre>
+     * Offset: 0x40
+     * </pre>
+     *
+     * <code>repeated uint32 locked_point_list = 5;</code>
+     * @return A list containing the lockedPointList.
+     */
+    java.util.List<java.lang.Integer> getLockedPointListList();
+    /**
+     * <pre>
+     * Offset: 0x40
+     * </pre>
+     *
+     * <code>repeated uint32 locked_point_list = 5;</code>
+     * @return The count of lockedPointList.
+     */
+    int getLockedPointListCount();
+    /**
+     * <pre>
+     * Offset: 0x40
+     * </pre>
+     *
+     * <code>repeated uint32 locked_point_list = 5;</code>
+     * @param index The index of the element to return.
+     * @return The lockedPointList at the given index.
      */
-    boolean getIsNewPlayer();
+    int getLockedPointList(int index);
 
     /**
-     * <code>repeated uint32 FELMBEACBLB = 2;</code>
-     * @return A list containing the fELMBEACBLB.
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>repeated uint32 group_unlimit_point_list = 15;</code>
+     * @return A list containing the groupUnlimitPointList.
      */
-    java.util.List<java.lang.Integer> getFELMBEACBLBList();
+    java.util.List<java.lang.Integer> getGroupUnlimitPointListList();
     /**
-     * <code>repeated uint32 FELMBEACBLB = 2;</code>
-     * @return The count of fELMBEACBLB.
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>repeated uint32 group_unlimit_point_list = 15;</code>
+     * @return The count of groupUnlimitPointList.
      */
-    int getFELMBEACBLBCount();
+    int getGroupUnlimitPointListCount();
     /**
-     * <code>repeated uint32 FELMBEACBLB = 2;</code>
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>repeated uint32 group_unlimit_point_list = 15;</code>
      * @param index The index of the element to return.
-     * @return The fELMBEACBLB at the given index.
+     * @return The groupUnlimitPointList at the given index.
      */
-    int getFELMBEACBLB(int index);
+    int getGroupUnlimitPointList(int index);
 
     /**
-     * <code>repeated uint32 unhide_point_list = 100;</code>
-     * @return A list containing the unhidePointList.
+     * <pre>
+     * Offset: 0x50
+     * </pre>
+     *
+     * <code>repeated uint32 AOMMPMBGCOE = 2;</code>
+     * @return A list containing the aOMMPMBGCOE.
      */
-    java.util.List<java.lang.Integer> getUnhidePointListList();
+    java.util.List<java.lang.Integer> getAOMMPMBGCOEList();
     /**
-     * <code>repeated uint32 unhide_point_list = 100;</code>
-     * @return The count of unhidePointList.
+     * <pre>
+     * Offset: 0x50
+     * </pre>
+     *
+     * <code>repeated uint32 AOMMPMBGCOE = 2;</code>
+     * @return The count of aOMMPMBGCOE.
      */
-    int getUnhidePointListCount();
+    int getAOMMPMBGCOECount();
     /**
-     * <code>repeated uint32 unhide_point_list = 100;</code>
+     * <pre>
+     * Offset: 0x50
+     * </pre>
+     *
+     * <code>repeated uint32 AOMMPMBGCOE = 2;</code>
      * @param index The index of the element to return.
-     * @return The unhidePointList at the given index.
+     * @return The aOMMPMBGCOE at the given index.
      */
-    int getUnhidePointList(int index);
+    int getAOMMPMBGCOE(int index);
 
     /**
-     * <code>repeated uint32 BEOCPMCPHJH = 11;</code>
-     * @return A list containing the bEOCPMCPHJH.
+     * <pre>
+     * Offset: 0x58
+     * </pre>
+     *
+     * <code>repeated uint32 JCLLNNAMCOO = 7;</code>
+     * @return A list containing the jCLLNNAMCOO.
      */
-    java.util.List<java.lang.Integer> getBEOCPMCPHJHList();
+    java.util.List<java.lang.Integer> getJCLLNNAMCOOList();
     /**
-     * <code>repeated uint32 BEOCPMCPHJH = 11;</code>
-     * @return The count of bEOCPMCPHJH.
+     * <pre>
+     * Offset: 0x58
+     * </pre>
+     *
+     * <code>repeated uint32 JCLLNNAMCOO = 7;</code>
+     * @return The count of jCLLNNAMCOO.
      */
-    int getBEOCPMCPHJHCount();
+    int getJCLLNNAMCOOCount();
     /**
-     * <code>repeated uint32 BEOCPMCPHJH = 11;</code>
+     * <pre>
+     * Offset: 0x58
+     * </pre>
+     *
+     * <code>repeated uint32 JCLLNNAMCOO = 7;</code>
      * @param index The index of the element to return.
-     * @return The bEOCPMCPHJH at the given index.
+     * @return The jCLLNNAMCOO at the given index.
      */
-    int getBEOCPMCPHJH(int index);
+    int getJCLLNNAMCOO(int index);
 
     /**
-     * <code>repeated uint32 DOGJLOBEEPC = 12;</code>
-     * @return A list containing the dOGJLOBEEPC.
+     * <pre>
+     * Offset: 0x60
+     * </pre>
+     *
+     * <code>repeated uint32 LPIDFIIBCJO = 11;</code>
+     * @return A list containing the lPIDFIIBCJO.
      */
-    java.util.List<java.lang.Integer> getDOGJLOBEEPCList();
+    java.util.List<java.lang.Integer> getLPIDFIIBCJOList();
     /**
-     * <code>repeated uint32 DOGJLOBEEPC = 12;</code>
-     * @return The count of dOGJLOBEEPC.
+     * <pre>
+     * Offset: 0x60
+     * </pre>
+     *
+     * <code>repeated uint32 LPIDFIIBCJO = 11;</code>
+     * @return The count of lPIDFIIBCJO.
      */
-    int getDOGJLOBEEPCCount();
+    int getLPIDFIIBCJOCount();
     /**
-     * <code>repeated uint32 DOGJLOBEEPC = 12;</code>
+     * <pre>
+     * Offset: 0x60
+     * </pre>
+     *
+     * <code>repeated uint32 LPIDFIIBCJO = 11;</code>
      * @param index The index of the element to return.
-     * @return The dOGJLOBEEPC at the given index.
+     * @return The lPIDFIIBCJO at the given index.
      */
-    int getDOGJLOBEEPC(int index);
+    int getLPIDFIIBCJO(int index);
 
     /**
-     * <code>repeated uint32 OGLOLEOEAGD = 140;</code>
-     * @return A list containing the oGLOLEOEAGD.
+     * <pre>
+     * Offset: 0x68
+     * </pre>
+     *
+     * <code>bool is_relogin = 3;</code>
+     * @return The isRelogin.
+     */
+    boolean getIsRelogin();
+
+    /**
+     * <pre>
+     * Offset: 0x6C
+     * </pre>
+     *
+     * <code>int32 retcode = 8;</code>
+     * @return The retcode.
      */
-    java.util.List<java.lang.Integer> getOGLOLEOEAGDList();
+    int getRetcode();
+
     /**
-     * <code>repeated uint32 OGLOLEOEAGD = 140;</code>
-     * @return The count of oGLOLEOEAGD.
+     * <pre>
+     * Offset: 0x70
+     * </pre>
+     *
+     * <code>uint32 belong_uid = 1;</code>
+     * @return The belongUid.
      */
-    int getOGLOLEOEAGDCount();
+    int getBelongUid();
+
     /**
-     * <code>repeated uint32 OGLOLEOEAGD = 140;</code>
-     * @param index The index of the element to return.
-     * @return The oGLOLEOEAGD at the given index.
+     * <pre>
+     * Offset: 0x74
+     * </pre>
+     *
+     * <code>uint32 scene_id = 12;</code>
+     * @return The sceneId.
      */
-    int getOGLOLEOEAGD(int index);
+    int getSceneId();
   }
   /**
    * <pre>
-   * CmdId: 29349
+   * CmdId: 7599
    * </pre>
    *
    * Protobuf type {@code GetScenePointRsp}
@@ -212,15 +336,15 @@ private GetScenePointRsp(com.google.protobuf.GeneratedMessageV3.Builder<?> build
       super(builder);
     }
     private GetScenePointRsp() {
-      unlockedPointList_ = emptyIntList();
       unlockAreaList_ = emptyIntList();
-      lockedPointList_ = emptyIntList();
-      pointList_ = emptyIntList();
-      fELMBEACBLB_ = emptyIntList();
+      unlockedPointList_ = emptyIntList();
+      hidePointList_ = emptyIntList();
       unhidePointList_ = emptyIntList();
-      bEOCPMCPHJH_ = emptyIntList();
-      dOGJLOBEEPC_ = emptyIntList();
-      oGLOLEOEAGD_ = emptyIntList();
+      lockedPointList_ = emptyIntList();
+      groupUnlimitPointList_ = emptyIntList();
+      aOMMPMBGCOE_ = emptyIntList();
+      jCLLNNAMCOO_ = emptyIntList();
+      lPIDFIIBCJO_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -255,71 +379,97 @@ private GetScenePointRsp(
               done = true;
               break;
             case 8: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                unlockedPointList_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
+
+              belongUid_ = input.readUInt32();
+              break;
+            }
+            case 16: {
+              if (!((mutable_bitField0_ & 0x00000040) != 0)) {
+                aOMMPMBGCOE_ = newIntList();
+                mutable_bitField0_ |= 0x00000040;
               }
-              unlockedPointList_.addInt(input.readUInt32());
+              aOMMPMBGCOE_.addInt(input.readUInt32());
               break;
             }
-            case 10: {
+            case 18: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
-                unlockedPointList_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
+              if (!((mutable_bitField0_ & 0x00000040) != 0) && input.getBytesUntilLimit() > 0) {
+                aOMMPMBGCOE_ = newIntList();
+                mutable_bitField0_ |= 0x00000040;
               }
               while (input.getBytesUntilLimit() > 0) {
-                unlockedPointList_.addInt(input.readUInt32());
+                aOMMPMBGCOE_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
             }
-            case 16: {
+            case 24: {
+
+              isRelogin_ = input.readBool();
+              break;
+            }
+            case 40: {
               if (!((mutable_bitField0_ & 0x00000010) != 0)) {
-                fELMBEACBLB_ = newIntList();
+                lockedPointList_ = newIntList();
                 mutable_bitField0_ |= 0x00000010;
               }
-              fELMBEACBLB_.addInt(input.readUInt32());
+              lockedPointList_.addInt(input.readUInt32());
               break;
             }
-            case 18: {
+            case 42: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000010) != 0) && input.getBytesUntilLimit() > 0) {
-                fELMBEACBLB_ = newIntList();
+                lockedPointList_ = newIntList();
                 mutable_bitField0_ |= 0x00000010;
               }
               while (input.getBytesUntilLimit() > 0) {
-                fELMBEACBLB_.addInt(input.readUInt32());
+                lockedPointList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
             }
-            case 40: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                unlockAreaList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
+            case 48: {
+              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
+                unhidePointList_ = newIntList();
+                mutable_bitField0_ |= 0x00000008;
               }
-              unlockAreaList_.addInt(input.readUInt32());
+              unhidePointList_.addInt(input.readUInt32());
               break;
             }
-            case 42: {
+            case 50: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
-                unlockAreaList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
+              if (!((mutable_bitField0_ & 0x00000008) != 0) && input.getBytesUntilLimit() > 0) {
+                unhidePointList_ = newIntList();
+                mutable_bitField0_ |= 0x00000008;
               }
               while (input.getBytesUntilLimit() > 0) {
-                unlockAreaList_.addInt(input.readUInt32());
+                unhidePointList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
             }
-            case 48: {
-
-              belongUid_ = input.readUInt32();
+            case 56: {
+              if (!((mutable_bitField0_ & 0x00000080) != 0)) {
+                jCLLNNAMCOO_ = newIntList();
+                mutable_bitField0_ |= 0x00000080;
+              }
+              jCLLNNAMCOO_.addInt(input.readUInt32());
+              break;
+            }
+            case 58: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000080) != 0) && input.getBytesUntilLimit() > 0) {
+                jCLLNNAMCOO_ = newIntList();
+                mutable_bitField0_ |= 0x00000080;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                jCLLNNAMCOO_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
               break;
             }
             case 64: {
@@ -327,138 +477,112 @@ private GetScenePointRsp(
               retcode_ = input.readInt32();
               break;
             }
-            case 80: {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                lockedPointList_ = newIntList();
-                mutable_bitField0_ |= 0x00000004;
+            case 72: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                unlockedPointList_ = newIntList();
+                mutable_bitField0_ |= 0x00000002;
               }
-              lockedPointList_.addInt(input.readUInt32());
+              unlockedPointList_.addInt(input.readUInt32());
               break;
             }
-            case 82: {
+            case 74: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
-                lockedPointList_ = newIntList();
-                mutable_bitField0_ |= 0x00000004;
+              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
+                unlockedPointList_ = newIntList();
+                mutable_bitField0_ |= 0x00000002;
               }
               while (input.getBytesUntilLimit() > 0) {
-                lockedPointList_.addInt(input.readUInt32());
+                unlockedPointList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
             }
             case 88: {
-              if (!((mutable_bitField0_ & 0x00000040) != 0)) {
-                bEOCPMCPHJH_ = newIntList();
-                mutable_bitField0_ |= 0x00000040;
+              if (!((mutable_bitField0_ & 0x00000100) != 0)) {
+                lPIDFIIBCJO_ = newIntList();
+                mutable_bitField0_ |= 0x00000100;
               }
-              bEOCPMCPHJH_.addInt(input.readUInt32());
+              lPIDFIIBCJO_.addInt(input.readUInt32());
               break;
             }
             case 90: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000040) != 0) && input.getBytesUntilLimit() > 0) {
-                bEOCPMCPHJH_ = newIntList();
-                mutable_bitField0_ |= 0x00000040;
+              if (!((mutable_bitField0_ & 0x00000100) != 0) && input.getBytesUntilLimit() > 0) {
+                lPIDFIIBCJO_ = newIntList();
+                mutable_bitField0_ |= 0x00000100;
               }
               while (input.getBytesUntilLimit() > 0) {
-                bEOCPMCPHJH_.addInt(input.readUInt32());
+                lPIDFIIBCJO_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
             }
             case 96: {
-              if (!((mutable_bitField0_ & 0x00000080) != 0)) {
-                dOGJLOBEEPC_ = newIntList();
-                mutable_bitField0_ |= 0x00000080;
+
+              sceneId_ = input.readUInt32();
+              break;
+            }
+            case 104: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                unlockAreaList_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
               }
-              dOGJLOBEEPC_.addInt(input.readUInt32());
+              unlockAreaList_.addInt(input.readUInt32());
               break;
             }
-            case 98: {
+            case 106: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000080) != 0) && input.getBytesUntilLimit() > 0) {
-                dOGJLOBEEPC_ = newIntList();
-                mutable_bitField0_ |= 0x00000080;
+              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
+                unlockAreaList_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
               }
               while (input.getBytesUntilLimit() > 0) {
-                dOGJLOBEEPC_.addInt(input.readUInt32());
+                unlockAreaList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
             }
-            case 104: {
-
-              sceneId_ = input.readUInt32();
-              break;
-            }
             case 112: {
-              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
-                pointList_ = newIntList();
-                mutable_bitField0_ |= 0x00000008;
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+                hidePointList_ = newIntList();
+                mutable_bitField0_ |= 0x00000004;
               }
-              pointList_.addInt(input.readUInt32());
+              hidePointList_.addInt(input.readUInt32());
               break;
             }
             case 114: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000008) != 0) && input.getBytesUntilLimit() > 0) {
-                pointList_ = newIntList();
-                mutable_bitField0_ |= 0x00000008;
+              if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
+                hidePointList_ = newIntList();
+                mutable_bitField0_ |= 0x00000004;
               }
               while (input.getBytesUntilLimit() > 0) {
-                pointList_.addInt(input.readUInt32());
+                hidePointList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
             }
             case 120: {
-
-              isNewPlayer_ = input.readBool();
-              break;
-            }
-            case 800: {
               if (!((mutable_bitField0_ & 0x00000020) != 0)) {
-                unhidePointList_ = newIntList();
+                groupUnlimitPointList_ = newIntList();
                 mutable_bitField0_ |= 0x00000020;
               }
-              unhidePointList_.addInt(input.readUInt32());
+              groupUnlimitPointList_.addInt(input.readUInt32());
               break;
             }
-            case 802: {
+            case 122: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000020) != 0) && input.getBytesUntilLimit() > 0) {
-                unhidePointList_ = newIntList();
+                groupUnlimitPointList_ = newIntList();
                 mutable_bitField0_ |= 0x00000020;
               }
               while (input.getBytesUntilLimit() > 0) {
-                unhidePointList_.addInt(input.readUInt32());
-              }
-              input.popLimit(limit);
-              break;
-            }
-            case 1120: {
-              if (!((mutable_bitField0_ & 0x00000100) != 0)) {
-                oGLOLEOEAGD_ = newIntList();
-                mutable_bitField0_ |= 0x00000100;
-              }
-              oGLOLEOEAGD_.addInt(input.readUInt32());
-              break;
-            }
-            case 1122: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000100) != 0) && input.getBytesUntilLimit() > 0) {
-                oGLOLEOEAGD_ = newIntList();
-                mutable_bitField0_ |= 0x00000100;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                oGLOLEOEAGD_.addInt(input.readUInt32());
+                groupUnlimitPointList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
@@ -478,32 +602,32 @@ private GetScenePointRsp(
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          unlockedPointList_.makeImmutable(); // C
+        if (((mutable_bitField0_ & 0x00000040) != 0)) {
+          aOMMPMBGCOE_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000010) != 0)) {
-          fELMBEACBLB_.makeImmutable(); // C
-        }
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          unlockAreaList_.makeImmutable(); // C
-        }
-        if (((mutable_bitField0_ & 0x00000004) != 0)) {
           lockedPointList_.makeImmutable(); // C
         }
-        if (((mutable_bitField0_ & 0x00000040) != 0)) {
-          bEOCPMCPHJH_.makeImmutable(); // C
+        if (((mutable_bitField0_ & 0x00000008) != 0)) {
+          unhidePointList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000080) != 0)) {
-          dOGJLOBEEPC_.makeImmutable(); // C
-        }
-        if (((mutable_bitField0_ & 0x00000008) != 0)) {
-          pointList_.makeImmutable(); // C
+          jCLLNNAMCOO_.makeImmutable(); // C
         }
-        if (((mutable_bitField0_ & 0x00000020) != 0)) {
-          unhidePointList_.makeImmutable(); // C
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+          unlockedPointList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000100) != 0)) {
-          oGLOLEOEAGD_.makeImmutable(); // C
+          lPIDFIIBCJO_.makeImmutable(); // C
+        }
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          unlockAreaList_.makeImmutable(); // C
+        }
+        if (((mutable_bitField0_ & 0x00000004) != 0)) {
+          hidePointList_.makeImmutable(); // C
+        }
+        if (((mutable_bitField0_ & 0x00000020) != 0)) {
+          groupUnlimitPointList_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -522,38 +646,14 @@ private GetScenePointRsp(
               emu.grasscutter.net.proto.GetScenePointRspOuterClass.GetScenePointRsp.class, emu.grasscutter.net.proto.GetScenePointRspOuterClass.GetScenePointRsp.Builder.class);
     }
 
-    public static final int UNLOCKED_POINT_LIST_FIELD_NUMBER = 1;
-    private com.google.protobuf.Internal.IntList unlockedPointList_;
-    /**
-     * <code>repeated uint32 unlocked_point_list = 1;</code>
-     * @return A list containing the unlockedPointList.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getUnlockedPointListList() {
-      return unlockedPointList_;
-    }
-    /**
-     * <code>repeated uint32 unlocked_point_list = 1;</code>
-     * @return The count of unlockedPointList.
-     */
-    public int getUnlockedPointListCount() {
-      return unlockedPointList_.size();
-    }
-    /**
-     * <code>repeated uint32 unlocked_point_list = 1;</code>
-     * @param index The index of the element to return.
-     * @return The unlockedPointList at the given index.
-     */
-    public int getUnlockedPointList(int index) {
-      return unlockedPointList_.getInt(index);
-    }
-    private int unlockedPointListMemoizedSerializedSize = -1;
-
-    public static final int UNLOCK_AREA_LIST_FIELD_NUMBER = 5;
+    public static final int UNLOCK_AREA_LIST_FIELD_NUMBER = 13;
     private com.google.protobuf.Internal.IntList unlockAreaList_;
     /**
-     * <code>repeated uint32 unlock_area_list = 5;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 unlock_area_list = 13;</code>
      * @return A list containing the unlockAreaList.
      */
     @java.lang.Override
@@ -562,14 +662,22 @@ public int getUnlockedPointList(int index) {
       return unlockAreaList_;
     }
     /**
-     * <code>repeated uint32 unlock_area_list = 5;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 unlock_area_list = 13;</code>
      * @return The count of unlockAreaList.
      */
     public int getUnlockAreaListCount() {
       return unlockAreaList_.size();
     }
     /**
-     * <code>repeated uint32 unlock_area_list = 5;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 unlock_area_list = 13;</code>
      * @param index The index of the element to return.
      * @return The unlockAreaList at the given index.
      */
@@ -578,245 +686,385 @@ public int getUnlockAreaList(int index) {
     }
     private int unlockAreaListMemoizedSerializedSize = -1;
 
-    public static final int LOCKED_POINT_LIST_FIELD_NUMBER = 10;
-    private com.google.protobuf.Internal.IntList lockedPointList_;
+    public static final int UNLOCKED_POINT_LIST_FIELD_NUMBER = 9;
+    private com.google.protobuf.Internal.IntList unlockedPointList_;
     /**
-     * <code>repeated uint32 locked_point_list = 10;</code>
-     * @return A list containing the lockedPointList.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated uint32 unlocked_point_list = 9;</code>
+     * @return A list containing the unlockedPointList.
      */
     @java.lang.Override
     public java.util.List<java.lang.Integer>
-        getLockedPointListList() {
-      return lockedPointList_;
+        getUnlockedPointListList() {
+      return unlockedPointList_;
     }
     /**
-     * <code>repeated uint32 locked_point_list = 10;</code>
-     * @return The count of lockedPointList.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated uint32 unlocked_point_list = 9;</code>
+     * @return The count of unlockedPointList.
      */
-    public int getLockedPointListCount() {
-      return lockedPointList_.size();
+    public int getUnlockedPointListCount() {
+      return unlockedPointList_.size();
     }
     /**
-     * <code>repeated uint32 locked_point_list = 10;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated uint32 unlocked_point_list = 9;</code>
      * @param index The index of the element to return.
-     * @return The lockedPointList at the given index.
+     * @return The unlockedPointList at the given index.
      */
-    public int getLockedPointList(int index) {
-      return lockedPointList_.getInt(index);
+    public int getUnlockedPointList(int index) {
+      return unlockedPointList_.getInt(index);
     }
-    private int lockedPointListMemoizedSerializedSize = -1;
+    private int unlockedPointListMemoizedSerializedSize = -1;
 
-    public static final int POINT_LIST_FIELD_NUMBER = 14;
-    private com.google.protobuf.Internal.IntList pointList_;
+    public static final int HIDE_POINT_LIST_FIELD_NUMBER = 14;
+    private com.google.protobuf.Internal.IntList hidePointList_;
     /**
-     * <code>repeated uint32 point_list = 14;</code>
-     * @return A list containing the pointList.
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated uint32 hide_point_list = 14;</code>
+     * @return A list containing the hidePointList.
      */
     @java.lang.Override
     public java.util.List<java.lang.Integer>
-        getPointListList() {
-      return pointList_;
+        getHidePointListList() {
+      return hidePointList_;
     }
     /**
-     * <code>repeated uint32 point_list = 14;</code>
-     * @return The count of pointList.
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated uint32 hide_point_list = 14;</code>
+     * @return The count of hidePointList.
      */
-    public int getPointListCount() {
-      return pointList_.size();
+    public int getHidePointListCount() {
+      return hidePointList_.size();
     }
     /**
-     * <code>repeated uint32 point_list = 14;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated uint32 hide_point_list = 14;</code>
      * @param index The index of the element to return.
-     * @return The pointList at the given index.
+     * @return The hidePointList at the given index.
      */
-    public int getPointList(int index) {
-      return pointList_.getInt(index);
+    public int getHidePointList(int index) {
+      return hidePointList_.getInt(index);
     }
-    private int pointListMemoizedSerializedSize = -1;
+    private int hidePointListMemoizedSerializedSize = -1;
 
-    public static final int SCENE_ID_FIELD_NUMBER = 13;
-    private int sceneId_;
+    public static final int UNHIDE_POINT_LIST_FIELD_NUMBER = 6;
+    private com.google.protobuf.Internal.IntList unhidePointList_;
     /**
-     * <code>uint32 scene_id = 13;</code>
-     * @return The sceneId.
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>repeated uint32 unhide_point_list = 6;</code>
+     * @return A list containing the unhidePointList.
      */
     @java.lang.Override
-    public int getSceneId() {
-      return sceneId_;
+    public java.util.List<java.lang.Integer>
+        getUnhidePointListList() {
+      return unhidePointList_;
     }
-
-    public static final int BELONG_UID_FIELD_NUMBER = 6;
-    private int belongUid_;
     /**
-     * <code>uint32 belong_uid = 6;</code>
-     * @return The belongUid.
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>repeated uint32 unhide_point_list = 6;</code>
+     * @return The count of unhidePointList.
      */
-    @java.lang.Override
-    public int getBelongUid() {
-      return belongUid_;
+    public int getUnhidePointListCount() {
+      return unhidePointList_.size();
     }
-
-    public static final int RETCODE_FIELD_NUMBER = 8;
-    private int retcode_;
     /**
-     * <code>int32 retcode = 8;</code>
-     * @return The retcode.
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>repeated uint32 unhide_point_list = 6;</code>
+     * @param index The index of the element to return.
+     * @return The unhidePointList at the given index.
      */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
+    public int getUnhidePointList(int index) {
+      return unhidePointList_.getInt(index);
     }
+    private int unhidePointListMemoizedSerializedSize = -1;
 
-    public static final int IS_NEW_PLAYER_FIELD_NUMBER = 15;
-    private boolean isNewPlayer_;
+    public static final int LOCKED_POINT_LIST_FIELD_NUMBER = 5;
+    private com.google.protobuf.Internal.IntList lockedPointList_;
     /**
-     * <code>bool is_new_player = 15;</code>
-     * @return The isNewPlayer.
+     * <pre>
+     * Offset: 0x40
+     * </pre>
+     *
+     * <code>repeated uint32 locked_point_list = 5;</code>
+     * @return A list containing the lockedPointList.
      */
     @java.lang.Override
-    public boolean getIsNewPlayer() {
-      return isNewPlayer_;
+    public java.util.List<java.lang.Integer>
+        getLockedPointListList() {
+      return lockedPointList_;
+    }
+    /**
+     * <pre>
+     * Offset: 0x40
+     * </pre>
+     *
+     * <code>repeated uint32 locked_point_list = 5;</code>
+     * @return The count of lockedPointList.
+     */
+    public int getLockedPointListCount() {
+      return lockedPointList_.size();
+    }
+    /**
+     * <pre>
+     * Offset: 0x40
+     * </pre>
+     *
+     * <code>repeated uint32 locked_point_list = 5;</code>
+     * @param index The index of the element to return.
+     * @return The lockedPointList at the given index.
+     */
+    public int getLockedPointList(int index) {
+      return lockedPointList_.getInt(index);
     }
+    private int lockedPointListMemoizedSerializedSize = -1;
 
-    public static final int FELMBEACBLB_FIELD_NUMBER = 2;
-    private com.google.protobuf.Internal.IntList fELMBEACBLB_;
+    public static final int GROUP_UNLIMIT_POINT_LIST_FIELD_NUMBER = 15;
+    private com.google.protobuf.Internal.IntList groupUnlimitPointList_;
     /**
-     * <code>repeated uint32 FELMBEACBLB = 2;</code>
-     * @return A list containing the fELMBEACBLB.
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>repeated uint32 group_unlimit_point_list = 15;</code>
+     * @return A list containing the groupUnlimitPointList.
      */
     @java.lang.Override
     public java.util.List<java.lang.Integer>
-        getFELMBEACBLBList() {
-      return fELMBEACBLB_;
+        getGroupUnlimitPointListList() {
+      return groupUnlimitPointList_;
     }
     /**
-     * <code>repeated uint32 FELMBEACBLB = 2;</code>
-     * @return The count of fELMBEACBLB.
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>repeated uint32 group_unlimit_point_list = 15;</code>
+     * @return The count of groupUnlimitPointList.
      */
-    public int getFELMBEACBLBCount() {
-      return fELMBEACBLB_.size();
+    public int getGroupUnlimitPointListCount() {
+      return groupUnlimitPointList_.size();
     }
     /**
-     * <code>repeated uint32 FELMBEACBLB = 2;</code>
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>repeated uint32 group_unlimit_point_list = 15;</code>
      * @param index The index of the element to return.
-     * @return The fELMBEACBLB at the given index.
+     * @return The groupUnlimitPointList at the given index.
      */
-    public int getFELMBEACBLB(int index) {
-      return fELMBEACBLB_.getInt(index);
+    public int getGroupUnlimitPointList(int index) {
+      return groupUnlimitPointList_.getInt(index);
     }
-    private int fELMBEACBLBMemoizedSerializedSize = -1;
+    private int groupUnlimitPointListMemoizedSerializedSize = -1;
 
-    public static final int UNHIDE_POINT_LIST_FIELD_NUMBER = 100;
-    private com.google.protobuf.Internal.IntList unhidePointList_;
+    public static final int AOMMPMBGCOE_FIELD_NUMBER = 2;
+    private com.google.protobuf.Internal.IntList aOMMPMBGCOE_;
     /**
-     * <code>repeated uint32 unhide_point_list = 100;</code>
-     * @return A list containing the unhidePointList.
+     * <pre>
+     * Offset: 0x50
+     * </pre>
+     *
+     * <code>repeated uint32 AOMMPMBGCOE = 2;</code>
+     * @return A list containing the aOMMPMBGCOE.
      */
     @java.lang.Override
     public java.util.List<java.lang.Integer>
-        getUnhidePointListList() {
-      return unhidePointList_;
+        getAOMMPMBGCOEList() {
+      return aOMMPMBGCOE_;
     }
     /**
-     * <code>repeated uint32 unhide_point_list = 100;</code>
-     * @return The count of unhidePointList.
+     * <pre>
+     * Offset: 0x50
+     * </pre>
+     *
+     * <code>repeated uint32 AOMMPMBGCOE = 2;</code>
+     * @return The count of aOMMPMBGCOE.
      */
-    public int getUnhidePointListCount() {
-      return unhidePointList_.size();
+    public int getAOMMPMBGCOECount() {
+      return aOMMPMBGCOE_.size();
     }
     /**
-     * <code>repeated uint32 unhide_point_list = 100;</code>
+     * <pre>
+     * Offset: 0x50
+     * </pre>
+     *
+     * <code>repeated uint32 AOMMPMBGCOE = 2;</code>
      * @param index The index of the element to return.
-     * @return The unhidePointList at the given index.
+     * @return The aOMMPMBGCOE at the given index.
      */
-    public int getUnhidePointList(int index) {
-      return unhidePointList_.getInt(index);
+    public int getAOMMPMBGCOE(int index) {
+      return aOMMPMBGCOE_.getInt(index);
     }
-    private int unhidePointListMemoizedSerializedSize = -1;
+    private int aOMMPMBGCOEMemoizedSerializedSize = -1;
 
-    public static final int BEOCPMCPHJH_FIELD_NUMBER = 11;
-    private com.google.protobuf.Internal.IntList bEOCPMCPHJH_;
+    public static final int JCLLNNAMCOO_FIELD_NUMBER = 7;
+    private com.google.protobuf.Internal.IntList jCLLNNAMCOO_;
     /**
-     * <code>repeated uint32 BEOCPMCPHJH = 11;</code>
-     * @return A list containing the bEOCPMCPHJH.
+     * <pre>
+     * Offset: 0x58
+     * </pre>
+     *
+     * <code>repeated uint32 JCLLNNAMCOO = 7;</code>
+     * @return A list containing the jCLLNNAMCOO.
      */
     @java.lang.Override
     public java.util.List<java.lang.Integer>
-        getBEOCPMCPHJHList() {
-      return bEOCPMCPHJH_;
+        getJCLLNNAMCOOList() {
+      return jCLLNNAMCOO_;
     }
     /**
-     * <code>repeated uint32 BEOCPMCPHJH = 11;</code>
-     * @return The count of bEOCPMCPHJH.
+     * <pre>
+     * Offset: 0x58
+     * </pre>
+     *
+     * <code>repeated uint32 JCLLNNAMCOO = 7;</code>
+     * @return The count of jCLLNNAMCOO.
      */
-    public int getBEOCPMCPHJHCount() {
-      return bEOCPMCPHJH_.size();
+    public int getJCLLNNAMCOOCount() {
+      return jCLLNNAMCOO_.size();
     }
     /**
-     * <code>repeated uint32 BEOCPMCPHJH = 11;</code>
+     * <pre>
+     * Offset: 0x58
+     * </pre>
+     *
+     * <code>repeated uint32 JCLLNNAMCOO = 7;</code>
      * @param index The index of the element to return.
-     * @return The bEOCPMCPHJH at the given index.
+     * @return The jCLLNNAMCOO at the given index.
      */
-    public int getBEOCPMCPHJH(int index) {
-      return bEOCPMCPHJH_.getInt(index);
+    public int getJCLLNNAMCOO(int index) {
+      return jCLLNNAMCOO_.getInt(index);
     }
-    private int bEOCPMCPHJHMemoizedSerializedSize = -1;
+    private int jCLLNNAMCOOMemoizedSerializedSize = -1;
 
-    public static final int DOGJLOBEEPC_FIELD_NUMBER = 12;
-    private com.google.protobuf.Internal.IntList dOGJLOBEEPC_;
+    public static final int LPIDFIIBCJO_FIELD_NUMBER = 11;
+    private com.google.protobuf.Internal.IntList lPIDFIIBCJO_;
     /**
-     * <code>repeated uint32 DOGJLOBEEPC = 12;</code>
-     * @return A list containing the dOGJLOBEEPC.
+     * <pre>
+     * Offset: 0x60
+     * </pre>
+     *
+     * <code>repeated uint32 LPIDFIIBCJO = 11;</code>
+     * @return A list containing the lPIDFIIBCJO.
      */
     @java.lang.Override
     public java.util.List<java.lang.Integer>
-        getDOGJLOBEEPCList() {
-      return dOGJLOBEEPC_;
+        getLPIDFIIBCJOList() {
+      return lPIDFIIBCJO_;
     }
     /**
-     * <code>repeated uint32 DOGJLOBEEPC = 12;</code>
-     * @return The count of dOGJLOBEEPC.
+     * <pre>
+     * Offset: 0x60
+     * </pre>
+     *
+     * <code>repeated uint32 LPIDFIIBCJO = 11;</code>
+     * @return The count of lPIDFIIBCJO.
      */
-    public int getDOGJLOBEEPCCount() {
-      return dOGJLOBEEPC_.size();
+    public int getLPIDFIIBCJOCount() {
+      return lPIDFIIBCJO_.size();
     }
     /**
-     * <code>repeated uint32 DOGJLOBEEPC = 12;</code>
+     * <pre>
+     * Offset: 0x60
+     * </pre>
+     *
+     * <code>repeated uint32 LPIDFIIBCJO = 11;</code>
      * @param index The index of the element to return.
-     * @return The dOGJLOBEEPC at the given index.
+     * @return The lPIDFIIBCJO at the given index.
      */
-    public int getDOGJLOBEEPC(int index) {
-      return dOGJLOBEEPC_.getInt(index);
+    public int getLPIDFIIBCJO(int index) {
+      return lPIDFIIBCJO_.getInt(index);
     }
-    private int dOGJLOBEEPCMemoizedSerializedSize = -1;
+    private int lPIDFIIBCJOMemoizedSerializedSize = -1;
 
-    public static final int OGLOLEOEAGD_FIELD_NUMBER = 140;
-    private com.google.protobuf.Internal.IntList oGLOLEOEAGD_;
+    public static final int IS_RELOGIN_FIELD_NUMBER = 3;
+    private boolean isRelogin_;
     /**
-     * <code>repeated uint32 OGLOLEOEAGD = 140;</code>
-     * @return A list containing the oGLOLEOEAGD.
+     * <pre>
+     * Offset: 0x68
+     * </pre>
+     *
+     * <code>bool is_relogin = 3;</code>
+     * @return The isRelogin.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getOGLOLEOEAGDList() {
-      return oGLOLEOEAGD_;
+    public boolean getIsRelogin() {
+      return isRelogin_;
     }
+
+    public static final int RETCODE_FIELD_NUMBER = 8;
+    private int retcode_;
     /**
-     * <code>repeated uint32 OGLOLEOEAGD = 140;</code>
-     * @return The count of oGLOLEOEAGD.
+     * <pre>
+     * Offset: 0x6C
+     * </pre>
+     *
+     * <code>int32 retcode = 8;</code>
+     * @return The retcode.
      */
-    public int getOGLOLEOEAGDCount() {
-      return oGLOLEOEAGD_.size();
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
     }
+
+    public static final int BELONG_UID_FIELD_NUMBER = 1;
+    private int belongUid_;
     /**
-     * <code>repeated uint32 OGLOLEOEAGD = 140;</code>
-     * @param index The index of the element to return.
-     * @return The oGLOLEOEAGD at the given index.
+     * <pre>
+     * Offset: 0x70
+     * </pre>
+     *
+     * <code>uint32 belong_uid = 1;</code>
+     * @return The belongUid.
+     */
+    @java.lang.Override
+    public int getBelongUid() {
+      return belongUid_;
+    }
+
+    public static final int SCENE_ID_FIELD_NUMBER = 12;
+    private int sceneId_;
+    /**
+     * <pre>
+     * Offset: 0x74
+     * </pre>
+     *
+     * <code>uint32 scene_id = 12;</code>
+     * @return The sceneId.
      */
-    public int getOGLOLEOEAGD(int index) {
-      return oGLOLEOEAGD_.getInt(index);
+    @java.lang.Override
+    public int getSceneId() {
+      return sceneId_;
     }
-    private int oGLOLEOEAGDMemoizedSerializedSize = -1;
 
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
@@ -833,80 +1081,80 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (getUnlockedPointListList().size() > 0) {
-        output.writeUInt32NoTag(10);
-        output.writeUInt32NoTag(unlockedPointListMemoizedSerializedSize);
-      }
-      for (int i = 0; i < unlockedPointList_.size(); i++) {
-        output.writeUInt32NoTag(unlockedPointList_.getInt(i));
+      if (belongUid_ != 0) {
+        output.writeUInt32(1, belongUid_);
       }
-      if (getFELMBEACBLBList().size() > 0) {
+      if (getAOMMPMBGCOEList().size() > 0) {
         output.writeUInt32NoTag(18);
-        output.writeUInt32NoTag(fELMBEACBLBMemoizedSerializedSize);
+        output.writeUInt32NoTag(aOMMPMBGCOEMemoizedSerializedSize);
       }
-      for (int i = 0; i < fELMBEACBLB_.size(); i++) {
-        output.writeUInt32NoTag(fELMBEACBLB_.getInt(i));
+      for (int i = 0; i < aOMMPMBGCOE_.size(); i++) {
+        output.writeUInt32NoTag(aOMMPMBGCOE_.getInt(i));
       }
-      if (getUnlockAreaListList().size() > 0) {
+      if (isRelogin_ != false) {
+        output.writeBool(3, isRelogin_);
+      }
+      if (getLockedPointListList().size() > 0) {
         output.writeUInt32NoTag(42);
-        output.writeUInt32NoTag(unlockAreaListMemoizedSerializedSize);
+        output.writeUInt32NoTag(lockedPointListMemoizedSerializedSize);
       }
-      for (int i = 0; i < unlockAreaList_.size(); i++) {
-        output.writeUInt32NoTag(unlockAreaList_.getInt(i));
+      for (int i = 0; i < lockedPointList_.size(); i++) {
+        output.writeUInt32NoTag(lockedPointList_.getInt(i));
       }
-      if (belongUid_ != 0) {
-        output.writeUInt32(6, belongUid_);
+      if (getUnhidePointListList().size() > 0) {
+        output.writeUInt32NoTag(50);
+        output.writeUInt32NoTag(unhidePointListMemoizedSerializedSize);
+      }
+      for (int i = 0; i < unhidePointList_.size(); i++) {
+        output.writeUInt32NoTag(unhidePointList_.getInt(i));
+      }
+      if (getJCLLNNAMCOOList().size() > 0) {
+        output.writeUInt32NoTag(58);
+        output.writeUInt32NoTag(jCLLNNAMCOOMemoizedSerializedSize);
+      }
+      for (int i = 0; i < jCLLNNAMCOO_.size(); i++) {
+        output.writeUInt32NoTag(jCLLNNAMCOO_.getInt(i));
       }
       if (retcode_ != 0) {
         output.writeInt32(8, retcode_);
       }
-      if (getLockedPointListList().size() > 0) {
-        output.writeUInt32NoTag(82);
-        output.writeUInt32NoTag(lockedPointListMemoizedSerializedSize);
+      if (getUnlockedPointListList().size() > 0) {
+        output.writeUInt32NoTag(74);
+        output.writeUInt32NoTag(unlockedPointListMemoizedSerializedSize);
       }
-      for (int i = 0; i < lockedPointList_.size(); i++) {
-        output.writeUInt32NoTag(lockedPointList_.getInt(i));
+      for (int i = 0; i < unlockedPointList_.size(); i++) {
+        output.writeUInt32NoTag(unlockedPointList_.getInt(i));
       }
-      if (getBEOCPMCPHJHList().size() > 0) {
+      if (getLPIDFIIBCJOList().size() > 0) {
         output.writeUInt32NoTag(90);
-        output.writeUInt32NoTag(bEOCPMCPHJHMemoizedSerializedSize);
-      }
-      for (int i = 0; i < bEOCPMCPHJH_.size(); i++) {
-        output.writeUInt32NoTag(bEOCPMCPHJH_.getInt(i));
+        output.writeUInt32NoTag(lPIDFIIBCJOMemoizedSerializedSize);
       }
-      if (getDOGJLOBEEPCList().size() > 0) {
-        output.writeUInt32NoTag(98);
-        output.writeUInt32NoTag(dOGJLOBEEPCMemoizedSerializedSize);
-      }
-      for (int i = 0; i < dOGJLOBEEPC_.size(); i++) {
-        output.writeUInt32NoTag(dOGJLOBEEPC_.getInt(i));
+      for (int i = 0; i < lPIDFIIBCJO_.size(); i++) {
+        output.writeUInt32NoTag(lPIDFIIBCJO_.getInt(i));
       }
       if (sceneId_ != 0) {
-        output.writeUInt32(13, sceneId_);
-      }
-      if (getPointListList().size() > 0) {
-        output.writeUInt32NoTag(114);
-        output.writeUInt32NoTag(pointListMemoizedSerializedSize);
+        output.writeUInt32(12, sceneId_);
       }
-      for (int i = 0; i < pointList_.size(); i++) {
-        output.writeUInt32NoTag(pointList_.getInt(i));
+      if (getUnlockAreaListList().size() > 0) {
+        output.writeUInt32NoTag(106);
+        output.writeUInt32NoTag(unlockAreaListMemoizedSerializedSize);
       }
-      if (isNewPlayer_ != false) {
-        output.writeBool(15, isNewPlayer_);
+      for (int i = 0; i < unlockAreaList_.size(); i++) {
+        output.writeUInt32NoTag(unlockAreaList_.getInt(i));
       }
-      if (getUnhidePointListList().size() > 0) {
-        output.writeUInt32NoTag(802);
-        output.writeUInt32NoTag(unhidePointListMemoizedSerializedSize);
+      if (getHidePointListList().size() > 0) {
+        output.writeUInt32NoTag(114);
+        output.writeUInt32NoTag(hidePointListMemoizedSerializedSize);
       }
-      for (int i = 0; i < unhidePointList_.size(); i++) {
-        output.writeUInt32NoTag(unhidePointList_.getInt(i));
+      for (int i = 0; i < hidePointList_.size(); i++) {
+        output.writeUInt32NoTag(hidePointList_.getInt(i));
       }
-      if (getOGLOLEOEAGDList().size() > 0) {
-        output.writeUInt32NoTag(1122);
-        output.writeUInt32NoTag(oGLOLEOEAGDMemoizedSerializedSize);
+      if (getGroupUnlimitPointListList().size() > 0) {
+        output.writeUInt32NoTag(122);
+        output.writeUInt32NoTag(groupUnlimitPointListMemoizedSerializedSize);
       }
-      for (int i = 0; i < oGLOLEOEAGD_.size(); i++) {
-        output.writeUInt32NoTag(oGLOLEOEAGD_.getInt(i));
+      for (int i = 0; i < groupUnlimitPointList_.size(); i++) {
+        output.writeUInt32NoTag(groupUnlimitPointList_.getInt(i));
       }
       unknownFields.writeTo(output);
     }
@@ -917,147 +1165,147 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
+      if (belongUid_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1, belongUid_);
+      }
       {
         int dataSize = 0;
-        for (int i = 0; i < unlockedPointList_.size(); i++) {
+        for (int i = 0; i < aOMMPMBGCOE_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(unlockedPointList_.getInt(i));
+            .computeUInt32SizeNoTag(aOMMPMBGCOE_.getInt(i));
         }
         size += dataSize;
-        if (!getUnlockedPointListList().isEmpty()) {
+        if (!getAOMMPMBGCOEList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        unlockedPointListMemoizedSerializedSize = dataSize;
+        aOMMPMBGCOEMemoizedSerializedSize = dataSize;
+      }
+      if (isRelogin_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(3, isRelogin_);
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < fELMBEACBLB_.size(); i++) {
+        for (int i = 0; i < lockedPointList_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(fELMBEACBLB_.getInt(i));
+            .computeUInt32SizeNoTag(lockedPointList_.getInt(i));
         }
         size += dataSize;
-        if (!getFELMBEACBLBList().isEmpty()) {
+        if (!getLockedPointListList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        fELMBEACBLBMemoizedSerializedSize = dataSize;
+        lockedPointListMemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < unlockAreaList_.size(); i++) {
+        for (int i = 0; i < unhidePointList_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(unlockAreaList_.getInt(i));
+            .computeUInt32SizeNoTag(unhidePointList_.getInt(i));
         }
         size += dataSize;
-        if (!getUnlockAreaListList().isEmpty()) {
+        if (!getUnhidePointListList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        unlockAreaListMemoizedSerializedSize = dataSize;
-      }
-      if (belongUid_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, belongUid_);
-      }
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(8, retcode_);
+        unhidePointListMemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < lockedPointList_.size(); i++) {
+        for (int i = 0; i < jCLLNNAMCOO_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(lockedPointList_.getInt(i));
+            .computeUInt32SizeNoTag(jCLLNNAMCOO_.getInt(i));
         }
         size += dataSize;
-        if (!getLockedPointListList().isEmpty()) {
+        if (!getJCLLNNAMCOOList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        lockedPointListMemoizedSerializedSize = dataSize;
+        jCLLNNAMCOOMemoizedSerializedSize = dataSize;
+      }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(8, retcode_);
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < bEOCPMCPHJH_.size(); i++) {
+        for (int i = 0; i < unlockedPointList_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(bEOCPMCPHJH_.getInt(i));
+            .computeUInt32SizeNoTag(unlockedPointList_.getInt(i));
         }
         size += dataSize;
-        if (!getBEOCPMCPHJHList().isEmpty()) {
+        if (!getUnlockedPointListList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        bEOCPMCPHJHMemoizedSerializedSize = dataSize;
+        unlockedPointListMemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < dOGJLOBEEPC_.size(); i++) {
+        for (int i = 0; i < lPIDFIIBCJO_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(dOGJLOBEEPC_.getInt(i));
+            .computeUInt32SizeNoTag(lPIDFIIBCJO_.getInt(i));
         }
         size += dataSize;
-        if (!getDOGJLOBEEPCList().isEmpty()) {
+        if (!getLPIDFIIBCJOList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        dOGJLOBEEPCMemoizedSerializedSize = dataSize;
+        lPIDFIIBCJOMemoizedSerializedSize = dataSize;
       }
       if (sceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, sceneId_);
+          .computeUInt32Size(12, sceneId_);
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < pointList_.size(); i++) {
+        for (int i = 0; i < unlockAreaList_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(pointList_.getInt(i));
+            .computeUInt32SizeNoTag(unlockAreaList_.getInt(i));
         }
         size += dataSize;
-        if (!getPointListList().isEmpty()) {
+        if (!getUnlockAreaListList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        pointListMemoizedSerializedSize = dataSize;
-      }
-      if (isNewPlayer_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(15, isNewPlayer_);
+        unlockAreaListMemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < unhidePointList_.size(); i++) {
+        for (int i = 0; i < hidePointList_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(unhidePointList_.getInt(i));
+            .computeUInt32SizeNoTag(hidePointList_.getInt(i));
         }
         size += dataSize;
-        if (!getUnhidePointListList().isEmpty()) {
-          size += 2;
+        if (!getHidePointListList().isEmpty()) {
+          size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        unhidePointListMemoizedSerializedSize = dataSize;
+        hidePointListMemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < oGLOLEOEAGD_.size(); i++) {
+        for (int i = 0; i < groupUnlimitPointList_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(oGLOLEOEAGD_.getInt(i));
+            .computeUInt32SizeNoTag(groupUnlimitPointList_.getInt(i));
         }
         size += dataSize;
-        if (!getOGLOLEOEAGDList().isEmpty()) {
-          size += 2;
+        if (!getGroupUnlimitPointListList().isEmpty()) {
+          size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        oGLOLEOEAGDMemoizedSerializedSize = dataSize;
+        groupUnlimitPointListMemoizedSerializedSize = dataSize;
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -1074,32 +1322,32 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.GetScenePointRspOuterClass.GetScenePointRsp other = (emu.grasscutter.net.proto.GetScenePointRspOuterClass.GetScenePointRsp) obj;
 
-      if (!getUnlockedPointListList()
-          .equals(other.getUnlockedPointListList())) return false;
       if (!getUnlockAreaListList()
           .equals(other.getUnlockAreaListList())) return false;
+      if (!getUnlockedPointListList()
+          .equals(other.getUnlockedPointListList())) return false;
+      if (!getHidePointListList()
+          .equals(other.getHidePointListList())) return false;
+      if (!getUnhidePointListList()
+          .equals(other.getUnhidePointListList())) return false;
       if (!getLockedPointListList()
           .equals(other.getLockedPointListList())) return false;
-      if (!getPointListList()
-          .equals(other.getPointListList())) return false;
-      if (getSceneId()
-          != other.getSceneId()) return false;
-      if (getBelongUid()
-          != other.getBelongUid()) return false;
+      if (!getGroupUnlimitPointListList()
+          .equals(other.getGroupUnlimitPointListList())) return false;
+      if (!getAOMMPMBGCOEList()
+          .equals(other.getAOMMPMBGCOEList())) return false;
+      if (!getJCLLNNAMCOOList()
+          .equals(other.getJCLLNNAMCOOList())) return false;
+      if (!getLPIDFIIBCJOList()
+          .equals(other.getLPIDFIIBCJOList())) return false;
+      if (getIsRelogin()
+          != other.getIsRelogin()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
-      if (getIsNewPlayer()
-          != other.getIsNewPlayer()) return false;
-      if (!getFELMBEACBLBList()
-          .equals(other.getFELMBEACBLBList())) return false;
-      if (!getUnhidePointListList()
-          .equals(other.getUnhidePointListList())) return false;
-      if (!getBEOCPMCPHJHList()
-          .equals(other.getBEOCPMCPHJHList())) return false;
-      if (!getDOGJLOBEEPCList()
-          .equals(other.getDOGJLOBEEPCList())) return false;
-      if (!getOGLOLEOEAGDList()
-          .equals(other.getOGLOLEOEAGDList())) return false;
+      if (getBelongUid()
+          != other.getBelongUid()) return false;
+      if (getSceneId()
+          != other.getSceneId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -1111,51 +1359,51 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (getUnlockedPointListCount() > 0) {
-        hash = (37 * hash) + UNLOCKED_POINT_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getUnlockedPointListList().hashCode();
-      }
       if (getUnlockAreaListCount() > 0) {
         hash = (37 * hash) + UNLOCK_AREA_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getUnlockAreaListList().hashCode();
       }
-      if (getLockedPointListCount() > 0) {
-        hash = (37 * hash) + LOCKED_POINT_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getLockedPointListList().hashCode();
-      }
-      if (getPointListCount() > 0) {
-        hash = (37 * hash) + POINT_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getPointListList().hashCode();
+      if (getUnlockedPointListCount() > 0) {
+        hash = (37 * hash) + UNLOCKED_POINT_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getUnlockedPointListList().hashCode();
       }
-      hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getSceneId();
-      hash = (37 * hash) + BELONG_UID_FIELD_NUMBER;
-      hash = (53 * hash) + getBelongUid();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
-      hash = (37 * hash) + IS_NEW_PLAYER_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsNewPlayer());
-      if (getFELMBEACBLBCount() > 0) {
-        hash = (37 * hash) + FELMBEACBLB_FIELD_NUMBER;
-        hash = (53 * hash) + getFELMBEACBLBList().hashCode();
+      if (getHidePointListCount() > 0) {
+        hash = (37 * hash) + HIDE_POINT_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getHidePointListList().hashCode();
       }
       if (getUnhidePointListCount() > 0) {
         hash = (37 * hash) + UNHIDE_POINT_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getUnhidePointListList().hashCode();
       }
-      if (getBEOCPMCPHJHCount() > 0) {
-        hash = (37 * hash) + BEOCPMCPHJH_FIELD_NUMBER;
-        hash = (53 * hash) + getBEOCPMCPHJHList().hashCode();
+      if (getLockedPointListCount() > 0) {
+        hash = (37 * hash) + LOCKED_POINT_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getLockedPointListList().hashCode();
+      }
+      if (getGroupUnlimitPointListCount() > 0) {
+        hash = (37 * hash) + GROUP_UNLIMIT_POINT_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getGroupUnlimitPointListList().hashCode();
       }
-      if (getDOGJLOBEEPCCount() > 0) {
-        hash = (37 * hash) + DOGJLOBEEPC_FIELD_NUMBER;
-        hash = (53 * hash) + getDOGJLOBEEPCList().hashCode();
+      if (getAOMMPMBGCOECount() > 0) {
+        hash = (37 * hash) + AOMMPMBGCOE_FIELD_NUMBER;
+        hash = (53 * hash) + getAOMMPMBGCOEList().hashCode();
       }
-      if (getOGLOLEOEAGDCount() > 0) {
-        hash = (37 * hash) + OGLOLEOEAGD_FIELD_NUMBER;
-        hash = (53 * hash) + getOGLOLEOEAGDList().hashCode();
+      if (getJCLLNNAMCOOCount() > 0) {
+        hash = (37 * hash) + JCLLNNAMCOO_FIELD_NUMBER;
+        hash = (53 * hash) + getJCLLNNAMCOOList().hashCode();
       }
+      if (getLPIDFIIBCJOCount() > 0) {
+        hash = (37 * hash) + LPIDFIIBCJO_FIELD_NUMBER;
+        hash = (53 * hash) + getLPIDFIIBCJOList().hashCode();
+      }
+      hash = (37 * hash) + IS_RELOGIN_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsRelogin());
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + BELONG_UID_FIELD_NUMBER;
+      hash = (53 * hash) + getBelongUid();
+      hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getSceneId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -1253,7 +1501,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 29349
+     * CmdId: 7599
      * </pre>
      *
      * Protobuf type {@code GetScenePointRsp}
@@ -1293,32 +1541,32 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        unlockedPointList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
         unlockAreaList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        unlockedPointList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
-        lockedPointList_ = emptyIntList();
+        hidePointList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000004);
-        pointList_ = emptyIntList();
+        unhidePointList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000008);
-        sceneId_ = 0;
-
-        belongUid_ = 0;
-
-        retcode_ = 0;
-
-        isNewPlayer_ = false;
-
-        fELMBEACBLB_ = emptyIntList();
+        lockedPointList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000010);
-        unhidePointList_ = emptyIntList();
+        groupUnlimitPointList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000020);
-        bEOCPMCPHJH_ = emptyIntList();
+        aOMMPMBGCOE_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000040);
-        dOGJLOBEEPC_ = emptyIntList();
+        jCLLNNAMCOO_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000080);
-        oGLOLEOEAGD_ = emptyIntList();
+        lPIDFIIBCJO_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000100);
+        isRelogin_ = false;
+
+        retcode_ = 0;
+
+        belongUid_ = 0;
+
+        sceneId_ = 0;
+
         return this;
       }
 
@@ -1347,54 +1595,54 @@ public emu.grasscutter.net.proto.GetScenePointRspOuterClass.GetScenePointRsp bui
         emu.grasscutter.net.proto.GetScenePointRspOuterClass.GetScenePointRsp result = new emu.grasscutter.net.proto.GetScenePointRspOuterClass.GetScenePointRsp(this);
         int from_bitField0_ = bitField0_;
         if (((bitField0_ & 0x00000001) != 0)) {
-          unlockedPointList_.makeImmutable();
+          unlockAreaList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
-        result.unlockedPointList_ = unlockedPointList_;
+        result.unlockAreaList_ = unlockAreaList_;
         if (((bitField0_ & 0x00000002) != 0)) {
-          unlockAreaList_.makeImmutable();
+          unlockedPointList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000002);
         }
-        result.unlockAreaList_ = unlockAreaList_;
+        result.unlockedPointList_ = unlockedPointList_;
         if (((bitField0_ & 0x00000004) != 0)) {
-          lockedPointList_.makeImmutable();
+          hidePointList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000004);
         }
-        result.lockedPointList_ = lockedPointList_;
+        result.hidePointList_ = hidePointList_;
         if (((bitField0_ & 0x00000008) != 0)) {
-          pointList_.makeImmutable();
+          unhidePointList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000008);
         }
-        result.pointList_ = pointList_;
-        result.sceneId_ = sceneId_;
-        result.belongUid_ = belongUid_;
-        result.retcode_ = retcode_;
-        result.isNewPlayer_ = isNewPlayer_;
+        result.unhidePointList_ = unhidePointList_;
         if (((bitField0_ & 0x00000010) != 0)) {
-          fELMBEACBLB_.makeImmutable();
+          lockedPointList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000010);
         }
-        result.fELMBEACBLB_ = fELMBEACBLB_;
+        result.lockedPointList_ = lockedPointList_;
         if (((bitField0_ & 0x00000020) != 0)) {
-          unhidePointList_.makeImmutable();
+          groupUnlimitPointList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000020);
         }
-        result.unhidePointList_ = unhidePointList_;
+        result.groupUnlimitPointList_ = groupUnlimitPointList_;
         if (((bitField0_ & 0x00000040) != 0)) {
-          bEOCPMCPHJH_.makeImmutable();
+          aOMMPMBGCOE_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000040);
         }
-        result.bEOCPMCPHJH_ = bEOCPMCPHJH_;
+        result.aOMMPMBGCOE_ = aOMMPMBGCOE_;
         if (((bitField0_ & 0x00000080) != 0)) {
-          dOGJLOBEEPC_.makeImmutable();
+          jCLLNNAMCOO_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000080);
         }
-        result.dOGJLOBEEPC_ = dOGJLOBEEPC_;
+        result.jCLLNNAMCOO_ = jCLLNNAMCOO_;
         if (((bitField0_ & 0x00000100) != 0)) {
-          oGLOLEOEAGD_.makeImmutable();
+          lPIDFIIBCJO_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000100);
         }
-        result.oGLOLEOEAGD_ = oGLOLEOEAGD_;
+        result.lPIDFIIBCJO_ = lPIDFIIBCJO_;
+        result.isRelogin_ = isRelogin_;
+        result.retcode_ = retcode_;
+        result.belongUid_ = belongUid_;
+        result.sceneId_ = sceneId_;
         onBuilt();
         return result;
       }
@@ -1443,108 +1691,108 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.GetScenePointRspOuterClass.GetScenePointRsp other) {
         if (other == emu.grasscutter.net.proto.GetScenePointRspOuterClass.GetScenePointRsp.getDefaultInstance()) return this;
-        if (!other.unlockedPointList_.isEmpty()) {
-          if (unlockedPointList_.isEmpty()) {
-            unlockedPointList_ = other.unlockedPointList_;
+        if (!other.unlockAreaList_.isEmpty()) {
+          if (unlockAreaList_.isEmpty()) {
+            unlockAreaList_ = other.unlockAreaList_;
             bitField0_ = (bitField0_ & ~0x00000001);
           } else {
-            ensureUnlockedPointListIsMutable();
-            unlockedPointList_.addAll(other.unlockedPointList_);
+            ensureUnlockAreaListIsMutable();
+            unlockAreaList_.addAll(other.unlockAreaList_);
           }
           onChanged();
         }
-        if (!other.unlockAreaList_.isEmpty()) {
-          if (unlockAreaList_.isEmpty()) {
-            unlockAreaList_ = other.unlockAreaList_;
+        if (!other.unlockedPointList_.isEmpty()) {
+          if (unlockedPointList_.isEmpty()) {
+            unlockedPointList_ = other.unlockedPointList_;
             bitField0_ = (bitField0_ & ~0x00000002);
           } else {
-            ensureUnlockAreaListIsMutable();
-            unlockAreaList_.addAll(other.unlockAreaList_);
+            ensureUnlockedPointListIsMutable();
+            unlockedPointList_.addAll(other.unlockedPointList_);
           }
           onChanged();
         }
-        if (!other.lockedPointList_.isEmpty()) {
-          if (lockedPointList_.isEmpty()) {
-            lockedPointList_ = other.lockedPointList_;
+        if (!other.hidePointList_.isEmpty()) {
+          if (hidePointList_.isEmpty()) {
+            hidePointList_ = other.hidePointList_;
             bitField0_ = (bitField0_ & ~0x00000004);
           } else {
-            ensureLockedPointListIsMutable();
-            lockedPointList_.addAll(other.lockedPointList_);
+            ensureHidePointListIsMutable();
+            hidePointList_.addAll(other.hidePointList_);
           }
           onChanged();
         }
-        if (!other.pointList_.isEmpty()) {
-          if (pointList_.isEmpty()) {
-            pointList_ = other.pointList_;
+        if (!other.unhidePointList_.isEmpty()) {
+          if (unhidePointList_.isEmpty()) {
+            unhidePointList_ = other.unhidePointList_;
             bitField0_ = (bitField0_ & ~0x00000008);
           } else {
-            ensurePointListIsMutable();
-            pointList_.addAll(other.pointList_);
+            ensureUnhidePointListIsMutable();
+            unhidePointList_.addAll(other.unhidePointList_);
           }
           onChanged();
         }
-        if (other.getSceneId() != 0) {
-          setSceneId(other.getSceneId());
-        }
-        if (other.getBelongUid() != 0) {
-          setBelongUid(other.getBelongUid());
-        }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
-        if (other.getIsNewPlayer() != false) {
-          setIsNewPlayer(other.getIsNewPlayer());
-        }
-        if (!other.fELMBEACBLB_.isEmpty()) {
-          if (fELMBEACBLB_.isEmpty()) {
-            fELMBEACBLB_ = other.fELMBEACBLB_;
+        if (!other.lockedPointList_.isEmpty()) {
+          if (lockedPointList_.isEmpty()) {
+            lockedPointList_ = other.lockedPointList_;
             bitField0_ = (bitField0_ & ~0x00000010);
           } else {
-            ensureFELMBEACBLBIsMutable();
-            fELMBEACBLB_.addAll(other.fELMBEACBLB_);
+            ensureLockedPointListIsMutable();
+            lockedPointList_.addAll(other.lockedPointList_);
           }
           onChanged();
         }
-        if (!other.unhidePointList_.isEmpty()) {
-          if (unhidePointList_.isEmpty()) {
-            unhidePointList_ = other.unhidePointList_;
+        if (!other.groupUnlimitPointList_.isEmpty()) {
+          if (groupUnlimitPointList_.isEmpty()) {
+            groupUnlimitPointList_ = other.groupUnlimitPointList_;
             bitField0_ = (bitField0_ & ~0x00000020);
           } else {
-            ensureUnhidePointListIsMutable();
-            unhidePointList_.addAll(other.unhidePointList_);
+            ensureGroupUnlimitPointListIsMutable();
+            groupUnlimitPointList_.addAll(other.groupUnlimitPointList_);
           }
           onChanged();
         }
-        if (!other.bEOCPMCPHJH_.isEmpty()) {
-          if (bEOCPMCPHJH_.isEmpty()) {
-            bEOCPMCPHJH_ = other.bEOCPMCPHJH_;
+        if (!other.aOMMPMBGCOE_.isEmpty()) {
+          if (aOMMPMBGCOE_.isEmpty()) {
+            aOMMPMBGCOE_ = other.aOMMPMBGCOE_;
             bitField0_ = (bitField0_ & ~0x00000040);
           } else {
-            ensureBEOCPMCPHJHIsMutable();
-            bEOCPMCPHJH_.addAll(other.bEOCPMCPHJH_);
+            ensureAOMMPMBGCOEIsMutable();
+            aOMMPMBGCOE_.addAll(other.aOMMPMBGCOE_);
           }
           onChanged();
         }
-        if (!other.dOGJLOBEEPC_.isEmpty()) {
-          if (dOGJLOBEEPC_.isEmpty()) {
-            dOGJLOBEEPC_ = other.dOGJLOBEEPC_;
+        if (!other.jCLLNNAMCOO_.isEmpty()) {
+          if (jCLLNNAMCOO_.isEmpty()) {
+            jCLLNNAMCOO_ = other.jCLLNNAMCOO_;
             bitField0_ = (bitField0_ & ~0x00000080);
           } else {
-            ensureDOGJLOBEEPCIsMutable();
-            dOGJLOBEEPC_.addAll(other.dOGJLOBEEPC_);
+            ensureJCLLNNAMCOOIsMutable();
+            jCLLNNAMCOO_.addAll(other.jCLLNNAMCOO_);
           }
           onChanged();
         }
-        if (!other.oGLOLEOEAGD_.isEmpty()) {
-          if (oGLOLEOEAGD_.isEmpty()) {
-            oGLOLEOEAGD_ = other.oGLOLEOEAGD_;
+        if (!other.lPIDFIIBCJO_.isEmpty()) {
+          if (lPIDFIIBCJO_.isEmpty()) {
+            lPIDFIIBCJO_ = other.lPIDFIIBCJO_;
             bitField0_ = (bitField0_ & ~0x00000100);
           } else {
-            ensureOGLOLEOEAGDIsMutable();
-            oGLOLEOEAGD_.addAll(other.oGLOLEOEAGD_);
+            ensureLPIDFIIBCJOIsMutable();
+            lPIDFIIBCJO_.addAll(other.lPIDFIIBCJO_);
           }
           onChanged();
         }
+        if (other.getIsRelogin() != false) {
+          setIsRelogin(other.getIsRelogin());
+        }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
+        if (other.getBelongUid() != 0) {
+          setBelongUid(other.getBelongUid());
+        }
+        if (other.getSceneId() != 0) {
+          setSceneId(other.getSceneId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -1575,31 +1823,150 @@ public Builder mergeFrom(
       }
       private int bitField0_;
 
+      private com.google.protobuf.Internal.IntList unlockAreaList_ = emptyIntList();
+      private void ensureUnlockAreaListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          unlockAreaList_ = mutableCopy(unlockAreaList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 unlock_area_list = 13;</code>
+       * @return A list containing the unlockAreaList.
+       */
+      public java.util.List<java.lang.Integer>
+          getUnlockAreaListList() {
+        return ((bitField0_ & 0x00000001) != 0) ?
+                 java.util.Collections.unmodifiableList(unlockAreaList_) : unlockAreaList_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 unlock_area_list = 13;</code>
+       * @return The count of unlockAreaList.
+       */
+      public int getUnlockAreaListCount() {
+        return unlockAreaList_.size();
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 unlock_area_list = 13;</code>
+       * @param index The index of the element to return.
+       * @return The unlockAreaList at the given index.
+       */
+      public int getUnlockAreaList(int index) {
+        return unlockAreaList_.getInt(index);
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 unlock_area_list = 13;</code>
+       * @param index The index to set the value at.
+       * @param value The unlockAreaList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnlockAreaList(
+          int index, int value) {
+        ensureUnlockAreaListIsMutable();
+        unlockAreaList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 unlock_area_list = 13;</code>
+       * @param value The unlockAreaList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnlockAreaList(int value) {
+        ensureUnlockAreaListIsMutable();
+        unlockAreaList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 unlock_area_list = 13;</code>
+       * @param values The unlockAreaList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnlockAreaList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureUnlockAreaListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unlockAreaList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 unlock_area_list = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnlockAreaList() {
+        unlockAreaList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
       private com.google.protobuf.Internal.IntList unlockedPointList_ = emptyIntList();
       private void ensureUnlockedPointListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
+        if (!((bitField0_ & 0x00000002) != 0)) {
           unlockedPointList_ = mutableCopy(unlockedPointList_);
-          bitField0_ |= 0x00000001;
+          bitField0_ |= 0x00000002;
          }
       }
       /**
-       * <code>repeated uint32 unlocked_point_list = 1;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated uint32 unlocked_point_list = 9;</code>
        * @return A list containing the unlockedPointList.
        */
       public java.util.List<java.lang.Integer>
           getUnlockedPointListList() {
-        return ((bitField0_ & 0x00000001) != 0) ?
+        return ((bitField0_ & 0x00000002) != 0) ?
                  java.util.Collections.unmodifiableList(unlockedPointList_) : unlockedPointList_;
       }
       /**
-       * <code>repeated uint32 unlocked_point_list = 1;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated uint32 unlocked_point_list = 9;</code>
        * @return The count of unlockedPointList.
        */
       public int getUnlockedPointListCount() {
         return unlockedPointList_.size();
       }
       /**
-       * <code>repeated uint32 unlocked_point_list = 1;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated uint32 unlocked_point_list = 9;</code>
        * @param index The index of the element to return.
        * @return The unlockedPointList at the given index.
        */
@@ -1607,7 +1974,11 @@ public int getUnlockedPointList(int index) {
         return unlockedPointList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 unlocked_point_list = 1;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated uint32 unlocked_point_list = 9;</code>
        * @param index The index to set the value at.
        * @param value The unlockedPointList to set.
        * @return This builder for chaining.
@@ -1620,7 +1991,11 @@ public Builder setUnlockedPointList(
         return this;
       }
       /**
-       * <code>repeated uint32 unlocked_point_list = 1;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated uint32 unlocked_point_list = 9;</code>
        * @param value The unlockedPointList to add.
        * @return This builder for chaining.
        */
@@ -1631,7 +2006,11 @@ public Builder addUnlockedPointList(int value) {
         return this;
       }
       /**
-       * <code>repeated uint32 unlocked_point_list = 1;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated uint32 unlocked_point_list = 9;</code>
        * @param values The unlockedPointList to add.
        * @return This builder for chaining.
        */
@@ -1644,120 +2023,271 @@ public Builder addAllUnlockedPointList(
         return this;
       }
       /**
-       * <code>repeated uint32 unlocked_point_list = 1;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated uint32 unlocked_point_list = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearUnlockedPointList() {
         unlockedPointList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList unlockAreaList_ = emptyIntList();
-      private void ensureUnlockAreaListIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
-          unlockAreaList_ = mutableCopy(unlockAreaList_);
-          bitField0_ |= 0x00000002;
+      private com.google.protobuf.Internal.IntList hidePointList_ = emptyIntList();
+      private void ensureHidePointListIsMutable() {
+        if (!((bitField0_ & 0x00000004) != 0)) {
+          hidePointList_ = mutableCopy(hidePointList_);
+          bitField0_ |= 0x00000004;
          }
       }
       /**
-       * <code>repeated uint32 unlock_area_list = 5;</code>
-       * @return A list containing the unlockAreaList.
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated uint32 hide_point_list = 14;</code>
+       * @return A list containing the hidePointList.
        */
       public java.util.List<java.lang.Integer>
-          getUnlockAreaListList() {
-        return ((bitField0_ & 0x00000002) != 0) ?
-                 java.util.Collections.unmodifiableList(unlockAreaList_) : unlockAreaList_;
+          getHidePointListList() {
+        return ((bitField0_ & 0x00000004) != 0) ?
+                 java.util.Collections.unmodifiableList(hidePointList_) : hidePointList_;
       }
       /**
-       * <code>repeated uint32 unlock_area_list = 5;</code>
-       * @return The count of unlockAreaList.
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated uint32 hide_point_list = 14;</code>
+       * @return The count of hidePointList.
        */
-      public int getUnlockAreaListCount() {
-        return unlockAreaList_.size();
+      public int getHidePointListCount() {
+        return hidePointList_.size();
       }
       /**
-       * <code>repeated uint32 unlock_area_list = 5;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated uint32 hide_point_list = 14;</code>
        * @param index The index of the element to return.
-       * @return The unlockAreaList at the given index.
+       * @return The hidePointList at the given index.
        */
-      public int getUnlockAreaList(int index) {
-        return unlockAreaList_.getInt(index);
+      public int getHidePointList(int index) {
+        return hidePointList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 unlock_area_list = 5;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated uint32 hide_point_list = 14;</code>
        * @param index The index to set the value at.
-       * @param value The unlockAreaList to set.
+       * @param value The hidePointList to set.
        * @return This builder for chaining.
        */
-      public Builder setUnlockAreaList(
+      public Builder setHidePointList(
           int index, int value) {
-        ensureUnlockAreaListIsMutable();
-        unlockAreaList_.setInt(index, value);
+        ensureHidePointListIsMutable();
+        hidePointList_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 unlock_area_list = 5;</code>
-       * @param value The unlockAreaList to add.
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated uint32 hide_point_list = 14;</code>
+       * @param value The hidePointList to add.
        * @return This builder for chaining.
        */
-      public Builder addUnlockAreaList(int value) {
-        ensureUnlockAreaListIsMutable();
-        unlockAreaList_.addInt(value);
+      public Builder addHidePointList(int value) {
+        ensureHidePointListIsMutable();
+        hidePointList_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 unlock_area_list = 5;</code>
-       * @param values The unlockAreaList to add.
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated uint32 hide_point_list = 14;</code>
+       * @param values The hidePointList to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnlockAreaList(
+      public Builder addAllHidePointList(
           java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureUnlockAreaListIsMutable();
+        ensureHidePointListIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, unlockAreaList_);
+            values, hidePointList_);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 unlock_area_list = 5;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated uint32 hide_point_list = 14;</code>
        * @return This builder for chaining.
        */
-      public Builder clearUnlockAreaList() {
-        unlockAreaList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+      public Builder clearHidePointList() {
+        hidePointList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000004);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList unhidePointList_ = emptyIntList();
+      private void ensureUnhidePointListIsMutable() {
+        if (!((bitField0_ & 0x00000008) != 0)) {
+          unhidePointList_ = mutableCopy(unhidePointList_);
+          bitField0_ |= 0x00000008;
+         }
+      }
+      /**
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>repeated uint32 unhide_point_list = 6;</code>
+       * @return A list containing the unhidePointList.
+       */
+      public java.util.List<java.lang.Integer>
+          getUnhidePointListList() {
+        return ((bitField0_ & 0x00000008) != 0) ?
+                 java.util.Collections.unmodifiableList(unhidePointList_) : unhidePointList_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>repeated uint32 unhide_point_list = 6;</code>
+       * @return The count of unhidePointList.
+       */
+      public int getUnhidePointListCount() {
+        return unhidePointList_.size();
+      }
+      /**
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>repeated uint32 unhide_point_list = 6;</code>
+       * @param index The index of the element to return.
+       * @return The unhidePointList at the given index.
+       */
+      public int getUnhidePointList(int index) {
+        return unhidePointList_.getInt(index);
+      }
+      /**
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>repeated uint32 unhide_point_list = 6;</code>
+       * @param index The index to set the value at.
+       * @param value The unhidePointList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnhidePointList(
+          int index, int value) {
+        ensureUnhidePointListIsMutable();
+        unhidePointList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>repeated uint32 unhide_point_list = 6;</code>
+       * @param value The unhidePointList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnhidePointList(int value) {
+        ensureUnhidePointListIsMutable();
+        unhidePointList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>repeated uint32 unhide_point_list = 6;</code>
+       * @param values The unhidePointList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnhidePointList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureUnhidePointListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unhidePointList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>repeated uint32 unhide_point_list = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnhidePointList() {
+        unhidePointList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
         return this;
       }
 
       private com.google.protobuf.Internal.IntList lockedPointList_ = emptyIntList();
       private void ensureLockedPointListIsMutable() {
-        if (!((bitField0_ & 0x00000004) != 0)) {
+        if (!((bitField0_ & 0x00000010) != 0)) {
           lockedPointList_ = mutableCopy(lockedPointList_);
-          bitField0_ |= 0x00000004;
+          bitField0_ |= 0x00000010;
          }
       }
       /**
-       * <code>repeated uint32 locked_point_list = 10;</code>
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>repeated uint32 locked_point_list = 5;</code>
        * @return A list containing the lockedPointList.
        */
       public java.util.List<java.lang.Integer>
           getLockedPointListList() {
-        return ((bitField0_ & 0x00000004) != 0) ?
+        return ((bitField0_ & 0x00000010) != 0) ?
                  java.util.Collections.unmodifiableList(lockedPointList_) : lockedPointList_;
       }
       /**
-       * <code>repeated uint32 locked_point_list = 10;</code>
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>repeated uint32 locked_point_list = 5;</code>
        * @return The count of lockedPointList.
        */
       public int getLockedPointListCount() {
         return lockedPointList_.size();
       }
       /**
-       * <code>repeated uint32 locked_point_list = 10;</code>
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>repeated uint32 locked_point_list = 5;</code>
        * @param index The index of the element to return.
        * @return The lockedPointList at the given index.
        */
@@ -1765,7 +2295,11 @@ public int getLockedPointList(int index) {
         return lockedPointList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 locked_point_list = 10;</code>
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>repeated uint32 locked_point_list = 5;</code>
        * @param index The index to set the value at.
        * @param value The lockedPointList to set.
        * @return This builder for chaining.
@@ -1778,7 +2312,11 @@ public Builder setLockedPointList(
         return this;
       }
       /**
-       * <code>repeated uint32 locked_point_list = 10;</code>
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>repeated uint32 locked_point_list = 5;</code>
        * @param value The lockedPointList to add.
        * @return This builder for chaining.
        */
@@ -1789,7 +2327,11 @@ public Builder addLockedPointList(int value) {
         return this;
       }
       /**
-       * <code>repeated uint32 locked_point_list = 10;</code>
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>repeated uint32 locked_point_list = 5;</code>
        * @param values The lockedPointList to add.
        * @return This builder for chaining.
        */
@@ -1802,610 +2344,616 @@ public Builder addAllLockedPointList(
         return this;
       }
       /**
-       * <code>repeated uint32 locked_point_list = 10;</code>
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>repeated uint32 locked_point_list = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearLockedPointList() {
         lockedPointList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000004);
+        bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList pointList_ = emptyIntList();
-      private void ensurePointListIsMutable() {
-        if (!((bitField0_ & 0x00000008) != 0)) {
-          pointList_ = mutableCopy(pointList_);
-          bitField0_ |= 0x00000008;
+      private com.google.protobuf.Internal.IntList groupUnlimitPointList_ = emptyIntList();
+      private void ensureGroupUnlimitPointListIsMutable() {
+        if (!((bitField0_ & 0x00000020) != 0)) {
+          groupUnlimitPointList_ = mutableCopy(groupUnlimitPointList_);
+          bitField0_ |= 0x00000020;
          }
       }
       /**
-       * <code>repeated uint32 point_list = 14;</code>
-       * @return A list containing the pointList.
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>repeated uint32 group_unlimit_point_list = 15;</code>
+       * @return A list containing the groupUnlimitPointList.
        */
       public java.util.List<java.lang.Integer>
-          getPointListList() {
-        return ((bitField0_ & 0x00000008) != 0) ?
-                 java.util.Collections.unmodifiableList(pointList_) : pointList_;
+          getGroupUnlimitPointListList() {
+        return ((bitField0_ & 0x00000020) != 0) ?
+                 java.util.Collections.unmodifiableList(groupUnlimitPointList_) : groupUnlimitPointList_;
       }
       /**
-       * <code>repeated uint32 point_list = 14;</code>
-       * @return The count of pointList.
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>repeated uint32 group_unlimit_point_list = 15;</code>
+       * @return The count of groupUnlimitPointList.
        */
-      public int getPointListCount() {
-        return pointList_.size();
+      public int getGroupUnlimitPointListCount() {
+        return groupUnlimitPointList_.size();
       }
       /**
-       * <code>repeated uint32 point_list = 14;</code>
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>repeated uint32 group_unlimit_point_list = 15;</code>
        * @param index The index of the element to return.
-       * @return The pointList at the given index.
+       * @return The groupUnlimitPointList at the given index.
        */
-      public int getPointList(int index) {
-        return pointList_.getInt(index);
+      public int getGroupUnlimitPointList(int index) {
+        return groupUnlimitPointList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 point_list = 14;</code>
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>repeated uint32 group_unlimit_point_list = 15;</code>
        * @param index The index to set the value at.
-       * @param value The pointList to set.
+       * @param value The groupUnlimitPointList to set.
        * @return This builder for chaining.
        */
-      public Builder setPointList(
+      public Builder setGroupUnlimitPointList(
           int index, int value) {
-        ensurePointListIsMutable();
-        pointList_.setInt(index, value);
+        ensureGroupUnlimitPointListIsMutable();
+        groupUnlimitPointList_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 point_list = 14;</code>
-       * @param value The pointList to add.
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>repeated uint32 group_unlimit_point_list = 15;</code>
+       * @param value The groupUnlimitPointList to add.
        * @return This builder for chaining.
        */
-      public Builder addPointList(int value) {
-        ensurePointListIsMutable();
-        pointList_.addInt(value);
+      public Builder addGroupUnlimitPointList(int value) {
+        ensureGroupUnlimitPointListIsMutable();
+        groupUnlimitPointList_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 point_list = 14;</code>
-       * @param values The pointList to add.
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>repeated uint32 group_unlimit_point_list = 15;</code>
+       * @param values The groupUnlimitPointList to add.
        * @return This builder for chaining.
        */
-      public Builder addAllPointList(
+      public Builder addAllGroupUnlimitPointList(
           java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensurePointListIsMutable();
+        ensureGroupUnlimitPointListIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, pointList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 point_list = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPointList() {
-        pointList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000008);
-        onChanged();
-        return this;
-      }
-
-      private int sceneId_ ;
-      /**
-       * <code>uint32 scene_id = 13;</code>
-       * @return The sceneId.
-       */
-      @java.lang.Override
-      public int getSceneId() {
-        return sceneId_;
-      }
-      /**
-       * <code>uint32 scene_id = 13;</code>
-       * @param value The sceneId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSceneId(int value) {
-        
-        sceneId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 scene_id = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSceneId() {
-        
-        sceneId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int belongUid_ ;
-      /**
-       * <code>uint32 belong_uid = 6;</code>
-       * @return The belongUid.
-       */
-      @java.lang.Override
-      public int getBelongUid() {
-        return belongUid_;
-      }
-      /**
-       * <code>uint32 belong_uid = 6;</code>
-       * @param value The belongUid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setBelongUid(int value) {
-        
-        belongUid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 belong_uid = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearBelongUid() {
-        
-        belongUid_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 8;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <code>int32 retcode = 8;</code>
-       * @param value The retcode to set.
-       * @return This builder for chaining.
-       */
-      public Builder setRetcode(int value) {
-        
-        retcode_ = value;
+            values, groupUnlimitPointList_);
         onChanged();
         return this;
       }
       /**
-       * <code>int32 retcode = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private boolean isNewPlayer_ ;
-      /**
-       * <code>bool is_new_player = 15;</code>
-       * @return The isNewPlayer.
-       */
-      @java.lang.Override
-      public boolean getIsNewPlayer() {
-        return isNewPlayer_;
-      }
-      /**
-       * <code>bool is_new_player = 15;</code>
-       * @param value The isNewPlayer to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsNewPlayer(boolean value) {
-        
-        isNewPlayer_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_new_player = 15;</code>
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>repeated uint32 group_unlimit_point_list = 15;</code>
        * @return This builder for chaining.
        */
-      public Builder clearIsNewPlayer() {
-        
-        isNewPlayer_ = false;
+      public Builder clearGroupUnlimitPointList() {
+        groupUnlimitPointList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000020);
         onChanged();
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList fELMBEACBLB_ = emptyIntList();
-      private void ensureFELMBEACBLBIsMutable() {
-        if (!((bitField0_ & 0x00000010) != 0)) {
-          fELMBEACBLB_ = mutableCopy(fELMBEACBLB_);
-          bitField0_ |= 0x00000010;
+      private com.google.protobuf.Internal.IntList aOMMPMBGCOE_ = emptyIntList();
+      private void ensureAOMMPMBGCOEIsMutable() {
+        if (!((bitField0_ & 0x00000040) != 0)) {
+          aOMMPMBGCOE_ = mutableCopy(aOMMPMBGCOE_);
+          bitField0_ |= 0x00000040;
          }
       }
       /**
-       * <code>repeated uint32 FELMBEACBLB = 2;</code>
-       * @return A list containing the fELMBEACBLB.
+       * <pre>
+       * Offset: 0x50
+       * </pre>
+       *
+       * <code>repeated uint32 AOMMPMBGCOE = 2;</code>
+       * @return A list containing the aOMMPMBGCOE.
        */
       public java.util.List<java.lang.Integer>
-          getFELMBEACBLBList() {
-        return ((bitField0_ & 0x00000010) != 0) ?
-                 java.util.Collections.unmodifiableList(fELMBEACBLB_) : fELMBEACBLB_;
+          getAOMMPMBGCOEList() {
+        return ((bitField0_ & 0x00000040) != 0) ?
+                 java.util.Collections.unmodifiableList(aOMMPMBGCOE_) : aOMMPMBGCOE_;
       }
       /**
-       * <code>repeated uint32 FELMBEACBLB = 2;</code>
-       * @return The count of fELMBEACBLB.
+       * <pre>
+       * Offset: 0x50
+       * </pre>
+       *
+       * <code>repeated uint32 AOMMPMBGCOE = 2;</code>
+       * @return The count of aOMMPMBGCOE.
        */
-      public int getFELMBEACBLBCount() {
-        return fELMBEACBLB_.size();
+      public int getAOMMPMBGCOECount() {
+        return aOMMPMBGCOE_.size();
       }
       /**
-       * <code>repeated uint32 FELMBEACBLB = 2;</code>
+       * <pre>
+       * Offset: 0x50
+       * </pre>
+       *
+       * <code>repeated uint32 AOMMPMBGCOE = 2;</code>
        * @param index The index of the element to return.
-       * @return The fELMBEACBLB at the given index.
+       * @return The aOMMPMBGCOE at the given index.
        */
-      public int getFELMBEACBLB(int index) {
-        return fELMBEACBLB_.getInt(index);
+      public int getAOMMPMBGCOE(int index) {
+        return aOMMPMBGCOE_.getInt(index);
       }
       /**
-       * <code>repeated uint32 FELMBEACBLB = 2;</code>
+       * <pre>
+       * Offset: 0x50
+       * </pre>
+       *
+       * <code>repeated uint32 AOMMPMBGCOE = 2;</code>
        * @param index The index to set the value at.
-       * @param value The fELMBEACBLB to set.
+       * @param value The aOMMPMBGCOE to set.
        * @return This builder for chaining.
        */
-      public Builder setFELMBEACBLB(
+      public Builder setAOMMPMBGCOE(
           int index, int value) {
-        ensureFELMBEACBLBIsMutable();
-        fELMBEACBLB_.setInt(index, value);
+        ensureAOMMPMBGCOEIsMutable();
+        aOMMPMBGCOE_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 FELMBEACBLB = 2;</code>
-       * @param value The fELMBEACBLB to add.
+       * <pre>
+       * Offset: 0x50
+       * </pre>
+       *
+       * <code>repeated uint32 AOMMPMBGCOE = 2;</code>
+       * @param value The aOMMPMBGCOE to add.
        * @return This builder for chaining.
        */
-      public Builder addFELMBEACBLB(int value) {
-        ensureFELMBEACBLBIsMutable();
-        fELMBEACBLB_.addInt(value);
+      public Builder addAOMMPMBGCOE(int value) {
+        ensureAOMMPMBGCOEIsMutable();
+        aOMMPMBGCOE_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 FELMBEACBLB = 2;</code>
-       * @param values The fELMBEACBLB to add.
+       * <pre>
+       * Offset: 0x50
+       * </pre>
+       *
+       * <code>repeated uint32 AOMMPMBGCOE = 2;</code>
+       * @param values The aOMMPMBGCOE to add.
        * @return This builder for chaining.
        */
-      public Builder addAllFELMBEACBLB(
+      public Builder addAllAOMMPMBGCOE(
           java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureFELMBEACBLBIsMutable();
+        ensureAOMMPMBGCOEIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, fELMBEACBLB_);
+            values, aOMMPMBGCOE_);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 FELMBEACBLB = 2;</code>
+       * <pre>
+       * Offset: 0x50
+       * </pre>
+       *
+       * <code>repeated uint32 AOMMPMBGCOE = 2;</code>
        * @return This builder for chaining.
        */
-      public Builder clearFELMBEACBLB() {
-        fELMBEACBLB_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000010);
+      public Builder clearAOMMPMBGCOE() {
+        aOMMPMBGCOE_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000040);
         onChanged();
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList unhidePointList_ = emptyIntList();
-      private void ensureUnhidePointListIsMutable() {
-        if (!((bitField0_ & 0x00000020) != 0)) {
-          unhidePointList_ = mutableCopy(unhidePointList_);
-          bitField0_ |= 0x00000020;
+      private com.google.protobuf.Internal.IntList jCLLNNAMCOO_ = emptyIntList();
+      private void ensureJCLLNNAMCOOIsMutable() {
+        if (!((bitField0_ & 0x00000080) != 0)) {
+          jCLLNNAMCOO_ = mutableCopy(jCLLNNAMCOO_);
+          bitField0_ |= 0x00000080;
          }
       }
       /**
-       * <code>repeated uint32 unhide_point_list = 100;</code>
-       * @return A list containing the unhidePointList.
+       * <pre>
+       * Offset: 0x58
+       * </pre>
+       *
+       * <code>repeated uint32 JCLLNNAMCOO = 7;</code>
+       * @return A list containing the jCLLNNAMCOO.
        */
       public java.util.List<java.lang.Integer>
-          getUnhidePointListList() {
-        return ((bitField0_ & 0x00000020) != 0) ?
-                 java.util.Collections.unmodifiableList(unhidePointList_) : unhidePointList_;
+          getJCLLNNAMCOOList() {
+        return ((bitField0_ & 0x00000080) != 0) ?
+                 java.util.Collections.unmodifiableList(jCLLNNAMCOO_) : jCLLNNAMCOO_;
       }
       /**
-       * <code>repeated uint32 unhide_point_list = 100;</code>
-       * @return The count of unhidePointList.
+       * <pre>
+       * Offset: 0x58
+       * </pre>
+       *
+       * <code>repeated uint32 JCLLNNAMCOO = 7;</code>
+       * @return The count of jCLLNNAMCOO.
        */
-      public int getUnhidePointListCount() {
-        return unhidePointList_.size();
+      public int getJCLLNNAMCOOCount() {
+        return jCLLNNAMCOO_.size();
       }
       /**
-       * <code>repeated uint32 unhide_point_list = 100;</code>
+       * <pre>
+       * Offset: 0x58
+       * </pre>
+       *
+       * <code>repeated uint32 JCLLNNAMCOO = 7;</code>
        * @param index The index of the element to return.
-       * @return The unhidePointList at the given index.
+       * @return The jCLLNNAMCOO at the given index.
        */
-      public int getUnhidePointList(int index) {
-        return unhidePointList_.getInt(index);
+      public int getJCLLNNAMCOO(int index) {
+        return jCLLNNAMCOO_.getInt(index);
       }
       /**
-       * <code>repeated uint32 unhide_point_list = 100;</code>
+       * <pre>
+       * Offset: 0x58
+       * </pre>
+       *
+       * <code>repeated uint32 JCLLNNAMCOO = 7;</code>
        * @param index The index to set the value at.
-       * @param value The unhidePointList to set.
+       * @param value The jCLLNNAMCOO to set.
        * @return This builder for chaining.
        */
-      public Builder setUnhidePointList(
+      public Builder setJCLLNNAMCOO(
           int index, int value) {
-        ensureUnhidePointListIsMutable();
-        unhidePointList_.setInt(index, value);
+        ensureJCLLNNAMCOOIsMutable();
+        jCLLNNAMCOO_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 unhide_point_list = 100;</code>
-       * @param value The unhidePointList to add.
+       * <pre>
+       * Offset: 0x58
+       * </pre>
+       *
+       * <code>repeated uint32 JCLLNNAMCOO = 7;</code>
+       * @param value The jCLLNNAMCOO to add.
        * @return This builder for chaining.
        */
-      public Builder addUnhidePointList(int value) {
-        ensureUnhidePointListIsMutable();
-        unhidePointList_.addInt(value);
+      public Builder addJCLLNNAMCOO(int value) {
+        ensureJCLLNNAMCOOIsMutable();
+        jCLLNNAMCOO_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 unhide_point_list = 100;</code>
-       * @param values The unhidePointList to add.
+       * <pre>
+       * Offset: 0x58
+       * </pre>
+       *
+       * <code>repeated uint32 JCLLNNAMCOO = 7;</code>
+       * @param values The jCLLNNAMCOO to add.
        * @return This builder for chaining.
        */
-      public Builder addAllUnhidePointList(
+      public Builder addAllJCLLNNAMCOO(
           java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureUnhidePointListIsMutable();
+        ensureJCLLNNAMCOOIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, unhidePointList_);
+            values, jCLLNNAMCOO_);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 unhide_point_list = 100;</code>
+       * <pre>
+       * Offset: 0x58
+       * </pre>
+       *
+       * <code>repeated uint32 JCLLNNAMCOO = 7;</code>
        * @return This builder for chaining.
        */
-      public Builder clearUnhidePointList() {
-        unhidePointList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000020);
+      public Builder clearJCLLNNAMCOO() {
+        jCLLNNAMCOO_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000080);
         onChanged();
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList bEOCPMCPHJH_ = emptyIntList();
-      private void ensureBEOCPMCPHJHIsMutable() {
-        if (!((bitField0_ & 0x00000040) != 0)) {
-          bEOCPMCPHJH_ = mutableCopy(bEOCPMCPHJH_);
-          bitField0_ |= 0x00000040;
+      private com.google.protobuf.Internal.IntList lPIDFIIBCJO_ = emptyIntList();
+      private void ensureLPIDFIIBCJOIsMutable() {
+        if (!((bitField0_ & 0x00000100) != 0)) {
+          lPIDFIIBCJO_ = mutableCopy(lPIDFIIBCJO_);
+          bitField0_ |= 0x00000100;
          }
       }
       /**
-       * <code>repeated uint32 BEOCPMCPHJH = 11;</code>
-       * @return A list containing the bEOCPMCPHJH.
+       * <pre>
+       * Offset: 0x60
+       * </pre>
+       *
+       * <code>repeated uint32 LPIDFIIBCJO = 11;</code>
+       * @return A list containing the lPIDFIIBCJO.
        */
       public java.util.List<java.lang.Integer>
-          getBEOCPMCPHJHList() {
-        return ((bitField0_ & 0x00000040) != 0) ?
-                 java.util.Collections.unmodifiableList(bEOCPMCPHJH_) : bEOCPMCPHJH_;
+          getLPIDFIIBCJOList() {
+        return ((bitField0_ & 0x00000100) != 0) ?
+                 java.util.Collections.unmodifiableList(lPIDFIIBCJO_) : lPIDFIIBCJO_;
       }
       /**
-       * <code>repeated uint32 BEOCPMCPHJH = 11;</code>
-       * @return The count of bEOCPMCPHJH.
+       * <pre>
+       * Offset: 0x60
+       * </pre>
+       *
+       * <code>repeated uint32 LPIDFIIBCJO = 11;</code>
+       * @return The count of lPIDFIIBCJO.
        */
-      public int getBEOCPMCPHJHCount() {
-        return bEOCPMCPHJH_.size();
+      public int getLPIDFIIBCJOCount() {
+        return lPIDFIIBCJO_.size();
       }
       /**
-       * <code>repeated uint32 BEOCPMCPHJH = 11;</code>
+       * <pre>
+       * Offset: 0x60
+       * </pre>
+       *
+       * <code>repeated uint32 LPIDFIIBCJO = 11;</code>
        * @param index The index of the element to return.
-       * @return The bEOCPMCPHJH at the given index.
+       * @return The lPIDFIIBCJO at the given index.
        */
-      public int getBEOCPMCPHJH(int index) {
-        return bEOCPMCPHJH_.getInt(index);
+      public int getLPIDFIIBCJO(int index) {
+        return lPIDFIIBCJO_.getInt(index);
       }
       /**
-       * <code>repeated uint32 BEOCPMCPHJH = 11;</code>
+       * <pre>
+       * Offset: 0x60
+       * </pre>
+       *
+       * <code>repeated uint32 LPIDFIIBCJO = 11;</code>
        * @param index The index to set the value at.
-       * @param value The bEOCPMCPHJH to set.
+       * @param value The lPIDFIIBCJO to set.
        * @return This builder for chaining.
        */
-      public Builder setBEOCPMCPHJH(
+      public Builder setLPIDFIIBCJO(
           int index, int value) {
-        ensureBEOCPMCPHJHIsMutable();
-        bEOCPMCPHJH_.setInt(index, value);
+        ensureLPIDFIIBCJOIsMutable();
+        lPIDFIIBCJO_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 BEOCPMCPHJH = 11;</code>
-       * @param value The bEOCPMCPHJH to add.
+       * <pre>
+       * Offset: 0x60
+       * </pre>
+       *
+       * <code>repeated uint32 LPIDFIIBCJO = 11;</code>
+       * @param value The lPIDFIIBCJO to add.
        * @return This builder for chaining.
        */
-      public Builder addBEOCPMCPHJH(int value) {
-        ensureBEOCPMCPHJHIsMutable();
-        bEOCPMCPHJH_.addInt(value);
+      public Builder addLPIDFIIBCJO(int value) {
+        ensureLPIDFIIBCJOIsMutable();
+        lPIDFIIBCJO_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 BEOCPMCPHJH = 11;</code>
-       * @param values The bEOCPMCPHJH to add.
+       * <pre>
+       * Offset: 0x60
+       * </pre>
+       *
+       * <code>repeated uint32 LPIDFIIBCJO = 11;</code>
+       * @param values The lPIDFIIBCJO to add.
        * @return This builder for chaining.
        */
-      public Builder addAllBEOCPMCPHJH(
+      public Builder addAllLPIDFIIBCJO(
           java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureBEOCPMCPHJHIsMutable();
+        ensureLPIDFIIBCJOIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, bEOCPMCPHJH_);
+            values, lPIDFIIBCJO_);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 BEOCPMCPHJH = 11;</code>
+       * <pre>
+       * Offset: 0x60
+       * </pre>
+       *
+       * <code>repeated uint32 LPIDFIIBCJO = 11;</code>
        * @return This builder for chaining.
        */
-      public Builder clearBEOCPMCPHJH() {
-        bEOCPMCPHJH_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000040);
+      public Builder clearLPIDFIIBCJO() {
+        lPIDFIIBCJO_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000100);
         onChanged();
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList dOGJLOBEEPC_ = emptyIntList();
-      private void ensureDOGJLOBEEPCIsMutable() {
-        if (!((bitField0_ & 0x00000080) != 0)) {
-          dOGJLOBEEPC_ = mutableCopy(dOGJLOBEEPC_);
-          bitField0_ |= 0x00000080;
-         }
-      }
-      /**
-       * <code>repeated uint32 DOGJLOBEEPC = 12;</code>
-       * @return A list containing the dOGJLOBEEPC.
-       */
-      public java.util.List<java.lang.Integer>
-          getDOGJLOBEEPCList() {
-        return ((bitField0_ & 0x00000080) != 0) ?
-                 java.util.Collections.unmodifiableList(dOGJLOBEEPC_) : dOGJLOBEEPC_;
-      }
-      /**
-       * <code>repeated uint32 DOGJLOBEEPC = 12;</code>
-       * @return The count of dOGJLOBEEPC.
-       */
-      public int getDOGJLOBEEPCCount() {
-        return dOGJLOBEEPC_.size();
-      }
+      private boolean isRelogin_ ;
       /**
-       * <code>repeated uint32 DOGJLOBEEPC = 12;</code>
-       * @param index The index of the element to return.
-       * @return The dOGJLOBEEPC at the given index.
+       * <pre>
+       * Offset: 0x68
+       * </pre>
+       *
+       * <code>bool is_relogin = 3;</code>
+       * @return The isRelogin.
        */
-      public int getDOGJLOBEEPC(int index) {
-        return dOGJLOBEEPC_.getInt(index);
+      @java.lang.Override
+      public boolean getIsRelogin() {
+        return isRelogin_;
       }
       /**
-       * <code>repeated uint32 DOGJLOBEEPC = 12;</code>
-       * @param index The index to set the value at.
-       * @param value The dOGJLOBEEPC to set.
+       * <pre>
+       * Offset: 0x68
+       * </pre>
+       *
+       * <code>bool is_relogin = 3;</code>
+       * @param value The isRelogin to set.
        * @return This builder for chaining.
        */
-      public Builder setDOGJLOBEEPC(
-          int index, int value) {
-        ensureDOGJLOBEEPCIsMutable();
-        dOGJLOBEEPC_.setInt(index, value);
+      public Builder setIsRelogin(boolean value) {
+        
+        isRelogin_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 DOGJLOBEEPC = 12;</code>
-       * @param value The dOGJLOBEEPC to add.
+       * <pre>
+       * Offset: 0x68
+       * </pre>
+       *
+       * <code>bool is_relogin = 3;</code>
        * @return This builder for chaining.
        */
-      public Builder addDOGJLOBEEPC(int value) {
-        ensureDOGJLOBEEPCIsMutable();
-        dOGJLOBEEPC_.addInt(value);
+      public Builder clearIsRelogin() {
+        
+        isRelogin_ = false;
         onChanged();
         return this;
       }
+
+      private int retcode_ ;
+      /**
+       * <pre>
+       * Offset: 0x6C
+       * </pre>
+       *
+       * <code>int32 retcode = 8;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
       /**
-       * <code>repeated uint32 DOGJLOBEEPC = 12;</code>
-       * @param values The dOGJLOBEEPC to add.
+       * <pre>
+       * Offset: 0x6C
+       * </pre>
+       *
+       * <code>int32 retcode = 8;</code>
+       * @param value The retcode to set.
        * @return This builder for chaining.
        */
-      public Builder addAllDOGJLOBEEPC(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureDOGJLOBEEPCIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, dOGJLOBEEPC_);
+      public Builder setRetcode(int value) {
+        
+        retcode_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 DOGJLOBEEPC = 12;</code>
+       * <pre>
+       * Offset: 0x6C
+       * </pre>
+       *
+       * <code>int32 retcode = 8;</code>
        * @return This builder for chaining.
        */
-      public Builder clearDOGJLOBEEPC() {
-        dOGJLOBEEPC_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000080);
+      public Builder clearRetcode() {
+        
+        retcode_ = 0;
         onChanged();
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList oGLOLEOEAGD_ = emptyIntList();
-      private void ensureOGLOLEOEAGDIsMutable() {
-        if (!((bitField0_ & 0x00000100) != 0)) {
-          oGLOLEOEAGD_ = mutableCopy(oGLOLEOEAGD_);
-          bitField0_ |= 0x00000100;
-         }
-      }
-      /**
-       * <code>repeated uint32 OGLOLEOEAGD = 140;</code>
-       * @return A list containing the oGLOLEOEAGD.
-       */
-      public java.util.List<java.lang.Integer>
-          getOGLOLEOEAGDList() {
-        return ((bitField0_ & 0x00000100) != 0) ?
-                 java.util.Collections.unmodifiableList(oGLOLEOEAGD_) : oGLOLEOEAGD_;
-      }
-      /**
-       * <code>repeated uint32 OGLOLEOEAGD = 140;</code>
-       * @return The count of oGLOLEOEAGD.
-       */
-      public int getOGLOLEOEAGDCount() {
-        return oGLOLEOEAGD_.size();
-      }
+      private int belongUid_ ;
       /**
-       * <code>repeated uint32 OGLOLEOEAGD = 140;</code>
-       * @param index The index of the element to return.
-       * @return The oGLOLEOEAGD at the given index.
+       * <pre>
+       * Offset: 0x70
+       * </pre>
+       *
+       * <code>uint32 belong_uid = 1;</code>
+       * @return The belongUid.
        */
-      public int getOGLOLEOEAGD(int index) {
-        return oGLOLEOEAGD_.getInt(index);
+      @java.lang.Override
+      public int getBelongUid() {
+        return belongUid_;
       }
       /**
-       * <code>repeated uint32 OGLOLEOEAGD = 140;</code>
-       * @param index The index to set the value at.
-       * @param value The oGLOLEOEAGD to set.
+       * <pre>
+       * Offset: 0x70
+       * </pre>
+       *
+       * <code>uint32 belong_uid = 1;</code>
+       * @param value The belongUid to set.
        * @return This builder for chaining.
        */
-      public Builder setOGLOLEOEAGD(
-          int index, int value) {
-        ensureOGLOLEOEAGDIsMutable();
-        oGLOLEOEAGD_.setInt(index, value);
+      public Builder setBelongUid(int value) {
+        
+        belongUid_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 OGLOLEOEAGD = 140;</code>
-       * @param value The oGLOLEOEAGD to add.
+       * <pre>
+       * Offset: 0x70
+       * </pre>
+       *
+       * <code>uint32 belong_uid = 1;</code>
        * @return This builder for chaining.
        */
-      public Builder addOGLOLEOEAGD(int value) {
-        ensureOGLOLEOEAGDIsMutable();
-        oGLOLEOEAGD_.addInt(value);
+      public Builder clearBelongUid() {
+        
+        belongUid_ = 0;
         onChanged();
         return this;
       }
+
+      private int sceneId_ ;
+      /**
+       * <pre>
+       * Offset: 0x74
+       * </pre>
+       *
+       * <code>uint32 scene_id = 12;</code>
+       * @return The sceneId.
+       */
+      @java.lang.Override
+      public int getSceneId() {
+        return sceneId_;
+      }
       /**
-       * <code>repeated uint32 OGLOLEOEAGD = 140;</code>
-       * @param values The oGLOLEOEAGD to add.
+       * <pre>
+       * Offset: 0x74
+       * </pre>
+       *
+       * <code>uint32 scene_id = 12;</code>
+       * @param value The sceneId to set.
        * @return This builder for chaining.
        */
-      public Builder addAllOGLOLEOEAGD(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureOGLOLEOEAGDIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, oGLOLEOEAGD_);
+      public Builder setSceneId(int value) {
+        
+        sceneId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 OGLOLEOEAGD = 140;</code>
+       * <pre>
+       * Offset: 0x74
+       * </pre>
+       *
+       * <code>uint32 scene_id = 12;</code>
        * @return This builder for chaining.
        */
-      public Builder clearOGLOLEOEAGD() {
-        oGLOLEOEAGD_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000100);
+      public Builder clearSceneId() {
+        
+        sceneId_ = 0;
         onChanged();
         return this;
       }
@@ -2476,16 +3024,16 @@ public emu.grasscutter.net.proto.GetScenePointRspOuterClass.GetScenePointRsp get
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\026GetScenePointRsp.proto\"\266\002\n\020GetScenePoi" +
-      "ntRsp\022\033\n\023unlocked_point_list\030\001 \003(\r\022\030\n\020un" +
-      "lock_area_list\030\005 \003(\r\022\031\n\021locked_point_lis" +
-      "t\030\n \003(\r\022\022\n\npoint_list\030\016 \003(\r\022\020\n\010scene_id\030" +
-      "\r \001(\r\022\022\n\nbelong_uid\030\006 \001(\r\022\017\n\007retcode\030\010 \001" +
-      "(\005\022\025\n\ris_new_player\030\017 \001(\010\022\023\n\013FELMBEACBLB" +
-      "\030\002 \003(\r\022\031\n\021unhide_point_list\030d \003(\r\022\023\n\013BEO" +
-      "CPMCPHJH\030\013 \003(\r\022\023\n\013DOGJLOBEEPC\030\014 \003(\r\022\024\n\013O" +
-      "GLOLEOEAGD\030\214\001 \003(\rB\033\n\031emu.grasscutter.net" +
-      ".protob\006proto3"
+      "\n\026GetScenePointRsp.proto\"\304\002\n\020GetScenePoi" +
+      "ntRsp\022\030\n\020unlock_area_list\030\r \003(\r\022\033\n\023unloc" +
+      "ked_point_list\030\t \003(\r\022\027\n\017hide_point_list\030" +
+      "\016 \003(\r\022\031\n\021unhide_point_list\030\006 \003(\r\022\031\n\021lock" +
+      "ed_point_list\030\005 \003(\r\022 \n\030group_unlimit_poi" +
+      "nt_list\030\017 \003(\r\022\023\n\013AOMMPMBGCOE\030\002 \003(\r\022\023\n\013JC" +
+      "LLNNAMCOO\030\007 \003(\r\022\023\n\013LPIDFIIBCJO\030\013 \003(\r\022\022\n\n" +
+      "is_relogin\030\003 \001(\010\022\017\n\007retcode\030\010 \001(\005\022\022\n\nbel" +
+      "ong_uid\030\001 \001(\r\022\020\n\010scene_id\030\014 \001(\rB\033\n\031emu.g" +
+      "rasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -2496,7 +3044,7 @@ public emu.grasscutter.net.proto.GetScenePointRspOuterClass.GetScenePointRsp get
     internal_static_GetScenePointRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetScenePointRsp_descriptor,
-        new java.lang.String[] { "UnlockedPointList", "UnlockAreaList", "LockedPointList", "PointList", "SceneId", "BelongUid", "Retcode", "IsNewPlayer", "FELMBEACBLB", "UnhidePointList", "BEOCPMCPHJH", "DOGJLOBEEPC", "OGLOLEOEAGD", });
+        new java.lang.String[] { "UnlockAreaList", "UnlockedPointList", "HidePointList", "UnhidePointList", "LockedPointList", "GroupUnlimitPointList", "AOMMPMBGCOE", "JCLLNNAMCOO", "LPIDFIIBCJO", "IsRelogin", "Retcode", "BelongUid", "SceneId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetWidgetSlotRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetWidgetSlotRspOuterClass.java
index 7536e173aec..2621d95831f 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetWidgetSlotRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetWidgetSlotRspOuterClass.java
@@ -19,38 +19,62 @@ public interface GetWidgetSlotRspOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 9;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
-    /**
-     * <code>repeated .WidgetSlotData slot_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .WidgetSlotData slot_list = 2;</code>
      */
     java.util.List<emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData> 
         getSlotListList();
     /**
-     * <code>repeated .WidgetSlotData slot_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .WidgetSlotData slot_list = 2;</code>
      */
     emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData getSlotList(int index);
     /**
-     * <code>repeated .WidgetSlotData slot_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .WidgetSlotData slot_list = 2;</code>
      */
     int getSlotListCount();
     /**
-     * <code>repeated .WidgetSlotData slot_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .WidgetSlotData slot_list = 2;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder> 
         getSlotListOrBuilderList();
     /**
-     * <code>repeated .WidgetSlotData slot_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .WidgetSlotData slot_list = 2;</code>
      */
     emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder getSlotListOrBuilder(
         int index);
+
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>int32 retcode = 7;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
   }
   /**
    * <pre>
-   * CmdId: 5441
+   * CmdId: 25921
    * </pre>
    *
    * Protobuf type {@code GetWidgetSlotRsp}
@@ -99,12 +123,7 @@ private GetWidgetSlotRsp(
             case 0:
               done = true;
               break;
-            case 72: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 82: {
+            case 18: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 slotList_ = new java.util.ArrayList<emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData>();
                 mutable_bitField0_ |= 0x00000001;
@@ -113,6 +132,11 @@ private GetWidgetSlotRsp(
                   input.readMessage(emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.parser(), extensionRegistry));
               break;
             }
+            case 56: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -148,28 +172,25 @@ private GetWidgetSlotRsp(
               emu.grasscutter.net.proto.GetWidgetSlotRspOuterClass.GetWidgetSlotRsp.class, emu.grasscutter.net.proto.GetWidgetSlotRspOuterClass.GetWidgetSlotRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 9;
-    private int retcode_;
-    /**
-     * <code>int32 retcode = 9;</code>
-     * @return The retcode.
-     */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
-    }
-
-    public static final int SLOT_LIST_FIELD_NUMBER = 10;
+    public static final int SLOT_LIST_FIELD_NUMBER = 2;
     private java.util.List<emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData> slotList_;
     /**
-     * <code>repeated .WidgetSlotData slot_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .WidgetSlotData slot_list = 2;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData> getSlotListList() {
       return slotList_;
     }
     /**
-     * <code>repeated .WidgetSlotData slot_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .WidgetSlotData slot_list = 2;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder> 
@@ -177,21 +198,33 @@ public java.util.List<emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetS
       return slotList_;
     }
     /**
-     * <code>repeated .WidgetSlotData slot_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .WidgetSlotData slot_list = 2;</code>
      */
     @java.lang.Override
     public int getSlotListCount() {
       return slotList_.size();
     }
     /**
-     * <code>repeated .WidgetSlotData slot_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .WidgetSlotData slot_list = 2;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData getSlotList(int index) {
       return slotList_.get(index);
     }
     /**
-     * <code>repeated .WidgetSlotData slot_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .WidgetSlotData slot_list = 2;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder getSlotListOrBuilder(
@@ -199,6 +232,21 @@ public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilde
       return slotList_.get(index);
     }
 
+    public static final int RETCODE_FIELD_NUMBER = 7;
+    private int retcode_;
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>int32 retcode = 7;</code>
+     * @return The retcode.
+     */
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -213,11 +261,11 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (retcode_ != 0) {
-        output.writeInt32(9, retcode_);
-      }
       for (int i = 0; i < slotList_.size(); i++) {
-        output.writeMessage(10, slotList_.get(i));
+        output.writeMessage(2, slotList_.get(i));
+      }
+      if (retcode_ != 0) {
+        output.writeInt32(7, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -228,13 +276,13 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (retcode_ != 0) {
+      for (int i = 0; i < slotList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(9, retcode_);
+          .computeMessageSize(2, slotList_.get(i));
       }
-      for (int i = 0; i < slotList_.size(); i++) {
+      if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(10, slotList_.get(i));
+          .computeInt32Size(7, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -251,10 +299,10 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.GetWidgetSlotRspOuterClass.GetWidgetSlotRsp other = (emu.grasscutter.net.proto.GetWidgetSlotRspOuterClass.GetWidgetSlotRsp) obj;
 
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (!getSlotListList()
           .equals(other.getSlotListList())) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -266,12 +314,12 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       if (getSlotListCount() > 0) {
         hash = (37 * hash) + SLOT_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getSlotListList().hashCode();
       }
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -369,7 +417,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 5441
+     * CmdId: 25921
      * </pre>
      *
      * Protobuf type {@code GetWidgetSlotRsp}
@@ -410,14 +458,14 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        retcode_ = 0;
-
         if (slotListBuilder_ == null) {
           slotList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           slotListBuilder_.clear();
         }
+        retcode_ = 0;
+
         return this;
       }
 
@@ -445,7 +493,6 @@ public emu.grasscutter.net.proto.GetWidgetSlotRspOuterClass.GetWidgetSlotRsp bui
       public emu.grasscutter.net.proto.GetWidgetSlotRspOuterClass.GetWidgetSlotRsp buildPartial() {
         emu.grasscutter.net.proto.GetWidgetSlotRspOuterClass.GetWidgetSlotRsp result = new emu.grasscutter.net.proto.GetWidgetSlotRspOuterClass.GetWidgetSlotRsp(this);
         int from_bitField0_ = bitField0_;
-        result.retcode_ = retcode_;
         if (slotListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             slotList_ = java.util.Collections.unmodifiableList(slotList_);
@@ -455,6 +502,7 @@ public emu.grasscutter.net.proto.GetWidgetSlotRspOuterClass.GetWidgetSlotRsp bui
         } else {
           result.slotList_ = slotListBuilder_.build();
         }
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -503,9 +551,6 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.GetWidgetSlotRspOuterClass.GetWidgetSlotRsp other) {
         if (other == emu.grasscutter.net.proto.GetWidgetSlotRspOuterClass.GetWidgetSlotRsp.getDefaultInstance()) return this;
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         if (slotListBuilder_ == null) {
           if (!other.slotList_.isEmpty()) {
             if (slotList_.isEmpty()) {
@@ -532,6 +577,9 @@ public Builder mergeFrom(emu.grasscutter.net.proto.GetWidgetSlotRspOuterClass.Ge
             }
           }
         }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -562,37 +610,6 @@ public Builder mergeFrom(
       }
       private int bitField0_;
 
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 9;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <code>int32 retcode = 9;</code>
-       * @param value The retcode to set.
-       * @return This builder for chaining.
-       */
-      public Builder setRetcode(int value) {
-        
-        retcode_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>int32 retcode = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
       private java.util.List<emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData> slotList_ =
         java.util.Collections.emptyList();
       private void ensureSlotListIsMutable() {
@@ -606,7 +623,11 @@ private void ensureSlotListIsMutable() {
           emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData, emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder, emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder> slotListBuilder_;
 
       /**
-       * <code>repeated .WidgetSlotData slot_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .WidgetSlotData slot_list = 2;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData> getSlotListList() {
         if (slotListBuilder_ == null) {
@@ -616,7 +637,11 @@ public java.util.List<emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetS
         }
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .WidgetSlotData slot_list = 2;</code>
        */
       public int getSlotListCount() {
         if (slotListBuilder_ == null) {
@@ -626,7 +651,11 @@ public int getSlotListCount() {
         }
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .WidgetSlotData slot_list = 2;</code>
        */
       public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData getSlotList(int index) {
         if (slotListBuilder_ == null) {
@@ -636,7 +665,11 @@ public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData getSlot
         }
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .WidgetSlotData slot_list = 2;</code>
        */
       public Builder setSlotList(
           int index, emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData value) {
@@ -653,7 +686,11 @@ public Builder setSlotList(
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .WidgetSlotData slot_list = 2;</code>
        */
       public Builder setSlotList(
           int index, emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder builderForValue) {
@@ -667,7 +704,11 @@ public Builder setSlotList(
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .WidgetSlotData slot_list = 2;</code>
        */
       public Builder addSlotList(emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData value) {
         if (slotListBuilder_ == null) {
@@ -683,7 +724,11 @@ public Builder addSlotList(emu.grasscutter.net.proto.WidgetSlotDataOuterClass.Wi
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .WidgetSlotData slot_list = 2;</code>
        */
       public Builder addSlotList(
           int index, emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData value) {
@@ -700,7 +745,11 @@ public Builder addSlotList(
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .WidgetSlotData slot_list = 2;</code>
        */
       public Builder addSlotList(
           emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder builderForValue) {
@@ -714,7 +763,11 @@ public Builder addSlotList(
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .WidgetSlotData slot_list = 2;</code>
        */
       public Builder addSlotList(
           int index, emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder builderForValue) {
@@ -728,7 +781,11 @@ public Builder addSlotList(
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .WidgetSlotData slot_list = 2;</code>
        */
       public Builder addAllSlotList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData> values) {
@@ -743,7 +800,11 @@ public Builder addAllSlotList(
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .WidgetSlotData slot_list = 2;</code>
        */
       public Builder clearSlotList() {
         if (slotListBuilder_ == null) {
@@ -756,7 +817,11 @@ public Builder clearSlotList() {
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .WidgetSlotData slot_list = 2;</code>
        */
       public Builder removeSlotList(int index) {
         if (slotListBuilder_ == null) {
@@ -769,14 +834,22 @@ public Builder removeSlotList(int index) {
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .WidgetSlotData slot_list = 2;</code>
        */
       public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder getSlotListBuilder(
           int index) {
         return getSlotListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .WidgetSlotData slot_list = 2;</code>
        */
       public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder getSlotListOrBuilder(
           int index) {
@@ -786,7 +859,11 @@ public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilde
         }
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .WidgetSlotData slot_list = 2;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder> 
            getSlotListOrBuilderList() {
@@ -797,14 +874,22 @@ public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilde
         }
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .WidgetSlotData slot_list = 2;</code>
        */
       public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder addSlotListBuilder() {
         return getSlotListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.getDefaultInstance());
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .WidgetSlotData slot_list = 2;</code>
        */
       public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder addSlotListBuilder(
           int index) {
@@ -812,7 +897,11 @@ public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder
             index, emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.getDefaultInstance());
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .WidgetSlotData slot_list = 2;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder> 
            getSlotListBuilderList() {
@@ -832,6 +921,49 @@ public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder
         }
         return slotListBuilder_;
       }
+
+      private int retcode_ ;
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>int32 retcode = 7;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>int32 retcode = 7;</code>
+       * @param value The retcode to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRetcode(int value) {
+        
+        retcode_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>int32 retcode = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRetcode() {
+        
+        retcode_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -900,8 +1032,8 @@ public emu.grasscutter.net.proto.GetWidgetSlotRspOuterClass.GetWidgetSlotRsp get
   static {
     java.lang.String[] descriptorData = {
       "\n\026GetWidgetSlotRsp.proto\032\024WidgetSlotData" +
-      ".proto\"G\n\020GetWidgetSlotRsp\022\017\n\007retcode\030\t " +
-      "\001(\005\022\"\n\tslot_list\030\n \003(\0132\017.WidgetSlotDataB" +
+      ".proto\"G\n\020GetWidgetSlotRsp\022\"\n\tslot_list\030" +
+      "\002 \003(\0132\017.WidgetSlotData\022\017\n\007retcode\030\007 \001(\005B" +
       "\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -914,7 +1046,7 @@ public emu.grasscutter.net.proto.GetWidgetSlotRspOuterClass.GetWidgetSlotRsp get
     internal_static_GetWidgetSlotRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetWidgetSlotRsp_descriptor,
-        new java.lang.String[] { "Retcode", "SlotList", });
+        new java.lang.String[] { "SlotList", "Retcode", });
     emu.grasscutter.net.proto.WidgetSlotDataOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HostPlayerNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HostPlayerNotifyOuterClass.java
index 4ee670e994c..831e7052bd5 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HostPlayerNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HostPlayerNotifyOuterClass.java
@@ -19,20 +19,28 @@ public interface HostPlayerNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 host_uid = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 host_uid = 6;</code>
      * @return The hostUid.
      */
     int getHostUid();
 
     /**
-     * <code>uint32 host_peer_id = 9;</code>
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 host_peer_id = 10;</code>
      * @return The hostPeerId.
      */
     int getHostPeerId();
   }
   /**
    * <pre>
-   * CmdId: 2109
+   * CmdId: 5855
    * </pre>
    *
    * Protobuf type {@code HostPlayerNotify}
@@ -79,12 +87,12 @@ private HostPlayerNotify(
             case 0:
               done = true;
               break;
-            case 8: {
+            case 48: {
 
               hostUid_ = input.readUInt32();
               break;
             }
-            case 72: {
+            case 80: {
 
               hostPeerId_ = input.readUInt32();
               break;
@@ -121,10 +129,14 @@ private HostPlayerNotify(
               emu.grasscutter.net.proto.HostPlayerNotifyOuterClass.HostPlayerNotify.class, emu.grasscutter.net.proto.HostPlayerNotifyOuterClass.HostPlayerNotify.Builder.class);
     }
 
-    public static final int HOST_UID_FIELD_NUMBER = 1;
+    public static final int HOST_UID_FIELD_NUMBER = 6;
     private int hostUid_;
     /**
-     * <code>uint32 host_uid = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 host_uid = 6;</code>
      * @return The hostUid.
      */
     @java.lang.Override
@@ -132,10 +144,14 @@ public int getHostUid() {
       return hostUid_;
     }
 
-    public static final int HOST_PEER_ID_FIELD_NUMBER = 9;
+    public static final int HOST_PEER_ID_FIELD_NUMBER = 10;
     private int hostPeerId_;
     /**
-     * <code>uint32 host_peer_id = 9;</code>
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 host_peer_id = 10;</code>
      * @return The hostPeerId.
      */
     @java.lang.Override
@@ -158,10 +174,10 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (hostUid_ != 0) {
-        output.writeUInt32(1, hostUid_);
+        output.writeUInt32(6, hostUid_);
       }
       if (hostPeerId_ != 0) {
-        output.writeUInt32(9, hostPeerId_);
+        output.writeUInt32(10, hostPeerId_);
       }
       unknownFields.writeTo(output);
     }
@@ -174,11 +190,11 @@ public int getSerializedSize() {
       size = 0;
       if (hostUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, hostUid_);
+          .computeUInt32Size(6, hostUid_);
       }
       if (hostPeerId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, hostPeerId_);
+          .computeUInt32Size(10, hostPeerId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -311,7 +327,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 2109
+     * CmdId: 5855
      * </pre>
      *
      * Protobuf type {@code HostPlayerNotify}
@@ -468,7 +484,11 @@ public Builder mergeFrom(
 
       private int hostUid_ ;
       /**
-       * <code>uint32 host_uid = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 host_uid = 6;</code>
        * @return The hostUid.
        */
       @java.lang.Override
@@ -476,7 +496,11 @@ public int getHostUid() {
         return hostUid_;
       }
       /**
-       * <code>uint32 host_uid = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 host_uid = 6;</code>
        * @param value The hostUid to set.
        * @return This builder for chaining.
        */
@@ -487,7 +511,11 @@ public Builder setHostUid(int value) {
         return this;
       }
       /**
-       * <code>uint32 host_uid = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 host_uid = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearHostUid() {
@@ -499,7 +527,11 @@ public Builder clearHostUid() {
 
       private int hostPeerId_ ;
       /**
-       * <code>uint32 host_peer_id = 9;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 host_peer_id = 10;</code>
        * @return The hostPeerId.
        */
       @java.lang.Override
@@ -507,7 +539,11 @@ public int getHostPeerId() {
         return hostPeerId_;
       }
       /**
-       * <code>uint32 host_peer_id = 9;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 host_peer_id = 10;</code>
        * @param value The hostPeerId to set.
        * @return This builder for chaining.
        */
@@ -518,7 +554,11 @@ public Builder setHostPeerId(int value) {
         return this;
       }
       /**
-       * <code>uint32 host_peer_id = 9;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 host_peer_id = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearHostPeerId() {
@@ -595,7 +635,7 @@ public emu.grasscutter.net.proto.HostPlayerNotifyOuterClass.HostPlayerNotify get
   static {
     java.lang.String[] descriptorData = {
       "\n\026HostPlayerNotify.proto\":\n\020HostPlayerNo" +
-      "tify\022\020\n\010host_uid\030\001 \001(\r\022\024\n\014host_peer_id\030\t" +
+      "tify\022\020\n\010host_uid\030\006 \001(\r\022\024\n\014host_peer_id\030\n" +
       " \001(\rB\033\n\031emu.grasscutter.net.protob\006proto" +
       "3"
     };
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/InferencePageInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/InferencePageInfoOuterClass.java
index bbdc926ef36..7b158ae9510 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/InferencePageInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/InferencePageInfoOuterClass.java
@@ -19,34 +19,58 @@ public interface InferencePageInfoOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 page_id = 6;</code>
-     * @return The pageId.
-     */
-    int getPageId();
-
-    /**
-     * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .InferenceWordInfo unlock_word_list = 4;</code>
      */
     java.util.List<emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo> 
         getUnlockWordListList();
     /**
-     * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .InferenceWordInfo unlock_word_list = 4;</code>
      */
     emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo getUnlockWordList(int index);
     /**
-     * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .InferenceWordInfo unlock_word_list = 4;</code>
      */
     int getUnlockWordListCount();
     /**
-     * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .InferenceWordInfo unlock_word_list = 4;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfoOrBuilder> 
         getUnlockWordListOrBuilderList();
     /**
-     * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .InferenceWordInfo unlock_word_list = 4;</code>
      */
     emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfoOrBuilder getUnlockWordListOrBuilder(
         int index);
+
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 page_id = 11;</code>
+     * @return The pageId.
+     */
+    int getPageId();
   }
   /**
    * Protobuf type {@code InferencePageInfo}
@@ -95,12 +119,7 @@ private InferencePageInfo(
             case 0:
               done = true;
               break;
-            case 48: {
-
-              pageId_ = input.readUInt32();
-              break;
-            }
-            case 90: {
+            case 34: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 unlockWordList_ = new java.util.ArrayList<emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -109,6 +128,11 @@ private InferencePageInfo(
                   input.readMessage(emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo.parser(), extensionRegistry));
               break;
             }
+            case 88: {
+
+              pageId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -144,28 +168,25 @@ private InferencePageInfo(
               emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.class, emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.Builder.class);
     }
 
-    public static final int PAGE_ID_FIELD_NUMBER = 6;
-    private int pageId_;
-    /**
-     * <code>uint32 page_id = 6;</code>
-     * @return The pageId.
-     */
-    @java.lang.Override
-    public int getPageId() {
-      return pageId_;
-    }
-
-    public static final int UNLOCK_WORD_LIST_FIELD_NUMBER = 11;
+    public static final int UNLOCK_WORD_LIST_FIELD_NUMBER = 4;
     private java.util.List<emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo> unlockWordList_;
     /**
-     * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .InferenceWordInfo unlock_word_list = 4;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo> getUnlockWordListList() {
       return unlockWordList_;
     }
     /**
-     * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .InferenceWordInfo unlock_word_list = 4;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfoOrBuilder> 
@@ -173,21 +194,33 @@ public java.util.List<emu.grasscutter.net.proto.InferenceWordInfoOuterClass.Infe
       return unlockWordList_;
     }
     /**
-     * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .InferenceWordInfo unlock_word_list = 4;</code>
      */
     @java.lang.Override
     public int getUnlockWordListCount() {
       return unlockWordList_.size();
     }
     /**
-     * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .InferenceWordInfo unlock_word_list = 4;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo getUnlockWordList(int index) {
       return unlockWordList_.get(index);
     }
     /**
-     * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .InferenceWordInfo unlock_word_list = 4;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfoOrBuilder getUnlockWordListOrBuilder(
@@ -195,6 +228,21 @@ public emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfoOr
       return unlockWordList_.get(index);
     }
 
+    public static final int PAGE_ID_FIELD_NUMBER = 11;
+    private int pageId_;
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 page_id = 11;</code>
+     * @return The pageId.
+     */
+    @java.lang.Override
+    public int getPageId() {
+      return pageId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -209,11 +257,11 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (pageId_ != 0) {
-        output.writeUInt32(6, pageId_);
-      }
       for (int i = 0; i < unlockWordList_.size(); i++) {
-        output.writeMessage(11, unlockWordList_.get(i));
+        output.writeMessage(4, unlockWordList_.get(i));
+      }
+      if (pageId_ != 0) {
+        output.writeUInt32(11, pageId_);
       }
       unknownFields.writeTo(output);
     }
@@ -224,13 +272,13 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (pageId_ != 0) {
+      for (int i = 0; i < unlockWordList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, pageId_);
+          .computeMessageSize(4, unlockWordList_.get(i));
       }
-      for (int i = 0; i < unlockWordList_.size(); i++) {
+      if (pageId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(11, unlockWordList_.get(i));
+          .computeUInt32Size(11, pageId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -247,10 +295,10 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo other = (emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo) obj;
 
-      if (getPageId()
-          != other.getPageId()) return false;
       if (!getUnlockWordListList()
           .equals(other.getUnlockWordListList())) return false;
+      if (getPageId()
+          != other.getPageId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -262,12 +310,12 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + PAGE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getPageId();
       if (getUnlockWordListCount() > 0) {
         hash = (37 * hash) + UNLOCK_WORD_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getUnlockWordListList().hashCode();
       }
+      hash = (37 * hash) + PAGE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getPageId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -402,14 +450,14 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        pageId_ = 0;
-
         if (unlockWordListBuilder_ == null) {
           unlockWordList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           unlockWordListBuilder_.clear();
         }
+        pageId_ = 0;
+
         return this;
       }
 
@@ -437,7 +485,6 @@ public emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo b
       public emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo buildPartial() {
         emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo result = new emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo(this);
         int from_bitField0_ = bitField0_;
-        result.pageId_ = pageId_;
         if (unlockWordListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             unlockWordList_ = java.util.Collections.unmodifiableList(unlockWordList_);
@@ -447,6 +494,7 @@ public emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo b
         } else {
           result.unlockWordList_ = unlockWordListBuilder_.build();
         }
+        result.pageId_ = pageId_;
         onBuilt();
         return result;
       }
@@ -495,9 +543,6 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo other) {
         if (other == emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.getDefaultInstance()) return this;
-        if (other.getPageId() != 0) {
-          setPageId(other.getPageId());
-        }
         if (unlockWordListBuilder_ == null) {
           if (!other.unlockWordList_.isEmpty()) {
             if (unlockWordList_.isEmpty()) {
@@ -524,6 +569,9 @@ public Builder mergeFrom(emu.grasscutter.net.proto.InferencePageInfoOuterClass.I
             }
           }
         }
+        if (other.getPageId() != 0) {
+          setPageId(other.getPageId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -554,37 +602,6 @@ public Builder mergeFrom(
       }
       private int bitField0_;
 
-      private int pageId_ ;
-      /**
-       * <code>uint32 page_id = 6;</code>
-       * @return The pageId.
-       */
-      @java.lang.Override
-      public int getPageId() {
-        return pageId_;
-      }
-      /**
-       * <code>uint32 page_id = 6;</code>
-       * @param value The pageId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPageId(int value) {
-        
-        pageId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 page_id = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPageId() {
-        
-        pageId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private java.util.List<emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo> unlockWordList_ =
         java.util.Collections.emptyList();
       private void ensureUnlockWordListIsMutable() {
@@ -598,7 +615,11 @@ private void ensureUnlockWordListIsMutable() {
           emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo, emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo.Builder, emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfoOrBuilder> unlockWordListBuilder_;
 
       /**
-       * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .InferenceWordInfo unlock_word_list = 4;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo> getUnlockWordListList() {
         if (unlockWordListBuilder_ == null) {
@@ -608,7 +629,11 @@ public java.util.List<emu.grasscutter.net.proto.InferenceWordInfoOuterClass.Infe
         }
       }
       /**
-       * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .InferenceWordInfo unlock_word_list = 4;</code>
        */
       public int getUnlockWordListCount() {
         if (unlockWordListBuilder_ == null) {
@@ -618,7 +643,11 @@ public int getUnlockWordListCount() {
         }
       }
       /**
-       * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .InferenceWordInfo unlock_word_list = 4;</code>
        */
       public emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo getUnlockWordList(int index) {
         if (unlockWordListBuilder_ == null) {
@@ -628,7 +657,11 @@ public emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo g
         }
       }
       /**
-       * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .InferenceWordInfo unlock_word_list = 4;</code>
        */
       public Builder setUnlockWordList(
           int index, emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo value) {
@@ -645,7 +678,11 @@ public Builder setUnlockWordList(
         return this;
       }
       /**
-       * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .InferenceWordInfo unlock_word_list = 4;</code>
        */
       public Builder setUnlockWordList(
           int index, emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo.Builder builderForValue) {
@@ -659,7 +696,11 @@ public Builder setUnlockWordList(
         return this;
       }
       /**
-       * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .InferenceWordInfo unlock_word_list = 4;</code>
        */
       public Builder addUnlockWordList(emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo value) {
         if (unlockWordListBuilder_ == null) {
@@ -675,7 +716,11 @@ public Builder addUnlockWordList(emu.grasscutter.net.proto.InferenceWordInfoOute
         return this;
       }
       /**
-       * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .InferenceWordInfo unlock_word_list = 4;</code>
        */
       public Builder addUnlockWordList(
           int index, emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo value) {
@@ -692,7 +737,11 @@ public Builder addUnlockWordList(
         return this;
       }
       /**
-       * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .InferenceWordInfo unlock_word_list = 4;</code>
        */
       public Builder addUnlockWordList(
           emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo.Builder builderForValue) {
@@ -706,7 +755,11 @@ public Builder addUnlockWordList(
         return this;
       }
       /**
-       * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .InferenceWordInfo unlock_word_list = 4;</code>
        */
       public Builder addUnlockWordList(
           int index, emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo.Builder builderForValue) {
@@ -720,7 +773,11 @@ public Builder addUnlockWordList(
         return this;
       }
       /**
-       * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .InferenceWordInfo unlock_word_list = 4;</code>
        */
       public Builder addAllUnlockWordList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo> values) {
@@ -735,7 +792,11 @@ public Builder addAllUnlockWordList(
         return this;
       }
       /**
-       * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .InferenceWordInfo unlock_word_list = 4;</code>
        */
       public Builder clearUnlockWordList() {
         if (unlockWordListBuilder_ == null) {
@@ -748,7 +809,11 @@ public Builder clearUnlockWordList() {
         return this;
       }
       /**
-       * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .InferenceWordInfo unlock_word_list = 4;</code>
        */
       public Builder removeUnlockWordList(int index) {
         if (unlockWordListBuilder_ == null) {
@@ -761,14 +826,22 @@ public Builder removeUnlockWordList(int index) {
         return this;
       }
       /**
-       * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .InferenceWordInfo unlock_word_list = 4;</code>
        */
       public emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo.Builder getUnlockWordListBuilder(
           int index) {
         return getUnlockWordListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .InferenceWordInfo unlock_word_list = 4;</code>
        */
       public emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfoOrBuilder getUnlockWordListOrBuilder(
           int index) {
@@ -778,7 +851,11 @@ public emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfoOr
         }
       }
       /**
-       * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .InferenceWordInfo unlock_word_list = 4;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfoOrBuilder> 
            getUnlockWordListOrBuilderList() {
@@ -789,14 +866,22 @@ public emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfoOr
         }
       }
       /**
-       * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .InferenceWordInfo unlock_word_list = 4;</code>
        */
       public emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo.Builder addUnlockWordListBuilder() {
         return getUnlockWordListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .InferenceWordInfo unlock_word_list = 4;</code>
        */
       public emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo.Builder addUnlockWordListBuilder(
           int index) {
@@ -804,7 +889,11 @@ public emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo.B
             index, emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .InferenceWordInfo unlock_word_list = 4;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo.Builder> 
            getUnlockWordListBuilderList() {
@@ -824,6 +913,49 @@ public emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo.B
         }
         return unlockWordListBuilder_;
       }
+
+      private int pageId_ ;
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 page_id = 11;</code>
+       * @return The pageId.
+       */
+      @java.lang.Override
+      public int getPageId() {
+        return pageId_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 page_id = 11;</code>
+       * @param value The pageId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPageId(int value) {
+        
+        pageId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 page_id = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPageId() {
+        
+        pageId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -892,9 +1024,9 @@ public emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo g
   static {
     java.lang.String[] descriptorData = {
       "\n\027InferencePageInfo.proto\032\027InferenceWord" +
-      "Info.proto\"R\n\021InferencePageInfo\022\017\n\007page_" +
-      "id\030\006 \001(\r\022,\n\020unlock_word_list\030\013 \003(\0132\022.Inf" +
-      "erenceWordInfoB\033\n\031emu.grasscutter.net.pr" +
+      "Info.proto\"R\n\021InferencePageInfo\022,\n\020unloc" +
+      "k_word_list\030\004 \003(\0132\022.InferenceWordInfo\022\017\n" +
+      "\007page_id\030\013 \001(\rB\033\n\031emu.grasscutter.net.pr" +
       "otob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -907,7 +1039,7 @@ public emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo g
     internal_static_InferencePageInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_InferencePageInfo_descriptor,
-        new java.lang.String[] { "PageId", "UnlockWordList", });
+        new java.lang.String[] { "UnlockWordList", "PageId", });
     emu.grasscutter.net.proto.InferenceWordInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/LifeStateChangeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/LifeStateChangeNotifyOuterClass.java
index 2588ef34b39..7baf0ceab25 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/LifeStateChangeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/LifeStateChangeNotifyOuterClass.java
@@ -19,104 +19,131 @@ public interface LifeStateChangeNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>string attack_tag = 2;</code>
-     * @return The attackTag.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 6;</code>
      */
-    java.lang.String getAttackTag();
+    java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> 
+        getServerBuffListList();
     /**
-     * <code>string attack_tag = 2;</code>
-     * @return The bytes for attackTag.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 6;</code>
      */
-    com.google.protobuf.ByteString
-        getAttackTagBytes();
-
+    emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff getServerBuffList(int index);
     /**
-     * <code>uint32 move_reliable_seq = 3;</code>
-     * @return The moveReliableSeq.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 6;</code>
      */
-    int getMoveReliableSeq();
-
+    int getServerBuffListCount();
     /**
-     * <code>repeated string EPGOBHIEDOI = 5;</code>
-     * @return A list containing the ePGOBHIEDOI.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 6;</code>
      */
-    java.util.List<java.lang.String>
-        getEPGOBHIEDOIList();
+    java.util.List<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> 
+        getServerBuffListOrBuilderList();
     /**
-     * <code>repeated string EPGOBHIEDOI = 5;</code>
-     * @return The count of ePGOBHIEDOI.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 6;</code>
      */
-    int getEPGOBHIEDOICount();
+    emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getServerBuffListOrBuilder(
+        int index);
+
     /**
-     * <code>repeated string EPGOBHIEDOI = 5;</code>
-     * @param index The index of the element to return.
-     * @return The ePGOBHIEDOI at the given index.
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>string attack_tag = 9;</code>
+     * @return The attackTag.
      */
-    java.lang.String getEPGOBHIEDOI(int index);
+    java.lang.String getAttackTag();
     /**
-     * <code>repeated string EPGOBHIEDOI = 5;</code>
-     * @param index The index of the value to return.
-     * @return The bytes of the ePGOBHIEDOI at the given index.
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>string attack_tag = 9;</code>
+     * @return The bytes for attackTag.
      */
     com.google.protobuf.ByteString
-        getEPGOBHIEDOIBytes(int index);
+        getAttackTagBytes();
 
     /**
-     * <code>uint32 entity_id = 6;</code>
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>uint32 entity_id = 8;</code>
      * @return The entityId.
      */
     int getEntityId();
 
     /**
-     * <code>uint32 life_state = 8;</code>
+     * <pre>
+     * Offset: 0x3C
+     * </pre>
+     *
+     * <code>uint32 move_reliable_seq = 13;</code>
+     * @return The moveReliableSeq.
+     */
+    int getMoveReliableSeq();
+
+    /**
+     * <pre>
+     * Offset: 0x40
+     * </pre>
+     *
+     * <code>uint32 life_state = 12;</code>
      * @return The lifeState.
      */
     int getLifeState();
 
     /**
-     * <code>.PlayerDieType die_type = 10;</code>
+     * <pre>
+     * Offset: 0x44
+     * </pre>
+     *
+     * <code>.PlayerDieType die_type = 2;</code>
      * @return The enum numeric value on the wire for dieType.
      */
     int getDieTypeValue();
     /**
-     * <code>.PlayerDieType die_type = 10;</code>
+     * <pre>
+     * Offset: 0x44
+     * </pre>
+     *
+     * <code>.PlayerDieType die_type = 2;</code>
      * @return The dieType.
      */
     emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType getDieType();
 
     /**
-     * <code>repeated .ServerBuff server_buff_list = 13;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> 
-        getServerBuffListList();
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 13;</code>
-     */
-    emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff getServerBuffList(int index);
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 13;</code>
-     */
-    int getServerBuffListCount();
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 13;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> 
-        getServerBuffListOrBuilderList();
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 13;</code>
-     */
-    emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getServerBuffListOrBuilder(
-        int index);
-
-    /**
-     * <code>uint32 source_entity_id = 14;</code>
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>uint32 source_entity_id = 5;</code>
      * @return The sourceEntityId.
      */
     int getSourceEntityId();
   }
   /**
    * <pre>
-   * CmdId: 29321
+   * CmdId: 20981
    * </pre>
    *
    * Protobuf type {@code LifeStateChangeNotify}
@@ -131,10 +158,9 @@ private LifeStateChangeNotify(com.google.protobuf.GeneratedMessageV3.Builder<?>
       super(builder);
     }
     private LifeStateChangeNotify() {
+      serverBuffList_ = java.util.Collections.emptyList();
       attackTag_ = "";
-      ePGOBHIEDOI_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       dieType_ = 0;
-      serverBuffList_ = java.util.Collections.emptyList();
     }
 
     @java.lang.Override
@@ -168,54 +194,45 @@ private LifeStateChangeNotify(
             case 0:
               done = true;
               break;
-            case 18: {
-              java.lang.String s = input.readStringRequireUtf8();
+            case 16: {
+              int rawValue = input.readEnum();
 
-              attackTag_ = s;
+              dieType_ = rawValue;
               break;
             }
-            case 24: {
+            case 40: {
 
-              moveReliableSeq_ = input.readUInt32();
+              sourceEntityId_ = input.readUInt32();
               break;
             }
-            case 42: {
-              java.lang.String s = input.readStringRequireUtf8();
+            case 50: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                ePGOBHIEDOI_ = new com.google.protobuf.LazyStringArrayList();
+                serverBuffList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff>();
                 mutable_bitField0_ |= 0x00000001;
               }
-              ePGOBHIEDOI_.add(s);
+              serverBuffList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.parser(), extensionRegistry));
               break;
             }
-            case 48: {
+            case 64: {
 
               entityId_ = input.readUInt32();
               break;
             }
-            case 64: {
+            case 74: {
+              java.lang.String s = input.readStringRequireUtf8();
 
-              lifeState_ = input.readUInt32();
+              attackTag_ = s;
               break;
             }
-            case 80: {
-              int rawValue = input.readEnum();
+            case 96: {
 
-              dieType_ = rawValue;
-              break;
-            }
-            case 106: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                serverBuffList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff>();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              serverBuffList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.parser(), extensionRegistry));
+              lifeState_ = input.readUInt32();
               break;
             }
-            case 112: {
+            case 104: {
 
-              sourceEntityId_ = input.readUInt32();
+              moveReliableSeq_ = input.readUInt32();
               break;
             }
             default: {
@@ -234,9 +251,6 @@ private LifeStateChangeNotify(
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          ePGOBHIEDOI_ = ePGOBHIEDOI_.getUnmodifiableView();
-        }
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
           serverBuffList_ = java.util.Collections.unmodifiableList(serverBuffList_);
         }
         this.unknownFields = unknownFields.build();
@@ -256,10 +270,74 @@ private LifeStateChangeNotify(
               emu.grasscutter.net.proto.LifeStateChangeNotifyOuterClass.LifeStateChangeNotify.class, emu.grasscutter.net.proto.LifeStateChangeNotifyOuterClass.LifeStateChangeNotify.Builder.class);
     }
 
-    public static final int ATTACK_TAG_FIELD_NUMBER = 2;
+    public static final int SERVER_BUFF_LIST_FIELD_NUMBER = 6;
+    private java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> serverBuffList_;
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 6;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> getServerBuffListList() {
+      return serverBuffList_;
+    }
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 6;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> 
+        getServerBuffListOrBuilderList() {
+      return serverBuffList_;
+    }
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 6;</code>
+     */
+    @java.lang.Override
+    public int getServerBuffListCount() {
+      return serverBuffList_.size();
+    }
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 6;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff getServerBuffList(int index) {
+      return serverBuffList_.get(index);
+    }
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 6;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getServerBuffListOrBuilder(
+        int index) {
+      return serverBuffList_.get(index);
+    }
+
+    public static final int ATTACK_TAG_FIELD_NUMBER = 9;
     private volatile java.lang.Object attackTag_;
     /**
-     * <code>string attack_tag = 2;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>string attack_tag = 9;</code>
      * @return The attackTag.
      */
     @java.lang.Override
@@ -276,7 +354,11 @@ public java.lang.String getAttackTag() {
       }
     }
     /**
-     * <code>string attack_tag = 2;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>string attack_tag = 9;</code>
      * @return The bytes for attackTag.
      */
     @java.lang.Override
@@ -294,67 +376,44 @@ public java.lang.String getAttackTag() {
       }
     }
 
-    public static final int MOVE_RELIABLE_SEQ_FIELD_NUMBER = 3;
-    private int moveReliableSeq_;
+    public static final int ENTITY_ID_FIELD_NUMBER = 8;
+    private int entityId_;
     /**
-     * <code>uint32 move_reliable_seq = 3;</code>
-     * @return The moveReliableSeq.
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>uint32 entity_id = 8;</code>
+     * @return The entityId.
      */
     @java.lang.Override
-    public int getMoveReliableSeq() {
-      return moveReliableSeq_;
-    }
-
-    public static final int EPGOBHIEDOI_FIELD_NUMBER = 5;
-    private com.google.protobuf.LazyStringList ePGOBHIEDOI_;
-    /**
-     * <code>repeated string EPGOBHIEDOI = 5;</code>
-     * @return A list containing the ePGOBHIEDOI.
-     */
-    public com.google.protobuf.ProtocolStringList
-        getEPGOBHIEDOIList() {
-      return ePGOBHIEDOI_;
-    }
-    /**
-     * <code>repeated string EPGOBHIEDOI = 5;</code>
-     * @return The count of ePGOBHIEDOI.
-     */
-    public int getEPGOBHIEDOICount() {
-      return ePGOBHIEDOI_.size();
-    }
-    /**
-     * <code>repeated string EPGOBHIEDOI = 5;</code>
-     * @param index The index of the element to return.
-     * @return The ePGOBHIEDOI at the given index.
-     */
-    public java.lang.String getEPGOBHIEDOI(int index) {
-      return ePGOBHIEDOI_.get(index);
-    }
-    /**
-     * <code>repeated string EPGOBHIEDOI = 5;</code>
-     * @param index The index of the value to return.
-     * @return The bytes of the ePGOBHIEDOI at the given index.
-     */
-    public com.google.protobuf.ByteString
-        getEPGOBHIEDOIBytes(int index) {
-      return ePGOBHIEDOI_.getByteString(index);
+    public int getEntityId() {
+      return entityId_;
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 6;
-    private int entityId_;
+    public static final int MOVE_RELIABLE_SEQ_FIELD_NUMBER = 13;
+    private int moveReliableSeq_;
     /**
-     * <code>uint32 entity_id = 6;</code>
-     * @return The entityId.
+     * <pre>
+     * Offset: 0x3C
+     * </pre>
+     *
+     * <code>uint32 move_reliable_seq = 13;</code>
+     * @return The moveReliableSeq.
      */
     @java.lang.Override
-    public int getEntityId() {
-      return entityId_;
+    public int getMoveReliableSeq() {
+      return moveReliableSeq_;
     }
 
-    public static final int LIFE_STATE_FIELD_NUMBER = 8;
+    public static final int LIFE_STATE_FIELD_NUMBER = 12;
     private int lifeState_;
     /**
-     * <code>uint32 life_state = 8;</code>
+     * <pre>
+     * Offset: 0x40
+     * </pre>
+     *
+     * <code>uint32 life_state = 12;</code>
      * @return The lifeState.
      */
     @java.lang.Override
@@ -362,17 +421,25 @@ public int getLifeState() {
       return lifeState_;
     }
 
-    public static final int DIE_TYPE_FIELD_NUMBER = 10;
+    public static final int DIE_TYPE_FIELD_NUMBER = 2;
     private int dieType_;
     /**
-     * <code>.PlayerDieType die_type = 10;</code>
+     * <pre>
+     * Offset: 0x44
+     * </pre>
+     *
+     * <code>.PlayerDieType die_type = 2;</code>
      * @return The enum numeric value on the wire for dieType.
      */
     @java.lang.Override public int getDieTypeValue() {
       return dieType_;
     }
     /**
-     * <code>.PlayerDieType die_type = 10;</code>
+     * <pre>
+     * Offset: 0x44
+     * </pre>
+     *
+     * <code>.PlayerDieType die_type = 2;</code>
      * @return The dieType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType getDieType() {
@@ -381,50 +448,14 @@ public int getLifeState() {
       return result == null ? emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.UNRECOGNIZED : result;
     }
 
-    public static final int SERVER_BUFF_LIST_FIELD_NUMBER = 13;
-    private java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> serverBuffList_;
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 13;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> getServerBuffListList() {
-      return serverBuffList_;
-    }
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 13;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> 
-        getServerBuffListOrBuilderList() {
-      return serverBuffList_;
-    }
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 13;</code>
-     */
-    @java.lang.Override
-    public int getServerBuffListCount() {
-      return serverBuffList_.size();
-    }
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 13;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff getServerBuffList(int index) {
-      return serverBuffList_.get(index);
-    }
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 13;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getServerBuffListOrBuilder(
-        int index) {
-      return serverBuffList_.get(index);
-    }
-
-    public static final int SOURCE_ENTITY_ID_FIELD_NUMBER = 14;
+    public static final int SOURCE_ENTITY_ID_FIELD_NUMBER = 5;
     private int sourceEntityId_;
     /**
-     * <code>uint32 source_entity_id = 14;</code>
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>uint32 source_entity_id = 5;</code>
      * @return The sourceEntityId.
      */
     @java.lang.Override
@@ -446,29 +477,26 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(attackTag_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 2, attackTag_);
+      if (dieType_ != emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.PLAYER_DIE_TYPE_NONE.getNumber()) {
+        output.writeEnum(2, dieType_);
       }
-      if (moveReliableSeq_ != 0) {
-        output.writeUInt32(3, moveReliableSeq_);
+      if (sourceEntityId_ != 0) {
+        output.writeUInt32(5, sourceEntityId_);
       }
-      for (int i = 0; i < ePGOBHIEDOI_.size(); i++) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 5, ePGOBHIEDOI_.getRaw(i));
+      for (int i = 0; i < serverBuffList_.size(); i++) {
+        output.writeMessage(6, serverBuffList_.get(i));
       }
       if (entityId_ != 0) {
-        output.writeUInt32(6, entityId_);
+        output.writeUInt32(8, entityId_);
       }
-      if (lifeState_ != 0) {
-        output.writeUInt32(8, lifeState_);
-      }
-      if (dieType_ != emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.PLAYER_DIE_TYPE_NONE.getNumber()) {
-        output.writeEnum(10, dieType_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(attackTag_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 9, attackTag_);
       }
-      for (int i = 0; i < serverBuffList_.size(); i++) {
-        output.writeMessage(13, serverBuffList_.get(i));
+      if (lifeState_ != 0) {
+        output.writeUInt32(12, lifeState_);
       }
-      if (sourceEntityId_ != 0) {
-        output.writeUInt32(14, sourceEntityId_);
+      if (moveReliableSeq_ != 0) {
+        output.writeUInt32(13, moveReliableSeq_);
       }
       unknownFields.writeTo(output);
     }
@@ -479,40 +507,32 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(attackTag_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, attackTag_);
-      }
-      if (moveReliableSeq_ != 0) {
+      if (dieType_ != emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.PLAYER_DIE_TYPE_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, moveReliableSeq_);
+          .computeEnumSize(2, dieType_);
       }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < ePGOBHIEDOI_.size(); i++) {
-          dataSize += computeStringSizeNoTag(ePGOBHIEDOI_.getRaw(i));
-        }
-        size += dataSize;
-        size += 1 * getEPGOBHIEDOIList().size();
-      }
-      if (entityId_ != 0) {
+      if (sourceEntityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, entityId_);
+          .computeUInt32Size(5, sourceEntityId_);
       }
-      if (lifeState_ != 0) {
+      for (int i = 0; i < serverBuffList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, lifeState_);
+          .computeMessageSize(6, serverBuffList_.get(i));
       }
-      if (dieType_ != emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.PLAYER_DIE_TYPE_NONE.getNumber()) {
+      if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(10, dieType_);
+          .computeUInt32Size(8, entityId_);
       }
-      for (int i = 0; i < serverBuffList_.size(); i++) {
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(attackTag_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, attackTag_);
+      }
+      if (lifeState_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(13, serverBuffList_.get(i));
+          .computeUInt32Size(12, lifeState_);
       }
-      if (sourceEntityId_ != 0) {
+      if (moveReliableSeq_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, sourceEntityId_);
+          .computeUInt32Size(13, moveReliableSeq_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -529,19 +549,17 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.LifeStateChangeNotifyOuterClass.LifeStateChangeNotify other = (emu.grasscutter.net.proto.LifeStateChangeNotifyOuterClass.LifeStateChangeNotify) obj;
 
+      if (!getServerBuffListList()
+          .equals(other.getServerBuffListList())) return false;
       if (!getAttackTag()
           .equals(other.getAttackTag())) return false;
-      if (getMoveReliableSeq()
-          != other.getMoveReliableSeq()) return false;
-      if (!getEPGOBHIEDOIList()
-          .equals(other.getEPGOBHIEDOIList())) return false;
       if (getEntityId()
           != other.getEntityId()) return false;
+      if (getMoveReliableSeq()
+          != other.getMoveReliableSeq()) return false;
       if (getLifeState()
           != other.getLifeState()) return false;
       if (dieType_ != other.dieType_) return false;
-      if (!getServerBuffListList()
-          .equals(other.getServerBuffListList())) return false;
       if (getSourceEntityId()
           != other.getSourceEntityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -555,24 +573,20 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      if (getServerBuffListCount() > 0) {
+        hash = (37 * hash) + SERVER_BUFF_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getServerBuffListList().hashCode();
+      }
       hash = (37 * hash) + ATTACK_TAG_FIELD_NUMBER;
       hash = (53 * hash) + getAttackTag().hashCode();
-      hash = (37 * hash) + MOVE_RELIABLE_SEQ_FIELD_NUMBER;
-      hash = (53 * hash) + getMoveReliableSeq();
-      if (getEPGOBHIEDOICount() > 0) {
-        hash = (37 * hash) + EPGOBHIEDOI_FIELD_NUMBER;
-        hash = (53 * hash) + getEPGOBHIEDOIList().hashCode();
-      }
       hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getEntityId();
+      hash = (37 * hash) + MOVE_RELIABLE_SEQ_FIELD_NUMBER;
+      hash = (53 * hash) + getMoveReliableSeq();
       hash = (37 * hash) + LIFE_STATE_FIELD_NUMBER;
       hash = (53 * hash) + getLifeState();
       hash = (37 * hash) + DIE_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + dieType_;
-      if (getServerBuffListCount() > 0) {
-        hash = (37 * hash) + SERVER_BUFF_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getServerBuffListList().hashCode();
-      }
       hash = (37 * hash) + SOURCE_ENTITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getSourceEntityId();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -672,7 +686,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 29321
+     * CmdId: 20981
      * </pre>
      *
      * Protobuf type {@code LifeStateChangeNotify}
@@ -713,24 +727,22 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        if (serverBuffListBuilder_ == null) {
+          serverBuffList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        } else {
+          serverBuffListBuilder_.clear();
+        }
         attackTag_ = "";
 
-        moveReliableSeq_ = 0;
-
-        ePGOBHIEDOI_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000001);
         entityId_ = 0;
 
+        moveReliableSeq_ = 0;
+
         lifeState_ = 0;
 
         dieType_ = 0;
 
-        if (serverBuffListBuilder_ == null) {
-          serverBuffList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
-        } else {
-          serverBuffListBuilder_.clear();
-        }
         sourceEntityId_ = 0;
 
         return this;
@@ -760,25 +772,20 @@ public emu.grasscutter.net.proto.LifeStateChangeNotifyOuterClass.LifeStateChange
       public emu.grasscutter.net.proto.LifeStateChangeNotifyOuterClass.LifeStateChangeNotify buildPartial() {
         emu.grasscutter.net.proto.LifeStateChangeNotifyOuterClass.LifeStateChangeNotify result = new emu.grasscutter.net.proto.LifeStateChangeNotifyOuterClass.LifeStateChangeNotify(this);
         int from_bitField0_ = bitField0_;
-        result.attackTag_ = attackTag_;
-        result.moveReliableSeq_ = moveReliableSeq_;
-        if (((bitField0_ & 0x00000001) != 0)) {
-          ePGOBHIEDOI_ = ePGOBHIEDOI_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        }
-        result.ePGOBHIEDOI_ = ePGOBHIEDOI_;
-        result.entityId_ = entityId_;
-        result.lifeState_ = lifeState_;
-        result.dieType_ = dieType_;
         if (serverBuffListBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) != 0)) {
+          if (((bitField0_ & 0x00000001) != 0)) {
             serverBuffList_ = java.util.Collections.unmodifiableList(serverBuffList_);
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           }
           result.serverBuffList_ = serverBuffList_;
         } else {
           result.serverBuffList_ = serverBuffListBuilder_.build();
         }
+        result.attackTag_ = attackTag_;
+        result.entityId_ = entityId_;
+        result.moveReliableSeq_ = moveReliableSeq_;
+        result.lifeState_ = lifeState_;
+        result.dieType_ = dieType_;
         result.sourceEntityId_ = sourceEntityId_;
         onBuilt();
         return result;
@@ -828,37 +835,11 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.LifeStateChangeNotifyOuterClass.LifeStateChangeNotify other) {
         if (other == emu.grasscutter.net.proto.LifeStateChangeNotifyOuterClass.LifeStateChangeNotify.getDefaultInstance()) return this;
-        if (!other.getAttackTag().isEmpty()) {
-          attackTag_ = other.attackTag_;
-          onChanged();
-        }
-        if (other.getMoveReliableSeq() != 0) {
-          setMoveReliableSeq(other.getMoveReliableSeq());
-        }
-        if (!other.ePGOBHIEDOI_.isEmpty()) {
-          if (ePGOBHIEDOI_.isEmpty()) {
-            ePGOBHIEDOI_ = other.ePGOBHIEDOI_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-          } else {
-            ensureEPGOBHIEDOIIsMutable();
-            ePGOBHIEDOI_.addAll(other.ePGOBHIEDOI_);
-          }
-          onChanged();
-        }
-        if (other.getEntityId() != 0) {
-          setEntityId(other.getEntityId());
-        }
-        if (other.getLifeState() != 0) {
-          setLifeState(other.getLifeState());
-        }
-        if (other.dieType_ != 0) {
-          setDieTypeValue(other.getDieTypeValue());
-        }
         if (serverBuffListBuilder_ == null) {
           if (!other.serverBuffList_.isEmpty()) {
             if (serverBuffList_.isEmpty()) {
               serverBuffList_ = other.serverBuffList_;
-              bitField0_ = (bitField0_ & ~0x00000002);
+              bitField0_ = (bitField0_ & ~0x00000001);
             } else {
               ensureServerBuffListIsMutable();
               serverBuffList_.addAll(other.serverBuffList_);
@@ -871,7 +852,7 @@ public Builder mergeFrom(emu.grasscutter.net.proto.LifeStateChangeNotifyOuterCla
               serverBuffListBuilder_.dispose();
               serverBuffListBuilder_ = null;
               serverBuffList_ = other.serverBuffList_;
-              bitField0_ = (bitField0_ & ~0x00000002);
+              bitField0_ = (bitField0_ & ~0x00000001);
               serverBuffListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getServerBuffListFieldBuilder() : null;
@@ -880,6 +861,22 @@ public Builder mergeFrom(emu.grasscutter.net.proto.LifeStateChangeNotifyOuterCla
             }
           }
         }
+        if (!other.getAttackTag().isEmpty()) {
+          attackTag_ = other.attackTag_;
+          onChanged();
+        }
+        if (other.getEntityId() != 0) {
+          setEntityId(other.getEntityId());
+        }
+        if (other.getMoveReliableSeq() != 0) {
+          setMoveReliableSeq(other.getMoveReliableSeq());
+        }
+        if (other.getLifeState() != 0) {
+          setLifeState(other.getLifeState());
+        }
+        if (other.dieType_ != 0) {
+          setDieTypeValue(other.getDieTypeValue());
+        }
         if (other.getSourceEntityId() != 0) {
           setSourceEntityId(other.getSourceEntityId());
         }
@@ -913,226 +910,421 @@ public Builder mergeFrom(
       }
       private int bitField0_;
 
-      private java.lang.Object attackTag_ = "";
+      private java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> serverBuffList_ =
+        java.util.Collections.emptyList();
+      private void ensureServerBuffListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          serverBuffList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff>(serverBuffList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> serverBuffListBuilder_;
+
       /**
-       * <code>string attack_tag = 2;</code>
-       * @return The attackTag.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 6;</code>
        */
-      public java.lang.String getAttackTag() {
-        java.lang.Object ref = attackTag_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          attackTag_ = s;
-          return s;
+      public java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> getServerBuffListList() {
+        if (serverBuffListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(serverBuffList_);
         } else {
-          return (java.lang.String) ref;
+          return serverBuffListBuilder_.getMessageList();
         }
       }
       /**
-       * <code>string attack_tag = 2;</code>
-       * @return The bytes for attackTag.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 6;</code>
        */
-      public com.google.protobuf.ByteString
-          getAttackTagBytes() {
-        java.lang.Object ref = attackTag_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          attackTag_ = b;
-          return b;
+      public int getServerBuffListCount() {
+        if (serverBuffListBuilder_ == null) {
+          return serverBuffList_.size();
         } else {
-          return (com.google.protobuf.ByteString) ref;
+          return serverBuffListBuilder_.getCount();
         }
       }
       /**
-       * <code>string attack_tag = 2;</code>
-       * @param value The attackTag to set.
-       * @return This builder for chaining.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 6;</code>
        */
-      public Builder setAttackTag(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        attackTag_ = value;
-        onChanged();
-        return this;
+      public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff getServerBuffList(int index) {
+        if (serverBuffListBuilder_ == null) {
+          return serverBuffList_.get(index);
+        } else {
+          return serverBuffListBuilder_.getMessage(index);
+        }
       }
       /**
-       * <code>string attack_tag = 2;</code>
-       * @return This builder for chaining.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 6;</code>
        */
-      public Builder clearAttackTag() {
-        
-        attackTag_ = getDefaultInstance().getAttackTag();
-        onChanged();
+      public Builder setServerBuffList(
+          int index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff value) {
+        if (serverBuffListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureServerBuffListIsMutable();
+          serverBuffList_.set(index, value);
+          onChanged();
+        } else {
+          serverBuffListBuilder_.setMessage(index, value);
+        }
         return this;
       }
       /**
-       * <code>string attack_tag = 2;</code>
-       * @param value The bytes for attackTag to set.
-       * @return This builder for chaining.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 6;</code>
        */
-      public Builder setAttackTagBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        attackTag_ = value;
-        onChanged();
+      public Builder setServerBuffList(
+          int index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder builderForValue) {
+        if (serverBuffListBuilder_ == null) {
+          ensureServerBuffListIsMutable();
+          serverBuffList_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          serverBuffListBuilder_.setMessage(index, builderForValue.build());
+        }
         return this;
       }
-
-      private int moveReliableSeq_ ;
-      /**
-       * <code>uint32 move_reliable_seq = 3;</code>
-       * @return The moveReliableSeq.
-       */
-      @java.lang.Override
-      public int getMoveReliableSeq() {
-        return moveReliableSeq_;
-      }
       /**
-       * <code>uint32 move_reliable_seq = 3;</code>
-       * @param value The moveReliableSeq to set.
-       * @return This builder for chaining.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 6;</code>
        */
-      public Builder setMoveReliableSeq(int value) {
-        
-        moveReliableSeq_ = value;
-        onChanged();
+      public Builder addServerBuffList(emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff value) {
+        if (serverBuffListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureServerBuffListIsMutable();
+          serverBuffList_.add(value);
+          onChanged();
+        } else {
+          serverBuffListBuilder_.addMessage(value);
+        }
         return this;
       }
       /**
-       * <code>uint32 move_reliable_seq = 3;</code>
-       * @return This builder for chaining.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 6;</code>
        */
-      public Builder clearMoveReliableSeq() {
-        
-        moveReliableSeq_ = 0;
-        onChanged();
+      public Builder addServerBuffList(
+          int index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff value) {
+        if (serverBuffListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureServerBuffListIsMutable();
+          serverBuffList_.add(index, value);
+          onChanged();
+        } else {
+          serverBuffListBuilder_.addMessage(index, value);
+        }
         return this;
       }
-
-      private com.google.protobuf.LazyStringList ePGOBHIEDOI_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      private void ensureEPGOBHIEDOIIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          ePGOBHIEDOI_ = new com.google.protobuf.LazyStringArrayList(ePGOBHIEDOI_);
-          bitField0_ |= 0x00000001;
-         }
-      }
       /**
-       * <code>repeated string EPGOBHIEDOI = 5;</code>
-       * @return A list containing the ePGOBHIEDOI.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 6;</code>
        */
-      public com.google.protobuf.ProtocolStringList
-          getEPGOBHIEDOIList() {
-        return ePGOBHIEDOI_.getUnmodifiableView();
-      }
+      public Builder addServerBuffList(
+          emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder builderForValue) {
+        if (serverBuffListBuilder_ == null) {
+          ensureServerBuffListIsMutable();
+          serverBuffList_.add(builderForValue.build());
+          onChanged();
+        } else {
+          serverBuffListBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
       /**
-       * <code>repeated string EPGOBHIEDOI = 5;</code>
-       * @return The count of ePGOBHIEDOI.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 6;</code>
        */
-      public int getEPGOBHIEDOICount() {
-        return ePGOBHIEDOI_.size();
+      public Builder addServerBuffList(
+          int index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder builderForValue) {
+        if (serverBuffListBuilder_ == null) {
+          ensureServerBuffListIsMutable();
+          serverBuffList_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          serverBuffListBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
       }
       /**
-       * <code>repeated string EPGOBHIEDOI = 5;</code>
-       * @param index The index of the element to return.
-       * @return The ePGOBHIEDOI at the given index.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 6;</code>
        */
-      public java.lang.String getEPGOBHIEDOI(int index) {
-        return ePGOBHIEDOI_.get(index);
+      public Builder addAllServerBuffList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> values) {
+        if (serverBuffListBuilder_ == null) {
+          ensureServerBuffListIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, serverBuffList_);
+          onChanged();
+        } else {
+          serverBuffListBuilder_.addAllMessages(values);
+        }
+        return this;
       }
       /**
-       * <code>repeated string EPGOBHIEDOI = 5;</code>
-       * @param index The index of the value to return.
-       * @return The bytes of the ePGOBHIEDOI at the given index.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 6;</code>
        */
-      public com.google.protobuf.ByteString
-          getEPGOBHIEDOIBytes(int index) {
-        return ePGOBHIEDOI_.getByteString(index);
+      public Builder clearServerBuffList() {
+        if (serverBuffListBuilder_ == null) {
+          serverBuffList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+          onChanged();
+        } else {
+          serverBuffListBuilder_.clear();
+        }
+        return this;
       }
       /**
-       * <code>repeated string EPGOBHIEDOI = 5;</code>
-       * @param index The index to set the value at.
-       * @param value The ePGOBHIEDOI to set.
-       * @return This builder for chaining.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 6;</code>
        */
-      public Builder setEPGOBHIEDOI(
-          int index, java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureEPGOBHIEDOIIsMutable();
-        ePGOBHIEDOI_.set(index, value);
-        onChanged();
+      public Builder removeServerBuffList(int index) {
+        if (serverBuffListBuilder_ == null) {
+          ensureServerBuffListIsMutable();
+          serverBuffList_.remove(index);
+          onChanged();
+        } else {
+          serverBuffListBuilder_.remove(index);
+        }
         return this;
       }
       /**
-       * <code>repeated string EPGOBHIEDOI = 5;</code>
-       * @param value The ePGOBHIEDOI to add.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 6;</code>
+       */
+      public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder getServerBuffListBuilder(
+          int index) {
+        return getServerBuffListFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 6;</code>
+       */
+      public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getServerBuffListOrBuilder(
+          int index) {
+        if (serverBuffListBuilder_ == null) {
+          return serverBuffList_.get(index);  } else {
+          return serverBuffListBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 6;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> 
+           getServerBuffListOrBuilderList() {
+        if (serverBuffListBuilder_ != null) {
+          return serverBuffListBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(serverBuffList_);
+        }
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 6;</code>
+       */
+      public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder addServerBuffListBuilder() {
+        return getServerBuffListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.getDefaultInstance());
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 6;</code>
+       */
+      public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder addServerBuffListBuilder(
+          int index) {
+        return getServerBuffListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.getDefaultInstance());
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 6;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder> 
+           getServerBuffListBuilderList() {
+        return getServerBuffListFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> 
+          getServerBuffListFieldBuilder() {
+        if (serverBuffListBuilder_ == null) {
+          serverBuffListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder>(
+                  serverBuffList_,
+                  ((bitField0_ & 0x00000001) != 0),
+                  getParentForChildren(),
+                  isClean());
+          serverBuffList_ = null;
+        }
+        return serverBuffListBuilder_;
+      }
+
+      private java.lang.Object attackTag_ = "";
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>string attack_tag = 9;</code>
+       * @return The attackTag.
+       */
+      public java.lang.String getAttackTag() {
+        java.lang.Object ref = attackTag_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          attackTag_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>string attack_tag = 9;</code>
+       * @return The bytes for attackTag.
+       */
+      public com.google.protobuf.ByteString
+          getAttackTagBytes() {
+        java.lang.Object ref = attackTag_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          attackTag_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>string attack_tag = 9;</code>
+       * @param value The attackTag to set.
        * @return This builder for chaining.
        */
-      public Builder addEPGOBHIEDOI(
+      public Builder setAttackTag(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
-  ensureEPGOBHIEDOIIsMutable();
-        ePGOBHIEDOI_.add(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated string EPGOBHIEDOI = 5;</code>
-       * @param values The ePGOBHIEDOI to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllEPGOBHIEDOI(
-          java.lang.Iterable<java.lang.String> values) {
-        ensureEPGOBHIEDOIIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, ePGOBHIEDOI_);
+  
+        attackTag_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>repeated string EPGOBHIEDOI = 5;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>string attack_tag = 9;</code>
        * @return This builder for chaining.
        */
-      public Builder clearEPGOBHIEDOI() {
-        ePGOBHIEDOI_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000001);
+      public Builder clearAttackTag() {
+        
+        attackTag_ = getDefaultInstance().getAttackTag();
         onChanged();
         return this;
       }
       /**
-       * <code>repeated string EPGOBHIEDOI = 5;</code>
-       * @param value The bytes of the ePGOBHIEDOI to add.
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>string attack_tag = 9;</code>
+       * @param value The bytes for attackTag to set.
        * @return This builder for chaining.
        */
-      public Builder addEPGOBHIEDOIBytes(
+      public Builder setAttackTagBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-        ensureEPGOBHIEDOIIsMutable();
-        ePGOBHIEDOI_.add(value);
+        
+        attackTag_ = value;
         onChanged();
         return this;
       }
 
       private int entityId_ ;
       /**
-       * <code>uint32 entity_id = 6;</code>
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>uint32 entity_id = 8;</code>
        * @return The entityId.
        */
       @java.lang.Override
@@ -1140,7 +1332,11 @@ public int getEntityId() {
         return entityId_;
       }
       /**
-       * <code>uint32 entity_id = 6;</code>
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>uint32 entity_id = 8;</code>
        * @param value The entityId to set.
        * @return This builder for chaining.
        */
@@ -1151,7 +1347,11 @@ public Builder setEntityId(int value) {
         return this;
       }
       /**
-       * <code>uint32 entity_id = 6;</code>
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>uint32 entity_id = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearEntityId() {
@@ -1161,9 +1361,56 @@ public Builder clearEntityId() {
         return this;
       }
 
+      private int moveReliableSeq_ ;
+      /**
+       * <pre>
+       * Offset: 0x3C
+       * </pre>
+       *
+       * <code>uint32 move_reliable_seq = 13;</code>
+       * @return The moveReliableSeq.
+       */
+      @java.lang.Override
+      public int getMoveReliableSeq() {
+        return moveReliableSeq_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x3C
+       * </pre>
+       *
+       * <code>uint32 move_reliable_seq = 13;</code>
+       * @param value The moveReliableSeq to set.
+       * @return This builder for chaining.
+       */
+      public Builder setMoveReliableSeq(int value) {
+        
+        moveReliableSeq_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x3C
+       * </pre>
+       *
+       * <code>uint32 move_reliable_seq = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearMoveReliableSeq() {
+        
+        moveReliableSeq_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int lifeState_ ;
       /**
-       * <code>uint32 life_state = 8;</code>
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>uint32 life_state = 12;</code>
        * @return The lifeState.
        */
       @java.lang.Override
@@ -1171,7 +1418,11 @@ public int getLifeState() {
         return lifeState_;
       }
       /**
-       * <code>uint32 life_state = 8;</code>
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>uint32 life_state = 12;</code>
        * @param value The lifeState to set.
        * @return This builder for chaining.
        */
@@ -1182,7 +1433,11 @@ public Builder setLifeState(int value) {
         return this;
       }
       /**
-       * <code>uint32 life_state = 8;</code>
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>uint32 life_state = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearLifeState() {
@@ -1194,14 +1449,22 @@ public Builder clearLifeState() {
 
       private int dieType_ = 0;
       /**
-       * <code>.PlayerDieType die_type = 10;</code>
+       * <pre>
+       * Offset: 0x44
+       * </pre>
+       *
+       * <code>.PlayerDieType die_type = 2;</code>
        * @return The enum numeric value on the wire for dieType.
        */
       @java.lang.Override public int getDieTypeValue() {
         return dieType_;
       }
       /**
-       * <code>.PlayerDieType die_type = 10;</code>
+       * <pre>
+       * Offset: 0x44
+       * </pre>
+       *
+       * <code>.PlayerDieType die_type = 2;</code>
        * @param value The enum numeric value on the wire for dieType to set.
        * @return This builder for chaining.
        */
@@ -1212,7 +1475,11 @@ public Builder setDieTypeValue(int value) {
         return this;
       }
       /**
-       * <code>.PlayerDieType die_type = 10;</code>
+       * <pre>
+       * Offset: 0x44
+       * </pre>
+       *
+       * <code>.PlayerDieType die_type = 2;</code>
        * @return The dieType.
        */
       @java.lang.Override
@@ -1222,7 +1489,11 @@ public emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType getDieTyp
         return result == null ? emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.PlayerDieType die_type = 10;</code>
+       * <pre>
+       * Offset: 0x44
+       * </pre>
+       *
+       * <code>.PlayerDieType die_type = 2;</code>
        * @param value The dieType to set.
        * @return This builder for chaining.
        */
@@ -1236,7 +1507,11 @@ public Builder setDieType(emu.grasscutter.net.proto.PlayerDieTypeOuterClass.Play
         return this;
       }
       /**
-       * <code>.PlayerDieType die_type = 10;</code>
+       * <pre>
+       * Offset: 0x44
+       * </pre>
+       *
+       * <code>.PlayerDieType die_type = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearDieType() {
@@ -1246,249 +1521,13 @@ public Builder clearDieType() {
         return this;
       }
 
-      private java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> serverBuffList_ =
-        java.util.Collections.emptyList();
-      private void ensureServerBuffListIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
-          serverBuffList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff>(serverBuffList_);
-          bitField0_ |= 0x00000002;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> serverBuffListBuilder_;
-
-      /**
-       * <code>repeated .ServerBuff server_buff_list = 13;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> getServerBuffListList() {
-        if (serverBuffListBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(serverBuffList_);
-        } else {
-          return serverBuffListBuilder_.getMessageList();
-        }
-      }
-      /**
-       * <code>repeated .ServerBuff server_buff_list = 13;</code>
-       */
-      public int getServerBuffListCount() {
-        if (serverBuffListBuilder_ == null) {
-          return serverBuffList_.size();
-        } else {
-          return serverBuffListBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .ServerBuff server_buff_list = 13;</code>
-       */
-      public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff getServerBuffList(int index) {
-        if (serverBuffListBuilder_ == null) {
-          return serverBuffList_.get(index);
-        } else {
-          return serverBuffListBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * <code>repeated .ServerBuff server_buff_list = 13;</code>
-       */
-      public Builder setServerBuffList(
-          int index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff value) {
-        if (serverBuffListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureServerBuffListIsMutable();
-          serverBuffList_.set(index, value);
-          onChanged();
-        } else {
-          serverBuffListBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ServerBuff server_buff_list = 13;</code>
-       */
-      public Builder setServerBuffList(
-          int index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder builderForValue) {
-        if (serverBuffListBuilder_ == null) {
-          ensureServerBuffListIsMutable();
-          serverBuffList_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          serverBuffListBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ServerBuff server_buff_list = 13;</code>
-       */
-      public Builder addServerBuffList(emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff value) {
-        if (serverBuffListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureServerBuffListIsMutable();
-          serverBuffList_.add(value);
-          onChanged();
-        } else {
-          serverBuffListBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ServerBuff server_buff_list = 13;</code>
-       */
-      public Builder addServerBuffList(
-          int index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff value) {
-        if (serverBuffListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureServerBuffListIsMutable();
-          serverBuffList_.add(index, value);
-          onChanged();
-        } else {
-          serverBuffListBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ServerBuff server_buff_list = 13;</code>
-       */
-      public Builder addServerBuffList(
-          emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder builderForValue) {
-        if (serverBuffListBuilder_ == null) {
-          ensureServerBuffListIsMutable();
-          serverBuffList_.add(builderForValue.build());
-          onChanged();
-        } else {
-          serverBuffListBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ServerBuff server_buff_list = 13;</code>
-       */
-      public Builder addServerBuffList(
-          int index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder builderForValue) {
-        if (serverBuffListBuilder_ == null) {
-          ensureServerBuffListIsMutable();
-          serverBuffList_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          serverBuffListBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ServerBuff server_buff_list = 13;</code>
-       */
-      public Builder addAllServerBuffList(
-          java.lang.Iterable<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> values) {
-        if (serverBuffListBuilder_ == null) {
-          ensureServerBuffListIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, serverBuffList_);
-          onChanged();
-        } else {
-          serverBuffListBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ServerBuff server_buff_list = 13;</code>
-       */
-      public Builder clearServerBuffList() {
-        if (serverBuffListBuilder_ == null) {
-          serverBuffList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
-          onChanged();
-        } else {
-          serverBuffListBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ServerBuff server_buff_list = 13;</code>
-       */
-      public Builder removeServerBuffList(int index) {
-        if (serverBuffListBuilder_ == null) {
-          ensureServerBuffListIsMutable();
-          serverBuffList_.remove(index);
-          onChanged();
-        } else {
-          serverBuffListBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ServerBuff server_buff_list = 13;</code>
-       */
-      public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder getServerBuffListBuilder(
-          int index) {
-        return getServerBuffListFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .ServerBuff server_buff_list = 13;</code>
-       */
-      public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getServerBuffListOrBuilder(
-          int index) {
-        if (serverBuffListBuilder_ == null) {
-          return serverBuffList_.get(index);  } else {
-          return serverBuffListBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * <code>repeated .ServerBuff server_buff_list = 13;</code>
-       */
-      public java.util.List<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> 
-           getServerBuffListOrBuilderList() {
-        if (serverBuffListBuilder_ != null) {
-          return serverBuffListBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(serverBuffList_);
-        }
-      }
-      /**
-       * <code>repeated .ServerBuff server_buff_list = 13;</code>
-       */
-      public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder addServerBuffListBuilder() {
-        return getServerBuffListFieldBuilder().addBuilder(
-            emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .ServerBuff server_buff_list = 13;</code>
-       */
-      public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder addServerBuffListBuilder(
-          int index) {
-        return getServerBuffListFieldBuilder().addBuilder(
-            index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .ServerBuff server_buff_list = 13;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder> 
-           getServerBuffListBuilderList() {
-        return getServerBuffListFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> 
-          getServerBuffListFieldBuilder() {
-        if (serverBuffListBuilder_ == null) {
-          serverBuffListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder>(
-                  serverBuffList_,
-                  ((bitField0_ & 0x00000002) != 0),
-                  getParentForChildren(),
-                  isClean());
-          serverBuffList_ = null;
-        }
-        return serverBuffListBuilder_;
-      }
-
       private int sourceEntityId_ ;
       /**
-       * <code>uint32 source_entity_id = 14;</code>
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>uint32 source_entity_id = 5;</code>
        * @return The sourceEntityId.
        */
       @java.lang.Override
@@ -1496,7 +1535,11 @@ public int getSourceEntityId() {
         return sourceEntityId_;
       }
       /**
-       * <code>uint32 source_entity_id = 14;</code>
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>uint32 source_entity_id = 5;</code>
        * @param value The sourceEntityId to set.
        * @return This builder for chaining.
        */
@@ -1507,7 +1550,11 @@ public Builder setSourceEntityId(int value) {
         return this;
       }
       /**
-       * <code>uint32 source_entity_id = 14;</code>
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>uint32 source_entity_id = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearSourceEntityId() {
@@ -1584,14 +1631,13 @@ public emu.grasscutter.net.proto.LifeStateChangeNotifyOuterClass.LifeStateChange
   static {
     java.lang.String[] descriptorData = {
       "\n\033LifeStateChangeNotify.proto\032\020ServerBuf" +
-      "f.proto\032\023PlayerDieType.proto\"\345\001\n\025LifeSta" +
-      "teChangeNotify\022\022\n\nattack_tag\030\002 \001(\t\022\031\n\021mo" +
-      "ve_reliable_seq\030\003 \001(\r\022\023\n\013EPGOBHIEDOI\030\005 \003" +
-      "(\t\022\021\n\tentity_id\030\006 \001(\r\022\022\n\nlife_state\030\010 \001(" +
-      "\r\022 \n\010die_type\030\n \001(\0162\016.PlayerDieType\022%\n\020s" +
-      "erver_buff_list\030\r \003(\0132\013.ServerBuff\022\030\n\020so" +
-      "urce_entity_id\030\016 \001(\rB\033\n\031emu.grasscutter." +
-      "net.protob\006proto3"
+      "f.proto\032\023PlayerDieType.proto\"\320\001\n\025LifeSta" +
+      "teChangeNotify\022%\n\020server_buff_list\030\006 \003(\013" +
+      "2\013.ServerBuff\022\022\n\nattack_tag\030\t \001(\t\022\021\n\tent" +
+      "ity_id\030\010 \001(\r\022\031\n\021move_reliable_seq\030\r \001(\r\022" +
+      "\022\n\nlife_state\030\014 \001(\r\022 \n\010die_type\030\002 \001(\0162\016." +
+      "PlayerDieType\022\030\n\020source_entity_id\030\005 \001(\rB" +
+      "\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1604,7 +1650,7 @@ public emu.grasscutter.net.proto.LifeStateChangeNotifyOuterClass.LifeStateChange
     internal_static_LifeStateChangeNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_LifeStateChangeNotify_descriptor,
-        new java.lang.String[] { "AttackTag", "MoveReliableSeq", "EPGOBHIEDOI", "EntityId", "LifeState", "DieType", "ServerBuffList", "SourceEntityId", });
+        new java.lang.String[] { "ServerBuffList", "AttackTag", "EntityId", "MoveReliableSeq", "LifeState", "DieType", "SourceEntityId", });
     emu.grasscutter.net.proto.ServerBuffOuterClass.getDescriptor();
     emu.grasscutter.net.proto.PlayerDieTypeOuterClass.getDescriptor();
   }
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MPLevelEntityInfo.java b/src/generated/main/java/emu/grasscutter/net/proto/MPLevelEntityInfo.java
index e88b496823c..82ec72ee74d 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/MPLevelEntityInfo.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/MPLevelEntityInfo.java
@@ -19,28 +19,48 @@ public interface MpLevelEntityInfoOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.AbilitySyncStateInfo ability_info = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.AbilitySyncStateInfo ability_info = 10;</code>
      * @return Whether the abilityInfo field is set.
      */
     boolean hasAbilityInfo();
     /**
-     * <code>.AbilitySyncStateInfo ability_info = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.AbilitySyncStateInfo ability_info = 10;</code>
      * @return The abilityInfo.
      */
     emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getAbilityInfo();
     /**
-     * <code>.AbilitySyncStateInfo ability_info = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.AbilitySyncStateInfo ability_info = 10;</code>
      */
     emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getAbilityInfoOrBuilder();
 
     /**
-     * <code>uint32 entity_id = 10;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 entity_id = 4;</code>
      * @return The entityId.
      */
     int getEntityId();
 
     /**
-     * <code>uint32 authority_peer_id = 15;</code>
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>uint32 authority_peer_id = 6;</code>
      * @return The authorityPeerId.
      */
     int getAuthorityPeerId();
@@ -90,7 +110,17 @@ private MpLevelEntityInfo(
             case 0:
               done = true;
               break;
-            case 66: {
+            case 32: {
+
+              entityId_ = input.readUInt32();
+              break;
+            }
+            case 48: {
+
+              authorityPeerId_ = input.readUInt32();
+              break;
+            }
+            case 82: {
               emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder subBuilder = null;
               if (abilityInfo_ != null) {
                 subBuilder = abilityInfo_.toBuilder();
@@ -103,16 +133,6 @@ private MpLevelEntityInfo(
 
               break;
             }
-            case 80: {
-
-              entityId_ = input.readUInt32();
-              break;
-            }
-            case 120: {
-
-              authorityPeerId_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -145,10 +165,14 @@ private MpLevelEntityInfo(
               emu.grasscutter.net.proto.MPLevelEntityInfo.MpLevelEntityInfo.class, emu.grasscutter.net.proto.MPLevelEntityInfo.MpLevelEntityInfo.Builder.class);
     }
 
-    public static final int ABILITY_INFO_FIELD_NUMBER = 8;
+    public static final int ABILITY_INFO_FIELD_NUMBER = 10;
     private emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo abilityInfo_;
     /**
-     * <code>.AbilitySyncStateInfo ability_info = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.AbilitySyncStateInfo ability_info = 10;</code>
      * @return Whether the abilityInfo field is set.
      */
     @java.lang.Override
@@ -156,7 +180,11 @@ public boolean hasAbilityInfo() {
       return abilityInfo_ != null;
     }
     /**
-     * <code>.AbilitySyncStateInfo ability_info = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.AbilitySyncStateInfo ability_info = 10;</code>
      * @return The abilityInfo.
      */
     @java.lang.Override
@@ -164,17 +192,25 @@ public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncState
       return abilityInfo_ == null ? emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : abilityInfo_;
     }
     /**
-     * <code>.AbilitySyncStateInfo ability_info = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.AbilitySyncStateInfo ability_info = 10;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getAbilityInfoOrBuilder() {
       return getAbilityInfo();
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 10;
+    public static final int ENTITY_ID_FIELD_NUMBER = 4;
     private int entityId_;
     /**
-     * <code>uint32 entity_id = 10;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 entity_id = 4;</code>
      * @return The entityId.
      */
     @java.lang.Override
@@ -182,10 +218,14 @@ public int getEntityId() {
       return entityId_;
     }
 
-    public static final int AUTHORITY_PEER_ID_FIELD_NUMBER = 15;
+    public static final int AUTHORITY_PEER_ID_FIELD_NUMBER = 6;
     private int authorityPeerId_;
     /**
-     * <code>uint32 authority_peer_id = 15;</code>
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>uint32 authority_peer_id = 6;</code>
      * @return The authorityPeerId.
      */
     @java.lang.Override
@@ -207,14 +247,14 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (abilityInfo_ != null) {
-        output.writeMessage(8, getAbilityInfo());
-      }
       if (entityId_ != 0) {
-        output.writeUInt32(10, entityId_);
+        output.writeUInt32(4, entityId_);
       }
       if (authorityPeerId_ != 0) {
-        output.writeUInt32(15, authorityPeerId_);
+        output.writeUInt32(6, authorityPeerId_);
+      }
+      if (abilityInfo_ != null) {
+        output.writeMessage(10, getAbilityInfo());
       }
       unknownFields.writeTo(output);
     }
@@ -225,17 +265,17 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (abilityInfo_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(8, getAbilityInfo());
-      }
       if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, entityId_);
+          .computeUInt32Size(4, entityId_);
       }
       if (authorityPeerId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, authorityPeerId_);
+          .computeUInt32Size(6, authorityPeerId_);
+      }
+      if (abilityInfo_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(10, getAbilityInfo());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -546,14 +586,22 @@ public Builder mergeFrom(
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder> abilityInfoBuilder_;
       /**
-       * <code>.AbilitySyncStateInfo ability_info = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo ability_info = 10;</code>
        * @return Whether the abilityInfo field is set.
        */
       public boolean hasAbilityInfo() {
         return abilityInfoBuilder_ != null || abilityInfo_ != null;
       }
       /**
-       * <code>.AbilitySyncStateInfo ability_info = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo ability_info = 10;</code>
        * @return The abilityInfo.
        */
       public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getAbilityInfo() {
@@ -564,7 +612,11 @@ public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncState
         }
       }
       /**
-       * <code>.AbilitySyncStateInfo ability_info = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo ability_info = 10;</code>
        */
       public Builder setAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
         if (abilityInfoBuilder_ == null) {
@@ -580,7 +632,11 @@ public Builder setAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOute
         return this;
       }
       /**
-       * <code>.AbilitySyncStateInfo ability_info = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo ability_info = 10;</code>
        */
       public Builder setAbilityInfo(
           emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder builderForValue) {
@@ -594,7 +650,11 @@ public Builder setAbilityInfo(
         return this;
       }
       /**
-       * <code>.AbilitySyncStateInfo ability_info = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo ability_info = 10;</code>
        */
       public Builder mergeAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
         if (abilityInfoBuilder_ == null) {
@@ -612,7 +672,11 @@ public Builder mergeAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOu
         return this;
       }
       /**
-       * <code>.AbilitySyncStateInfo ability_info = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo ability_info = 10;</code>
        */
       public Builder clearAbilityInfo() {
         if (abilityInfoBuilder_ == null) {
@@ -626,7 +690,11 @@ public Builder clearAbilityInfo() {
         return this;
       }
       /**
-       * <code>.AbilitySyncStateInfo ability_info = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo ability_info = 10;</code>
        */
       public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder getAbilityInfoBuilder() {
         
@@ -634,7 +702,11 @@ public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncState
         return getAbilityInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.AbilitySyncStateInfo ability_info = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo ability_info = 10;</code>
        */
       public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getAbilityInfoOrBuilder() {
         if (abilityInfoBuilder_ != null) {
@@ -645,7 +717,11 @@ public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncState
         }
       }
       /**
-       * <code>.AbilitySyncStateInfo ability_info = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo ability_info = 10;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder> 
@@ -663,7 +739,11 @@ public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncState
 
       private int entityId_ ;
       /**
-       * <code>uint32 entity_id = 10;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 entity_id = 4;</code>
        * @return The entityId.
        */
       @java.lang.Override
@@ -671,7 +751,11 @@ public int getEntityId() {
         return entityId_;
       }
       /**
-       * <code>uint32 entity_id = 10;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 entity_id = 4;</code>
        * @param value The entityId to set.
        * @return This builder for chaining.
        */
@@ -682,7 +766,11 @@ public Builder setEntityId(int value) {
         return this;
       }
       /**
-       * <code>uint32 entity_id = 10;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 entity_id = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearEntityId() {
@@ -694,7 +782,11 @@ public Builder clearEntityId() {
 
       private int authorityPeerId_ ;
       /**
-       * <code>uint32 authority_peer_id = 15;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 authority_peer_id = 6;</code>
        * @return The authorityPeerId.
        */
       @java.lang.Override
@@ -702,7 +794,11 @@ public int getAuthorityPeerId() {
         return authorityPeerId_;
       }
       /**
-       * <code>uint32 authority_peer_id = 15;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 authority_peer_id = 6;</code>
        * @param value The authorityPeerId to set.
        * @return This builder for chaining.
        */
@@ -713,7 +809,11 @@ public Builder setAuthorityPeerId(int value) {
         return this;
       }
       /**
-       * <code>uint32 authority_peer_id = 15;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 authority_peer_id = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearAuthorityPeerId() {
@@ -791,9 +891,9 @@ public emu.grasscutter.net.proto.MPLevelEntityInfo.MpLevelEntityInfo getDefaultI
     java.lang.String[] descriptorData = {
       "\n\027MPLevelEntityInfo.proto\032\032AbilitySyncSt" +
       "ateInfo.proto\"n\n\021MpLevelEntityInfo\022+\n\014ab" +
-      "ility_info\030\010 \001(\0132\025.AbilitySyncStateInfo\022" +
-      "\021\n\tentity_id\030\n \001(\r\022\031\n\021authority_peer_id\030" +
-      "\017 \001(\rB\033\n\031emu.grasscutter.net.protob\006prot" +
+      "ility_info\030\n \001(\0132\025.AbilitySyncStateInfo\022" +
+      "\021\n\tentity_id\030\004 \001(\r\022\031\n\021authority_peer_id\030" +
+      "\006 \001(\rB\033\n\031emu.grasscutter.net.protob\006prot" +
       "o3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MPLevelEntityInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MPLevelEntityInfoOuterClass.java
index 1dae1e7029f..b8409236acb 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/MPLevelEntityInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/MPLevelEntityInfoOuterClass.java
@@ -19,28 +19,48 @@ public interface MPLevelEntityInfoOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.AbilitySyncStateInfo ability_info = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.AbilitySyncStateInfo ability_info = 10;</code>
      * @return Whether the abilityInfo field is set.
      */
     boolean hasAbilityInfo();
     /**
-     * <code>.AbilitySyncStateInfo ability_info = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.AbilitySyncStateInfo ability_info = 10;</code>
      * @return The abilityInfo.
      */
     emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getAbilityInfo();
     /**
-     * <code>.AbilitySyncStateInfo ability_info = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.AbilitySyncStateInfo ability_info = 10;</code>
      */
     emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getAbilityInfoOrBuilder();
 
     /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
      * <code>uint32 entity_id = 4;</code>
      * @return The entityId.
      */
     int getEntityId();
 
     /**
-     * <code>uint32 authority_peer_id = 12;</code>
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>uint32 authority_peer_id = 6;</code>
      * @return The authorityPeerId.
      */
     int getAuthorityPeerId();
@@ -90,7 +110,17 @@ private MPLevelEntityInfo(
             case 0:
               done = true;
               break;
-            case 10: {
+            case 32: {
+
+              entityId_ = input.readUInt32();
+              break;
+            }
+            case 48: {
+
+              authorityPeerId_ = input.readUInt32();
+              break;
+            }
+            case 82: {
               emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder subBuilder = null;
               if (abilityInfo_ != null) {
                 subBuilder = abilityInfo_.toBuilder();
@@ -103,16 +133,6 @@ private MPLevelEntityInfo(
 
               break;
             }
-            case 32: {
-
-              entityId_ = input.readUInt32();
-              break;
-            }
-            case 96: {
-
-              authorityPeerId_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -145,10 +165,14 @@ private MPLevelEntityInfo(
               emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo.class, emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo.Builder.class);
     }
 
-    public static final int ABILITY_INFO_FIELD_NUMBER = 1;
+    public static final int ABILITY_INFO_FIELD_NUMBER = 10;
     private emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo abilityInfo_;
     /**
-     * <code>.AbilitySyncStateInfo ability_info = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.AbilitySyncStateInfo ability_info = 10;</code>
      * @return Whether the abilityInfo field is set.
      */
     @java.lang.Override
@@ -156,7 +180,11 @@ public boolean hasAbilityInfo() {
       return abilityInfo_ != null;
     }
     /**
-     * <code>.AbilitySyncStateInfo ability_info = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.AbilitySyncStateInfo ability_info = 10;</code>
      * @return The abilityInfo.
      */
     @java.lang.Override
@@ -164,7 +192,11 @@ public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncState
       return abilityInfo_ == null ? emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : abilityInfo_;
     }
     /**
-     * <code>.AbilitySyncStateInfo ability_info = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.AbilitySyncStateInfo ability_info = 10;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getAbilityInfoOrBuilder() {
@@ -174,6 +206,10 @@ public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncState
     public static final int ENTITY_ID_FIELD_NUMBER = 4;
     private int entityId_;
     /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
      * <code>uint32 entity_id = 4;</code>
      * @return The entityId.
      */
@@ -182,10 +218,14 @@ public int getEntityId() {
       return entityId_;
     }
 
-    public static final int AUTHORITY_PEER_ID_FIELD_NUMBER = 12;
+    public static final int AUTHORITY_PEER_ID_FIELD_NUMBER = 6;
     private int authorityPeerId_;
     /**
-     * <code>uint32 authority_peer_id = 12;</code>
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>uint32 authority_peer_id = 6;</code>
      * @return The authorityPeerId.
      */
     @java.lang.Override
@@ -207,14 +247,14 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (abilityInfo_ != null) {
-        output.writeMessage(1, getAbilityInfo());
-      }
       if (entityId_ != 0) {
         output.writeUInt32(4, entityId_);
       }
       if (authorityPeerId_ != 0) {
-        output.writeUInt32(12, authorityPeerId_);
+        output.writeUInt32(6, authorityPeerId_);
+      }
+      if (abilityInfo_ != null) {
+        output.writeMessage(10, getAbilityInfo());
       }
       unknownFields.writeTo(output);
     }
@@ -225,17 +265,17 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (abilityInfo_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getAbilityInfo());
-      }
       if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(4, entityId_);
       }
       if (authorityPeerId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, authorityPeerId_);
+          .computeUInt32Size(6, authorityPeerId_);
+      }
+      if (abilityInfo_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(10, getAbilityInfo());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -546,14 +586,22 @@ public Builder mergeFrom(
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder> abilityInfoBuilder_;
       /**
-       * <code>.AbilitySyncStateInfo ability_info = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo ability_info = 10;</code>
        * @return Whether the abilityInfo field is set.
        */
       public boolean hasAbilityInfo() {
         return abilityInfoBuilder_ != null || abilityInfo_ != null;
       }
       /**
-       * <code>.AbilitySyncStateInfo ability_info = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo ability_info = 10;</code>
        * @return The abilityInfo.
        */
       public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getAbilityInfo() {
@@ -564,7 +612,11 @@ public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncState
         }
       }
       /**
-       * <code>.AbilitySyncStateInfo ability_info = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo ability_info = 10;</code>
        */
       public Builder setAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
         if (abilityInfoBuilder_ == null) {
@@ -580,7 +632,11 @@ public Builder setAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOute
         return this;
       }
       /**
-       * <code>.AbilitySyncStateInfo ability_info = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo ability_info = 10;</code>
        */
       public Builder setAbilityInfo(
           emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder builderForValue) {
@@ -594,7 +650,11 @@ public Builder setAbilityInfo(
         return this;
       }
       /**
-       * <code>.AbilitySyncStateInfo ability_info = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo ability_info = 10;</code>
        */
       public Builder mergeAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
         if (abilityInfoBuilder_ == null) {
@@ -612,7 +672,11 @@ public Builder mergeAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOu
         return this;
       }
       /**
-       * <code>.AbilitySyncStateInfo ability_info = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo ability_info = 10;</code>
        */
       public Builder clearAbilityInfo() {
         if (abilityInfoBuilder_ == null) {
@@ -626,7 +690,11 @@ public Builder clearAbilityInfo() {
         return this;
       }
       /**
-       * <code>.AbilitySyncStateInfo ability_info = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo ability_info = 10;</code>
        */
       public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder getAbilityInfoBuilder() {
         
@@ -634,7 +702,11 @@ public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncState
         return getAbilityInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.AbilitySyncStateInfo ability_info = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo ability_info = 10;</code>
        */
       public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getAbilityInfoOrBuilder() {
         if (abilityInfoBuilder_ != null) {
@@ -645,7 +717,11 @@ public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncState
         }
       }
       /**
-       * <code>.AbilitySyncStateInfo ability_info = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo ability_info = 10;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder> 
@@ -663,6 +739,10 @@ public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncState
 
       private int entityId_ ;
       /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
        * <code>uint32 entity_id = 4;</code>
        * @return The entityId.
        */
@@ -671,6 +751,10 @@ public int getEntityId() {
         return entityId_;
       }
       /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
        * <code>uint32 entity_id = 4;</code>
        * @param value The entityId to set.
        * @return This builder for chaining.
@@ -682,6 +766,10 @@ public Builder setEntityId(int value) {
         return this;
       }
       /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
        * <code>uint32 entity_id = 4;</code>
        * @return This builder for chaining.
        */
@@ -694,7 +782,11 @@ public Builder clearEntityId() {
 
       private int authorityPeerId_ ;
       /**
-       * <code>uint32 authority_peer_id = 12;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 authority_peer_id = 6;</code>
        * @return The authorityPeerId.
        */
       @java.lang.Override
@@ -702,7 +794,11 @@ public int getAuthorityPeerId() {
         return authorityPeerId_;
       }
       /**
-       * <code>uint32 authority_peer_id = 12;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 authority_peer_id = 6;</code>
        * @param value The authorityPeerId to set.
        * @return This builder for chaining.
        */
@@ -713,7 +809,11 @@ public Builder setAuthorityPeerId(int value) {
         return this;
       }
       /**
-       * <code>uint32 authority_peer_id = 12;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 authority_peer_id = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearAuthorityPeerId() {
@@ -791,9 +891,9 @@ public emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo g
     java.lang.String[] descriptorData = {
       "\n\027MPLevelEntityInfo.proto\032\032AbilitySyncSt" +
       "ateInfo.proto\"n\n\021MPLevelEntityInfo\022+\n\014ab" +
-      "ility_info\030\001 \001(\0132\025.AbilitySyncStateInfo\022" +
+      "ility_info\030\n \001(\0132\025.AbilitySyncStateInfo\022" +
       "\021\n\tentity_id\030\004 \001(\r\022\031\n\021authority_peer_id\030" +
-      "\014 \001(\rB\033\n\031emu.grasscutter.net.protob\006prot" +
+      "\006 \001(\rB\033\n\031emu.grasscutter.net.protob\006prot" +
       "o3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MarkMapReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MarkMapReqOuterClass.java
index 2aec049ef92..b92f21e17b1 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/MarkMapReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/MarkMapReqOuterClass.java
@@ -19,41 +19,73 @@ public interface MarkMapReqOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.MapMarkPoint mark = 9;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.MapMarkPoint mark = 8;</code>
      * @return Whether the mark field is set.
      */
     boolean hasMark();
     /**
-     * <code>.MapMarkPoint mark = 9;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.MapMarkPoint mark = 8;</code>
      * @return The mark.
      */
     emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint getMark();
     /**
-     * <code>.MapMarkPoint mark = 9;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.MapMarkPoint mark = 8;</code>
      */
     emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder getMarkOrBuilder();
 
     /**
-     * <code>.MapMarkPoint old = 3;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.MapMarkPoint old = 13;</code>
      * @return Whether the old field is set.
      */
     boolean hasOld();
     /**
-     * <code>.MapMarkPoint old = 3;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.MapMarkPoint old = 13;</code>
      * @return The old.
      */
     emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint getOld();
     /**
-     * <code>.MapMarkPoint old = 3;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.MapMarkPoint old = 13;</code>
      */
     emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder getOldOrBuilder();
 
     /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
      * <code>.MarkMapReq.Operation op = 15;</code>
      * @return The enum numeric value on the wire for op.
      */
     int getOpValue();
     /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
      * <code>.MarkMapReq.Operation op = 15;</code>
      * @return The op.
      */
@@ -61,7 +93,7 @@ public interface MarkMapReqOrBuilder extends
   }
   /**
    * <pre>
-   * CmdId: 9954
+   * CmdId: 26646
    * </pre>
    *
    * Protobuf type {@code MarkMapReq}
@@ -109,28 +141,28 @@ private MarkMapReq(
             case 0:
               done = true;
               break;
-            case 26: {
+            case 66: {
               emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder subBuilder = null;
-              if (old_ != null) {
-                subBuilder = old_.toBuilder();
+              if (mark_ != null) {
+                subBuilder = mark_.toBuilder();
               }
-              old_ = input.readMessage(emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.parser(), extensionRegistry);
+              mark_ = input.readMessage(emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom(old_);
-                old_ = subBuilder.buildPartial();
+                subBuilder.mergeFrom(mark_);
+                mark_ = subBuilder.buildPartial();
               }
 
               break;
             }
-            case 74: {
+            case 106: {
               emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder subBuilder = null;
-              if (mark_ != null) {
-                subBuilder = mark_.toBuilder();
+              if (old_ != null) {
+                subBuilder = old_.toBuilder();
               }
-              mark_ = input.readMessage(emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.parser(), extensionRegistry);
+              old_ = input.readMessage(emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom(mark_);
-                mark_ = subBuilder.buildPartial();
+                subBuilder.mergeFrom(old_);
+                old_ = subBuilder.buildPartial();
               }
 
               break;
@@ -299,10 +331,14 @@ private Operation(int value) {
       // @@protoc_insertion_point(enum_scope:MarkMapReq.Operation)
     }
 
-    public static final int MARK_FIELD_NUMBER = 9;
+    public static final int MARK_FIELD_NUMBER = 8;
     private emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint mark_;
     /**
-     * <code>.MapMarkPoint mark = 9;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.MapMarkPoint mark = 8;</code>
      * @return Whether the mark field is set.
      */
     @java.lang.Override
@@ -310,7 +346,11 @@ public boolean hasMark() {
       return mark_ != null;
     }
     /**
-     * <code>.MapMarkPoint mark = 9;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.MapMarkPoint mark = 8;</code>
      * @return The mark.
      */
     @java.lang.Override
@@ -318,17 +358,25 @@ public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint getMark() {
       return mark_ == null ? emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.getDefaultInstance() : mark_;
     }
     /**
-     * <code>.MapMarkPoint mark = 9;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.MapMarkPoint mark = 8;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder getMarkOrBuilder() {
       return getMark();
     }
 
-    public static final int OLD_FIELD_NUMBER = 3;
+    public static final int OLD_FIELD_NUMBER = 13;
     private emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint old_;
     /**
-     * <code>.MapMarkPoint old = 3;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.MapMarkPoint old = 13;</code>
      * @return Whether the old field is set.
      */
     @java.lang.Override
@@ -336,7 +384,11 @@ public boolean hasOld() {
       return old_ != null;
     }
     /**
-     * <code>.MapMarkPoint old = 3;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.MapMarkPoint old = 13;</code>
      * @return The old.
      */
     @java.lang.Override
@@ -344,7 +396,11 @@ public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint getOld() {
       return old_ == null ? emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.getDefaultInstance() : old_;
     }
     /**
-     * <code>.MapMarkPoint old = 3;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.MapMarkPoint old = 13;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder getOldOrBuilder() {
@@ -354,6 +410,10 @@ public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder ge
     public static final int OP_FIELD_NUMBER = 15;
     private int op_;
     /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
      * <code>.MarkMapReq.Operation op = 15;</code>
      * @return The enum numeric value on the wire for op.
      */
@@ -361,6 +421,10 @@ public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder ge
       return op_;
     }
     /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
      * <code>.MarkMapReq.Operation op = 15;</code>
      * @return The op.
      */
@@ -384,11 +448,11 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (old_ != null) {
-        output.writeMessage(3, getOld());
-      }
       if (mark_ != null) {
-        output.writeMessage(9, getMark());
+        output.writeMessage(8, getMark());
+      }
+      if (old_ != null) {
+        output.writeMessage(13, getOld());
       }
       if (op_ != emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq.Operation.OPERATION_ADD.getNumber()) {
         output.writeEnum(15, op_);
@@ -402,13 +466,13 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (old_ != null) {
+      if (mark_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, getOld());
+          .computeMessageSize(8, getMark());
       }
-      if (mark_ != null) {
+      if (old_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, getMark());
+          .computeMessageSize(13, getOld());
       }
       if (op_ != emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq.Operation.OPERATION_ADD.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
@@ -558,7 +622,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 9954
+     * CmdId: 26646
      * </pre>
      *
      * Protobuf type {@code MarkMapReq}
@@ -739,14 +803,22 @@ public Builder mergeFrom(
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder> markBuilder_;
       /**
-       * <code>.MapMarkPoint mark = 9;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.MapMarkPoint mark = 8;</code>
        * @return Whether the mark field is set.
        */
       public boolean hasMark() {
         return markBuilder_ != null || mark_ != null;
       }
       /**
-       * <code>.MapMarkPoint mark = 9;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.MapMarkPoint mark = 8;</code>
        * @return The mark.
        */
       public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint getMark() {
@@ -757,7 +829,11 @@ public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint getMark() {
         }
       }
       /**
-       * <code>.MapMarkPoint mark = 9;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.MapMarkPoint mark = 8;</code>
        */
       public Builder setMark(emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint value) {
         if (markBuilder_ == null) {
@@ -773,7 +849,11 @@ public Builder setMark(emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkP
         return this;
       }
       /**
-       * <code>.MapMarkPoint mark = 9;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.MapMarkPoint mark = 8;</code>
        */
       public Builder setMark(
           emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder builderForValue) {
@@ -787,7 +867,11 @@ public Builder setMark(
         return this;
       }
       /**
-       * <code>.MapMarkPoint mark = 9;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.MapMarkPoint mark = 8;</code>
        */
       public Builder mergeMark(emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint value) {
         if (markBuilder_ == null) {
@@ -805,7 +889,11 @@ public Builder mergeMark(emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMar
         return this;
       }
       /**
-       * <code>.MapMarkPoint mark = 9;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.MapMarkPoint mark = 8;</code>
        */
       public Builder clearMark() {
         if (markBuilder_ == null) {
@@ -819,7 +907,11 @@ public Builder clearMark() {
         return this;
       }
       /**
-       * <code>.MapMarkPoint mark = 9;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.MapMarkPoint mark = 8;</code>
        */
       public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder getMarkBuilder() {
         
@@ -827,7 +919,11 @@ public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder get
         return getMarkFieldBuilder().getBuilder();
       }
       /**
-       * <code>.MapMarkPoint mark = 9;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.MapMarkPoint mark = 8;</code>
        */
       public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder getMarkOrBuilder() {
         if (markBuilder_ != null) {
@@ -838,7 +934,11 @@ public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder ge
         }
       }
       /**
-       * <code>.MapMarkPoint mark = 9;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.MapMarkPoint mark = 8;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder> 
@@ -858,14 +958,22 @@ public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder ge
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder> oldBuilder_;
       /**
-       * <code>.MapMarkPoint old = 3;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.MapMarkPoint old = 13;</code>
        * @return Whether the old field is set.
        */
       public boolean hasOld() {
         return oldBuilder_ != null || old_ != null;
       }
       /**
-       * <code>.MapMarkPoint old = 3;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.MapMarkPoint old = 13;</code>
        * @return The old.
        */
       public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint getOld() {
@@ -876,7 +984,11 @@ public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint getOld() {
         }
       }
       /**
-       * <code>.MapMarkPoint old = 3;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.MapMarkPoint old = 13;</code>
        */
       public Builder setOld(emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint value) {
         if (oldBuilder_ == null) {
@@ -892,7 +1004,11 @@ public Builder setOld(emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPo
         return this;
       }
       /**
-       * <code>.MapMarkPoint old = 3;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.MapMarkPoint old = 13;</code>
        */
       public Builder setOld(
           emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder builderForValue) {
@@ -906,7 +1022,11 @@ public Builder setOld(
         return this;
       }
       /**
-       * <code>.MapMarkPoint old = 3;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.MapMarkPoint old = 13;</code>
        */
       public Builder mergeOld(emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint value) {
         if (oldBuilder_ == null) {
@@ -924,7 +1044,11 @@ public Builder mergeOld(emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMark
         return this;
       }
       /**
-       * <code>.MapMarkPoint old = 3;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.MapMarkPoint old = 13;</code>
        */
       public Builder clearOld() {
         if (oldBuilder_ == null) {
@@ -938,7 +1062,11 @@ public Builder clearOld() {
         return this;
       }
       /**
-       * <code>.MapMarkPoint old = 3;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.MapMarkPoint old = 13;</code>
        */
       public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder getOldBuilder() {
         
@@ -946,7 +1074,11 @@ public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder get
         return getOldFieldBuilder().getBuilder();
       }
       /**
-       * <code>.MapMarkPoint old = 3;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.MapMarkPoint old = 13;</code>
        */
       public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder getOldOrBuilder() {
         if (oldBuilder_ != null) {
@@ -957,7 +1089,11 @@ public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder ge
         }
       }
       /**
-       * <code>.MapMarkPoint old = 3;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.MapMarkPoint old = 13;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder> 
@@ -975,6 +1111,10 @@ public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder ge
 
       private int op_ = 0;
       /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
        * <code>.MarkMapReq.Operation op = 15;</code>
        * @return The enum numeric value on the wire for op.
        */
@@ -982,6 +1122,10 @@ public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder ge
         return op_;
       }
       /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
        * <code>.MarkMapReq.Operation op = 15;</code>
        * @param value The enum numeric value on the wire for op to set.
        * @return This builder for chaining.
@@ -993,6 +1137,10 @@ public Builder setOpValue(int value) {
         return this;
       }
       /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
        * <code>.MarkMapReq.Operation op = 15;</code>
        * @return The op.
        */
@@ -1003,6 +1151,10 @@ public emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq.Operation getOp
         return result == null ? emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq.Operation.UNRECOGNIZED : result;
       }
       /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
        * <code>.MarkMapReq.Operation op = 15;</code>
        * @param value The op to set.
        * @return This builder for chaining.
@@ -1017,6 +1169,10 @@ public Builder setOp(emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq.O
         return this;
       }
       /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
        * <code>.MarkMapReq.Operation op = 15;</code>
        * @return This builder for chaining.
        */
@@ -1094,8 +1250,8 @@ public emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq getDefaultInsta
   static {
     java.lang.String[] descriptorData = {
       "\n\020MarkMapReq.proto\032\022MapMarkPoint.proto\"\301" +
-      "\001\n\nMarkMapReq\022\033\n\004mark\030\t \001(\0132\r.MapMarkPoi" +
-      "nt\022\032\n\003old\030\003 \001(\0132\r.MapMarkPoint\022!\n\002op\030\017 \001" +
+      "\001\n\nMarkMapReq\022\033\n\004mark\030\010 \001(\0132\r.MapMarkPoi" +
+      "nt\022\032\n\003old\030\r \001(\0132\r.MapMarkPoint\022!\n\002op\030\017 \001" +
       "(\0162\025.MarkMapReq.Operation\"W\n\tOperation\022\021" +
       "\n\rOPERATION_ADD\020\000\022\021\n\rOPERATION_MOD\020\001\022\021\n\r" +
       "OPERATION_DEL\020\002\022\021\n\rOPERATION_GET\020\003B\033\n\031em" +
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/NpcTalkReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/NpcTalkReqOuterClass.java
index e9e4dd41a8f..f451b813cb0 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/NpcTalkReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/NpcTalkReqOuterClass.java
@@ -19,26 +19,38 @@ public interface NpcTalkReqOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 entity_id = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 npc_entity_id = 5;</code>
+     * @return The npcEntityId.
+     */
+    int getNpcEntityId();
+
+    /**
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 entity_id = 4;</code>
      * @return The entityId.
      */
     int getEntityId();
 
     /**
-     * <code>uint32 talk_id = 14;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 talk_id = 9;</code>
      * @return The talkId.
      */
     int getTalkId();
-
-    /**
-     * <code>uint32 npc_entity_id = 2;</code>
-     * @return The npcEntityId.
-     */
-    int getNpcEntityId();
   }
   /**
    * <pre>
-   * CmdId: 24255
+   * CmdId: 26161
    * </pre>
    *
    * Protobuf type {@code NpcTalkReq}
@@ -85,17 +97,17 @@ private NpcTalkReq(
             case 0:
               done = true;
               break;
-            case 16: {
+            case 32: {
 
-              npcEntityId_ = input.readUInt32();
+              entityId_ = input.readUInt32();
               break;
             }
-            case 64: {
+            case 40: {
 
-              entityId_ = input.readUInt32();
+              npcEntityId_ = input.readUInt32();
               break;
             }
-            case 112: {
+            case 72: {
 
               talkId_ = input.readUInt32();
               break;
@@ -132,10 +144,29 @@ private NpcTalkReq(
               emu.grasscutter.net.proto.NpcTalkReqOuterClass.NpcTalkReq.class, emu.grasscutter.net.proto.NpcTalkReqOuterClass.NpcTalkReq.Builder.class);
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 8;
+    public static final int NPC_ENTITY_ID_FIELD_NUMBER = 5;
+    private int npcEntityId_;
+    /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 npc_entity_id = 5;</code>
+     * @return The npcEntityId.
+     */
+    @java.lang.Override
+    public int getNpcEntityId() {
+      return npcEntityId_;
+    }
+
+    public static final int ENTITY_ID_FIELD_NUMBER = 4;
     private int entityId_;
     /**
-     * <code>uint32 entity_id = 8;</code>
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 entity_id = 4;</code>
      * @return The entityId.
      */
     @java.lang.Override
@@ -143,10 +174,14 @@ public int getEntityId() {
       return entityId_;
     }
 
-    public static final int TALK_ID_FIELD_NUMBER = 14;
+    public static final int TALK_ID_FIELD_NUMBER = 9;
     private int talkId_;
     /**
-     * <code>uint32 talk_id = 14;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 talk_id = 9;</code>
      * @return The talkId.
      */
     @java.lang.Override
@@ -154,17 +189,6 @@ public int getTalkId() {
       return talkId_;
     }
 
-    public static final int NPC_ENTITY_ID_FIELD_NUMBER = 2;
-    private int npcEntityId_;
-    /**
-     * <code>uint32 npc_entity_id = 2;</code>
-     * @return The npcEntityId.
-     */
-    @java.lang.Override
-    public int getNpcEntityId() {
-      return npcEntityId_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -179,14 +203,14 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (npcEntityId_ != 0) {
-        output.writeUInt32(2, npcEntityId_);
-      }
       if (entityId_ != 0) {
-        output.writeUInt32(8, entityId_);
+        output.writeUInt32(4, entityId_);
+      }
+      if (npcEntityId_ != 0) {
+        output.writeUInt32(5, npcEntityId_);
       }
       if (talkId_ != 0) {
-        output.writeUInt32(14, talkId_);
+        output.writeUInt32(9, talkId_);
       }
       unknownFields.writeTo(output);
     }
@@ -197,17 +221,17 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (npcEntityId_ != 0) {
+      if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, npcEntityId_);
+          .computeUInt32Size(4, entityId_);
       }
-      if (entityId_ != 0) {
+      if (npcEntityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, entityId_);
+          .computeUInt32Size(5, npcEntityId_);
       }
       if (talkId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, talkId_);
+          .computeUInt32Size(9, talkId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -224,12 +248,12 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.NpcTalkReqOuterClass.NpcTalkReq other = (emu.grasscutter.net.proto.NpcTalkReqOuterClass.NpcTalkReq) obj;
 
+      if (getNpcEntityId()
+          != other.getNpcEntityId()) return false;
       if (getEntityId()
           != other.getEntityId()) return false;
       if (getTalkId()
           != other.getTalkId()) return false;
-      if (getNpcEntityId()
-          != other.getNpcEntityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -241,12 +265,12 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + NPC_ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getNpcEntityId();
       hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getEntityId();
       hash = (37 * hash) + TALK_ID_FIELD_NUMBER;
       hash = (53 * hash) + getTalkId();
-      hash = (37 * hash) + NPC_ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getNpcEntityId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -344,7 +368,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 24255
+     * CmdId: 26161
      * </pre>
      *
      * Protobuf type {@code NpcTalkReq}
@@ -384,12 +408,12 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        npcEntityId_ = 0;
+
         entityId_ = 0;
 
         talkId_ = 0;
 
-        npcEntityId_ = 0;
-
         return this;
       }
 
@@ -416,9 +440,9 @@ public emu.grasscutter.net.proto.NpcTalkReqOuterClass.NpcTalkReq build() {
       @java.lang.Override
       public emu.grasscutter.net.proto.NpcTalkReqOuterClass.NpcTalkReq buildPartial() {
         emu.grasscutter.net.proto.NpcTalkReqOuterClass.NpcTalkReq result = new emu.grasscutter.net.proto.NpcTalkReqOuterClass.NpcTalkReq(this);
+        result.npcEntityId_ = npcEntityId_;
         result.entityId_ = entityId_;
         result.talkId_ = talkId_;
-        result.npcEntityId_ = npcEntityId_;
         onBuilt();
         return result;
       }
@@ -467,15 +491,15 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.NpcTalkReqOuterClass.NpcTalkReq other) {
         if (other == emu.grasscutter.net.proto.NpcTalkReqOuterClass.NpcTalkReq.getDefaultInstance()) return this;
+        if (other.getNpcEntityId() != 0) {
+          setNpcEntityId(other.getNpcEntityId());
+        }
         if (other.getEntityId() != 0) {
           setEntityId(other.getEntityId());
         }
         if (other.getTalkId() != 0) {
           setTalkId(other.getTalkId());
         }
-        if (other.getNpcEntityId() != 0) {
-          setNpcEntityId(other.getNpcEntityId());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -505,95 +529,131 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int entityId_ ;
+      private int npcEntityId_ ;
       /**
-       * <code>uint32 entity_id = 8;</code>
-       * @return The entityId.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 npc_entity_id = 5;</code>
+       * @return The npcEntityId.
        */
       @java.lang.Override
-      public int getEntityId() {
-        return entityId_;
+      public int getNpcEntityId() {
+        return npcEntityId_;
       }
       /**
-       * <code>uint32 entity_id = 8;</code>
-       * @param value The entityId to set.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 npc_entity_id = 5;</code>
+       * @param value The npcEntityId to set.
        * @return This builder for chaining.
        */
-      public Builder setEntityId(int value) {
+      public Builder setNpcEntityId(int value) {
         
-        entityId_ = value;
+        npcEntityId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 entity_id = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 npc_entity_id = 5;</code>
        * @return This builder for chaining.
        */
-      public Builder clearEntityId() {
+      public Builder clearNpcEntityId() {
         
-        entityId_ = 0;
+        npcEntityId_ = 0;
         onChanged();
         return this;
       }
 
-      private int talkId_ ;
+      private int entityId_ ;
       /**
-       * <code>uint32 talk_id = 14;</code>
-       * @return The talkId.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 entity_id = 4;</code>
+       * @return The entityId.
        */
       @java.lang.Override
-      public int getTalkId() {
-        return talkId_;
+      public int getEntityId() {
+        return entityId_;
       }
       /**
-       * <code>uint32 talk_id = 14;</code>
-       * @param value The talkId to set.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 entity_id = 4;</code>
+       * @param value The entityId to set.
        * @return This builder for chaining.
        */
-      public Builder setTalkId(int value) {
+      public Builder setEntityId(int value) {
         
-        talkId_ = value;
+        entityId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 talk_id = 14;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 entity_id = 4;</code>
        * @return This builder for chaining.
        */
-      public Builder clearTalkId() {
+      public Builder clearEntityId() {
         
-        talkId_ = 0;
+        entityId_ = 0;
         onChanged();
         return this;
       }
 
-      private int npcEntityId_ ;
+      private int talkId_ ;
       /**
-       * <code>uint32 npc_entity_id = 2;</code>
-       * @return The npcEntityId.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 talk_id = 9;</code>
+       * @return The talkId.
        */
       @java.lang.Override
-      public int getNpcEntityId() {
-        return npcEntityId_;
+      public int getTalkId() {
+        return talkId_;
       }
       /**
-       * <code>uint32 npc_entity_id = 2;</code>
-       * @param value The npcEntityId to set.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 talk_id = 9;</code>
+       * @param value The talkId to set.
        * @return This builder for chaining.
        */
-      public Builder setNpcEntityId(int value) {
+      public Builder setTalkId(int value) {
         
-        npcEntityId_ = value;
+        talkId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 npc_entity_id = 2;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 talk_id = 9;</code>
        * @return This builder for chaining.
        */
-      public Builder clearNpcEntityId() {
+      public Builder clearTalkId() {
         
-        npcEntityId_ = 0;
+        talkId_ = 0;
         onChanged();
         return this;
       }
@@ -664,9 +724,9 @@ public emu.grasscutter.net.proto.NpcTalkReqOuterClass.NpcTalkReq getDefaultInsta
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\020NpcTalkReq.proto\"G\n\nNpcTalkReq\022\021\n\tenti" +
-      "ty_id\030\010 \001(\r\022\017\n\007talk_id\030\016 \001(\r\022\025\n\rnpc_enti" +
-      "ty_id\030\002 \001(\rB\033\n\031emu.grasscutter.net.proto" +
+      "\n\020NpcTalkReq.proto\"G\n\nNpcTalkReq\022\025\n\rnpc_" +
+      "entity_id\030\005 \001(\r\022\021\n\tentity_id\030\004 \001(\r\022\017\n\007ta" +
+      "lk_id\030\t \001(\rB\033\n\031emu.grasscutter.net.proto" +
       "b\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -678,7 +738,7 @@ public emu.grasscutter.net.proto.NpcTalkReqOuterClass.NpcTalkReq getDefaultInsta
     internal_static_NpcTalkReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_NpcTalkReq_descriptor,
-        new java.lang.String[] { "EntityId", "TalkId", "NpcEntityId", });
+        new java.lang.String[] { "NpcEntityId", "EntityId", "TalkId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/NpcTalkRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/NpcTalkRspOuterClass.java
index a72a5cd5bfe..746df14362c 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/NpcTalkRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/NpcTalkRspOuterClass.java
@@ -19,32 +19,48 @@ public interface NpcTalkRspOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>int32 retcode = 12;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>uint32 npc_entity_id = 3;</code>
-     * @return The npcEntityId.
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 cur_talk_id = 3;</code>
+     * @return The curTalkId.
      */
-    int getNpcEntityId();
+    int getCurTalkId();
 
     /**
-     * <code>uint32 cur_talk_id = 5;</code>
-     * @return The curTalkId.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 npc_entity_id = 15;</code>
+     * @return The npcEntityId.
      */
-    int getCurTalkId();
+    int getNpcEntityId();
 
     /**
-     * <code>uint32 entity_id = 15;</code>
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>uint32 entity_id = 4;</code>
      * @return The entityId.
      */
     int getEntityId();
   }
   /**
    * <pre>
-   * CmdId: 23865
+   * CmdId: 21566
    * </pre>
    *
    * Protobuf type {@code NpcTalkRsp}
@@ -91,24 +107,24 @@ private NpcTalkRsp(
             case 0:
               done = true;
               break;
-            case 8: {
+            case 24: {
 
-              retcode_ = input.readInt32();
+              curTalkId_ = input.readUInt32();
               break;
             }
-            case 24: {
+            case 32: {
 
-              npcEntityId_ = input.readUInt32();
+              entityId_ = input.readUInt32();
               break;
             }
-            case 40: {
+            case 96: {
 
-              curTalkId_ = input.readUInt32();
+              retcode_ = input.readInt32();
               break;
             }
             case 120: {
 
-              entityId_ = input.readUInt32();
+              npcEntityId_ = input.readUInt32();
               break;
             }
             default: {
@@ -143,10 +159,14 @@ private NpcTalkRsp(
               emu.grasscutter.net.proto.NpcTalkRspOuterClass.NpcTalkRsp.class, emu.grasscutter.net.proto.NpcTalkRspOuterClass.NpcTalkRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 1;
+    public static final int RETCODE_FIELD_NUMBER = 12;
     private int retcode_;
     /**
-     * <code>int32 retcode = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>int32 retcode = 12;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -154,32 +174,44 @@ public int getRetcode() {
       return retcode_;
     }
 
-    public static final int NPC_ENTITY_ID_FIELD_NUMBER = 3;
-    private int npcEntityId_;
+    public static final int CUR_TALK_ID_FIELD_NUMBER = 3;
+    private int curTalkId_;
     /**
-     * <code>uint32 npc_entity_id = 3;</code>
-     * @return The npcEntityId.
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 cur_talk_id = 3;</code>
+     * @return The curTalkId.
      */
     @java.lang.Override
-    public int getNpcEntityId() {
-      return npcEntityId_;
+    public int getCurTalkId() {
+      return curTalkId_;
     }
 
-    public static final int CUR_TALK_ID_FIELD_NUMBER = 5;
-    private int curTalkId_;
+    public static final int NPC_ENTITY_ID_FIELD_NUMBER = 15;
+    private int npcEntityId_;
     /**
-     * <code>uint32 cur_talk_id = 5;</code>
-     * @return The curTalkId.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 npc_entity_id = 15;</code>
+     * @return The npcEntityId.
      */
     @java.lang.Override
-    public int getCurTalkId() {
-      return curTalkId_;
+    public int getNpcEntityId() {
+      return npcEntityId_;
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 15;
+    public static final int ENTITY_ID_FIELD_NUMBER = 4;
     private int entityId_;
     /**
-     * <code>uint32 entity_id = 15;</code>
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>uint32 entity_id = 4;</code>
      * @return The entityId.
      */
     @java.lang.Override
@@ -201,17 +233,17 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (retcode_ != 0) {
-        output.writeInt32(1, retcode_);
-      }
-      if (npcEntityId_ != 0) {
-        output.writeUInt32(3, npcEntityId_);
-      }
       if (curTalkId_ != 0) {
-        output.writeUInt32(5, curTalkId_);
+        output.writeUInt32(3, curTalkId_);
       }
       if (entityId_ != 0) {
-        output.writeUInt32(15, entityId_);
+        output.writeUInt32(4, entityId_);
+      }
+      if (retcode_ != 0) {
+        output.writeInt32(12, retcode_);
+      }
+      if (npcEntityId_ != 0) {
+        output.writeUInt32(15, npcEntityId_);
       }
       unknownFields.writeTo(output);
     }
@@ -222,21 +254,21 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (retcode_ != 0) {
+      if (curTalkId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(1, retcode_);
+          .computeUInt32Size(3, curTalkId_);
       }
-      if (npcEntityId_ != 0) {
+      if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, npcEntityId_);
+          .computeUInt32Size(4, entityId_);
       }
-      if (curTalkId_ != 0) {
+      if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, curTalkId_);
+          .computeInt32Size(12, retcode_);
       }
-      if (entityId_ != 0) {
+      if (npcEntityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, entityId_);
+          .computeUInt32Size(15, npcEntityId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -255,10 +287,10 @@ public boolean equals(final java.lang.Object obj) {
 
       if (getRetcode()
           != other.getRetcode()) return false;
-      if (getNpcEntityId()
-          != other.getNpcEntityId()) return false;
       if (getCurTalkId()
           != other.getCurTalkId()) return false;
+      if (getNpcEntityId()
+          != other.getNpcEntityId()) return false;
       if (getEntityId()
           != other.getEntityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -274,10 +306,10 @@ public int hashCode() {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
-      hash = (37 * hash) + NPC_ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getNpcEntityId();
       hash = (37 * hash) + CUR_TALK_ID_FIELD_NUMBER;
       hash = (53 * hash) + getCurTalkId();
+      hash = (37 * hash) + NPC_ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getNpcEntityId();
       hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getEntityId();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -377,7 +409,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 23865
+     * CmdId: 21566
      * </pre>
      *
      * Protobuf type {@code NpcTalkRsp}
@@ -419,10 +451,10 @@ public Builder clear() {
         super.clear();
         retcode_ = 0;
 
-        npcEntityId_ = 0;
-
         curTalkId_ = 0;
 
+        npcEntityId_ = 0;
+
         entityId_ = 0;
 
         return this;
@@ -452,8 +484,8 @@ public emu.grasscutter.net.proto.NpcTalkRspOuterClass.NpcTalkRsp build() {
       public emu.grasscutter.net.proto.NpcTalkRspOuterClass.NpcTalkRsp buildPartial() {
         emu.grasscutter.net.proto.NpcTalkRspOuterClass.NpcTalkRsp result = new emu.grasscutter.net.proto.NpcTalkRspOuterClass.NpcTalkRsp(this);
         result.retcode_ = retcode_;
-        result.npcEntityId_ = npcEntityId_;
         result.curTalkId_ = curTalkId_;
+        result.npcEntityId_ = npcEntityId_;
         result.entityId_ = entityId_;
         onBuilt();
         return result;
@@ -506,12 +538,12 @@ public Builder mergeFrom(emu.grasscutter.net.proto.NpcTalkRspOuterClass.NpcTalkR
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
-        if (other.getNpcEntityId() != 0) {
-          setNpcEntityId(other.getNpcEntityId());
-        }
         if (other.getCurTalkId() != 0) {
           setCurTalkId(other.getCurTalkId());
         }
+        if (other.getNpcEntityId() != 0) {
+          setNpcEntityId(other.getNpcEntityId());
+        }
         if (other.getEntityId() != 0) {
           setEntityId(other.getEntityId());
         }
@@ -546,7 +578,11 @@ public Builder mergeFrom(
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>int32 retcode = 12;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -554,7 +590,11 @@ public int getRetcode() {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>int32 retcode = 12;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -565,7 +605,11 @@ public Builder setRetcode(int value) {
         return this;
       }
       /**
-       * <code>int32 retcode = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>int32 retcode = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -575,71 +619,99 @@ public Builder clearRetcode() {
         return this;
       }
 
-      private int npcEntityId_ ;
+      private int curTalkId_ ;
       /**
-       * <code>uint32 npc_entity_id = 3;</code>
-       * @return The npcEntityId.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 cur_talk_id = 3;</code>
+       * @return The curTalkId.
        */
       @java.lang.Override
-      public int getNpcEntityId() {
-        return npcEntityId_;
+      public int getCurTalkId() {
+        return curTalkId_;
       }
       /**
-       * <code>uint32 npc_entity_id = 3;</code>
-       * @param value The npcEntityId to set.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 cur_talk_id = 3;</code>
+       * @param value The curTalkId to set.
        * @return This builder for chaining.
        */
-      public Builder setNpcEntityId(int value) {
+      public Builder setCurTalkId(int value) {
         
-        npcEntityId_ = value;
+        curTalkId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 npc_entity_id = 3;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 cur_talk_id = 3;</code>
        * @return This builder for chaining.
        */
-      public Builder clearNpcEntityId() {
+      public Builder clearCurTalkId() {
         
-        npcEntityId_ = 0;
+        curTalkId_ = 0;
         onChanged();
         return this;
       }
 
-      private int curTalkId_ ;
+      private int npcEntityId_ ;
       /**
-       * <code>uint32 cur_talk_id = 5;</code>
-       * @return The curTalkId.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 npc_entity_id = 15;</code>
+       * @return The npcEntityId.
        */
       @java.lang.Override
-      public int getCurTalkId() {
-        return curTalkId_;
+      public int getNpcEntityId() {
+        return npcEntityId_;
       }
       /**
-       * <code>uint32 cur_talk_id = 5;</code>
-       * @param value The curTalkId to set.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 npc_entity_id = 15;</code>
+       * @param value The npcEntityId to set.
        * @return This builder for chaining.
        */
-      public Builder setCurTalkId(int value) {
+      public Builder setNpcEntityId(int value) {
         
-        curTalkId_ = value;
+        npcEntityId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 cur_talk_id = 5;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 npc_entity_id = 15;</code>
        * @return This builder for chaining.
        */
-      public Builder clearCurTalkId() {
+      public Builder clearNpcEntityId() {
         
-        curTalkId_ = 0;
+        npcEntityId_ = 0;
         onChanged();
         return this;
       }
 
       private int entityId_ ;
       /**
-       * <code>uint32 entity_id = 15;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 entity_id = 4;</code>
        * @return The entityId.
        */
       @java.lang.Override
@@ -647,7 +719,11 @@ public int getEntityId() {
         return entityId_;
       }
       /**
-       * <code>uint32 entity_id = 15;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 entity_id = 4;</code>
        * @param value The entityId to set.
        * @return This builder for chaining.
        */
@@ -658,7 +734,11 @@ public Builder setEntityId(int value) {
         return this;
       }
       /**
-       * <code>uint32 entity_id = 15;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 entity_id = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearEntityId() {
@@ -735,8 +815,8 @@ public emu.grasscutter.net.proto.NpcTalkRspOuterClass.NpcTalkRsp getDefaultInsta
   static {
     java.lang.String[] descriptorData = {
       "\n\020NpcTalkRsp.proto\"\\\n\nNpcTalkRsp\022\017\n\007retc" +
-      "ode\030\001 \001(\005\022\025\n\rnpc_entity_id\030\003 \001(\r\022\023\n\013cur_" +
-      "talk_id\030\005 \001(\r\022\021\n\tentity_id\030\017 \001(\rB\033\n\031emu." +
+      "ode\030\014 \001(\005\022\023\n\013cur_talk_id\030\003 \001(\r\022\025\n\rnpc_en" +
+      "tity_id\030\017 \001(\r\022\021\n\tentity_id\030\004 \001(\rB\033\n\031emu." +
       "grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -748,7 +828,7 @@ public emu.grasscutter.net.proto.NpcTalkRspOuterClass.NpcTalkRsp getDefaultInsta
     internal_static_NpcTalkRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_NpcTalkRsp_descriptor,
-        new java.lang.String[] { "Retcode", "NpcEntityId", "CurTalkId", "EntityId", });
+        new java.lang.String[] { "Retcode", "CurTalkId", "NpcEntityId", "EntityId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/OpenStateUpdateNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/OpenStateUpdateNotifyOuterClass.java
index f4767145f08..bb15a6b0297 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/OpenStateUpdateNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/OpenStateUpdateNotifyOuterClass.java
@@ -23,7 +23,7 @@ public interface OpenStateUpdateNotifyOrBuilder extends
      * Offset: 0x20
      * </pre>
      *
-     * <code>map&lt;uint32, uint32&gt; open_state_map = 15;</code>
+     * <code>map&lt;uint32, uint32&gt; open_state_map = 14;</code>
      */
     int getOpenStateMapCount();
     /**
@@ -31,7 +31,7 @@ public interface OpenStateUpdateNotifyOrBuilder extends
      * Offset: 0x20
      * </pre>
      *
-     * <code>map&lt;uint32, uint32&gt; open_state_map = 15;</code>
+     * <code>map&lt;uint32, uint32&gt; open_state_map = 14;</code>
      */
     boolean containsOpenStateMap(
         int key);
@@ -46,7 +46,7 @@ boolean containsOpenStateMap(
      * Offset: 0x20
      * </pre>
      *
-     * <code>map&lt;uint32, uint32&gt; open_state_map = 15;</code>
+     * <code>map&lt;uint32, uint32&gt; open_state_map = 14;</code>
      */
     java.util.Map<java.lang.Integer, java.lang.Integer>
     getOpenStateMapMap();
@@ -55,7 +55,7 @@ boolean containsOpenStateMap(
      * Offset: 0x20
      * </pre>
      *
-     * <code>map&lt;uint32, uint32&gt; open_state_map = 15;</code>
+     * <code>map&lt;uint32, uint32&gt; open_state_map = 14;</code>
      */
 
     int getOpenStateMapOrDefault(
@@ -66,7 +66,7 @@ int getOpenStateMapOrDefault(
      * Offset: 0x20
      * </pre>
      *
-     * <code>map&lt;uint32, uint32&gt; open_state_map = 15;</code>
+     * <code>map&lt;uint32, uint32&gt; open_state_map = 14;</code>
      */
 
     int getOpenStateMapOrThrow(
@@ -74,7 +74,7 @@ int getOpenStateMapOrThrow(
   }
   /**
    * <pre>
-   * CmdId: 25389
+   * CmdId: 28079
    * </pre>
    *
    * Protobuf type {@code OpenStateUpdateNotify}
@@ -122,7 +122,7 @@ private OpenStateUpdateNotify(
             case 0:
               done = true;
               break;
-            case 122: {
+            case 114: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 openStateMap_ = com.google.protobuf.MapField.newMapField(
                     OpenStateMapDefaultEntryHolder.defaultEntry);
@@ -164,7 +164,7 @@ private OpenStateUpdateNotify(
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 15:
+        case 14:
           return internalGetOpenStateMap();
         default:
           throw new RuntimeException(
@@ -179,7 +179,7 @@ protected com.google.protobuf.MapField internalGetMapField(
               emu.grasscutter.net.proto.OpenStateUpdateNotifyOuterClass.OpenStateUpdateNotify.class, emu.grasscutter.net.proto.OpenStateUpdateNotifyOuterClass.OpenStateUpdateNotify.Builder.class);
     }
 
-    public static final int OPEN_STATE_MAP_FIELD_NUMBER = 15;
+    public static final int OPEN_STATE_MAP_FIELD_NUMBER = 14;
     private static final class OpenStateMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, java.lang.Integer> defaultEntry =
@@ -210,7 +210,7 @@ public int getOpenStateMapCount() {
      * Offset: 0x20
      * </pre>
      *
-     * <code>map&lt;uint32, uint32&gt; open_state_map = 15;</code>
+     * <code>map&lt;uint32, uint32&gt; open_state_map = 14;</code>
      */
 
     @java.lang.Override
@@ -232,7 +232,7 @@ public java.util.Map<java.lang.Integer, java.lang.Integer> getOpenStateMap() {
      * Offset: 0x20
      * </pre>
      *
-     * <code>map&lt;uint32, uint32&gt; open_state_map = 15;</code>
+     * <code>map&lt;uint32, uint32&gt; open_state_map = 14;</code>
      */
     @java.lang.Override
 
@@ -244,7 +244,7 @@ public java.util.Map<java.lang.Integer, java.lang.Integer> getOpenStateMapMap()
      * Offset: 0x20
      * </pre>
      *
-     * <code>map&lt;uint32, uint32&gt; open_state_map = 15;</code>
+     * <code>map&lt;uint32, uint32&gt; open_state_map = 14;</code>
      */
     @java.lang.Override
 
@@ -261,7 +261,7 @@ public int getOpenStateMapOrDefault(
      * Offset: 0x20
      * </pre>
      *
-     * <code>map&lt;uint32, uint32&gt; open_state_map = 15;</code>
+     * <code>map&lt;uint32, uint32&gt; open_state_map = 14;</code>
      */
     @java.lang.Override
 
@@ -295,7 +295,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
           output,
           internalGetOpenStateMap(),
           OpenStateMapDefaultEntryHolder.defaultEntry,
-          15);
+          14);
       unknownFields.writeTo(output);
     }
 
@@ -313,7 +313,7 @@ public int getSerializedSize() {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(15, openStateMap__);
+            .computeMessageSize(14, openStateMap__);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -444,7 +444,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 25389
+     * CmdId: 28079
      * </pre>
      *
      * Protobuf type {@code OpenStateUpdateNotify}
@@ -462,7 +462,7 @@ public static final class Builder extends
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 15:
+          case 14:
             return internalGetOpenStateMap();
           default:
             throw new RuntimeException(
@@ -473,7 +473,7 @@ protected com.google.protobuf.MapField internalGetMapField(
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 15:
+          case 14:
             return internalGetMutableOpenStateMap();
           default:
             throw new RuntimeException(
@@ -647,7 +647,7 @@ public int getOpenStateMapCount() {
        * Offset: 0x20
        * </pre>
        *
-       * <code>map&lt;uint32, uint32&gt; open_state_map = 15;</code>
+       * <code>map&lt;uint32, uint32&gt; open_state_map = 14;</code>
        */
 
       @java.lang.Override
@@ -669,7 +669,7 @@ public java.util.Map<java.lang.Integer, java.lang.Integer> getOpenStateMap() {
        * Offset: 0x20
        * </pre>
        *
-       * <code>map&lt;uint32, uint32&gt; open_state_map = 15;</code>
+       * <code>map&lt;uint32, uint32&gt; open_state_map = 14;</code>
        */
       @java.lang.Override
 
@@ -681,7 +681,7 @@ public java.util.Map<java.lang.Integer, java.lang.Integer> getOpenStateMapMap()
        * Offset: 0x20
        * </pre>
        *
-       * <code>map&lt;uint32, uint32&gt; open_state_map = 15;</code>
+       * <code>map&lt;uint32, uint32&gt; open_state_map = 14;</code>
        */
       @java.lang.Override
 
@@ -698,7 +698,7 @@ public int getOpenStateMapOrDefault(
        * Offset: 0x20
        * </pre>
        *
-       * <code>map&lt;uint32, uint32&gt; open_state_map = 15;</code>
+       * <code>map&lt;uint32, uint32&gt; open_state_map = 14;</code>
        */
       @java.lang.Override
 
@@ -723,7 +723,7 @@ public Builder clearOpenStateMap() {
        * Offset: 0x20
        * </pre>
        *
-       * <code>map&lt;uint32, uint32&gt; open_state_map = 15;</code>
+       * <code>map&lt;uint32, uint32&gt; open_state_map = 14;</code>
        */
 
       public Builder removeOpenStateMap(
@@ -746,7 +746,7 @@ public Builder removeOpenStateMap(
        * Offset: 0x20
        * </pre>
        *
-       * <code>map&lt;uint32, uint32&gt; open_state_map = 15;</code>
+       * <code>map&lt;uint32, uint32&gt; open_state_map = 14;</code>
        */
       public Builder putOpenStateMap(
           int key,
@@ -762,7 +762,7 @@ public Builder putOpenStateMap(
        * Offset: 0x20
        * </pre>
        *
-       * <code>map&lt;uint32, uint32&gt; open_state_map = 15;</code>
+       * <code>map&lt;uint32, uint32&gt; open_state_map = 14;</code>
        */
 
       public Builder putAllOpenStateMap(
@@ -844,7 +844,7 @@ public emu.grasscutter.net.proto.OpenStateUpdateNotifyOuterClass.OpenStateUpdate
   static {
     java.lang.String[] descriptorData = {
       "\n\033OpenStateUpdateNotify.proto\"\216\001\n\025OpenSt" +
-      "ateUpdateNotify\022@\n\016open_state_map\030\017 \003(\0132" +
+      "ateUpdateNotify\022@\n\016open_state_map\030\016 \003(\0132" +
       "(.OpenStateUpdateNotify.OpenStateMapEntr" +
       "y\0323\n\021OpenStateMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005v" +
       "alue\030\002 \001(\r:\0028\001B\033\n\031emu.grasscutter.net.pr" +
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ParentQuestOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ParentQuestOuterClass.java
index 24ec2870a46..6255dbcad35 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ParentQuestOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ParentQuestOuterClass.java
@@ -19,160 +19,272 @@ public interface ParentQuestOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.ParentQuestRandomInfo random_info = 1;</code>
-     * @return Whether the randomInfo field is set.
-     */
-    boolean hasRandomInfo();
-    /**
-     * <code>.ParentQuestRandomInfo random_info = 1;</code>
-     * @return The randomInfo.
-     */
-    emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo getRandomInfo();
-    /**
-     * <code>.ParentQuestRandomInfo random_info = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, uint32&gt; time_var_map = 15;</code>
      */
-    emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfoOrBuilder getRandomInfoOrBuilder();
-
-    /**
-     * <code>repeated .ChildQuest child_quest_list = 2;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest> 
-        getChildQuestListList();
+    int getTimeVarMapCount();
     /**
-     * <code>repeated .ChildQuest child_quest_list = 2;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, uint32&gt; time_var_map = 15;</code>
      */
-    emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest getChildQuestList(int index);
+    boolean containsTimeVarMap(
+        int key);
     /**
-     * <code>repeated .ChildQuest child_quest_list = 2;</code>
+     * Use {@link #getTimeVarMapMap()} instead.
      */
-    int getChildQuestListCount();
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getTimeVarMap();
     /**
-     * <code>repeated .ChildQuest child_quest_list = 2;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, uint32&gt; time_var_map = 15;</code>
      */
-    java.util.List<? extends emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuestOrBuilder> 
-        getChildQuestListOrBuilderList();
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getTimeVarMapMap();
     /**
-     * <code>repeated .ChildQuest child_quest_list = 2;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, uint32&gt; time_var_map = 15;</code>
      */
-    emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuestOrBuilder getChildQuestListOrBuilder(
-        int index);
 
+    int getTimeVarMapOrDefault(
+        int key,
+        int defaultValue);
     /**
-     * <code>uint32 quest_var_seq = 3;</code>
-     * @return The questVarSeq.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, uint32&gt; time_var_map = 15;</code>
      */
-    int getQuestVarSeq();
+
+    int getTimeVarMapOrThrow(
+        int key);
 
     /**
-     * <code>uint32 parent_quest_state = 4;</code>
-     * @return The parentQuestState.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated int32 quest_var = 7;</code>
+     * @return A list containing the questVar.
      */
-    int getParentQuestState();
-
+    java.util.List<java.lang.Integer> getQuestVarList();
     /**
-     * <code>bool is_random = 5;</code>
-     * @return The isRandom.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated int32 quest_var = 7;</code>
+     * @return The count of questVar.
      */
-    boolean getIsRandom();
-
+    int getQuestVarCount();
     /**
-     * <code>uint32 accept_time = 7;</code>
-     * @return The acceptTime.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated int32 quest_var = 7;</code>
+     * @param index The index of the element to return.
+     * @return The questVar at the given index.
      */
-    int getAcceptTime();
+    int getQuestVar(int index);
 
     /**
-     * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .InferencePageInfo inference_page_list = 11;</code>
      */
     java.util.List<emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo> 
         getInferencePageListList();
     /**
-     * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .InferencePageInfo inference_page_list = 11;</code>
      */
     emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo getInferencePageList(int index);
     /**
-     * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .InferencePageInfo inference_page_list = 11;</code>
      */
     int getInferencePageListCount();
     /**
-     * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .InferencePageInfo inference_page_list = 11;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfoOrBuilder> 
         getInferencePageListOrBuilderList();
     /**
-     * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .InferencePageInfo inference_page_list = 11;</code>
      */
     emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfoOrBuilder getInferencePageListOrBuilder(
         int index);
 
     /**
-     * <code>uint32 parent_quest_id = 9;</code>
-     * @return The parentQuestId.
+     * <pre>
+     * Offset: 0x40
+     * </pre>
+     *
+     * <code>.ParentQuestRandomInfo random_info = 4;</code>
+     * @return Whether the randomInfo field is set.
      */
-    int getParentQuestId();
-
+    boolean hasRandomInfo();
     /**
-     * <code>bool is_finished = 12;</code>
-     * @return The isFinished.
+     * <pre>
+     * Offset: 0x40
+     * </pre>
+     *
+     * <code>.ParentQuestRandomInfo random_info = 4;</code>
+     * @return The randomInfo.
      */
-    boolean getIsFinished();
+    emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo getRandomInfo();
+    /**
+     * <pre>
+     * Offset: 0x40
+     * </pre>
+     *
+     * <code>.ParentQuestRandomInfo random_info = 4;</code>
+     */
+    emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfoOrBuilder getRandomInfoOrBuilder();
 
     /**
-     * <code>map&lt;uint32, uint32&gt; time_var_map = 13;</code>
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>repeated .ChildQuest child_quest_list = 3;</code>
      */
-    int getTimeVarMapCount();
+    java.util.List<emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest> 
+        getChildQuestListList();
     /**
-     * <code>map&lt;uint32, uint32&gt; time_var_map = 13;</code>
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>repeated .ChildQuest child_quest_list = 3;</code>
      */
-    boolean containsTimeVarMap(
-        int key);
+    emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest getChildQuestList(int index);
     /**
-     * Use {@link #getTimeVarMapMap()} instead.
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>repeated .ChildQuest child_quest_list = 3;</code>
      */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Integer, java.lang.Integer>
-    getTimeVarMap();
+    int getChildQuestListCount();
     /**
-     * <code>map&lt;uint32, uint32&gt; time_var_map = 13;</code>
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>repeated .ChildQuest child_quest_list = 3;</code>
      */
-    java.util.Map<java.lang.Integer, java.lang.Integer>
-    getTimeVarMapMap();
+    java.util.List<? extends emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuestOrBuilder> 
+        getChildQuestListOrBuilderList();
     /**
-     * <code>map&lt;uint32, uint32&gt; time_var_map = 13;</code>
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>repeated .ChildQuest child_quest_list = 3;</code>
      */
+    emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuestOrBuilder getChildQuestListOrBuilder(
+        int index);
 
-    int getTimeVarMapOrDefault(
-        int key,
-        int defaultValue);
     /**
-     * <code>map&lt;uint32, uint32&gt; time_var_map = 13;</code>
+     * <pre>
+     * Offset: 0x50
+     * </pre>
+     *
+     * <code>uint64 video_key = 2;</code>
+     * @return The videoKey.
      */
+    long getVideoKey();
 
-    int getTimeVarMapOrThrow(
-        int key);
+    /**
+     * <pre>
+     * Offset: 0x58
+     * </pre>
+     *
+     * <code>uint32 accept_time = 5;</code>
+     * @return The acceptTime.
+     */
+    int getAcceptTime();
 
     /**
-     * <code>repeated int32 quest_var = 14;</code>
-     * @return A list containing the questVar.
+     * <pre>
+     * Offset: 0x5D
+     * </pre>
+     *
+     * <code>bool is_finished = 8;</code>
+     * @return The isFinished.
      */
-    java.util.List<java.lang.Integer> getQuestVarList();
+    boolean getIsFinished();
+
     /**
-     * <code>repeated int32 quest_var = 14;</code>
-     * @return The count of questVar.
+     * <pre>
+     * Offset: 0x5F
+     * </pre>
+     *
+     * <code>bool is_random = 12;</code>
+     * @return The isRandom.
      */
-    int getQuestVarCount();
+    boolean getIsRandom();
+
     /**
-     * <code>repeated int32 quest_var = 14;</code>
-     * @param index The index of the element to return.
-     * @return The questVar at the given index.
+     * <pre>
+     * Offset: 0x60
+     * </pre>
+     *
+     * <code>uint32 parent_quest_id = 14;</code>
+     * @return The parentQuestId.
      */
-    int getQuestVar(int index);
+    int getParentQuestId();
 
     /**
-     * <code>uint64 video_key = 15;</code>
-     * @return The videoKey.
+     * <pre>
+     * Offset: 0x64
+     * </pre>
+     *
+     * <code>uint32 parent_quest_state = 1;</code>
+     * @return The parentQuestState.
      */
-    long getVideoKey();
+    int getParentQuestState();
+
+    /**
+     * <pre>
+     * Offset: 0x68
+     * </pre>
+     *
+     * <code>uint32 quest_var_seq = 9;</code>
+     * @return The questVarSeq.
+     */
+    int getQuestVarSeq();
   }
   /**
    * Protobuf type {@code ParentQuest}
@@ -187,9 +299,9 @@ private ParentQuest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
     }
     private ParentQuest() {
-      childQuestList_ = java.util.Collections.emptyList();
-      inferencePageList_ = java.util.Collections.emptyList();
       questVar_ = emptyIntList();
+      inferencePageList_ = java.util.Collections.emptyList();
+      childQuestList_ = java.util.Collections.emptyList();
     }
 
     @java.lang.Override
@@ -223,7 +335,26 @@ private ParentQuest(
             case 0:
               done = true;
               break;
-            case 10: {
+            case 8: {
+
+              parentQuestState_ = input.readUInt32();
+              break;
+            }
+            case 16: {
+
+              videoKey_ = input.readUInt64();
+              break;
+            }
+            case 26: {
+              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
+                childQuestList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest>();
+                mutable_bitField0_ |= 0x00000008;
+              }
+              childQuestList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.parser(), extensionRegistry));
+              break;
+            }
+            case 34: {
               emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo.Builder subBuilder = null;
               if (randomInfo_ != null) {
                 subBuilder = randomInfo_.toBuilder();
@@ -236,59 +367,66 @@ private ParentQuest(
 
               break;
             }
-            case 18: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                childQuestList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest>();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              childQuestList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.parser(), extensionRegistry));
+            case 40: {
+
+              acceptTime_ = input.readUInt32();
               break;
             }
-            case 24: {
-
-              questVarSeq_ = input.readUInt32();
+            case 56: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                questVar_ = newIntList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              questVar_.addInt(input.readInt32());
               break;
             }
-            case 32: {
-
-              parentQuestState_ = input.readUInt32();
+            case 58: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
+                questVar_ = newIntList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                questVar_.addInt(input.readInt32());
+              }
+              input.popLimit(limit);
               break;
             }
-            case 40: {
+            case 64: {
 
-              isRandom_ = input.readBool();
+              isFinished_ = input.readBool();
               break;
             }
-            case 56: {
+            case 72: {
 
-              acceptTime_ = input.readUInt32();
+              questVarSeq_ = input.readUInt32();
               break;
             }
-            case 66: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+            case 90: {
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
                 inferencePageList_ = new java.util.ArrayList<emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo>();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000004;
               }
               inferencePageList_.add(
                   input.readMessage(emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.parser(), extensionRegistry));
               break;
             }
-            case 72: {
+            case 96: {
 
-              parentQuestId_ = input.readUInt32();
+              isRandom_ = input.readBool();
               break;
             }
-            case 96: {
+            case 112: {
 
-              isFinished_ = input.readBool();
+              parentQuestId_ = input.readUInt32();
               break;
             }
-            case 106: {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+            case 122: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 timeVarMap_ = com.google.protobuf.MapField.newMapField(
                     TimeVarMapDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000004;
+                mutable_bitField0_ |= 0x00000001;
               }
               com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
               timeVarMap__ = input.readMessage(
@@ -297,32 +435,6 @@ private ParentQuest(
                   timeVarMap__.getKey(), timeVarMap__.getValue());
               break;
             }
-            case 112: {
-              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
-                questVar_ = newIntList();
-                mutable_bitField0_ |= 0x00000008;
-              }
-              questVar_.addInt(input.readInt32());
-              break;
-            }
-            case 114: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000008) != 0) && input.getBytesUntilLimit() > 0) {
-                questVar_ = newIntList();
-                mutable_bitField0_ |= 0x00000008;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                questVar_.addInt(input.readInt32());
-              }
-              input.popLimit(limit);
-              break;
-            }
-            case 120: {
-
-              videoKey_ = input.readUInt64();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -338,15 +450,15 @@ private ParentQuest(
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        if (((mutable_bitField0_ & 0x00000008) != 0)) {
           childQuestList_ = java.util.Collections.unmodifiableList(childQuestList_);
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          inferencePageList_ = java.util.Collections.unmodifiableList(inferencePageList_);
-        }
-        if (((mutable_bitField0_ & 0x00000008) != 0)) {
           questVar_.makeImmutable(); // C
         }
+        if (((mutable_bitField0_ & 0x00000004) != 0)) {
+          inferencePageList_ = java.util.Collections.unmodifiableList(inferencePageList_);
+        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -361,7 +473,7 @@ private ParentQuest(
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 13:
+        case 15:
           return internalGetTimeVarMap();
         default:
           throw new RuntimeException(
@@ -376,127 +488,162 @@ protected com.google.protobuf.MapField internalGetMapField(
               emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.class, emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.Builder.class);
     }
 
-    public static final int RANDOM_INFO_FIELD_NUMBER = 1;
-    private emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo randomInfo_;
-    /**
-     * <code>.ParentQuestRandomInfo random_info = 1;</code>
-     * @return Whether the randomInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasRandomInfo() {
-      return randomInfo_ != null;
+    public static final int TIME_VAR_MAP_FIELD_NUMBER = 15;
+    private static final class TimeVarMapDefaultEntryHolder {
+      static final com.google.protobuf.MapEntry<
+          java.lang.Integer, java.lang.Integer> defaultEntry =
+              com.google.protobuf.MapEntry
+              .<java.lang.Integer, java.lang.Integer>newDefaultInstance(
+                  emu.grasscutter.net.proto.ParentQuestOuterClass.internal_static_ParentQuest_TimeVarMapEntry_descriptor, 
+                  com.google.protobuf.WireFormat.FieldType.UINT32,
+                  0,
+                  com.google.protobuf.WireFormat.FieldType.UINT32,
+                  0);
+    }
+    private com.google.protobuf.MapField<
+        java.lang.Integer, java.lang.Integer> timeVarMap_;
+    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+    internalGetTimeVarMap() {
+      if (timeVarMap_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            TimeVarMapDefaultEntryHolder.defaultEntry);
+      }
+      return timeVarMap_;
+    }
+
+    public int getTimeVarMapCount() {
+      return internalGetTimeVarMap().getMap().size();
     }
     /**
-     * <code>.ParentQuestRandomInfo random_info = 1;</code>
-     * @return The randomInfo.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, uint32&gt; time_var_map = 15;</code>
      */
+
     @java.lang.Override
-    public emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo getRandomInfo() {
-      return randomInfo_ == null ? emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo.getDefaultInstance() : randomInfo_;
+    public boolean containsTimeVarMap(
+        int key) {
+      
+      return internalGetTimeVarMap().getMap().containsKey(key);
     }
     /**
-     * <code>.ParentQuestRandomInfo random_info = 1;</code>
+     * Use {@link #getTimeVarMapMap()} instead.
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfoOrBuilder getRandomInfoOrBuilder() {
-      return getRandomInfo();
-    }
-
-    public static final int CHILD_QUEST_LIST_FIELD_NUMBER = 2;
-    private java.util.List<emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest> childQuestList_;
-    /**
-     * <code>repeated .ChildQuest child_quest_list = 2;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest> getChildQuestListList() {
-      return childQuestList_;
-    }
-    /**
-     * <code>repeated .ChildQuest child_quest_list = 2;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuestOrBuilder> 
-        getChildQuestListOrBuilderList() {
-      return childQuestList_;
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getTimeVarMap() {
+      return getTimeVarMapMap();
     }
     /**
-     * <code>repeated .ChildQuest child_quest_list = 2;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, uint32&gt; time_var_map = 15;</code>
      */
     @java.lang.Override
-    public int getChildQuestListCount() {
-      return childQuestList_.size();
+
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getTimeVarMapMap() {
+      return internalGetTimeVarMap().getMap();
     }
     /**
-     * <code>repeated .ChildQuest child_quest_list = 2;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, uint32&gt; time_var_map = 15;</code>
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest getChildQuestList(int index) {
-      return childQuestList_.get(index);
+
+    public int getTimeVarMapOrDefault(
+        int key,
+        int defaultValue) {
+      
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetTimeVarMap().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>repeated .ChildQuest child_quest_list = 2;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, uint32&gt; time_var_map = 15;</code>
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuestOrBuilder getChildQuestListOrBuilder(
-        int index) {
-      return childQuestList_.get(index);
-    }
 
-    public static final int QUEST_VAR_SEQ_FIELD_NUMBER = 3;
-    private int questVarSeq_;
-    /**
-     * <code>uint32 quest_var_seq = 3;</code>
-     * @return The questVarSeq.
-     */
-    @java.lang.Override
-    public int getQuestVarSeq() {
-      return questVarSeq_;
+    public int getTimeVarMapOrThrow(
+        int key) {
+      
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetTimeVarMap().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
     }
 
-    public static final int PARENT_QUEST_STATE_FIELD_NUMBER = 4;
-    private int parentQuestState_;
+    public static final int QUEST_VAR_FIELD_NUMBER = 7;
+    private com.google.protobuf.Internal.IntList questVar_;
     /**
-     * <code>uint32 parent_quest_state = 4;</code>
-     * @return The parentQuestState.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated int32 quest_var = 7;</code>
+     * @return A list containing the questVar.
      */
     @java.lang.Override
-    public int getParentQuestState() {
-      return parentQuestState_;
+    public java.util.List<java.lang.Integer>
+        getQuestVarList() {
+      return questVar_;
     }
-
-    public static final int IS_RANDOM_FIELD_NUMBER = 5;
-    private boolean isRandom_;
     /**
-     * <code>bool is_random = 5;</code>
-     * @return The isRandom.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated int32 quest_var = 7;</code>
+     * @return The count of questVar.
      */
-    @java.lang.Override
-    public boolean getIsRandom() {
-      return isRandom_;
+    public int getQuestVarCount() {
+      return questVar_.size();
     }
-
-    public static final int ACCEPT_TIME_FIELD_NUMBER = 7;
-    private int acceptTime_;
     /**
-     * <code>uint32 accept_time = 7;</code>
-     * @return The acceptTime.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated int32 quest_var = 7;</code>
+     * @param index The index of the element to return.
+     * @return The questVar at the given index.
      */
-    @java.lang.Override
-    public int getAcceptTime() {
-      return acceptTime_;
+    public int getQuestVar(int index) {
+      return questVar_.getInt(index);
     }
+    private int questVarMemoizedSerializedSize = -1;
 
-    public static final int INFERENCE_PAGE_LIST_FIELD_NUMBER = 8;
+    public static final int INFERENCE_PAGE_LIST_FIELD_NUMBER = 11;
     private java.util.List<emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo> inferencePageList_;
     /**
-     * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .InferencePageInfo inference_page_list = 11;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo> getInferencePageListList() {
       return inferencePageList_;
     }
     /**
-     * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .InferencePageInfo inference_page_list = 11;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfoOrBuilder> 
@@ -504,21 +651,33 @@ public java.util.List<emu.grasscutter.net.proto.InferencePageInfoOuterClass.Infe
       return inferencePageList_;
     }
     /**
-     * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .InferencePageInfo inference_page_list = 11;</code>
      */
     @java.lang.Override
     public int getInferencePageListCount() {
       return inferencePageList_.size();
     }
     /**
-     * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .InferencePageInfo inference_page_list = 11;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo getInferencePageList(int index) {
       return inferencePageList_.get(index);
     }
     /**
-     * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .InferencePageInfo inference_page_list = 11;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfoOrBuilder getInferencePageListOrBuilder(
@@ -526,146 +685,207 @@ public emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfoOr
       return inferencePageList_.get(index);
     }
 
-    public static final int PARENT_QUEST_ID_FIELD_NUMBER = 9;
-    private int parentQuestId_;
+    public static final int RANDOM_INFO_FIELD_NUMBER = 4;
+    private emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo randomInfo_;
     /**
-     * <code>uint32 parent_quest_id = 9;</code>
-     * @return The parentQuestId.
+     * <pre>
+     * Offset: 0x40
+     * </pre>
+     *
+     * <code>.ParentQuestRandomInfo random_info = 4;</code>
+     * @return Whether the randomInfo field is set.
      */
     @java.lang.Override
-    public int getParentQuestId() {
-      return parentQuestId_;
+    public boolean hasRandomInfo() {
+      return randomInfo_ != null;
     }
-
-    public static final int IS_FINISHED_FIELD_NUMBER = 12;
-    private boolean isFinished_;
     /**
-     * <code>bool is_finished = 12;</code>
-     * @return The isFinished.
+     * <pre>
+     * Offset: 0x40
+     * </pre>
+     *
+     * <code>.ParentQuestRandomInfo random_info = 4;</code>
+     * @return The randomInfo.
      */
     @java.lang.Override
-    public boolean getIsFinished() {
-      return isFinished_;
-    }
-
-    public static final int TIME_VAR_MAP_FIELD_NUMBER = 13;
-    private static final class TimeVarMapDefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<
-          java.lang.Integer, java.lang.Integer> defaultEntry =
-              com.google.protobuf.MapEntry
-              .<java.lang.Integer, java.lang.Integer>newDefaultInstance(
-                  emu.grasscutter.net.proto.ParentQuestOuterClass.internal_static_ParentQuest_TimeVarMapEntry_descriptor, 
-                  com.google.protobuf.WireFormat.FieldType.UINT32,
-                  0,
-                  com.google.protobuf.WireFormat.FieldType.UINT32,
-                  0);
+    public emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo getRandomInfo() {
+      return randomInfo_ == null ? emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo.getDefaultInstance() : randomInfo_;
     }
-    private com.google.protobuf.MapField<
-        java.lang.Integer, java.lang.Integer> timeVarMap_;
-    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-    internalGetTimeVarMap() {
-      if (timeVarMap_ == null) {
-        return com.google.protobuf.MapField.emptyMapField(
-            TimeVarMapDefaultEntryHolder.defaultEntry);
-      }
-      return timeVarMap_;
+    /**
+     * <pre>
+     * Offset: 0x40
+     * </pre>
+     *
+     * <code>.ParentQuestRandomInfo random_info = 4;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfoOrBuilder getRandomInfoOrBuilder() {
+      return getRandomInfo();
     }
 
-    public int getTimeVarMapCount() {
-      return internalGetTimeVarMap().getMap().size();
+    public static final int CHILD_QUEST_LIST_FIELD_NUMBER = 3;
+    private java.util.List<emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest> childQuestList_;
+    /**
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>repeated .ChildQuest child_quest_list = 3;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest> getChildQuestListList() {
+      return childQuestList_;
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; time_var_map = 13;</code>
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>repeated .ChildQuest child_quest_list = 3;</code>
      */
-
     @java.lang.Override
-    public boolean containsTimeVarMap(
-        int key) {
-      
-      return internalGetTimeVarMap().getMap().containsKey(key);
+    public java.util.List<? extends emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuestOrBuilder> 
+        getChildQuestListOrBuilderList() {
+      return childQuestList_;
     }
     /**
-     * Use {@link #getTimeVarMapMap()} instead.
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>repeated .ChildQuest child_quest_list = 3;</code>
      */
     @java.lang.Override
-    @java.lang.Deprecated
-    public java.util.Map<java.lang.Integer, java.lang.Integer> getTimeVarMap() {
-      return getTimeVarMapMap();
+    public int getChildQuestListCount() {
+      return childQuestList_.size();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; time_var_map = 13;</code>
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>repeated .ChildQuest child_quest_list = 3;</code>
      */
     @java.lang.Override
-
-    public java.util.Map<java.lang.Integer, java.lang.Integer> getTimeVarMapMap() {
-      return internalGetTimeVarMap().getMap();
+    public emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest getChildQuestList(int index) {
+      return childQuestList_.get(index);
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; time_var_map = 13;</code>
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>repeated .ChildQuest child_quest_list = 3;</code>
      */
     @java.lang.Override
+    public emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuestOrBuilder getChildQuestListOrBuilder(
+        int index) {
+      return childQuestList_.get(index);
+    }
 
-    public int getTimeVarMapOrDefault(
-        int key,
-        int defaultValue) {
-      
-      java.util.Map<java.lang.Integer, java.lang.Integer> map =
-          internalGetTimeVarMap().getMap();
-      return map.containsKey(key) ? map.get(key) : defaultValue;
+    public static final int VIDEO_KEY_FIELD_NUMBER = 2;
+    private long videoKey_;
+    /**
+     * <pre>
+     * Offset: 0x50
+     * </pre>
+     *
+     * <code>uint64 video_key = 2;</code>
+     * @return The videoKey.
+     */
+    @java.lang.Override
+    public long getVideoKey() {
+      return videoKey_;
     }
+
+    public static final int ACCEPT_TIME_FIELD_NUMBER = 5;
+    private int acceptTime_;
     /**
-     * <code>map&lt;uint32, uint32&gt; time_var_map = 13;</code>
+     * <pre>
+     * Offset: 0x58
+     * </pre>
+     *
+     * <code>uint32 accept_time = 5;</code>
+     * @return The acceptTime.
      */
     @java.lang.Override
+    public int getAcceptTime() {
+      return acceptTime_;
+    }
 
-    public int getTimeVarMapOrThrow(
-        int key) {
-      
-      java.util.Map<java.lang.Integer, java.lang.Integer> map =
-          internalGetTimeVarMap().getMap();
-      if (!map.containsKey(key)) {
-        throw new java.lang.IllegalArgumentException();
-      }
-      return map.get(key);
+    public static final int IS_FINISHED_FIELD_NUMBER = 8;
+    private boolean isFinished_;
+    /**
+     * <pre>
+     * Offset: 0x5D
+     * </pre>
+     *
+     * <code>bool is_finished = 8;</code>
+     * @return The isFinished.
+     */
+    @java.lang.Override
+    public boolean getIsFinished() {
+      return isFinished_;
     }
 
-    public static final int QUEST_VAR_FIELD_NUMBER = 14;
-    private com.google.protobuf.Internal.IntList questVar_;
+    public static final int IS_RANDOM_FIELD_NUMBER = 12;
+    private boolean isRandom_;
     /**
-     * <code>repeated int32 quest_var = 14;</code>
-     * @return A list containing the questVar.
+     * <pre>
+     * Offset: 0x5F
+     * </pre>
+     *
+     * <code>bool is_random = 12;</code>
+     * @return The isRandom.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getQuestVarList() {
-      return questVar_;
+    public boolean getIsRandom() {
+      return isRandom_;
     }
+
+    public static final int PARENT_QUEST_ID_FIELD_NUMBER = 14;
+    private int parentQuestId_;
     /**
-     * <code>repeated int32 quest_var = 14;</code>
-     * @return The count of questVar.
+     * <pre>
+     * Offset: 0x60
+     * </pre>
+     *
+     * <code>uint32 parent_quest_id = 14;</code>
+     * @return The parentQuestId.
      */
-    public int getQuestVarCount() {
-      return questVar_.size();
+    @java.lang.Override
+    public int getParentQuestId() {
+      return parentQuestId_;
     }
+
+    public static final int PARENT_QUEST_STATE_FIELD_NUMBER = 1;
+    private int parentQuestState_;
     /**
-     * <code>repeated int32 quest_var = 14;</code>
-     * @param index The index of the element to return.
-     * @return The questVar at the given index.
+     * <pre>
+     * Offset: 0x64
+     * </pre>
+     *
+     * <code>uint32 parent_quest_state = 1;</code>
+     * @return The parentQuestState.
      */
-    public int getQuestVar(int index) {
-      return questVar_.getInt(index);
+    @java.lang.Override
+    public int getParentQuestState() {
+      return parentQuestState_;
     }
-    private int questVarMemoizedSerializedSize = -1;
 
-    public static final int VIDEO_KEY_FIELD_NUMBER = 15;
-    private long videoKey_;
+    public static final int QUEST_VAR_SEQ_FIELD_NUMBER = 9;
+    private int questVarSeq_;
     /**
-     * <code>uint64 video_key = 15;</code>
-     * @return The videoKey.
+     * <pre>
+     * Offset: 0x68
+     * </pre>
+     *
+     * <code>uint32 quest_var_seq = 9;</code>
+     * @return The questVarSeq.
      */
     @java.lang.Override
-    public long getVideoKey() {
-      return videoKey_;
+    public int getQuestVarSeq() {
+      return questVarSeq_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -683,49 +903,49 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (randomInfo_ != null) {
-        output.writeMessage(1, getRandomInfo());
+      if (parentQuestState_ != 0) {
+        output.writeUInt32(1, parentQuestState_);
+      }
+      if (videoKey_ != 0L) {
+        output.writeUInt64(2, videoKey_);
       }
       for (int i = 0; i < childQuestList_.size(); i++) {
-        output.writeMessage(2, childQuestList_.get(i));
+        output.writeMessage(3, childQuestList_.get(i));
       }
-      if (questVarSeq_ != 0) {
-        output.writeUInt32(3, questVarSeq_);
+      if (randomInfo_ != null) {
+        output.writeMessage(4, getRandomInfo());
       }
-      if (parentQuestState_ != 0) {
-        output.writeUInt32(4, parentQuestState_);
+      if (acceptTime_ != 0) {
+        output.writeUInt32(5, acceptTime_);
       }
-      if (isRandom_ != false) {
-        output.writeBool(5, isRandom_);
+      if (getQuestVarList().size() > 0) {
+        output.writeUInt32NoTag(58);
+        output.writeUInt32NoTag(questVarMemoizedSerializedSize);
       }
-      if (acceptTime_ != 0) {
-        output.writeUInt32(7, acceptTime_);
+      for (int i = 0; i < questVar_.size(); i++) {
+        output.writeInt32NoTag(questVar_.getInt(i));
+      }
+      if (isFinished_ != false) {
+        output.writeBool(8, isFinished_);
+      }
+      if (questVarSeq_ != 0) {
+        output.writeUInt32(9, questVarSeq_);
       }
       for (int i = 0; i < inferencePageList_.size(); i++) {
-        output.writeMessage(8, inferencePageList_.get(i));
+        output.writeMessage(11, inferencePageList_.get(i));
       }
-      if (parentQuestId_ != 0) {
-        output.writeUInt32(9, parentQuestId_);
+      if (isRandom_ != false) {
+        output.writeBool(12, isRandom_);
       }
-      if (isFinished_ != false) {
-        output.writeBool(12, isFinished_);
+      if (parentQuestId_ != 0) {
+        output.writeUInt32(14, parentQuestId_);
       }
       com.google.protobuf.GeneratedMessageV3
         .serializeIntegerMapTo(
           output,
           internalGetTimeVarMap(),
           TimeVarMapDefaultEntryHolder.defaultEntry,
-          13);
-      if (getQuestVarList().size() > 0) {
-        output.writeUInt32NoTag(114);
-        output.writeUInt32NoTag(questVarMemoizedSerializedSize);
-      }
-      for (int i = 0; i < questVar_.size(); i++) {
-        output.writeInt32NoTag(questVar_.getInt(i));
-      }
-      if (videoKey_ != 0L) {
-        output.writeUInt64(15, videoKey_);
-      }
+          15);
       unknownFields.writeTo(output);
     }
 
@@ -735,41 +955,59 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (randomInfo_ != null) {
+      if (parentQuestState_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1, parentQuestState_);
+      }
+      if (videoKey_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getRandomInfo());
+          .computeUInt64Size(2, videoKey_);
       }
       for (int i = 0; i < childQuestList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, childQuestList_.get(i));
+          .computeMessageSize(3, childQuestList_.get(i));
       }
-      if (questVarSeq_ != 0) {
+      if (randomInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, questVarSeq_);
+          .computeMessageSize(4, getRandomInfo());
       }
-      if (parentQuestState_ != 0) {
+      if (acceptTime_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, parentQuestState_);
+          .computeUInt32Size(5, acceptTime_);
       }
-      if (isRandom_ != false) {
+      {
+        int dataSize = 0;
+        for (int i = 0; i < questVar_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt32SizeNoTag(questVar_.getInt(i));
+        }
+        size += dataSize;
+        if (!getQuestVarList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        questVarMemoizedSerializedSize = dataSize;
+      }
+      if (isFinished_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(5, isRandom_);
+          .computeBoolSize(8, isFinished_);
       }
-      if (acceptTime_ != 0) {
+      if (questVarSeq_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, acceptTime_);
+          .computeUInt32Size(9, questVarSeq_);
       }
       for (int i = 0; i < inferencePageList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(8, inferencePageList_.get(i));
+          .computeMessageSize(11, inferencePageList_.get(i));
       }
-      if (parentQuestId_ != 0) {
+      if (isRandom_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, parentQuestId_);
+          .computeBoolSize(12, isRandom_);
       }
-      if (isFinished_ != false) {
+      if (parentQuestId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(12, isFinished_);
+          .computeUInt32Size(14, parentQuestId_);
       }
       for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
            : internalGetTimeVarMap().getMap().entrySet()) {
@@ -779,25 +1017,7 @@ public int getSerializedSize() {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(13, timeVarMap__);
-      }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < questVar_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream
-            .computeInt32SizeNoTag(questVar_.getInt(i));
-        }
-        size += dataSize;
-        if (!getQuestVarList().isEmpty()) {
-          size += 1;
-          size += com.google.protobuf.CodedOutputStream
-              .computeInt32SizeNoTag(dataSize);
-        }
-        questVarMemoizedSerializedSize = dataSize;
-      }
-      if (videoKey_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(15, videoKey_);
+            .computeMessageSize(15, timeVarMap__);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -814,6 +1034,12 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest other = (emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest) obj;
 
+      if (!internalGetTimeVarMap().equals(
+          other.internalGetTimeVarMap())) return false;
+      if (!getQuestVarList()
+          .equals(other.getQuestVarList())) return false;
+      if (!getInferencePageListList()
+          .equals(other.getInferencePageListList())) return false;
       if (hasRandomInfo() != other.hasRandomInfo()) return false;
       if (hasRandomInfo()) {
         if (!getRandomInfo()
@@ -821,26 +1047,20 @@ public boolean equals(final java.lang.Object obj) {
       }
       if (!getChildQuestListList()
           .equals(other.getChildQuestListList())) return false;
-      if (getQuestVarSeq()
-          != other.getQuestVarSeq()) return false;
-      if (getParentQuestState()
-          != other.getParentQuestState()) return false;
-      if (getIsRandom()
-          != other.getIsRandom()) return false;
+      if (getVideoKey()
+          != other.getVideoKey()) return false;
       if (getAcceptTime()
           != other.getAcceptTime()) return false;
-      if (!getInferencePageListList()
-          .equals(other.getInferencePageListList())) return false;
-      if (getParentQuestId()
-          != other.getParentQuestId()) return false;
       if (getIsFinished()
           != other.getIsFinished()) return false;
-      if (!internalGetTimeVarMap().equals(
-          other.internalGetTimeVarMap())) return false;
-      if (!getQuestVarList()
-          .equals(other.getQuestVarList())) return false;
-      if (getVideoKey()
-          != other.getVideoKey()) return false;
+      if (getIsRandom()
+          != other.getIsRandom()) return false;
+      if (getParentQuestId()
+          != other.getParentQuestId()) return false;
+      if (getParentQuestState()
+          != other.getParentQuestState()) return false;
+      if (getQuestVarSeq()
+          != other.getQuestVarSeq()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -852,6 +1072,18 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      if (!internalGetTimeVarMap().getMap().isEmpty()) {
+        hash = (37 * hash) + TIME_VAR_MAP_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetTimeVarMap().hashCode();
+      }
+      if (getQuestVarCount() > 0) {
+        hash = (37 * hash) + QUEST_VAR_FIELD_NUMBER;
+        hash = (53 * hash) + getQuestVarList().hashCode();
+      }
+      if (getInferencePageListCount() > 0) {
+        hash = (37 * hash) + INFERENCE_PAGE_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getInferencePageListList().hashCode();
+      }
       if (hasRandomInfo()) {
         hash = (37 * hash) + RANDOM_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getRandomInfo().hashCode();
@@ -860,35 +1092,23 @@ public int hashCode() {
         hash = (37 * hash) + CHILD_QUEST_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getChildQuestListList().hashCode();
       }
-      hash = (37 * hash) + QUEST_VAR_SEQ_FIELD_NUMBER;
-      hash = (53 * hash) + getQuestVarSeq();
-      hash = (37 * hash) + PARENT_QUEST_STATE_FIELD_NUMBER;
-      hash = (53 * hash) + getParentQuestState();
-      hash = (37 * hash) + IS_RANDOM_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsRandom());
+      hash = (37 * hash) + VIDEO_KEY_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getVideoKey());
       hash = (37 * hash) + ACCEPT_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getAcceptTime();
-      if (getInferencePageListCount() > 0) {
-        hash = (37 * hash) + INFERENCE_PAGE_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getInferencePageListList().hashCode();
-      }
-      hash = (37 * hash) + PARENT_QUEST_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getParentQuestId();
       hash = (37 * hash) + IS_FINISHED_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsFinished());
-      if (!internalGetTimeVarMap().getMap().isEmpty()) {
-        hash = (37 * hash) + TIME_VAR_MAP_FIELD_NUMBER;
-        hash = (53 * hash) + internalGetTimeVarMap().hashCode();
-      }
-      if (getQuestVarCount() > 0) {
-        hash = (37 * hash) + QUEST_VAR_FIELD_NUMBER;
-        hash = (53 * hash) + getQuestVarList().hashCode();
-      }
-      hash = (37 * hash) + VIDEO_KEY_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getVideoKey());
+      hash = (37 * hash) + IS_RANDOM_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsRandom());
+      hash = (37 * hash) + PARENT_QUEST_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getParentQuestId();
+      hash = (37 * hash) + PARENT_QUEST_STATE_FIELD_NUMBER;
+      hash = (53 * hash) + getParentQuestState();
+      hash = (37 * hash) + QUEST_VAR_SEQ_FIELD_NUMBER;
+      hash = (53 * hash) + getQuestVarSeq();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -1000,7 +1220,7 @@ public static final class Builder extends
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 13:
+          case 15:
             return internalGetTimeVarMap();
           default:
             throw new RuntimeException(
@@ -1011,7 +1231,7 @@ protected com.google.protobuf.MapField internalGetMapField(
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 13:
+          case 15:
             return internalGetMutableTimeVarMap();
           default:
             throw new RuntimeException(
@@ -1039,13 +1259,22 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
-          getChildQuestListFieldBuilder();
           getInferencePageListFieldBuilder();
+          getChildQuestListFieldBuilder();
         }
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        internalGetMutableTimeVarMap().clear();
+        questVar_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        if (inferencePageListBuilder_ == null) {
+          inferencePageList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000004);
+        } else {
+          inferencePageListBuilder_.clear();
+        }
         if (randomInfoBuilder_ == null) {
           randomInfo_ = null;
         } else {
@@ -1054,32 +1283,23 @@ public Builder clear() {
         }
         if (childQuestListBuilder_ == null) {
           childQuestList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000008);
         } else {
           childQuestListBuilder_.clear();
         }
-        questVarSeq_ = 0;
+        videoKey_ = 0L;
 
-        parentQuestState_ = 0;
+        acceptTime_ = 0;
 
-        isRandom_ = false;
+        isFinished_ = false;
 
-        acceptTime_ = 0;
+        isRandom_ = false;
 
-        if (inferencePageListBuilder_ == null) {
-          inferencePageList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
-        } else {
-          inferencePageListBuilder_.clear();
-        }
         parentQuestId_ = 0;
 
-        isFinished_ = false;
+        parentQuestState_ = 0;
 
-        internalGetMutableTimeVarMap().clear();
-        questVar_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000008);
-        videoKey_ = 0L;
+        questVarSeq_ = 0;
 
         return this;
       }
@@ -1108,43 +1328,43 @@ public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest build() {
       public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest buildPartial() {
         emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest result = new emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest(this);
         int from_bitField0_ = bitField0_;
+        result.timeVarMap_ = internalGetTimeVarMap();
+        result.timeVarMap_.makeImmutable();
+        if (((bitField0_ & 0x00000002) != 0)) {
+          questVar_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        }
+        result.questVar_ = questVar_;
+        if (inferencePageListBuilder_ == null) {
+          if (((bitField0_ & 0x00000004) != 0)) {
+            inferencePageList_ = java.util.Collections.unmodifiableList(inferencePageList_);
+            bitField0_ = (bitField0_ & ~0x00000004);
+          }
+          result.inferencePageList_ = inferencePageList_;
+        } else {
+          result.inferencePageList_ = inferencePageListBuilder_.build();
+        }
         if (randomInfoBuilder_ == null) {
           result.randomInfo_ = randomInfo_;
         } else {
           result.randomInfo_ = randomInfoBuilder_.build();
         }
         if (childQuestListBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) != 0)) {
+          if (((bitField0_ & 0x00000008) != 0)) {
             childQuestList_ = java.util.Collections.unmodifiableList(childQuestList_);
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000008);
           }
           result.childQuestList_ = childQuestList_;
         } else {
           result.childQuestList_ = childQuestListBuilder_.build();
         }
-        result.questVarSeq_ = questVarSeq_;
-        result.parentQuestState_ = parentQuestState_;
-        result.isRandom_ = isRandom_;
+        result.videoKey_ = videoKey_;
         result.acceptTime_ = acceptTime_;
-        if (inferencePageListBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) != 0)) {
-            inferencePageList_ = java.util.Collections.unmodifiableList(inferencePageList_);
-            bitField0_ = (bitField0_ & ~0x00000002);
-          }
-          result.inferencePageList_ = inferencePageList_;
-        } else {
-          result.inferencePageList_ = inferencePageListBuilder_.build();
-        }
-        result.parentQuestId_ = parentQuestId_;
         result.isFinished_ = isFinished_;
-        result.timeVarMap_ = internalGetTimeVarMap();
-        result.timeVarMap_.makeImmutable();
-        if (((bitField0_ & 0x00000008) != 0)) {
-          questVar_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000008);
-        }
-        result.questVar_ = questVar_;
-        result.videoKey_ = videoKey_;
+        result.isRandom_ = isRandom_;
+        result.parentQuestId_ = parentQuestId_;
+        result.parentQuestState_ = parentQuestState_;
+        result.questVarSeq_ = questVarSeq_;
         onBuilt();
         return result;
       }
@@ -1193,6 +1413,44 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest other) {
         if (other == emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.getDefaultInstance()) return this;
+        internalGetMutableTimeVarMap().mergeFrom(
+            other.internalGetTimeVarMap());
+        if (!other.questVar_.isEmpty()) {
+          if (questVar_.isEmpty()) {
+            questVar_ = other.questVar_;
+            bitField0_ = (bitField0_ & ~0x00000002);
+          } else {
+            ensureQuestVarIsMutable();
+            questVar_.addAll(other.questVar_);
+          }
+          onChanged();
+        }
+        if (inferencePageListBuilder_ == null) {
+          if (!other.inferencePageList_.isEmpty()) {
+            if (inferencePageList_.isEmpty()) {
+              inferencePageList_ = other.inferencePageList_;
+              bitField0_ = (bitField0_ & ~0x00000004);
+            } else {
+              ensureInferencePageListIsMutable();
+              inferencePageList_.addAll(other.inferencePageList_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.inferencePageList_.isEmpty()) {
+            if (inferencePageListBuilder_.isEmpty()) {
+              inferencePageListBuilder_.dispose();
+              inferencePageListBuilder_ = null;
+              inferencePageList_ = other.inferencePageList_;
+              bitField0_ = (bitField0_ & ~0x00000004);
+              inferencePageListBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getInferencePageListFieldBuilder() : null;
+            } else {
+              inferencePageListBuilder_.addAllMessages(other.inferencePageList_);
+            }
+          }
+        }
         if (other.hasRandomInfo()) {
           mergeRandomInfo(other.getRandomInfo());
         }
@@ -1200,7 +1458,7 @@ public Builder mergeFrom(emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQ
           if (!other.childQuestList_.isEmpty()) {
             if (childQuestList_.isEmpty()) {
               childQuestList_ = other.childQuestList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000008);
             } else {
               ensureChildQuestListIsMutable();
               childQuestList_.addAll(other.childQuestList_);
@@ -1213,7 +1471,7 @@ public Builder mergeFrom(emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQ
               childQuestListBuilder_.dispose();
               childQuestListBuilder_ = null;
               childQuestList_ = other.childQuestList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000008);
               childQuestListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getChildQuestListFieldBuilder() : null;
@@ -1222,64 +1480,26 @@ public Builder mergeFrom(emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQ
             }
           }
         }
-        if (other.getQuestVarSeq() != 0) {
-          setQuestVarSeq(other.getQuestVarSeq());
+        if (other.getVideoKey() != 0L) {
+          setVideoKey(other.getVideoKey());
         }
-        if (other.getParentQuestState() != 0) {
-          setParentQuestState(other.getParentQuestState());
+        if (other.getAcceptTime() != 0) {
+          setAcceptTime(other.getAcceptTime());
+        }
+        if (other.getIsFinished() != false) {
+          setIsFinished(other.getIsFinished());
         }
         if (other.getIsRandom() != false) {
           setIsRandom(other.getIsRandom());
         }
-        if (other.getAcceptTime() != 0) {
-          setAcceptTime(other.getAcceptTime());
+        if (other.getParentQuestId() != 0) {
+          setParentQuestId(other.getParentQuestId());
         }
-        if (inferencePageListBuilder_ == null) {
-          if (!other.inferencePageList_.isEmpty()) {
-            if (inferencePageList_.isEmpty()) {
-              inferencePageList_ = other.inferencePageList_;
-              bitField0_ = (bitField0_ & ~0x00000002);
-            } else {
-              ensureInferencePageListIsMutable();
-              inferencePageList_.addAll(other.inferencePageList_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.inferencePageList_.isEmpty()) {
-            if (inferencePageListBuilder_.isEmpty()) {
-              inferencePageListBuilder_.dispose();
-              inferencePageListBuilder_ = null;
-              inferencePageList_ = other.inferencePageList_;
-              bitField0_ = (bitField0_ & ~0x00000002);
-              inferencePageListBuilder_ = 
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getInferencePageListFieldBuilder() : null;
-            } else {
-              inferencePageListBuilder_.addAllMessages(other.inferencePageList_);
-            }
-          }
-        }
-        if (other.getParentQuestId() != 0) {
-          setParentQuestId(other.getParentQuestId());
-        }
-        if (other.getIsFinished() != false) {
-          setIsFinished(other.getIsFinished());
-        }
-        internalGetMutableTimeVarMap().mergeFrom(
-            other.internalGetTimeVarMap());
-        if (!other.questVar_.isEmpty()) {
-          if (questVar_.isEmpty()) {
-            questVar_ = other.questVar_;
-            bitField0_ = (bitField0_ & ~0x00000008);
-          } else {
-            ensureQuestVarIsMutable();
-            questVar_.addAll(other.questVar_);
-          }
-          onChanged();
+        if (other.getParentQuestState() != 0) {
+          setParentQuestState(other.getParentQuestState());
         }
-        if (other.getVideoKey() != 0L) {
-          setVideoKey(other.getVideoKey());
+        if (other.getQuestVarSeq() != 0) {
+          setQuestVarSeq(other.getQuestVarSeq());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -1311,763 +1531,1141 @@ public Builder mergeFrom(
       }
       private int bitField0_;
 
-      private emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo randomInfo_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo, emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo.Builder, emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfoOrBuilder> randomInfoBuilder_;
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> timeVarMap_;
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+      internalGetTimeVarMap() {
+        if (timeVarMap_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              TimeVarMapDefaultEntryHolder.defaultEntry);
+        }
+        return timeVarMap_;
+      }
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+      internalGetMutableTimeVarMap() {
+        onChanged();;
+        if (timeVarMap_ == null) {
+          timeVarMap_ = com.google.protobuf.MapField.newMapField(
+              TimeVarMapDefaultEntryHolder.defaultEntry);
+        }
+        if (!timeVarMap_.isMutable()) {
+          timeVarMap_ = timeVarMap_.copy();
+        }
+        return timeVarMap_;
+      }
+
+      public int getTimeVarMapCount() {
+        return internalGetTimeVarMap().getMap().size();
+      }
       /**
-       * <code>.ParentQuestRandomInfo random_info = 1;</code>
-       * @return Whether the randomInfo field is set.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, uint32&gt; time_var_map = 15;</code>
        */
-      public boolean hasRandomInfo() {
-        return randomInfoBuilder_ != null || randomInfo_ != null;
+
+      @java.lang.Override
+      public boolean containsTimeVarMap(
+          int key) {
+        
+        return internalGetTimeVarMap().getMap().containsKey(key);
       }
       /**
-       * <code>.ParentQuestRandomInfo random_info = 1;</code>
-       * @return The randomInfo.
+       * Use {@link #getTimeVarMapMap()} instead.
        */
-      public emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo getRandomInfo() {
-        if (randomInfoBuilder_ == null) {
-          return randomInfo_ == null ? emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo.getDefaultInstance() : randomInfo_;
-        } else {
-          return randomInfoBuilder_.getMessage();
-        }
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getTimeVarMap() {
+        return getTimeVarMapMap();
       }
       /**
-       * <code>.ParentQuestRandomInfo random_info = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, uint32&gt; time_var_map = 15;</code>
        */
-      public Builder setRandomInfo(emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo value) {
-        if (randomInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          randomInfo_ = value;
-          onChanged();
-        } else {
-          randomInfoBuilder_.setMessage(value);
-        }
+      @java.lang.Override
 
-        return this;
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getTimeVarMapMap() {
+        return internalGetTimeVarMap().getMap();
       }
       /**
-       * <code>.ParentQuestRandomInfo random_info = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, uint32&gt; time_var_map = 15;</code>
        */
-      public Builder setRandomInfo(
-          emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo.Builder builderForValue) {
-        if (randomInfoBuilder_ == null) {
-          randomInfo_ = builderForValue.build();
-          onChanged();
-        } else {
-          randomInfoBuilder_.setMessage(builderForValue.build());
-        }
+      @java.lang.Override
 
-        return this;
+      public int getTimeVarMapOrDefault(
+          int key,
+          int defaultValue) {
+        
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetTimeVarMap().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>.ParentQuestRandomInfo random_info = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, uint32&gt; time_var_map = 15;</code>
        */
-      public Builder mergeRandomInfo(emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo value) {
-        if (randomInfoBuilder_ == null) {
-          if (randomInfo_ != null) {
-            randomInfo_ =
-              emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo.newBuilder(randomInfo_).mergeFrom(value).buildPartial();
-          } else {
-            randomInfo_ = value;
-          }
-          onChanged();
-        } else {
-          randomInfoBuilder_.mergeFrom(value);
+      @java.lang.Override
+
+      public int getTimeVarMapOrThrow(
+          int key) {
+        
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetTimeVarMap().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
         }
+        return map.get(key);
+      }
 
+      public Builder clearTimeVarMap() {
+        internalGetMutableTimeVarMap().getMutableMap()
+            .clear();
         return this;
       }
       /**
-       * <code>.ParentQuestRandomInfo random_info = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, uint32&gt; time_var_map = 15;</code>
        */
-      public Builder clearRandomInfo() {
-        if (randomInfoBuilder_ == null) {
-          randomInfo_ = null;
-          onChanged();
-        } else {
-          randomInfo_ = null;
-          randomInfoBuilder_ = null;
-        }
 
+      public Builder removeTimeVarMap(
+          int key) {
+        
+        internalGetMutableTimeVarMap().getMutableMap()
+            .remove(key);
         return this;
       }
       /**
-       * <code>.ParentQuestRandomInfo random_info = 1;</code>
+       * Use alternate mutation accessors instead.
        */
-      public emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo.Builder getRandomInfoBuilder() {
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+      getMutableTimeVarMap() {
+        return internalGetMutableTimeVarMap().getMutableMap();
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, uint32&gt; time_var_map = 15;</code>
+       */
+      public Builder putTimeVarMap(
+          int key,
+          int value) {
+        
         
+        internalGetMutableTimeVarMap().getMutableMap()
+            .put(key, value);
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, uint32&gt; time_var_map = 15;</code>
+       */
+
+      public Builder putAllTimeVarMap(
+          java.util.Map<java.lang.Integer, java.lang.Integer> values) {
+        internalGetMutableTimeVarMap().getMutableMap()
+            .putAll(values);
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList questVar_ = emptyIntList();
+      private void ensureQuestVarIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          questVar_ = mutableCopy(questVar_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated int32 quest_var = 7;</code>
+       * @return A list containing the questVar.
+       */
+      public java.util.List<java.lang.Integer>
+          getQuestVarList() {
+        return ((bitField0_ & 0x00000002) != 0) ?
+                 java.util.Collections.unmodifiableList(questVar_) : questVar_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated int32 quest_var = 7;</code>
+       * @return The count of questVar.
+       */
+      public int getQuestVarCount() {
+        return questVar_.size();
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated int32 quest_var = 7;</code>
+       * @param index The index of the element to return.
+       * @return The questVar at the given index.
+       */
+      public int getQuestVar(int index) {
+        return questVar_.getInt(index);
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated int32 quest_var = 7;</code>
+       * @param index The index to set the value at.
+       * @param value The questVar to set.
+       * @return This builder for chaining.
+       */
+      public Builder setQuestVar(
+          int index, int value) {
+        ensureQuestVarIsMutable();
+        questVar_.setInt(index, value);
         onChanged();
-        return getRandomInfoFieldBuilder().getBuilder();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated int32 quest_var = 7;</code>
+       * @param value The questVar to add.
+       * @return This builder for chaining.
+       */
+      public Builder addQuestVar(int value) {
+        ensureQuestVarIsMutable();
+        questVar_.addInt(value);
+        onChanged();
+        return this;
       }
       /**
-       * <code>.ParentQuestRandomInfo random_info = 1;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated int32 quest_var = 7;</code>
+       * @param values The questVar to add.
+       * @return This builder for chaining.
        */
-      public emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfoOrBuilder getRandomInfoOrBuilder() {
-        if (randomInfoBuilder_ != null) {
-          return randomInfoBuilder_.getMessageOrBuilder();
-        } else {
-          return randomInfo_ == null ?
-              emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo.getDefaultInstance() : randomInfo_;
-        }
+      public Builder addAllQuestVar(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureQuestVarIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, questVar_);
+        onChanged();
+        return this;
       }
       /**
-       * <code>.ParentQuestRandomInfo random_info = 1;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated int32 quest_var = 7;</code>
+       * @return This builder for chaining.
        */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo, emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo.Builder, emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfoOrBuilder> 
-          getRandomInfoFieldBuilder() {
-        if (randomInfoBuilder_ == null) {
-          randomInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo, emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo.Builder, emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfoOrBuilder>(
-                  getRandomInfo(),
-                  getParentForChildren(),
-                  isClean());
-          randomInfo_ = null;
-        }
-        return randomInfoBuilder_;
+      public Builder clearQuestVar() {
+        questVar_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        onChanged();
+        return this;
       }
 
-      private java.util.List<emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest> childQuestList_ =
+      private java.util.List<emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo> inferencePageList_ =
         java.util.Collections.emptyList();
-      private void ensureChildQuestListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          childQuestList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest>(childQuestList_);
-          bitField0_ |= 0x00000001;
+      private void ensureInferencePageListIsMutable() {
+        if (!((bitField0_ & 0x00000004) != 0)) {
+          inferencePageList_ = new java.util.ArrayList<emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo>(inferencePageList_);
+          bitField0_ |= 0x00000004;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest, emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.Builder, emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuestOrBuilder> childQuestListBuilder_;
+          emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo, emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.Builder, emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfoOrBuilder> inferencePageListBuilder_;
 
       /**
-       * <code>repeated .ChildQuest child_quest_list = 2;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .InferencePageInfo inference_page_list = 11;</code>
        */
-      public java.util.List<emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest> getChildQuestListList() {
-        if (childQuestListBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(childQuestList_);
+      public java.util.List<emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo> getInferencePageListList() {
+        if (inferencePageListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(inferencePageList_);
         } else {
-          return childQuestListBuilder_.getMessageList();
+          return inferencePageListBuilder_.getMessageList();
         }
       }
       /**
-       * <code>repeated .ChildQuest child_quest_list = 2;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .InferencePageInfo inference_page_list = 11;</code>
        */
-      public int getChildQuestListCount() {
-        if (childQuestListBuilder_ == null) {
-          return childQuestList_.size();
+      public int getInferencePageListCount() {
+        if (inferencePageListBuilder_ == null) {
+          return inferencePageList_.size();
         } else {
-          return childQuestListBuilder_.getCount();
+          return inferencePageListBuilder_.getCount();
         }
       }
       /**
-       * <code>repeated .ChildQuest child_quest_list = 2;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .InferencePageInfo inference_page_list = 11;</code>
        */
-      public emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest getChildQuestList(int index) {
-        if (childQuestListBuilder_ == null) {
-          return childQuestList_.get(index);
+      public emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo getInferencePageList(int index) {
+        if (inferencePageListBuilder_ == null) {
+          return inferencePageList_.get(index);
         } else {
-          return childQuestListBuilder_.getMessage(index);
+          return inferencePageListBuilder_.getMessage(index);
         }
       }
       /**
-       * <code>repeated .ChildQuest child_quest_list = 2;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .InferencePageInfo inference_page_list = 11;</code>
        */
-      public Builder setChildQuestList(
-          int index, emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest value) {
-        if (childQuestListBuilder_ == null) {
+      public Builder setInferencePageList(
+          int index, emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo value) {
+        if (inferencePageListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureChildQuestListIsMutable();
-          childQuestList_.set(index, value);
+          ensureInferencePageListIsMutable();
+          inferencePageList_.set(index, value);
           onChanged();
         } else {
-          childQuestListBuilder_.setMessage(index, value);
+          inferencePageListBuilder_.setMessage(index, value);
         }
         return this;
       }
       /**
-       * <code>repeated .ChildQuest child_quest_list = 2;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .InferencePageInfo inference_page_list = 11;</code>
        */
-      public Builder setChildQuestList(
-          int index, emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.Builder builderForValue) {
-        if (childQuestListBuilder_ == null) {
-          ensureChildQuestListIsMutable();
-          childQuestList_.set(index, builderForValue.build());
+      public Builder setInferencePageList(
+          int index, emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.Builder builderForValue) {
+        if (inferencePageListBuilder_ == null) {
+          ensureInferencePageListIsMutable();
+          inferencePageList_.set(index, builderForValue.build());
           onChanged();
         } else {
-          childQuestListBuilder_.setMessage(index, builderForValue.build());
+          inferencePageListBuilder_.setMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * <code>repeated .ChildQuest child_quest_list = 2;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .InferencePageInfo inference_page_list = 11;</code>
        */
-      public Builder addChildQuestList(emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest value) {
-        if (childQuestListBuilder_ == null) {
+      public Builder addInferencePageList(emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo value) {
+        if (inferencePageListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureChildQuestListIsMutable();
-          childQuestList_.add(value);
+          ensureInferencePageListIsMutable();
+          inferencePageList_.add(value);
           onChanged();
         } else {
-          childQuestListBuilder_.addMessage(value);
+          inferencePageListBuilder_.addMessage(value);
         }
         return this;
       }
       /**
-       * <code>repeated .ChildQuest child_quest_list = 2;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .InferencePageInfo inference_page_list = 11;</code>
        */
-      public Builder addChildQuestList(
-          int index, emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest value) {
-        if (childQuestListBuilder_ == null) {
+      public Builder addInferencePageList(
+          int index, emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo value) {
+        if (inferencePageListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureChildQuestListIsMutable();
-          childQuestList_.add(index, value);
+          ensureInferencePageListIsMutable();
+          inferencePageList_.add(index, value);
           onChanged();
         } else {
-          childQuestListBuilder_.addMessage(index, value);
+          inferencePageListBuilder_.addMessage(index, value);
         }
         return this;
       }
       /**
-       * <code>repeated .ChildQuest child_quest_list = 2;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .InferencePageInfo inference_page_list = 11;</code>
        */
-      public Builder addChildQuestList(
-          emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.Builder builderForValue) {
-        if (childQuestListBuilder_ == null) {
-          ensureChildQuestListIsMutable();
-          childQuestList_.add(builderForValue.build());
+      public Builder addInferencePageList(
+          emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.Builder builderForValue) {
+        if (inferencePageListBuilder_ == null) {
+          ensureInferencePageListIsMutable();
+          inferencePageList_.add(builderForValue.build());
           onChanged();
         } else {
-          childQuestListBuilder_.addMessage(builderForValue.build());
+          inferencePageListBuilder_.addMessage(builderForValue.build());
         }
         return this;
       }
       /**
-       * <code>repeated .ChildQuest child_quest_list = 2;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .InferencePageInfo inference_page_list = 11;</code>
        */
-      public Builder addChildQuestList(
-          int index, emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.Builder builderForValue) {
-        if (childQuestListBuilder_ == null) {
-          ensureChildQuestListIsMutable();
-          childQuestList_.add(index, builderForValue.build());
+      public Builder addInferencePageList(
+          int index, emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.Builder builderForValue) {
+        if (inferencePageListBuilder_ == null) {
+          ensureInferencePageListIsMutable();
+          inferencePageList_.add(index, builderForValue.build());
           onChanged();
         } else {
-          childQuestListBuilder_.addMessage(index, builderForValue.build());
+          inferencePageListBuilder_.addMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * <code>repeated .ChildQuest child_quest_list = 2;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .InferencePageInfo inference_page_list = 11;</code>
        */
-      public Builder addAllChildQuestList(
-          java.lang.Iterable<? extends emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest> values) {
-        if (childQuestListBuilder_ == null) {
-          ensureChildQuestListIsMutable();
+      public Builder addAllInferencePageList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo> values) {
+        if (inferencePageListBuilder_ == null) {
+          ensureInferencePageListIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, childQuestList_);
+              values, inferencePageList_);
           onChanged();
         } else {
-          childQuestListBuilder_.addAllMessages(values);
+          inferencePageListBuilder_.addAllMessages(values);
         }
         return this;
       }
       /**
-       * <code>repeated .ChildQuest child_quest_list = 2;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .InferencePageInfo inference_page_list = 11;</code>
        */
-      public Builder clearChildQuestList() {
-        if (childQuestListBuilder_ == null) {
-          childQuestList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
+      public Builder clearInferencePageList() {
+        if (inferencePageListBuilder_ == null) {
+          inferencePageList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000004);
           onChanged();
         } else {
-          childQuestListBuilder_.clear();
+          inferencePageListBuilder_.clear();
         }
         return this;
       }
       /**
-       * <code>repeated .ChildQuest child_quest_list = 2;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .InferencePageInfo inference_page_list = 11;</code>
        */
-      public Builder removeChildQuestList(int index) {
-        if (childQuestListBuilder_ == null) {
-          ensureChildQuestListIsMutable();
-          childQuestList_.remove(index);
+      public Builder removeInferencePageList(int index) {
+        if (inferencePageListBuilder_ == null) {
+          ensureInferencePageListIsMutable();
+          inferencePageList_.remove(index);
           onChanged();
         } else {
-          childQuestListBuilder_.remove(index);
+          inferencePageListBuilder_.remove(index);
         }
         return this;
       }
       /**
-       * <code>repeated .ChildQuest child_quest_list = 2;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .InferencePageInfo inference_page_list = 11;</code>
        */
-      public emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.Builder getChildQuestListBuilder(
+      public emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.Builder getInferencePageListBuilder(
           int index) {
-        return getChildQuestListFieldBuilder().getBuilder(index);
+        return getInferencePageListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .ChildQuest child_quest_list = 2;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .InferencePageInfo inference_page_list = 11;</code>
        */
-      public emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuestOrBuilder getChildQuestListOrBuilder(
+      public emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfoOrBuilder getInferencePageListOrBuilder(
           int index) {
-        if (childQuestListBuilder_ == null) {
-          return childQuestList_.get(index);  } else {
-          return childQuestListBuilder_.getMessageOrBuilder(index);
+        if (inferencePageListBuilder_ == null) {
+          return inferencePageList_.get(index);  } else {
+          return inferencePageListBuilder_.getMessageOrBuilder(index);
         }
       }
       /**
-       * <code>repeated .ChildQuest child_quest_list = 2;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .InferencePageInfo inference_page_list = 11;</code>
        */
-      public java.util.List<? extends emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuestOrBuilder> 
-           getChildQuestListOrBuilderList() {
-        if (childQuestListBuilder_ != null) {
-          return childQuestListBuilder_.getMessageOrBuilderList();
+      public java.util.List<? extends emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfoOrBuilder> 
+           getInferencePageListOrBuilderList() {
+        if (inferencePageListBuilder_ != null) {
+          return inferencePageListBuilder_.getMessageOrBuilderList();
         } else {
-          return java.util.Collections.unmodifiableList(childQuestList_);
+          return java.util.Collections.unmodifiableList(inferencePageList_);
         }
       }
       /**
-       * <code>repeated .ChildQuest child_quest_list = 2;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .InferencePageInfo inference_page_list = 11;</code>
        */
-      public emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.Builder addChildQuestListBuilder() {
-        return getChildQuestListFieldBuilder().addBuilder(
-            emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.getDefaultInstance());
+      public emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.Builder addInferencePageListBuilder() {
+        return getInferencePageListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .ChildQuest child_quest_list = 2;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .InferencePageInfo inference_page_list = 11;</code>
        */
-      public emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.Builder addChildQuestListBuilder(
+      public emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.Builder addInferencePageListBuilder(
           int index) {
-        return getChildQuestListFieldBuilder().addBuilder(
-            index, emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.getDefaultInstance());
+        return getInferencePageListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .ChildQuest child_quest_list = 2;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .InferencePageInfo inference_page_list = 11;</code>
        */
-      public java.util.List<emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.Builder> 
-           getChildQuestListBuilderList() {
-        return getChildQuestListFieldBuilder().getBuilderList();
+      public java.util.List<emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.Builder> 
+           getInferencePageListBuilderList() {
+        return getInferencePageListFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest, emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.Builder, emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuestOrBuilder> 
-          getChildQuestListFieldBuilder() {
-        if (childQuestListBuilder_ == null) {
-          childQuestListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest, emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.Builder, emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuestOrBuilder>(
-                  childQuestList_,
-                  ((bitField0_ & 0x00000001) != 0),
+          emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo, emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.Builder, emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfoOrBuilder> 
+          getInferencePageListFieldBuilder() {
+        if (inferencePageListBuilder_ == null) {
+          inferencePageListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo, emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.Builder, emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfoOrBuilder>(
+                  inferencePageList_,
+                  ((bitField0_ & 0x00000004) != 0),
                   getParentForChildren(),
                   isClean());
-          childQuestList_ = null;
+          inferencePageList_ = null;
         }
-        return childQuestListBuilder_;
+        return inferencePageListBuilder_;
       }
 
-      private int questVarSeq_ ;
+      private emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo randomInfo_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo, emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo.Builder, emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfoOrBuilder> randomInfoBuilder_;
       /**
-       * <code>uint32 quest_var_seq = 3;</code>
-       * @return The questVarSeq.
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>.ParentQuestRandomInfo random_info = 4;</code>
+       * @return Whether the randomInfo field is set.
        */
-      @java.lang.Override
-      public int getQuestVarSeq() {
-        return questVarSeq_;
+      public boolean hasRandomInfo() {
+        return randomInfoBuilder_ != null || randomInfo_ != null;
       }
       /**
-       * <code>uint32 quest_var_seq = 3;</code>
-       * @param value The questVarSeq to set.
-       * @return This builder for chaining.
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>.ParentQuestRandomInfo random_info = 4;</code>
+       * @return The randomInfo.
        */
-      public Builder setQuestVarSeq(int value) {
-        
-        questVarSeq_ = value;
-        onChanged();
-        return this;
+      public emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo getRandomInfo() {
+        if (randomInfoBuilder_ == null) {
+          return randomInfo_ == null ? emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo.getDefaultInstance() : randomInfo_;
+        } else {
+          return randomInfoBuilder_.getMessage();
+        }
       }
       /**
-       * <code>uint32 quest_var_seq = 3;</code>
-       * @return This builder for chaining.
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>.ParentQuestRandomInfo random_info = 4;</code>
        */
-      public Builder clearQuestVarSeq() {
-        
-        questVarSeq_ = 0;
-        onChanged();
-        return this;
-      }
+      public Builder setRandomInfo(emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo value) {
+        if (randomInfoBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          randomInfo_ = value;
+          onChanged();
+        } else {
+          randomInfoBuilder_.setMessage(value);
+        }
 
-      private int parentQuestState_ ;
-      /**
-       * <code>uint32 parent_quest_state = 4;</code>
-       * @return The parentQuestState.
-       */
-      @java.lang.Override
-      public int getParentQuestState() {
-        return parentQuestState_;
-      }
-      /**
-       * <code>uint32 parent_quest_state = 4;</code>
-       * @param value The parentQuestState to set.
-       * @return This builder for chaining.
-       */
-      public Builder setParentQuestState(int value) {
-        
-        parentQuestState_ = value;
-        onChanged();
         return this;
       }
       /**
-       * <code>uint32 parent_quest_state = 4;</code>
-       * @return This builder for chaining.
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>.ParentQuestRandomInfo random_info = 4;</code>
        */
-      public Builder clearParentQuestState() {
-        
-        parentQuestState_ = 0;
-        onChanged();
-        return this;
-      }
+      public Builder setRandomInfo(
+          emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo.Builder builderForValue) {
+        if (randomInfoBuilder_ == null) {
+          randomInfo_ = builderForValue.build();
+          onChanged();
+        } else {
+          randomInfoBuilder_.setMessage(builderForValue.build());
+        }
 
-      private boolean isRandom_ ;
-      /**
-       * <code>bool is_random = 5;</code>
-       * @return The isRandom.
-       */
-      @java.lang.Override
-      public boolean getIsRandom() {
-        return isRandom_;
-      }
-      /**
-       * <code>bool is_random = 5;</code>
-       * @param value The isRandom to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsRandom(boolean value) {
-        
-        isRandom_ = value;
-        onChanged();
         return this;
       }
       /**
-       * <code>bool is_random = 5;</code>
-       * @return This builder for chaining.
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>.ParentQuestRandomInfo random_info = 4;</code>
        */
-      public Builder clearIsRandom() {
-        
-        isRandom_ = false;
-        onChanged();
+      public Builder mergeRandomInfo(emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo value) {
+        if (randomInfoBuilder_ == null) {
+          if (randomInfo_ != null) {
+            randomInfo_ =
+              emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo.newBuilder(randomInfo_).mergeFrom(value).buildPartial();
+          } else {
+            randomInfo_ = value;
+          }
+          onChanged();
+        } else {
+          randomInfoBuilder_.mergeFrom(value);
+        }
+
         return this;
       }
-
-      private int acceptTime_ ;
       /**
-       * <code>uint32 accept_time = 7;</code>
-       * @return The acceptTime.
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>.ParentQuestRandomInfo random_info = 4;</code>
        */
-      @java.lang.Override
-      public int getAcceptTime() {
-        return acceptTime_;
+      public Builder clearRandomInfo() {
+        if (randomInfoBuilder_ == null) {
+          randomInfo_ = null;
+          onChanged();
+        } else {
+          randomInfo_ = null;
+          randomInfoBuilder_ = null;
+        }
+
+        return this;
       }
       /**
-       * <code>uint32 accept_time = 7;</code>
-       * @param value The acceptTime to set.
-       * @return This builder for chaining.
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>.ParentQuestRandomInfo random_info = 4;</code>
        */
-      public Builder setAcceptTime(int value) {
+      public emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo.Builder getRandomInfoBuilder() {
         
-        acceptTime_ = value;
         onChanged();
-        return this;
+        return getRandomInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>uint32 accept_time = 7;</code>
-       * @return This builder for chaining.
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>.ParentQuestRandomInfo random_info = 4;</code>
        */
-      public Builder clearAcceptTime() {
-        
-        acceptTime_ = 0;
-        onChanged();
-        return this;
+      public emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfoOrBuilder getRandomInfoOrBuilder() {
+        if (randomInfoBuilder_ != null) {
+          return randomInfoBuilder_.getMessageOrBuilder();
+        } else {
+          return randomInfo_ == null ?
+              emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo.getDefaultInstance() : randomInfo_;
+        }
+      }
+      /**
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>.ParentQuestRandomInfo random_info = 4;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo, emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo.Builder, emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfoOrBuilder> 
+          getRandomInfoFieldBuilder() {
+        if (randomInfoBuilder_ == null) {
+          randomInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo, emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo.Builder, emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfoOrBuilder>(
+                  getRandomInfo(),
+                  getParentForChildren(),
+                  isClean());
+          randomInfo_ = null;
+        }
+        return randomInfoBuilder_;
       }
 
-      private java.util.List<emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo> inferencePageList_ =
+      private java.util.List<emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest> childQuestList_ =
         java.util.Collections.emptyList();
-      private void ensureInferencePageListIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
-          inferencePageList_ = new java.util.ArrayList<emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo>(inferencePageList_);
-          bitField0_ |= 0x00000002;
+      private void ensureChildQuestListIsMutable() {
+        if (!((bitField0_ & 0x00000008) != 0)) {
+          childQuestList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest>(childQuestList_);
+          bitField0_ |= 0x00000008;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo, emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.Builder, emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfoOrBuilder> inferencePageListBuilder_;
+          emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest, emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.Builder, emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuestOrBuilder> childQuestListBuilder_;
 
       /**
-       * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>repeated .ChildQuest child_quest_list = 3;</code>
        */
-      public java.util.List<emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo> getInferencePageListList() {
-        if (inferencePageListBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(inferencePageList_);
+      public java.util.List<emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest> getChildQuestListList() {
+        if (childQuestListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(childQuestList_);
         } else {
-          return inferencePageListBuilder_.getMessageList();
+          return childQuestListBuilder_.getMessageList();
         }
       }
       /**
-       * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>repeated .ChildQuest child_quest_list = 3;</code>
        */
-      public int getInferencePageListCount() {
-        if (inferencePageListBuilder_ == null) {
-          return inferencePageList_.size();
+      public int getChildQuestListCount() {
+        if (childQuestListBuilder_ == null) {
+          return childQuestList_.size();
         } else {
-          return inferencePageListBuilder_.getCount();
+          return childQuestListBuilder_.getCount();
         }
       }
       /**
-       * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>repeated .ChildQuest child_quest_list = 3;</code>
        */
-      public emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo getInferencePageList(int index) {
-        if (inferencePageListBuilder_ == null) {
-          return inferencePageList_.get(index);
+      public emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest getChildQuestList(int index) {
+        if (childQuestListBuilder_ == null) {
+          return childQuestList_.get(index);
         } else {
-          return inferencePageListBuilder_.getMessage(index);
+          return childQuestListBuilder_.getMessage(index);
         }
       }
       /**
-       * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>repeated .ChildQuest child_quest_list = 3;</code>
        */
-      public Builder setInferencePageList(
-          int index, emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo value) {
-        if (inferencePageListBuilder_ == null) {
+      public Builder setChildQuestList(
+          int index, emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest value) {
+        if (childQuestListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureInferencePageListIsMutable();
-          inferencePageList_.set(index, value);
+          ensureChildQuestListIsMutable();
+          childQuestList_.set(index, value);
           onChanged();
         } else {
-          inferencePageListBuilder_.setMessage(index, value);
+          childQuestListBuilder_.setMessage(index, value);
         }
         return this;
       }
       /**
-       * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>repeated .ChildQuest child_quest_list = 3;</code>
        */
-      public Builder setInferencePageList(
-          int index, emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.Builder builderForValue) {
-        if (inferencePageListBuilder_ == null) {
-          ensureInferencePageListIsMutable();
-          inferencePageList_.set(index, builderForValue.build());
+      public Builder setChildQuestList(
+          int index, emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.Builder builderForValue) {
+        if (childQuestListBuilder_ == null) {
+          ensureChildQuestListIsMutable();
+          childQuestList_.set(index, builderForValue.build());
           onChanged();
         } else {
-          inferencePageListBuilder_.setMessage(index, builderForValue.build());
+          childQuestListBuilder_.setMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>repeated .ChildQuest child_quest_list = 3;</code>
        */
-      public Builder addInferencePageList(emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo value) {
-        if (inferencePageListBuilder_ == null) {
+      public Builder addChildQuestList(emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest value) {
+        if (childQuestListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureInferencePageListIsMutable();
-          inferencePageList_.add(value);
+          ensureChildQuestListIsMutable();
+          childQuestList_.add(value);
           onChanged();
         } else {
-          inferencePageListBuilder_.addMessage(value);
+          childQuestListBuilder_.addMessage(value);
         }
         return this;
       }
       /**
-       * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>repeated .ChildQuest child_quest_list = 3;</code>
        */
-      public Builder addInferencePageList(
-          int index, emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo value) {
-        if (inferencePageListBuilder_ == null) {
+      public Builder addChildQuestList(
+          int index, emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest value) {
+        if (childQuestListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureInferencePageListIsMutable();
-          inferencePageList_.add(index, value);
+          ensureChildQuestListIsMutable();
+          childQuestList_.add(index, value);
           onChanged();
         } else {
-          inferencePageListBuilder_.addMessage(index, value);
+          childQuestListBuilder_.addMessage(index, value);
         }
         return this;
       }
       /**
-       * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>repeated .ChildQuest child_quest_list = 3;</code>
        */
-      public Builder addInferencePageList(
-          emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.Builder builderForValue) {
-        if (inferencePageListBuilder_ == null) {
-          ensureInferencePageListIsMutable();
-          inferencePageList_.add(builderForValue.build());
+      public Builder addChildQuestList(
+          emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.Builder builderForValue) {
+        if (childQuestListBuilder_ == null) {
+          ensureChildQuestListIsMutable();
+          childQuestList_.add(builderForValue.build());
           onChanged();
         } else {
-          inferencePageListBuilder_.addMessage(builderForValue.build());
+          childQuestListBuilder_.addMessage(builderForValue.build());
         }
         return this;
       }
       /**
-       * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>repeated .ChildQuest child_quest_list = 3;</code>
        */
-      public Builder addInferencePageList(
-          int index, emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.Builder builderForValue) {
-        if (inferencePageListBuilder_ == null) {
-          ensureInferencePageListIsMutable();
-          inferencePageList_.add(index, builderForValue.build());
+      public Builder addChildQuestList(
+          int index, emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.Builder builderForValue) {
+        if (childQuestListBuilder_ == null) {
+          ensureChildQuestListIsMutable();
+          childQuestList_.add(index, builderForValue.build());
           onChanged();
         } else {
-          inferencePageListBuilder_.addMessage(index, builderForValue.build());
+          childQuestListBuilder_.addMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>repeated .ChildQuest child_quest_list = 3;</code>
        */
-      public Builder addAllInferencePageList(
-          java.lang.Iterable<? extends emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo> values) {
-        if (inferencePageListBuilder_ == null) {
-          ensureInferencePageListIsMutable();
+      public Builder addAllChildQuestList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest> values) {
+        if (childQuestListBuilder_ == null) {
+          ensureChildQuestListIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, inferencePageList_);
+              values, childQuestList_);
           onChanged();
         } else {
-          inferencePageListBuilder_.addAllMessages(values);
+          childQuestListBuilder_.addAllMessages(values);
         }
         return this;
       }
       /**
-       * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>repeated .ChildQuest child_quest_list = 3;</code>
        */
-      public Builder clearInferencePageList() {
-        if (inferencePageListBuilder_ == null) {
-          inferencePageList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
+      public Builder clearChildQuestList() {
+        if (childQuestListBuilder_ == null) {
+          childQuestList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000008);
           onChanged();
         } else {
-          inferencePageListBuilder_.clear();
+          childQuestListBuilder_.clear();
         }
         return this;
       }
       /**
-       * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>repeated .ChildQuest child_quest_list = 3;</code>
        */
-      public Builder removeInferencePageList(int index) {
-        if (inferencePageListBuilder_ == null) {
-          ensureInferencePageListIsMutable();
-          inferencePageList_.remove(index);
+      public Builder removeChildQuestList(int index) {
+        if (childQuestListBuilder_ == null) {
+          ensureChildQuestListIsMutable();
+          childQuestList_.remove(index);
           onChanged();
         } else {
-          inferencePageListBuilder_.remove(index);
+          childQuestListBuilder_.remove(index);
         }
         return this;
       }
       /**
-       * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>repeated .ChildQuest child_quest_list = 3;</code>
        */
-      public emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.Builder getInferencePageListBuilder(
+      public emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.Builder getChildQuestListBuilder(
           int index) {
-        return getInferencePageListFieldBuilder().getBuilder(index);
+        return getChildQuestListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>repeated .ChildQuest child_quest_list = 3;</code>
        */
-      public emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfoOrBuilder getInferencePageListOrBuilder(
+      public emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuestOrBuilder getChildQuestListOrBuilder(
           int index) {
-        if (inferencePageListBuilder_ == null) {
-          return inferencePageList_.get(index);  } else {
-          return inferencePageListBuilder_.getMessageOrBuilder(index);
+        if (childQuestListBuilder_ == null) {
+          return childQuestList_.get(index);  } else {
+          return childQuestListBuilder_.getMessageOrBuilder(index);
         }
       }
       /**
-       * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>repeated .ChildQuest child_quest_list = 3;</code>
        */
-      public java.util.List<? extends emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfoOrBuilder> 
-           getInferencePageListOrBuilderList() {
-        if (inferencePageListBuilder_ != null) {
-          return inferencePageListBuilder_.getMessageOrBuilderList();
+      public java.util.List<? extends emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuestOrBuilder> 
+           getChildQuestListOrBuilderList() {
+        if (childQuestListBuilder_ != null) {
+          return childQuestListBuilder_.getMessageOrBuilderList();
         } else {
-          return java.util.Collections.unmodifiableList(inferencePageList_);
+          return java.util.Collections.unmodifiableList(childQuestList_);
         }
       }
       /**
-       * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>repeated .ChildQuest child_quest_list = 3;</code>
        */
-      public emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.Builder addInferencePageListBuilder() {
-        return getInferencePageListFieldBuilder().addBuilder(
-            emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.getDefaultInstance());
+      public emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.Builder addChildQuestListBuilder() {
+        return getChildQuestListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.getDefaultInstance());
+      }
+      /**
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>repeated .ChildQuest child_quest_list = 3;</code>
+       */
+      public emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.Builder addChildQuestListBuilder(
+          int index) {
+        return getChildQuestListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.getDefaultInstance());
+      }
+      /**
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>repeated .ChildQuest child_quest_list = 3;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.Builder> 
+           getChildQuestListBuilderList() {
+        return getChildQuestListFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest, emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.Builder, emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuestOrBuilder> 
+          getChildQuestListFieldBuilder() {
+        if (childQuestListBuilder_ == null) {
+          childQuestListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest, emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.Builder, emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuestOrBuilder>(
+                  childQuestList_,
+                  ((bitField0_ & 0x00000008) != 0),
+                  getParentForChildren(),
+                  isClean());
+          childQuestList_ = null;
+        }
+        return childQuestListBuilder_;
+      }
+
+      private long videoKey_ ;
+      /**
+       * <pre>
+       * Offset: 0x50
+       * </pre>
+       *
+       * <code>uint64 video_key = 2;</code>
+       * @return The videoKey.
+       */
+      @java.lang.Override
+      public long getVideoKey() {
+        return videoKey_;
       }
       /**
-       * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
+       * <pre>
+       * Offset: 0x50
+       * </pre>
+       *
+       * <code>uint64 video_key = 2;</code>
+       * @param value The videoKey to set.
+       * @return This builder for chaining.
        */
-      public emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.Builder addInferencePageListBuilder(
-          int index) {
-        return getInferencePageListFieldBuilder().addBuilder(
-            index, emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.getDefaultInstance());
+      public Builder setVideoKey(long value) {
+        
+        videoKey_ = value;
+        onChanged();
+        return this;
       }
       /**
-       * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
+       * <pre>
+       * Offset: 0x50
+       * </pre>
+       *
+       * <code>uint64 video_key = 2;</code>
+       * @return This builder for chaining.
        */
-      public java.util.List<emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.Builder> 
-           getInferencePageListBuilderList() {
-        return getInferencePageListFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo, emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.Builder, emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfoOrBuilder> 
-          getInferencePageListFieldBuilder() {
-        if (inferencePageListBuilder_ == null) {
-          inferencePageListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo, emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.Builder, emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfoOrBuilder>(
-                  inferencePageList_,
-                  ((bitField0_ & 0x00000002) != 0),
-                  getParentForChildren(),
-                  isClean());
-          inferencePageList_ = null;
-        }
-        return inferencePageListBuilder_;
+      public Builder clearVideoKey() {
+        
+        videoKey_ = 0L;
+        onChanged();
+        return this;
       }
 
-      private int parentQuestId_ ;
+      private int acceptTime_ ;
       /**
-       * <code>uint32 parent_quest_id = 9;</code>
-       * @return The parentQuestId.
+       * <pre>
+       * Offset: 0x58
+       * </pre>
+       *
+       * <code>uint32 accept_time = 5;</code>
+       * @return The acceptTime.
        */
       @java.lang.Override
-      public int getParentQuestId() {
-        return parentQuestId_;
+      public int getAcceptTime() {
+        return acceptTime_;
       }
       /**
-       * <code>uint32 parent_quest_id = 9;</code>
-       * @param value The parentQuestId to set.
+       * <pre>
+       * Offset: 0x58
+       * </pre>
+       *
+       * <code>uint32 accept_time = 5;</code>
+       * @param value The acceptTime to set.
        * @return This builder for chaining.
        */
-      public Builder setParentQuestId(int value) {
+      public Builder setAcceptTime(int value) {
         
-        parentQuestId_ = value;
+        acceptTime_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 parent_quest_id = 9;</code>
+       * <pre>
+       * Offset: 0x58
+       * </pre>
+       *
+       * <code>uint32 accept_time = 5;</code>
        * @return This builder for chaining.
        */
-      public Builder clearParentQuestId() {
+      public Builder clearAcceptTime() {
         
-        parentQuestId_ = 0;
+        acceptTime_ = 0;
         onChanged();
         return this;
       }
 
       private boolean isFinished_ ;
       /**
-       * <code>bool is_finished = 12;</code>
+       * <pre>
+       * Offset: 0x5D
+       * </pre>
+       *
+       * <code>bool is_finished = 8;</code>
        * @return The isFinished.
        */
       @java.lang.Override
@@ -2075,7 +2673,11 @@ public boolean getIsFinished() {
         return isFinished_;
       }
       /**
-       * <code>bool is_finished = 12;</code>
+       * <pre>
+       * Offset: 0x5D
+       * </pre>
+       *
+       * <code>bool is_finished = 8;</code>
        * @param value The isFinished to set.
        * @return This builder for chaining.
        */
@@ -2086,7 +2688,11 @@ public Builder setIsFinished(boolean value) {
         return this;
       }
       /**
-       * <code>bool is_finished = 12;</code>
+       * <pre>
+       * Offset: 0x5D
+       * </pre>
+       *
+       * <code>bool is_finished = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsFinished() {
@@ -2096,240 +2702,174 @@ public Builder clearIsFinished() {
         return this;
       }
 
-      private com.google.protobuf.MapField<
-          java.lang.Integer, java.lang.Integer> timeVarMap_;
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-      internalGetTimeVarMap() {
-        if (timeVarMap_ == null) {
-          return com.google.protobuf.MapField.emptyMapField(
-              TimeVarMapDefaultEntryHolder.defaultEntry);
-        }
-        return timeVarMap_;
-      }
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-      internalGetMutableTimeVarMap() {
-        onChanged();;
-        if (timeVarMap_ == null) {
-          timeVarMap_ = com.google.protobuf.MapField.newMapField(
-              TimeVarMapDefaultEntryHolder.defaultEntry);
-        }
-        if (!timeVarMap_.isMutable()) {
-          timeVarMap_ = timeVarMap_.copy();
-        }
-        return timeVarMap_;
-      }
-
-      public int getTimeVarMapCount() {
-        return internalGetTimeVarMap().getMap().size();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; time_var_map = 13;</code>
-       */
-
-      @java.lang.Override
-      public boolean containsTimeVarMap(
-          int key) {
-        
-        return internalGetTimeVarMap().getMap().containsKey(key);
-      }
-      /**
-       * Use {@link #getTimeVarMapMap()} instead.
-       */
-      @java.lang.Override
-      @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Integer> getTimeVarMap() {
-        return getTimeVarMapMap();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; time_var_map = 13;</code>
-       */
-      @java.lang.Override
-
-      public java.util.Map<java.lang.Integer, java.lang.Integer> getTimeVarMapMap() {
-        return internalGetTimeVarMap().getMap();
-      }
+      private boolean isRandom_ ;
       /**
-       * <code>map&lt;uint32, uint32&gt; time_var_map = 13;</code>
+       * <pre>
+       * Offset: 0x5F
+       * </pre>
+       *
+       * <code>bool is_random = 12;</code>
+       * @return The isRandom.
        */
       @java.lang.Override
-
-      public int getTimeVarMapOrDefault(
-          int key,
-          int defaultValue) {
-        
-        java.util.Map<java.lang.Integer, java.lang.Integer> map =
-            internalGetTimeVarMap().getMap();
-        return map.containsKey(key) ? map.get(key) : defaultValue;
+      public boolean getIsRandom() {
+        return isRandom_;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; time_var_map = 13;</code>
+       * <pre>
+       * Offset: 0x5F
+       * </pre>
+       *
+       * <code>bool is_random = 12;</code>
+       * @param value The isRandom to set.
+       * @return This builder for chaining.
        */
-      @java.lang.Override
-
-      public int getTimeVarMapOrThrow(
-          int key) {
+      public Builder setIsRandom(boolean value) {
         
-        java.util.Map<java.lang.Integer, java.lang.Integer> map =
-            internalGetTimeVarMap().getMap();
-        if (!map.containsKey(key)) {
-          throw new java.lang.IllegalArgumentException();
-        }
-        return map.get(key);
-      }
-
-      public Builder clearTimeVarMap() {
-        internalGetMutableTimeVarMap().getMutableMap()
-            .clear();
+        isRandom_ = value;
+        onChanged();
         return this;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; time_var_map = 13;</code>
+       * <pre>
+       * Offset: 0x5F
+       * </pre>
+       *
+       * <code>bool is_random = 12;</code>
+       * @return This builder for chaining.
        */
-
-      public Builder removeTimeVarMap(
-          int key) {
+      public Builder clearIsRandom() {
         
-        internalGetMutableTimeVarMap().getMutableMap()
-            .remove(key);
+        isRandom_ = false;
+        onChanged();
         return this;
       }
+
+      private int parentQuestId_ ;
       /**
-       * Use alternate mutation accessors instead.
+       * <pre>
+       * Offset: 0x60
+       * </pre>
+       *
+       * <code>uint32 parent_quest_id = 14;</code>
+       * @return The parentQuestId.
        */
-      @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Integer>
-      getMutableTimeVarMap() {
-        return internalGetMutableTimeVarMap().getMutableMap();
+      @java.lang.Override
+      public int getParentQuestId() {
+        return parentQuestId_;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; time_var_map = 13;</code>
+       * <pre>
+       * Offset: 0x60
+       * </pre>
+       *
+       * <code>uint32 parent_quest_id = 14;</code>
+       * @param value The parentQuestId to set.
+       * @return This builder for chaining.
        */
-      public Builder putTimeVarMap(
-          int key,
-          int value) {
-        
+      public Builder setParentQuestId(int value) {
         
-        internalGetMutableTimeVarMap().getMutableMap()
-            .put(key, value);
-        return this;
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; time_var_map = 13;</code>
-       */
-
-      public Builder putAllTimeVarMap(
-          java.util.Map<java.lang.Integer, java.lang.Integer> values) {
-        internalGetMutableTimeVarMap().getMutableMap()
-            .putAll(values);
+        parentQuestId_ = value;
+        onChanged();
         return this;
       }
-
-      private com.google.protobuf.Internal.IntList questVar_ = emptyIntList();
-      private void ensureQuestVarIsMutable() {
-        if (!((bitField0_ & 0x00000008) != 0)) {
-          questVar_ = mutableCopy(questVar_);
-          bitField0_ |= 0x00000008;
-         }
-      }
-      /**
-       * <code>repeated int32 quest_var = 14;</code>
-       * @return A list containing the questVar.
-       */
-      public java.util.List<java.lang.Integer>
-          getQuestVarList() {
-        return ((bitField0_ & 0x00000008) != 0) ?
-                 java.util.Collections.unmodifiableList(questVar_) : questVar_;
-      }
-      /**
-       * <code>repeated int32 quest_var = 14;</code>
-       * @return The count of questVar.
-       */
-      public int getQuestVarCount() {
-        return questVar_.size();
-      }
-      /**
-       * <code>repeated int32 quest_var = 14;</code>
-       * @param index The index of the element to return.
-       * @return The questVar at the given index.
-       */
-      public int getQuestVar(int index) {
-        return questVar_.getInt(index);
-      }
       /**
-       * <code>repeated int32 quest_var = 14;</code>
-       * @param index The index to set the value at.
-       * @param value The questVar to set.
+       * <pre>
+       * Offset: 0x60
+       * </pre>
+       *
+       * <code>uint32 parent_quest_id = 14;</code>
        * @return This builder for chaining.
        */
-      public Builder setQuestVar(
-          int index, int value) {
-        ensureQuestVarIsMutable();
-        questVar_.setInt(index, value);
+      public Builder clearParentQuestId() {
+        
+        parentQuestId_ = 0;
         onChanged();
         return this;
       }
+
+      private int parentQuestState_ ;
       /**
-       * <code>repeated int32 quest_var = 14;</code>
-       * @param value The questVar to add.
-       * @return This builder for chaining.
+       * <pre>
+       * Offset: 0x64
+       * </pre>
+       *
+       * <code>uint32 parent_quest_state = 1;</code>
+       * @return The parentQuestState.
        */
-      public Builder addQuestVar(int value) {
-        ensureQuestVarIsMutable();
-        questVar_.addInt(value);
-        onChanged();
-        return this;
+      @java.lang.Override
+      public int getParentQuestState() {
+        return parentQuestState_;
       }
       /**
-       * <code>repeated int32 quest_var = 14;</code>
-       * @param values The questVar to add.
+       * <pre>
+       * Offset: 0x64
+       * </pre>
+       *
+       * <code>uint32 parent_quest_state = 1;</code>
+       * @param value The parentQuestState to set.
        * @return This builder for chaining.
        */
-      public Builder addAllQuestVar(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureQuestVarIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, questVar_);
+      public Builder setParentQuestState(int value) {
+        
+        parentQuestState_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>repeated int32 quest_var = 14;</code>
+       * <pre>
+       * Offset: 0x64
+       * </pre>
+       *
+       * <code>uint32 parent_quest_state = 1;</code>
        * @return This builder for chaining.
        */
-      public Builder clearQuestVar() {
-        questVar_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000008);
+      public Builder clearParentQuestState() {
+        
+        parentQuestState_ = 0;
         onChanged();
         return this;
       }
 
-      private long videoKey_ ;
+      private int questVarSeq_ ;
       /**
-       * <code>uint64 video_key = 15;</code>
-       * @return The videoKey.
+       * <pre>
+       * Offset: 0x68
+       * </pre>
+       *
+       * <code>uint32 quest_var_seq = 9;</code>
+       * @return The questVarSeq.
        */
       @java.lang.Override
-      public long getVideoKey() {
-        return videoKey_;
+      public int getQuestVarSeq() {
+        return questVarSeq_;
       }
       /**
-       * <code>uint64 video_key = 15;</code>
-       * @param value The videoKey to set.
+       * <pre>
+       * Offset: 0x68
+       * </pre>
+       *
+       * <code>uint32 quest_var_seq = 9;</code>
+       * @param value The questVarSeq to set.
        * @return This builder for chaining.
        */
-      public Builder setVideoKey(long value) {
+      public Builder setQuestVarSeq(int value) {
         
-        videoKey_ = value;
+        questVarSeq_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint64 video_key = 15;</code>
+       * <pre>
+       * Offset: 0x68
+       * </pre>
+       *
+       * <code>uint32 quest_var_seq = 9;</code>
        * @return This builder for chaining.
        */
-      public Builder clearVideoKey() {
+      public Builder clearQuestVarSeq() {
         
-        videoKey_ = 0L;
+        questVarSeq_ = 0;
         onChanged();
         return this;
       }
@@ -2407,16 +2947,16 @@ public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest getDefaultIns
     java.lang.String[] descriptorData = {
       "\n\021ParentQuest.proto\032\020ChildQuest.proto\032\027I" +
       "nferencePageInfo.proto\032\033ParentQuestRando" +
-      "mInfo.proto\"\250\003\n\013ParentQuest\022+\n\013random_in" +
-      "fo\030\001 \001(\0132\026.ParentQuestRandomInfo\022%\n\020chil" +
-      "d_quest_list\030\002 \003(\0132\013.ChildQuest\022\025\n\rquest" +
-      "_var_seq\030\003 \001(\r\022\032\n\022parent_quest_state\030\004 \001" +
-      "(\r\022\021\n\tis_random\030\005 \001(\010\022\023\n\013accept_time\030\007 \001" +
-      "(\r\022/\n\023inference_page_list\030\010 \003(\0132\022.Infere" +
-      "ncePageInfo\022\027\n\017parent_quest_id\030\t \001(\r\022\023\n\013" +
-      "is_finished\030\014 \001(\010\0222\n\014time_var_map\030\r \003(\0132" +
-      "\034.ParentQuest.TimeVarMapEntry\022\021\n\tquest_v" +
-      "ar\030\016 \003(\005\022\021\n\tvideo_key\030\017 \001(\004\0321\n\017TimeVarMa" +
+      "mInfo.proto\"\250\003\n\013ParentQuest\0222\n\014time_var_" +
+      "map\030\017 \003(\0132\034.ParentQuest.TimeVarMapEntry\022" +
+      "\021\n\tquest_var\030\007 \003(\005\022/\n\023inference_page_lis" +
+      "t\030\013 \003(\0132\022.InferencePageInfo\022+\n\013random_in" +
+      "fo\030\004 \001(\0132\026.ParentQuestRandomInfo\022%\n\020chil" +
+      "d_quest_list\030\003 \003(\0132\013.ChildQuest\022\021\n\tvideo" +
+      "_key\030\002 \001(\004\022\023\n\013accept_time\030\005 \001(\r\022\023\n\013is_fi" +
+      "nished\030\010 \001(\010\022\021\n\tis_random\030\014 \001(\010\022\027\n\017paren" +
+      "t_quest_id\030\016 \001(\r\022\032\n\022parent_quest_state\030\001" +
+      " \001(\r\022\025\n\rquest_var_seq\030\t \001(\r\0321\n\017TimeVarMa" +
       "pEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001B\033" +
       "\n\031emu.grasscutter.net.protob\006proto3"
     };
@@ -2432,7 +2972,7 @@ public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest getDefaultIns
     internal_static_ParentQuest_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ParentQuest_descriptor,
-        new java.lang.String[] { "RandomInfo", "ChildQuestList", "QuestVarSeq", "ParentQuestState", "IsRandom", "AcceptTime", "InferencePageList", "ParentQuestId", "IsFinished", "TimeVarMap", "QuestVar", "VideoKey", });
+        new java.lang.String[] { "TimeVarMap", "QuestVar", "InferencePageList", "RandomInfo", "ChildQuestList", "VideoKey", "AcceptTime", "IsFinished", "IsRandom", "ParentQuestId", "ParentQuestState", "QuestVarSeq", });
     internal_static_ParentQuest_TimeVarMapEntry_descriptor =
       internal_static_ParentQuest_descriptor.getNestedTypes().get(0);
     internal_static_ParentQuest_TimeVarMapEntry_fieldAccessorTable = new
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ParentQuestRandomInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ParentQuestRandomInfoOuterClass.java
index b7fcfc6d45d..51999276280 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ParentQuestRandomInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ParentQuestRandomInfoOuterClass.java
@@ -19,30 +19,50 @@ public interface ParentQuestRandomInfoOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 factor_list = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 factor_list = 10;</code>
      * @return A list containing the factorList.
      */
     java.util.List<java.lang.Integer> getFactorListList();
     /**
-     * <code>repeated uint32 factor_list = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 factor_list = 10;</code>
      * @return The count of factorList.
      */
     int getFactorListCount();
     /**
-     * <code>repeated uint32 factor_list = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 factor_list = 10;</code>
      * @param index The index of the element to return.
      * @return The factorList at the given index.
      */
     int getFactorList(int index);
 
     /**
-     * <code>uint32 template_id = 11;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 template_id = 12;</code>
      * @return The templateId.
      */
     int getTemplateId();
 
     /**
-     * <code>uint32 entrance_id = 15;</code>
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>uint32 entrance_id = 4;</code>
      * @return The entranceId.
      */
     int getEntranceId();
@@ -94,7 +114,12 @@ private ParentQuestRandomInfo(
             case 0:
               done = true;
               break;
-            case 24: {
+            case 32: {
+
+              entranceId_ = input.readUInt32();
+              break;
+            }
+            case 80: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 factorList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -102,7 +127,7 @@ private ParentQuestRandomInfo(
               factorList_.addInt(input.readUInt32());
               break;
             }
-            case 26: {
+            case 82: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -115,16 +140,11 @@ private ParentQuestRandomInfo(
               input.popLimit(limit);
               break;
             }
-            case 88: {
+            case 96: {
 
               templateId_ = input.readUInt32();
               break;
             }
-            case 120: {
-
-              entranceId_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -160,10 +180,14 @@ private ParentQuestRandomInfo(
               emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo.class, emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo.Builder.class);
     }
 
-    public static final int FACTOR_LIST_FIELD_NUMBER = 3;
+    public static final int FACTOR_LIST_FIELD_NUMBER = 10;
     private com.google.protobuf.Internal.IntList factorList_;
     /**
-     * <code>repeated uint32 factor_list = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 factor_list = 10;</code>
      * @return A list containing the factorList.
      */
     @java.lang.Override
@@ -172,14 +196,22 @@ private ParentQuestRandomInfo(
       return factorList_;
     }
     /**
-     * <code>repeated uint32 factor_list = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 factor_list = 10;</code>
      * @return The count of factorList.
      */
     public int getFactorListCount() {
       return factorList_.size();
     }
     /**
-     * <code>repeated uint32 factor_list = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 factor_list = 10;</code>
      * @param index The index of the element to return.
      * @return The factorList at the given index.
      */
@@ -188,10 +220,14 @@ public int getFactorList(int index) {
     }
     private int factorListMemoizedSerializedSize = -1;
 
-    public static final int TEMPLATE_ID_FIELD_NUMBER = 11;
+    public static final int TEMPLATE_ID_FIELD_NUMBER = 12;
     private int templateId_;
     /**
-     * <code>uint32 template_id = 11;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 template_id = 12;</code>
      * @return The templateId.
      */
     @java.lang.Override
@@ -199,10 +235,14 @@ public int getTemplateId() {
       return templateId_;
     }
 
-    public static final int ENTRANCE_ID_FIELD_NUMBER = 15;
+    public static final int ENTRANCE_ID_FIELD_NUMBER = 4;
     private int entranceId_;
     /**
-     * <code>uint32 entrance_id = 15;</code>
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>uint32 entrance_id = 4;</code>
      * @return The entranceId.
      */
     @java.lang.Override
@@ -225,18 +265,18 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
+      if (entranceId_ != 0) {
+        output.writeUInt32(4, entranceId_);
+      }
       if (getFactorListList().size() > 0) {
-        output.writeUInt32NoTag(26);
+        output.writeUInt32NoTag(82);
         output.writeUInt32NoTag(factorListMemoizedSerializedSize);
       }
       for (int i = 0; i < factorList_.size(); i++) {
         output.writeUInt32NoTag(factorList_.getInt(i));
       }
       if (templateId_ != 0) {
-        output.writeUInt32(11, templateId_);
-      }
-      if (entranceId_ != 0) {
-        output.writeUInt32(15, entranceId_);
+        output.writeUInt32(12, templateId_);
       }
       unknownFields.writeTo(output);
     }
@@ -247,6 +287,10 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
+      if (entranceId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(4, entranceId_);
+      }
       {
         int dataSize = 0;
         for (int i = 0; i < factorList_.size(); i++) {
@@ -263,11 +307,7 @@ public int getSerializedSize() {
       }
       if (templateId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, templateId_);
-      }
-      if (entranceId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, entranceId_);
+          .computeUInt32Size(12, templateId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -584,7 +624,11 @@ private void ensureFactorListIsMutable() {
          }
       }
       /**
-       * <code>repeated uint32 factor_list = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 factor_list = 10;</code>
        * @return A list containing the factorList.
        */
       public java.util.List<java.lang.Integer>
@@ -593,14 +637,22 @@ private void ensureFactorListIsMutable() {
                  java.util.Collections.unmodifiableList(factorList_) : factorList_;
       }
       /**
-       * <code>repeated uint32 factor_list = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 factor_list = 10;</code>
        * @return The count of factorList.
        */
       public int getFactorListCount() {
         return factorList_.size();
       }
       /**
-       * <code>repeated uint32 factor_list = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 factor_list = 10;</code>
        * @param index The index of the element to return.
        * @return The factorList at the given index.
        */
@@ -608,7 +660,11 @@ public int getFactorList(int index) {
         return factorList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 factor_list = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 factor_list = 10;</code>
        * @param index The index to set the value at.
        * @param value The factorList to set.
        * @return This builder for chaining.
@@ -621,7 +677,11 @@ public Builder setFactorList(
         return this;
       }
       /**
-       * <code>repeated uint32 factor_list = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 factor_list = 10;</code>
        * @param value The factorList to add.
        * @return This builder for chaining.
        */
@@ -632,7 +692,11 @@ public Builder addFactorList(int value) {
         return this;
       }
       /**
-       * <code>repeated uint32 factor_list = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 factor_list = 10;</code>
        * @param values The factorList to add.
        * @return This builder for chaining.
        */
@@ -645,7 +709,11 @@ public Builder addAllFactorList(
         return this;
       }
       /**
-       * <code>repeated uint32 factor_list = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 factor_list = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearFactorList() {
@@ -657,7 +725,11 @@ public Builder clearFactorList() {
 
       private int templateId_ ;
       /**
-       * <code>uint32 template_id = 11;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 template_id = 12;</code>
        * @return The templateId.
        */
       @java.lang.Override
@@ -665,7 +737,11 @@ public int getTemplateId() {
         return templateId_;
       }
       /**
-       * <code>uint32 template_id = 11;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 template_id = 12;</code>
        * @param value The templateId to set.
        * @return This builder for chaining.
        */
@@ -676,7 +752,11 @@ public Builder setTemplateId(int value) {
         return this;
       }
       /**
-       * <code>uint32 template_id = 11;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 template_id = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearTemplateId() {
@@ -688,7 +768,11 @@ public Builder clearTemplateId() {
 
       private int entranceId_ ;
       /**
-       * <code>uint32 entrance_id = 15;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 entrance_id = 4;</code>
        * @return The entranceId.
        */
       @java.lang.Override
@@ -696,7 +780,11 @@ public int getEntranceId() {
         return entranceId_;
       }
       /**
-       * <code>uint32 entrance_id = 15;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 entrance_id = 4;</code>
        * @param value The entranceId to set.
        * @return This builder for chaining.
        */
@@ -707,7 +795,11 @@ public Builder setEntranceId(int value) {
         return this;
       }
       /**
-       * <code>uint32 entrance_id = 15;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 entrance_id = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearEntranceId() {
@@ -784,8 +876,8 @@ public emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRand
   static {
     java.lang.String[] descriptorData = {
       "\n\033ParentQuestRandomInfo.proto\"V\n\025ParentQ" +
-      "uestRandomInfo\022\023\n\013factor_list\030\003 \003(\r\022\023\n\013t" +
-      "emplate_id\030\013 \001(\r\022\023\n\013entrance_id\030\017 \001(\rB\033\n" +
+      "uestRandomInfo\022\023\n\013factor_list\030\n \003(\r\022\023\n\013t" +
+      "emplate_id\030\014 \001(\r\022\023\n\013entrance_id\030\004 \001(\rB\033\n" +
       "\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PersonalSceneJumpReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PersonalSceneJumpReqOuterClass.java
index ee3d9b645bd..f5a5f5aea70 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PersonalSceneJumpReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PersonalSceneJumpReqOuterClass.java
@@ -19,14 +19,18 @@ public interface PersonalSceneJumpReqOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 point_id = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 point_id = 14;</code>
      * @return The pointId.
      */
     int getPointId();
   }
   /**
    * <pre>
-   * CmdId: 25750
+   * CmdId: 5277
    * </pre>
    *
    * Protobuf type {@code PersonalSceneJumpReq}
@@ -73,7 +77,7 @@ private PersonalSceneJumpReq(
             case 0:
               done = true;
               break;
-            case 48: {
+            case 112: {
 
               pointId_ = input.readUInt32();
               break;
@@ -110,10 +114,14 @@ private PersonalSceneJumpReq(
               emu.grasscutter.net.proto.PersonalSceneJumpReqOuterClass.PersonalSceneJumpReq.class, emu.grasscutter.net.proto.PersonalSceneJumpReqOuterClass.PersonalSceneJumpReq.Builder.class);
     }
 
-    public static final int POINT_ID_FIELD_NUMBER = 6;
+    public static final int POINT_ID_FIELD_NUMBER = 14;
     private int pointId_;
     /**
-     * <code>uint32 point_id = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 point_id = 14;</code>
      * @return The pointId.
      */
     @java.lang.Override
@@ -136,7 +144,7 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (pointId_ != 0) {
-        output.writeUInt32(6, pointId_);
+        output.writeUInt32(14, pointId_);
       }
       unknownFields.writeTo(output);
     }
@@ -149,7 +157,7 @@ public int getSerializedSize() {
       size = 0;
       if (pointId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, pointId_);
+          .computeUInt32Size(14, pointId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,7 +286,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 25750
+     * CmdId: 5277
      * </pre>
      *
      * Protobuf type {@code PersonalSceneJumpReq}
@@ -429,7 +437,11 @@ public Builder mergeFrom(
 
       private int pointId_ ;
       /**
-       * <code>uint32 point_id = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 point_id = 14;</code>
        * @return The pointId.
        */
       @java.lang.Override
@@ -437,7 +449,11 @@ public int getPointId() {
         return pointId_;
       }
       /**
-       * <code>uint32 point_id = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 point_id = 14;</code>
        * @param value The pointId to set.
        * @return This builder for chaining.
        */
@@ -448,7 +464,11 @@ public Builder setPointId(int value) {
         return this;
       }
       /**
-       * <code>uint32 point_id = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 point_id = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearPointId() {
@@ -525,7 +545,7 @@ public emu.grasscutter.net.proto.PersonalSceneJumpReqOuterClass.PersonalSceneJum
   static {
     java.lang.String[] descriptorData = {
       "\n\032PersonalSceneJumpReq.proto\"(\n\024Personal" +
-      "SceneJumpReq\022\020\n\010point_id\030\006 \001(\rB\033\n\031emu.gr" +
+      "SceneJumpReq\022\020\n\010point_id\030\016 \001(\rB\033\n\031emu.gr" +
       "asscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PingReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PingReqOuterClass.java
index beee9c1a0f3..4c4c7e26f15 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PingReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PingReqOuterClass.java
@@ -20,57 +20,57 @@ public interface PingReqOrBuilder extends
 
     /**
      * <pre>
-     * Offset 0x20
+     * Offset: 0x28
      * </pre>
      *
-     * <code>bytes sc_data = 4;</code>
+     * <code>bytes sc_data = 14;</code>
      * @return The scData.
      */
     com.google.protobuf.ByteString getScData();
 
     /**
      * <pre>
-     * Offset 0x38
+     * Offset: 0x38
      * </pre>
      *
-     * <code>uint32 client_time = 6;</code>
-     * @return The clientTime.
+     * <code>double total_tick_time = 9;</code>
+     * @return The totalTickTime.
      */
-    int getClientTime();
+    double getTotalTickTime();
 
     /**
      * <pre>
-     * Offset 0x3C
+     * Offset: 0x40
      * </pre>
      *
-     * <code>float ue_time = 12;</code>
-     * @return The ueTime.
+     * <code>uint32 seq = 5;</code>
+     * @return The seq.
      */
-    float getUeTime();
+    int getSeq();
 
     /**
      * <pre>
-     * Offset 0x40
+     * Offset: 0x44
      * </pre>
      *
-     * <code>uint32 seq = 9;</code>
-     * @return The seq.
+     * <code>uint32 client_time = 7;</code>
+     * @return The clientTime.
      */
-    int getSeq();
+    int getClientTime();
 
     /**
      * <pre>
-     * Offset 0x48
+     * Offset: 0x4C
      * </pre>
      *
-     * <code>double total_tick_time = 8;</code>
-     * @return The totalTickTime.
+     * <code>float ue_time = 10;</code>
+     * @return The ueTime.
      */
-    double getTotalTickTime();
+    float getUeTime();
   }
   /**
    * <pre>
-   * CmdId: 6255
+   * CmdId: 8341
    * </pre>
    *
    * Protobuf type {@code PingReq}
@@ -118,29 +118,29 @@ private PingReq(
             case 0:
               done = true;
               break;
-            case 34: {
+            case 40: {
 
-              scData_ = input.readBytes();
+              seq_ = input.readUInt32();
               break;
             }
-            case 48: {
+            case 56: {
 
               clientTime_ = input.readUInt32();
               break;
             }
-            case 65: {
+            case 73: {
 
               totalTickTime_ = input.readDouble();
               break;
             }
-            case 72: {
+            case 85: {
 
-              seq_ = input.readUInt32();
+              ueTime_ = input.readFloat();
               break;
             }
-            case 101: {
+            case 114: {
 
-              ueTime_ = input.readFloat();
+              scData_ = input.readBytes();
               break;
             }
             default: {
@@ -175,14 +175,14 @@ private PingReq(
               emu.grasscutter.net.proto.PingReqOuterClass.PingReq.class, emu.grasscutter.net.proto.PingReqOuterClass.PingReq.Builder.class);
     }
 
-    public static final int SC_DATA_FIELD_NUMBER = 4;
+    public static final int SC_DATA_FIELD_NUMBER = 14;
     private com.google.protobuf.ByteString scData_;
     /**
      * <pre>
-     * Offset 0x20
+     * Offset: 0x28
      * </pre>
      *
-     * <code>bytes sc_data = 4;</code>
+     * <code>bytes sc_data = 14;</code>
      * @return The scData.
      */
     @java.lang.Override
@@ -190,64 +190,64 @@ public com.google.protobuf.ByteString getScData() {
       return scData_;
     }
 
-    public static final int CLIENT_TIME_FIELD_NUMBER = 6;
-    private int clientTime_;
+    public static final int TOTAL_TICK_TIME_FIELD_NUMBER = 9;
+    private double totalTickTime_;
     /**
      * <pre>
-     * Offset 0x38
+     * Offset: 0x38
      * </pre>
      *
-     * <code>uint32 client_time = 6;</code>
-     * @return The clientTime.
+     * <code>double total_tick_time = 9;</code>
+     * @return The totalTickTime.
      */
     @java.lang.Override
-    public int getClientTime() {
-      return clientTime_;
+    public double getTotalTickTime() {
+      return totalTickTime_;
     }
 
-    public static final int UE_TIME_FIELD_NUMBER = 12;
-    private float ueTime_;
+    public static final int SEQ_FIELD_NUMBER = 5;
+    private int seq_;
     /**
      * <pre>
-     * Offset 0x3C
+     * Offset: 0x40
      * </pre>
      *
-     * <code>float ue_time = 12;</code>
-     * @return The ueTime.
+     * <code>uint32 seq = 5;</code>
+     * @return The seq.
      */
     @java.lang.Override
-    public float getUeTime() {
-      return ueTime_;
+    public int getSeq() {
+      return seq_;
     }
 
-    public static final int SEQ_FIELD_NUMBER = 9;
-    private int seq_;
+    public static final int CLIENT_TIME_FIELD_NUMBER = 7;
+    private int clientTime_;
     /**
      * <pre>
-     * Offset 0x40
+     * Offset: 0x44
      * </pre>
      *
-     * <code>uint32 seq = 9;</code>
-     * @return The seq.
+     * <code>uint32 client_time = 7;</code>
+     * @return The clientTime.
      */
     @java.lang.Override
-    public int getSeq() {
-      return seq_;
+    public int getClientTime() {
+      return clientTime_;
     }
 
-    public static final int TOTAL_TICK_TIME_FIELD_NUMBER = 8;
-    private double totalTickTime_;
+    public static final int UE_TIME_FIELD_NUMBER = 10;
+    private float ueTime_;
     /**
      * <pre>
-     * Offset 0x48
+     * Offset: 0x4C
      * </pre>
      *
-     * <code>double total_tick_time = 8;</code>
-     * @return The totalTickTime.
+     * <code>float ue_time = 10;</code>
+     * @return The ueTime.
      */
     @java.lang.Override
-    public double getTotalTickTime() {
-      return totalTickTime_;
+    public float getUeTime() {
+      return ueTime_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -264,20 +264,20 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (!scData_.isEmpty()) {
-        output.writeBytes(4, scData_);
+      if (seq_ != 0) {
+        output.writeUInt32(5, seq_);
       }
       if (clientTime_ != 0) {
-        output.writeUInt32(6, clientTime_);
+        output.writeUInt32(7, clientTime_);
       }
       if (totalTickTime_ != 0D) {
-        output.writeDouble(8, totalTickTime_);
-      }
-      if (seq_ != 0) {
-        output.writeUInt32(9, seq_);
+        output.writeDouble(9, totalTickTime_);
       }
       if (ueTime_ != 0F) {
-        output.writeFloat(12, ueTime_);
+        output.writeFloat(10, ueTime_);
+      }
+      if (!scData_.isEmpty()) {
+        output.writeBytes(14, scData_);
       }
       unknownFields.writeTo(output);
     }
@@ -288,25 +288,25 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (!scData_.isEmpty()) {
+      if (seq_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(4, scData_);
+          .computeUInt32Size(5, seq_);
       }
       if (clientTime_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, clientTime_);
+          .computeUInt32Size(7, clientTime_);
       }
       if (totalTickTime_ != 0D) {
         size += com.google.protobuf.CodedOutputStream
-          .computeDoubleSize(8, totalTickTime_);
+          .computeDoubleSize(9, totalTickTime_);
       }
-      if (seq_ != 0) {
+      if (ueTime_ != 0F) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, seq_);
+          .computeFloatSize(10, ueTime_);
       }
-      if (ueTime_ != 0F) {
+      if (!scData_.isEmpty()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(12, ueTime_);
+          .computeBytesSize(14, scData_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -325,16 +325,16 @@ public boolean equals(final java.lang.Object obj) {
 
       if (!getScData()
           .equals(other.getScData())) return false;
+      if (java.lang.Double.doubleToLongBits(getTotalTickTime())
+          != java.lang.Double.doubleToLongBits(
+              other.getTotalTickTime())) return false;
+      if (getSeq()
+          != other.getSeq()) return false;
       if (getClientTime()
           != other.getClientTime()) return false;
       if (java.lang.Float.floatToIntBits(getUeTime())
           != java.lang.Float.floatToIntBits(
               other.getUeTime())) return false;
-      if (getSeq()
-          != other.getSeq()) return false;
-      if (java.lang.Double.doubleToLongBits(getTotalTickTime())
-          != java.lang.Double.doubleToLongBits(
-              other.getTotalTickTime())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -348,16 +348,16 @@ public int hashCode() {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + SC_DATA_FIELD_NUMBER;
       hash = (53 * hash) + getScData().hashCode();
+      hash = (37 * hash) + TOTAL_TICK_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          java.lang.Double.doubleToLongBits(getTotalTickTime()));
+      hash = (37 * hash) + SEQ_FIELD_NUMBER;
+      hash = (53 * hash) + getSeq();
       hash = (37 * hash) + CLIENT_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getClientTime();
       hash = (37 * hash) + UE_TIME_FIELD_NUMBER;
       hash = (53 * hash) + java.lang.Float.floatToIntBits(
           getUeTime());
-      hash = (37 * hash) + SEQ_FIELD_NUMBER;
-      hash = (53 * hash) + getSeq();
-      hash = (37 * hash) + TOTAL_TICK_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          java.lang.Double.doubleToLongBits(getTotalTickTime()));
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -455,7 +455,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 6255
+     * CmdId: 8341
      * </pre>
      *
      * Protobuf type {@code PingReq}
@@ -497,13 +497,13 @@ public Builder clear() {
         super.clear();
         scData_ = com.google.protobuf.ByteString.EMPTY;
 
-        clientTime_ = 0;
-
-        ueTime_ = 0F;
+        totalTickTime_ = 0D;
 
         seq_ = 0;
 
-        totalTickTime_ = 0D;
+        clientTime_ = 0;
+
+        ueTime_ = 0F;
 
         return this;
       }
@@ -532,10 +532,10 @@ public emu.grasscutter.net.proto.PingReqOuterClass.PingReq build() {
       public emu.grasscutter.net.proto.PingReqOuterClass.PingReq buildPartial() {
         emu.grasscutter.net.proto.PingReqOuterClass.PingReq result = new emu.grasscutter.net.proto.PingReqOuterClass.PingReq(this);
         result.scData_ = scData_;
+        result.totalTickTime_ = totalTickTime_;
+        result.seq_ = seq_;
         result.clientTime_ = clientTime_;
         result.ueTime_ = ueTime_;
-        result.seq_ = seq_;
-        result.totalTickTime_ = totalTickTime_;
         onBuilt();
         return result;
       }
@@ -587,18 +587,18 @@ public Builder mergeFrom(emu.grasscutter.net.proto.PingReqOuterClass.PingReq oth
         if (other.getScData() != com.google.protobuf.ByteString.EMPTY) {
           setScData(other.getScData());
         }
+        if (other.getTotalTickTime() != 0D) {
+          setTotalTickTime(other.getTotalTickTime());
+        }
+        if (other.getSeq() != 0) {
+          setSeq(other.getSeq());
+        }
         if (other.getClientTime() != 0) {
           setClientTime(other.getClientTime());
         }
         if (other.getUeTime() != 0F) {
           setUeTime(other.getUeTime());
         }
-        if (other.getSeq() != 0) {
-          setSeq(other.getSeq());
-        }
-        if (other.getTotalTickTime() != 0D) {
-          setTotalTickTime(other.getTotalTickTime());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -631,10 +631,10 @@ public Builder mergeFrom(
       private com.google.protobuf.ByteString scData_ = com.google.protobuf.ByteString.EMPTY;
       /**
        * <pre>
-       * Offset 0x20
+       * Offset: 0x28
        * </pre>
        *
-       * <code>bytes sc_data = 4;</code>
+       * <code>bytes sc_data = 14;</code>
        * @return The scData.
        */
       @java.lang.Override
@@ -643,10 +643,10 @@ public com.google.protobuf.ByteString getScData() {
       }
       /**
        * <pre>
-       * Offset 0x20
+       * Offset: 0x28
        * </pre>
        *
-       * <code>bytes sc_data = 4;</code>
+       * <code>bytes sc_data = 14;</code>
        * @param value The scData to set.
        * @return This builder for chaining.
        */
@@ -661,10 +661,10 @@ public Builder setScData(com.google.protobuf.ByteString value) {
       }
       /**
        * <pre>
-       * Offset 0x20
+       * Offset: 0x28
        * </pre>
        *
-       * <code>bytes sc_data = 4;</code>
+       * <code>bytes sc_data = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearScData() {
@@ -674,174 +674,174 @@ public Builder clearScData() {
         return this;
       }
 
-      private int clientTime_ ;
+      private double totalTickTime_ ;
       /**
        * <pre>
-       * Offset 0x38
+       * Offset: 0x38
        * </pre>
        *
-       * <code>uint32 client_time = 6;</code>
-       * @return The clientTime.
+       * <code>double total_tick_time = 9;</code>
+       * @return The totalTickTime.
        */
       @java.lang.Override
-      public int getClientTime() {
-        return clientTime_;
+      public double getTotalTickTime() {
+        return totalTickTime_;
       }
       /**
        * <pre>
-       * Offset 0x38
+       * Offset: 0x38
        * </pre>
        *
-       * <code>uint32 client_time = 6;</code>
-       * @param value The clientTime to set.
+       * <code>double total_tick_time = 9;</code>
+       * @param value The totalTickTime to set.
        * @return This builder for chaining.
        */
-      public Builder setClientTime(int value) {
+      public Builder setTotalTickTime(double value) {
         
-        clientTime_ = value;
+        totalTickTime_ = value;
         onChanged();
         return this;
       }
       /**
        * <pre>
-       * Offset 0x38
+       * Offset: 0x38
        * </pre>
        *
-       * <code>uint32 client_time = 6;</code>
+       * <code>double total_tick_time = 9;</code>
        * @return This builder for chaining.
        */
-      public Builder clearClientTime() {
+      public Builder clearTotalTickTime() {
         
-        clientTime_ = 0;
+        totalTickTime_ = 0D;
         onChanged();
         return this;
       }
 
-      private float ueTime_ ;
+      private int seq_ ;
       /**
        * <pre>
-       * Offset 0x3C
+       * Offset: 0x40
        * </pre>
        *
-       * <code>float ue_time = 12;</code>
-       * @return The ueTime.
+       * <code>uint32 seq = 5;</code>
+       * @return The seq.
        */
       @java.lang.Override
-      public float getUeTime() {
-        return ueTime_;
+      public int getSeq() {
+        return seq_;
       }
       /**
        * <pre>
-       * Offset 0x3C
+       * Offset: 0x40
        * </pre>
        *
-       * <code>float ue_time = 12;</code>
-       * @param value The ueTime to set.
+       * <code>uint32 seq = 5;</code>
+       * @param value The seq to set.
        * @return This builder for chaining.
        */
-      public Builder setUeTime(float value) {
+      public Builder setSeq(int value) {
         
-        ueTime_ = value;
+        seq_ = value;
         onChanged();
         return this;
       }
       /**
        * <pre>
-       * Offset 0x3C
+       * Offset: 0x40
        * </pre>
        *
-       * <code>float ue_time = 12;</code>
+       * <code>uint32 seq = 5;</code>
        * @return This builder for chaining.
        */
-      public Builder clearUeTime() {
+      public Builder clearSeq() {
         
-        ueTime_ = 0F;
+        seq_ = 0;
         onChanged();
         return this;
       }
 
-      private int seq_ ;
+      private int clientTime_ ;
       /**
        * <pre>
-       * Offset 0x40
+       * Offset: 0x44
        * </pre>
        *
-       * <code>uint32 seq = 9;</code>
-       * @return The seq.
+       * <code>uint32 client_time = 7;</code>
+       * @return The clientTime.
        */
       @java.lang.Override
-      public int getSeq() {
-        return seq_;
+      public int getClientTime() {
+        return clientTime_;
       }
       /**
        * <pre>
-       * Offset 0x40
+       * Offset: 0x44
        * </pre>
        *
-       * <code>uint32 seq = 9;</code>
-       * @param value The seq to set.
+       * <code>uint32 client_time = 7;</code>
+       * @param value The clientTime to set.
        * @return This builder for chaining.
        */
-      public Builder setSeq(int value) {
+      public Builder setClientTime(int value) {
         
-        seq_ = value;
+        clientTime_ = value;
         onChanged();
         return this;
       }
       /**
        * <pre>
-       * Offset 0x40
+       * Offset: 0x44
        * </pre>
        *
-       * <code>uint32 seq = 9;</code>
+       * <code>uint32 client_time = 7;</code>
        * @return This builder for chaining.
        */
-      public Builder clearSeq() {
+      public Builder clearClientTime() {
         
-        seq_ = 0;
+        clientTime_ = 0;
         onChanged();
         return this;
       }
 
-      private double totalTickTime_ ;
+      private float ueTime_ ;
       /**
        * <pre>
-       * Offset 0x48
+       * Offset: 0x4C
        * </pre>
        *
-       * <code>double total_tick_time = 8;</code>
-       * @return The totalTickTime.
+       * <code>float ue_time = 10;</code>
+       * @return The ueTime.
        */
       @java.lang.Override
-      public double getTotalTickTime() {
-        return totalTickTime_;
+      public float getUeTime() {
+        return ueTime_;
       }
       /**
        * <pre>
-       * Offset 0x48
+       * Offset: 0x4C
        * </pre>
        *
-       * <code>double total_tick_time = 8;</code>
-       * @param value The totalTickTime to set.
+       * <code>float ue_time = 10;</code>
+       * @param value The ueTime to set.
        * @return This builder for chaining.
        */
-      public Builder setTotalTickTime(double value) {
+      public Builder setUeTime(float value) {
         
-        totalTickTime_ = value;
+        ueTime_ = value;
         onChanged();
         return this;
       }
       /**
        * <pre>
-       * Offset 0x48
+       * Offset: 0x4C
        * </pre>
        *
-       * <code>double total_tick_time = 8;</code>
+       * <code>float ue_time = 10;</code>
        * @return This builder for chaining.
        */
-      public Builder clearTotalTickTime() {
+      public Builder clearUeTime() {
         
-        totalTickTime_ = 0D;
+        ueTime_ = 0F;
         onChanged();
         return this;
       }
@@ -912,9 +912,9 @@ public emu.grasscutter.net.proto.PingReqOuterClass.PingReq getDefaultInstanceFor
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\rPingReq.proto\"f\n\007PingReq\022\017\n\007sc_data\030\004 " +
-      "\001(\014\022\023\n\013client_time\030\006 \001(\r\022\017\n\007ue_time\030\014 \001(" +
-      "\002\022\013\n\003seq\030\t \001(\r\022\027\n\017total_tick_time\030\010 \001(\001B" +
+      "\n\rPingReq.proto\"f\n\007PingReq\022\017\n\007sc_data\030\016 " +
+      "\001(\014\022\027\n\017total_tick_time\030\t \001(\001\022\013\n\003seq\030\005 \001(" +
+      "\r\022\023\n\013client_time\030\007 \001(\r\022\017\n\007ue_time\030\n \001(\002B" +
       "\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -926,7 +926,7 @@ public emu.grasscutter.net.proto.PingReqOuterClass.PingReq getDefaultInstanceFor
     internal_static_PingReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PingReq_descriptor,
-        new java.lang.String[] { "ScData", "ClientTime", "UeTime", "Seq", "TotalTickTime", });
+        new java.lang.String[] { "ScData", "TotalTickTime", "Seq", "ClientTime", "UeTime", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PingRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PingRspOuterClass.java
index 3408d808489..3bf4cd8917e 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PingRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PingRspOuterClass.java
@@ -23,34 +23,34 @@ public interface PingRspOrBuilder extends
      * Offset: 0x20
      * </pre>
      *
-     * <code>uint32 seq = 3;</code>
-     * @return The seq.
+     * <code>int32 retcode = 10;</code>
+     * @return The retcode.
      */
-    int getSeq();
+    int getRetcode();
 
     /**
      * <pre>
      * Offset: 0x24
      * </pre>
      *
-     * <code>uint32 client_time = 15;</code>
-     * @return The clientTime.
+     * <code>uint32 seq = 15;</code>
+     * @return The seq.
      */
-    int getClientTime();
+    int getSeq();
 
     /**
      * <pre>
      * Offset: 0x28
      * </pre>
      *
-     * <code>int32 retcode = 4;</code>
-     * @return The retcode.
+     * <code>uint32 client_time = 3;</code>
+     * @return The clientTime.
      */
-    int getRetcode();
+    int getClientTime();
   }
   /**
    * <pre>
-   * CmdId: 21110
+   * CmdId: 25458
    * </pre>
    *
    * Protobuf type {@code PingRsp}
@@ -99,17 +99,17 @@ private PingRsp(
               break;
             case 24: {
 
-              seq_ = input.readUInt32();
+              clientTime_ = input.readUInt32();
               break;
             }
-            case 32: {
+            case 80: {
 
               retcode_ = input.readInt32();
               break;
             }
             case 120: {
 
-              clientTime_ = input.readUInt32();
+              seq_ = input.readUInt32();
               break;
             }
             default: {
@@ -144,49 +144,49 @@ private PingRsp(
               emu.grasscutter.net.proto.PingRspOuterClass.PingRsp.class, emu.grasscutter.net.proto.PingRspOuterClass.PingRsp.Builder.class);
     }
 
-    public static final int SEQ_FIELD_NUMBER = 3;
-    private int seq_;
+    public static final int RETCODE_FIELD_NUMBER = 10;
+    private int retcode_;
     /**
      * <pre>
      * Offset: 0x20
      * </pre>
      *
-     * <code>uint32 seq = 3;</code>
-     * @return The seq.
+     * <code>int32 retcode = 10;</code>
+     * @return The retcode.
      */
     @java.lang.Override
-    public int getSeq() {
-      return seq_;
+    public int getRetcode() {
+      return retcode_;
     }
 
-    public static final int CLIENT_TIME_FIELD_NUMBER = 15;
-    private int clientTime_;
+    public static final int SEQ_FIELD_NUMBER = 15;
+    private int seq_;
     /**
      * <pre>
      * Offset: 0x24
      * </pre>
      *
-     * <code>uint32 client_time = 15;</code>
-     * @return The clientTime.
+     * <code>uint32 seq = 15;</code>
+     * @return The seq.
      */
     @java.lang.Override
-    public int getClientTime() {
-      return clientTime_;
+    public int getSeq() {
+      return seq_;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 4;
-    private int retcode_;
+    public static final int CLIENT_TIME_FIELD_NUMBER = 3;
+    private int clientTime_;
     /**
      * <pre>
      * Offset: 0x28
      * </pre>
      *
-     * <code>int32 retcode = 4;</code>
-     * @return The retcode.
+     * <code>uint32 client_time = 3;</code>
+     * @return The clientTime.
      */
     @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
+    public int getClientTime() {
+      return clientTime_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -203,14 +203,14 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (seq_ != 0) {
-        output.writeUInt32(3, seq_);
+      if (clientTime_ != 0) {
+        output.writeUInt32(3, clientTime_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(4, retcode_);
+        output.writeInt32(10, retcode_);
       }
-      if (clientTime_ != 0) {
-        output.writeUInt32(15, clientTime_);
+      if (seq_ != 0) {
+        output.writeUInt32(15, seq_);
       }
       unknownFields.writeTo(output);
     }
@@ -221,17 +221,17 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (seq_ != 0) {
+      if (clientTime_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, seq_);
+          .computeUInt32Size(3, clientTime_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(4, retcode_);
+          .computeInt32Size(10, retcode_);
       }
-      if (clientTime_ != 0) {
+      if (seq_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, clientTime_);
+          .computeUInt32Size(15, seq_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -248,12 +248,12 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.PingRspOuterClass.PingRsp other = (emu.grasscutter.net.proto.PingRspOuterClass.PingRsp) obj;
 
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (getSeq()
           != other.getSeq()) return false;
       if (getClientTime()
           != other.getClientTime()) return false;
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -265,12 +265,12 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + SEQ_FIELD_NUMBER;
       hash = (53 * hash) + getSeq();
       hash = (37 * hash) + CLIENT_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getClientTime();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -368,7 +368,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 21110
+     * CmdId: 25458
      * </pre>
      *
      * Protobuf type {@code PingRsp}
@@ -408,12 +408,12 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        retcode_ = 0;
+
         seq_ = 0;
 
         clientTime_ = 0;
 
-        retcode_ = 0;
-
         return this;
       }
 
@@ -440,9 +440,9 @@ public emu.grasscutter.net.proto.PingRspOuterClass.PingRsp build() {
       @java.lang.Override
       public emu.grasscutter.net.proto.PingRspOuterClass.PingRsp buildPartial() {
         emu.grasscutter.net.proto.PingRspOuterClass.PingRsp result = new emu.grasscutter.net.proto.PingRspOuterClass.PingRsp(this);
+        result.retcode_ = retcode_;
         result.seq_ = seq_;
         result.clientTime_ = clientTime_;
-        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -491,15 +491,15 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PingRspOuterClass.PingRsp other) {
         if (other == emu.grasscutter.net.proto.PingRspOuterClass.PingRsp.getDefaultInstance()) return this;
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         if (other.getSeq() != 0) {
           setSeq(other.getSeq());
         }
         if (other.getClientTime() != 0) {
           setClientTime(other.getClientTime());
         }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -529,31 +529,31 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int seq_ ;
+      private int retcode_ ;
       /**
        * <pre>
        * Offset: 0x20
        * </pre>
        *
-       * <code>uint32 seq = 3;</code>
-       * @return The seq.
+       * <code>int32 retcode = 10;</code>
+       * @return The retcode.
        */
       @java.lang.Override
-      public int getSeq() {
-        return seq_;
+      public int getRetcode() {
+        return retcode_;
       }
       /**
        * <pre>
        * Offset: 0x20
        * </pre>
        *
-       * <code>uint32 seq = 3;</code>
-       * @param value The seq to set.
+       * <code>int32 retcode = 10;</code>
+       * @param value The retcode to set.
        * @return This builder for chaining.
        */
-      public Builder setSeq(int value) {
+      public Builder setRetcode(int value) {
         
-        seq_ = value;
+        retcode_ = value;
         onChanged();
         return this;
       }
@@ -562,41 +562,41 @@ public Builder setSeq(int value) {
        * Offset: 0x20
        * </pre>
        *
-       * <code>uint32 seq = 3;</code>
+       * <code>int32 retcode = 10;</code>
        * @return This builder for chaining.
        */
-      public Builder clearSeq() {
+      public Builder clearRetcode() {
         
-        seq_ = 0;
+        retcode_ = 0;
         onChanged();
         return this;
       }
 
-      private int clientTime_ ;
+      private int seq_ ;
       /**
        * <pre>
        * Offset: 0x24
        * </pre>
        *
-       * <code>uint32 client_time = 15;</code>
-       * @return The clientTime.
+       * <code>uint32 seq = 15;</code>
+       * @return The seq.
        */
       @java.lang.Override
-      public int getClientTime() {
-        return clientTime_;
+      public int getSeq() {
+        return seq_;
       }
       /**
        * <pre>
        * Offset: 0x24
        * </pre>
        *
-       * <code>uint32 client_time = 15;</code>
-       * @param value The clientTime to set.
+       * <code>uint32 seq = 15;</code>
+       * @param value The seq to set.
        * @return This builder for chaining.
        */
-      public Builder setClientTime(int value) {
+      public Builder setSeq(int value) {
         
-        clientTime_ = value;
+        seq_ = value;
         onChanged();
         return this;
       }
@@ -605,41 +605,41 @@ public Builder setClientTime(int value) {
        * Offset: 0x24
        * </pre>
        *
-       * <code>uint32 client_time = 15;</code>
+       * <code>uint32 seq = 15;</code>
        * @return This builder for chaining.
        */
-      public Builder clearClientTime() {
+      public Builder clearSeq() {
         
-        clientTime_ = 0;
+        seq_ = 0;
         onChanged();
         return this;
       }
 
-      private int retcode_ ;
+      private int clientTime_ ;
       /**
        * <pre>
        * Offset: 0x28
        * </pre>
        *
-       * <code>int32 retcode = 4;</code>
-       * @return The retcode.
+       * <code>uint32 client_time = 3;</code>
+       * @return The clientTime.
        */
       @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
+      public int getClientTime() {
+        return clientTime_;
       }
       /**
        * <pre>
        * Offset: 0x28
        * </pre>
        *
-       * <code>int32 retcode = 4;</code>
-       * @param value The retcode to set.
+       * <code>uint32 client_time = 3;</code>
+       * @param value The clientTime to set.
        * @return This builder for chaining.
        */
-      public Builder setRetcode(int value) {
+      public Builder setClientTime(int value) {
         
-        retcode_ = value;
+        clientTime_ = value;
         onChanged();
         return this;
       }
@@ -648,12 +648,12 @@ public Builder setRetcode(int value) {
        * Offset: 0x28
        * </pre>
        *
-       * <code>int32 retcode = 4;</code>
+       * <code>uint32 client_time = 3;</code>
        * @return This builder for chaining.
        */
-      public Builder clearRetcode() {
+      public Builder clearClientTime() {
         
-        retcode_ = 0;
+        clientTime_ = 0;
         onChanged();
         return this;
       }
@@ -724,8 +724,8 @@ public emu.grasscutter.net.proto.PingRspOuterClass.PingRsp getDefaultInstanceFor
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\rPingRsp.proto\"<\n\007PingRsp\022\013\n\003seq\030\003 \001(\r\022" +
-      "\023\n\013client_time\030\017 \001(\r\022\017\n\007retcode\030\004 \001(\005B\033\n" +
+      "\n\rPingRsp.proto\"<\n\007PingRsp\022\017\n\007retcode\030\n " +
+      "\001(\005\022\013\n\003seq\030\017 \001(\r\022\023\n\013client_time\030\003 \001(\rB\033\n" +
       "\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -737,7 +737,7 @@ public emu.grasscutter.net.proto.PingRspOuterClass.PingRsp getDefaultInstanceFor
     internal_static_PingRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PingRsp_descriptor,
-        new java.lang.String[] { "Seq", "ClientTime", "Retcode", });
+        new java.lang.String[] { "Retcode", "Seq", "ClientTime", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerDataNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerDataNotifyOuterClass.java
index 6999c0ff577..ce18cd48f5a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerDataNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerDataNotifyOuterClass.java
@@ -19,35 +19,19 @@ public interface PlayerDataNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>string nick_name = 1;</code>
-     * @return The nickName.
-     */
-    java.lang.String getNickName();
-    /**
-     * <code>string nick_name = 1;</code>
-     * @return The bytes for nickName.
-     */
-    com.google.protobuf.ByteString
-        getNickNameBytes();
-
-    /**
-     * <code>bool is_first_login_today = 2;</code>
-     * @return The isFirstLoginToday.
-     */
-    boolean getIsFirstLoginToday();
-
-    /**
-     * <code>uint32 region_id = 5;</code>
-     * @return The regionId.
-     */
-    int getRegionId();
-
-    /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
      */
     int getPropMapCount();
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
      */
     boolean containsPropMap(
         int key);
@@ -58,33 +42,89 @@ boolean containsPropMap(
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.PropValueOuterClass.PropValue>
     getPropMap();
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
      */
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.PropValueOuterClass.PropValue>
     getPropMapMap();
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
      */
 
     emu.grasscutter.net.proto.PropValueOuterClass.PropValue getPropMapOrDefault(
         int key,
         emu.grasscutter.net.proto.PropValueOuterClass.PropValue defaultValue);
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
      */
 
     emu.grasscutter.net.proto.PropValueOuterClass.PropValue getPropMapOrThrow(
         int key);
 
     /**
-     * <code>uint64 server_time = 11;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>string nick_name = 11;</code>
+     * @return The nickName.
+     */
+    java.lang.String getNickName();
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>string nick_name = 11;</code>
+     * @return The bytes for nickName.
+     */
+    com.google.protobuf.ByteString
+        getNickNameBytes();
+
+    /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>uint64 server_time = 5;</code>
      * @return The serverTime.
      */
     long getServerTime();
+
+    /**
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>uint32 region_id = 10;</code>
+     * @return The regionId.
+     */
+    int getRegionId();
+
+    /**
+     * <pre>
+     * Offset: 0x3C
+     * </pre>
+     *
+     * <code>bool is_first_login_today = 3;</code>
+     * @return The isFirstLoginToday.
+     */
+    boolean getIsFirstLoginToday();
   }
   /**
    * <pre>
-   * CmdId: 7961
+   * CmdId: 28579
    * </pre>
    *
    * Protobuf type {@code PlayerDataNotify}
@@ -133,23 +173,28 @@ private PlayerDataNotify(
             case 0:
               done = true;
               break;
-            case 10: {
-              java.lang.String s = input.readStringRequireUtf8();
+            case 24: {
 
-              nickName_ = s;
+              isFirstLoginToday_ = input.readBool();
               break;
             }
-            case 16: {
+            case 40: {
 
-              isFirstLoginToday_ = input.readBool();
+              serverTime_ = input.readUInt64();
               break;
             }
-            case 40: {
+            case 80: {
 
               regionId_ = input.readUInt32();
               break;
             }
-            case 66: {
+            case 90: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              nickName_ = s;
+              break;
+            }
+            case 98: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 propMap_ = com.google.protobuf.MapField.newMapField(
                     PropMapDefaultEntryHolder.defaultEntry);
@@ -162,11 +207,6 @@ private PlayerDataNotify(
                   propMap__.getKey(), propMap__.getValue());
               break;
             }
-            case 88: {
-
-              serverTime_ = input.readUInt64();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -196,7 +236,7 @@ private PlayerDataNotify(
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 8:
+        case 12:
           return internalGetPropMap();
         default:
           throw new RuntimeException(
@@ -211,67 +251,7 @@ protected com.google.protobuf.MapField internalGetMapField(
               emu.grasscutter.net.proto.PlayerDataNotifyOuterClass.PlayerDataNotify.class, emu.grasscutter.net.proto.PlayerDataNotifyOuterClass.PlayerDataNotify.Builder.class);
     }
 
-    public static final int NICK_NAME_FIELD_NUMBER = 1;
-    private volatile java.lang.Object nickName_;
-    /**
-     * <code>string nick_name = 1;</code>
-     * @return The nickName.
-     */
-    @java.lang.Override
-    public java.lang.String getNickName() {
-      java.lang.Object ref = nickName_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        nickName_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string nick_name = 1;</code>
-     * @return The bytes for nickName.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getNickNameBytes() {
-      java.lang.Object ref = nickName_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        nickName_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    public static final int IS_FIRST_LOGIN_TODAY_FIELD_NUMBER = 2;
-    private boolean isFirstLoginToday_;
-    /**
-     * <code>bool is_first_login_today = 2;</code>
-     * @return The isFirstLoginToday.
-     */
-    @java.lang.Override
-    public boolean getIsFirstLoginToday() {
-      return isFirstLoginToday_;
-    }
-
-    public static final int REGION_ID_FIELD_NUMBER = 5;
-    private int regionId_;
-    /**
-     * <code>uint32 region_id = 5;</code>
-     * @return The regionId.
-     */
-    @java.lang.Override
-    public int getRegionId() {
-      return regionId_;
-    }
-
-    public static final int PROP_MAP_FIELD_NUMBER = 8;
+    public static final int PROP_MAP_FIELD_NUMBER = 12;
     private static final class PropMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, emu.grasscutter.net.proto.PropValueOuterClass.PropValue> defaultEntry =
@@ -298,7 +278,11 @@ public int getPropMapCount() {
       return internalGetPropMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
      */
 
     @java.lang.Override
@@ -316,7 +300,11 @@ public java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.PropValueOuter
       return getPropMapMap();
     }
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
      */
     @java.lang.Override
 
@@ -324,7 +312,11 @@ public java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.PropValueOuter
       return internalGetPropMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
      */
     @java.lang.Override
 
@@ -337,7 +329,11 @@ public emu.grasscutter.net.proto.PropValueOuterClass.PropValue getPropMapOrDefau
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
      */
     @java.lang.Override
 
@@ -352,10 +348,60 @@ public emu.grasscutter.net.proto.PropValueOuterClass.PropValue getPropMapOrThrow
       return map.get(key);
     }
 
-    public static final int SERVER_TIME_FIELD_NUMBER = 11;
+    public static final int NICK_NAME_FIELD_NUMBER = 11;
+    private volatile java.lang.Object nickName_;
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>string nick_name = 11;</code>
+     * @return The nickName.
+     */
+    @java.lang.Override
+    public java.lang.String getNickName() {
+      java.lang.Object ref = nickName_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        nickName_ = s;
+        return s;
+      }
+    }
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>string nick_name = 11;</code>
+     * @return The bytes for nickName.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getNickNameBytes() {
+      java.lang.Object ref = nickName_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        nickName_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int SERVER_TIME_FIELD_NUMBER = 5;
     private long serverTime_;
     /**
-     * <code>uint64 server_time = 11;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>uint64 server_time = 5;</code>
      * @return The serverTime.
      */
     @java.lang.Override
@@ -363,6 +409,36 @@ public long getServerTime() {
       return serverTime_;
     }
 
+    public static final int REGION_ID_FIELD_NUMBER = 10;
+    private int regionId_;
+    /**
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>uint32 region_id = 10;</code>
+     * @return The regionId.
+     */
+    @java.lang.Override
+    public int getRegionId() {
+      return regionId_;
+    }
+
+    public static final int IS_FIRST_LOGIN_TODAY_FIELD_NUMBER = 3;
+    private boolean isFirstLoginToday_;
+    /**
+     * <pre>
+     * Offset: 0x3C
+     * </pre>
+     *
+     * <code>bool is_first_login_today = 3;</code>
+     * @return The isFirstLoginToday.
+     */
+    @java.lang.Override
+    public boolean getIsFirstLoginToday() {
+      return isFirstLoginToday_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -377,24 +453,24 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nickName_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1, nickName_);
-      }
       if (isFirstLoginToday_ != false) {
-        output.writeBool(2, isFirstLoginToday_);
+        output.writeBool(3, isFirstLoginToday_);
+      }
+      if (serverTime_ != 0L) {
+        output.writeUInt64(5, serverTime_);
       }
       if (regionId_ != 0) {
-        output.writeUInt32(5, regionId_);
+        output.writeUInt32(10, regionId_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nickName_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 11, nickName_);
       }
       com.google.protobuf.GeneratedMessageV3
         .serializeIntegerMapTo(
           output,
           internalGetPropMap(),
           PropMapDefaultEntryHolder.defaultEntry,
-          8);
-      if (serverTime_ != 0L) {
-        output.writeUInt64(11, serverTime_);
-      }
+          12);
       unknownFields.writeTo(output);
     }
 
@@ -404,16 +480,20 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nickName_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, nickName_);
-      }
       if (isFirstLoginToday_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(2, isFirstLoginToday_);
+          .computeBoolSize(3, isFirstLoginToday_);
+      }
+      if (serverTime_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(5, serverTime_);
       }
       if (regionId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, regionId_);
+          .computeUInt32Size(10, regionId_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nickName_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(11, nickName_);
       }
       for (java.util.Map.Entry<java.lang.Integer, emu.grasscutter.net.proto.PropValueOuterClass.PropValue> entry
            : internalGetPropMap().getMap().entrySet()) {
@@ -423,11 +503,7 @@ public int getSerializedSize() {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(8, propMap__);
-      }
-      if (serverTime_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(11, serverTime_);
+            .computeMessageSize(12, propMap__);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -444,16 +520,16 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.PlayerDataNotifyOuterClass.PlayerDataNotify other = (emu.grasscutter.net.proto.PlayerDataNotifyOuterClass.PlayerDataNotify) obj;
 
-      if (!getNickName()
-          .equals(other.getNickName())) return false;
-      if (getIsFirstLoginToday()
-          != other.getIsFirstLoginToday()) return false;
-      if (getRegionId()
-          != other.getRegionId()) return false;
       if (!internalGetPropMap().equals(
           other.internalGetPropMap())) return false;
+      if (!getNickName()
+          .equals(other.getNickName())) return false;
       if (getServerTime()
           != other.getServerTime()) return false;
+      if (getRegionId()
+          != other.getRegionId()) return false;
+      if (getIsFirstLoginToday()
+          != other.getIsFirstLoginToday()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -465,20 +541,20 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + NICK_NAME_FIELD_NUMBER;
-      hash = (53 * hash) + getNickName().hashCode();
-      hash = (37 * hash) + IS_FIRST_LOGIN_TODAY_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsFirstLoginToday());
-      hash = (37 * hash) + REGION_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getRegionId();
       if (!internalGetPropMap().getMap().isEmpty()) {
         hash = (37 * hash) + PROP_MAP_FIELD_NUMBER;
         hash = (53 * hash) + internalGetPropMap().hashCode();
       }
+      hash = (37 * hash) + NICK_NAME_FIELD_NUMBER;
+      hash = (53 * hash) + getNickName().hashCode();
       hash = (37 * hash) + SERVER_TIME_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getServerTime());
+      hash = (37 * hash) + REGION_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getRegionId();
+      hash = (37 * hash) + IS_FIRST_LOGIN_TODAY_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsFirstLoginToday());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -576,7 +652,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 7961
+     * CmdId: 28579
      * </pre>
      *
      * Protobuf type {@code PlayerDataNotify}
@@ -594,7 +670,7 @@ public static final class Builder extends
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 8:
+          case 12:
             return internalGetPropMap();
           default:
             throw new RuntimeException(
@@ -605,7 +681,7 @@ protected com.google.protobuf.MapField internalGetMapField(
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 8:
+          case 12:
             return internalGetMutablePropMap();
           default:
             throw new RuntimeException(
@@ -638,14 +714,14 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        internalGetMutablePropMap().clear();
         nickName_ = "";
 
-        isFirstLoginToday_ = false;
+        serverTime_ = 0L;
 
         regionId_ = 0;
 
-        internalGetMutablePropMap().clear();
-        serverTime_ = 0L;
+        isFirstLoginToday_ = false;
 
         return this;
       }
@@ -674,12 +750,12 @@ public emu.grasscutter.net.proto.PlayerDataNotifyOuterClass.PlayerDataNotify bui
       public emu.grasscutter.net.proto.PlayerDataNotifyOuterClass.PlayerDataNotify buildPartial() {
         emu.grasscutter.net.proto.PlayerDataNotifyOuterClass.PlayerDataNotify result = new emu.grasscutter.net.proto.PlayerDataNotifyOuterClass.PlayerDataNotify(this);
         int from_bitField0_ = bitField0_;
-        result.nickName_ = nickName_;
-        result.isFirstLoginToday_ = isFirstLoginToday_;
-        result.regionId_ = regionId_;
         result.propMap_ = internalGetPropMap();
         result.propMap_.makeImmutable();
+        result.nickName_ = nickName_;
         result.serverTime_ = serverTime_;
+        result.regionId_ = regionId_;
+        result.isFirstLoginToday_ = isFirstLoginToday_;
         onBuilt();
         return result;
       }
@@ -728,20 +804,20 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PlayerDataNotifyOuterClass.PlayerDataNotify other) {
         if (other == emu.grasscutter.net.proto.PlayerDataNotifyOuterClass.PlayerDataNotify.getDefaultInstance()) return this;
+        internalGetMutablePropMap().mergeFrom(
+            other.internalGetPropMap());
         if (!other.getNickName().isEmpty()) {
           nickName_ = other.nickName_;
           onChanged();
         }
-        if (other.getIsFirstLoginToday() != false) {
-          setIsFirstLoginToday(other.getIsFirstLoginToday());
+        if (other.getServerTime() != 0L) {
+          setServerTime(other.getServerTime());
         }
         if (other.getRegionId() != 0) {
           setRegionId(other.getRegionId());
         }
-        internalGetMutablePropMap().mergeFrom(
-            other.internalGetPropMap());
-        if (other.getServerTime() != 0L) {
-          setServerTime(other.getServerTime());
+        if (other.getIsFirstLoginToday() != false) {
+          setIsFirstLoginToday(other.getIsFirstLoginToday());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -773,144 +849,6 @@ public Builder mergeFrom(
       }
       private int bitField0_;
 
-      private java.lang.Object nickName_ = "";
-      /**
-       * <code>string nick_name = 1;</code>
-       * @return The nickName.
-       */
-      public java.lang.String getNickName() {
-        java.lang.Object ref = nickName_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          nickName_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string nick_name = 1;</code>
-       * @return The bytes for nickName.
-       */
-      public com.google.protobuf.ByteString
-          getNickNameBytes() {
-        java.lang.Object ref = nickName_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          nickName_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string nick_name = 1;</code>
-       * @param value The nickName to set.
-       * @return This builder for chaining.
-       */
-      public Builder setNickName(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        nickName_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string nick_name = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearNickName() {
-        
-        nickName_ = getDefaultInstance().getNickName();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string nick_name = 1;</code>
-       * @param value The bytes for nickName to set.
-       * @return This builder for chaining.
-       */
-      public Builder setNickNameBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        nickName_ = value;
-        onChanged();
-        return this;
-      }
-
-      private boolean isFirstLoginToday_ ;
-      /**
-       * <code>bool is_first_login_today = 2;</code>
-       * @return The isFirstLoginToday.
-       */
-      @java.lang.Override
-      public boolean getIsFirstLoginToday() {
-        return isFirstLoginToday_;
-      }
-      /**
-       * <code>bool is_first_login_today = 2;</code>
-       * @param value The isFirstLoginToday to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsFirstLoginToday(boolean value) {
-        
-        isFirstLoginToday_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_first_login_today = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsFirstLoginToday() {
-        
-        isFirstLoginToday_ = false;
-        onChanged();
-        return this;
-      }
-
-      private int regionId_ ;
-      /**
-       * <code>uint32 region_id = 5;</code>
-       * @return The regionId.
-       */
-      @java.lang.Override
-      public int getRegionId() {
-        return regionId_;
-      }
-      /**
-       * <code>uint32 region_id = 5;</code>
-       * @param value The regionId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setRegionId(int value) {
-        
-        regionId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 region_id = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRegionId() {
-        
-        regionId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private com.google.protobuf.MapField<
           java.lang.Integer, emu.grasscutter.net.proto.PropValueOuterClass.PropValue> propMap_;
       private com.google.protobuf.MapField<java.lang.Integer, emu.grasscutter.net.proto.PropValueOuterClass.PropValue>
@@ -938,7 +876,11 @@ public int getPropMapCount() {
         return internalGetPropMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; prop_map = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
        */
 
       @java.lang.Override
@@ -956,7 +898,11 @@ public java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.PropValueOuter
         return getPropMapMap();
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; prop_map = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
        */
       @java.lang.Override
 
@@ -964,7 +910,11 @@ public java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.PropValueOuter
         return internalGetPropMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; prop_map = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
        */
       @java.lang.Override
 
@@ -977,7 +927,11 @@ public emu.grasscutter.net.proto.PropValueOuterClass.PropValue getPropMapOrDefau
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; prop_map = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
        */
       @java.lang.Override
 
@@ -998,7 +952,11 @@ public Builder clearPropMap() {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; prop_map = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
        */
 
       public Builder removePropMap(
@@ -1017,7 +975,11 @@ public Builder removePropMap(
         return internalGetMutablePropMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; prop_map = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
        */
       public Builder putPropMap(
           int key,
@@ -1029,7 +991,11 @@ public Builder putPropMap(
         return this;
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; prop_map = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
        */
 
       public Builder putAllPropMap(
@@ -1039,9 +1005,109 @@ public Builder putAllPropMap(
         return this;
       }
 
+      private java.lang.Object nickName_ = "";
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>string nick_name = 11;</code>
+       * @return The nickName.
+       */
+      public java.lang.String getNickName() {
+        java.lang.Object ref = nickName_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          nickName_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>string nick_name = 11;</code>
+       * @return The bytes for nickName.
+       */
+      public com.google.protobuf.ByteString
+          getNickNameBytes() {
+        java.lang.Object ref = nickName_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          nickName_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>string nick_name = 11;</code>
+       * @param value The nickName to set.
+       * @return This builder for chaining.
+       */
+      public Builder setNickName(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        nickName_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>string nick_name = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearNickName() {
+        
+        nickName_ = getDefaultInstance().getNickName();
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>string nick_name = 11;</code>
+       * @param value The bytes for nickName to set.
+       * @return This builder for chaining.
+       */
+      public Builder setNickNameBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        nickName_ = value;
+        onChanged();
+        return this;
+      }
+
       private long serverTime_ ;
       /**
-       * <code>uint64 server_time = 11;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint64 server_time = 5;</code>
        * @return The serverTime.
        */
       @java.lang.Override
@@ -1049,7 +1115,11 @@ public long getServerTime() {
         return serverTime_;
       }
       /**
-       * <code>uint64 server_time = 11;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint64 server_time = 5;</code>
        * @param value The serverTime to set.
        * @return This builder for chaining.
        */
@@ -1060,7 +1130,11 @@ public Builder setServerTime(long value) {
         return this;
       }
       /**
-       * <code>uint64 server_time = 11;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint64 server_time = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearServerTime() {
@@ -1069,6 +1143,92 @@ public Builder clearServerTime() {
         onChanged();
         return this;
       }
+
+      private int regionId_ ;
+      /**
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>uint32 region_id = 10;</code>
+       * @return The regionId.
+       */
+      @java.lang.Override
+      public int getRegionId() {
+        return regionId_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>uint32 region_id = 10;</code>
+       * @param value The regionId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRegionId(int value) {
+        
+        regionId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>uint32 region_id = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRegionId() {
+        
+        regionId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private boolean isFirstLoginToday_ ;
+      /**
+       * <pre>
+       * Offset: 0x3C
+       * </pre>
+       *
+       * <code>bool is_first_login_today = 3;</code>
+       * @return The isFirstLoginToday.
+       */
+      @java.lang.Override
+      public boolean getIsFirstLoginToday() {
+        return isFirstLoginToday_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x3C
+       * </pre>
+       *
+       * <code>bool is_first_login_today = 3;</code>
+       * @param value The isFirstLoginToday to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsFirstLoginToday(boolean value) {
+        
+        isFirstLoginToday_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x3C
+       * </pre>
+       *
+       * <code>bool is_first_login_today = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsFirstLoginToday() {
+        
+        isFirstLoginToday_ = false;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1142,11 +1302,11 @@ public emu.grasscutter.net.proto.PlayerDataNotifyOuterClass.PlayerDataNotify get
   static {
     java.lang.String[] descriptorData = {
       "\n\026PlayerDataNotify.proto\032\017PropValue.prot" +
-      "o\"\331\001\n\020PlayerDataNotify\022\021\n\tnick_name\030\001 \001(" +
-      "\t\022\034\n\024is_first_login_today\030\002 \001(\010\022\021\n\tregio" +
-      "n_id\030\005 \001(\r\0220\n\010prop_map\030\010 \003(\0132\036.PlayerDat" +
-      "aNotify.PropMapEntry\022\023\n\013server_time\030\013 \001(" +
-      "\004\032:\n\014PropMapEntry\022\013\n\003key\030\001 \001(\r\022\031\n\005value\030" +
+      "o\"\331\001\n\020PlayerDataNotify\0220\n\010prop_map\030\014 \003(\013" +
+      "2\036.PlayerDataNotify.PropMapEntry\022\021\n\tnick" +
+      "_name\030\013 \001(\t\022\023\n\013server_time\030\005 \001(\004\022\021\n\tregi" +
+      "on_id\030\n \001(\r\022\034\n\024is_first_login_today\030\003 \001(" +
+      "\010\032:\n\014PropMapEntry\022\013\n\003key\030\001 \001(\r\022\031\n\005value\030" +
       "\002 \001(\0132\n.PropValue:\0028\001B\033\n\031emu.grasscutter" +
       ".net.protob\006proto3"
     };
@@ -1160,7 +1320,7 @@ public emu.grasscutter.net.proto.PlayerDataNotifyOuterClass.PlayerDataNotify get
     internal_static_PlayerDataNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerDataNotify_descriptor,
-        new java.lang.String[] { "NickName", "IsFirstLoginToday", "RegionId", "PropMap", "ServerTime", });
+        new java.lang.String[] { "PropMap", "NickName", "ServerTime", "RegionId", "IsFirstLoginToday", });
     internal_static_PlayerDataNotify_PropMapEntry_descriptor =
       internal_static_PlayerDataNotify_descriptor.getNestedTypes().get(0);
     internal_static_PlayerDataNotify_PropMapEntry_fieldAccessorTable = new
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerEnterSceneInfoNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerEnterSceneInfoNotifyOuterClass.java
index 018515ded96..3b93ec64963 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerEnterSceneInfoNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerEnterSceneInfoNotifyOuterClass.java
@@ -19,74 +19,126 @@ public interface PlayerEnterSceneInfoNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.TeamEnterSceneInfo team_enter_info = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.MPLevelEntityInfo mp_level_entity_info = 12;</code>
+     * @return Whether the mpLevelEntityInfo field is set.
+     */
+    boolean hasMpLevelEntityInfo();
+    /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.MPLevelEntityInfo mp_level_entity_info = 12;</code>
+     * @return The mpLevelEntityInfo.
+     */
+    emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo getMpLevelEntityInfo();
+    /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.MPLevelEntityInfo mp_level_entity_info = 12;</code>
+     */
+    emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfoOrBuilder getMpLevelEntityInfoOrBuilder();
+
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.TeamEnterSceneInfo team_enter_info = 9;</code>
      * @return Whether the teamEnterInfo field is set.
      */
     boolean hasTeamEnterInfo();
     /**
-     * <code>.TeamEnterSceneInfo team_enter_info = 1;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.TeamEnterSceneInfo team_enter_info = 9;</code>
      * @return The teamEnterInfo.
      */
     emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo getTeamEnterInfo();
     /**
-     * <code>.TeamEnterSceneInfo team_enter_info = 1;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.TeamEnterSceneInfo team_enter_info = 9;</code>
      */
     emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfoOrBuilder getTeamEnterInfoOrBuilder();
 
     /**
-     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 3;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 6;</code>
      */
     java.util.List<emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo> 
         getAvatarEnterInfoList();
     /**
-     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 3;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 6;</code>
      */
     emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo getAvatarEnterInfo(int index);
     /**
-     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 3;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 6;</code>
      */
     int getAvatarEnterInfoCount();
     /**
-     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 3;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 6;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfoOrBuilder> 
         getAvatarEnterInfoOrBuilderList();
     /**
-     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 3;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 6;</code>
      */
     emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfoOrBuilder getAvatarEnterInfoOrBuilder(
         int index);
 
     /**
-     * <code>uint32 enter_scene_token = 2;</code>
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>uint32 enter_scene_token = 7;</code>
      * @return The enterSceneToken.
      */
     int getEnterSceneToken();
 
     /**
-     * <code>.MPLevelEntityInfo mp_level_entity_info = 4;</code>
-     * @return Whether the mpLevelEntityInfo field is set.
-     */
-    boolean hasMpLevelEntityInfo();
-    /**
-     * <code>.MPLevelEntityInfo mp_level_entity_info = 4;</code>
-     * @return The mpLevelEntityInfo.
-     */
-    emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo getMpLevelEntityInfo();
-    /**
-     * <code>.MPLevelEntityInfo mp_level_entity_info = 4;</code>
-     */
-    emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfoOrBuilder getMpLevelEntityInfoOrBuilder();
-
-    /**
-     * <code>uint32 cur_avatar_entity_id = 12;</code>
+     * <pre>
+     * Offset: 0x3C
+     * </pre>
+     *
+     * <code>uint32 cur_avatar_entity_id = 5;</code>
      * @return The curAvatarEntityId.
      */
     int getCurAvatarEntityId();
   }
   /**
    * <pre>
-   * CmdId: 21773
+   * CmdId: 1315
    * </pre>
    *
    * Protobuf type {@code PlayerEnterSceneInfoNotify}
@@ -135,7 +187,26 @@ private PlayerEnterSceneInfoNotify(
             case 0:
               done = true;
               break;
-            case 10: {
+            case 40: {
+
+              curAvatarEntityId_ = input.readUInt32();
+              break;
+            }
+            case 50: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                avatarEnterInfo_ = new java.util.ArrayList<emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo>();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              avatarEnterInfo_.add(
+                  input.readMessage(emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo.parser(), extensionRegistry));
+              break;
+            }
+            case 56: {
+
+              enterSceneToken_ = input.readUInt32();
+              break;
+            }
+            case 74: {
               emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo.Builder subBuilder = null;
               if (teamEnterInfo_ != null) {
                 subBuilder = teamEnterInfo_.toBuilder();
@@ -148,21 +219,7 @@ private PlayerEnterSceneInfoNotify(
 
               break;
             }
-            case 16: {
-
-              enterSceneToken_ = input.readUInt32();
-              break;
-            }
-            case 26: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                avatarEnterInfo_ = new java.util.ArrayList<emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo>();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              avatarEnterInfo_.add(
-                  input.readMessage(emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo.parser(), extensionRegistry));
-              break;
-            }
-            case 34: {
+            case 98: {
               emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo.Builder subBuilder = null;
               if (mpLevelEntityInfo_ != null) {
                 subBuilder = mpLevelEntityInfo_.toBuilder();
@@ -175,11 +232,6 @@ private PlayerEnterSceneInfoNotify(
 
               break;
             }
-            case 96: {
-
-              curAvatarEntityId_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -215,10 +267,52 @@ private PlayerEnterSceneInfoNotify(
               emu.grasscutter.net.proto.PlayerEnterSceneInfoNotifyOuterClass.PlayerEnterSceneInfoNotify.class, emu.grasscutter.net.proto.PlayerEnterSceneInfoNotifyOuterClass.PlayerEnterSceneInfoNotify.Builder.class);
     }
 
-    public static final int TEAM_ENTER_INFO_FIELD_NUMBER = 1;
+    public static final int MP_LEVEL_ENTITY_INFO_FIELD_NUMBER = 12;
+    private emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo mpLevelEntityInfo_;
+    /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.MPLevelEntityInfo mp_level_entity_info = 12;</code>
+     * @return Whether the mpLevelEntityInfo field is set.
+     */
+    @java.lang.Override
+    public boolean hasMpLevelEntityInfo() {
+      return mpLevelEntityInfo_ != null;
+    }
+    /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.MPLevelEntityInfo mp_level_entity_info = 12;</code>
+     * @return The mpLevelEntityInfo.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo getMpLevelEntityInfo() {
+      return mpLevelEntityInfo_ == null ? emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo.getDefaultInstance() : mpLevelEntityInfo_;
+    }
+    /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.MPLevelEntityInfo mp_level_entity_info = 12;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfoOrBuilder getMpLevelEntityInfoOrBuilder() {
+      return getMpLevelEntityInfo();
+    }
+
+    public static final int TEAM_ENTER_INFO_FIELD_NUMBER = 9;
     private emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo teamEnterInfo_;
     /**
-     * <code>.TeamEnterSceneInfo team_enter_info = 1;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.TeamEnterSceneInfo team_enter_info = 9;</code>
      * @return Whether the teamEnterInfo field is set.
      */
     @java.lang.Override
@@ -226,7 +320,11 @@ public boolean hasTeamEnterInfo() {
       return teamEnterInfo_ != null;
     }
     /**
-     * <code>.TeamEnterSceneInfo team_enter_info = 1;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.TeamEnterSceneInfo team_enter_info = 9;</code>
      * @return The teamEnterInfo.
      */
     @java.lang.Override
@@ -234,24 +332,36 @@ public emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo
       return teamEnterInfo_ == null ? emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo.getDefaultInstance() : teamEnterInfo_;
     }
     /**
-     * <code>.TeamEnterSceneInfo team_enter_info = 1;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.TeamEnterSceneInfo team_enter_info = 9;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfoOrBuilder getTeamEnterInfoOrBuilder() {
       return getTeamEnterInfo();
     }
 
-    public static final int AVATAR_ENTER_INFO_FIELD_NUMBER = 3;
+    public static final int AVATAR_ENTER_INFO_FIELD_NUMBER = 6;
     private java.util.List<emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo> avatarEnterInfo_;
     /**
-     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 3;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 6;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo> getAvatarEnterInfoList() {
       return avatarEnterInfo_;
     }
     /**
-     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 3;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 6;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfoOrBuilder> 
@@ -259,21 +369,33 @@ public java.util.List<emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.A
       return avatarEnterInfo_;
     }
     /**
-     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 3;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 6;</code>
      */
     @java.lang.Override
     public int getAvatarEnterInfoCount() {
       return avatarEnterInfo_.size();
     }
     /**
-     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 3;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 6;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo getAvatarEnterInfo(int index) {
       return avatarEnterInfo_.get(index);
     }
     /**
-     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 3;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 6;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfoOrBuilder getAvatarEnterInfoOrBuilder(
@@ -281,10 +403,14 @@ public emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterScene
       return avatarEnterInfo_.get(index);
     }
 
-    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 2;
+    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 7;
     private int enterSceneToken_;
     /**
-     * <code>uint32 enter_scene_token = 2;</code>
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>uint32 enter_scene_token = 7;</code>
      * @return The enterSceneToken.
      */
     @java.lang.Override
@@ -292,36 +418,14 @@ public int getEnterSceneToken() {
       return enterSceneToken_;
     }
 
-    public static final int MP_LEVEL_ENTITY_INFO_FIELD_NUMBER = 4;
-    private emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo mpLevelEntityInfo_;
-    /**
-     * <code>.MPLevelEntityInfo mp_level_entity_info = 4;</code>
-     * @return Whether the mpLevelEntityInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasMpLevelEntityInfo() {
-      return mpLevelEntityInfo_ != null;
-    }
-    /**
-     * <code>.MPLevelEntityInfo mp_level_entity_info = 4;</code>
-     * @return The mpLevelEntityInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo getMpLevelEntityInfo() {
-      return mpLevelEntityInfo_ == null ? emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo.getDefaultInstance() : mpLevelEntityInfo_;
-    }
-    /**
-     * <code>.MPLevelEntityInfo mp_level_entity_info = 4;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfoOrBuilder getMpLevelEntityInfoOrBuilder() {
-      return getMpLevelEntityInfo();
-    }
-
-    public static final int CUR_AVATAR_ENTITY_ID_FIELD_NUMBER = 12;
+    public static final int CUR_AVATAR_ENTITY_ID_FIELD_NUMBER = 5;
     private int curAvatarEntityId_;
     /**
-     * <code>uint32 cur_avatar_entity_id = 12;</code>
+     * <pre>
+     * Offset: 0x3C
+     * </pre>
+     *
+     * <code>uint32 cur_avatar_entity_id = 5;</code>
      * @return The curAvatarEntityId.
      */
     @java.lang.Override
@@ -343,20 +447,20 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (teamEnterInfo_ != null) {
-        output.writeMessage(1, getTeamEnterInfo());
+      if (curAvatarEntityId_ != 0) {
+        output.writeUInt32(5, curAvatarEntityId_);
+      }
+      for (int i = 0; i < avatarEnterInfo_.size(); i++) {
+        output.writeMessage(6, avatarEnterInfo_.get(i));
       }
       if (enterSceneToken_ != 0) {
-        output.writeUInt32(2, enterSceneToken_);
+        output.writeUInt32(7, enterSceneToken_);
       }
-      for (int i = 0; i < avatarEnterInfo_.size(); i++) {
-        output.writeMessage(3, avatarEnterInfo_.get(i));
+      if (teamEnterInfo_ != null) {
+        output.writeMessage(9, getTeamEnterInfo());
       }
       if (mpLevelEntityInfo_ != null) {
-        output.writeMessage(4, getMpLevelEntityInfo());
-      }
-      if (curAvatarEntityId_ != 0) {
-        output.writeUInt32(12, curAvatarEntityId_);
+        output.writeMessage(12, getMpLevelEntityInfo());
       }
       unknownFields.writeTo(output);
     }
@@ -367,25 +471,25 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (teamEnterInfo_ != null) {
+      if (curAvatarEntityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getTeamEnterInfo());
+          .computeUInt32Size(5, curAvatarEntityId_);
       }
-      if (enterSceneToken_ != 0) {
+      for (int i = 0; i < avatarEnterInfo_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, enterSceneToken_);
+          .computeMessageSize(6, avatarEnterInfo_.get(i));
       }
-      for (int i = 0; i < avatarEnterInfo_.size(); i++) {
+      if (enterSceneToken_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, avatarEnterInfo_.get(i));
+          .computeUInt32Size(7, enterSceneToken_);
       }
-      if (mpLevelEntityInfo_ != null) {
+      if (teamEnterInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, getMpLevelEntityInfo());
+          .computeMessageSize(9, getTeamEnterInfo());
       }
-      if (curAvatarEntityId_ != 0) {
+      if (mpLevelEntityInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, curAvatarEntityId_);
+          .computeMessageSize(12, getMpLevelEntityInfo());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -402,6 +506,11 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.PlayerEnterSceneInfoNotifyOuterClass.PlayerEnterSceneInfoNotify other = (emu.grasscutter.net.proto.PlayerEnterSceneInfoNotifyOuterClass.PlayerEnterSceneInfoNotify) obj;
 
+      if (hasMpLevelEntityInfo() != other.hasMpLevelEntityInfo()) return false;
+      if (hasMpLevelEntityInfo()) {
+        if (!getMpLevelEntityInfo()
+            .equals(other.getMpLevelEntityInfo())) return false;
+      }
       if (hasTeamEnterInfo() != other.hasTeamEnterInfo()) return false;
       if (hasTeamEnterInfo()) {
         if (!getTeamEnterInfo()
@@ -411,11 +520,6 @@ public boolean equals(final java.lang.Object obj) {
           .equals(other.getAvatarEnterInfoList())) return false;
       if (getEnterSceneToken()
           != other.getEnterSceneToken()) return false;
-      if (hasMpLevelEntityInfo() != other.hasMpLevelEntityInfo()) return false;
-      if (hasMpLevelEntityInfo()) {
-        if (!getMpLevelEntityInfo()
-            .equals(other.getMpLevelEntityInfo())) return false;
-      }
       if (getCurAvatarEntityId()
           != other.getCurAvatarEntityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -429,6 +533,10 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasMpLevelEntityInfo()) {
+        hash = (37 * hash) + MP_LEVEL_ENTITY_INFO_FIELD_NUMBER;
+        hash = (53 * hash) + getMpLevelEntityInfo().hashCode();
+      }
       if (hasTeamEnterInfo()) {
         hash = (37 * hash) + TEAM_ENTER_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getTeamEnterInfo().hashCode();
@@ -439,10 +547,6 @@ public int hashCode() {
       }
       hash = (37 * hash) + ENTER_SCENE_TOKEN_FIELD_NUMBER;
       hash = (53 * hash) + getEnterSceneToken();
-      if (hasMpLevelEntityInfo()) {
-        hash = (37 * hash) + MP_LEVEL_ENTITY_INFO_FIELD_NUMBER;
-        hash = (53 * hash) + getMpLevelEntityInfo().hashCode();
-      }
       hash = (37 * hash) + CUR_AVATAR_ENTITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getCurAvatarEntityId();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -542,7 +646,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 21773
+     * CmdId: 1315
      * </pre>
      *
      * Protobuf type {@code PlayerEnterSceneInfoNotify}
@@ -583,6 +687,12 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        if (mpLevelEntityInfoBuilder_ == null) {
+          mpLevelEntityInfo_ = null;
+        } else {
+          mpLevelEntityInfo_ = null;
+          mpLevelEntityInfoBuilder_ = null;
+        }
         if (teamEnterInfoBuilder_ == null) {
           teamEnterInfo_ = null;
         } else {
@@ -597,12 +707,6 @@ public Builder clear() {
         }
         enterSceneToken_ = 0;
 
-        if (mpLevelEntityInfoBuilder_ == null) {
-          mpLevelEntityInfo_ = null;
-        } else {
-          mpLevelEntityInfo_ = null;
-          mpLevelEntityInfoBuilder_ = null;
-        }
         curAvatarEntityId_ = 0;
 
         return this;
@@ -632,6 +736,11 @@ public emu.grasscutter.net.proto.PlayerEnterSceneInfoNotifyOuterClass.PlayerEnte
       public emu.grasscutter.net.proto.PlayerEnterSceneInfoNotifyOuterClass.PlayerEnterSceneInfoNotify buildPartial() {
         emu.grasscutter.net.proto.PlayerEnterSceneInfoNotifyOuterClass.PlayerEnterSceneInfoNotify result = new emu.grasscutter.net.proto.PlayerEnterSceneInfoNotifyOuterClass.PlayerEnterSceneInfoNotify(this);
         int from_bitField0_ = bitField0_;
+        if (mpLevelEntityInfoBuilder_ == null) {
+          result.mpLevelEntityInfo_ = mpLevelEntityInfo_;
+        } else {
+          result.mpLevelEntityInfo_ = mpLevelEntityInfoBuilder_.build();
+        }
         if (teamEnterInfoBuilder_ == null) {
           result.teamEnterInfo_ = teamEnterInfo_;
         } else {
@@ -647,11 +756,6 @@ public emu.grasscutter.net.proto.PlayerEnterSceneInfoNotifyOuterClass.PlayerEnte
           result.avatarEnterInfo_ = avatarEnterInfoBuilder_.build();
         }
         result.enterSceneToken_ = enterSceneToken_;
-        if (mpLevelEntityInfoBuilder_ == null) {
-          result.mpLevelEntityInfo_ = mpLevelEntityInfo_;
-        } else {
-          result.mpLevelEntityInfo_ = mpLevelEntityInfoBuilder_.build();
-        }
         result.curAvatarEntityId_ = curAvatarEntityId_;
         onBuilt();
         return result;
@@ -701,6 +805,9 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PlayerEnterSceneInfoNotifyOuterClass.PlayerEnterSceneInfoNotify other) {
         if (other == emu.grasscutter.net.proto.PlayerEnterSceneInfoNotifyOuterClass.PlayerEnterSceneInfoNotify.getDefaultInstance()) return this;
+        if (other.hasMpLevelEntityInfo()) {
+          mergeMpLevelEntityInfo(other.getMpLevelEntityInfo());
+        }
         if (other.hasTeamEnterInfo()) {
           mergeTeamEnterInfo(other.getTeamEnterInfo());
         }
@@ -733,9 +840,6 @@ public Builder mergeFrom(emu.grasscutter.net.proto.PlayerEnterSceneInfoNotifyOut
         if (other.getEnterSceneToken() != 0) {
           setEnterSceneToken(other.getEnterSceneToken());
         }
-        if (other.hasMpLevelEntityInfo()) {
-          mergeMpLevelEntityInfo(other.getMpLevelEntityInfo());
-        }
         if (other.getCurAvatarEntityId() != 0) {
           setCurAvatarEntityId(other.getCurAvatarEntityId());
         }
@@ -769,18 +873,181 @@ public Builder mergeFrom(
       }
       private int bitField0_;
 
+      private emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo mpLevelEntityInfo_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo, emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo.Builder, emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfoOrBuilder> mpLevelEntityInfoBuilder_;
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.MPLevelEntityInfo mp_level_entity_info = 12;</code>
+       * @return Whether the mpLevelEntityInfo field is set.
+       */
+      public boolean hasMpLevelEntityInfo() {
+        return mpLevelEntityInfoBuilder_ != null || mpLevelEntityInfo_ != null;
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.MPLevelEntityInfo mp_level_entity_info = 12;</code>
+       * @return The mpLevelEntityInfo.
+       */
+      public emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo getMpLevelEntityInfo() {
+        if (mpLevelEntityInfoBuilder_ == null) {
+          return mpLevelEntityInfo_ == null ? emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo.getDefaultInstance() : mpLevelEntityInfo_;
+        } else {
+          return mpLevelEntityInfoBuilder_.getMessage();
+        }
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.MPLevelEntityInfo mp_level_entity_info = 12;</code>
+       */
+      public Builder setMpLevelEntityInfo(emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo value) {
+        if (mpLevelEntityInfoBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          mpLevelEntityInfo_ = value;
+          onChanged();
+        } else {
+          mpLevelEntityInfoBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.MPLevelEntityInfo mp_level_entity_info = 12;</code>
+       */
+      public Builder setMpLevelEntityInfo(
+          emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo.Builder builderForValue) {
+        if (mpLevelEntityInfoBuilder_ == null) {
+          mpLevelEntityInfo_ = builderForValue.build();
+          onChanged();
+        } else {
+          mpLevelEntityInfoBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.MPLevelEntityInfo mp_level_entity_info = 12;</code>
+       */
+      public Builder mergeMpLevelEntityInfo(emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo value) {
+        if (mpLevelEntityInfoBuilder_ == null) {
+          if (mpLevelEntityInfo_ != null) {
+            mpLevelEntityInfo_ =
+              emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo.newBuilder(mpLevelEntityInfo_).mergeFrom(value).buildPartial();
+          } else {
+            mpLevelEntityInfo_ = value;
+          }
+          onChanged();
+        } else {
+          mpLevelEntityInfoBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.MPLevelEntityInfo mp_level_entity_info = 12;</code>
+       */
+      public Builder clearMpLevelEntityInfo() {
+        if (mpLevelEntityInfoBuilder_ == null) {
+          mpLevelEntityInfo_ = null;
+          onChanged();
+        } else {
+          mpLevelEntityInfo_ = null;
+          mpLevelEntityInfoBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.MPLevelEntityInfo mp_level_entity_info = 12;</code>
+       */
+      public emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo.Builder getMpLevelEntityInfoBuilder() {
+        
+        onChanged();
+        return getMpLevelEntityInfoFieldBuilder().getBuilder();
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.MPLevelEntityInfo mp_level_entity_info = 12;</code>
+       */
+      public emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfoOrBuilder getMpLevelEntityInfoOrBuilder() {
+        if (mpLevelEntityInfoBuilder_ != null) {
+          return mpLevelEntityInfoBuilder_.getMessageOrBuilder();
+        } else {
+          return mpLevelEntityInfo_ == null ?
+              emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo.getDefaultInstance() : mpLevelEntityInfo_;
+        }
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.MPLevelEntityInfo mp_level_entity_info = 12;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo, emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo.Builder, emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfoOrBuilder> 
+          getMpLevelEntityInfoFieldBuilder() {
+        if (mpLevelEntityInfoBuilder_ == null) {
+          mpLevelEntityInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo, emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo.Builder, emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfoOrBuilder>(
+                  getMpLevelEntityInfo(),
+                  getParentForChildren(),
+                  isClean());
+          mpLevelEntityInfo_ = null;
+        }
+        return mpLevelEntityInfoBuilder_;
+      }
+
       private emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo teamEnterInfo_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo, emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo.Builder, emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfoOrBuilder> teamEnterInfoBuilder_;
       /**
-       * <code>.TeamEnterSceneInfo team_enter_info = 1;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.TeamEnterSceneInfo team_enter_info = 9;</code>
        * @return Whether the teamEnterInfo field is set.
        */
       public boolean hasTeamEnterInfo() {
         return teamEnterInfoBuilder_ != null || teamEnterInfo_ != null;
       }
       /**
-       * <code>.TeamEnterSceneInfo team_enter_info = 1;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.TeamEnterSceneInfo team_enter_info = 9;</code>
        * @return The teamEnterInfo.
        */
       public emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo getTeamEnterInfo() {
@@ -791,7 +1058,11 @@ public emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo
         }
       }
       /**
-       * <code>.TeamEnterSceneInfo team_enter_info = 1;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.TeamEnterSceneInfo team_enter_info = 9;</code>
        */
       public Builder setTeamEnterInfo(emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo value) {
         if (teamEnterInfoBuilder_ == null) {
@@ -807,7 +1078,11 @@ public Builder setTeamEnterInfo(emu.grasscutter.net.proto.TeamEnterSceneInfoOute
         return this;
       }
       /**
-       * <code>.TeamEnterSceneInfo team_enter_info = 1;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.TeamEnterSceneInfo team_enter_info = 9;</code>
        */
       public Builder setTeamEnterInfo(
           emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo.Builder builderForValue) {
@@ -821,7 +1096,11 @@ public Builder setTeamEnterInfo(
         return this;
       }
       /**
-       * <code>.TeamEnterSceneInfo team_enter_info = 1;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.TeamEnterSceneInfo team_enter_info = 9;</code>
        */
       public Builder mergeTeamEnterInfo(emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo value) {
         if (teamEnterInfoBuilder_ == null) {
@@ -839,7 +1118,11 @@ public Builder mergeTeamEnterInfo(emu.grasscutter.net.proto.TeamEnterSceneInfoOu
         return this;
       }
       /**
-       * <code>.TeamEnterSceneInfo team_enter_info = 1;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.TeamEnterSceneInfo team_enter_info = 9;</code>
        */
       public Builder clearTeamEnterInfo() {
         if (teamEnterInfoBuilder_ == null) {
@@ -853,7 +1136,11 @@ public Builder clearTeamEnterInfo() {
         return this;
       }
       /**
-       * <code>.TeamEnterSceneInfo team_enter_info = 1;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.TeamEnterSceneInfo team_enter_info = 9;</code>
        */
       public emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo.Builder getTeamEnterInfoBuilder() {
         
@@ -861,7 +1148,11 @@ public emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo
         return getTeamEnterInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.TeamEnterSceneInfo team_enter_info = 1;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.TeamEnterSceneInfo team_enter_info = 9;</code>
        */
       public emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfoOrBuilder getTeamEnterInfoOrBuilder() {
         if (teamEnterInfoBuilder_ != null) {
@@ -872,7 +1163,11 @@ public emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo
         }
       }
       /**
-       * <code>.TeamEnterSceneInfo team_enter_info = 1;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.TeamEnterSceneInfo team_enter_info = 9;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo, emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo.Builder, emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfoOrBuilder> 
@@ -901,7 +1196,11 @@ private void ensureAvatarEnterInfoIsMutable() {
           emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo, emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo.Builder, emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfoOrBuilder> avatarEnterInfoBuilder_;
 
       /**
-       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 3;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 6;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo> getAvatarEnterInfoList() {
         if (avatarEnterInfoBuilder_ == null) {
@@ -911,7 +1210,11 @@ public java.util.List<emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.A
         }
       }
       /**
-       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 3;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 6;</code>
        */
       public int getAvatarEnterInfoCount() {
         if (avatarEnterInfoBuilder_ == null) {
@@ -921,7 +1224,11 @@ public int getAvatarEnterInfoCount() {
         }
       }
       /**
-       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 3;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 6;</code>
        */
       public emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo getAvatarEnterInfo(int index) {
         if (avatarEnterInfoBuilder_ == null) {
@@ -931,7 +1238,11 @@ public emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterScene
         }
       }
       /**
-       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 3;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 6;</code>
        */
       public Builder setAvatarEnterInfo(
           int index, emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo value) {
@@ -948,7 +1259,11 @@ public Builder setAvatarEnterInfo(
         return this;
       }
       /**
-       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 3;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 6;</code>
        */
       public Builder setAvatarEnterInfo(
           int index, emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo.Builder builderForValue) {
@@ -962,7 +1277,11 @@ public Builder setAvatarEnterInfo(
         return this;
       }
       /**
-       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 3;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 6;</code>
        */
       public Builder addAvatarEnterInfo(emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo value) {
         if (avatarEnterInfoBuilder_ == null) {
@@ -978,7 +1297,11 @@ public Builder addAvatarEnterInfo(emu.grasscutter.net.proto.AvatarEnterSceneInfo
         return this;
       }
       /**
-       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 3;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 6;</code>
        */
       public Builder addAvatarEnterInfo(
           int index, emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo value) {
@@ -995,7 +1318,11 @@ public Builder addAvatarEnterInfo(
         return this;
       }
       /**
-       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 3;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 6;</code>
        */
       public Builder addAvatarEnterInfo(
           emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo.Builder builderForValue) {
@@ -1009,7 +1336,11 @@ public Builder addAvatarEnterInfo(
         return this;
       }
       /**
-       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 3;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 6;</code>
        */
       public Builder addAvatarEnterInfo(
           int index, emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo.Builder builderForValue) {
@@ -1023,7 +1354,11 @@ public Builder addAvatarEnterInfo(
         return this;
       }
       /**
-       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 3;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 6;</code>
        */
       public Builder addAllAvatarEnterInfo(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo> values) {
@@ -1038,7 +1373,11 @@ public Builder addAllAvatarEnterInfo(
         return this;
       }
       /**
-       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 3;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 6;</code>
        */
       public Builder clearAvatarEnterInfo() {
         if (avatarEnterInfoBuilder_ == null) {
@@ -1051,7 +1390,11 @@ public Builder clearAvatarEnterInfo() {
         return this;
       }
       /**
-       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 3;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 6;</code>
        */
       public Builder removeAvatarEnterInfo(int index) {
         if (avatarEnterInfoBuilder_ == null) {
@@ -1064,14 +1407,22 @@ public Builder removeAvatarEnterInfo(int index) {
         return this;
       }
       /**
-       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 3;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 6;</code>
        */
       public emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo.Builder getAvatarEnterInfoBuilder(
           int index) {
         return getAvatarEnterInfoFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 3;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 6;</code>
        */
       public emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfoOrBuilder getAvatarEnterInfoOrBuilder(
           int index) {
@@ -1081,7 +1432,11 @@ public emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterScene
         }
       }
       /**
-       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 3;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 6;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfoOrBuilder> 
            getAvatarEnterInfoOrBuilderList() {
@@ -1092,14 +1447,22 @@ public emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterScene
         }
       }
       /**
-       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 3;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 6;</code>
        */
       public emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo.Builder addAvatarEnterInfoBuilder() {
         return getAvatarEnterInfoFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 3;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 6;</code>
        */
       public emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo.Builder addAvatarEnterInfoBuilder(
           int index) {
@@ -1107,7 +1470,11 @@ public emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterScene
             index, emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 3;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 6;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo.Builder> 
            getAvatarEnterInfoBuilderList() {
@@ -1130,7 +1497,11 @@ public emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterScene
 
       private int enterSceneToken_ ;
       /**
-       * <code>uint32 enter_scene_token = 2;</code>
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>uint32 enter_scene_token = 7;</code>
        * @return The enterSceneToken.
        */
       @java.lang.Override
@@ -1138,7 +1509,11 @@ public int getEnterSceneToken() {
         return enterSceneToken_;
       }
       /**
-       * <code>uint32 enter_scene_token = 2;</code>
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>uint32 enter_scene_token = 7;</code>
        * @param value The enterSceneToken to set.
        * @return This builder for chaining.
        */
@@ -1149,7 +1524,11 @@ public Builder setEnterSceneToken(int value) {
         return this;
       }
       /**
-       * <code>uint32 enter_scene_token = 2;</code>
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>uint32 enter_scene_token = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearEnterSceneToken() {
@@ -1159,128 +1538,13 @@ public Builder clearEnterSceneToken() {
         return this;
       }
 
-      private emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo mpLevelEntityInfo_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo, emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo.Builder, emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfoOrBuilder> mpLevelEntityInfoBuilder_;
-      /**
-       * <code>.MPLevelEntityInfo mp_level_entity_info = 4;</code>
-       * @return Whether the mpLevelEntityInfo field is set.
-       */
-      public boolean hasMpLevelEntityInfo() {
-        return mpLevelEntityInfoBuilder_ != null || mpLevelEntityInfo_ != null;
-      }
-      /**
-       * <code>.MPLevelEntityInfo mp_level_entity_info = 4;</code>
-       * @return The mpLevelEntityInfo.
-       */
-      public emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo getMpLevelEntityInfo() {
-        if (mpLevelEntityInfoBuilder_ == null) {
-          return mpLevelEntityInfo_ == null ? emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo.getDefaultInstance() : mpLevelEntityInfo_;
-        } else {
-          return mpLevelEntityInfoBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.MPLevelEntityInfo mp_level_entity_info = 4;</code>
-       */
-      public Builder setMpLevelEntityInfo(emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo value) {
-        if (mpLevelEntityInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          mpLevelEntityInfo_ = value;
-          onChanged();
-        } else {
-          mpLevelEntityInfoBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.MPLevelEntityInfo mp_level_entity_info = 4;</code>
-       */
-      public Builder setMpLevelEntityInfo(
-          emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo.Builder builderForValue) {
-        if (mpLevelEntityInfoBuilder_ == null) {
-          mpLevelEntityInfo_ = builderForValue.build();
-          onChanged();
-        } else {
-          mpLevelEntityInfoBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.MPLevelEntityInfo mp_level_entity_info = 4;</code>
-       */
-      public Builder mergeMpLevelEntityInfo(emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo value) {
-        if (mpLevelEntityInfoBuilder_ == null) {
-          if (mpLevelEntityInfo_ != null) {
-            mpLevelEntityInfo_ =
-              emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo.newBuilder(mpLevelEntityInfo_).mergeFrom(value).buildPartial();
-          } else {
-            mpLevelEntityInfo_ = value;
-          }
-          onChanged();
-        } else {
-          mpLevelEntityInfoBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.MPLevelEntityInfo mp_level_entity_info = 4;</code>
-       */
-      public Builder clearMpLevelEntityInfo() {
-        if (mpLevelEntityInfoBuilder_ == null) {
-          mpLevelEntityInfo_ = null;
-          onChanged();
-        } else {
-          mpLevelEntityInfo_ = null;
-          mpLevelEntityInfoBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.MPLevelEntityInfo mp_level_entity_info = 4;</code>
-       */
-      public emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo.Builder getMpLevelEntityInfoBuilder() {
-        
-        onChanged();
-        return getMpLevelEntityInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.MPLevelEntityInfo mp_level_entity_info = 4;</code>
-       */
-      public emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfoOrBuilder getMpLevelEntityInfoOrBuilder() {
-        if (mpLevelEntityInfoBuilder_ != null) {
-          return mpLevelEntityInfoBuilder_.getMessageOrBuilder();
-        } else {
-          return mpLevelEntityInfo_ == null ?
-              emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo.getDefaultInstance() : mpLevelEntityInfo_;
-        }
-      }
-      /**
-       * <code>.MPLevelEntityInfo mp_level_entity_info = 4;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo, emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo.Builder, emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfoOrBuilder> 
-          getMpLevelEntityInfoFieldBuilder() {
-        if (mpLevelEntityInfoBuilder_ == null) {
-          mpLevelEntityInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo, emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo.Builder, emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfoOrBuilder>(
-                  getMpLevelEntityInfo(),
-                  getParentForChildren(),
-                  isClean());
-          mpLevelEntityInfo_ = null;
-        }
-        return mpLevelEntityInfoBuilder_;
-      }
-
       private int curAvatarEntityId_ ;
       /**
-       * <code>uint32 cur_avatar_entity_id = 12;</code>
+       * <pre>
+       * Offset: 0x3C
+       * </pre>
+       *
+       * <code>uint32 cur_avatar_entity_id = 5;</code>
        * @return The curAvatarEntityId.
        */
       @java.lang.Override
@@ -1288,7 +1552,11 @@ public int getCurAvatarEntityId() {
         return curAvatarEntityId_;
       }
       /**
-       * <code>uint32 cur_avatar_entity_id = 12;</code>
+       * <pre>
+       * Offset: 0x3C
+       * </pre>
+       *
+       * <code>uint32 cur_avatar_entity_id = 5;</code>
        * @param value The curAvatarEntityId to set.
        * @return This builder for chaining.
        */
@@ -1299,7 +1567,11 @@ public Builder setCurAvatarEntityId(int value) {
         return this;
       }
       /**
-       * <code>uint32 cur_avatar_entity_id = 12;</code>
+       * <pre>
+       * Offset: 0x3C
+       * </pre>
+       *
+       * <code>uint32 cur_avatar_entity_id = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearCurAvatarEntityId() {
@@ -1378,12 +1650,12 @@ public emu.grasscutter.net.proto.PlayerEnterSceneInfoNotifyOuterClass.PlayerEnte
       "\n PlayerEnterSceneInfoNotify.proto\032\030Team" +
       "EnterSceneInfo.proto\032\032AvatarEnterSceneIn" +
       "fo.proto\032\027MPLevelEntityInfo.proto\"\347\001\n\032Pl" +
-      "ayerEnterSceneInfoNotify\022,\n\017team_enter_i" +
-      "nfo\030\001 \001(\0132\023.TeamEnterSceneInfo\0220\n\021avatar" +
-      "_enter_info\030\003 \003(\0132\025.AvatarEnterSceneInfo" +
-      "\022\031\n\021enter_scene_token\030\002 \001(\r\0220\n\024mp_level_" +
-      "entity_info\030\004 \001(\0132\022.MPLevelEntityInfo\022\034\n" +
-      "\024cur_avatar_entity_id\030\014 \001(\rB\033\n\031emu.grass" +
+      "ayerEnterSceneInfoNotify\0220\n\024mp_level_ent" +
+      "ity_info\030\014 \001(\0132\022.MPLevelEntityInfo\022,\n\017te" +
+      "am_enter_info\030\t \001(\0132\023.TeamEnterSceneInfo" +
+      "\0220\n\021avatar_enter_info\030\006 \003(\0132\025.AvatarEnte" +
+      "rSceneInfo\022\031\n\021enter_scene_token\030\007 \001(\r\022\034\n" +
+      "\024cur_avatar_entity_id\030\005 \001(\rB\033\n\031emu.grass" +
       "cutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1398,7 +1670,7 @@ public emu.grasscutter.net.proto.PlayerEnterSceneInfoNotifyOuterClass.PlayerEnte
     internal_static_PlayerEnterSceneInfoNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerEnterSceneInfoNotify_descriptor,
-        new java.lang.String[] { "TeamEnterInfo", "AvatarEnterInfo", "EnterSceneToken", "MpLevelEntityInfo", "CurAvatarEntityId", });
+        new java.lang.String[] { "MpLevelEntityInfo", "TeamEnterInfo", "AvatarEnterInfo", "EnterSceneToken", "CurAvatarEntityId", });
     emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.getDescriptor();
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerEnterSceneNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerEnterSceneNotifyOuterClass.java
index ebc6fbbe0a2..59c19220e57 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerEnterSceneNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerEnterSceneNotifyOuterClass.java
@@ -25,46 +25,29 @@ public interface PlayerEnterSceneNotifyOrBuilder extends
     int getTargetUid();
 
     /**
-     * <code>uint64 scene_begin_time = 15;</code>
+     * <code>uint64 scene_begin_time = 7;</code>
      * @return The sceneBeginTime.
      */
     long getSceneBeginTime();
 
     /**
-     * <code>repeated uint32 scene_tag_id_list = 14;</code>
-     * @return A list containing the sceneTagIdList.
-     */
-    java.util.List<java.lang.Integer> getSceneTagIdListList();
-    /**
-     * <code>repeated uint32 scene_tag_id_list = 14;</code>
-     * @return The count of sceneTagIdList.
-     */
-    int getSceneTagIdListCount();
-    /**
-     * <code>repeated uint32 scene_tag_id_list = 14;</code>
-     * @param index The index of the element to return.
-     * @return The sceneTagIdList at the given index.
-     */
-    int getSceneTagIdList(int index);
-
-    /**
-     * <code>uint32 enter_scene_token = 3;</code>
+     * <code>uint32 enter_scene_token = 14;</code>
      * @return The enterSceneToken.
      */
     int getEnterSceneToken();
 
     /**
-     * <code>.Vector pos = 6;</code>
+     * <code>.Vector pos = 2;</code>
      * @return Whether the pos field is set.
      */
     boolean hasPos();
     /**
-     * <code>.Vector pos = 6;</code>
+     * <code>.Vector pos = 2;</code>
      * @return The pos.
      */
     emu.grasscutter.net.proto.VectorOuterClass.Vector getPos();
     /**
-     * <code>.Vector pos = 6;</code>
+     * <code>.Vector pos = 2;</code>
      */
     emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder();
 
@@ -75,40 +58,40 @@ public interface PlayerEnterSceneNotifyOrBuilder extends
     int getSceneId();
 
     /**
-     * <code>.EnterType type = 10;</code>
+     * <code>.EnterType type = 5;</code>
      * @return The enum numeric value on the wire for type.
      */
     int getTypeValue();
     /**
-     * <code>.EnterType type = 10;</code>
+     * <code>.EnterType type = 5;</code>
      * @return The type.
      */
     emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType getType();
 
     /**
-     * <code>string scene_transaction = 229;</code>
+     * <code>string scene_transaction = 1674;</code>
      * @return The sceneTransaction.
      */
     java.lang.String getSceneTransaction();
     /**
-     * <code>string scene_transaction = 229;</code>
+     * <code>string scene_transaction = 1674;</code>
      * @return The bytes for sceneTransaction.
      */
     com.google.protobuf.ByteString
         getSceneTransactionBytes();
 
     /**
-     * <code>.MapLayerInfo map_layer_info = 923;</code>
+     * <code>.MapLayerInfo map_layer_info = 1909;</code>
      * @return Whether the mapLayerInfo field is set.
      */
     boolean hasMapLayerInfo();
     /**
-     * <code>.MapLayerInfo map_layer_info = 923;</code>
+     * <code>.MapLayerInfo map_layer_info = 1909;</code>
      * @return The mapLayerInfo.
      */
     emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo getMapLayerInfo();
     /**
-     * <code>.MapLayerInfo map_layer_info = 923;</code>
+     * <code>.MapLayerInfo map_layer_info = 1909;</code>
      */
     emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder getMapLayerInfoOrBuilder();
 
@@ -118,6 +101,38 @@ public interface PlayerEnterSceneNotifyOrBuilder extends
      */
     int getWorldLevel();
 
+    /**
+     * <code>.Vector prev_pos = 15;</code>
+     * @return Whether the prevPos field is set.
+     */
+    boolean hasPrevPos();
+    /**
+     * <code>.Vector prev_pos = 15;</code>
+     * @return The prevPos.
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getPrevPos();
+    /**
+     * <code>.Vector prev_pos = 15;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPrevPosOrBuilder();
+
+    /**
+     * <code>repeated uint32 scene_tag_id_list = 140;</code>
+     * @return A list containing the sceneTagIdList.
+     */
+    java.util.List<java.lang.Integer> getSceneTagIdListList();
+    /**
+     * <code>repeated uint32 scene_tag_id_list = 140;</code>
+     * @return The count of sceneTagIdList.
+     */
+    int getSceneTagIdListCount();
+    /**
+     * <code>repeated uint32 scene_tag_id_list = 140;</code>
+     * @param index The index of the element to return.
+     * @return The sceneTagIdList at the given index.
+     */
+    int getSceneTagIdList(int index);
+
     /**
      * <code>bool is_skip_ui = 100;</code>
      * @return The isSkipUi.
@@ -136,21 +151,6 @@ public interface PlayerEnterSceneNotifyOrBuilder extends
      */
     int getCreatePlayerUid();
 
-    /**
-     * <code>.Vector prev_pos = 2;</code>
-     * @return Whether the prevPos field is set.
-     */
-    boolean hasPrevPos();
-    /**
-     * <code>.Vector prev_pos = 2;</code>
-     * @return The prevPos.
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getPrevPos();
-    /**
-     * <code>.Vector prev_pos = 2;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPrevPosOrBuilder();
-
     /**
      * <code>uint32 dungeon_id = 110;</code>
      * @return The dungeonId.
@@ -192,9 +192,9 @@ private PlayerEnterSceneNotify(com.google.protobuf.GeneratedMessageV3.Builder<?>
       super(builder);
     }
     private PlayerEnterSceneNotify() {
-      sceneTagIdList_ = emptyIntList();
       type_ = 0;
       sceneTransaction_ = "";
+      sceneTagIdList_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -234,24 +234,6 @@ private PlayerEnterSceneNotify(
               break;
             }
             case 18: {
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
-              if (prevPos_ != null) {
-                subBuilder = prevPos_.toBuilder();
-              }
-              prevPos_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(prevPos_);
-                prevPos_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 24: {
-
-              enterSceneToken_ = input.readUInt32();
-              break;
-            }
-            case 50: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (pos_ != null) {
                 subBuilder = pos_.toBuilder();
@@ -264,12 +246,17 @@ private PlayerEnterSceneNotify(
 
               break;
             }
-            case 80: {
+            case 40: {
               int rawValue = input.readEnum();
 
               type_ = rawValue;
               break;
             }
+            case 56: {
+
+              sceneBeginTime_ = input.readUInt64();
+              break;
+            }
             case 88: {
 
               sceneId_ = input.readUInt32();
@@ -281,6 +268,39 @@ private PlayerEnterSceneNotify(
               break;
             }
             case 112: {
+
+              enterSceneToken_ = input.readUInt32();
+              break;
+            }
+            case 122: {
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
+              if (prevPos_ != null) {
+                subBuilder = prevPos_.toBuilder();
+              }
+              prevPos_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(prevPos_);
+                prevPos_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+            case 648: {
+
+              prevSceneId_ = input.readUInt32();
+              break;
+            }
+            case 800: {
+
+              isSkipUi_ = input.readBool();
+              break;
+            }
+            case 880: {
+
+              dungeonId_ = input.readUInt32();
+              break;
+            }
+            case 1120: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 sceneTagIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -288,7 +308,7 @@ private PlayerEnterSceneNotify(
               sceneTagIdList_.addInt(input.readUInt32());
               break;
             }
-            case 114: {
+            case 1122: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -301,43 +321,33 @@ private PlayerEnterSceneNotify(
               input.popLimit(limit);
               break;
             }
-            case 120: {
-
-              sceneBeginTime_ = input.readUInt64();
-              break;
-            }
-            case 648: {
+            case 5360: {
 
-              prevSceneId_ = input.readUInt32();
+              enterReason_ = input.readUInt32();
               break;
             }
-            case 800: {
+            case 6528: {
 
-              isSkipUi_ = input.readBool();
+              isFirstLoginEnterScene_ = input.readBool();
               break;
             }
-            case 880: {
+            case 10616: {
 
-              dungeonId_ = input.readUInt32();
+              worldType_ = input.readUInt32();
               break;
             }
-            case 1834: {
+            case 13394: {
               java.lang.String s = input.readStringRequireUtf8();
 
               sceneTransaction_ = s;
               break;
             }
-            case 5360: {
-
-              enterReason_ = input.readUInt32();
-              break;
-            }
-            case 6528: {
+            case 13568: {
 
-              isFirstLoginEnterScene_ = input.readBool();
+              createPlayerUid_ = input.readUInt32();
               break;
             }
-            case 7386: {
+            case 15274: {
               emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder subBuilder = null;
               if (mapLayerInfo_ != null) {
                 subBuilder = mapLayerInfo_.toBuilder();
@@ -350,16 +360,6 @@ private PlayerEnterSceneNotify(
 
               break;
             }
-            case 10616: {
-
-              worldType_ = input.readUInt32();
-              break;
-            }
-            case 13568: {
-
-              createPlayerUid_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -406,10 +406,10 @@ public int getTargetUid() {
       return targetUid_;
     }
 
-    public static final int SCENE_BEGIN_TIME_FIELD_NUMBER = 15;
+    public static final int SCENE_BEGIN_TIME_FIELD_NUMBER = 7;
     private long sceneBeginTime_;
     /**
-     * <code>uint64 scene_begin_time = 15;</code>
+     * <code>uint64 scene_begin_time = 7;</code>
      * @return The sceneBeginTime.
      */
     @java.lang.Override
@@ -417,38 +417,10 @@ public long getSceneBeginTime() {
       return sceneBeginTime_;
     }
 
-    public static final int SCENE_TAG_ID_LIST_FIELD_NUMBER = 14;
-    private com.google.protobuf.Internal.IntList sceneTagIdList_;
-    /**
-     * <code>repeated uint32 scene_tag_id_list = 14;</code>
-     * @return A list containing the sceneTagIdList.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getSceneTagIdListList() {
-      return sceneTagIdList_;
-    }
-    /**
-     * <code>repeated uint32 scene_tag_id_list = 14;</code>
-     * @return The count of sceneTagIdList.
-     */
-    public int getSceneTagIdListCount() {
-      return sceneTagIdList_.size();
-    }
-    /**
-     * <code>repeated uint32 scene_tag_id_list = 14;</code>
-     * @param index The index of the element to return.
-     * @return The sceneTagIdList at the given index.
-     */
-    public int getSceneTagIdList(int index) {
-      return sceneTagIdList_.getInt(index);
-    }
-    private int sceneTagIdListMemoizedSerializedSize = -1;
-
-    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 3;
+    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 14;
     private int enterSceneToken_;
     /**
-     * <code>uint32 enter_scene_token = 3;</code>
+     * <code>uint32 enter_scene_token = 14;</code>
      * @return The enterSceneToken.
      */
     @java.lang.Override
@@ -456,10 +428,10 @@ public int getEnterSceneToken() {
       return enterSceneToken_;
     }
 
-    public static final int POS_FIELD_NUMBER = 6;
+    public static final int POS_FIELD_NUMBER = 2;
     private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
     /**
-     * <code>.Vector pos = 6;</code>
+     * <code>.Vector pos = 2;</code>
      * @return Whether the pos field is set.
      */
     @java.lang.Override
@@ -467,7 +439,7 @@ public boolean hasPos() {
       return pos_ != null;
     }
     /**
-     * <code>.Vector pos = 6;</code>
+     * <code>.Vector pos = 2;</code>
      * @return The pos.
      */
     @java.lang.Override
@@ -475,7 +447,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() {
       return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
     }
     /**
-     * <code>.Vector pos = 6;</code>
+     * <code>.Vector pos = 2;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
@@ -493,17 +465,17 @@ public int getSceneId() {
       return sceneId_;
     }
 
-    public static final int TYPE_FIELD_NUMBER = 10;
+    public static final int TYPE_FIELD_NUMBER = 5;
     private int type_;
     /**
-     * <code>.EnterType type = 10;</code>
+     * <code>.EnterType type = 5;</code>
      * @return The enum numeric value on the wire for type.
      */
     @java.lang.Override public int getTypeValue() {
       return type_;
     }
     /**
-     * <code>.EnterType type = 10;</code>
+     * <code>.EnterType type = 5;</code>
      * @return The type.
      */
     @java.lang.Override public emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType getType() {
@@ -512,10 +484,10 @@ public int getSceneId() {
       return result == null ? emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType.UNRECOGNIZED : result;
     }
 
-    public static final int SCENE_TRANSACTION_FIELD_NUMBER = 229;
+    public static final int SCENE_TRANSACTION_FIELD_NUMBER = 1674;
     private volatile java.lang.Object sceneTransaction_;
     /**
-     * <code>string scene_transaction = 229;</code>
+     * <code>string scene_transaction = 1674;</code>
      * @return The sceneTransaction.
      */
     @java.lang.Override
@@ -532,7 +504,7 @@ public java.lang.String getSceneTransaction() {
       }
     }
     /**
-     * <code>string scene_transaction = 229;</code>
+     * <code>string scene_transaction = 1674;</code>
      * @return The bytes for sceneTransaction.
      */
     @java.lang.Override
@@ -550,10 +522,10 @@ public java.lang.String getSceneTransaction() {
       }
     }
 
-    public static final int MAP_LAYER_INFO_FIELD_NUMBER = 923;
+    public static final int MAP_LAYER_INFO_FIELD_NUMBER = 1909;
     private emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo mapLayerInfo_;
     /**
-     * <code>.MapLayerInfo map_layer_info = 923;</code>
+     * <code>.MapLayerInfo map_layer_info = 1909;</code>
      * @return Whether the mapLayerInfo field is set.
      */
     @java.lang.Override
@@ -561,7 +533,7 @@ public boolean hasMapLayerInfo() {
       return mapLayerInfo_ != null;
     }
     /**
-     * <code>.MapLayerInfo map_layer_info = 923;</code>
+     * <code>.MapLayerInfo map_layer_info = 1909;</code>
      * @return The mapLayerInfo.
      */
     @java.lang.Override
@@ -569,7 +541,7 @@ public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo getMapLayer
       return mapLayerInfo_ == null ? emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.getDefaultInstance() : mapLayerInfo_;
     }
     /**
-     * <code>.MapLayerInfo map_layer_info = 923;</code>
+     * <code>.MapLayerInfo map_layer_info = 1909;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder getMapLayerInfoOrBuilder() {
@@ -587,6 +559,60 @@ public int getWorldLevel() {
       return worldLevel_;
     }
 
+    public static final int PREV_POS_FIELD_NUMBER = 15;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector prevPos_;
+    /**
+     * <code>.Vector prev_pos = 15;</code>
+     * @return Whether the prevPos field is set.
+     */
+    @java.lang.Override
+    public boolean hasPrevPos() {
+      return prevPos_ != null;
+    }
+    /**
+     * <code>.Vector prev_pos = 15;</code>
+     * @return The prevPos.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getPrevPos() {
+      return prevPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : prevPos_;
+    }
+    /**
+     * <code>.Vector prev_pos = 15;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPrevPosOrBuilder() {
+      return getPrevPos();
+    }
+
+    public static final int SCENE_TAG_ID_LIST_FIELD_NUMBER = 140;
+    private com.google.protobuf.Internal.IntList sceneTagIdList_;
+    /**
+     * <code>repeated uint32 scene_tag_id_list = 140;</code>
+     * @return A list containing the sceneTagIdList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getSceneTagIdListList() {
+      return sceneTagIdList_;
+    }
+    /**
+     * <code>repeated uint32 scene_tag_id_list = 140;</code>
+     * @return The count of sceneTagIdList.
+     */
+    public int getSceneTagIdListCount() {
+      return sceneTagIdList_.size();
+    }
+    /**
+     * <code>repeated uint32 scene_tag_id_list = 140;</code>
+     * @param index The index of the element to return.
+     * @return The sceneTagIdList at the given index.
+     */
+    public int getSceneTagIdList(int index) {
+      return sceneTagIdList_.getInt(index);
+    }
+    private int sceneTagIdListMemoizedSerializedSize = -1;
+
     public static final int IS_SKIP_UI_FIELD_NUMBER = 100;
     private boolean isSkipUi_;
     /**
@@ -620,32 +646,6 @@ public int getCreatePlayerUid() {
       return createPlayerUid_;
     }
 
-    public static final int PREV_POS_FIELD_NUMBER = 2;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector prevPos_;
-    /**
-     * <code>.Vector prev_pos = 2;</code>
-     * @return Whether the prevPos field is set.
-     */
-    @java.lang.Override
-    public boolean hasPrevPos() {
-      return prevPos_ != null;
-    }
-    /**
-     * <code>.Vector prev_pos = 2;</code>
-     * @return The prevPos.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getPrevPos() {
-      return prevPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : prevPos_;
-    }
-    /**
-     * <code>.Vector prev_pos = 2;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPrevPosOrBuilder() {
-      return getPrevPos();
-    }
-
     public static final int DUNGEON_ID_FIELD_NUMBER = 110;
     private int dungeonId_;
     /**
@@ -708,17 +708,14 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (worldLevel_ != 0) {
         output.writeUInt32(1, worldLevel_);
       }
-      if (prevPos_ != null) {
-        output.writeMessage(2, getPrevPos());
-      }
-      if (enterSceneToken_ != 0) {
-        output.writeUInt32(3, enterSceneToken_);
-      }
       if (pos_ != null) {
-        output.writeMessage(6, getPos());
+        output.writeMessage(2, getPos());
       }
       if (type_ != emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType.ENTER_TYPE_NONE.getNumber()) {
-        output.writeEnum(10, type_);
+        output.writeEnum(5, type_);
+      }
+      if (sceneBeginTime_ != 0L) {
+        output.writeUInt64(7, sceneBeginTime_);
       }
       if (sceneId_ != 0) {
         output.writeUInt32(11, sceneId_);
@@ -726,15 +723,11 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (targetUid_ != 0) {
         output.writeUInt32(13, targetUid_);
       }
-      if (getSceneTagIdListList().size() > 0) {
-        output.writeUInt32NoTag(114);
-        output.writeUInt32NoTag(sceneTagIdListMemoizedSerializedSize);
-      }
-      for (int i = 0; i < sceneTagIdList_.size(); i++) {
-        output.writeUInt32NoTag(sceneTagIdList_.getInt(i));
+      if (enterSceneToken_ != 0) {
+        output.writeUInt32(14, enterSceneToken_);
       }
-      if (sceneBeginTime_ != 0L) {
-        output.writeUInt64(15, sceneBeginTime_);
+      if (prevPos_ != null) {
+        output.writeMessage(15, getPrevPos());
       }
       if (prevSceneId_ != 0) {
         output.writeUInt32(81, prevSceneId_);
@@ -745,8 +738,12 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (dungeonId_ != 0) {
         output.writeUInt32(110, dungeonId_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(sceneTransaction_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 229, sceneTransaction_);
+      if (getSceneTagIdListList().size() > 0) {
+        output.writeUInt32NoTag(1122);
+        output.writeUInt32NoTag(sceneTagIdListMemoizedSerializedSize);
+      }
+      for (int i = 0; i < sceneTagIdList_.size(); i++) {
+        output.writeUInt32NoTag(sceneTagIdList_.getInt(i));
       }
       if (enterReason_ != 0) {
         output.writeUInt32(670, enterReason_);
@@ -754,15 +751,18 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (isFirstLoginEnterScene_ != false) {
         output.writeBool(816, isFirstLoginEnterScene_);
       }
-      if (mapLayerInfo_ != null) {
-        output.writeMessage(923, getMapLayerInfo());
-      }
       if (worldType_ != 0) {
         output.writeUInt32(1327, worldType_);
       }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(sceneTransaction_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1674, sceneTransaction_);
+      }
       if (createPlayerUid_ != 0) {
         output.writeUInt32(1696, createPlayerUid_);
       }
+      if (mapLayerInfo_ != null) {
+        output.writeMessage(1909, getMapLayerInfo());
+      }
       unknownFields.writeTo(output);
     }
 
@@ -776,21 +776,17 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(1, worldLevel_);
       }
-      if (prevPos_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, getPrevPos());
-      }
-      if (enterSceneToken_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, enterSceneToken_);
-      }
       if (pos_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, getPos());
+          .computeMessageSize(2, getPos());
       }
       if (type_ != emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType.ENTER_TYPE_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(10, type_);
+          .computeEnumSize(5, type_);
+      }
+      if (sceneBeginTime_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(7, sceneBeginTime_);
       }
       if (sceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -800,23 +796,13 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(13, targetUid_);
       }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < sceneTagIdList_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(sceneTagIdList_.getInt(i));
-        }
-        size += dataSize;
-        if (!getSceneTagIdListList().isEmpty()) {
-          size += 1;
-          size += com.google.protobuf.CodedOutputStream
-              .computeInt32SizeNoTag(dataSize);
-        }
-        sceneTagIdListMemoizedSerializedSize = dataSize;
+      if (enterSceneToken_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, enterSceneToken_);
       }
-      if (sceneBeginTime_ != 0L) {
+      if (prevPos_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(15, sceneBeginTime_);
+          .computeMessageSize(15, getPrevPos());
       }
       if (prevSceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -830,8 +816,19 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(110, dungeonId_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(sceneTransaction_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(229, sceneTransaction_);
+      {
+        int dataSize = 0;
+        for (int i = 0; i < sceneTagIdList_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(sceneTagIdList_.getInt(i));
+        }
+        size += dataSize;
+        if (!getSceneTagIdListList().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        sceneTagIdListMemoizedSerializedSize = dataSize;
       }
       if (enterReason_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -841,18 +838,21 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeBoolSize(816, isFirstLoginEnterScene_);
       }
-      if (mapLayerInfo_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(923, getMapLayerInfo());
-      }
       if (worldType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(1327, worldType_);
       }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(sceneTransaction_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1674, sceneTransaction_);
+      }
       if (createPlayerUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(1696, createPlayerUid_);
       }
+      if (mapLayerInfo_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(1909, getMapLayerInfo());
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -872,8 +872,6 @@ public boolean equals(final java.lang.Object obj) {
           != other.getTargetUid()) return false;
       if (getSceneBeginTime()
           != other.getSceneBeginTime()) return false;
-      if (!getSceneTagIdListList()
-          .equals(other.getSceneTagIdListList())) return false;
       if (getEnterSceneToken()
           != other.getEnterSceneToken()) return false;
       if (hasPos() != other.hasPos()) return false;
@@ -893,17 +891,19 @@ public boolean equals(final java.lang.Object obj) {
       }
       if (getWorldLevel()
           != other.getWorldLevel()) return false;
+      if (hasPrevPos() != other.hasPrevPos()) return false;
+      if (hasPrevPos()) {
+        if (!getPrevPos()
+            .equals(other.getPrevPos())) return false;
+      }
+      if (!getSceneTagIdListList()
+          .equals(other.getSceneTagIdListList())) return false;
       if (getIsSkipUi()
           != other.getIsSkipUi()) return false;
       if (getIsFirstLoginEnterScene()
           != other.getIsFirstLoginEnterScene()) return false;
       if (getCreatePlayerUid()
           != other.getCreatePlayerUid()) return false;
-      if (hasPrevPos() != other.hasPrevPos()) return false;
-      if (hasPrevPos()) {
-        if (!getPrevPos()
-            .equals(other.getPrevPos())) return false;
-      }
       if (getDungeonId()
           != other.getDungeonId()) return false;
       if (getPrevSceneId()
@@ -928,10 +928,6 @@ public int hashCode() {
       hash = (37 * hash) + SCENE_BEGIN_TIME_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getSceneBeginTime());
-      if (getSceneTagIdListCount() > 0) {
-        hash = (37 * hash) + SCENE_TAG_ID_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getSceneTagIdListList().hashCode();
-      }
       hash = (37 * hash) + ENTER_SCENE_TOKEN_FIELD_NUMBER;
       hash = (53 * hash) + getEnterSceneToken();
       if (hasPos()) {
@@ -950,6 +946,14 @@ public int hashCode() {
       }
       hash = (37 * hash) + WORLD_LEVEL_FIELD_NUMBER;
       hash = (53 * hash) + getWorldLevel();
+      if (hasPrevPos()) {
+        hash = (37 * hash) + PREV_POS_FIELD_NUMBER;
+        hash = (53 * hash) + getPrevPos().hashCode();
+      }
+      if (getSceneTagIdListCount() > 0) {
+        hash = (37 * hash) + SCENE_TAG_ID_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getSceneTagIdListList().hashCode();
+      }
       hash = (37 * hash) + IS_SKIP_UI_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsSkipUi());
@@ -958,10 +962,6 @@ public int hashCode() {
           getIsFirstLoginEnterScene());
       hash = (37 * hash) + CREATE_PLAYER_UID_FIELD_NUMBER;
       hash = (53 * hash) + getCreatePlayerUid();
-      if (hasPrevPos()) {
-        hash = (37 * hash) + PREV_POS_FIELD_NUMBER;
-        hash = (53 * hash) + getPrevPos().hashCode();
-      }
       hash = (37 * hash) + DUNGEON_ID_FIELD_NUMBER;
       hash = (53 * hash) + getDungeonId();
       hash = (37 * hash) + PREV_SCENE_ID_FIELD_NUMBER;
@@ -1111,8 +1111,6 @@ public Builder clear() {
 
         sceneBeginTime_ = 0L;
 
-        sceneTagIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
         enterSceneToken_ = 0;
 
         if (posBuilder_ == null) {
@@ -1135,18 +1133,20 @@ public Builder clear() {
         }
         worldLevel_ = 0;
 
-        isSkipUi_ = false;
-
-        isFirstLoginEnterScene_ = false;
-
-        createPlayerUid_ = 0;
-
         if (prevPosBuilder_ == null) {
           prevPos_ = null;
         } else {
           prevPos_ = null;
           prevPosBuilder_ = null;
         }
+        sceneTagIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        isSkipUi_ = false;
+
+        isFirstLoginEnterScene_ = false;
+
+        createPlayerUid_ = 0;
+
         dungeonId_ = 0;
 
         prevSceneId_ = 0;
@@ -1184,11 +1184,6 @@ public emu.grasscutter.net.proto.PlayerEnterSceneNotifyOuterClass.PlayerEnterSce
         int from_bitField0_ = bitField0_;
         result.targetUid_ = targetUid_;
         result.sceneBeginTime_ = sceneBeginTime_;
-        if (((bitField0_ & 0x00000001) != 0)) {
-          sceneTagIdList_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        }
-        result.sceneTagIdList_ = sceneTagIdList_;
         result.enterSceneToken_ = enterSceneToken_;
         if (posBuilder_ == null) {
           result.pos_ = pos_;
@@ -1204,14 +1199,19 @@ public emu.grasscutter.net.proto.PlayerEnterSceneNotifyOuterClass.PlayerEnterSce
           result.mapLayerInfo_ = mapLayerInfoBuilder_.build();
         }
         result.worldLevel_ = worldLevel_;
-        result.isSkipUi_ = isSkipUi_;
-        result.isFirstLoginEnterScene_ = isFirstLoginEnterScene_;
-        result.createPlayerUid_ = createPlayerUid_;
         if (prevPosBuilder_ == null) {
           result.prevPos_ = prevPos_;
         } else {
           result.prevPos_ = prevPosBuilder_.build();
         }
+        if (((bitField0_ & 0x00000001) != 0)) {
+          sceneTagIdList_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.sceneTagIdList_ = sceneTagIdList_;
+        result.isSkipUi_ = isSkipUi_;
+        result.isFirstLoginEnterScene_ = isFirstLoginEnterScene_;
+        result.createPlayerUid_ = createPlayerUid_;
         result.dungeonId_ = dungeonId_;
         result.prevSceneId_ = prevSceneId_;
         result.worldType_ = worldType_;
@@ -1270,16 +1270,6 @@ public Builder mergeFrom(emu.grasscutter.net.proto.PlayerEnterSceneNotifyOuterCl
         if (other.getSceneBeginTime() != 0L) {
           setSceneBeginTime(other.getSceneBeginTime());
         }
-        if (!other.sceneTagIdList_.isEmpty()) {
-          if (sceneTagIdList_.isEmpty()) {
-            sceneTagIdList_ = other.sceneTagIdList_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-          } else {
-            ensureSceneTagIdListIsMutable();
-            sceneTagIdList_.addAll(other.sceneTagIdList_);
-          }
-          onChanged();
-        }
         if (other.getEnterSceneToken() != 0) {
           setEnterSceneToken(other.getEnterSceneToken());
         }
@@ -1302,6 +1292,19 @@ public Builder mergeFrom(emu.grasscutter.net.proto.PlayerEnterSceneNotifyOuterCl
         if (other.getWorldLevel() != 0) {
           setWorldLevel(other.getWorldLevel());
         }
+        if (other.hasPrevPos()) {
+          mergePrevPos(other.getPrevPos());
+        }
+        if (!other.sceneTagIdList_.isEmpty()) {
+          if (sceneTagIdList_.isEmpty()) {
+            sceneTagIdList_ = other.sceneTagIdList_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureSceneTagIdListIsMutable();
+            sceneTagIdList_.addAll(other.sceneTagIdList_);
+          }
+          onChanged();
+        }
         if (other.getIsSkipUi() != false) {
           setIsSkipUi(other.getIsSkipUi());
         }
@@ -1311,9 +1314,6 @@ public Builder mergeFrom(emu.grasscutter.net.proto.PlayerEnterSceneNotifyOuterCl
         if (other.getCreatePlayerUid() != 0) {
           setCreatePlayerUid(other.getCreatePlayerUid());
         }
-        if (other.hasPrevPos()) {
-          mergePrevPos(other.getPrevPos());
-        }
         if (other.getDungeonId() != 0) {
           setDungeonId(other.getDungeonId());
         }
@@ -1389,7 +1389,7 @@ public Builder clearTargetUid() {
 
       private long sceneBeginTime_ ;
       /**
-       * <code>uint64 scene_begin_time = 15;</code>
+       * <code>uint64 scene_begin_time = 7;</code>
        * @return The sceneBeginTime.
        */
       @java.lang.Override
@@ -1397,7 +1397,7 @@ public long getSceneBeginTime() {
         return sceneBeginTime_;
       }
       /**
-       * <code>uint64 scene_begin_time = 15;</code>
+       * <code>uint64 scene_begin_time = 7;</code>
        * @param value The sceneBeginTime to set.
        * @return This builder for chaining.
        */
@@ -1408,7 +1408,7 @@ public Builder setSceneBeginTime(long value) {
         return this;
       }
       /**
-       * <code>uint64 scene_begin_time = 15;</code>
+       * <code>uint64 scene_begin_time = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearSceneBeginTime() {
@@ -1418,88 +1418,9 @@ public Builder clearSceneBeginTime() {
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList sceneTagIdList_ = emptyIntList();
-      private void ensureSceneTagIdListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          sceneTagIdList_ = mutableCopy(sceneTagIdList_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-      /**
-       * <code>repeated uint32 scene_tag_id_list = 14;</code>
-       * @return A list containing the sceneTagIdList.
-       */
-      public java.util.List<java.lang.Integer>
-          getSceneTagIdListList() {
-        return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(sceneTagIdList_) : sceneTagIdList_;
-      }
-      /**
-       * <code>repeated uint32 scene_tag_id_list = 14;</code>
-       * @return The count of sceneTagIdList.
-       */
-      public int getSceneTagIdListCount() {
-        return sceneTagIdList_.size();
-      }
-      /**
-       * <code>repeated uint32 scene_tag_id_list = 14;</code>
-       * @param index The index of the element to return.
-       * @return The sceneTagIdList at the given index.
-       */
-      public int getSceneTagIdList(int index) {
-        return sceneTagIdList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 scene_tag_id_list = 14;</code>
-       * @param index The index to set the value at.
-       * @param value The sceneTagIdList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSceneTagIdList(
-          int index, int value) {
-        ensureSceneTagIdListIsMutable();
-        sceneTagIdList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 scene_tag_id_list = 14;</code>
-       * @param value The sceneTagIdList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addSceneTagIdList(int value) {
-        ensureSceneTagIdListIsMutable();
-        sceneTagIdList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 scene_tag_id_list = 14;</code>
-       * @param values The sceneTagIdList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllSceneTagIdList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureSceneTagIdListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, sceneTagIdList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 scene_tag_id_list = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSceneTagIdList() {
-        sceneTagIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-        return this;
-      }
-
       private int enterSceneToken_ ;
       /**
-       * <code>uint32 enter_scene_token = 3;</code>
+       * <code>uint32 enter_scene_token = 14;</code>
        * @return The enterSceneToken.
        */
       @java.lang.Override
@@ -1507,7 +1428,7 @@ public int getEnterSceneToken() {
         return enterSceneToken_;
       }
       /**
-       * <code>uint32 enter_scene_token = 3;</code>
+       * <code>uint32 enter_scene_token = 14;</code>
        * @param value The enterSceneToken to set.
        * @return This builder for chaining.
        */
@@ -1518,7 +1439,7 @@ public Builder setEnterSceneToken(int value) {
         return this;
       }
       /**
-       * <code>uint32 enter_scene_token = 3;</code>
+       * <code>uint32 enter_scene_token = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearEnterSceneToken() {
@@ -1532,14 +1453,14 @@ public Builder clearEnterSceneToken() {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> posBuilder_;
       /**
-       * <code>.Vector pos = 6;</code>
+       * <code>.Vector pos = 2;</code>
        * @return Whether the pos field is set.
        */
       public boolean hasPos() {
         return posBuilder_ != null || pos_ != null;
       }
       /**
-       * <code>.Vector pos = 6;</code>
+       * <code>.Vector pos = 2;</code>
        * @return The pos.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() {
@@ -1550,7 +1471,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() {
         }
       }
       /**
-       * <code>.Vector pos = 6;</code>
+       * <code>.Vector pos = 2;</code>
        */
       public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (posBuilder_ == null) {
@@ -1566,7 +1487,7 @@ public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         return this;
       }
       /**
-       * <code>.Vector pos = 6;</code>
+       * <code>.Vector pos = 2;</code>
        */
       public Builder setPos(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -1580,7 +1501,7 @@ public Builder setPos(
         return this;
       }
       /**
-       * <code>.Vector pos = 6;</code>
+       * <code>.Vector pos = 2;</code>
        */
       public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (posBuilder_ == null) {
@@ -1598,7 +1519,7 @@ public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value)
         return this;
       }
       /**
-       * <code>.Vector pos = 6;</code>
+       * <code>.Vector pos = 2;</code>
        */
       public Builder clearPos() {
         if (posBuilder_ == null) {
@@ -1612,7 +1533,7 @@ public Builder clearPos() {
         return this;
       }
       /**
-       * <code>.Vector pos = 6;</code>
+       * <code>.Vector pos = 2;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder() {
         
@@ -1620,7 +1541,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder()
         return getPosFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector pos = 6;</code>
+       * <code>.Vector pos = 2;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
         if (posBuilder_ != null) {
@@ -1631,7 +1552,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilde
         }
       }
       /**
-       * <code>.Vector pos = 6;</code>
+       * <code>.Vector pos = 2;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
@@ -1680,14 +1601,14 @@ public Builder clearSceneId() {
 
       private int type_ = 0;
       /**
-       * <code>.EnterType type = 10;</code>
+       * <code>.EnterType type = 5;</code>
        * @return The enum numeric value on the wire for type.
        */
       @java.lang.Override public int getTypeValue() {
         return type_;
       }
       /**
-       * <code>.EnterType type = 10;</code>
+       * <code>.EnterType type = 5;</code>
        * @param value The enum numeric value on the wire for type to set.
        * @return This builder for chaining.
        */
@@ -1698,7 +1619,7 @@ public Builder setTypeValue(int value) {
         return this;
       }
       /**
-       * <code>.EnterType type = 10;</code>
+       * <code>.EnterType type = 5;</code>
        * @return The type.
        */
       @java.lang.Override
@@ -1708,7 +1629,7 @@ public emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType getType() {
         return result == null ? emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.EnterType type = 10;</code>
+       * <code>.EnterType type = 5;</code>
        * @param value The type to set.
        * @return This builder for chaining.
        */
@@ -1722,7 +1643,7 @@ public Builder setType(emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType v
         return this;
       }
       /**
-       * <code>.EnterType type = 10;</code>
+       * <code>.EnterType type = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearType() {
@@ -1734,7 +1655,7 @@ public Builder clearType() {
 
       private java.lang.Object sceneTransaction_ = "";
       /**
-       * <code>string scene_transaction = 229;</code>
+       * <code>string scene_transaction = 1674;</code>
        * @return The sceneTransaction.
        */
       public java.lang.String getSceneTransaction() {
@@ -1750,7 +1671,7 @@ public java.lang.String getSceneTransaction() {
         }
       }
       /**
-       * <code>string scene_transaction = 229;</code>
+       * <code>string scene_transaction = 1674;</code>
        * @return The bytes for sceneTransaction.
        */
       public com.google.protobuf.ByteString
@@ -1767,7 +1688,7 @@ public java.lang.String getSceneTransaction() {
         }
       }
       /**
-       * <code>string scene_transaction = 229;</code>
+       * <code>string scene_transaction = 1674;</code>
        * @param value The sceneTransaction to set.
        * @return This builder for chaining.
        */
@@ -1782,7 +1703,7 @@ public Builder setSceneTransaction(
         return this;
       }
       /**
-       * <code>string scene_transaction = 229;</code>
+       * <code>string scene_transaction = 1674;</code>
        * @return This builder for chaining.
        */
       public Builder clearSceneTransaction() {
@@ -1792,7 +1713,7 @@ public Builder clearSceneTransaction() {
         return this;
       }
       /**
-       * <code>string scene_transaction = 229;</code>
+       * <code>string scene_transaction = 1674;</code>
        * @param value The bytes for sceneTransaction to set.
        * @return This builder for chaining.
        */
@@ -1812,14 +1733,14 @@ public Builder setSceneTransactionBytes(
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo, emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder, emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder> mapLayerInfoBuilder_;
       /**
-       * <code>.MapLayerInfo map_layer_info = 923;</code>
+       * <code>.MapLayerInfo map_layer_info = 1909;</code>
        * @return Whether the mapLayerInfo field is set.
        */
       public boolean hasMapLayerInfo() {
         return mapLayerInfoBuilder_ != null || mapLayerInfo_ != null;
       }
       /**
-       * <code>.MapLayerInfo map_layer_info = 923;</code>
+       * <code>.MapLayerInfo map_layer_info = 1909;</code>
        * @return The mapLayerInfo.
        */
       public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo getMapLayerInfo() {
@@ -1830,7 +1751,7 @@ public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo getMapLayer
         }
       }
       /**
-       * <code>.MapLayerInfo map_layer_info = 923;</code>
+       * <code>.MapLayerInfo map_layer_info = 1909;</code>
        */
       public Builder setMapLayerInfo(emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo value) {
         if (mapLayerInfoBuilder_ == null) {
@@ -1846,7 +1767,7 @@ public Builder setMapLayerInfo(emu.grasscutter.net.proto.MapLayerInfoOuterClass.
         return this;
       }
       /**
-       * <code>.MapLayerInfo map_layer_info = 923;</code>
+       * <code>.MapLayerInfo map_layer_info = 1909;</code>
        */
       public Builder setMapLayerInfo(
           emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder builderForValue) {
@@ -1860,7 +1781,7 @@ public Builder setMapLayerInfo(
         return this;
       }
       /**
-       * <code>.MapLayerInfo map_layer_info = 923;</code>
+       * <code>.MapLayerInfo map_layer_info = 1909;</code>
        */
       public Builder mergeMapLayerInfo(emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo value) {
         if (mapLayerInfoBuilder_ == null) {
@@ -1878,7 +1799,7 @@ public Builder mergeMapLayerInfo(emu.grasscutter.net.proto.MapLayerInfoOuterClas
         return this;
       }
       /**
-       * <code>.MapLayerInfo map_layer_info = 923;</code>
+       * <code>.MapLayerInfo map_layer_info = 1909;</code>
        */
       public Builder clearMapLayerInfo() {
         if (mapLayerInfoBuilder_ == null) {
@@ -1892,7 +1813,7 @@ public Builder clearMapLayerInfo() {
         return this;
       }
       /**
-       * <code>.MapLayerInfo map_layer_info = 923;</code>
+       * <code>.MapLayerInfo map_layer_info = 1909;</code>
        */
       public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder getMapLayerInfoBuilder() {
         
@@ -1900,7 +1821,7 @@ public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder get
         return getMapLayerInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.MapLayerInfo map_layer_info = 923;</code>
+       * <code>.MapLayerInfo map_layer_info = 1909;</code>
        */
       public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder getMapLayerInfoOrBuilder() {
         if (mapLayerInfoBuilder_ != null) {
@@ -1911,7 +1832,7 @@ public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder ge
         }
       }
       /**
-       * <code>.MapLayerInfo map_layer_info = 923;</code>
+       * <code>.MapLayerInfo map_layer_info = 1909;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo, emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder, emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder> 
@@ -1958,111 +1879,18 @@ public Builder clearWorldLevel() {
         return this;
       }
 
-      private boolean isSkipUi_ ;
-      /**
-       * <code>bool is_skip_ui = 100;</code>
-       * @return The isSkipUi.
-       */
-      @java.lang.Override
-      public boolean getIsSkipUi() {
-        return isSkipUi_;
-      }
-      /**
-       * <code>bool is_skip_ui = 100;</code>
-       * @param value The isSkipUi to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsSkipUi(boolean value) {
-        
-        isSkipUi_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_skip_ui = 100;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsSkipUi() {
-        
-        isSkipUi_ = false;
-        onChanged();
-        return this;
-      }
-
-      private boolean isFirstLoginEnterScene_ ;
-      /**
-       * <code>bool is_first_login_enter_scene = 816;</code>
-       * @return The isFirstLoginEnterScene.
-       */
-      @java.lang.Override
-      public boolean getIsFirstLoginEnterScene() {
-        return isFirstLoginEnterScene_;
-      }
-      /**
-       * <code>bool is_first_login_enter_scene = 816;</code>
-       * @param value The isFirstLoginEnterScene to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsFirstLoginEnterScene(boolean value) {
-        
-        isFirstLoginEnterScene_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_first_login_enter_scene = 816;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsFirstLoginEnterScene() {
-        
-        isFirstLoginEnterScene_ = false;
-        onChanged();
-        return this;
-      }
-
-      private int createPlayerUid_ ;
-      /**
-       * <code>uint32 create_player_uid = 1696;</code>
-       * @return The createPlayerUid.
-       */
-      @java.lang.Override
-      public int getCreatePlayerUid() {
-        return createPlayerUid_;
-      }
-      /**
-       * <code>uint32 create_player_uid = 1696;</code>
-       * @param value The createPlayerUid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCreatePlayerUid(int value) {
-        
-        createPlayerUid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 create_player_uid = 1696;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCreatePlayerUid() {
-        
-        createPlayerUid_ = 0;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.VectorOuterClass.Vector prevPos_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> prevPosBuilder_;
       /**
-       * <code>.Vector prev_pos = 2;</code>
+       * <code>.Vector prev_pos = 15;</code>
        * @return Whether the prevPos field is set.
        */
       public boolean hasPrevPos() {
         return prevPosBuilder_ != null || prevPos_ != null;
       }
       /**
-       * <code>.Vector prev_pos = 2;</code>
+       * <code>.Vector prev_pos = 15;</code>
        * @return The prevPos.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getPrevPos() {
@@ -2073,7 +1901,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getPrevPos() {
         }
       }
       /**
-       * <code>.Vector prev_pos = 2;</code>
+       * <code>.Vector prev_pos = 15;</code>
        */
       public Builder setPrevPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (prevPosBuilder_ == null) {
@@ -2089,7 +1917,7 @@ public Builder setPrevPos(emu.grasscutter.net.proto.VectorOuterClass.Vector valu
         return this;
       }
       /**
-       * <code>.Vector prev_pos = 2;</code>
+       * <code>.Vector prev_pos = 15;</code>
        */
       public Builder setPrevPos(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -2103,7 +1931,7 @@ public Builder setPrevPos(
         return this;
       }
       /**
-       * <code>.Vector prev_pos = 2;</code>
+       * <code>.Vector prev_pos = 15;</code>
        */
       public Builder mergePrevPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (prevPosBuilder_ == null) {
@@ -2121,7 +1949,7 @@ public Builder mergePrevPos(emu.grasscutter.net.proto.VectorOuterClass.Vector va
         return this;
       }
       /**
-       * <code>.Vector prev_pos = 2;</code>
+       * <code>.Vector prev_pos = 15;</code>
        */
       public Builder clearPrevPos() {
         if (prevPosBuilder_ == null) {
@@ -2135,7 +1963,7 @@ public Builder clearPrevPos() {
         return this;
       }
       /**
-       * <code>.Vector prev_pos = 2;</code>
+       * <code>.Vector prev_pos = 15;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPrevPosBuilder() {
         
@@ -2143,7 +1971,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPrevPosBuild
         return getPrevPosFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector prev_pos = 2;</code>
+       * <code>.Vector prev_pos = 15;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPrevPosOrBuilder() {
         if (prevPosBuilder_ != null) {
@@ -2154,7 +1982,7 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPrevPosOrBu
         }
       }
       /**
-       * <code>.Vector prev_pos = 2;</code>
+       * <code>.Vector prev_pos = 15;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
@@ -2170,6 +1998,178 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPrevPosOrBu
         return prevPosBuilder_;
       }
 
+      private com.google.protobuf.Internal.IntList sceneTagIdList_ = emptyIntList();
+      private void ensureSceneTagIdListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          sceneTagIdList_ = mutableCopy(sceneTagIdList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+      /**
+       * <code>repeated uint32 scene_tag_id_list = 140;</code>
+       * @return A list containing the sceneTagIdList.
+       */
+      public java.util.List<java.lang.Integer>
+          getSceneTagIdListList() {
+        return ((bitField0_ & 0x00000001) != 0) ?
+                 java.util.Collections.unmodifiableList(sceneTagIdList_) : sceneTagIdList_;
+      }
+      /**
+       * <code>repeated uint32 scene_tag_id_list = 140;</code>
+       * @return The count of sceneTagIdList.
+       */
+      public int getSceneTagIdListCount() {
+        return sceneTagIdList_.size();
+      }
+      /**
+       * <code>repeated uint32 scene_tag_id_list = 140;</code>
+       * @param index The index of the element to return.
+       * @return The sceneTagIdList at the given index.
+       */
+      public int getSceneTagIdList(int index) {
+        return sceneTagIdList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 scene_tag_id_list = 140;</code>
+       * @param index The index to set the value at.
+       * @param value The sceneTagIdList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSceneTagIdList(
+          int index, int value) {
+        ensureSceneTagIdListIsMutable();
+        sceneTagIdList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 scene_tag_id_list = 140;</code>
+       * @param value The sceneTagIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addSceneTagIdList(int value) {
+        ensureSceneTagIdListIsMutable();
+        sceneTagIdList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 scene_tag_id_list = 140;</code>
+       * @param values The sceneTagIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllSceneTagIdList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureSceneTagIdListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, sceneTagIdList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 scene_tag_id_list = 140;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearSceneTagIdList() {
+        sceneTagIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
+      private boolean isSkipUi_ ;
+      /**
+       * <code>bool is_skip_ui = 100;</code>
+       * @return The isSkipUi.
+       */
+      @java.lang.Override
+      public boolean getIsSkipUi() {
+        return isSkipUi_;
+      }
+      /**
+       * <code>bool is_skip_ui = 100;</code>
+       * @param value The isSkipUi to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsSkipUi(boolean value) {
+        
+        isSkipUi_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_skip_ui = 100;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsSkipUi() {
+        
+        isSkipUi_ = false;
+        onChanged();
+        return this;
+      }
+
+      private boolean isFirstLoginEnterScene_ ;
+      /**
+       * <code>bool is_first_login_enter_scene = 816;</code>
+       * @return The isFirstLoginEnterScene.
+       */
+      @java.lang.Override
+      public boolean getIsFirstLoginEnterScene() {
+        return isFirstLoginEnterScene_;
+      }
+      /**
+       * <code>bool is_first_login_enter_scene = 816;</code>
+       * @param value The isFirstLoginEnterScene to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsFirstLoginEnterScene(boolean value) {
+        
+        isFirstLoginEnterScene_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_first_login_enter_scene = 816;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsFirstLoginEnterScene() {
+        
+        isFirstLoginEnterScene_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int createPlayerUid_ ;
+      /**
+       * <code>uint32 create_player_uid = 1696;</code>
+       * @return The createPlayerUid.
+       */
+      @java.lang.Override
+      public int getCreatePlayerUid() {
+        return createPlayerUid_;
+      }
+      /**
+       * <code>uint32 create_player_uid = 1696;</code>
+       * @param value The createPlayerUid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCreatePlayerUid(int value) {
+        
+        createPlayerUid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 create_player_uid = 1696;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCreatePlayerUid() {
+        
+        createPlayerUid_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int dungeonId_ ;
       /**
        * <code>uint32 dungeon_id = 110;</code>
@@ -2362,19 +2362,19 @@ public emu.grasscutter.net.proto.PlayerEnterSceneNotifyOuterClass.PlayerEnterSce
     java.lang.String[] descriptorData = {
       "\n\034PlayerEnterSceneNotify.proto\032\022MapLayer" +
       "Info.proto\032\014Vector.proto\032\017EnterType.prot" +
-      "o\"\336\003\n\026PlayerEnterSceneNotify\022\022\n\ntarget_u" +
-      "id\030\r \001(\r\022\030\n\020scene_begin_time\030\017 \001(\004\022\031\n\021sc" +
-      "ene_tag_id_list\030\016 \003(\r\022\031\n\021enter_scene_tok" +
-      "en\030\003 \001(\r\022\024\n\003pos\030\006 \001(\0132\007.Vector\022\020\n\010scene_" +
-      "id\030\013 \001(\r\022\030\n\004type\030\n \001(\0162\n.EnterType\022\032\n\021sc" +
-      "ene_transaction\030\345\001 \001(\t\022&\n\016map_layer_info" +
-      "\030\233\007 \001(\0132\r.MapLayerInfo\022\023\n\013world_level\030\001 " +
-      "\001(\r\022\022\n\nis_skip_ui\030d \001(\010\022#\n\032is_first_logi" +
-      "n_enter_scene\030\260\006 \001(\010\022\032\n\021create_player_ui" +
-      "d\030\240\r \001(\r\022\031\n\010prev_pos\030\002 \001(\0132\007.Vector\022\022\n\nd" +
-      "ungeon_id\030n \001(\r\022\025\n\rprev_scene_id\030Q \001(\r\022\023" +
-      "\n\nworld_type\030\257\n \001(\r\022\025\n\014enter_reason\030\236\005 \001" +
-      "(\rB\033\n\031emu.grasscutter.net.protob\006proto3"
+      "o\"\337\003\n\026PlayerEnterSceneNotify\022\022\n\ntarget_u" +
+      "id\030\r \001(\r\022\030\n\020scene_begin_time\030\007 \001(\004\022\031\n\021en" +
+      "ter_scene_token\030\016 \001(\r\022\024\n\003pos\030\002 \001(\0132\007.Vec" +
+      "tor\022\020\n\010scene_id\030\013 \001(\r\022\030\n\004type\030\005 \001(\0162\n.En" +
+      "terType\022\032\n\021scene_transaction\030\212\r \001(\t\022&\n\016m" +
+      "ap_layer_info\030\365\016 \001(\0132\r.MapLayerInfo\022\023\n\013w" +
+      "orld_level\030\001 \001(\r\022\031\n\010prev_pos\030\017 \001(\0132\007.Vec" +
+      "tor\022\032\n\021scene_tag_id_list\030\214\001 \003(\r\022\022\n\nis_sk" +
+      "ip_ui\030d \001(\010\022#\n\032is_first_login_enter_scen" +
+      "e\030\260\006 \001(\010\022\032\n\021create_player_uid\030\240\r \001(\r\022\022\n\n" +
+      "dungeon_id\030n \001(\r\022\025\n\rprev_scene_id\030Q \001(\r\022" +
+      "\023\n\nworld_type\030\257\n \001(\r\022\025\n\014enter_reason\030\236\005 " +
+      "\001(\rB\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -2388,7 +2388,7 @@ public emu.grasscutter.net.proto.PlayerEnterSceneNotifyOuterClass.PlayerEnterSce
     internal_static_PlayerEnterSceneNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerEnterSceneNotify_descriptor,
-        new java.lang.String[] { "TargetUid", "SceneBeginTime", "SceneTagIdList", "EnterSceneToken", "Pos", "SceneId", "Type", "SceneTransaction", "MapLayerInfo", "WorldLevel", "IsSkipUi", "IsFirstLoginEnterScene", "CreatePlayerUid", "PrevPos", "DungeonId", "PrevSceneId", "WorldType", "EnterReason", });
+        new java.lang.String[] { "TargetUid", "SceneBeginTime", "EnterSceneToken", "Pos", "SceneId", "Type", "SceneTransaction", "MapLayerInfo", "WorldLevel", "PrevPos", "SceneTagIdList", "IsSkipUi", "IsFirstLoginEnterScene", "CreatePlayerUid", "DungeonId", "PrevSceneId", "WorldType", "EnterReason", });
     emu.grasscutter.net.proto.MapLayerInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
     emu.grasscutter.net.proto.EnterTypeOuterClass.getDescriptor();
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerGameTimeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerGameTimeNotifyOuterClass.java
index df7063971b8..631859dd9f9 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerGameTimeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerGameTimeNotifyOuterClass.java
@@ -19,26 +19,38 @@ public interface PlayerGameTimeNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 game_time = 4;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 uid = 14;</code>
+     * @return The uid.
+     */
+    int getUid();
+
+    /**
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 game_time = 15;</code>
      * @return The gameTime.
      */
     int getGameTime();
 
     /**
-     * <code>bool is_home = 9;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>bool is_home = 2;</code>
      * @return The isHome.
      */
     boolean getIsHome();
-
-    /**
-     * <code>uint32 uid = 15;</code>
-     * @return The uid.
-     */
-    int getUid();
   }
   /**
    * <pre>
-   * CmdId: 4423
+   * CmdId: 1970
    * </pre>
    *
    * Protobuf type {@code PlayerGameTimeNotify}
@@ -85,19 +97,19 @@ private PlayerGameTimeNotify(
             case 0:
               done = true;
               break;
-            case 32: {
+            case 16: {
 
-              gameTime_ = input.readUInt32();
+              isHome_ = input.readBool();
               break;
             }
-            case 72: {
+            case 112: {
 
-              isHome_ = input.readBool();
+              uid_ = input.readUInt32();
               break;
             }
             case 120: {
 
-              uid_ = input.readUInt32();
+              gameTime_ = input.readUInt32();
               break;
             }
             default: {
@@ -132,10 +144,29 @@ private PlayerGameTimeNotify(
               emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNotify.class, emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNotify.Builder.class);
     }
 
-    public static final int GAME_TIME_FIELD_NUMBER = 4;
+    public static final int UID_FIELD_NUMBER = 14;
+    private int uid_;
+    /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 uid = 14;</code>
+     * @return The uid.
+     */
+    @java.lang.Override
+    public int getUid() {
+      return uid_;
+    }
+
+    public static final int GAME_TIME_FIELD_NUMBER = 15;
     private int gameTime_;
     /**
-     * <code>uint32 game_time = 4;</code>
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 game_time = 15;</code>
      * @return The gameTime.
      */
     @java.lang.Override
@@ -143,10 +174,14 @@ public int getGameTime() {
       return gameTime_;
     }
 
-    public static final int IS_HOME_FIELD_NUMBER = 9;
+    public static final int IS_HOME_FIELD_NUMBER = 2;
     private boolean isHome_;
     /**
-     * <code>bool is_home = 9;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>bool is_home = 2;</code>
      * @return The isHome.
      */
     @java.lang.Override
@@ -154,17 +189,6 @@ public boolean getIsHome() {
       return isHome_;
     }
 
-    public static final int UID_FIELD_NUMBER = 15;
-    private int uid_;
-    /**
-     * <code>uint32 uid = 15;</code>
-     * @return The uid.
-     */
-    @java.lang.Override
-    public int getUid() {
-      return uid_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -179,14 +203,14 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (gameTime_ != 0) {
-        output.writeUInt32(4, gameTime_);
-      }
       if (isHome_ != false) {
-        output.writeBool(9, isHome_);
+        output.writeBool(2, isHome_);
       }
       if (uid_ != 0) {
-        output.writeUInt32(15, uid_);
+        output.writeUInt32(14, uid_);
+      }
+      if (gameTime_ != 0) {
+        output.writeUInt32(15, gameTime_);
       }
       unknownFields.writeTo(output);
     }
@@ -197,17 +221,17 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (gameTime_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, gameTime_);
-      }
       if (isHome_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(9, isHome_);
+          .computeBoolSize(2, isHome_);
       }
       if (uid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, uid_);
+          .computeUInt32Size(14, uid_);
+      }
+      if (gameTime_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(15, gameTime_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -224,12 +248,12 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNotify other = (emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNotify) obj;
 
+      if (getUid()
+          != other.getUid()) return false;
       if (getGameTime()
           != other.getGameTime()) return false;
       if (getIsHome()
           != other.getIsHome()) return false;
-      if (getUid()
-          != other.getUid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -241,13 +265,13 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + UID_FIELD_NUMBER;
+      hash = (53 * hash) + getUid();
       hash = (37 * hash) + GAME_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getGameTime();
       hash = (37 * hash) + IS_HOME_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsHome());
-      hash = (37 * hash) + UID_FIELD_NUMBER;
-      hash = (53 * hash) + getUid();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -345,7 +369,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 4423
+     * CmdId: 1970
      * </pre>
      *
      * Protobuf type {@code PlayerGameTimeNotify}
@@ -385,12 +409,12 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        uid_ = 0;
+
         gameTime_ = 0;
 
         isHome_ = false;
 
-        uid_ = 0;
-
         return this;
       }
 
@@ -417,9 +441,9 @@ public emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNo
       @java.lang.Override
       public emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNotify buildPartial() {
         emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNotify result = new emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNotify(this);
+        result.uid_ = uid_;
         result.gameTime_ = gameTime_;
         result.isHome_ = isHome_;
-        result.uid_ = uid_;
         onBuilt();
         return result;
       }
@@ -468,15 +492,15 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNotify other) {
         if (other == emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNotify.getDefaultInstance()) return this;
+        if (other.getUid() != 0) {
+          setUid(other.getUid());
+        }
         if (other.getGameTime() != 0) {
           setGameTime(other.getGameTime());
         }
         if (other.getIsHome() != false) {
           setIsHome(other.getIsHome());
         }
-        if (other.getUid() != 0) {
-          setUid(other.getUid());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -506,95 +530,131 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int gameTime_ ;
+      private int uid_ ;
       /**
-       * <code>uint32 game_time = 4;</code>
-       * @return The gameTime.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 uid = 14;</code>
+       * @return The uid.
        */
       @java.lang.Override
-      public int getGameTime() {
-        return gameTime_;
+      public int getUid() {
+        return uid_;
       }
       /**
-       * <code>uint32 game_time = 4;</code>
-       * @param value The gameTime to set.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 uid = 14;</code>
+       * @param value The uid to set.
        * @return This builder for chaining.
        */
-      public Builder setGameTime(int value) {
+      public Builder setUid(int value) {
         
-        gameTime_ = value;
+        uid_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 game_time = 4;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 uid = 14;</code>
        * @return This builder for chaining.
        */
-      public Builder clearGameTime() {
+      public Builder clearUid() {
         
-        gameTime_ = 0;
+        uid_ = 0;
         onChanged();
         return this;
       }
 
-      private boolean isHome_ ;
+      private int gameTime_ ;
       /**
-       * <code>bool is_home = 9;</code>
-       * @return The isHome.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 game_time = 15;</code>
+       * @return The gameTime.
        */
       @java.lang.Override
-      public boolean getIsHome() {
-        return isHome_;
+      public int getGameTime() {
+        return gameTime_;
       }
       /**
-       * <code>bool is_home = 9;</code>
-       * @param value The isHome to set.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 game_time = 15;</code>
+       * @param value The gameTime to set.
        * @return This builder for chaining.
        */
-      public Builder setIsHome(boolean value) {
+      public Builder setGameTime(int value) {
         
-        isHome_ = value;
+        gameTime_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bool is_home = 9;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 game_time = 15;</code>
        * @return This builder for chaining.
        */
-      public Builder clearIsHome() {
+      public Builder clearGameTime() {
         
-        isHome_ = false;
+        gameTime_ = 0;
         onChanged();
         return this;
       }
 
-      private int uid_ ;
+      private boolean isHome_ ;
       /**
-       * <code>uint32 uid = 15;</code>
-       * @return The uid.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>bool is_home = 2;</code>
+       * @return The isHome.
        */
       @java.lang.Override
-      public int getUid() {
-        return uid_;
+      public boolean getIsHome() {
+        return isHome_;
       }
       /**
-       * <code>uint32 uid = 15;</code>
-       * @param value The uid to set.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>bool is_home = 2;</code>
+       * @param value The isHome to set.
        * @return This builder for chaining.
        */
-      public Builder setUid(int value) {
+      public Builder setIsHome(boolean value) {
         
-        uid_ = value;
+        isHome_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 uid = 15;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>bool is_home = 2;</code>
        * @return This builder for chaining.
        */
-      public Builder clearUid() {
+      public Builder clearIsHome() {
         
-        uid_ = 0;
+        isHome_ = false;
         onChanged();
         return this;
       }
@@ -666,8 +726,8 @@ public emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNo
   static {
     java.lang.String[] descriptorData = {
       "\n\032PlayerGameTimeNotify.proto\"G\n\024PlayerGa" +
-      "meTimeNotify\022\021\n\tgame_time\030\004 \001(\r\022\017\n\007is_ho" +
-      "me\030\t \001(\010\022\013\n\003uid\030\017 \001(\rB\033\n\031emu.grasscutter" +
+      "meTimeNotify\022\013\n\003uid\030\016 \001(\r\022\021\n\tgame_time\030\017" +
+      " \001(\r\022\017\n\007is_home\030\002 \001(\010B\033\n\031emu.grasscutter" +
       ".net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -679,7 +739,7 @@ public emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNo
     internal_static_PlayerGameTimeNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerGameTimeNotify_descriptor,
-        new java.lang.String[] { "GameTime", "IsHome", "Uid", });
+        new java.lang.String[] { "Uid", "GameTime", "IsHome", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerLoginReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerLoginReqOuterClass.java
index 788bbd7cebb..95b3dacceec 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerLoginReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerLoginReqOuterClass.java
@@ -19,12 +19,12 @@ public interface PlayerLoginReqOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>string token = 1;</code>
+     * <code>string token = 15;</code>
      * @return The token.
      */
     java.lang.String getToken();
     /**
-     * <code>string token = 1;</code>
+     * <code>string token = 15;</code>
      * @return The bytes for token.
      */
     com.google.protobuf.ByteString
@@ -42,6 +42,36 @@ public interface PlayerLoginReqOrBuilder extends
     com.google.protobuf.ByteString
         getPlatformBytes();
 
+    /**
+     * <code>uint32 tag = 443;</code>
+     * @return The tag.
+     */
+    int getTag();
+
+    /**
+     * <code>string account_uid = 8;</code>
+     * @return The accountUid.
+     */
+    java.lang.String getAccountUid();
+    /**
+     * <code>string account_uid = 8;</code>
+     * @return The bytes for accountUid.
+     */
+    com.google.protobuf.ByteString
+        getAccountUidBytes();
+
+    /**
+     * <code>uint32 platform_type = 3;</code>
+     * @return The platformType.
+     */
+    int getPlatformType();
+
+    /**
+     * <code>uint32 target_uid = 14;</code>
+     * @return The targetUid.
+     */
+    int getTargetUid();
+
     /**
      * <code>bytes extra_bin_data = 1183;</code>
      * @return The extraBinData.
@@ -60,18 +90,6 @@ public interface PlayerLoginReqOrBuilder extends
     com.google.protobuf.ByteString
         getCountryCodeBytes();
 
-    /**
-     * <code>string account_uid = 11;</code>
-     * @return The accountUid.
-     */
-    java.lang.String getAccountUid();
-    /**
-     * <code>string account_uid = 11;</code>
-     * @return The bytes for accountUid.
-     */
-    com.google.protobuf.ByteString
-        getAccountUidBytes();
-
     /**
      * <code>uint32 account_type = 9;</code>
      * @return The accountType.
@@ -96,12 +114,6 @@ public interface PlayerLoginReqOrBuilder extends
      */
     long getLoginRand();
 
-    /**
-     * <code>uint32 tag = 1158;</code>
-     * @return The tag.
-     */
-    int getTag();
-
     /**
      * <code>uint32 client_data_version = 420;</code>
      * @return The clientDataVersion.
@@ -113,22 +125,10 @@ public interface PlayerLoginReqOrBuilder extends
      * @return The gmUid.
      */
     int getGmUid();
-
-    /**
-     * <code>uint32 platform_type = 2;</code>
-     * @return The platformType.
-     */
-    int getPlatformType();
-
-    /**
-     * <code>uint32 target_uid = 8;</code>
-     * @return The targetUid.
-     */
-    int getTargetUid();
   }
   /**
    * <pre>
-   * CmdId: 20206
+   * CmdId: 6606
    * </pre>
    *
    * Protobuf type {@code PlayerLoginReq}
@@ -145,9 +145,9 @@ private PlayerLoginReq(com.google.protobuf.GeneratedMessageV3.Builder<?> builder
     private PlayerLoginReq() {
       token_ = "";
       platform_ = "";
+      accountUid_ = "";
       extraBinData_ = com.google.protobuf.ByteString.EMPTY;
       countryCode_ = "";
-      accountUid_ = "";
     }
 
     @java.lang.Override
@@ -180,13 +180,7 @@ private PlayerLoginReq(
             case 0:
               done = true;
               break;
-            case 10: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              token_ = s;
-              break;
-            }
-            case 16: {
+            case 24: {
 
               platformType_ = input.readUInt32();
               break;
@@ -196,9 +190,10 @@ private PlayerLoginReq(
               isGuest_ = input.readBool();
               break;
             }
-            case 64: {
+            case 66: {
+              java.lang.String s = input.readStringRequireUtf8();
 
-              targetUid_ = input.readUInt32();
+              accountUid_ = s;
               break;
             }
             case 72: {
@@ -206,16 +201,21 @@ private PlayerLoginReq(
               accountType_ = input.readUInt32();
               break;
             }
-            case 90: {
+            case 98: {
               java.lang.String s = input.readStringRequireUtf8();
 
-              accountUid_ = s;
+              platform_ = s;
               break;
             }
-            case 98: {
+            case 112: {
+
+              targetUid_ = input.readUInt32();
+              break;
+            }
+            case 122: {
               java.lang.String s = input.readStringRequireUtf8();
 
-              platform_ = s;
+              token_ = s;
               break;
             }
             case 960: {
@@ -233,14 +233,14 @@ private PlayerLoginReq(
               clientDataVersion_ = input.readUInt32();
               break;
             }
-            case 5512: {
+            case 3544: {
 
-              gmUid_ = input.readUInt32();
+              tag_ = input.readUInt32();
               break;
             }
-            case 9264: {
+            case 5512: {
 
-              tag_ = input.readUInt32();
+              gmUid_ = input.readUInt32();
               break;
             }
             case 9466: {
@@ -286,10 +286,10 @@ private PlayerLoginReq(
               emu.grasscutter.net.proto.PlayerLoginReqOuterClass.PlayerLoginReq.class, emu.grasscutter.net.proto.PlayerLoginReqOuterClass.PlayerLoginReq.Builder.class);
     }
 
-    public static final int TOKEN_FIELD_NUMBER = 1;
+    public static final int TOKEN_FIELD_NUMBER = 15;
     private volatile java.lang.Object token_;
     /**
-     * <code>string token = 1;</code>
+     * <code>string token = 15;</code>
      * @return The token.
      */
     @java.lang.Override
@@ -306,7 +306,7 @@ public java.lang.String getToken() {
       }
     }
     /**
-     * <code>string token = 1;</code>
+     * <code>string token = 15;</code>
      * @return The bytes for token.
      */
     @java.lang.Override
@@ -362,87 +362,120 @@ public java.lang.String getPlatform() {
       }
     }
 
-    public static final int EXTRA_BIN_DATA_FIELD_NUMBER = 1183;
-    private com.google.protobuf.ByteString extraBinData_;
+    public static final int TAG_FIELD_NUMBER = 443;
+    private int tag_;
     /**
-     * <code>bytes extra_bin_data = 1183;</code>
-     * @return The extraBinData.
+     * <code>uint32 tag = 443;</code>
+     * @return The tag.
      */
     @java.lang.Override
-    public com.google.protobuf.ByteString getExtraBinData() {
-      return extraBinData_;
+    public int getTag() {
+      return tag_;
     }
 
-    public static final int COUNTRY_CODE_FIELD_NUMBER = 1774;
-    private volatile java.lang.Object countryCode_;
+    public static final int ACCOUNT_UID_FIELD_NUMBER = 8;
+    private volatile java.lang.Object accountUid_;
     /**
-     * <code>string country_code = 1774;</code>
-     * @return The countryCode.
+     * <code>string account_uid = 8;</code>
+     * @return The accountUid.
      */
     @java.lang.Override
-    public java.lang.String getCountryCode() {
-      java.lang.Object ref = countryCode_;
+    public java.lang.String getAccountUid() {
+      java.lang.Object ref = accountUid_;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
         com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
-        countryCode_ = s;
+        accountUid_ = s;
         return s;
       }
     }
     /**
-     * <code>string country_code = 1774;</code>
-     * @return The bytes for countryCode.
+     * <code>string account_uid = 8;</code>
+     * @return The bytes for accountUid.
      */
     @java.lang.Override
     public com.google.protobuf.ByteString
-        getCountryCodeBytes() {
-      java.lang.Object ref = countryCode_;
+        getAccountUidBytes() {
+      java.lang.Object ref = accountUid_;
       if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
-        countryCode_ = b;
+        accountUid_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
       }
     }
 
-    public static final int ACCOUNT_UID_FIELD_NUMBER = 11;
-    private volatile java.lang.Object accountUid_;
+    public static final int PLATFORM_TYPE_FIELD_NUMBER = 3;
+    private int platformType_;
     /**
-     * <code>string account_uid = 11;</code>
-     * @return The accountUid.
+     * <code>uint32 platform_type = 3;</code>
+     * @return The platformType.
      */
     @java.lang.Override
-    public java.lang.String getAccountUid() {
-      java.lang.Object ref = accountUid_;
+    public int getPlatformType() {
+      return platformType_;
+    }
+
+    public static final int TARGET_UID_FIELD_NUMBER = 14;
+    private int targetUid_;
+    /**
+     * <code>uint32 target_uid = 14;</code>
+     * @return The targetUid.
+     */
+    @java.lang.Override
+    public int getTargetUid() {
+      return targetUid_;
+    }
+
+    public static final int EXTRA_BIN_DATA_FIELD_NUMBER = 1183;
+    private com.google.protobuf.ByteString extraBinData_;
+    /**
+     * <code>bytes extra_bin_data = 1183;</code>
+     * @return The extraBinData.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString getExtraBinData() {
+      return extraBinData_;
+    }
+
+    public static final int COUNTRY_CODE_FIELD_NUMBER = 1774;
+    private volatile java.lang.Object countryCode_;
+    /**
+     * <code>string country_code = 1774;</code>
+     * @return The countryCode.
+     */
+    @java.lang.Override
+    public java.lang.String getCountryCode() {
+      java.lang.Object ref = countryCode_;
       if (ref instanceof java.lang.String) {
         return (java.lang.String) ref;
       } else {
         com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
-        accountUid_ = s;
+        countryCode_ = s;
         return s;
       }
     }
     /**
-     * <code>string account_uid = 11;</code>
-     * @return The bytes for accountUid.
+     * <code>string country_code = 1774;</code>
+     * @return The bytes for countryCode.
      */
     @java.lang.Override
     public com.google.protobuf.ByteString
-        getAccountUidBytes() {
-      java.lang.Object ref = accountUid_;
+        getCountryCodeBytes() {
+      java.lang.Object ref = countryCode_;
       if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
-        accountUid_ = b;
+        countryCode_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
@@ -493,17 +526,6 @@ public long getLoginRand() {
       return loginRand_;
     }
 
-    public static final int TAG_FIELD_NUMBER = 1158;
-    private int tag_;
-    /**
-     * <code>uint32 tag = 1158;</code>
-     * @return The tag.
-     */
-    @java.lang.Override
-    public int getTag() {
-      return tag_;
-    }
-
     public static final int CLIENT_DATA_VERSION_FIELD_NUMBER = 420;
     private int clientDataVersion_;
     /**
@@ -526,28 +548,6 @@ public int getGmUid() {
       return gmUid_;
     }
 
-    public static final int PLATFORM_TYPE_FIELD_NUMBER = 2;
-    private int platformType_;
-    /**
-     * <code>uint32 platform_type = 2;</code>
-     * @return The platformType.
-     */
-    @java.lang.Override
-    public int getPlatformType() {
-      return platformType_;
-    }
-
-    public static final int TARGET_UID_FIELD_NUMBER = 8;
-    private int targetUid_;
-    /**
-     * <code>uint32 target_uid = 8;</code>
-     * @return The targetUid.
-     */
-    @java.lang.Override
-    public int getTargetUid() {
-      return targetUid_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -562,27 +562,27 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(token_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1, token_);
-      }
       if (platformType_ != 0) {
-        output.writeUInt32(2, platformType_);
+        output.writeUInt32(3, platformType_);
       }
       if (isGuest_ != false) {
         output.writeBool(6, isGuest_);
       }
-      if (targetUid_ != 0) {
-        output.writeUInt32(8, targetUid_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(accountUid_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 8, accountUid_);
       }
       if (accountType_ != 0) {
         output.writeUInt32(9, accountType_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(accountUid_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 11, accountUid_);
-      }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(platform_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 12, platform_);
       }
+      if (targetUid_ != 0) {
+        output.writeUInt32(14, targetUid_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(token_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 15, token_);
+      }
       if (loginRand_ != 0L) {
         output.writeUInt64(120, loginRand_);
       }
@@ -592,12 +592,12 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (clientDataVersion_ != 0) {
         output.writeUInt32(420, clientDataVersion_);
       }
+      if (tag_ != 0) {
+        output.writeUInt32(443, tag_);
+      }
       if (gmUid_ != 0) {
         output.writeUInt32(689, gmUid_);
       }
-      if (tag_ != 0) {
-        output.writeUInt32(1158, tag_);
-      }
       if (!extraBinData_.isEmpty()) {
         output.writeBytes(1183, extraBinData_);
       }
@@ -613,31 +613,31 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(token_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, token_);
-      }
       if (platformType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, platformType_);
+          .computeUInt32Size(3, platformType_);
       }
       if (isGuest_ != false) {
         size += com.google.protobuf.CodedOutputStream
           .computeBoolSize(6, isGuest_);
       }
-      if (targetUid_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, targetUid_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(accountUid_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, accountUid_);
       }
       if (accountType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(9, accountType_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(accountUid_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(11, accountUid_);
-      }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(platform_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(12, platform_);
       }
+      if (targetUid_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, targetUid_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(token_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(15, token_);
+      }
       if (loginRand_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt64Size(120, loginRand_);
@@ -650,13 +650,13 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(420, clientDataVersion_);
       }
-      if (gmUid_ != 0) {
+      if (tag_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(689, gmUid_);
+          .computeUInt32Size(443, tag_);
       }
-      if (tag_ != 0) {
+      if (gmUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1158, tag_);
+          .computeUInt32Size(689, gmUid_);
       }
       if (!extraBinData_.isEmpty()) {
         size += com.google.protobuf.CodedOutputStream
@@ -684,12 +684,18 @@ public boolean equals(final java.lang.Object obj) {
           .equals(other.getToken())) return false;
       if (!getPlatform()
           .equals(other.getPlatform())) return false;
+      if (getTag()
+          != other.getTag()) return false;
+      if (!getAccountUid()
+          .equals(other.getAccountUid())) return false;
+      if (getPlatformType()
+          != other.getPlatformType()) return false;
+      if (getTargetUid()
+          != other.getTargetUid()) return false;
       if (!getExtraBinData()
           .equals(other.getExtraBinData())) return false;
       if (!getCountryCode()
           .equals(other.getCountryCode())) return false;
-      if (!getAccountUid()
-          .equals(other.getAccountUid())) return false;
       if (getAccountType()
           != other.getAccountType()) return false;
       if (getTargetHomeOwnerUid()
@@ -698,16 +704,10 @@ public boolean equals(final java.lang.Object obj) {
           != other.getIsGuest()) return false;
       if (getLoginRand()
           != other.getLoginRand()) return false;
-      if (getTag()
-          != other.getTag()) return false;
       if (getClientDataVersion()
           != other.getClientDataVersion()) return false;
       if (getGmUid()
           != other.getGmUid()) return false;
-      if (getPlatformType()
-          != other.getPlatformType()) return false;
-      if (getTargetUid()
-          != other.getTargetUid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -723,12 +723,18 @@ public int hashCode() {
       hash = (53 * hash) + getToken().hashCode();
       hash = (37 * hash) + PLATFORM_FIELD_NUMBER;
       hash = (53 * hash) + getPlatform().hashCode();
+      hash = (37 * hash) + TAG_FIELD_NUMBER;
+      hash = (53 * hash) + getTag();
+      hash = (37 * hash) + ACCOUNT_UID_FIELD_NUMBER;
+      hash = (53 * hash) + getAccountUid().hashCode();
+      hash = (37 * hash) + PLATFORM_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + getPlatformType();
+      hash = (37 * hash) + TARGET_UID_FIELD_NUMBER;
+      hash = (53 * hash) + getTargetUid();
       hash = (37 * hash) + EXTRA_BIN_DATA_FIELD_NUMBER;
       hash = (53 * hash) + getExtraBinData().hashCode();
       hash = (37 * hash) + COUNTRY_CODE_FIELD_NUMBER;
       hash = (53 * hash) + getCountryCode().hashCode();
-      hash = (37 * hash) + ACCOUNT_UID_FIELD_NUMBER;
-      hash = (53 * hash) + getAccountUid().hashCode();
       hash = (37 * hash) + ACCOUNT_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + getAccountType();
       hash = (37 * hash) + TARGET_HOME_OWNER_UID_FIELD_NUMBER;
@@ -739,16 +745,10 @@ public int hashCode() {
       hash = (37 * hash) + LOGIN_RAND_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getLoginRand());
-      hash = (37 * hash) + TAG_FIELD_NUMBER;
-      hash = (53 * hash) + getTag();
       hash = (37 * hash) + CLIENT_DATA_VERSION_FIELD_NUMBER;
       hash = (53 * hash) + getClientDataVersion();
       hash = (37 * hash) + GM_UID_FIELD_NUMBER;
       hash = (53 * hash) + getGmUid();
-      hash = (37 * hash) + PLATFORM_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + getPlatformType();
-      hash = (37 * hash) + TARGET_UID_FIELD_NUMBER;
-      hash = (53 * hash) + getTargetUid();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -846,7 +846,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 20206
+     * CmdId: 6606
      * </pre>
      *
      * Protobuf type {@code PlayerLoginReq}
@@ -890,30 +890,30 @@ public Builder clear() {
 
         platform_ = "";
 
-        extraBinData_ = com.google.protobuf.ByteString.EMPTY;
-
-        countryCode_ = "";
+        tag_ = 0;
 
         accountUid_ = "";
 
-        accountType_ = 0;
+        platformType_ = 0;
 
-        targetHomeOwnerUid_ = 0;
+        targetUid_ = 0;
+
+        extraBinData_ = com.google.protobuf.ByteString.EMPTY;
+
+        countryCode_ = "";
+
+        accountType_ = 0;
+
+        targetHomeOwnerUid_ = 0;
 
         isGuest_ = false;
 
         loginRand_ = 0L;
 
-        tag_ = 0;
-
         clientDataVersion_ = 0;
 
         gmUid_ = 0;
 
-        platformType_ = 0;
-
-        targetUid_ = 0;
-
         return this;
       }
 
@@ -942,18 +942,18 @@ public emu.grasscutter.net.proto.PlayerLoginReqOuterClass.PlayerLoginReq buildPa
         emu.grasscutter.net.proto.PlayerLoginReqOuterClass.PlayerLoginReq result = new emu.grasscutter.net.proto.PlayerLoginReqOuterClass.PlayerLoginReq(this);
         result.token_ = token_;
         result.platform_ = platform_;
+        result.tag_ = tag_;
+        result.accountUid_ = accountUid_;
+        result.platformType_ = platformType_;
+        result.targetUid_ = targetUid_;
         result.extraBinData_ = extraBinData_;
         result.countryCode_ = countryCode_;
-        result.accountUid_ = accountUid_;
         result.accountType_ = accountType_;
         result.targetHomeOwnerUid_ = targetHomeOwnerUid_;
         result.isGuest_ = isGuest_;
         result.loginRand_ = loginRand_;
-        result.tag_ = tag_;
         result.clientDataVersion_ = clientDataVersion_;
         result.gmUid_ = gmUid_;
-        result.platformType_ = platformType_;
-        result.targetUid_ = targetUid_;
         onBuilt();
         return result;
       }
@@ -1010,6 +1010,19 @@ public Builder mergeFrom(emu.grasscutter.net.proto.PlayerLoginReqOuterClass.Play
           platform_ = other.platform_;
           onChanged();
         }
+        if (other.getTag() != 0) {
+          setTag(other.getTag());
+        }
+        if (!other.getAccountUid().isEmpty()) {
+          accountUid_ = other.accountUid_;
+          onChanged();
+        }
+        if (other.getPlatformType() != 0) {
+          setPlatformType(other.getPlatformType());
+        }
+        if (other.getTargetUid() != 0) {
+          setTargetUid(other.getTargetUid());
+        }
         if (other.getExtraBinData() != com.google.protobuf.ByteString.EMPTY) {
           setExtraBinData(other.getExtraBinData());
         }
@@ -1017,10 +1030,6 @@ public Builder mergeFrom(emu.grasscutter.net.proto.PlayerLoginReqOuterClass.Play
           countryCode_ = other.countryCode_;
           onChanged();
         }
-        if (!other.getAccountUid().isEmpty()) {
-          accountUid_ = other.accountUid_;
-          onChanged();
-        }
         if (other.getAccountType() != 0) {
           setAccountType(other.getAccountType());
         }
@@ -1033,21 +1042,12 @@ public Builder mergeFrom(emu.grasscutter.net.proto.PlayerLoginReqOuterClass.Play
         if (other.getLoginRand() != 0L) {
           setLoginRand(other.getLoginRand());
         }
-        if (other.getTag() != 0) {
-          setTag(other.getTag());
-        }
         if (other.getClientDataVersion() != 0) {
           setClientDataVersion(other.getClientDataVersion());
         }
         if (other.getGmUid() != 0) {
           setGmUid(other.getGmUid());
         }
-        if (other.getPlatformType() != 0) {
-          setPlatformType(other.getPlatformType());
-        }
-        if (other.getTargetUid() != 0) {
-          setTargetUid(other.getTargetUid());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -1079,7 +1079,7 @@ public Builder mergeFrom(
 
       private java.lang.Object token_ = "";
       /**
-       * <code>string token = 1;</code>
+       * <code>string token = 15;</code>
        * @return The token.
        */
       public java.lang.String getToken() {
@@ -1095,7 +1095,7 @@ public java.lang.String getToken() {
         }
       }
       /**
-       * <code>string token = 1;</code>
+       * <code>string token = 15;</code>
        * @return The bytes for token.
        */
       public com.google.protobuf.ByteString
@@ -1112,7 +1112,7 @@ public java.lang.String getToken() {
         }
       }
       /**
-       * <code>string token = 1;</code>
+       * <code>string token = 15;</code>
        * @param value The token to set.
        * @return This builder for chaining.
        */
@@ -1127,7 +1127,7 @@ public Builder setToken(
         return this;
       }
       /**
-       * <code>string token = 1;</code>
+       * <code>string token = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearToken() {
@@ -1137,7 +1137,7 @@ public Builder clearToken() {
         return this;
       }
       /**
-       * <code>string token = 1;</code>
+       * <code>string token = 15;</code>
        * @param value The bytes for token to set.
        * @return This builder for chaining.
        */
@@ -1229,188 +1229,281 @@ public Builder setPlatformBytes(
         return this;
       }
 
-      private com.google.protobuf.ByteString extraBinData_ = com.google.protobuf.ByteString.EMPTY;
+      private int tag_ ;
       /**
-       * <code>bytes extra_bin_data = 1183;</code>
-       * @return The extraBinData.
+       * <code>uint32 tag = 443;</code>
+       * @return The tag.
        */
       @java.lang.Override
-      public com.google.protobuf.ByteString getExtraBinData() {
-        return extraBinData_;
+      public int getTag() {
+        return tag_;
       }
       /**
-       * <code>bytes extra_bin_data = 1183;</code>
-       * @param value The extraBinData to set.
+       * <code>uint32 tag = 443;</code>
+       * @param value The tag to set.
        * @return This builder for chaining.
        */
-      public Builder setExtraBinData(com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        extraBinData_ = value;
+      public Builder setTag(int value) {
+        
+        tag_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bytes extra_bin_data = 1183;</code>
+       * <code>uint32 tag = 443;</code>
        * @return This builder for chaining.
        */
-      public Builder clearExtraBinData() {
+      public Builder clearTag() {
         
-        extraBinData_ = getDefaultInstance().getExtraBinData();
+        tag_ = 0;
         onChanged();
         return this;
       }
 
-      private java.lang.Object countryCode_ = "";
+      private java.lang.Object accountUid_ = "";
       /**
-       * <code>string country_code = 1774;</code>
-       * @return The countryCode.
+       * <code>string account_uid = 8;</code>
+       * @return The accountUid.
        */
-      public java.lang.String getCountryCode() {
-        java.lang.Object ref = countryCode_;
+      public java.lang.String getAccountUid() {
+        java.lang.Object ref = accountUid_;
         if (!(ref instanceof java.lang.String)) {
           com.google.protobuf.ByteString bs =
               (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
-          countryCode_ = s;
+          accountUid_ = s;
           return s;
         } else {
           return (java.lang.String) ref;
         }
       }
       /**
-       * <code>string country_code = 1774;</code>
-       * @return The bytes for countryCode.
+       * <code>string account_uid = 8;</code>
+       * @return The bytes for accountUid.
        */
       public com.google.protobuf.ByteString
-          getCountryCodeBytes() {
-        java.lang.Object ref = countryCode_;
+          getAccountUidBytes() {
+        java.lang.Object ref = accountUid_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
-          countryCode_ = b;
+          accountUid_ = b;
           return b;
         } else {
           return (com.google.protobuf.ByteString) ref;
         }
       }
       /**
-       * <code>string country_code = 1774;</code>
-       * @param value The countryCode to set.
+       * <code>string account_uid = 8;</code>
+       * @param value The accountUid to set.
        * @return This builder for chaining.
        */
-      public Builder setCountryCode(
+      public Builder setAccountUid(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
   
-        countryCode_ = value;
+        accountUid_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>string country_code = 1774;</code>
+       * <code>string account_uid = 8;</code>
        * @return This builder for chaining.
        */
-      public Builder clearCountryCode() {
+      public Builder clearAccountUid() {
         
-        countryCode_ = getDefaultInstance().getCountryCode();
+        accountUid_ = getDefaultInstance().getAccountUid();
         onChanged();
         return this;
       }
       /**
-       * <code>string country_code = 1774;</code>
-       * @param value The bytes for countryCode to set.
+       * <code>string account_uid = 8;</code>
+       * @param value The bytes for accountUid to set.
        * @return This builder for chaining.
        */
-      public Builder setCountryCodeBytes(
+      public Builder setAccountUidBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
         
-        countryCode_ = value;
+        accountUid_ = value;
         onChanged();
         return this;
       }
 
-      private java.lang.Object accountUid_ = "";
+      private int platformType_ ;
       /**
-       * <code>string account_uid = 11;</code>
-       * @return The accountUid.
+       * <code>uint32 platform_type = 3;</code>
+       * @return The platformType.
        */
-      public java.lang.String getAccountUid() {
-        java.lang.Object ref = accountUid_;
+      @java.lang.Override
+      public int getPlatformType() {
+        return platformType_;
+      }
+      /**
+       * <code>uint32 platform_type = 3;</code>
+       * @param value The platformType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPlatformType(int value) {
+        
+        platformType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 platform_type = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPlatformType() {
+        
+        platformType_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int targetUid_ ;
+      /**
+       * <code>uint32 target_uid = 14;</code>
+       * @return The targetUid.
+       */
+      @java.lang.Override
+      public int getTargetUid() {
+        return targetUid_;
+      }
+      /**
+       * <code>uint32 target_uid = 14;</code>
+       * @param value The targetUid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTargetUid(int value) {
+        
+        targetUid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 target_uid = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTargetUid() {
+        
+        targetUid_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.ByteString extraBinData_ = com.google.protobuf.ByteString.EMPTY;
+      /**
+       * <code>bytes extra_bin_data = 1183;</code>
+       * @return The extraBinData.
+       */
+      @java.lang.Override
+      public com.google.protobuf.ByteString getExtraBinData() {
+        return extraBinData_;
+      }
+      /**
+       * <code>bytes extra_bin_data = 1183;</code>
+       * @param value The extraBinData to set.
+       * @return This builder for chaining.
+       */
+      public Builder setExtraBinData(com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        extraBinData_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bytes extra_bin_data = 1183;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearExtraBinData() {
+        
+        extraBinData_ = getDefaultInstance().getExtraBinData();
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object countryCode_ = "";
+      /**
+       * <code>string country_code = 1774;</code>
+       * @return The countryCode.
+       */
+      public java.lang.String getCountryCode() {
+        java.lang.Object ref = countryCode_;
         if (!(ref instanceof java.lang.String)) {
           com.google.protobuf.ByteString bs =
               (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
-          accountUid_ = s;
+          countryCode_ = s;
           return s;
         } else {
           return (java.lang.String) ref;
         }
       }
       /**
-       * <code>string account_uid = 11;</code>
-       * @return The bytes for accountUid.
+       * <code>string country_code = 1774;</code>
+       * @return The bytes for countryCode.
        */
       public com.google.protobuf.ByteString
-          getAccountUidBytes() {
-        java.lang.Object ref = accountUid_;
+          getCountryCodeBytes() {
+        java.lang.Object ref = countryCode_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
-          accountUid_ = b;
+          countryCode_ = b;
           return b;
         } else {
           return (com.google.protobuf.ByteString) ref;
         }
       }
       /**
-       * <code>string account_uid = 11;</code>
-       * @param value The accountUid to set.
+       * <code>string country_code = 1774;</code>
+       * @param value The countryCode to set.
        * @return This builder for chaining.
        */
-      public Builder setAccountUid(
+      public Builder setCountryCode(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
   
-        accountUid_ = value;
+        countryCode_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>string account_uid = 11;</code>
+       * <code>string country_code = 1774;</code>
        * @return This builder for chaining.
        */
-      public Builder clearAccountUid() {
+      public Builder clearCountryCode() {
         
-        accountUid_ = getDefaultInstance().getAccountUid();
+        countryCode_ = getDefaultInstance().getCountryCode();
         onChanged();
         return this;
       }
       /**
-       * <code>string account_uid = 11;</code>
-       * @param value The bytes for accountUid to set.
+       * <code>string country_code = 1774;</code>
+       * @param value The bytes for countryCode to set.
        * @return This builder for chaining.
        */
-      public Builder setAccountUidBytes(
+      public Builder setCountryCodeBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
         
-        accountUid_ = value;
+        countryCode_ = value;
         onChanged();
         return this;
       }
@@ -1539,37 +1632,6 @@ public Builder clearLoginRand() {
         return this;
       }
 
-      private int tag_ ;
-      /**
-       * <code>uint32 tag = 1158;</code>
-       * @return The tag.
-       */
-      @java.lang.Override
-      public int getTag() {
-        return tag_;
-      }
-      /**
-       * <code>uint32 tag = 1158;</code>
-       * @param value The tag to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTag(int value) {
-        
-        tag_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 tag = 1158;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTag() {
-        
-        tag_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int clientDataVersion_ ;
       /**
        * <code>uint32 client_data_version = 420;</code>
@@ -1631,68 +1693,6 @@ public Builder clearGmUid() {
         onChanged();
         return this;
       }
-
-      private int platformType_ ;
-      /**
-       * <code>uint32 platform_type = 2;</code>
-       * @return The platformType.
-       */
-      @java.lang.Override
-      public int getPlatformType() {
-        return platformType_;
-      }
-      /**
-       * <code>uint32 platform_type = 2;</code>
-       * @param value The platformType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPlatformType(int value) {
-        
-        platformType_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 platform_type = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPlatformType() {
-        
-        platformType_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int targetUid_ ;
-      /**
-       * <code>uint32 target_uid = 8;</code>
-       * @return The targetUid.
-       */
-      @java.lang.Override
-      public int getTargetUid() {
-        return targetUid_;
-      }
-      /**
-       * <code>uint32 target_uid = 8;</code>
-       * @param value The targetUid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTargetUid(int value) {
-        
-        targetUid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 target_uid = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTargetUid() {
-        
-        targetUid_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1761,14 +1761,14 @@ public emu.grasscutter.net.proto.PlayerLoginReqOuterClass.PlayerLoginReq getDefa
   static {
     java.lang.String[] descriptorData = {
       "\n\024PlayerLoginReq.proto\"\272\002\n\016PlayerLoginRe" +
-      "q\022\r\n\005token\030\001 \001(\t\022\020\n\010platform\030\014 \001(\t\022\027\n\016ex" +
-      "tra_bin_data\030\237\t \001(\014\022\025\n\014country_code\030\356\r \001" +
-      "(\t\022\023\n\013account_uid\030\013 \001(\t\022\024\n\014account_type\030" +
-      "\t \001(\r\022\036\n\025target_home_owner_uid\030\342\001 \001(\r\022\020\n" +
-      "\010is_guest\030\006 \001(\010\022\022\n\nlogin_rand\030x \001(\004\022\014\n\003t" +
-      "ag\030\206\t \001(\r\022\034\n\023client_data_version\030\244\003 \001(\r\022" +
-      "\017\n\006gm_uid\030\261\005 \001(\r\022\025\n\rplatform_type\030\002 \001(\r\022" +
-      "\022\n\ntarget_uid\030\010 \001(\rB\033\n\031emu.grasscutter.n" +
+      "q\022\r\n\005token\030\017 \001(\t\022\020\n\010platform\030\014 \001(\t\022\014\n\003ta" +
+      "g\030\273\003 \001(\r\022\023\n\013account_uid\030\010 \001(\t\022\025\n\rplatfor" +
+      "m_type\030\003 \001(\r\022\022\n\ntarget_uid\030\016 \001(\r\022\027\n\016extr" +
+      "a_bin_data\030\237\t \001(\014\022\025\n\014country_code\030\356\r \001(\t" +
+      "\022\024\n\014account_type\030\t \001(\r\022\036\n\025target_home_ow" +
+      "ner_uid\030\342\001 \001(\r\022\020\n\010is_guest\030\006 \001(\010\022\022\n\nlogi" +
+      "n_rand\030x \001(\004\022\034\n\023client_data_version\030\244\003 \001" +
+      "(\r\022\017\n\006gm_uid\030\261\005 \001(\rB\033\n\031emu.grasscutter.n" +
       "et.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1780,7 +1780,7 @@ public emu.grasscutter.net.proto.PlayerLoginReqOuterClass.PlayerLoginReq getDefa
     internal_static_PlayerLoginReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerLoginReq_descriptor,
-        new java.lang.String[] { "Token", "Platform", "ExtraBinData", "CountryCode", "AccountUid", "AccountType", "TargetHomeOwnerUid", "IsGuest", "LoginRand", "Tag", "ClientDataVersion", "GmUid", "PlatformType", "TargetUid", });
+        new java.lang.String[] { "Token", "Platform", "Tag", "AccountUid", "PlatformType", "TargetUid", "ExtraBinData", "CountryCode", "AccountType", "TargetHomeOwnerUid", "IsGuest", "LoginRand", "ClientDataVersion", "GmUid", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerLoginRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerLoginRspOuterClass.java
index c5bf1d89141..70721b1d6d6 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerLoginRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerLoginRspOuterClass.java
@@ -19,12 +19,12 @@ public interface PlayerLoginRspOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>string country_code = 633;</code>
+     * <code>string country_code = 1815;</code>
      * @return The countryCode.
      */
     java.lang.String getCountryCode();
     /**
-     * <code>string country_code = 633;</code>
+     * <code>string country_code = 1815;</code>
      * @return The bytes for countryCode.
      */
     com.google.protobuf.ByteString
@@ -43,41 +43,41 @@ public interface PlayerLoginRspOrBuilder extends
         getGameBizBytes();
 
     /**
-     * <code>string client_md5 = 1164;</code>
+     * <code>string client_md5 = 1182;</code>
      * @return The clientMd5.
      */
     java.lang.String getClientMd5();
     /**
-     * <code>string client_md5 = 1164;</code>
+     * <code>string client_md5 = 1182;</code>
      * @return The bytes for clientMd5.
      */
     com.google.protobuf.ByteString
         getClientMd5Bytes();
 
     /**
-     * <code>string client_silence_md5 = 1404;</code>
+     * <code>string client_silence_md5 = 1977;</code>
      * @return The clientSilenceMd5.
      */
     java.lang.String getClientSilenceMd5();
     /**
-     * <code>string client_silence_md5 = 1404;</code>
+     * <code>string client_silence_md5 = 1977;</code>
      * @return The bytes for clientSilenceMd5.
      */
     com.google.protobuf.ByteString
         getClientSilenceMd5Bytes();
 
     /**
-     * <code>.ResVersionConfig res_version_config = 1907;</code>
+     * <code>.ResVersionConfig res_version_config = 1074;</code>
      * @return Whether the resVersionConfig field is set.
      */
     boolean hasResVersionConfig();
     /**
-     * <code>.ResVersionConfig res_version_config = 1907;</code>
+     * <code>.ResVersionConfig res_version_config = 1074;</code>
      * @return The resVersionConfig.
      */
     emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig getResVersionConfig();
     /**
-     * <code>.ResVersionConfig res_version_config = 1907;</code>
+     * <code>.ResVersionConfig res_version_config = 1074;</code>
      */
     emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfigOrBuilder getResVersionConfigOrBuilder();
 
@@ -88,24 +88,24 @@ public interface PlayerLoginRspOrBuilder extends
     double getTotalTickTime();
 
     /**
-     * <code>string client_version_suffix = 1315;</code>
+     * <code>string client_version_suffix = 1756;</code>
      * @return The clientVersionSuffix.
      */
     java.lang.String getClientVersionSuffix();
     /**
-     * <code>string client_version_suffix = 1315;</code>
+     * <code>string client_version_suffix = 1756;</code>
      * @return The bytes for clientVersionSuffix.
      */
     com.google.protobuf.ByteString
         getClientVersionSuffixBytes();
 
     /**
-     * <code>string client_silence_version_suffix = 315;</code>
+     * <code>string client_silence_version_suffix = 552;</code>
      * @return The clientSilenceVersionSuffix.
      */
     java.lang.String getClientSilenceVersionSuffix();
     /**
-     * <code>string client_silence_version_suffix = 315;</code>
+     * <code>string client_silence_version_suffix = 552;</code>
      * @return The bytes for clientSilenceVersionSuffix.
      */
     com.google.protobuf.ByteString
@@ -117,6 +117,39 @@ public interface PlayerLoginRspOrBuilder extends
      */
     com.google.protobuf.ByteString getScInfo();
 
+    /**
+     * <code>uint32 target_uid = 6;</code>
+     * @return The targetUid.
+     */
+    int getTargetUid();
+
+    /**
+     * <code>string msg = 219;</code>
+     * @return The msg.
+     */
+    java.lang.String getMsg();
+    /**
+     * <code>string msg = 219;</code>
+     * @return The bytes for msg.
+     */
+    com.google.protobuf.ByteString
+        getMsgBytes();
+
+    /**
+     * <code>.StopServerInfo ABPMACCDDJH = 1407;</code>
+     * @return Whether the aBPMACCDDJH field is set.
+     */
+    boolean hasABPMACCDDJH();
+    /**
+     * <code>.StopServerInfo ABPMACCDDJH = 1407;</code>
+     * @return The aBPMACCDDJH.
+     */
+    emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo getABPMACCDDJH();
+    /**
+     * <code>.StopServerInfo ABPMACCDDJH = 1407;</code>
+     */
+    emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfoOrBuilder getABPMACCDDJHOrBuilder();
+
     /**
      * <code>bool is_new_player = 100;</code>
      * @return The isNewPlayer.
@@ -129,12 +162,6 @@ public interface PlayerLoginRspOrBuilder extends
      */
     com.google.protobuf.ByteString getPlayerData();
 
-    /**
-     * <code>uint32 target_uid = 5;</code>
-     * @return The targetUid.
-     */
-    int getTargetUid();
-
     /**
      * <code>int32 ability_hash_code = 8;</code>
      * @return The abilityHashCode.
@@ -259,33 +286,6 @@ emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfoOrBuilder g
      */
     int getTargetHomeOwnerUid();
 
-    /**
-     * <code>string msg = 1207;</code>
-     * @return The msg.
-     */
-    java.lang.String getMsg();
-    /**
-     * <code>string msg = 1207;</code>
-     * @return The bytes for msg.
-     */
-    com.google.protobuf.ByteString
-        getMsgBytes();
-
-    /**
-     * <code>.StopServerInfo ABPMACCDDJH = 1530;</code>
-     * @return Whether the aBPMACCDDJH field is set.
-     */
-    boolean hasABPMACCDDJH();
-    /**
-     * <code>.StopServerInfo ABPMACCDDJH = 1530;</code>
-     * @return The aBPMACCDDJH.
-     */
-    emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo getABPMACCDDJH();
-    /**
-     * <code>.StopServerInfo ABPMACCDDJH = 1530;</code>
-     */
-    emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfoOrBuilder getABPMACCDDJHOrBuilder();
-
     /**
      * <code>string next_resource_url = 1549;</code>
      * @return The nextResourceUrl.
@@ -411,10 +411,10 @@ private PlayerLoginRsp() {
       clientVersionSuffix_ = "";
       clientSilenceVersionSuffix_ = "";
       scInfo_ = com.google.protobuf.ByteString.EMPTY;
+      msg_ = "";
       playerData_ = com.google.protobuf.ByteString.EMPTY;
       shortAbilityHashMap_ = java.util.Collections.emptyList();
       featureBlockInfoList_ = java.util.Collections.emptyList();
-      msg_ = "";
       nextResourceUrl_ = "";
       birthday_ = "";
     }
@@ -461,7 +461,7 @@ private PlayerLoginRsp(
               playerData_ = input.readBytes();
               break;
             }
-            case 40: {
+            case 48: {
 
               targetUid_ = input.readUInt32();
               break;
@@ -523,10 +523,10 @@ private PlayerLoginRsp(
               isNewPlayer_ = input.readBool();
               break;
             }
-            case 2522: {
+            case 1754: {
               java.lang.String s = input.readStringRequireUtf8();
 
-              clientSilenceVersionSuffix_ = s;
+              msg_ = s;
               break;
             }
             case 2680: {
@@ -543,15 +543,28 @@ private PlayerLoginRsp(
                   input.readMessage(emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfo.parser(), extensionRegistry));
               break;
             }
+            case 4418: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              clientSilenceVersionSuffix_ = s;
+              break;
+            }
             case 5017: {
 
               totalTickTime_ = input.readDouble();
               break;
             }
-            case 5066: {
-              java.lang.String s = input.readStringRequireUtf8();
+            case 8594: {
+              emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.Builder subBuilder = null;
+              if (resVersionConfig_ != null) {
+                subBuilder = resVersionConfig_.toBuilder();
+              }
+              resVersionConfig_ = input.readMessage(emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(resVersionConfig_);
+                resVersionConfig_ = subBuilder.buildPartial();
+              }
 
-              countryCode_ = s;
               break;
             }
             case 9176: {
@@ -559,7 +572,7 @@ private PlayerLoginRsp(
               targetHomeOwnerUid_ = input.readUInt32();
               break;
             }
-            case 9314: {
+            case 9458: {
               java.lang.String s = input.readStringRequireUtf8();
 
               clientMd5_ = s;
@@ -570,25 +583,7 @@ private PlayerLoginRsp(
               isUseAbilityHash_ = input.readBool();
               break;
             }
-            case 9658: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              msg_ = s;
-              break;
-            }
-            case 10522: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              clientVersionSuffix_ = s;
-              break;
-            }
-            case 11234: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              clientSilenceMd5_ = s;
-              break;
-            }
-            case 12242: {
+            case 11258: {
               emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.Builder subBuilder = null;
               if (aBPMACCDDJH_ != null) {
                 subBuilder = aBPMACCDDJH_.toBuilder();
@@ -626,22 +621,21 @@ private PlayerLoginRsp(
               birthday_ = s;
               break;
             }
-            case 15202: {
+            case 14050: {
+              java.lang.String s = input.readStringRequireUtf8();
 
-              scInfo_ = input.readBytes();
+              clientVersionSuffix_ = s;
               break;
             }
-            case 15258: {
-              emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.Builder subBuilder = null;
-              if (resVersionConfig_ != null) {
-                subBuilder = resVersionConfig_.toBuilder();
-              }
-              resVersionConfig_ = input.readMessage(emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(resVersionConfig_);
-                resVersionConfig_ = subBuilder.buildPartial();
-              }
+            case 14522: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              countryCode_ = s;
+              break;
+            }
+            case 15202: {
 
+              scInfo_ = input.readBytes();
               break;
             }
             case 15802: {
@@ -657,6 +651,12 @@ private PlayerLoginRsp(
 
               break;
             }
+            case 15818: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              clientSilenceMd5_ = s;
+              break;
+            }
             case 15904: {
 
               isTransfer_ = input.readBool();
@@ -719,10 +719,10 @@ protected com.google.protobuf.MapField internalGetMapField(
               emu.grasscutter.net.proto.PlayerLoginRspOuterClass.PlayerLoginRsp.class, emu.grasscutter.net.proto.PlayerLoginRspOuterClass.PlayerLoginRsp.Builder.class);
     }
 
-    public static final int COUNTRY_CODE_FIELD_NUMBER = 633;
+    public static final int COUNTRY_CODE_FIELD_NUMBER = 1815;
     private volatile java.lang.Object countryCode_;
     /**
-     * <code>string country_code = 633;</code>
+     * <code>string country_code = 1815;</code>
      * @return The countryCode.
      */
     @java.lang.Override
@@ -739,7 +739,7 @@ public java.lang.String getCountryCode() {
       }
     }
     /**
-     * <code>string country_code = 633;</code>
+     * <code>string country_code = 1815;</code>
      * @return The bytes for countryCode.
      */
     @java.lang.Override
@@ -795,10 +795,10 @@ public java.lang.String getGameBiz() {
       }
     }
 
-    public static final int CLIENT_MD5_FIELD_NUMBER = 1164;
+    public static final int CLIENT_MD5_FIELD_NUMBER = 1182;
     private volatile java.lang.Object clientMd5_;
     /**
-     * <code>string client_md5 = 1164;</code>
+     * <code>string client_md5 = 1182;</code>
      * @return The clientMd5.
      */
     @java.lang.Override
@@ -815,7 +815,7 @@ public java.lang.String getClientMd5() {
       }
     }
     /**
-     * <code>string client_md5 = 1164;</code>
+     * <code>string client_md5 = 1182;</code>
      * @return The bytes for clientMd5.
      */
     @java.lang.Override
@@ -833,10 +833,10 @@ public java.lang.String getClientMd5() {
       }
     }
 
-    public static final int CLIENT_SILENCE_MD5_FIELD_NUMBER = 1404;
+    public static final int CLIENT_SILENCE_MD5_FIELD_NUMBER = 1977;
     private volatile java.lang.Object clientSilenceMd5_;
     /**
-     * <code>string client_silence_md5 = 1404;</code>
+     * <code>string client_silence_md5 = 1977;</code>
      * @return The clientSilenceMd5.
      */
     @java.lang.Override
@@ -853,7 +853,7 @@ public java.lang.String getClientSilenceMd5() {
       }
     }
     /**
-     * <code>string client_silence_md5 = 1404;</code>
+     * <code>string client_silence_md5 = 1977;</code>
      * @return The bytes for clientSilenceMd5.
      */
     @java.lang.Override
@@ -871,10 +871,10 @@ public java.lang.String getClientSilenceMd5() {
       }
     }
 
-    public static final int RES_VERSION_CONFIG_FIELD_NUMBER = 1907;
+    public static final int RES_VERSION_CONFIG_FIELD_NUMBER = 1074;
     private emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig resVersionConfig_;
     /**
-     * <code>.ResVersionConfig res_version_config = 1907;</code>
+     * <code>.ResVersionConfig res_version_config = 1074;</code>
      * @return Whether the resVersionConfig field is set.
      */
     @java.lang.Override
@@ -882,7 +882,7 @@ public boolean hasResVersionConfig() {
       return resVersionConfig_ != null;
     }
     /**
-     * <code>.ResVersionConfig res_version_config = 1907;</code>
+     * <code>.ResVersionConfig res_version_config = 1074;</code>
      * @return The resVersionConfig.
      */
     @java.lang.Override
@@ -890,7 +890,7 @@ public emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig get
       return resVersionConfig_ == null ? emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.getDefaultInstance() : resVersionConfig_;
     }
     /**
-     * <code>.ResVersionConfig res_version_config = 1907;</code>
+     * <code>.ResVersionConfig res_version_config = 1074;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfigOrBuilder getResVersionConfigOrBuilder() {
@@ -908,10 +908,10 @@ public double getTotalTickTime() {
       return totalTickTime_;
     }
 
-    public static final int CLIENT_VERSION_SUFFIX_FIELD_NUMBER = 1315;
+    public static final int CLIENT_VERSION_SUFFIX_FIELD_NUMBER = 1756;
     private volatile java.lang.Object clientVersionSuffix_;
     /**
-     * <code>string client_version_suffix = 1315;</code>
+     * <code>string client_version_suffix = 1756;</code>
      * @return The clientVersionSuffix.
      */
     @java.lang.Override
@@ -928,7 +928,7 @@ public java.lang.String getClientVersionSuffix() {
       }
     }
     /**
-     * <code>string client_version_suffix = 1315;</code>
+     * <code>string client_version_suffix = 1756;</code>
      * @return The bytes for clientVersionSuffix.
      */
     @java.lang.Override
@@ -946,10 +946,10 @@ public java.lang.String getClientVersionSuffix() {
       }
     }
 
-    public static final int CLIENT_SILENCE_VERSION_SUFFIX_FIELD_NUMBER = 315;
+    public static final int CLIENT_SILENCE_VERSION_SUFFIX_FIELD_NUMBER = 552;
     private volatile java.lang.Object clientSilenceVersionSuffix_;
     /**
-     * <code>string client_silence_version_suffix = 315;</code>
+     * <code>string client_silence_version_suffix = 552;</code>
      * @return The clientSilenceVersionSuffix.
      */
     @java.lang.Override
@@ -966,7 +966,7 @@ public java.lang.String getClientSilenceVersionSuffix() {
       }
     }
     /**
-     * <code>string client_silence_version_suffix = 315;</code>
+     * <code>string client_silence_version_suffix = 552;</code>
      * @return The bytes for clientSilenceVersionSuffix.
      */
     @java.lang.Override
@@ -995,6 +995,81 @@ public com.google.protobuf.ByteString getScInfo() {
       return scInfo_;
     }
 
+    public static final int TARGET_UID_FIELD_NUMBER = 6;
+    private int targetUid_;
+    /**
+     * <code>uint32 target_uid = 6;</code>
+     * @return The targetUid.
+     */
+    @java.lang.Override
+    public int getTargetUid() {
+      return targetUid_;
+    }
+
+    public static final int MSG_FIELD_NUMBER = 219;
+    private volatile java.lang.Object msg_;
+    /**
+     * <code>string msg = 219;</code>
+     * @return The msg.
+     */
+    @java.lang.Override
+    public java.lang.String getMsg() {
+      java.lang.Object ref = msg_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        msg_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string msg = 219;</code>
+     * @return The bytes for msg.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getMsgBytes() {
+      java.lang.Object ref = msg_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        msg_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int ABPMACCDDJH_FIELD_NUMBER = 1407;
+    private emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo aBPMACCDDJH_;
+    /**
+     * <code>.StopServerInfo ABPMACCDDJH = 1407;</code>
+     * @return Whether the aBPMACCDDJH field is set.
+     */
+    @java.lang.Override
+    public boolean hasABPMACCDDJH() {
+      return aBPMACCDDJH_ != null;
+    }
+    /**
+     * <code>.StopServerInfo ABPMACCDDJH = 1407;</code>
+     * @return The aBPMACCDDJH.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo getABPMACCDDJH() {
+      return aBPMACCDDJH_ == null ? emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.getDefaultInstance() : aBPMACCDDJH_;
+    }
+    /**
+     * <code>.StopServerInfo ABPMACCDDJH = 1407;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfoOrBuilder getABPMACCDDJHOrBuilder() {
+      return getABPMACCDDJH();
+    }
+
     public static final int IS_NEW_PLAYER_FIELD_NUMBER = 100;
     private boolean isNewPlayer_;
     /**
@@ -1017,17 +1092,6 @@ public com.google.protobuf.ByteString getPlayerData() {
       return playerData_;
     }
 
-    public static final int TARGET_UID_FIELD_NUMBER = 5;
-    private int targetUid_;
-    /**
-     * <code>uint32 target_uid = 5;</code>
-     * @return The targetUid.
-     */
-    @java.lang.Override
-    public int getTargetUid() {
-      return targetUid_;
-    }
-
     public static final int ABILITY_HASH_CODE_FIELD_NUMBER = 8;
     private int abilityHashCode_;
     /**
@@ -1266,70 +1330,6 @@ public int getTargetHomeOwnerUid() {
       return targetHomeOwnerUid_;
     }
 
-    public static final int MSG_FIELD_NUMBER = 1207;
-    private volatile java.lang.Object msg_;
-    /**
-     * <code>string msg = 1207;</code>
-     * @return The msg.
-     */
-    @java.lang.Override
-    public java.lang.String getMsg() {
-      java.lang.Object ref = msg_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        msg_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string msg = 1207;</code>
-     * @return The bytes for msg.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getMsgBytes() {
-      java.lang.Object ref = msg_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        msg_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    public static final int ABPMACCDDJH_FIELD_NUMBER = 1530;
-    private emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo aBPMACCDDJH_;
-    /**
-     * <code>.StopServerInfo ABPMACCDDJH = 1530;</code>
-     * @return Whether the aBPMACCDDJH field is set.
-     */
-    @java.lang.Override
-    public boolean hasABPMACCDDJH() {
-      return aBPMACCDDJH_ != null;
-    }
-    /**
-     * <code>.StopServerInfo ABPMACCDDJH = 1530;</code>
-     * @return The aBPMACCDDJH.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo getABPMACCDDJH() {
-      return aBPMACCDDJH_ == null ? emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.getDefaultInstance() : aBPMACCDDJH_;
-    }
-    /**
-     * <code>.StopServerInfo ABPMACCDDJH = 1530;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfoOrBuilder getABPMACCDDJHOrBuilder() {
-      return getABPMACCDDJH();
-    }
-
     public static final int NEXT_RESOURCE_URL_FIELD_NUMBER = 1549;
     private volatile java.lang.Object nextResourceUrl_;
     /**
@@ -1582,7 +1582,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
         output.writeBytes(4, playerData_);
       }
       if (targetUid_ != 0) {
-        output.writeUInt32(5, targetUid_);
+        output.writeUInt32(6, targetUid_);
       }
       if (abilityHashCode_ != 0) {
         output.writeInt32(8, abilityHashCode_);
@@ -1614,8 +1614,8 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (isNewPlayer_ != false) {
         output.writeBool(100, isNewPlayer_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientSilenceVersionSuffix_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 315, clientSilenceVersionSuffix_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(msg_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 219, msg_);
       }
       if (isAudit_ != false) {
         output.writeBool(335, isAudit_);
@@ -1623,32 +1623,26 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       for (int i = 0; i < featureBlockInfoList_.size(); i++) {
         output.writeMessage(336, featureBlockInfoList_.get(i));
       }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientSilenceVersionSuffix_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 552, clientSilenceVersionSuffix_);
+      }
       if (totalTickTime_ != 0D) {
         output.writeDouble(627, totalTickTime_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(countryCode_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 633, countryCode_);
+      if (resVersionConfig_ != null) {
+        output.writeMessage(1074, getResVersionConfig());
       }
       if (targetHomeOwnerUid_ != 0) {
         output.writeUInt32(1147, targetHomeOwnerUid_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientMd5_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1164, clientMd5_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1182, clientMd5_);
       }
       if (isUseAbilityHash_ != false) {
         output.writeBool(1192, isUseAbilityHash_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(msg_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1207, msg_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientVersionSuffix_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1315, clientVersionSuffix_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientSilenceMd5_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1404, clientSilenceMd5_);
-      }
-      if (aBPMACCDDJH_ != null) {
-        output.writeMessage(1530, getABPMACCDDJH());
+      if (aBPMACCDDJH_ != null) {
+        output.writeMessage(1407, getABPMACCDDJH());
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextResourceUrl_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 1549, nextResourceUrl_);
@@ -1662,15 +1656,21 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(birthday_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 1688, birthday_);
       }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientVersionSuffix_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1756, clientVersionSuffix_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(countryCode_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1815, countryCode_);
+      }
       if (!scInfo_.isEmpty()) {
         output.writeBytes(1900, scInfo_);
       }
-      if (resVersionConfig_ != null) {
-        output.writeMessage(1907, getResVersionConfig());
-      }
       if (nextResVersionConfig_ != null) {
         output.writeMessage(1975, getNextResVersionConfig());
       }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientSilenceMd5_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1977, clientSilenceMd5_);
+      }
       if (isTransfer_ != false) {
         output.writeBool(1988, isTransfer_);
       }
@@ -1695,7 +1695,7 @@ public int getSerializedSize() {
       }
       if (targetUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, targetUid_);
+          .computeUInt32Size(6, targetUid_);
       }
       if (abilityHashCode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -1739,8 +1739,8 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeBoolSize(100, isNewPlayer_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientSilenceVersionSuffix_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(315, clientSilenceVersionSuffix_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(msg_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(219, msg_);
       }
       if (isAudit_ != false) {
         size += com.google.protobuf.CodedOutputStream
@@ -1750,36 +1750,31 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(336, featureBlockInfoList_.get(i));
       }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientSilenceVersionSuffix_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(552, clientSilenceVersionSuffix_);
+      }
       if (totalTickTime_ != 0D) {
         size += com.google.protobuf.CodedOutputStream
           .computeDoubleSize(627, totalTickTime_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(countryCode_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(633, countryCode_);
+      if (resVersionConfig_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(1074, getResVersionConfig());
       }
       if (targetHomeOwnerUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(1147, targetHomeOwnerUid_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientMd5_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1164, clientMd5_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1182, clientMd5_);
       }
       if (isUseAbilityHash_ != false) {
         size += com.google.protobuf.CodedOutputStream
           .computeBoolSize(1192, isUseAbilityHash_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(msg_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1207, msg_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientVersionSuffix_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1315, clientVersionSuffix_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientSilenceMd5_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1404, clientSilenceMd5_);
-      }
       if (aBPMACCDDJH_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1530, getABPMACCDDJH());
+          .computeMessageSize(1407, getABPMACCDDJH());
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextResourceUrl_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1549, nextResourceUrl_);
@@ -1797,18 +1792,23 @@ public int getSerializedSize() {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(birthday_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1688, birthday_);
       }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientVersionSuffix_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1756, clientVersionSuffix_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(countryCode_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1815, countryCode_);
+      }
       if (!scInfo_.isEmpty()) {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(1900, scInfo_);
       }
-      if (resVersionConfig_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1907, getResVersionConfig());
-      }
       if (nextResVersionConfig_ != null) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(1975, getNextResVersionConfig());
       }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientSilenceMd5_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1977, clientSilenceMd5_);
+      }
       if (isTransfer_ != false) {
         size += com.google.protobuf.CodedOutputStream
           .computeBoolSize(1988, isTransfer_);
@@ -1854,12 +1854,19 @@ public boolean equals(final java.lang.Object obj) {
           .equals(other.getClientSilenceVersionSuffix())) return false;
       if (!getScInfo()
           .equals(other.getScInfo())) return false;
+      if (getTargetUid()
+          != other.getTargetUid()) return false;
+      if (!getMsg()
+          .equals(other.getMsg())) return false;
+      if (hasABPMACCDDJH() != other.hasABPMACCDDJH()) return false;
+      if (hasABPMACCDDJH()) {
+        if (!getABPMACCDDJH()
+            .equals(other.getABPMACCDDJH())) return false;
+      }
       if (getIsNewPlayer()
           != other.getIsNewPlayer()) return false;
       if (!getPlayerData()
           .equals(other.getPlayerData())) return false;
-      if (getTargetUid()
-          != other.getTargetUid()) return false;
       if (getAbilityHashCode()
           != other.getAbilityHashCode()) return false;
       if (getLoginRand()
@@ -1880,13 +1887,6 @@ public boolean equals(final java.lang.Object obj) {
           .equals(other.getFeatureBlockInfoListList())) return false;
       if (getTargetHomeOwnerUid()
           != other.getTargetHomeOwnerUid()) return false;
-      if (!getMsg()
-          .equals(other.getMsg())) return false;
-      if (hasABPMACCDDJH() != other.hasABPMACCDDJH()) return false;
-      if (hasABPMACCDDJH()) {
-        if (!getABPMACCDDJH()
-            .equals(other.getABPMACCDDJH())) return false;
-      }
       if (!getNextResourceUrl()
           .equals(other.getNextResourceUrl())) return false;
       if (!internalGetBlockInfoMap().equals(
@@ -1938,13 +1938,19 @@ public int hashCode() {
       hash = (53 * hash) + getClientSilenceVersionSuffix().hashCode();
       hash = (37 * hash) + SC_INFO_FIELD_NUMBER;
       hash = (53 * hash) + getScInfo().hashCode();
+      hash = (37 * hash) + TARGET_UID_FIELD_NUMBER;
+      hash = (53 * hash) + getTargetUid();
+      hash = (37 * hash) + MSG_FIELD_NUMBER;
+      hash = (53 * hash) + getMsg().hashCode();
+      if (hasABPMACCDDJH()) {
+        hash = (37 * hash) + ABPMACCDDJH_FIELD_NUMBER;
+        hash = (53 * hash) + getABPMACCDDJH().hashCode();
+      }
       hash = (37 * hash) + IS_NEW_PLAYER_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsNewPlayer());
       hash = (37 * hash) + PLAYER_DATA_FIELD_NUMBER;
       hash = (53 * hash) + getPlayerData().hashCode();
-      hash = (37 * hash) + TARGET_UID_FIELD_NUMBER;
-      hash = (53 * hash) + getTargetUid();
       hash = (37 * hash) + ABILITY_HASH_CODE_FIELD_NUMBER;
       hash = (53 * hash) + getAbilityHashCode();
       hash = (37 * hash) + LOGIN_RAND_FIELD_NUMBER;
@@ -1972,12 +1978,6 @@ public int hashCode() {
       }
       hash = (37 * hash) + TARGET_HOME_OWNER_UID_FIELD_NUMBER;
       hash = (53 * hash) + getTargetHomeOwnerUid();
-      hash = (37 * hash) + MSG_FIELD_NUMBER;
-      hash = (53 * hash) + getMsg().hashCode();
-      if (hasABPMACCDDJH()) {
-        hash = (37 * hash) + ABPMACCDDJH_FIELD_NUMBER;
-        hash = (53 * hash) + getABPMACCDDJH().hashCode();
-      }
       hash = (37 * hash) + NEXT_RESOURCE_URL_FIELD_NUMBER;
       hash = (53 * hash) + getNextResourceUrl().hashCode();
       if (!internalGetBlockInfoMap().getMap().isEmpty()) {
@@ -2189,12 +2189,20 @@ public Builder clear() {
 
         scInfo_ = com.google.protobuf.ByteString.EMPTY;
 
+        targetUid_ = 0;
+
+        msg_ = "";
+
+        if (aBPMACCDDJHBuilder_ == null) {
+          aBPMACCDDJH_ = null;
+        } else {
+          aBPMACCDDJH_ = null;
+          aBPMACCDDJHBuilder_ = null;
+        }
         isNewPlayer_ = false;
 
         playerData_ = com.google.protobuf.ByteString.EMPTY;
 
-        targetUid_ = 0;
-
         abilityHashCode_ = 0;
 
         loginRand_ = 0L;
@@ -2222,14 +2230,6 @@ public Builder clear() {
         }
         targetHomeOwnerUid_ = 0;
 
-        msg_ = "";
-
-        if (aBPMACCDDJHBuilder_ == null) {
-          aBPMACCDDJH_ = null;
-        } else {
-          aBPMACCDDJH_ = null;
-          aBPMACCDDJHBuilder_ = null;
-        }
         nextResourceUrl_ = "";
 
         internalGetMutableBlockInfoMap().clear();
@@ -2289,9 +2289,15 @@ public emu.grasscutter.net.proto.PlayerLoginRspOuterClass.PlayerLoginRsp buildPa
         result.clientVersionSuffix_ = clientVersionSuffix_;
         result.clientSilenceVersionSuffix_ = clientSilenceVersionSuffix_;
         result.scInfo_ = scInfo_;
+        result.targetUid_ = targetUid_;
+        result.msg_ = msg_;
+        if (aBPMACCDDJHBuilder_ == null) {
+          result.aBPMACCDDJH_ = aBPMACCDDJH_;
+        } else {
+          result.aBPMACCDDJH_ = aBPMACCDDJHBuilder_.build();
+        }
         result.isNewPlayer_ = isNewPlayer_;
         result.playerData_ = playerData_;
-        result.targetUid_ = targetUid_;
         result.abilityHashCode_ = abilityHashCode_;
         result.loginRand_ = loginRand_;
         result.playerDataVersion_ = playerDataVersion_;
@@ -2319,12 +2325,6 @@ public emu.grasscutter.net.proto.PlayerLoginRspOuterClass.PlayerLoginRsp buildPa
           result.featureBlockInfoList_ = featureBlockInfoListBuilder_.build();
         }
         result.targetHomeOwnerUid_ = targetHomeOwnerUid_;
-        result.msg_ = msg_;
-        if (aBPMACCDDJHBuilder_ == null) {
-          result.aBPMACCDDJH_ = aBPMACCDDJH_;
-        } else {
-          result.aBPMACCDDJH_ = aBPMACCDDJHBuilder_.build();
-        }
         result.nextResourceUrl_ = nextResourceUrl_;
         result.blockInfoMap_ = internalGetBlockInfoMap();
         result.blockInfoMap_.makeImmutable();
@@ -2419,15 +2419,22 @@ public Builder mergeFrom(emu.grasscutter.net.proto.PlayerLoginRspOuterClass.Play
         if (other.getScInfo() != com.google.protobuf.ByteString.EMPTY) {
           setScInfo(other.getScInfo());
         }
+        if (other.getTargetUid() != 0) {
+          setTargetUid(other.getTargetUid());
+        }
+        if (!other.getMsg().isEmpty()) {
+          msg_ = other.msg_;
+          onChanged();
+        }
+        if (other.hasABPMACCDDJH()) {
+          mergeABPMACCDDJH(other.getABPMACCDDJH());
+        }
         if (other.getIsNewPlayer() != false) {
           setIsNewPlayer(other.getIsNewPlayer());
         }
         if (other.getPlayerData() != com.google.protobuf.ByteString.EMPTY) {
           setPlayerData(other.getPlayerData());
         }
-        if (other.getTargetUid() != 0) {
-          setTargetUid(other.getTargetUid());
-        }
         if (other.getAbilityHashCode() != 0) {
           setAbilityHashCode(other.getAbilityHashCode());
         }
@@ -2503,13 +2510,6 @@ public Builder mergeFrom(emu.grasscutter.net.proto.PlayerLoginRspOuterClass.Play
         if (other.getTargetHomeOwnerUid() != 0) {
           setTargetHomeOwnerUid(other.getTargetHomeOwnerUid());
         }
-        if (!other.getMsg().isEmpty()) {
-          msg_ = other.msg_;
-          onChanged();
-        }
-        if (other.hasABPMACCDDJH()) {
-          mergeABPMACCDDJH(other.getABPMACCDDJH());
-        }
         if (!other.getNextResourceUrl().isEmpty()) {
           nextResourceUrl_ = other.nextResourceUrl_;
           onChanged();
@@ -2567,7 +2567,7 @@ public Builder mergeFrom(
 
       private java.lang.Object countryCode_ = "";
       /**
-       * <code>string country_code = 633;</code>
+       * <code>string country_code = 1815;</code>
        * @return The countryCode.
        */
       public java.lang.String getCountryCode() {
@@ -2583,7 +2583,7 @@ public java.lang.String getCountryCode() {
         }
       }
       /**
-       * <code>string country_code = 633;</code>
+       * <code>string country_code = 1815;</code>
        * @return The bytes for countryCode.
        */
       public com.google.protobuf.ByteString
@@ -2600,7 +2600,7 @@ public java.lang.String getCountryCode() {
         }
       }
       /**
-       * <code>string country_code = 633;</code>
+       * <code>string country_code = 1815;</code>
        * @param value The countryCode to set.
        * @return This builder for chaining.
        */
@@ -2615,7 +2615,7 @@ public Builder setCountryCode(
         return this;
       }
       /**
-       * <code>string country_code = 633;</code>
+       * <code>string country_code = 1815;</code>
        * @return This builder for chaining.
        */
       public Builder clearCountryCode() {
@@ -2625,7 +2625,7 @@ public Builder clearCountryCode() {
         return this;
       }
       /**
-       * <code>string country_code = 633;</code>
+       * <code>string country_code = 1815;</code>
        * @param value The bytes for countryCode to set.
        * @return This builder for chaining.
        */
@@ -2719,7 +2719,7 @@ public Builder setGameBizBytes(
 
       private java.lang.Object clientMd5_ = "";
       /**
-       * <code>string client_md5 = 1164;</code>
+       * <code>string client_md5 = 1182;</code>
        * @return The clientMd5.
        */
       public java.lang.String getClientMd5() {
@@ -2735,7 +2735,7 @@ public java.lang.String getClientMd5() {
         }
       }
       /**
-       * <code>string client_md5 = 1164;</code>
+       * <code>string client_md5 = 1182;</code>
        * @return The bytes for clientMd5.
        */
       public com.google.protobuf.ByteString
@@ -2752,7 +2752,7 @@ public java.lang.String getClientMd5() {
         }
       }
       /**
-       * <code>string client_md5 = 1164;</code>
+       * <code>string client_md5 = 1182;</code>
        * @param value The clientMd5 to set.
        * @return This builder for chaining.
        */
@@ -2767,7 +2767,7 @@ public Builder setClientMd5(
         return this;
       }
       /**
-       * <code>string client_md5 = 1164;</code>
+       * <code>string client_md5 = 1182;</code>
        * @return This builder for chaining.
        */
       public Builder clearClientMd5() {
@@ -2777,7 +2777,7 @@ public Builder clearClientMd5() {
         return this;
       }
       /**
-       * <code>string client_md5 = 1164;</code>
+       * <code>string client_md5 = 1182;</code>
        * @param value The bytes for clientMd5 to set.
        * @return This builder for chaining.
        */
@@ -2795,7 +2795,7 @@ public Builder setClientMd5Bytes(
 
       private java.lang.Object clientSilenceMd5_ = "";
       /**
-       * <code>string client_silence_md5 = 1404;</code>
+       * <code>string client_silence_md5 = 1977;</code>
        * @return The clientSilenceMd5.
        */
       public java.lang.String getClientSilenceMd5() {
@@ -2811,7 +2811,7 @@ public java.lang.String getClientSilenceMd5() {
         }
       }
       /**
-       * <code>string client_silence_md5 = 1404;</code>
+       * <code>string client_silence_md5 = 1977;</code>
        * @return The bytes for clientSilenceMd5.
        */
       public com.google.protobuf.ByteString
@@ -2828,7 +2828,7 @@ public java.lang.String getClientSilenceMd5() {
         }
       }
       /**
-       * <code>string client_silence_md5 = 1404;</code>
+       * <code>string client_silence_md5 = 1977;</code>
        * @param value The clientSilenceMd5 to set.
        * @return This builder for chaining.
        */
@@ -2843,7 +2843,7 @@ public Builder setClientSilenceMd5(
         return this;
       }
       /**
-       * <code>string client_silence_md5 = 1404;</code>
+       * <code>string client_silence_md5 = 1977;</code>
        * @return This builder for chaining.
        */
       public Builder clearClientSilenceMd5() {
@@ -2853,7 +2853,7 @@ public Builder clearClientSilenceMd5() {
         return this;
       }
       /**
-       * <code>string client_silence_md5 = 1404;</code>
+       * <code>string client_silence_md5 = 1977;</code>
        * @param value The bytes for clientSilenceMd5 to set.
        * @return This builder for chaining.
        */
@@ -2873,14 +2873,14 @@ public Builder setClientSilenceMd5Bytes(
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig, emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.Builder, emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfigOrBuilder> resVersionConfigBuilder_;
       /**
-       * <code>.ResVersionConfig res_version_config = 1907;</code>
+       * <code>.ResVersionConfig res_version_config = 1074;</code>
        * @return Whether the resVersionConfig field is set.
        */
       public boolean hasResVersionConfig() {
         return resVersionConfigBuilder_ != null || resVersionConfig_ != null;
       }
       /**
-       * <code>.ResVersionConfig res_version_config = 1907;</code>
+       * <code>.ResVersionConfig res_version_config = 1074;</code>
        * @return The resVersionConfig.
        */
       public emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig getResVersionConfig() {
@@ -2891,7 +2891,7 @@ public emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig get
         }
       }
       /**
-       * <code>.ResVersionConfig res_version_config = 1907;</code>
+       * <code>.ResVersionConfig res_version_config = 1074;</code>
        */
       public Builder setResVersionConfig(emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig value) {
         if (resVersionConfigBuilder_ == null) {
@@ -2907,7 +2907,7 @@ public Builder setResVersionConfig(emu.grasscutter.net.proto.ResVersionConfigOut
         return this;
       }
       /**
-       * <code>.ResVersionConfig res_version_config = 1907;</code>
+       * <code>.ResVersionConfig res_version_config = 1074;</code>
        */
       public Builder setResVersionConfig(
           emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.Builder builderForValue) {
@@ -2921,7 +2921,7 @@ public Builder setResVersionConfig(
         return this;
       }
       /**
-       * <code>.ResVersionConfig res_version_config = 1907;</code>
+       * <code>.ResVersionConfig res_version_config = 1074;</code>
        */
       public Builder mergeResVersionConfig(emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig value) {
         if (resVersionConfigBuilder_ == null) {
@@ -2939,7 +2939,7 @@ public Builder mergeResVersionConfig(emu.grasscutter.net.proto.ResVersionConfigO
         return this;
       }
       /**
-       * <code>.ResVersionConfig res_version_config = 1907;</code>
+       * <code>.ResVersionConfig res_version_config = 1074;</code>
        */
       public Builder clearResVersionConfig() {
         if (resVersionConfigBuilder_ == null) {
@@ -2953,7 +2953,7 @@ public Builder clearResVersionConfig() {
         return this;
       }
       /**
-       * <code>.ResVersionConfig res_version_config = 1907;</code>
+       * <code>.ResVersionConfig res_version_config = 1074;</code>
        */
       public emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.Builder getResVersionConfigBuilder() {
         
@@ -2961,7 +2961,7 @@ public emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.Bui
         return getResVersionConfigFieldBuilder().getBuilder();
       }
       /**
-       * <code>.ResVersionConfig res_version_config = 1907;</code>
+       * <code>.ResVersionConfig res_version_config = 1074;</code>
        */
       public emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfigOrBuilder getResVersionConfigOrBuilder() {
         if (resVersionConfigBuilder_ != null) {
@@ -2972,7 +2972,7 @@ public emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfigOrBu
         }
       }
       /**
-       * <code>.ResVersionConfig res_version_config = 1907;</code>
+       * <code>.ResVersionConfig res_version_config = 1074;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig, emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.Builder, emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfigOrBuilder> 
@@ -3021,7 +3021,7 @@ public Builder clearTotalTickTime() {
 
       private java.lang.Object clientVersionSuffix_ = "";
       /**
-       * <code>string client_version_suffix = 1315;</code>
+       * <code>string client_version_suffix = 1756;</code>
        * @return The clientVersionSuffix.
        */
       public java.lang.String getClientVersionSuffix() {
@@ -3037,7 +3037,7 @@ public java.lang.String getClientVersionSuffix() {
         }
       }
       /**
-       * <code>string client_version_suffix = 1315;</code>
+       * <code>string client_version_suffix = 1756;</code>
        * @return The bytes for clientVersionSuffix.
        */
       public com.google.protobuf.ByteString
@@ -3054,7 +3054,7 @@ public java.lang.String getClientVersionSuffix() {
         }
       }
       /**
-       * <code>string client_version_suffix = 1315;</code>
+       * <code>string client_version_suffix = 1756;</code>
        * @param value The clientVersionSuffix to set.
        * @return This builder for chaining.
        */
@@ -3069,7 +3069,7 @@ public Builder setClientVersionSuffix(
         return this;
       }
       /**
-       * <code>string client_version_suffix = 1315;</code>
+       * <code>string client_version_suffix = 1756;</code>
        * @return This builder for chaining.
        */
       public Builder clearClientVersionSuffix() {
@@ -3079,7 +3079,7 @@ public Builder clearClientVersionSuffix() {
         return this;
       }
       /**
-       * <code>string client_version_suffix = 1315;</code>
+       * <code>string client_version_suffix = 1756;</code>
        * @param value The bytes for clientVersionSuffix to set.
        * @return This builder for chaining.
        */
@@ -3097,7 +3097,7 @@ public Builder setClientVersionSuffixBytes(
 
       private java.lang.Object clientSilenceVersionSuffix_ = "";
       /**
-       * <code>string client_silence_version_suffix = 315;</code>
+       * <code>string client_silence_version_suffix = 552;</code>
        * @return The clientSilenceVersionSuffix.
        */
       public java.lang.String getClientSilenceVersionSuffix() {
@@ -3113,7 +3113,7 @@ public java.lang.String getClientSilenceVersionSuffix() {
         }
       }
       /**
-       * <code>string client_silence_version_suffix = 315;</code>
+       * <code>string client_silence_version_suffix = 552;</code>
        * @return The bytes for clientSilenceVersionSuffix.
        */
       public com.google.protobuf.ByteString
@@ -3130,7 +3130,7 @@ public java.lang.String getClientSilenceVersionSuffix() {
         }
       }
       /**
-       * <code>string client_silence_version_suffix = 315;</code>
+       * <code>string client_silence_version_suffix = 552;</code>
        * @param value The clientSilenceVersionSuffix to set.
        * @return This builder for chaining.
        */
@@ -3145,7 +3145,7 @@ public Builder setClientSilenceVersionSuffix(
         return this;
       }
       /**
-       * <code>string client_silence_version_suffix = 315;</code>
+       * <code>string client_silence_version_suffix = 552;</code>
        * @return This builder for chaining.
        */
       public Builder clearClientSilenceVersionSuffix() {
@@ -3155,7 +3155,7 @@ public Builder clearClientSilenceVersionSuffix() {
         return this;
       }
       /**
-       * <code>string client_silence_version_suffix = 315;</code>
+       * <code>string client_silence_version_suffix = 552;</code>
        * @param value The bytes for clientSilenceVersionSuffix to set.
        * @return This builder for chaining.
        */
@@ -3205,120 +3205,315 @@ public Builder clearScInfo() {
         return this;
       }
 
-      private boolean isNewPlayer_ ;
+      private int targetUid_ ;
       /**
-       * <code>bool is_new_player = 100;</code>
-       * @return The isNewPlayer.
+       * <code>uint32 target_uid = 6;</code>
+       * @return The targetUid.
        */
       @java.lang.Override
-      public boolean getIsNewPlayer() {
-        return isNewPlayer_;
+      public int getTargetUid() {
+        return targetUid_;
       }
       /**
-       * <code>bool is_new_player = 100;</code>
-       * @param value The isNewPlayer to set.
+       * <code>uint32 target_uid = 6;</code>
+       * @param value The targetUid to set.
        * @return This builder for chaining.
        */
-      public Builder setIsNewPlayer(boolean value) {
+      public Builder setTargetUid(int value) {
         
-        isNewPlayer_ = value;
+        targetUid_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bool is_new_player = 100;</code>
+       * <code>uint32 target_uid = 6;</code>
        * @return This builder for chaining.
        */
-      public Builder clearIsNewPlayer() {
+      public Builder clearTargetUid() {
         
-        isNewPlayer_ = false;
+        targetUid_ = 0;
         onChanged();
         return this;
       }
 
-      private com.google.protobuf.ByteString playerData_ = com.google.protobuf.ByteString.EMPTY;
+      private java.lang.Object msg_ = "";
       /**
-       * <code>bytes player_data = 4;</code>
-       * @return The playerData.
+       * <code>string msg = 219;</code>
+       * @return The msg.
        */
-      @java.lang.Override
-      public com.google.protobuf.ByteString getPlayerData() {
-        return playerData_;
+      public java.lang.String getMsg() {
+        java.lang.Object ref = msg_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          msg_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
       }
       /**
-       * <code>bytes player_data = 4;</code>
-       * @param value The playerData to set.
+       * <code>string msg = 219;</code>
+       * @return The bytes for msg.
+       */
+      public com.google.protobuf.ByteString
+          getMsgBytes() {
+        java.lang.Object ref = msg_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          msg_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string msg = 219;</code>
+       * @param value The msg to set.
        * @return This builder for chaining.
        */
-      public Builder setPlayerData(com.google.protobuf.ByteString value) {
+      public Builder setMsg(
+          java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
   
-        playerData_ = value;
+        msg_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bytes player_data = 4;</code>
+       * <code>string msg = 219;</code>
        * @return This builder for chaining.
        */
-      public Builder clearPlayerData() {
+      public Builder clearMsg() {
         
-        playerData_ = getDefaultInstance().getPlayerData();
+        msg_ = getDefaultInstance().getMsg();
         onChanged();
         return this;
       }
-
-      private int targetUid_ ;
-      /**
-       * <code>uint32 target_uid = 5;</code>
-       * @return The targetUid.
-       */
-      @java.lang.Override
-      public int getTargetUid() {
-        return targetUid_;
-      }
       /**
-       * <code>uint32 target_uid = 5;</code>
-       * @param value The targetUid to set.
+       * <code>string msg = 219;</code>
+       * @param value The bytes for msg to set.
        * @return This builder for chaining.
        */
-      public Builder setTargetUid(int value) {
+      public Builder setMsgBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
         
-        targetUid_ = value;
+        msg_ = value;
         onChanged();
         return this;
       }
+
+      private emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo aBPMACCDDJH_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo, emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.Builder, emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfoOrBuilder> aBPMACCDDJHBuilder_;
       /**
-       * <code>uint32 target_uid = 5;</code>
-       * @return This builder for chaining.
+       * <code>.StopServerInfo ABPMACCDDJH = 1407;</code>
+       * @return Whether the aBPMACCDDJH field is set.
        */
-      public Builder clearTargetUid() {
-        
-        targetUid_ = 0;
-        onChanged();
-        return this;
+      public boolean hasABPMACCDDJH() {
+        return aBPMACCDDJHBuilder_ != null || aBPMACCDDJH_ != null;
       }
-
-      private int abilityHashCode_ ;
       /**
-       * <code>int32 ability_hash_code = 8;</code>
-       * @return The abilityHashCode.
+       * <code>.StopServerInfo ABPMACCDDJH = 1407;</code>
+       * @return The aBPMACCDDJH.
        */
-      @java.lang.Override
-      public int getAbilityHashCode() {
-        return abilityHashCode_;
+      public emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo getABPMACCDDJH() {
+        if (aBPMACCDDJHBuilder_ == null) {
+          return aBPMACCDDJH_ == null ? emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.getDefaultInstance() : aBPMACCDDJH_;
+        } else {
+          return aBPMACCDDJHBuilder_.getMessage();
+        }
       }
       /**
-       * <code>int32 ability_hash_code = 8;</code>
-       * @param value The abilityHashCode to set.
-       * @return This builder for chaining.
+       * <code>.StopServerInfo ABPMACCDDJH = 1407;</code>
        */
-      public Builder setAbilityHashCode(int value) {
-        
-        abilityHashCode_ = value;
-        onChanged();
+      public Builder setABPMACCDDJH(emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo value) {
+        if (aBPMACCDDJHBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          aBPMACCDDJH_ = value;
+          onChanged();
+        } else {
+          aBPMACCDDJHBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.StopServerInfo ABPMACCDDJH = 1407;</code>
+       */
+      public Builder setABPMACCDDJH(
+          emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.Builder builderForValue) {
+        if (aBPMACCDDJHBuilder_ == null) {
+          aBPMACCDDJH_ = builderForValue.build();
+          onChanged();
+        } else {
+          aBPMACCDDJHBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.StopServerInfo ABPMACCDDJH = 1407;</code>
+       */
+      public Builder mergeABPMACCDDJH(emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo value) {
+        if (aBPMACCDDJHBuilder_ == null) {
+          if (aBPMACCDDJH_ != null) {
+            aBPMACCDDJH_ =
+              emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.newBuilder(aBPMACCDDJH_).mergeFrom(value).buildPartial();
+          } else {
+            aBPMACCDDJH_ = value;
+          }
+          onChanged();
+        } else {
+          aBPMACCDDJHBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.StopServerInfo ABPMACCDDJH = 1407;</code>
+       */
+      public Builder clearABPMACCDDJH() {
+        if (aBPMACCDDJHBuilder_ == null) {
+          aBPMACCDDJH_ = null;
+          onChanged();
+        } else {
+          aBPMACCDDJH_ = null;
+          aBPMACCDDJHBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.StopServerInfo ABPMACCDDJH = 1407;</code>
+       */
+      public emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.Builder getABPMACCDDJHBuilder() {
+        
+        onChanged();
+        return getABPMACCDDJHFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.StopServerInfo ABPMACCDDJH = 1407;</code>
+       */
+      public emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfoOrBuilder getABPMACCDDJHOrBuilder() {
+        if (aBPMACCDDJHBuilder_ != null) {
+          return aBPMACCDDJHBuilder_.getMessageOrBuilder();
+        } else {
+          return aBPMACCDDJH_ == null ?
+              emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.getDefaultInstance() : aBPMACCDDJH_;
+        }
+      }
+      /**
+       * <code>.StopServerInfo ABPMACCDDJH = 1407;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo, emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.Builder, emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfoOrBuilder> 
+          getABPMACCDDJHFieldBuilder() {
+        if (aBPMACCDDJHBuilder_ == null) {
+          aBPMACCDDJHBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo, emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.Builder, emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfoOrBuilder>(
+                  getABPMACCDDJH(),
+                  getParentForChildren(),
+                  isClean());
+          aBPMACCDDJH_ = null;
+        }
+        return aBPMACCDDJHBuilder_;
+      }
+
+      private boolean isNewPlayer_ ;
+      /**
+       * <code>bool is_new_player = 100;</code>
+       * @return The isNewPlayer.
+       */
+      @java.lang.Override
+      public boolean getIsNewPlayer() {
+        return isNewPlayer_;
+      }
+      /**
+       * <code>bool is_new_player = 100;</code>
+       * @param value The isNewPlayer to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsNewPlayer(boolean value) {
+        
+        isNewPlayer_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_new_player = 100;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsNewPlayer() {
+        
+        isNewPlayer_ = false;
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.ByteString playerData_ = com.google.protobuf.ByteString.EMPTY;
+      /**
+       * <code>bytes player_data = 4;</code>
+       * @return The playerData.
+       */
+      @java.lang.Override
+      public com.google.protobuf.ByteString getPlayerData() {
+        return playerData_;
+      }
+      /**
+       * <code>bytes player_data = 4;</code>
+       * @param value The playerData to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPlayerData(com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        playerData_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bytes player_data = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPlayerData() {
+        
+        playerData_ = getDefaultInstance().getPlayerData();
+        onChanged();
+        return this;
+      }
+
+      private int abilityHashCode_ ;
+      /**
+       * <code>int32 ability_hash_code = 8;</code>
+       * @return The abilityHashCode.
+       */
+      @java.lang.Override
+      public int getAbilityHashCode() {
+        return abilityHashCode_;
+      }
+      /**
+       * <code>int32 ability_hash_code = 8;</code>
+       * @param value The abilityHashCode to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAbilityHashCode(int value) {
+        
+        abilityHashCode_ = value;
+        onChanged();
         return this;
       }
       /**
@@ -4126,201 +4321,6 @@ public Builder clearTargetHomeOwnerUid() {
         return this;
       }
 
-      private java.lang.Object msg_ = "";
-      /**
-       * <code>string msg = 1207;</code>
-       * @return The msg.
-       */
-      public java.lang.String getMsg() {
-        java.lang.Object ref = msg_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          msg_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string msg = 1207;</code>
-       * @return The bytes for msg.
-       */
-      public com.google.protobuf.ByteString
-          getMsgBytes() {
-        java.lang.Object ref = msg_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          msg_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string msg = 1207;</code>
-       * @param value The msg to set.
-       * @return This builder for chaining.
-       */
-      public Builder setMsg(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        msg_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string msg = 1207;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearMsg() {
-        
-        msg_ = getDefaultInstance().getMsg();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string msg = 1207;</code>
-       * @param value The bytes for msg to set.
-       * @return This builder for chaining.
-       */
-      public Builder setMsgBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        msg_ = value;
-        onChanged();
-        return this;
-      }
-
-      private emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo aBPMACCDDJH_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo, emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.Builder, emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfoOrBuilder> aBPMACCDDJHBuilder_;
-      /**
-       * <code>.StopServerInfo ABPMACCDDJH = 1530;</code>
-       * @return Whether the aBPMACCDDJH field is set.
-       */
-      public boolean hasABPMACCDDJH() {
-        return aBPMACCDDJHBuilder_ != null || aBPMACCDDJH_ != null;
-      }
-      /**
-       * <code>.StopServerInfo ABPMACCDDJH = 1530;</code>
-       * @return The aBPMACCDDJH.
-       */
-      public emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo getABPMACCDDJH() {
-        if (aBPMACCDDJHBuilder_ == null) {
-          return aBPMACCDDJH_ == null ? emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.getDefaultInstance() : aBPMACCDDJH_;
-        } else {
-          return aBPMACCDDJHBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.StopServerInfo ABPMACCDDJH = 1530;</code>
-       */
-      public Builder setABPMACCDDJH(emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo value) {
-        if (aBPMACCDDJHBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          aBPMACCDDJH_ = value;
-          onChanged();
-        } else {
-          aBPMACCDDJHBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.StopServerInfo ABPMACCDDJH = 1530;</code>
-       */
-      public Builder setABPMACCDDJH(
-          emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.Builder builderForValue) {
-        if (aBPMACCDDJHBuilder_ == null) {
-          aBPMACCDDJH_ = builderForValue.build();
-          onChanged();
-        } else {
-          aBPMACCDDJHBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.StopServerInfo ABPMACCDDJH = 1530;</code>
-       */
-      public Builder mergeABPMACCDDJH(emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo value) {
-        if (aBPMACCDDJHBuilder_ == null) {
-          if (aBPMACCDDJH_ != null) {
-            aBPMACCDDJH_ =
-              emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.newBuilder(aBPMACCDDJH_).mergeFrom(value).buildPartial();
-          } else {
-            aBPMACCDDJH_ = value;
-          }
-          onChanged();
-        } else {
-          aBPMACCDDJHBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.StopServerInfo ABPMACCDDJH = 1530;</code>
-       */
-      public Builder clearABPMACCDDJH() {
-        if (aBPMACCDDJHBuilder_ == null) {
-          aBPMACCDDJH_ = null;
-          onChanged();
-        } else {
-          aBPMACCDDJH_ = null;
-          aBPMACCDDJHBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.StopServerInfo ABPMACCDDJH = 1530;</code>
-       */
-      public emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.Builder getABPMACCDDJHBuilder() {
-        
-        onChanged();
-        return getABPMACCDDJHFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.StopServerInfo ABPMACCDDJH = 1530;</code>
-       */
-      public emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfoOrBuilder getABPMACCDDJHOrBuilder() {
-        if (aBPMACCDDJHBuilder_ != null) {
-          return aBPMACCDDJHBuilder_.getMessageOrBuilder();
-        } else {
-          return aBPMACCDDJH_ == null ?
-              emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.getDefaultInstance() : aBPMACCDDJH_;
-        }
-      }
-      /**
-       * <code>.StopServerInfo ABPMACCDDJH = 1530;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo, emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.Builder, emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfoOrBuilder> 
-          getABPMACCDDJHFieldBuilder() {
-        if (aBPMACCDDJHBuilder_ == null) {
-          aBPMACCDDJHBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo, emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.Builder, emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfoOrBuilder>(
-                  getABPMACCDDJH(),
-                  getParentForChildren(),
-                  isClean());
-          aBPMACCDDJH_ = null;
-        }
-        return aBPMACCDDJHBuilder_;
-      }
-
       private java.lang.Object nextResourceUrl_ = "";
       /**
        * <code>string next_resource_url = 1549;</code>
@@ -4936,25 +4936,25 @@ public emu.grasscutter.net.proto.PlayerLoginRspOuterClass.PlayerLoginRsp getDefa
       "Pair.proto\032\026FeatureBlockInfo.proto\032\017Bloc" +
       "kInfo.proto\032\026ResVersionConfig.proto\032\024Sto" +
       "pServerInfo.proto\"\354\010\n\016PlayerLoginRsp\022\025\n\014" +
-      "country_code\030\371\004 \001(\t\022\020\n\010game_biz\030\001 \001(\t\022\023\n" +
-      "\nclient_md5\030\214\t \001(\t\022\033\n\022client_silence_md5" +
-      "\030\374\n \001(\t\022.\n\022res_version_config\030\363\016 \001(\0132\021.R" +
+      "country_code\030\227\016 \001(\t\022\020\n\010game_biz\030\001 \001(\t\022\023\n" +
+      "\nclient_md5\030\236\t \001(\t\022\033\n\022client_silence_md5" +
+      "\030\271\017 \001(\t\022.\n\022res_version_config\030\262\010 \001(\0132\021.R" +
       "esVersionConfig\022\030\n\017total_tick_time\030\363\004 \001(" +
-      "\001\022\036\n\025client_version_suffix\030\243\n \001(\t\022&\n\035cli" +
-      "ent_silence_version_suffix\030\273\002 \001(\t\022\020\n\007sc_" +
-      "info\030\354\016 \001(\014\022\025\n\ris_new_player\030d \001(\010\022\023\n\013pl" +
-      "ayer_data\030\004 \001(\014\022\022\n\ntarget_uid\030\005 \001(\r\022\031\n\021a" +
-      "bility_hash_code\030\010 \001(\005\022\022\n\nlogin_rand\030\t \001" +
-      "(\004\022\033\n\023player_data_version\030\n \001(\r\022#\n\033clien" +
-      "t_silence_data_version\030\013 \001(\r\022\017\n\007retcode\030" +
-      "\014 \001(\005\022=\n\020ability_hash_map\030\016 \003(\0132#.Player" +
-      "LoginRsp.AbilityHashMapEntry\022\033\n\023client_d" +
-      "ata_version\030\017 \001(\r\0225\n\026short_ability_hash_" +
-      "map\030Z \003(\0132\025.ShortAbilityHashPair\0223\n\027feat" +
-      "ure_block_info_list\030\320\002 \003(\0132\021.FeatureBloc" +
-      "kInfo\022\036\n\025target_home_owner_uid\030\373\010 \001(\r\022\014\n" +
-      "\003msg\030\267\t \001(\t\022%\n\013ABPMACCDDJH\030\372\013 \001(\0132\017.Stop" +
-      "ServerInfo\022\032\n\021next_resource_url\030\215\014 \001(\t\022:" +
+      "\001\022\036\n\025client_version_suffix\030\334\r \001(\t\022&\n\035cli" +
+      "ent_silence_version_suffix\030\250\004 \001(\t\022\020\n\007sc_" +
+      "info\030\354\016 \001(\014\022\022\n\ntarget_uid\030\006 \001(\r\022\014\n\003msg\030\333" +
+      "\001 \001(\t\022%\n\013ABPMACCDDJH\030\377\n \001(\0132\017.StopServer" +
+      "Info\022\025\n\ris_new_player\030d \001(\010\022\023\n\013player_da" +
+      "ta\030\004 \001(\014\022\031\n\021ability_hash_code\030\010 \001(\005\022\022\n\nl" +
+      "ogin_rand\030\t \001(\004\022\033\n\023player_data_version\030\n" +
+      " \001(\r\022#\n\033client_silence_data_version\030\013 \001(" +
+      "\r\022\017\n\007retcode\030\014 \001(\005\022=\n\020ability_hash_map\030\016" +
+      " \003(\0132#.PlayerLoginRsp.AbilityHashMapEntr" +
+      "y\022\033\n\023client_data_version\030\017 \001(\r\0225\n\026short_" +
+      "ability_hash_map\030Z \003(\0132\025.ShortAbilityHas" +
+      "hPair\0223\n\027feature_block_info_list\030\320\002 \003(\0132" +
+      "\021.FeatureBlockInfo\022\036\n\025target_home_owner_" +
+      "uid\030\373\010 \001(\r\022\032\n\021next_resource_url\030\215\014 \001(\t\022:" +
       "\n\016block_info_map\030\274\014 \003(\0132!.PlayerLoginRsp" +
       ".BlockInfoMapEntry\0223\n\027next_res_version_c" +
       "onfig\030\267\017 \001(\0132\021.ResVersionConfig\022\034\n\023is_us" +
@@ -4980,7 +4980,7 @@ public emu.grasscutter.net.proto.PlayerLoginRspOuterClass.PlayerLoginRsp getDefa
     internal_static_PlayerLoginRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerLoginRsp_descriptor,
-        new java.lang.String[] { "CountryCode", "GameBiz", "ClientMd5", "ClientSilenceMd5", "ResVersionConfig", "TotalTickTime", "ClientVersionSuffix", "ClientSilenceVersionSuffix", "ScInfo", "IsNewPlayer", "PlayerData", "TargetUid", "AbilityHashCode", "LoginRand", "PlayerDataVersion", "ClientSilenceDataVersion", "Retcode", "AbilityHashMap", "ClientDataVersion", "ShortAbilityHashMap", "FeatureBlockInfoList", "TargetHomeOwnerUid", "Msg", "ABPMACCDDJH", "NextResourceUrl", "BlockInfoMap", "NextResVersionConfig", "IsUseAbilityHash", "IsTransfer", "IsDataNeedRelogin", "IsAudit", "Birthday", });
+        new java.lang.String[] { "CountryCode", "GameBiz", "ClientMd5", "ClientSilenceMd5", "ResVersionConfig", "TotalTickTime", "ClientVersionSuffix", "ClientSilenceVersionSuffix", "ScInfo", "TargetUid", "Msg", "ABPMACCDDJH", "IsNewPlayer", "PlayerData", "AbilityHashCode", "LoginRand", "PlayerDataVersion", "ClientSilenceDataVersion", "Retcode", "AbilityHashMap", "ClientDataVersion", "ShortAbilityHashMap", "FeatureBlockInfoList", "TargetHomeOwnerUid", "NextResourceUrl", "BlockInfoMap", "NextResVersionConfig", "IsUseAbilityHash", "IsTransfer", "IsDataNeedRelogin", "IsAudit", "Birthday", });
     internal_static_PlayerLoginRsp_AbilityHashMapEntry_descriptor =
       internal_static_PlayerLoginRsp_descriptor.getNestedTypes().get(0);
     internal_static_PlayerLoginRsp_AbilityHashMapEntry_fieldAccessorTable = new
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerPropChangeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerPropChangeNotifyOuterClass.java
index 810b0fc1de2..a9ac9444ff5 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerPropChangeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerPropChangeNotifyOuterClass.java
@@ -19,20 +19,28 @@ public interface PlayerPropChangeNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 prop_delta = 7;</code>
-     * @return The propDelta.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 prop_type = 10;</code>
+     * @return The propType.
      */
-    int getPropDelta();
+    int getPropType();
 
     /**
-     * <code>uint32 prop_type = 13;</code>
-     * @return The propType.
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 prop_delta = 8;</code>
+     * @return The propDelta.
      */
-    int getPropType();
+    int getPropDelta();
   }
   /**
    * <pre>
-   * CmdId: 27937
+   * CmdId: 7793
    * </pre>
    *
    * Protobuf type {@code PlayerPropChangeNotify}
@@ -79,12 +87,12 @@ private PlayerPropChangeNotify(
             case 0:
               done = true;
               break;
-            case 56: {
+            case 64: {
 
               propDelta_ = input.readUInt32();
               break;
             }
-            case 104: {
+            case 80: {
 
               propType_ = input.readUInt32();
               break;
@@ -121,26 +129,34 @@ private PlayerPropChangeNotify(
               emu.grasscutter.net.proto.PlayerPropChangeNotifyOuterClass.PlayerPropChangeNotify.class, emu.grasscutter.net.proto.PlayerPropChangeNotifyOuterClass.PlayerPropChangeNotify.Builder.class);
     }
 
-    public static final int PROP_DELTA_FIELD_NUMBER = 7;
-    private int propDelta_;
+    public static final int PROP_TYPE_FIELD_NUMBER = 10;
+    private int propType_;
     /**
-     * <code>uint32 prop_delta = 7;</code>
-     * @return The propDelta.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 prop_type = 10;</code>
+     * @return The propType.
      */
     @java.lang.Override
-    public int getPropDelta() {
-      return propDelta_;
+    public int getPropType() {
+      return propType_;
     }
 
-    public static final int PROP_TYPE_FIELD_NUMBER = 13;
-    private int propType_;
+    public static final int PROP_DELTA_FIELD_NUMBER = 8;
+    private int propDelta_;
     /**
-     * <code>uint32 prop_type = 13;</code>
-     * @return The propType.
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 prop_delta = 8;</code>
+     * @return The propDelta.
      */
     @java.lang.Override
-    public int getPropType() {
-      return propType_;
+    public int getPropDelta() {
+      return propDelta_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -158,10 +174,10 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (propDelta_ != 0) {
-        output.writeUInt32(7, propDelta_);
+        output.writeUInt32(8, propDelta_);
       }
       if (propType_ != 0) {
-        output.writeUInt32(13, propType_);
+        output.writeUInt32(10, propType_);
       }
       unknownFields.writeTo(output);
     }
@@ -174,11 +190,11 @@ public int getSerializedSize() {
       size = 0;
       if (propDelta_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, propDelta_);
+          .computeUInt32Size(8, propDelta_);
       }
       if (propType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, propType_);
+          .computeUInt32Size(10, propType_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -195,10 +211,10 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.PlayerPropChangeNotifyOuterClass.PlayerPropChangeNotify other = (emu.grasscutter.net.proto.PlayerPropChangeNotifyOuterClass.PlayerPropChangeNotify) obj;
 
-      if (getPropDelta()
-          != other.getPropDelta()) return false;
       if (getPropType()
           != other.getPropType()) return false;
+      if (getPropDelta()
+          != other.getPropDelta()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -210,10 +226,10 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + PROP_DELTA_FIELD_NUMBER;
-      hash = (53 * hash) + getPropDelta();
       hash = (37 * hash) + PROP_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + getPropType();
+      hash = (37 * hash) + PROP_DELTA_FIELD_NUMBER;
+      hash = (53 * hash) + getPropDelta();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -311,7 +327,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 27937
+     * CmdId: 7793
      * </pre>
      *
      * Protobuf type {@code PlayerPropChangeNotify}
@@ -351,10 +367,10 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        propDelta_ = 0;
-
         propType_ = 0;
 
+        propDelta_ = 0;
+
         return this;
       }
 
@@ -381,8 +397,8 @@ public emu.grasscutter.net.proto.PlayerPropChangeNotifyOuterClass.PlayerPropChan
       @java.lang.Override
       public emu.grasscutter.net.proto.PlayerPropChangeNotifyOuterClass.PlayerPropChangeNotify buildPartial() {
         emu.grasscutter.net.proto.PlayerPropChangeNotifyOuterClass.PlayerPropChangeNotify result = new emu.grasscutter.net.proto.PlayerPropChangeNotifyOuterClass.PlayerPropChangeNotify(this);
-        result.propDelta_ = propDelta_;
         result.propType_ = propType_;
+        result.propDelta_ = propDelta_;
         onBuilt();
         return result;
       }
@@ -431,12 +447,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PlayerPropChangeNotifyOuterClass.PlayerPropChangeNotify other) {
         if (other == emu.grasscutter.net.proto.PlayerPropChangeNotifyOuterClass.PlayerPropChangeNotify.getDefaultInstance()) return this;
-        if (other.getPropDelta() != 0) {
-          setPropDelta(other.getPropDelta());
-        }
         if (other.getPropType() != 0) {
           setPropType(other.getPropType());
         }
+        if (other.getPropDelta() != 0) {
+          setPropDelta(other.getPropDelta());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -466,64 +482,88 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int propDelta_ ;
+      private int propType_ ;
       /**
-       * <code>uint32 prop_delta = 7;</code>
-       * @return The propDelta.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 prop_type = 10;</code>
+       * @return The propType.
        */
       @java.lang.Override
-      public int getPropDelta() {
-        return propDelta_;
+      public int getPropType() {
+        return propType_;
       }
       /**
-       * <code>uint32 prop_delta = 7;</code>
-       * @param value The propDelta to set.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 prop_type = 10;</code>
+       * @param value The propType to set.
        * @return This builder for chaining.
        */
-      public Builder setPropDelta(int value) {
+      public Builder setPropType(int value) {
         
-        propDelta_ = value;
+        propType_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 prop_delta = 7;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 prop_type = 10;</code>
        * @return This builder for chaining.
        */
-      public Builder clearPropDelta() {
+      public Builder clearPropType() {
         
-        propDelta_ = 0;
+        propType_ = 0;
         onChanged();
         return this;
       }
 
-      private int propType_ ;
+      private int propDelta_ ;
       /**
-       * <code>uint32 prop_type = 13;</code>
-       * @return The propType.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 prop_delta = 8;</code>
+       * @return The propDelta.
        */
       @java.lang.Override
-      public int getPropType() {
-        return propType_;
+      public int getPropDelta() {
+        return propDelta_;
       }
       /**
-       * <code>uint32 prop_type = 13;</code>
-       * @param value The propType to set.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 prop_delta = 8;</code>
+       * @param value The propDelta to set.
        * @return This builder for chaining.
        */
-      public Builder setPropType(int value) {
+      public Builder setPropDelta(int value) {
         
-        propType_ = value;
+        propDelta_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 prop_type = 13;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 prop_delta = 8;</code>
        * @return This builder for chaining.
        */
-      public Builder clearPropType() {
+      public Builder clearPropDelta() {
         
-        propType_ = 0;
+        propDelta_ = 0;
         onChanged();
         return this;
       }
@@ -595,8 +635,8 @@ public emu.grasscutter.net.proto.PlayerPropChangeNotifyOuterClass.PlayerPropChan
   static {
     java.lang.String[] descriptorData = {
       "\n\034PlayerPropChangeNotify.proto\"?\n\026Player" +
-      "PropChangeNotify\022\022\n\nprop_delta\030\007 \001(\r\022\021\n\t" +
-      "prop_type\030\r \001(\rB\033\n\031emu.grasscutter.net.p" +
+      "PropChangeNotify\022\021\n\tprop_type\030\n \001(\r\022\022\n\np" +
+      "rop_delta\030\010 \001(\rB\033\n\031emu.grasscutter.net.p" +
       "rotob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -608,7 +648,7 @@ public emu.grasscutter.net.proto.PlayerPropChangeNotifyOuterClass.PlayerPropChan
     internal_static_PlayerPropChangeNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerPropChangeNotify_descriptor,
-        new java.lang.String[] { "PropDelta", "PropType", });
+        new java.lang.String[] { "PropType", "PropDelta", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerPropChangeReasonNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerPropChangeReasonNotifyOuterClass.java
index f4c60cb38f0..c2838684092 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerPropChangeReasonNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerPropChangeReasonNotifyOuterClass.java
@@ -19,37 +19,57 @@ public interface PlayerPropChangeReasonNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>float cur_value = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 prop_type = 5;</code>
+     * @return The propType.
+     */
+    int getPropType();
+
+    /**
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>float cur_value = 2;</code>
      * @return The curValue.
      */
     float getCurValue();
 
     /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>float old_value = 6;</code>
+     * @return The oldValue.
+     */
+    float getOldValue();
+
+    /**
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
      * <code>.PropChangeReason reason = 10;</code>
      * @return The enum numeric value on the wire for reason.
      */
     int getReasonValue();
     /**
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
      * <code>.PropChangeReason reason = 10;</code>
      * @return The reason.
      */
     emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason getReason();
-
-    /**
-     * <code>uint32 prop_type = 11;</code>
-     * @return The propType.
-     */
-    int getPropType();
-
-    /**
-     * <code>float old_value = 13;</code>
-     * @return The oldValue.
-     */
-    float getOldValue();
   }
   /**
    * <pre>
-   * CmdId: 25374
+   * CmdId: 407
    * </pre>
    *
    * Protobuf type {@code PlayerPropChangeReasonNotify}
@@ -97,25 +117,25 @@ private PlayerPropChangeReasonNotify(
             case 0:
               done = true;
               break;
-            case 13: {
+            case 21: {
 
               curValue_ = input.readFloat();
               break;
             }
-            case 80: {
-              int rawValue = input.readEnum();
+            case 40: {
 
-              reason_ = rawValue;
+              propType_ = input.readUInt32();
               break;
             }
-            case 88: {
+            case 53: {
 
-              propType_ = input.readUInt32();
+              oldValue_ = input.readFloat();
               break;
             }
-            case 109: {
+            case 80: {
+              int rawValue = input.readEnum();
 
-              oldValue_ = input.readFloat();
+              reason_ = rawValue;
               break;
             }
             default: {
@@ -150,10 +170,29 @@ private PlayerPropChangeReasonNotify(
               emu.grasscutter.net.proto.PlayerPropChangeReasonNotifyOuterClass.PlayerPropChangeReasonNotify.class, emu.grasscutter.net.proto.PlayerPropChangeReasonNotifyOuterClass.PlayerPropChangeReasonNotify.Builder.class);
     }
 
-    public static final int CUR_VALUE_FIELD_NUMBER = 1;
+    public static final int PROP_TYPE_FIELD_NUMBER = 5;
+    private int propType_;
+    /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 prop_type = 5;</code>
+     * @return The propType.
+     */
+    @java.lang.Override
+    public int getPropType() {
+      return propType_;
+    }
+
+    public static final int CUR_VALUE_FIELD_NUMBER = 2;
     private float curValue_;
     /**
-     * <code>float cur_value = 1;</code>
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>float cur_value = 2;</code>
      * @return The curValue.
      */
     @java.lang.Override
@@ -161,9 +200,28 @@ public float getCurValue() {
       return curValue_;
     }
 
+    public static final int OLD_VALUE_FIELD_NUMBER = 6;
+    private float oldValue_;
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>float old_value = 6;</code>
+     * @return The oldValue.
+     */
+    @java.lang.Override
+    public float getOldValue() {
+      return oldValue_;
+    }
+
     public static final int REASON_FIELD_NUMBER = 10;
     private int reason_;
     /**
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
      * <code>.PropChangeReason reason = 10;</code>
      * @return The enum numeric value on the wire for reason.
      */
@@ -171,6 +229,10 @@ public float getCurValue() {
       return reason_;
     }
     /**
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
      * <code>.PropChangeReason reason = 10;</code>
      * @return The reason.
      */
@@ -180,28 +242,6 @@ public float getCurValue() {
       return result == null ? emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason.UNRECOGNIZED : result;
     }
 
-    public static final int PROP_TYPE_FIELD_NUMBER = 11;
-    private int propType_;
-    /**
-     * <code>uint32 prop_type = 11;</code>
-     * @return The propType.
-     */
-    @java.lang.Override
-    public int getPropType() {
-      return propType_;
-    }
-
-    public static final int OLD_VALUE_FIELD_NUMBER = 13;
-    private float oldValue_;
-    /**
-     * <code>float old_value = 13;</code>
-     * @return The oldValue.
-     */
-    @java.lang.Override
-    public float getOldValue() {
-      return oldValue_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -217,16 +257,16 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (curValue_ != 0F) {
-        output.writeFloat(1, curValue_);
-      }
-      if (reason_ != emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason.PROP_CHANGE_REASON_NONE.getNumber()) {
-        output.writeEnum(10, reason_);
+        output.writeFloat(2, curValue_);
       }
       if (propType_ != 0) {
-        output.writeUInt32(11, propType_);
+        output.writeUInt32(5, propType_);
       }
       if (oldValue_ != 0F) {
-        output.writeFloat(13, oldValue_);
+        output.writeFloat(6, oldValue_);
+      }
+      if (reason_ != emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason.PROP_CHANGE_REASON_NONE.getNumber()) {
+        output.writeEnum(10, reason_);
       }
       unknownFields.writeTo(output);
     }
@@ -239,19 +279,19 @@ public int getSerializedSize() {
       size = 0;
       if (curValue_ != 0F) {
         size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(1, curValue_);
-      }
-      if (reason_ != emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason.PROP_CHANGE_REASON_NONE.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(10, reason_);
+          .computeFloatSize(2, curValue_);
       }
       if (propType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, propType_);
+          .computeUInt32Size(5, propType_);
       }
       if (oldValue_ != 0F) {
         size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(13, oldValue_);
+          .computeFloatSize(6, oldValue_);
+      }
+      if (reason_ != emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason.PROP_CHANGE_REASON_NONE.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(10, reason_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -268,15 +308,15 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.PlayerPropChangeReasonNotifyOuterClass.PlayerPropChangeReasonNotify other = (emu.grasscutter.net.proto.PlayerPropChangeReasonNotifyOuterClass.PlayerPropChangeReasonNotify) obj;
 
+      if (getPropType()
+          != other.getPropType()) return false;
       if (java.lang.Float.floatToIntBits(getCurValue())
           != java.lang.Float.floatToIntBits(
               other.getCurValue())) return false;
-      if (reason_ != other.reason_) return false;
-      if (getPropType()
-          != other.getPropType()) return false;
       if (java.lang.Float.floatToIntBits(getOldValue())
           != java.lang.Float.floatToIntBits(
               other.getOldValue())) return false;
+      if (reason_ != other.reason_) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -288,16 +328,16 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + PROP_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + getPropType();
       hash = (37 * hash) + CUR_VALUE_FIELD_NUMBER;
       hash = (53 * hash) + java.lang.Float.floatToIntBits(
           getCurValue());
-      hash = (37 * hash) + REASON_FIELD_NUMBER;
-      hash = (53 * hash) + reason_;
-      hash = (37 * hash) + PROP_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + getPropType();
       hash = (37 * hash) + OLD_VALUE_FIELD_NUMBER;
       hash = (53 * hash) + java.lang.Float.floatToIntBits(
           getOldValue());
+      hash = (37 * hash) + REASON_FIELD_NUMBER;
+      hash = (53 * hash) + reason_;
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -395,7 +435,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 25374
+     * CmdId: 407
      * </pre>
      *
      * Protobuf type {@code PlayerPropChangeReasonNotify}
@@ -435,14 +475,14 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        curValue_ = 0F;
-
-        reason_ = 0;
-
         propType_ = 0;
 
+        curValue_ = 0F;
+
         oldValue_ = 0F;
 
+        reason_ = 0;
+
         return this;
       }
 
@@ -469,10 +509,10 @@ public emu.grasscutter.net.proto.PlayerPropChangeReasonNotifyOuterClass.PlayerPr
       @java.lang.Override
       public emu.grasscutter.net.proto.PlayerPropChangeReasonNotifyOuterClass.PlayerPropChangeReasonNotify buildPartial() {
         emu.grasscutter.net.proto.PlayerPropChangeReasonNotifyOuterClass.PlayerPropChangeReasonNotify result = new emu.grasscutter.net.proto.PlayerPropChangeReasonNotifyOuterClass.PlayerPropChangeReasonNotify(this);
-        result.curValue_ = curValue_;
-        result.reason_ = reason_;
         result.propType_ = propType_;
+        result.curValue_ = curValue_;
         result.oldValue_ = oldValue_;
+        result.reason_ = reason_;
         onBuilt();
         return result;
       }
@@ -521,18 +561,18 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PlayerPropChangeReasonNotifyOuterClass.PlayerPropChangeReasonNotify other) {
         if (other == emu.grasscutter.net.proto.PlayerPropChangeReasonNotifyOuterClass.PlayerPropChangeReasonNotify.getDefaultInstance()) return this;
-        if (other.getCurValue() != 0F) {
-          setCurValue(other.getCurValue());
-        }
-        if (other.reason_ != 0) {
-          setReasonValue(other.getReasonValue());
-        }
         if (other.getPropType() != 0) {
           setPropType(other.getPropType());
         }
+        if (other.getCurValue() != 0F) {
+          setCurValue(other.getCurValue());
+        }
         if (other.getOldValue() != 0F) {
           setOldValue(other.getOldValue());
         }
+        if (other.reason_ != 0) {
+          setReasonValue(other.getReasonValue());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -562,9 +602,56 @@ public Builder mergeFrom(
         return this;
       }
 
+      private int propType_ ;
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 prop_type = 5;</code>
+       * @return The propType.
+       */
+      @java.lang.Override
+      public int getPropType() {
+        return propType_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 prop_type = 5;</code>
+       * @param value The propType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPropType(int value) {
+        
+        propType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 prop_type = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPropType() {
+        
+        propType_ = 0;
+        onChanged();
+        return this;
+      }
+
       private float curValue_ ;
       /**
-       * <code>float cur_value = 1;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>float cur_value = 2;</code>
        * @return The curValue.
        */
       @java.lang.Override
@@ -572,7 +659,11 @@ public float getCurValue() {
         return curValue_;
       }
       /**
-       * <code>float cur_value = 1;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>float cur_value = 2;</code>
        * @param value The curValue to set.
        * @return This builder for chaining.
        */
@@ -583,7 +674,11 @@ public Builder setCurValue(float value) {
         return this;
       }
       /**
-       * <code>float cur_value = 1;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>float cur_value = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearCurValue() {
@@ -593,8 +688,55 @@ public Builder clearCurValue() {
         return this;
       }
 
+      private float oldValue_ ;
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>float old_value = 6;</code>
+       * @return The oldValue.
+       */
+      @java.lang.Override
+      public float getOldValue() {
+        return oldValue_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>float old_value = 6;</code>
+       * @param value The oldValue to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOldValue(float value) {
+        
+        oldValue_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>float old_value = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOldValue() {
+        
+        oldValue_ = 0F;
+        onChanged();
+        return this;
+      }
+
       private int reason_ = 0;
       /**
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
        * <code>.PropChangeReason reason = 10;</code>
        * @return The enum numeric value on the wire for reason.
        */
@@ -602,6 +744,10 @@ public Builder clearCurValue() {
         return reason_;
       }
       /**
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
        * <code>.PropChangeReason reason = 10;</code>
        * @param value The enum numeric value on the wire for reason to set.
        * @return This builder for chaining.
@@ -613,6 +759,10 @@ public Builder setReasonValue(int value) {
         return this;
       }
       /**
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
        * <code>.PropChangeReason reason = 10;</code>
        * @return The reason.
        */
@@ -623,6 +773,10 @@ public emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason get
         return result == null ? emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason.UNRECOGNIZED : result;
       }
       /**
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
        * <code>.PropChangeReason reason = 10;</code>
        * @param value The reason to set.
        * @return This builder for chaining.
@@ -637,6 +791,10 @@ public Builder setReason(emu.grasscutter.net.proto.PropChangeReasonOuterClass.Pr
         return this;
       }
       /**
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
        * <code>.PropChangeReason reason = 10;</code>
        * @return This builder for chaining.
        */
@@ -646,68 +804,6 @@ public Builder clearReason() {
         onChanged();
         return this;
       }
-
-      private int propType_ ;
-      /**
-       * <code>uint32 prop_type = 11;</code>
-       * @return The propType.
-       */
-      @java.lang.Override
-      public int getPropType() {
-        return propType_;
-      }
-      /**
-       * <code>uint32 prop_type = 11;</code>
-       * @param value The propType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPropType(int value) {
-        
-        propType_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 prop_type = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPropType() {
-        
-        propType_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private float oldValue_ ;
-      /**
-       * <code>float old_value = 13;</code>
-       * @return The oldValue.
-       */
-      @java.lang.Override
-      public float getOldValue() {
-        return oldValue_;
-      }
-      /**
-       * <code>float old_value = 13;</code>
-       * @param value The oldValue to set.
-       * @return This builder for chaining.
-       */
-      public Builder setOldValue(float value) {
-        
-        oldValue_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>float old_value = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearOldValue() {
-        
-        oldValue_ = 0F;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -777,9 +873,9 @@ public emu.grasscutter.net.proto.PlayerPropChangeReasonNotifyOuterClass.PlayerPr
     java.lang.String[] descriptorData = {
       "\n\"PlayerPropChangeReasonNotify.proto\032\026Pr" +
       "opChangeReason.proto\"z\n\034PlayerPropChange" +
-      "ReasonNotify\022\021\n\tcur_value\030\001 \001(\002\022!\n\006reaso" +
-      "n\030\n \001(\0162\021.PropChangeReason\022\021\n\tprop_type\030" +
-      "\013 \001(\r\022\021\n\told_value\030\r \001(\002B\033\n\031emu.grasscut" +
+      "ReasonNotify\022\021\n\tprop_type\030\005 \001(\r\022\021\n\tcur_v" +
+      "alue\030\002 \001(\002\022\021\n\told_value\030\006 \001(\002\022!\n\006reason\030" +
+      "\n \001(\0162\021.PropChangeReasonB\033\n\031emu.grasscut" +
       "ter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -792,7 +888,7 @@ public emu.grasscutter.net.proto.PlayerPropChangeReasonNotifyOuterClass.PlayerPr
     internal_static_PlayerPropChangeReasonNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerPropChangeReasonNotify_descriptor,
-        new java.lang.String[] { "CurValue", "Reason", "PropType", "OldValue", });
+        new java.lang.String[] { "PropType", "CurValue", "OldValue", "Reason", });
     emu.grasscutter.net.proto.PropChangeReasonOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerPropNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerPropNotifyOuterClass.java
index ba2fb403052..ff83e66ad11 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerPropNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerPropNotifyOuterClass.java
@@ -19,11 +19,19 @@ public interface PlayerPropNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 15;</code>
      */
     int getPropMapCount();
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 15;</code>
      */
     boolean containsPropMap(
         int key);
@@ -34,19 +42,31 @@ boolean containsPropMap(
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.PropValueOuterClass.PropValue>
     getPropMap();
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 15;</code>
      */
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.PropValueOuterClass.PropValue>
     getPropMapMap();
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 15;</code>
      */
 
     emu.grasscutter.net.proto.PropValueOuterClass.PropValue getPropMapOrDefault(
         int key,
         emu.grasscutter.net.proto.PropValueOuterClass.PropValue defaultValue);
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 15;</code>
      */
 
     emu.grasscutter.net.proto.PropValueOuterClass.PropValue getPropMapOrThrow(
@@ -54,7 +74,7 @@ emu.grasscutter.net.proto.PropValueOuterClass.PropValue getPropMapOrThrow(
   }
   /**
    * <pre>
-   * CmdId: 25998
+   * CmdId: 5911
    * </pre>
    *
    * Protobuf type {@code PlayerPropNotify}
@@ -102,7 +122,7 @@ private PlayerPropNotify(
             case 0:
               done = true;
               break;
-            case 98: {
+            case 122: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 propMap_ = com.google.protobuf.MapField.newMapField(
                     PropMapDefaultEntryHolder.defaultEntry);
@@ -144,7 +164,7 @@ private PlayerPropNotify(
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 12:
+        case 15:
           return internalGetPropMap();
         default:
           throw new RuntimeException(
@@ -159,7 +179,7 @@ protected com.google.protobuf.MapField internalGetMapField(
               emu.grasscutter.net.proto.PlayerPropNotifyOuterClass.PlayerPropNotify.class, emu.grasscutter.net.proto.PlayerPropNotifyOuterClass.PlayerPropNotify.Builder.class);
     }
 
-    public static final int PROP_MAP_FIELD_NUMBER = 12;
+    public static final int PROP_MAP_FIELD_NUMBER = 15;
     private static final class PropMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, emu.grasscutter.net.proto.PropValueOuterClass.PropValue> defaultEntry =
@@ -186,7 +206,11 @@ public int getPropMapCount() {
       return internalGetPropMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 15;</code>
      */
 
     @java.lang.Override
@@ -204,7 +228,11 @@ public java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.PropValueOuter
       return getPropMapMap();
     }
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 15;</code>
      */
     @java.lang.Override
 
@@ -212,7 +240,11 @@ public java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.PropValueOuter
       return internalGetPropMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 15;</code>
      */
     @java.lang.Override
 
@@ -225,7 +257,11 @@ public emu.grasscutter.net.proto.PropValueOuterClass.PropValue getPropMapOrDefau
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 15;</code>
      */
     @java.lang.Override
 
@@ -259,7 +295,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
           output,
           internalGetPropMap(),
           PropMapDefaultEntryHolder.defaultEntry,
-          12);
+          15);
       unknownFields.writeTo(output);
     }
 
@@ -277,7 +313,7 @@ public int getSerializedSize() {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(12, propMap__);
+            .computeMessageSize(15, propMap__);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -408,7 +444,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 25998
+     * CmdId: 5911
      * </pre>
      *
      * Protobuf type {@code PlayerPropNotify}
@@ -426,7 +462,7 @@ public static final class Builder extends
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 12:
+          case 15:
             return internalGetPropMap();
           default:
             throw new RuntimeException(
@@ -437,7 +473,7 @@ protected com.google.protobuf.MapField internalGetMapField(
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 12:
+          case 15:
             return internalGetMutablePropMap();
           default:
             throw new RuntimeException(
@@ -607,7 +643,11 @@ public int getPropMapCount() {
         return internalGetPropMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, .PropValue&gt; prop_map = 15;</code>
        */
 
       @java.lang.Override
@@ -625,7 +665,11 @@ public java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.PropValueOuter
         return getPropMapMap();
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, .PropValue&gt; prop_map = 15;</code>
        */
       @java.lang.Override
 
@@ -633,7 +677,11 @@ public java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.PropValueOuter
         return internalGetPropMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, .PropValue&gt; prop_map = 15;</code>
        */
       @java.lang.Override
 
@@ -646,7 +694,11 @@ public emu.grasscutter.net.proto.PropValueOuterClass.PropValue getPropMapOrDefau
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, .PropValue&gt; prop_map = 15;</code>
        */
       @java.lang.Override
 
@@ -667,7 +719,11 @@ public Builder clearPropMap() {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, .PropValue&gt; prop_map = 15;</code>
        */
 
       public Builder removePropMap(
@@ -686,7 +742,11 @@ public Builder removePropMap(
         return internalGetMutablePropMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, .PropValue&gt; prop_map = 15;</code>
        */
       public Builder putPropMap(
           int key,
@@ -698,7 +758,11 @@ public Builder putPropMap(
         return this;
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, .PropValue&gt; prop_map = 15;</code>
        */
 
       public Builder putAllPropMap(
@@ -780,7 +844,7 @@ public emu.grasscutter.net.proto.PlayerPropNotifyOuterClass.PlayerPropNotify get
   static {
     java.lang.String[] descriptorData = {
       "\n\026PlayerPropNotify.proto\032\017PropValue.prot" +
-      "o\"\200\001\n\020PlayerPropNotify\0220\n\010prop_map\030\014 \003(\013" +
+      "o\"\200\001\n\020PlayerPropNotify\0220\n\010prop_map\030\017 \003(\013" +
       "2\036.PlayerPropNotify.PropMapEntry\032:\n\014Prop" +
       "MapEntry\022\013\n\003key\030\001 \001(\r\022\031\n\005value\030\002 \001(\0132\n.P" +
       "ropValue:\0028\001B\033\n\031emu.grasscutter.net.prot" +
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerSetPauseReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerSetPauseReqOuterClass.java
index 4e1e7fa6719..f44c319ce0f 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerSetPauseReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerSetPauseReqOuterClass.java
@@ -19,6 +19,10 @@ public interface PlayerSetPauseReqOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
      * <code>bool is_paused = 9;</code>
      * @return The isPaused.
      */
@@ -26,7 +30,7 @@ public interface PlayerSetPauseReqOrBuilder extends
   }
   /**
    * <pre>
-   * CmdId: 8076
+   * CmdId: 5330
    * </pre>
    *
    * Protobuf type {@code PlayerSetPauseReq}
@@ -113,6 +117,10 @@ private PlayerSetPauseReq(
     public static final int IS_PAUSED_FIELD_NUMBER = 9;
     private boolean isPaused_;
     /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
      * <code>bool is_paused = 9;</code>
      * @return The isPaused.
      */
@@ -279,7 +287,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 8076
+     * CmdId: 5330
      * </pre>
      *
      * Protobuf type {@code PlayerSetPauseReq}
@@ -430,6 +438,10 @@ public Builder mergeFrom(
 
       private boolean isPaused_ ;
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>bool is_paused = 9;</code>
        * @return The isPaused.
        */
@@ -438,6 +450,10 @@ public boolean getIsPaused() {
         return isPaused_;
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>bool is_paused = 9;</code>
        * @param value The isPaused to set.
        * @return This builder for chaining.
@@ -449,6 +465,10 @@ public Builder setIsPaused(boolean value) {
         return this;
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>bool is_paused = 9;</code>
        * @return This builder for chaining.
        */
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerSetPauseRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerSetPauseRspOuterClass.java
index d27690f28df..c2cb10560b7 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerSetPauseRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerSetPauseRspOuterClass.java
@@ -19,14 +19,18 @@ public interface PlayerSetPauseRspOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 15;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>int32 retcode = 11;</code>
      * @return The retcode.
      */
     int getRetcode();
   }
   /**
    * <pre>
-   * CmdId: 25030
+   * CmdId: 4816
    * </pre>
    *
    * Protobuf type {@code PlayerSetPauseRsp}
@@ -73,7 +77,7 @@ private PlayerSetPauseRsp(
             case 0:
               done = true;
               break;
-            case 120: {
+            case 88: {
 
               retcode_ = input.readInt32();
               break;
@@ -110,10 +114,14 @@ private PlayerSetPauseRsp(
               emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp.class, emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 15;
+    public static final int RETCODE_FIELD_NUMBER = 11;
     private int retcode_;
     /**
-     * <code>int32 retcode = 15;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>int32 retcode = 11;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -136,7 +144,7 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (retcode_ != 0) {
-        output.writeInt32(15, retcode_);
+        output.writeInt32(11, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -149,7 +157,7 @@ public int getSerializedSize() {
       size = 0;
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(15, retcode_);
+          .computeInt32Size(11, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,7 +286,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 25030
+     * CmdId: 4816
      * </pre>
      *
      * Protobuf type {@code PlayerSetPauseRsp}
@@ -429,7 +437,11 @@ public Builder mergeFrom(
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 15;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>int32 retcode = 11;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -437,7 +449,11 @@ public int getRetcode() {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 15;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>int32 retcode = 11;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -448,7 +464,11 @@ public Builder setRetcode(int value) {
         return this;
       }
       /**
-       * <code>int32 retcode = 15;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>int32 retcode = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -525,7 +545,7 @@ public emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp g
   static {
     java.lang.String[] descriptorData = {
       "\n\027PlayerSetPauseRsp.proto\"$\n\021PlayerSetPa" +
-      "useRsp\022\017\n\007retcode\030\017 \001(\005B\033\n\031emu.grasscutt" +
+      "useRsp\022\017\n\007retcode\030\013 \001(\005B\033\n\031emu.grasscutt" +
       "er.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerStoreNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerStoreNotifyOuterClass.java
index bd98a6b9678..3afb51adb91 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerStoreNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerStoreNotifyOuterClass.java
@@ -19,49 +19,81 @@ public interface PlayerStoreNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .Item item_list = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Item item_list = 3;</code>
      */
     java.util.List<emu.grasscutter.net.proto.ItemOuterClass.Item> 
         getItemListList();
     /**
-     * <code>repeated .Item item_list = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Item item_list = 3;</code>
      */
     emu.grasscutter.net.proto.ItemOuterClass.Item getItemList(int index);
     /**
-     * <code>repeated .Item item_list = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Item item_list = 3;</code>
      */
     int getItemListCount();
     /**
-     * <code>repeated .Item item_list = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Item item_list = 3;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder> 
         getItemListOrBuilderList();
     /**
-     * <code>repeated .Item item_list = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Item item_list = 3;</code>
      */
     emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder getItemListOrBuilder(
         int index);
 
     /**
-     * <code>.StoreType store_type = 5;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 weight_limit = 8;</code>
+     * @return The weightLimit.
+     */
+    int getWeightLimit();
+
+    /**
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>.StoreType store_type = 10;</code>
      * @return The enum numeric value on the wire for storeType.
      */
     int getStoreTypeValue();
     /**
-     * <code>.StoreType store_type = 5;</code>
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>.StoreType store_type = 10;</code>
      * @return The storeType.
      */
     emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType getStoreType();
-
-    /**
-     * <code>uint32 weight_limit = 8;</code>
-     * @return The weightLimit.
-     */
-    int getWeightLimit();
   }
   /**
    * <pre>
-   * CmdId: 7845
+   * CmdId: 424
    * </pre>
    *
    * Protobuf type {@code PlayerStoreNotify}
@@ -111,7 +143,7 @@ private PlayerStoreNotify(
             case 0:
               done = true;
               break;
-            case 10: {
+            case 26: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 itemList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemOuterClass.Item>();
                 mutable_bitField0_ |= 0x00000001;
@@ -120,15 +152,15 @@ private PlayerStoreNotify(
                   input.readMessage(emu.grasscutter.net.proto.ItemOuterClass.Item.parser(), extensionRegistry));
               break;
             }
-            case 40: {
-              int rawValue = input.readEnum();
+            case 64: {
 
-              storeType_ = rawValue;
+              weightLimit_ = input.readUInt32();
               break;
             }
-            case 64: {
+            case 80: {
+              int rawValue = input.readEnum();
 
-              weightLimit_ = input.readUInt32();
+              storeType_ = rawValue;
               break;
             }
             default: {
@@ -166,17 +198,25 @@ private PlayerStoreNotify(
               emu.grasscutter.net.proto.PlayerStoreNotifyOuterClass.PlayerStoreNotify.class, emu.grasscutter.net.proto.PlayerStoreNotifyOuterClass.PlayerStoreNotify.Builder.class);
     }
 
-    public static final int ITEM_LIST_FIELD_NUMBER = 1;
+    public static final int ITEM_LIST_FIELD_NUMBER = 3;
     private java.util.List<emu.grasscutter.net.proto.ItemOuterClass.Item> itemList_;
     /**
-     * <code>repeated .Item item_list = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Item item_list = 3;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.ItemOuterClass.Item> getItemListList() {
       return itemList_;
     }
     /**
-     * <code>repeated .Item item_list = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Item item_list = 3;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder> 
@@ -184,21 +224,33 @@ public java.util.List<emu.grasscutter.net.proto.ItemOuterClass.Item> getItemList
       return itemList_;
     }
     /**
-     * <code>repeated .Item item_list = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Item item_list = 3;</code>
      */
     @java.lang.Override
     public int getItemListCount() {
       return itemList_.size();
     }
     /**
-     * <code>repeated .Item item_list = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Item item_list = 3;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ItemOuterClass.Item getItemList(int index) {
       return itemList_.get(index);
     }
     /**
-     * <code>repeated .Item item_list = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Item item_list = 3;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder getItemListOrBuilder(
@@ -206,17 +258,40 @@ public emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder getItemListOrBuild
       return itemList_.get(index);
     }
 
-    public static final int STORE_TYPE_FIELD_NUMBER = 5;
+    public static final int WEIGHT_LIMIT_FIELD_NUMBER = 8;
+    private int weightLimit_;
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 weight_limit = 8;</code>
+     * @return The weightLimit.
+     */
+    @java.lang.Override
+    public int getWeightLimit() {
+      return weightLimit_;
+    }
+
+    public static final int STORE_TYPE_FIELD_NUMBER = 10;
     private int storeType_;
     /**
-     * <code>.StoreType store_type = 5;</code>
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>.StoreType store_type = 10;</code>
      * @return The enum numeric value on the wire for storeType.
      */
     @java.lang.Override public int getStoreTypeValue() {
       return storeType_;
     }
     /**
-     * <code>.StoreType store_type = 5;</code>
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>.StoreType store_type = 10;</code>
      * @return The storeType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType getStoreType() {
@@ -225,17 +300,6 @@ public emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder getItemListOrBuild
       return result == null ? emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.UNRECOGNIZED : result;
     }
 
-    public static final int WEIGHT_LIMIT_FIELD_NUMBER = 8;
-    private int weightLimit_;
-    /**
-     * <code>uint32 weight_limit = 8;</code>
-     * @return The weightLimit.
-     */
-    @java.lang.Override
-    public int getWeightLimit() {
-      return weightLimit_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -251,14 +315,14 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < itemList_.size(); i++) {
-        output.writeMessage(1, itemList_.get(i));
-      }
-      if (storeType_ != emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.STORE_TYPE_NONE.getNumber()) {
-        output.writeEnum(5, storeType_);
+        output.writeMessage(3, itemList_.get(i));
       }
       if (weightLimit_ != 0) {
         output.writeUInt32(8, weightLimit_);
       }
+      if (storeType_ != emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.STORE_TYPE_NONE.getNumber()) {
+        output.writeEnum(10, storeType_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -270,16 +334,16 @@ public int getSerializedSize() {
       size = 0;
       for (int i = 0; i < itemList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, itemList_.get(i));
-      }
-      if (storeType_ != emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.STORE_TYPE_NONE.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(5, storeType_);
+          .computeMessageSize(3, itemList_.get(i));
       }
       if (weightLimit_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(8, weightLimit_);
       }
+      if (storeType_ != emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.STORE_TYPE_NONE.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(10, storeType_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -297,9 +361,9 @@ public boolean equals(final java.lang.Object obj) {
 
       if (!getItemListList()
           .equals(other.getItemListList())) return false;
-      if (storeType_ != other.storeType_) return false;
       if (getWeightLimit()
           != other.getWeightLimit()) return false;
+      if (storeType_ != other.storeType_) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -315,10 +379,10 @@ public int hashCode() {
         hash = (37 * hash) + ITEM_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getItemListList().hashCode();
       }
-      hash = (37 * hash) + STORE_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + storeType_;
       hash = (37 * hash) + WEIGHT_LIMIT_FIELD_NUMBER;
       hash = (53 * hash) + getWeightLimit();
+      hash = (37 * hash) + STORE_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + storeType_;
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -416,7 +480,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 7845
+     * CmdId: 424
      * </pre>
      *
      * Protobuf type {@code PlayerStoreNotify}
@@ -463,10 +527,10 @@ public Builder clear() {
         } else {
           itemListBuilder_.clear();
         }
-        storeType_ = 0;
-
         weightLimit_ = 0;
 
+        storeType_ = 0;
+
         return this;
       }
 
@@ -503,8 +567,8 @@ public emu.grasscutter.net.proto.PlayerStoreNotifyOuterClass.PlayerStoreNotify b
         } else {
           result.itemList_ = itemListBuilder_.build();
         }
-        result.storeType_ = storeType_;
         result.weightLimit_ = weightLimit_;
+        result.storeType_ = storeType_;
         onBuilt();
         return result;
       }
@@ -579,12 +643,12 @@ public Builder mergeFrom(emu.grasscutter.net.proto.PlayerStoreNotifyOuterClass.P
             }
           }
         }
-        if (other.storeType_ != 0) {
-          setStoreTypeValue(other.getStoreTypeValue());
-        }
         if (other.getWeightLimit() != 0) {
           setWeightLimit(other.getWeightLimit());
         }
+        if (other.storeType_ != 0) {
+          setStoreTypeValue(other.getStoreTypeValue());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -628,7 +692,11 @@ private void ensureItemListIsMutable() {
           emu.grasscutter.net.proto.ItemOuterClass.Item, emu.grasscutter.net.proto.ItemOuterClass.Item.Builder, emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder> itemListBuilder_;
 
       /**
-       * <code>repeated .Item item_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Item item_list = 3;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ItemOuterClass.Item> getItemListList() {
         if (itemListBuilder_ == null) {
@@ -638,7 +706,11 @@ public java.util.List<emu.grasscutter.net.proto.ItemOuterClass.Item> getItemList
         }
       }
       /**
-       * <code>repeated .Item item_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Item item_list = 3;</code>
        */
       public int getItemListCount() {
         if (itemListBuilder_ == null) {
@@ -648,7 +720,11 @@ public int getItemListCount() {
         }
       }
       /**
-       * <code>repeated .Item item_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Item item_list = 3;</code>
        */
       public emu.grasscutter.net.proto.ItemOuterClass.Item getItemList(int index) {
         if (itemListBuilder_ == null) {
@@ -658,7 +734,11 @@ public emu.grasscutter.net.proto.ItemOuterClass.Item getItemList(int index) {
         }
       }
       /**
-       * <code>repeated .Item item_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Item item_list = 3;</code>
        */
       public Builder setItemList(
           int index, emu.grasscutter.net.proto.ItemOuterClass.Item value) {
@@ -675,7 +755,11 @@ public Builder setItemList(
         return this;
       }
       /**
-       * <code>repeated .Item item_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Item item_list = 3;</code>
        */
       public Builder setItemList(
           int index, emu.grasscutter.net.proto.ItemOuterClass.Item.Builder builderForValue) {
@@ -689,7 +773,11 @@ public Builder setItemList(
         return this;
       }
       /**
-       * <code>repeated .Item item_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Item item_list = 3;</code>
        */
       public Builder addItemList(emu.grasscutter.net.proto.ItemOuterClass.Item value) {
         if (itemListBuilder_ == null) {
@@ -705,7 +793,11 @@ public Builder addItemList(emu.grasscutter.net.proto.ItemOuterClass.Item value)
         return this;
       }
       /**
-       * <code>repeated .Item item_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Item item_list = 3;</code>
        */
       public Builder addItemList(
           int index, emu.grasscutter.net.proto.ItemOuterClass.Item value) {
@@ -722,7 +814,11 @@ public Builder addItemList(
         return this;
       }
       /**
-       * <code>repeated .Item item_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Item item_list = 3;</code>
        */
       public Builder addItemList(
           emu.grasscutter.net.proto.ItemOuterClass.Item.Builder builderForValue) {
@@ -736,7 +832,11 @@ public Builder addItemList(
         return this;
       }
       /**
-       * <code>repeated .Item item_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Item item_list = 3;</code>
        */
       public Builder addItemList(
           int index, emu.grasscutter.net.proto.ItemOuterClass.Item.Builder builderForValue) {
@@ -750,7 +850,11 @@ public Builder addItemList(
         return this;
       }
       /**
-       * <code>repeated .Item item_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Item item_list = 3;</code>
        */
       public Builder addAllItemList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ItemOuterClass.Item> values) {
@@ -765,7 +869,11 @@ public Builder addAllItemList(
         return this;
       }
       /**
-       * <code>repeated .Item item_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Item item_list = 3;</code>
        */
       public Builder clearItemList() {
         if (itemListBuilder_ == null) {
@@ -778,7 +886,11 @@ public Builder clearItemList() {
         return this;
       }
       /**
-       * <code>repeated .Item item_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Item item_list = 3;</code>
        */
       public Builder removeItemList(int index) {
         if (itemListBuilder_ == null) {
@@ -791,14 +903,22 @@ public Builder removeItemList(int index) {
         return this;
       }
       /**
-       * <code>repeated .Item item_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Item item_list = 3;</code>
        */
       public emu.grasscutter.net.proto.ItemOuterClass.Item.Builder getItemListBuilder(
           int index) {
         return getItemListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .Item item_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Item item_list = 3;</code>
        */
       public emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder getItemListOrBuilder(
           int index) {
@@ -808,7 +928,11 @@ public emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder getItemListOrBuild
         }
       }
       /**
-       * <code>repeated .Item item_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Item item_list = 3;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder> 
            getItemListOrBuilderList() {
@@ -819,14 +943,22 @@ public emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder getItemListOrBuild
         }
       }
       /**
-       * <code>repeated .Item item_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Item item_list = 3;</code>
        */
       public emu.grasscutter.net.proto.ItemOuterClass.Item.Builder addItemListBuilder() {
         return getItemListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ItemOuterClass.Item.getDefaultInstance());
       }
       /**
-       * <code>repeated .Item item_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Item item_list = 3;</code>
        */
       public emu.grasscutter.net.proto.ItemOuterClass.Item.Builder addItemListBuilder(
           int index) {
@@ -834,7 +966,11 @@ public emu.grasscutter.net.proto.ItemOuterClass.Item.Builder addItemListBuilder(
             index, emu.grasscutter.net.proto.ItemOuterClass.Item.getDefaultInstance());
       }
       /**
-       * <code>repeated .Item item_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Item item_list = 3;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ItemOuterClass.Item.Builder> 
            getItemListBuilderList() {
@@ -855,16 +991,67 @@ public emu.grasscutter.net.proto.ItemOuterClass.Item.Builder addItemListBuilder(
         return itemListBuilder_;
       }
 
+      private int weightLimit_ ;
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 weight_limit = 8;</code>
+       * @return The weightLimit.
+       */
+      @java.lang.Override
+      public int getWeightLimit() {
+        return weightLimit_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 weight_limit = 8;</code>
+       * @param value The weightLimit to set.
+       * @return This builder for chaining.
+       */
+      public Builder setWeightLimit(int value) {
+        
+        weightLimit_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 weight_limit = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearWeightLimit() {
+        
+        weightLimit_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int storeType_ = 0;
       /**
-       * <code>.StoreType store_type = 5;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>.StoreType store_type = 10;</code>
        * @return The enum numeric value on the wire for storeType.
        */
       @java.lang.Override public int getStoreTypeValue() {
         return storeType_;
       }
       /**
-       * <code>.StoreType store_type = 5;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>.StoreType store_type = 10;</code>
        * @param value The enum numeric value on the wire for storeType to set.
        * @return This builder for chaining.
        */
@@ -875,7 +1062,11 @@ public Builder setStoreTypeValue(int value) {
         return this;
       }
       /**
-       * <code>.StoreType store_type = 5;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>.StoreType store_type = 10;</code>
        * @return The storeType.
        */
       @java.lang.Override
@@ -885,7 +1076,11 @@ public emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType getStoreType() {
         return result == null ? emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.StoreType store_type = 5;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>.StoreType store_type = 10;</code>
        * @param value The storeType to set.
        * @return This builder for chaining.
        */
@@ -899,7 +1094,11 @@ public Builder setStoreType(emu.grasscutter.net.proto.StoreTypeOuterClass.StoreT
         return this;
       }
       /**
-       * <code>.StoreType store_type = 5;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>.StoreType store_type = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearStoreType() {
@@ -908,37 +1107,6 @@ public Builder clearStoreType() {
         onChanged();
         return this;
       }
-
-      private int weightLimit_ ;
-      /**
-       * <code>uint32 weight_limit = 8;</code>
-       * @return The weightLimit.
-       */
-      @java.lang.Override
-      public int getWeightLimit() {
-        return weightLimit_;
-      }
-      /**
-       * <code>uint32 weight_limit = 8;</code>
-       * @param value The weightLimit to set.
-       * @return This builder for chaining.
-       */
-      public Builder setWeightLimit(int value) {
-        
-        weightLimit_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 weight_limit = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearWeightLimit() {
-        
-        weightLimit_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1008,8 +1176,8 @@ public emu.grasscutter.net.proto.PlayerStoreNotifyOuterClass.PlayerStoreNotify g
     java.lang.String[] descriptorData = {
       "\n\027PlayerStoreNotify.proto\032\017StoreType.pro" +
       "to\032\nItem.proto\"c\n\021PlayerStoreNotify\022\030\n\ti" +
-      "tem_list\030\001 \003(\0132\005.Item\022\036\n\nstore_type\030\005 \001(" +
-      "\0162\n.StoreType\022\024\n\014weight_limit\030\010 \001(\rB\033\n\031e" +
+      "tem_list\030\003 \003(\0132\005.Item\022\024\n\014weight_limit\030\010 " +
+      "\001(\r\022\036\n\nstore_type\030\n \001(\0162\n.StoreTypeB\033\n\031e" +
       "mu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1023,7 +1191,7 @@ public emu.grasscutter.net.proto.PlayerStoreNotifyOuterClass.PlayerStoreNotify g
     internal_static_PlayerStoreNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerStoreNotify_descriptor,
-        new java.lang.String[] { "ItemList", "StoreType", "WeightLimit", });
+        new java.lang.String[] { "ItemList", "WeightLimit", "StoreType", });
     emu.grasscutter.net.proto.StoreTypeOuterClass.getDescriptor();
     emu.grasscutter.net.proto.ItemOuterClass.getDescriptor();
   }
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerTimeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerTimeNotifyOuterClass.java
index 87f8207de94..dceaf9a1dd3 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerTimeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerTimeNotifyOuterClass.java
@@ -19,26 +19,38 @@ public interface PlayerTimeNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>bool is_paused = 3;</code>
-     * @return The isPaused.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint64 player_time = 7;</code>
+     * @return The playerTime.
      */
-    boolean getIsPaused();
+    long getPlayerTime();
 
     /**
-     * <code>uint64 server_time = 7;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint64 server_time = 3;</code>
      * @return The serverTime.
      */
     long getServerTime();
 
     /**
-     * <code>uint64 player_time = 8;</code>
-     * @return The playerTime.
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>bool is_paused = 11;</code>
+     * @return The isPaused.
      */
-    long getPlayerTime();
+    boolean getIsPaused();
   }
   /**
    * <pre>
-   * CmdId: 2272
+   * CmdId: 274
    * </pre>
    *
    * Protobuf type {@code PlayerTimeNotify}
@@ -87,17 +99,17 @@ private PlayerTimeNotify(
               break;
             case 24: {
 
-              isPaused_ = input.readBool();
+              serverTime_ = input.readUInt64();
               break;
             }
             case 56: {
 
-              serverTime_ = input.readUInt64();
+              playerTime_ = input.readUInt64();
               break;
             }
-            case 64: {
+            case 88: {
 
-              playerTime_ = input.readUInt64();
+              isPaused_ = input.readBool();
               break;
             }
             default: {
@@ -132,21 +144,29 @@ private PlayerTimeNotify(
               emu.grasscutter.net.proto.PlayerTimeNotifyOuterClass.PlayerTimeNotify.class, emu.grasscutter.net.proto.PlayerTimeNotifyOuterClass.PlayerTimeNotify.Builder.class);
     }
 
-    public static final int IS_PAUSED_FIELD_NUMBER = 3;
-    private boolean isPaused_;
+    public static final int PLAYER_TIME_FIELD_NUMBER = 7;
+    private long playerTime_;
     /**
-     * <code>bool is_paused = 3;</code>
-     * @return The isPaused.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint64 player_time = 7;</code>
+     * @return The playerTime.
      */
     @java.lang.Override
-    public boolean getIsPaused() {
-      return isPaused_;
+    public long getPlayerTime() {
+      return playerTime_;
     }
 
-    public static final int SERVER_TIME_FIELD_NUMBER = 7;
+    public static final int SERVER_TIME_FIELD_NUMBER = 3;
     private long serverTime_;
     /**
-     * <code>uint64 server_time = 7;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint64 server_time = 3;</code>
      * @return The serverTime.
      */
     @java.lang.Override
@@ -154,15 +174,19 @@ public long getServerTime() {
       return serverTime_;
     }
 
-    public static final int PLAYER_TIME_FIELD_NUMBER = 8;
-    private long playerTime_;
+    public static final int IS_PAUSED_FIELD_NUMBER = 11;
+    private boolean isPaused_;
     /**
-     * <code>uint64 player_time = 8;</code>
-     * @return The playerTime.
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>bool is_paused = 11;</code>
+     * @return The isPaused.
      */
     @java.lang.Override
-    public long getPlayerTime() {
-      return playerTime_;
+    public boolean getIsPaused() {
+      return isPaused_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -179,14 +203,14 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (isPaused_ != false) {
-        output.writeBool(3, isPaused_);
-      }
       if (serverTime_ != 0L) {
-        output.writeUInt64(7, serverTime_);
+        output.writeUInt64(3, serverTime_);
       }
       if (playerTime_ != 0L) {
-        output.writeUInt64(8, playerTime_);
+        output.writeUInt64(7, playerTime_);
+      }
+      if (isPaused_ != false) {
+        output.writeBool(11, isPaused_);
       }
       unknownFields.writeTo(output);
     }
@@ -197,17 +221,17 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (isPaused_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(3, isPaused_);
-      }
       if (serverTime_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(7, serverTime_);
+          .computeUInt64Size(3, serverTime_);
       }
       if (playerTime_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(8, playerTime_);
+          .computeUInt64Size(7, playerTime_);
+      }
+      if (isPaused_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(11, isPaused_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -224,12 +248,12 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.PlayerTimeNotifyOuterClass.PlayerTimeNotify other = (emu.grasscutter.net.proto.PlayerTimeNotifyOuterClass.PlayerTimeNotify) obj;
 
-      if (getIsPaused()
-          != other.getIsPaused()) return false;
-      if (getServerTime()
-          != other.getServerTime()) return false;
       if (getPlayerTime()
           != other.getPlayerTime()) return false;
+      if (getServerTime()
+          != other.getServerTime()) return false;
+      if (getIsPaused()
+          != other.getIsPaused()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -241,15 +265,15 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + IS_PAUSED_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsPaused());
-      hash = (37 * hash) + SERVER_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getServerTime());
       hash = (37 * hash) + PLAYER_TIME_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getPlayerTime());
+      hash = (37 * hash) + SERVER_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getServerTime());
+      hash = (37 * hash) + IS_PAUSED_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsPaused());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -347,7 +371,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 2272
+     * CmdId: 274
      * </pre>
      *
      * Protobuf type {@code PlayerTimeNotify}
@@ -387,11 +411,11 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        isPaused_ = false;
+        playerTime_ = 0L;
 
         serverTime_ = 0L;
 
-        playerTime_ = 0L;
+        isPaused_ = false;
 
         return this;
       }
@@ -419,9 +443,9 @@ public emu.grasscutter.net.proto.PlayerTimeNotifyOuterClass.PlayerTimeNotify bui
       @java.lang.Override
       public emu.grasscutter.net.proto.PlayerTimeNotifyOuterClass.PlayerTimeNotify buildPartial() {
         emu.grasscutter.net.proto.PlayerTimeNotifyOuterClass.PlayerTimeNotify result = new emu.grasscutter.net.proto.PlayerTimeNotifyOuterClass.PlayerTimeNotify(this);
-        result.isPaused_ = isPaused_;
-        result.serverTime_ = serverTime_;
         result.playerTime_ = playerTime_;
+        result.serverTime_ = serverTime_;
+        result.isPaused_ = isPaused_;
         onBuilt();
         return result;
       }
@@ -470,14 +494,14 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PlayerTimeNotifyOuterClass.PlayerTimeNotify other) {
         if (other == emu.grasscutter.net.proto.PlayerTimeNotifyOuterClass.PlayerTimeNotify.getDefaultInstance()) return this;
-        if (other.getIsPaused() != false) {
-          setIsPaused(other.getIsPaused());
+        if (other.getPlayerTime() != 0L) {
+          setPlayerTime(other.getPlayerTime());
         }
         if (other.getServerTime() != 0L) {
           setServerTime(other.getServerTime());
         }
-        if (other.getPlayerTime() != 0L) {
-          setPlayerTime(other.getPlayerTime());
+        if (other.getIsPaused() != false) {
+          setIsPaused(other.getIsPaused());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -508,40 +532,56 @@ public Builder mergeFrom(
         return this;
       }
 
-      private boolean isPaused_ ;
+      private long playerTime_ ;
       /**
-       * <code>bool is_paused = 3;</code>
-       * @return The isPaused.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint64 player_time = 7;</code>
+       * @return The playerTime.
        */
       @java.lang.Override
-      public boolean getIsPaused() {
-        return isPaused_;
+      public long getPlayerTime() {
+        return playerTime_;
       }
       /**
-       * <code>bool is_paused = 3;</code>
-       * @param value The isPaused to set.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint64 player_time = 7;</code>
+       * @param value The playerTime to set.
        * @return This builder for chaining.
        */
-      public Builder setIsPaused(boolean value) {
+      public Builder setPlayerTime(long value) {
         
-        isPaused_ = value;
+        playerTime_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bool is_paused = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint64 player_time = 7;</code>
        * @return This builder for chaining.
        */
-      public Builder clearIsPaused() {
+      public Builder clearPlayerTime() {
         
-        isPaused_ = false;
+        playerTime_ = 0L;
         onChanged();
         return this;
       }
 
       private long serverTime_ ;
       /**
-       * <code>uint64 server_time = 7;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint64 server_time = 3;</code>
        * @return The serverTime.
        */
       @java.lang.Override
@@ -549,7 +589,11 @@ public long getServerTime() {
         return serverTime_;
       }
       /**
-       * <code>uint64 server_time = 7;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint64 server_time = 3;</code>
        * @param value The serverTime to set.
        * @return This builder for chaining.
        */
@@ -560,7 +604,11 @@ public Builder setServerTime(long value) {
         return this;
       }
       /**
-       * <code>uint64 server_time = 7;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint64 server_time = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearServerTime() {
@@ -570,33 +618,45 @@ public Builder clearServerTime() {
         return this;
       }
 
-      private long playerTime_ ;
+      private boolean isPaused_ ;
       /**
-       * <code>uint64 player_time = 8;</code>
-       * @return The playerTime.
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>bool is_paused = 11;</code>
+       * @return The isPaused.
        */
       @java.lang.Override
-      public long getPlayerTime() {
-        return playerTime_;
+      public boolean getIsPaused() {
+        return isPaused_;
       }
       /**
-       * <code>uint64 player_time = 8;</code>
-       * @param value The playerTime to set.
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>bool is_paused = 11;</code>
+       * @param value The isPaused to set.
        * @return This builder for chaining.
        */
-      public Builder setPlayerTime(long value) {
+      public Builder setIsPaused(boolean value) {
         
-        playerTime_ = value;
+        isPaused_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint64 player_time = 8;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>bool is_paused = 11;</code>
        * @return This builder for chaining.
        */
-      public Builder clearPlayerTime() {
+      public Builder clearIsPaused() {
         
-        playerTime_ = 0L;
+        isPaused_ = false;
         onChanged();
         return this;
       }
@@ -668,8 +728,8 @@ public emu.grasscutter.net.proto.PlayerTimeNotifyOuterClass.PlayerTimeNotify get
   static {
     java.lang.String[] descriptorData = {
       "\n\026PlayerTimeNotify.proto\"O\n\020PlayerTimeNo" +
-      "tify\022\021\n\tis_paused\030\003 \001(\010\022\023\n\013server_time\030\007" +
-      " \001(\004\022\023\n\013player_time\030\010 \001(\004B\033\n\031emu.grasscu" +
+      "tify\022\023\n\013player_time\030\007 \001(\004\022\023\n\013server_time" +
+      "\030\003 \001(\004\022\021\n\tis_paused\030\013 \001(\010B\033\n\031emu.grasscu" +
       "tter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -681,7 +741,7 @@ public emu.grasscutter.net.proto.PlayerTimeNotifyOuterClass.PlayerTimeNotify get
     internal_static_PlayerTimeNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerTimeNotify_descriptor,
-        new java.lang.String[] { "IsPaused", "ServerTime", "PlayerTime", });
+        new java.lang.String[] { "PlayerTime", "ServerTime", "IsPaused", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerWorldSceneInfoListNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerWorldSceneInfoListNotifyOuterClass.java
index 0be7b84d399..660f21aa23b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerWorldSceneInfoListNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerWorldSceneInfoListNotifyOuterClass.java
@@ -19,49 +19,81 @@ public interface PlayerWorldSceneInfoListNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 unlocked_area_id_list = 846;</code>
+     * @return A list containing the unlockedAreaIdList.
+     */
+    java.util.List<java.lang.Integer> getUnlockedAreaIdListList();
+    /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 unlocked_area_id_list = 846;</code>
+     * @return The count of unlockedAreaIdList.
+     */
+    int getUnlockedAreaIdListCount();
+    /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 unlocked_area_id_list = 846;</code>
+     * @param index The index of the element to return.
+     * @return The unlockedAreaIdList at the given index.
+     */
+    int getUnlockedAreaIdList(int index);
+
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated .PlayerWorldSceneInfo info_list = 7;</code>
      */
     java.util.List<emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo> 
         getInfoListList();
     /**
-     * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated .PlayerWorldSceneInfo info_list = 7;</code>
      */
     emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo getInfoList(int index);
     /**
-     * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated .PlayerWorldSceneInfo info_list = 7;</code>
      */
     int getInfoListCount();
     /**
-     * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated .PlayerWorldSceneInfo info_list = 7;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfoOrBuilder> 
         getInfoListOrBuilderList();
     /**
-     * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated .PlayerWorldSceneInfo info_list = 7;</code>
      */
     emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfoOrBuilder getInfoListOrBuilder(
         int index);
-
-    /**
-     * <code>repeated uint32 KNFOKJBGBEI = 1055;</code>
-     * @return A list containing the kNFOKJBGBEI.
-     */
-    java.util.List<java.lang.Integer> getKNFOKJBGBEIList();
-    /**
-     * <code>repeated uint32 KNFOKJBGBEI = 1055;</code>
-     * @return The count of kNFOKJBGBEI.
-     */
-    int getKNFOKJBGBEICount();
-    /**
-     * <code>repeated uint32 KNFOKJBGBEI = 1055;</code>
-     * @param index The index of the element to return.
-     * @return The kNFOKJBGBEI at the given index.
-     */
-    int getKNFOKJBGBEI(int index);
   }
   /**
    * <pre>
-   * CmdId: 8028
+   * CmdId: 4320
    * </pre>
    *
    * Protobuf type {@code PlayerWorldSceneInfoListNotify}
@@ -76,8 +108,8 @@ private PlayerWorldSceneInfoListNotify(com.google.protobuf.GeneratedMessageV3.Bu
       super(builder);
     }
     private PlayerWorldSceneInfoListNotify() {
+      unlockedAreaIdList_ = emptyIntList();
       infoList_ = java.util.Collections.emptyList();
-      kNFOKJBGBEI_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -111,32 +143,32 @@ private PlayerWorldSceneInfoListNotify(
             case 0:
               done = true;
               break;
-            case 106: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+            case 58: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 infoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo>();
-                mutable_bitField0_ |= 0x00000001;
+                mutable_bitField0_ |= 0x00000002;
               }
               infoList_.add(
                   input.readMessage(emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo.parser(), extensionRegistry));
               break;
             }
-            case 8440: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                kNFOKJBGBEI_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
+            case 6768: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                unlockedAreaIdList_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
               }
-              kNFOKJBGBEI_.addInt(input.readUInt32());
+              unlockedAreaIdList_.addInt(input.readUInt32());
               break;
             }
-            case 8442: {
+            case 6770: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
-                kNFOKJBGBEI_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
+              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
+                unlockedAreaIdList_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
               }
               while (input.getBytesUntilLimit() > 0) {
-                kNFOKJBGBEI_.addInt(input.readUInt32());
+                unlockedAreaIdList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
@@ -156,11 +188,11 @@ private PlayerWorldSceneInfoListNotify(
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
           infoList_ = java.util.Collections.unmodifiableList(infoList_);
         }
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          kNFOKJBGBEI_.makeImmutable(); // C
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          unlockedAreaIdList_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -179,17 +211,65 @@ private PlayerWorldSceneInfoListNotify(
               emu.grasscutter.net.proto.PlayerWorldSceneInfoListNotifyOuterClass.PlayerWorldSceneInfoListNotify.class, emu.grasscutter.net.proto.PlayerWorldSceneInfoListNotifyOuterClass.PlayerWorldSceneInfoListNotify.Builder.class);
     }
 
-    public static final int INFO_LIST_FIELD_NUMBER = 13;
+    public static final int UNLOCKED_AREA_ID_LIST_FIELD_NUMBER = 846;
+    private com.google.protobuf.Internal.IntList unlockedAreaIdList_;
+    /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 unlocked_area_id_list = 846;</code>
+     * @return A list containing the unlockedAreaIdList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getUnlockedAreaIdListList() {
+      return unlockedAreaIdList_;
+    }
+    /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 unlocked_area_id_list = 846;</code>
+     * @return The count of unlockedAreaIdList.
+     */
+    public int getUnlockedAreaIdListCount() {
+      return unlockedAreaIdList_.size();
+    }
+    /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 unlocked_area_id_list = 846;</code>
+     * @param index The index of the element to return.
+     * @return The unlockedAreaIdList at the given index.
+     */
+    public int getUnlockedAreaIdList(int index) {
+      return unlockedAreaIdList_.getInt(index);
+    }
+    private int unlockedAreaIdListMemoizedSerializedSize = -1;
+
+    public static final int INFO_LIST_FIELD_NUMBER = 7;
     private java.util.List<emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo> infoList_;
     /**
-     * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated .PlayerWorldSceneInfo info_list = 7;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo> getInfoListList() {
       return infoList_;
     }
     /**
-     * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated .PlayerWorldSceneInfo info_list = 7;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfoOrBuilder> 
@@ -197,21 +277,33 @@ public java.util.List<emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.P
       return infoList_;
     }
     /**
-     * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated .PlayerWorldSceneInfo info_list = 7;</code>
      */
     @java.lang.Override
     public int getInfoListCount() {
       return infoList_.size();
     }
     /**
-     * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated .PlayerWorldSceneInfo info_list = 7;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo getInfoList(int index) {
       return infoList_.get(index);
     }
     /**
-     * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated .PlayerWorldSceneInfo info_list = 7;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfoOrBuilder getInfoListOrBuilder(
@@ -219,34 +311,6 @@ public emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldScene
       return infoList_.get(index);
     }
 
-    public static final int KNFOKJBGBEI_FIELD_NUMBER = 1055;
-    private com.google.protobuf.Internal.IntList kNFOKJBGBEI_;
-    /**
-     * <code>repeated uint32 KNFOKJBGBEI = 1055;</code>
-     * @return A list containing the kNFOKJBGBEI.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getKNFOKJBGBEIList() {
-      return kNFOKJBGBEI_;
-    }
-    /**
-     * <code>repeated uint32 KNFOKJBGBEI = 1055;</code>
-     * @return The count of kNFOKJBGBEI.
-     */
-    public int getKNFOKJBGBEICount() {
-      return kNFOKJBGBEI_.size();
-    }
-    /**
-     * <code>repeated uint32 KNFOKJBGBEI = 1055;</code>
-     * @param index The index of the element to return.
-     * @return The kNFOKJBGBEI at the given index.
-     */
-    public int getKNFOKJBGBEI(int index) {
-      return kNFOKJBGBEI_.getInt(index);
-    }
-    private int kNFOKJBGBEIMemoizedSerializedSize = -1;
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -263,14 +327,14 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
       for (int i = 0; i < infoList_.size(); i++) {
-        output.writeMessage(13, infoList_.get(i));
+        output.writeMessage(7, infoList_.get(i));
       }
-      if (getKNFOKJBGBEIList().size() > 0) {
-        output.writeUInt32NoTag(8442);
-        output.writeUInt32NoTag(kNFOKJBGBEIMemoizedSerializedSize);
+      if (getUnlockedAreaIdListList().size() > 0) {
+        output.writeUInt32NoTag(6770);
+        output.writeUInt32NoTag(unlockedAreaIdListMemoizedSerializedSize);
       }
-      for (int i = 0; i < kNFOKJBGBEI_.size(); i++) {
-        output.writeUInt32NoTag(kNFOKJBGBEI_.getInt(i));
+      for (int i = 0; i < unlockedAreaIdList_.size(); i++) {
+        output.writeUInt32NoTag(unlockedAreaIdList_.getInt(i));
       }
       unknownFields.writeTo(output);
     }
@@ -283,21 +347,21 @@ public int getSerializedSize() {
       size = 0;
       for (int i = 0; i < infoList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(13, infoList_.get(i));
+          .computeMessageSize(7, infoList_.get(i));
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < kNFOKJBGBEI_.size(); i++) {
+        for (int i = 0; i < unlockedAreaIdList_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(kNFOKJBGBEI_.getInt(i));
+            .computeUInt32SizeNoTag(unlockedAreaIdList_.getInt(i));
         }
         size += dataSize;
-        if (!getKNFOKJBGBEIList().isEmpty()) {
+        if (!getUnlockedAreaIdListList().isEmpty()) {
           size += 2;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        kNFOKJBGBEIMemoizedSerializedSize = dataSize;
+        unlockedAreaIdListMemoizedSerializedSize = dataSize;
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -314,10 +378,10 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.PlayerWorldSceneInfoListNotifyOuterClass.PlayerWorldSceneInfoListNotify other = (emu.grasscutter.net.proto.PlayerWorldSceneInfoListNotifyOuterClass.PlayerWorldSceneInfoListNotify) obj;
 
+      if (!getUnlockedAreaIdListList()
+          .equals(other.getUnlockedAreaIdListList())) return false;
       if (!getInfoListList()
           .equals(other.getInfoListList())) return false;
-      if (!getKNFOKJBGBEIList()
-          .equals(other.getKNFOKJBGBEIList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -329,14 +393,14 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      if (getUnlockedAreaIdListCount() > 0) {
+        hash = (37 * hash) + UNLOCKED_AREA_ID_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getUnlockedAreaIdListList().hashCode();
+      }
       if (getInfoListCount() > 0) {
         hash = (37 * hash) + INFO_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getInfoListList().hashCode();
       }
-      if (getKNFOKJBGBEICount() > 0) {
-        hash = (37 * hash) + KNFOKJBGBEI_FIELD_NUMBER;
-        hash = (53 * hash) + getKNFOKJBGBEIList().hashCode();
-      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -434,7 +498,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 8028
+     * CmdId: 4320
      * </pre>
      *
      * Protobuf type {@code PlayerWorldSceneInfoListNotify}
@@ -475,14 +539,14 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        unlockedAreaIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
         if (infoListBuilder_ == null) {
           infoList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           infoListBuilder_.clear();
         }
-        kNFOKJBGBEI_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -510,20 +574,20 @@ public emu.grasscutter.net.proto.PlayerWorldSceneInfoListNotifyOuterClass.Player
       public emu.grasscutter.net.proto.PlayerWorldSceneInfoListNotifyOuterClass.PlayerWorldSceneInfoListNotify buildPartial() {
         emu.grasscutter.net.proto.PlayerWorldSceneInfoListNotifyOuterClass.PlayerWorldSceneInfoListNotify result = new emu.grasscutter.net.proto.PlayerWorldSceneInfoListNotifyOuterClass.PlayerWorldSceneInfoListNotify(this);
         int from_bitField0_ = bitField0_;
+        if (((bitField0_ & 0x00000001) != 0)) {
+          unlockedAreaIdList_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.unlockedAreaIdList_ = unlockedAreaIdList_;
         if (infoListBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) != 0)) {
+          if (((bitField0_ & 0x00000002) != 0)) {
             infoList_ = java.util.Collections.unmodifiableList(infoList_);
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
           }
           result.infoList_ = infoList_;
         } else {
           result.infoList_ = infoListBuilder_.build();
         }
-        if (((bitField0_ & 0x00000002) != 0)) {
-          kNFOKJBGBEI_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000002);
-        }
-        result.kNFOKJBGBEI_ = kNFOKJBGBEI_;
         onBuilt();
         return result;
       }
@@ -572,11 +636,21 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PlayerWorldSceneInfoListNotifyOuterClass.PlayerWorldSceneInfoListNotify other) {
         if (other == emu.grasscutter.net.proto.PlayerWorldSceneInfoListNotifyOuterClass.PlayerWorldSceneInfoListNotify.getDefaultInstance()) return this;
+        if (!other.unlockedAreaIdList_.isEmpty()) {
+          if (unlockedAreaIdList_.isEmpty()) {
+            unlockedAreaIdList_ = other.unlockedAreaIdList_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureUnlockedAreaIdListIsMutable();
+            unlockedAreaIdList_.addAll(other.unlockedAreaIdList_);
+          }
+          onChanged();
+        }
         if (infoListBuilder_ == null) {
           if (!other.infoList_.isEmpty()) {
             if (infoList_.isEmpty()) {
               infoList_ = other.infoList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000002);
             } else {
               ensureInfoListIsMutable();
               infoList_.addAll(other.infoList_);
@@ -589,7 +663,7 @@ public Builder mergeFrom(emu.grasscutter.net.proto.PlayerWorldSceneInfoListNotif
               infoListBuilder_.dispose();
               infoListBuilder_ = null;
               infoList_ = other.infoList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000002);
               infoListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getInfoListFieldBuilder() : null;
@@ -598,16 +672,6 @@ public Builder mergeFrom(emu.grasscutter.net.proto.PlayerWorldSceneInfoListNotif
             }
           }
         }
-        if (!other.kNFOKJBGBEI_.isEmpty()) {
-          if (kNFOKJBGBEI_.isEmpty()) {
-            kNFOKJBGBEI_ = other.kNFOKJBGBEI_;
-            bitField0_ = (bitField0_ & ~0x00000002);
-          } else {
-            ensureKNFOKJBGBEIIsMutable();
-            kNFOKJBGBEI_.addAll(other.kNFOKJBGBEI_);
-          }
-          onChanged();
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -638,12 +702,119 @@ public Builder mergeFrom(
       }
       private int bitField0_;
 
+      private com.google.protobuf.Internal.IntList unlockedAreaIdList_ = emptyIntList();
+      private void ensureUnlockedAreaIdListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          unlockedAreaIdList_ = mutableCopy(unlockedAreaIdList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 unlocked_area_id_list = 846;</code>
+       * @return A list containing the unlockedAreaIdList.
+       */
+      public java.util.List<java.lang.Integer>
+          getUnlockedAreaIdListList() {
+        return ((bitField0_ & 0x00000001) != 0) ?
+                 java.util.Collections.unmodifiableList(unlockedAreaIdList_) : unlockedAreaIdList_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 unlocked_area_id_list = 846;</code>
+       * @return The count of unlockedAreaIdList.
+       */
+      public int getUnlockedAreaIdListCount() {
+        return unlockedAreaIdList_.size();
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 unlocked_area_id_list = 846;</code>
+       * @param index The index of the element to return.
+       * @return The unlockedAreaIdList at the given index.
+       */
+      public int getUnlockedAreaIdList(int index) {
+        return unlockedAreaIdList_.getInt(index);
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 unlocked_area_id_list = 846;</code>
+       * @param index The index to set the value at.
+       * @param value The unlockedAreaIdList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnlockedAreaIdList(
+          int index, int value) {
+        ensureUnlockedAreaIdListIsMutable();
+        unlockedAreaIdList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 unlocked_area_id_list = 846;</code>
+       * @param value The unlockedAreaIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnlockedAreaIdList(int value) {
+        ensureUnlockedAreaIdListIsMutable();
+        unlockedAreaIdList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 unlocked_area_id_list = 846;</code>
+       * @param values The unlockedAreaIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnlockedAreaIdList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureUnlockedAreaIdListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unlockedAreaIdList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 unlocked_area_id_list = 846;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnlockedAreaIdList() {
+        unlockedAreaIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
       private java.util.List<emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo> infoList_ =
         java.util.Collections.emptyList();
       private void ensureInfoListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
+        if (!((bitField0_ & 0x00000002) != 0)) {
           infoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo>(infoList_);
-          bitField0_ |= 0x00000001;
+          bitField0_ |= 0x00000002;
          }
       }
 
@@ -651,7 +822,11 @@ private void ensureInfoListIsMutable() {
           emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo, emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo.Builder, emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfoOrBuilder> infoListBuilder_;
 
       /**
-       * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .PlayerWorldSceneInfo info_list = 7;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo> getInfoListList() {
         if (infoListBuilder_ == null) {
@@ -661,7 +836,11 @@ public java.util.List<emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.P
         }
       }
       /**
-       * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .PlayerWorldSceneInfo info_list = 7;</code>
        */
       public int getInfoListCount() {
         if (infoListBuilder_ == null) {
@@ -671,7 +850,11 @@ public int getInfoListCount() {
         }
       }
       /**
-       * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .PlayerWorldSceneInfo info_list = 7;</code>
        */
       public emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo getInfoList(int index) {
         if (infoListBuilder_ == null) {
@@ -681,7 +864,11 @@ public emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldScene
         }
       }
       /**
-       * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .PlayerWorldSceneInfo info_list = 7;</code>
        */
       public Builder setInfoList(
           int index, emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo value) {
@@ -698,7 +885,11 @@ public Builder setInfoList(
         return this;
       }
       /**
-       * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .PlayerWorldSceneInfo info_list = 7;</code>
        */
       public Builder setInfoList(
           int index, emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo.Builder builderForValue) {
@@ -712,7 +903,11 @@ public Builder setInfoList(
         return this;
       }
       /**
-       * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .PlayerWorldSceneInfo info_list = 7;</code>
        */
       public Builder addInfoList(emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo value) {
         if (infoListBuilder_ == null) {
@@ -728,7 +923,11 @@ public Builder addInfoList(emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterCl
         return this;
       }
       /**
-       * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .PlayerWorldSceneInfo info_list = 7;</code>
        */
       public Builder addInfoList(
           int index, emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo value) {
@@ -745,7 +944,11 @@ public Builder addInfoList(
         return this;
       }
       /**
-       * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .PlayerWorldSceneInfo info_list = 7;</code>
        */
       public Builder addInfoList(
           emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo.Builder builderForValue) {
@@ -759,7 +962,11 @@ public Builder addInfoList(
         return this;
       }
       /**
-       * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .PlayerWorldSceneInfo info_list = 7;</code>
        */
       public Builder addInfoList(
           int index, emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo.Builder builderForValue) {
@@ -773,7 +980,11 @@ public Builder addInfoList(
         return this;
       }
       /**
-       * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .PlayerWorldSceneInfo info_list = 7;</code>
        */
       public Builder addAllInfoList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo> values) {
@@ -788,12 +999,16 @@ public Builder addAllInfoList(
         return this;
       }
       /**
-       * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .PlayerWorldSceneInfo info_list = 7;</code>
        */
       public Builder clearInfoList() {
         if (infoListBuilder_ == null) {
           infoList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
           onChanged();
         } else {
           infoListBuilder_.clear();
@@ -801,7 +1016,11 @@ public Builder clearInfoList() {
         return this;
       }
       /**
-       * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .PlayerWorldSceneInfo info_list = 7;</code>
        */
       public Builder removeInfoList(int index) {
         if (infoListBuilder_ == null) {
@@ -814,14 +1033,22 @@ public Builder removeInfoList(int index) {
         return this;
       }
       /**
-       * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .PlayerWorldSceneInfo info_list = 7;</code>
        */
       public emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo.Builder getInfoListBuilder(
           int index) {
         return getInfoListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .PlayerWorldSceneInfo info_list = 7;</code>
        */
       public emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfoOrBuilder getInfoListOrBuilder(
           int index) {
@@ -831,7 +1058,11 @@ public emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldScene
         }
       }
       /**
-       * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .PlayerWorldSceneInfo info_list = 7;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfoOrBuilder> 
            getInfoListOrBuilderList() {
@@ -842,14 +1073,22 @@ public emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldScene
         }
       }
       /**
-       * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .PlayerWorldSceneInfo info_list = 7;</code>
        */
       public emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo.Builder addInfoListBuilder() {
         return getInfoListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .PlayerWorldSceneInfo info_list = 7;</code>
        */
       public emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo.Builder addInfoListBuilder(
           int index) {
@@ -857,7 +1096,11 @@ public emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldScene
             index, emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated .PlayerWorldSceneInfo info_list = 7;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo.Builder> 
            getInfoListBuilderList() {
@@ -870,92 +1113,13 @@ public emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldScene
           infoListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo, emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo.Builder, emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfoOrBuilder>(
                   infoList_,
-                  ((bitField0_ & 0x00000001) != 0),
+                  ((bitField0_ & 0x00000002) != 0),
                   getParentForChildren(),
                   isClean());
           infoList_ = null;
         }
         return infoListBuilder_;
       }
-
-      private com.google.protobuf.Internal.IntList kNFOKJBGBEI_ = emptyIntList();
-      private void ensureKNFOKJBGBEIIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
-          kNFOKJBGBEI_ = mutableCopy(kNFOKJBGBEI_);
-          bitField0_ |= 0x00000002;
-         }
-      }
-      /**
-       * <code>repeated uint32 KNFOKJBGBEI = 1055;</code>
-       * @return A list containing the kNFOKJBGBEI.
-       */
-      public java.util.List<java.lang.Integer>
-          getKNFOKJBGBEIList() {
-        return ((bitField0_ & 0x00000002) != 0) ?
-                 java.util.Collections.unmodifiableList(kNFOKJBGBEI_) : kNFOKJBGBEI_;
-      }
-      /**
-       * <code>repeated uint32 KNFOKJBGBEI = 1055;</code>
-       * @return The count of kNFOKJBGBEI.
-       */
-      public int getKNFOKJBGBEICount() {
-        return kNFOKJBGBEI_.size();
-      }
-      /**
-       * <code>repeated uint32 KNFOKJBGBEI = 1055;</code>
-       * @param index The index of the element to return.
-       * @return The kNFOKJBGBEI at the given index.
-       */
-      public int getKNFOKJBGBEI(int index) {
-        return kNFOKJBGBEI_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 KNFOKJBGBEI = 1055;</code>
-       * @param index The index to set the value at.
-       * @param value The kNFOKJBGBEI to set.
-       * @return This builder for chaining.
-       */
-      public Builder setKNFOKJBGBEI(
-          int index, int value) {
-        ensureKNFOKJBGBEIIsMutable();
-        kNFOKJBGBEI_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 KNFOKJBGBEI = 1055;</code>
-       * @param value The kNFOKJBGBEI to add.
-       * @return This builder for chaining.
-       */
-      public Builder addKNFOKJBGBEI(int value) {
-        ensureKNFOKJBGBEIIsMutable();
-        kNFOKJBGBEI_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 KNFOKJBGBEI = 1055;</code>
-       * @param values The kNFOKJBGBEI to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllKNFOKJBGBEI(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureKNFOKJBGBEIIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, kNFOKJBGBEI_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 KNFOKJBGBEI = 1055;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearKNFOKJBGBEI() {
-        kNFOKJBGBEI_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1024,11 +1188,11 @@ public emu.grasscutter.net.proto.PlayerWorldSceneInfoListNotifyOuterClass.Player
   static {
     java.lang.String[] descriptorData = {
       "\n$PlayerWorldSceneInfoListNotify.proto\032\032" +
-      "PlayerWorldSceneInfo.proto\"`\n\036PlayerWorl" +
-      "dSceneInfoListNotify\022(\n\tinfo_list\030\r \003(\0132" +
-      "\025.PlayerWorldSceneInfo\022\024\n\013KNFOKJBGBEI\030\237\010" +
-      " \003(\rB\033\n\031emu.grasscutter.net.protob\006proto" +
-      "3"
+      "PlayerWorldSceneInfo.proto\"j\n\036PlayerWorl" +
+      "dSceneInfoListNotify\022\036\n\025unlocked_area_id" +
+      "_list\030\316\006 \003(\r\022(\n\tinfo_list\030\007 \003(\0132\025.Player" +
+      "WorldSceneInfoB\033\n\031emu.grasscutter.net.pr" +
+      "otob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1040,7 +1204,7 @@ public emu.grasscutter.net.proto.PlayerWorldSceneInfoListNotifyOuterClass.Player
     internal_static_PlayerWorldSceneInfoListNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerWorldSceneInfoListNotify_descriptor,
-        new java.lang.String[] { "InfoList", "KNFOKJBGBEI", });
+        new java.lang.String[] { "UnlockedAreaIdList", "InfoList", });
     emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerWorldSceneInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerWorldSceneInfoOuterClass.java
index 82fc5af970d..86b83f6f491 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerWorldSceneInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerWorldSceneInfoOuterClass.java
@@ -19,48 +19,80 @@ public interface PlayerWorldSceneInfoOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 scene_tag_id_list = 5;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated uint32 scene_tag_id_list = 6;</code>
      * @return A list containing the sceneTagIdList.
      */
     java.util.List<java.lang.Integer> getSceneTagIdListList();
     /**
-     * <code>repeated uint32 scene_tag_id_list = 5;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated uint32 scene_tag_id_list = 6;</code>
      * @return The count of sceneTagIdList.
      */
     int getSceneTagIdListCount();
     /**
-     * <code>repeated uint32 scene_tag_id_list = 5;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated uint32 scene_tag_id_list = 6;</code>
      * @param index The index of the element to return.
      * @return The sceneTagIdList at the given index.
      */
     int getSceneTagIdList(int index);
 
     /**
-     * <code>bool is_locked = 10;</code>
-     * @return The isLocked.
-     */
-    boolean getIsLocked();
-
-    /**
-     * <code>uint32 scene_id = 11;</code>
-     * @return The sceneId.
-     */
-    int getSceneId();
-
-    /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
      * <code>.MapLayerInfo map_layer_info = 14;</code>
      * @return Whether the mapLayerInfo field is set.
      */
     boolean hasMapLayerInfo();
     /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
      * <code>.MapLayerInfo map_layer_info = 14;</code>
      * @return The mapLayerInfo.
      */
     emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo getMapLayerInfo();
     /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
      * <code>.MapLayerInfo map_layer_info = 14;</code>
      */
     emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder getMapLayerInfoOrBuilder();
+
+    /**
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>uint32 scene_id = 8;</code>
+     * @return The sceneId.
+     */
+    int getSceneId();
+
+    /**
+     * <pre>
+     * Offset: 0x3C
+     * </pre>
+     *
+     * <code>bool is_locked = 15;</code>
+     * @return The isLocked.
+     */
+    boolean getIsLocked();
   }
   /**
    * Protobuf type {@code PlayerWorldSceneInfo}
@@ -109,7 +141,7 @@ private PlayerWorldSceneInfo(
             case 0:
               done = true;
               break;
-            case 40: {
+            case 48: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 sceneTagIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -117,7 +149,7 @@ private PlayerWorldSceneInfo(
               sceneTagIdList_.addInt(input.readUInt32());
               break;
             }
-            case 42: {
+            case 50: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -130,12 +162,7 @@ private PlayerWorldSceneInfo(
               input.popLimit(limit);
               break;
             }
-            case 80: {
-
-              isLocked_ = input.readBool();
-              break;
-            }
-            case 88: {
+            case 64: {
 
               sceneId_ = input.readUInt32();
               break;
@@ -153,6 +180,11 @@ private PlayerWorldSceneInfo(
 
               break;
             }
+            case 120: {
+
+              isLocked_ = input.readBool();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -188,10 +220,14 @@ private PlayerWorldSceneInfo(
               emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo.class, emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo.Builder.class);
     }
 
-    public static final int SCENE_TAG_ID_LIST_FIELD_NUMBER = 5;
+    public static final int SCENE_TAG_ID_LIST_FIELD_NUMBER = 6;
     private com.google.protobuf.Internal.IntList sceneTagIdList_;
     /**
-     * <code>repeated uint32 scene_tag_id_list = 5;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated uint32 scene_tag_id_list = 6;</code>
      * @return A list containing the sceneTagIdList.
      */
     @java.lang.Override
@@ -200,14 +236,22 @@ private PlayerWorldSceneInfo(
       return sceneTagIdList_;
     }
     /**
-     * <code>repeated uint32 scene_tag_id_list = 5;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated uint32 scene_tag_id_list = 6;</code>
      * @return The count of sceneTagIdList.
      */
     public int getSceneTagIdListCount() {
       return sceneTagIdList_.size();
     }
     /**
-     * <code>repeated uint32 scene_tag_id_list = 5;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated uint32 scene_tag_id_list = 6;</code>
      * @param index The index of the element to return.
      * @return The sceneTagIdList at the given index.
      */
@@ -216,31 +260,13 @@ public int getSceneTagIdList(int index) {
     }
     private int sceneTagIdListMemoizedSerializedSize = -1;
 
-    public static final int IS_LOCKED_FIELD_NUMBER = 10;
-    private boolean isLocked_;
-    /**
-     * <code>bool is_locked = 10;</code>
-     * @return The isLocked.
-     */
-    @java.lang.Override
-    public boolean getIsLocked() {
-      return isLocked_;
-    }
-
-    public static final int SCENE_ID_FIELD_NUMBER = 11;
-    private int sceneId_;
-    /**
-     * <code>uint32 scene_id = 11;</code>
-     * @return The sceneId.
-     */
-    @java.lang.Override
-    public int getSceneId() {
-      return sceneId_;
-    }
-
     public static final int MAP_LAYER_INFO_FIELD_NUMBER = 14;
     private emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo mapLayerInfo_;
     /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
      * <code>.MapLayerInfo map_layer_info = 14;</code>
      * @return Whether the mapLayerInfo field is set.
      */
@@ -249,6 +275,10 @@ public boolean hasMapLayerInfo() {
       return mapLayerInfo_ != null;
     }
     /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
      * <code>.MapLayerInfo map_layer_info = 14;</code>
      * @return The mapLayerInfo.
      */
@@ -257,6 +287,10 @@ public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo getMapLayer
       return mapLayerInfo_ == null ? emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.getDefaultInstance() : mapLayerInfo_;
     }
     /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
      * <code>.MapLayerInfo map_layer_info = 14;</code>
      */
     @java.lang.Override
@@ -264,6 +298,36 @@ public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder ge
       return getMapLayerInfo();
     }
 
+    public static final int SCENE_ID_FIELD_NUMBER = 8;
+    private int sceneId_;
+    /**
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>uint32 scene_id = 8;</code>
+     * @return The sceneId.
+     */
+    @java.lang.Override
+    public int getSceneId() {
+      return sceneId_;
+    }
+
+    public static final int IS_LOCKED_FIELD_NUMBER = 15;
+    private boolean isLocked_;
+    /**
+     * <pre>
+     * Offset: 0x3C
+     * </pre>
+     *
+     * <code>bool is_locked = 15;</code>
+     * @return The isLocked.
+     */
+    @java.lang.Override
+    public boolean getIsLocked() {
+      return isLocked_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -280,21 +344,21 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
       if (getSceneTagIdListList().size() > 0) {
-        output.writeUInt32NoTag(42);
+        output.writeUInt32NoTag(50);
         output.writeUInt32NoTag(sceneTagIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < sceneTagIdList_.size(); i++) {
         output.writeUInt32NoTag(sceneTagIdList_.getInt(i));
       }
-      if (isLocked_ != false) {
-        output.writeBool(10, isLocked_);
-      }
       if (sceneId_ != 0) {
-        output.writeUInt32(11, sceneId_);
+        output.writeUInt32(8, sceneId_);
       }
       if (mapLayerInfo_ != null) {
         output.writeMessage(14, getMapLayerInfo());
       }
+      if (isLocked_ != false) {
+        output.writeBool(15, isLocked_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -318,18 +382,18 @@ public int getSerializedSize() {
         }
         sceneTagIdListMemoizedSerializedSize = dataSize;
       }
-      if (isLocked_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(10, isLocked_);
-      }
       if (sceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, sceneId_);
+          .computeUInt32Size(8, sceneId_);
       }
       if (mapLayerInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(14, getMapLayerInfo());
       }
+      if (isLocked_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(15, isLocked_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -347,15 +411,15 @@ public boolean equals(final java.lang.Object obj) {
 
       if (!getSceneTagIdListList()
           .equals(other.getSceneTagIdListList())) return false;
-      if (getIsLocked()
-          != other.getIsLocked()) return false;
-      if (getSceneId()
-          != other.getSceneId()) return false;
       if (hasMapLayerInfo() != other.hasMapLayerInfo()) return false;
       if (hasMapLayerInfo()) {
         if (!getMapLayerInfo()
             .equals(other.getMapLayerInfo())) return false;
       }
+      if (getSceneId()
+          != other.getSceneId()) return false;
+      if (getIsLocked()
+          != other.getIsLocked()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -371,15 +435,15 @@ public int hashCode() {
         hash = (37 * hash) + SCENE_TAG_ID_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getSceneTagIdListList().hashCode();
       }
-      hash = (37 * hash) + IS_LOCKED_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsLocked());
-      hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getSceneId();
       if (hasMapLayerInfo()) {
         hash = (37 * hash) + MAP_LAYER_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getMapLayerInfo().hashCode();
       }
+      hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getSceneId();
+      hash = (37 * hash) + IS_LOCKED_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsLocked());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -515,16 +579,16 @@ public Builder clear() {
         super.clear();
         sceneTagIdList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
-        isLocked_ = false;
-
-        sceneId_ = 0;
-
         if (mapLayerInfoBuilder_ == null) {
           mapLayerInfo_ = null;
         } else {
           mapLayerInfo_ = null;
           mapLayerInfoBuilder_ = null;
         }
+        sceneId_ = 0;
+
+        isLocked_ = false;
+
         return this;
       }
 
@@ -557,13 +621,13 @@ public emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldScene
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.sceneTagIdList_ = sceneTagIdList_;
-        result.isLocked_ = isLocked_;
-        result.sceneId_ = sceneId_;
         if (mapLayerInfoBuilder_ == null) {
           result.mapLayerInfo_ = mapLayerInfo_;
         } else {
           result.mapLayerInfo_ = mapLayerInfoBuilder_.build();
         }
+        result.sceneId_ = sceneId_;
+        result.isLocked_ = isLocked_;
         onBuilt();
         return result;
       }
@@ -622,14 +686,14 @@ public Builder mergeFrom(emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClas
           }
           onChanged();
         }
-        if (other.getIsLocked() != false) {
-          setIsLocked(other.getIsLocked());
+        if (other.hasMapLayerInfo()) {
+          mergeMapLayerInfo(other.getMapLayerInfo());
         }
         if (other.getSceneId() != 0) {
           setSceneId(other.getSceneId());
         }
-        if (other.hasMapLayerInfo()) {
-          mergeMapLayerInfo(other.getMapLayerInfo());
+        if (other.getIsLocked() != false) {
+          setIsLocked(other.getIsLocked());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -669,7 +733,11 @@ private void ensureSceneTagIdListIsMutable() {
          }
       }
       /**
-       * <code>repeated uint32 scene_tag_id_list = 5;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated uint32 scene_tag_id_list = 6;</code>
        * @return A list containing the sceneTagIdList.
        */
       public java.util.List<java.lang.Integer>
@@ -678,14 +746,22 @@ private void ensureSceneTagIdListIsMutable() {
                  java.util.Collections.unmodifiableList(sceneTagIdList_) : sceneTagIdList_;
       }
       /**
-       * <code>repeated uint32 scene_tag_id_list = 5;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated uint32 scene_tag_id_list = 6;</code>
        * @return The count of sceneTagIdList.
        */
       public int getSceneTagIdListCount() {
         return sceneTagIdList_.size();
       }
       /**
-       * <code>repeated uint32 scene_tag_id_list = 5;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated uint32 scene_tag_id_list = 6;</code>
        * @param index The index of the element to return.
        * @return The sceneTagIdList at the given index.
        */
@@ -693,7 +769,11 @@ public int getSceneTagIdList(int index) {
         return sceneTagIdList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 scene_tag_id_list = 5;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated uint32 scene_tag_id_list = 6;</code>
        * @param index The index to set the value at.
        * @param value The sceneTagIdList to set.
        * @return This builder for chaining.
@@ -706,7 +786,11 @@ public Builder setSceneTagIdList(
         return this;
       }
       /**
-       * <code>repeated uint32 scene_tag_id_list = 5;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated uint32 scene_tag_id_list = 6;</code>
        * @param value The sceneTagIdList to add.
        * @return This builder for chaining.
        */
@@ -717,7 +801,11 @@ public Builder addSceneTagIdList(int value) {
         return this;
       }
       /**
-       * <code>repeated uint32 scene_tag_id_list = 5;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated uint32 scene_tag_id_list = 6;</code>
        * @param values The sceneTagIdList to add.
        * @return This builder for chaining.
        */
@@ -730,7 +818,11 @@ public Builder addAllSceneTagIdList(
         return this;
       }
       /**
-       * <code>repeated uint32 scene_tag_id_list = 5;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated uint32 scene_tag_id_list = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearSceneTagIdList() {
@@ -740,72 +832,14 @@ public Builder clearSceneTagIdList() {
         return this;
       }
 
-      private boolean isLocked_ ;
-      /**
-       * <code>bool is_locked = 10;</code>
-       * @return The isLocked.
-       */
-      @java.lang.Override
-      public boolean getIsLocked() {
-        return isLocked_;
-      }
-      /**
-       * <code>bool is_locked = 10;</code>
-       * @param value The isLocked to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsLocked(boolean value) {
-        
-        isLocked_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_locked = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsLocked() {
-        
-        isLocked_ = false;
-        onChanged();
-        return this;
-      }
-
-      private int sceneId_ ;
-      /**
-       * <code>uint32 scene_id = 11;</code>
-       * @return The sceneId.
-       */
-      @java.lang.Override
-      public int getSceneId() {
-        return sceneId_;
-      }
-      /**
-       * <code>uint32 scene_id = 11;</code>
-       * @param value The sceneId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSceneId(int value) {
-        
-        sceneId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 scene_id = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSceneId() {
-        
-        sceneId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo mapLayerInfo_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo, emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder, emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder> mapLayerInfoBuilder_;
       /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
        * <code>.MapLayerInfo map_layer_info = 14;</code>
        * @return Whether the mapLayerInfo field is set.
        */
@@ -813,6 +847,10 @@ public boolean hasMapLayerInfo() {
         return mapLayerInfoBuilder_ != null || mapLayerInfo_ != null;
       }
       /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
        * <code>.MapLayerInfo map_layer_info = 14;</code>
        * @return The mapLayerInfo.
        */
@@ -824,6 +862,10 @@ public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo getMapLayer
         }
       }
       /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
        * <code>.MapLayerInfo map_layer_info = 14;</code>
        */
       public Builder setMapLayerInfo(emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo value) {
@@ -840,6 +882,10 @@ public Builder setMapLayerInfo(emu.grasscutter.net.proto.MapLayerInfoOuterClass.
         return this;
       }
       /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
        * <code>.MapLayerInfo map_layer_info = 14;</code>
        */
       public Builder setMapLayerInfo(
@@ -854,6 +900,10 @@ public Builder setMapLayerInfo(
         return this;
       }
       /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
        * <code>.MapLayerInfo map_layer_info = 14;</code>
        */
       public Builder mergeMapLayerInfo(emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo value) {
@@ -872,6 +922,10 @@ public Builder mergeMapLayerInfo(emu.grasscutter.net.proto.MapLayerInfoOuterClas
         return this;
       }
       /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
        * <code>.MapLayerInfo map_layer_info = 14;</code>
        */
       public Builder clearMapLayerInfo() {
@@ -886,6 +940,10 @@ public Builder clearMapLayerInfo() {
         return this;
       }
       /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
        * <code>.MapLayerInfo map_layer_info = 14;</code>
        */
       public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder getMapLayerInfoBuilder() {
@@ -894,6 +952,10 @@ public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder get
         return getMapLayerInfoFieldBuilder().getBuilder();
       }
       /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
        * <code>.MapLayerInfo map_layer_info = 14;</code>
        */
       public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder getMapLayerInfoOrBuilder() {
@@ -905,6 +967,10 @@ public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder ge
         }
       }
       /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
        * <code>.MapLayerInfo map_layer_info = 14;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
@@ -920,6 +986,92 @@ public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder ge
         }
         return mapLayerInfoBuilder_;
       }
+
+      private int sceneId_ ;
+      /**
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>uint32 scene_id = 8;</code>
+       * @return The sceneId.
+       */
+      @java.lang.Override
+      public int getSceneId() {
+        return sceneId_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>uint32 scene_id = 8;</code>
+       * @param value The sceneId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSceneId(int value) {
+        
+        sceneId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>uint32 scene_id = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearSceneId() {
+        
+        sceneId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private boolean isLocked_ ;
+      /**
+       * <pre>
+       * Offset: 0x3C
+       * </pre>
+       *
+       * <code>bool is_locked = 15;</code>
+       * @return The isLocked.
+       */
+      @java.lang.Override
+      public boolean getIsLocked() {
+        return isLocked_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x3C
+       * </pre>
+       *
+       * <code>bool is_locked = 15;</code>
+       * @param value The isLocked to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsLocked(boolean value) {
+        
+        isLocked_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x3C
+       * </pre>
+       *
+       * <code>bool is_locked = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsLocked() {
+        
+        isLocked_ = false;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -989,9 +1141,9 @@ public emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldScene
     java.lang.String[] descriptorData = {
       "\n\032PlayerWorldSceneInfo.proto\032\022MapLayerIn" +
       "fo.proto\"}\n\024PlayerWorldSceneInfo\022\031\n\021scen" +
-      "e_tag_id_list\030\005 \003(\r\022\021\n\tis_locked\030\n \001(\010\022\020" +
-      "\n\010scene_id\030\013 \001(\r\022%\n\016map_layer_info\030\016 \001(\013" +
-      "2\r.MapLayerInfoB\033\n\031emu.grasscutter.net.p" +
+      "e_tag_id_list\030\006 \003(\r\022%\n\016map_layer_info\030\016 " +
+      "\001(\0132\r.MapLayerInfo\022\020\n\010scene_id\030\010 \001(\r\022\021\n\t" +
+      "is_locked\030\017 \001(\010B\033\n\031emu.grasscutter.net.p" +
       "rotob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1004,7 +1156,7 @@ public emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldScene
     internal_static_PlayerWorldSceneInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerWorldSceneInfo_descriptor,
-        new java.lang.String[] { "SceneTagIdList", "IsLocked", "SceneId", "MapLayerInfo", });
+        new java.lang.String[] { "SceneTagIdList", "MapLayerInfo", "SceneId", "IsLocked", });
     emu.grasscutter.net.proto.MapLayerInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PostEnterSceneReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PostEnterSceneReqOuterClass.java
index 6ffc3ce41f7..cef110ca0aa 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PostEnterSceneReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PostEnterSceneReqOuterClass.java
@@ -19,20 +19,28 @@ public interface PostEnterSceneReqOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>double total_tick_time = 1;</code>
-     * @return The totalTickTime.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 enter_scene_token = 7;</code>
+     * @return The enterSceneToken.
      */
-    double getTotalTickTime();
+    int getEnterSceneToken();
 
     /**
-     * <code>uint32 enter_scene_token = 8;</code>
-     * @return The enterSceneToken.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>double total_tick_time = 4;</code>
+     * @return The totalTickTime.
      */
-    int getEnterSceneToken();
+    double getTotalTickTime();
   }
   /**
    * <pre>
-   * CmdId: 20778
+   * CmdId: 23191
    * </pre>
    *
    * Protobuf type {@code PostEnterSceneReq}
@@ -79,12 +87,12 @@ private PostEnterSceneReq(
             case 0:
               done = true;
               break;
-            case 9: {
+            case 33: {
 
               totalTickTime_ = input.readDouble();
               break;
             }
-            case 64: {
+            case 56: {
 
               enterSceneToken_ = input.readUInt32();
               break;
@@ -121,26 +129,34 @@ private PostEnterSceneReq(
               emu.grasscutter.net.proto.PostEnterSceneReqOuterClass.PostEnterSceneReq.class, emu.grasscutter.net.proto.PostEnterSceneReqOuterClass.PostEnterSceneReq.Builder.class);
     }
 
-    public static final int TOTAL_TICK_TIME_FIELD_NUMBER = 1;
-    private double totalTickTime_;
+    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 7;
+    private int enterSceneToken_;
     /**
-     * <code>double total_tick_time = 1;</code>
-     * @return The totalTickTime.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 enter_scene_token = 7;</code>
+     * @return The enterSceneToken.
      */
     @java.lang.Override
-    public double getTotalTickTime() {
-      return totalTickTime_;
+    public int getEnterSceneToken() {
+      return enterSceneToken_;
     }
 
-    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 8;
-    private int enterSceneToken_;
+    public static final int TOTAL_TICK_TIME_FIELD_NUMBER = 4;
+    private double totalTickTime_;
     /**
-     * <code>uint32 enter_scene_token = 8;</code>
-     * @return The enterSceneToken.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>double total_tick_time = 4;</code>
+     * @return The totalTickTime.
      */
     @java.lang.Override
-    public int getEnterSceneToken() {
-      return enterSceneToken_;
+    public double getTotalTickTime() {
+      return totalTickTime_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -158,10 +174,10 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (totalTickTime_ != 0D) {
-        output.writeDouble(1, totalTickTime_);
+        output.writeDouble(4, totalTickTime_);
       }
       if (enterSceneToken_ != 0) {
-        output.writeUInt32(8, enterSceneToken_);
+        output.writeUInt32(7, enterSceneToken_);
       }
       unknownFields.writeTo(output);
     }
@@ -174,11 +190,11 @@ public int getSerializedSize() {
       size = 0;
       if (totalTickTime_ != 0D) {
         size += com.google.protobuf.CodedOutputStream
-          .computeDoubleSize(1, totalTickTime_);
+          .computeDoubleSize(4, totalTickTime_);
       }
       if (enterSceneToken_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, enterSceneToken_);
+          .computeUInt32Size(7, enterSceneToken_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -195,11 +211,11 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.PostEnterSceneReqOuterClass.PostEnterSceneReq other = (emu.grasscutter.net.proto.PostEnterSceneReqOuterClass.PostEnterSceneReq) obj;
 
+      if (getEnterSceneToken()
+          != other.getEnterSceneToken()) return false;
       if (java.lang.Double.doubleToLongBits(getTotalTickTime())
           != java.lang.Double.doubleToLongBits(
               other.getTotalTickTime())) return false;
-      if (getEnterSceneToken()
-          != other.getEnterSceneToken()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -211,11 +227,11 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + ENTER_SCENE_TOKEN_FIELD_NUMBER;
+      hash = (53 * hash) + getEnterSceneToken();
       hash = (37 * hash) + TOTAL_TICK_TIME_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           java.lang.Double.doubleToLongBits(getTotalTickTime()));
-      hash = (37 * hash) + ENTER_SCENE_TOKEN_FIELD_NUMBER;
-      hash = (53 * hash) + getEnterSceneToken();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -313,7 +329,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 20778
+     * CmdId: 23191
      * </pre>
      *
      * Protobuf type {@code PostEnterSceneReq}
@@ -353,10 +369,10 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        totalTickTime_ = 0D;
-
         enterSceneToken_ = 0;
 
+        totalTickTime_ = 0D;
+
         return this;
       }
 
@@ -383,8 +399,8 @@ public emu.grasscutter.net.proto.PostEnterSceneReqOuterClass.PostEnterSceneReq b
       @java.lang.Override
       public emu.grasscutter.net.proto.PostEnterSceneReqOuterClass.PostEnterSceneReq buildPartial() {
         emu.grasscutter.net.proto.PostEnterSceneReqOuterClass.PostEnterSceneReq result = new emu.grasscutter.net.proto.PostEnterSceneReqOuterClass.PostEnterSceneReq(this);
-        result.totalTickTime_ = totalTickTime_;
         result.enterSceneToken_ = enterSceneToken_;
+        result.totalTickTime_ = totalTickTime_;
         onBuilt();
         return result;
       }
@@ -433,12 +449,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PostEnterSceneReqOuterClass.PostEnterSceneReq other) {
         if (other == emu.grasscutter.net.proto.PostEnterSceneReqOuterClass.PostEnterSceneReq.getDefaultInstance()) return this;
-        if (other.getTotalTickTime() != 0D) {
-          setTotalTickTime(other.getTotalTickTime());
-        }
         if (other.getEnterSceneToken() != 0) {
           setEnterSceneToken(other.getEnterSceneToken());
         }
+        if (other.getTotalTickTime() != 0D) {
+          setTotalTickTime(other.getTotalTickTime());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -468,64 +484,88 @@ public Builder mergeFrom(
         return this;
       }
 
-      private double totalTickTime_ ;
+      private int enterSceneToken_ ;
       /**
-       * <code>double total_tick_time = 1;</code>
-       * @return The totalTickTime.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 enter_scene_token = 7;</code>
+       * @return The enterSceneToken.
        */
       @java.lang.Override
-      public double getTotalTickTime() {
-        return totalTickTime_;
+      public int getEnterSceneToken() {
+        return enterSceneToken_;
       }
       /**
-       * <code>double total_tick_time = 1;</code>
-       * @param value The totalTickTime to set.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 enter_scene_token = 7;</code>
+       * @param value The enterSceneToken to set.
        * @return This builder for chaining.
        */
-      public Builder setTotalTickTime(double value) {
+      public Builder setEnterSceneToken(int value) {
         
-        totalTickTime_ = value;
+        enterSceneToken_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>double total_tick_time = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 enter_scene_token = 7;</code>
        * @return This builder for chaining.
        */
-      public Builder clearTotalTickTime() {
+      public Builder clearEnterSceneToken() {
         
-        totalTickTime_ = 0D;
+        enterSceneToken_ = 0;
         onChanged();
         return this;
       }
 
-      private int enterSceneToken_ ;
+      private double totalTickTime_ ;
       /**
-       * <code>uint32 enter_scene_token = 8;</code>
-       * @return The enterSceneToken.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>double total_tick_time = 4;</code>
+       * @return The totalTickTime.
        */
       @java.lang.Override
-      public int getEnterSceneToken() {
-        return enterSceneToken_;
+      public double getTotalTickTime() {
+        return totalTickTime_;
       }
       /**
-       * <code>uint32 enter_scene_token = 8;</code>
-       * @param value The enterSceneToken to set.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>double total_tick_time = 4;</code>
+       * @param value The totalTickTime to set.
        * @return This builder for chaining.
        */
-      public Builder setEnterSceneToken(int value) {
+      public Builder setTotalTickTime(double value) {
         
-        enterSceneToken_ = value;
+        totalTickTime_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 enter_scene_token = 8;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>double total_tick_time = 4;</code>
        * @return This builder for chaining.
        */
-      public Builder clearEnterSceneToken() {
+      public Builder clearTotalTickTime() {
         
-        enterSceneToken_ = 0;
+        totalTickTime_ = 0D;
         onChanged();
         return this;
       }
@@ -597,8 +637,8 @@ public emu.grasscutter.net.proto.PostEnterSceneReqOuterClass.PostEnterSceneReq g
   static {
     java.lang.String[] descriptorData = {
       "\n\027PostEnterSceneReq.proto\"G\n\021PostEnterSc" +
-      "eneReq\022\027\n\017total_tick_time\030\001 \001(\001\022\031\n\021enter" +
-      "_scene_token\030\010 \001(\rB\033\n\031emu.grasscutter.ne" +
+      "eneReq\022\031\n\021enter_scene_token\030\007 \001(\r\022\027\n\017tot" +
+      "al_tick_time\030\004 \001(\001B\033\n\031emu.grasscutter.ne" +
       "t.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -610,7 +650,7 @@ public emu.grasscutter.net.proto.PostEnterSceneReqOuterClass.PostEnterSceneReq g
     internal_static_PostEnterSceneReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PostEnterSceneReq_descriptor,
-        new java.lang.String[] { "TotalTickTime", "EnterSceneToken", });
+        new java.lang.String[] { "EnterSceneToken", "TotalTickTime", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PostEnterSceneRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PostEnterSceneRspOuterClass.java
index 178dc5705f1..d52392c39c6 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PostEnterSceneRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PostEnterSceneRspOuterClass.java
@@ -23,24 +23,24 @@ public interface PostEnterSceneRspOrBuilder extends
      * Offset: 0x20
      * </pre>
      *
-     * <code>uint32 enter_scene_token = 13;</code>
-     * @return The enterSceneToken.
+     * <code>int32 retcode = 14;</code>
+     * @return The retcode.
      */
-    int getEnterSceneToken();
+    int getRetcode();
 
     /**
      * <pre>
      * Offset: 0x24
      * </pre>
      *
-     * <code>int32 retcode = 10;</code>
-     * @return The retcode.
+     * <code>uint32 enter_scene_token = 3;</code>
+     * @return The enterSceneToken.
      */
-    int getRetcode();
+    int getEnterSceneToken();
   }
   /**
    * <pre>
-   * CmdId: 2709
+   * CmdId: 3887
    * </pre>
    *
    * Protobuf type {@code PostEnterSceneRsp}
@@ -87,14 +87,14 @@ private PostEnterSceneRsp(
             case 0:
               done = true;
               break;
-            case 80: {
+            case 24: {
 
-              retcode_ = input.readInt32();
+              enterSceneToken_ = input.readUInt32();
               break;
             }
-            case 104: {
+            case 112: {
 
-              enterSceneToken_ = input.readUInt32();
+              retcode_ = input.readInt32();
               break;
             }
             default: {
@@ -129,34 +129,34 @@ private PostEnterSceneRsp(
               emu.grasscutter.net.proto.PostEnterSceneRspOuterClass.PostEnterSceneRsp.class, emu.grasscutter.net.proto.PostEnterSceneRspOuterClass.PostEnterSceneRsp.Builder.class);
     }
 
-    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 13;
-    private int enterSceneToken_;
+    public static final int RETCODE_FIELD_NUMBER = 14;
+    private int retcode_;
     /**
      * <pre>
      * Offset: 0x20
      * </pre>
      *
-     * <code>uint32 enter_scene_token = 13;</code>
-     * @return The enterSceneToken.
+     * <code>int32 retcode = 14;</code>
+     * @return The retcode.
      */
     @java.lang.Override
-    public int getEnterSceneToken() {
-      return enterSceneToken_;
+    public int getRetcode() {
+      return retcode_;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 10;
-    private int retcode_;
+    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 3;
+    private int enterSceneToken_;
     /**
      * <pre>
      * Offset: 0x24
      * </pre>
      *
-     * <code>int32 retcode = 10;</code>
-     * @return The retcode.
+     * <code>uint32 enter_scene_token = 3;</code>
+     * @return The enterSceneToken.
      */
     @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
+    public int getEnterSceneToken() {
+      return enterSceneToken_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -173,11 +173,11 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (retcode_ != 0) {
-        output.writeInt32(10, retcode_);
-      }
       if (enterSceneToken_ != 0) {
-        output.writeUInt32(13, enterSceneToken_);
+        output.writeUInt32(3, enterSceneToken_);
+      }
+      if (retcode_ != 0) {
+        output.writeInt32(14, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -188,13 +188,13 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (retcode_ != 0) {
+      if (enterSceneToken_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(10, retcode_);
+          .computeUInt32Size(3, enterSceneToken_);
       }
-      if (enterSceneToken_ != 0) {
+      if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, enterSceneToken_);
+          .computeInt32Size(14, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -211,10 +211,10 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.PostEnterSceneRspOuterClass.PostEnterSceneRsp other = (emu.grasscutter.net.proto.PostEnterSceneRspOuterClass.PostEnterSceneRsp) obj;
 
-      if (getEnterSceneToken()
-          != other.getEnterSceneToken()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (getEnterSceneToken()
+          != other.getEnterSceneToken()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -226,10 +226,10 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + ENTER_SCENE_TOKEN_FIELD_NUMBER;
-      hash = (53 * hash) + getEnterSceneToken();
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + ENTER_SCENE_TOKEN_FIELD_NUMBER;
+      hash = (53 * hash) + getEnterSceneToken();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -327,7 +327,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 2709
+     * CmdId: 3887
      * </pre>
      *
      * Protobuf type {@code PostEnterSceneRsp}
@@ -367,10 +367,10 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        enterSceneToken_ = 0;
-
         retcode_ = 0;
 
+        enterSceneToken_ = 0;
+
         return this;
       }
 
@@ -397,8 +397,8 @@ public emu.grasscutter.net.proto.PostEnterSceneRspOuterClass.PostEnterSceneRsp b
       @java.lang.Override
       public emu.grasscutter.net.proto.PostEnterSceneRspOuterClass.PostEnterSceneRsp buildPartial() {
         emu.grasscutter.net.proto.PostEnterSceneRspOuterClass.PostEnterSceneRsp result = new emu.grasscutter.net.proto.PostEnterSceneRspOuterClass.PostEnterSceneRsp(this);
-        result.enterSceneToken_ = enterSceneToken_;
         result.retcode_ = retcode_;
+        result.enterSceneToken_ = enterSceneToken_;
         onBuilt();
         return result;
       }
@@ -447,12 +447,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PostEnterSceneRspOuterClass.PostEnterSceneRsp other) {
         if (other == emu.grasscutter.net.proto.PostEnterSceneRspOuterClass.PostEnterSceneRsp.getDefaultInstance()) return this;
-        if (other.getEnterSceneToken() != 0) {
-          setEnterSceneToken(other.getEnterSceneToken());
-        }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
+        if (other.getEnterSceneToken() != 0) {
+          setEnterSceneToken(other.getEnterSceneToken());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -482,31 +482,31 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int enterSceneToken_ ;
+      private int retcode_ ;
       /**
        * <pre>
        * Offset: 0x20
        * </pre>
        *
-       * <code>uint32 enter_scene_token = 13;</code>
-       * @return The enterSceneToken.
+       * <code>int32 retcode = 14;</code>
+       * @return The retcode.
        */
       @java.lang.Override
-      public int getEnterSceneToken() {
-        return enterSceneToken_;
+      public int getRetcode() {
+        return retcode_;
       }
       /**
        * <pre>
        * Offset: 0x20
        * </pre>
        *
-       * <code>uint32 enter_scene_token = 13;</code>
-       * @param value The enterSceneToken to set.
+       * <code>int32 retcode = 14;</code>
+       * @param value The retcode to set.
        * @return This builder for chaining.
        */
-      public Builder setEnterSceneToken(int value) {
+      public Builder setRetcode(int value) {
         
-        enterSceneToken_ = value;
+        retcode_ = value;
         onChanged();
         return this;
       }
@@ -515,41 +515,41 @@ public Builder setEnterSceneToken(int value) {
        * Offset: 0x20
        * </pre>
        *
-       * <code>uint32 enter_scene_token = 13;</code>
+       * <code>int32 retcode = 14;</code>
        * @return This builder for chaining.
        */
-      public Builder clearEnterSceneToken() {
+      public Builder clearRetcode() {
         
-        enterSceneToken_ = 0;
+        retcode_ = 0;
         onChanged();
         return this;
       }
 
-      private int retcode_ ;
+      private int enterSceneToken_ ;
       /**
        * <pre>
        * Offset: 0x24
        * </pre>
        *
-       * <code>int32 retcode = 10;</code>
-       * @return The retcode.
+       * <code>uint32 enter_scene_token = 3;</code>
+       * @return The enterSceneToken.
        */
       @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
+      public int getEnterSceneToken() {
+        return enterSceneToken_;
       }
       /**
        * <pre>
        * Offset: 0x24
        * </pre>
        *
-       * <code>int32 retcode = 10;</code>
-       * @param value The retcode to set.
+       * <code>uint32 enter_scene_token = 3;</code>
+       * @param value The enterSceneToken to set.
        * @return This builder for chaining.
        */
-      public Builder setRetcode(int value) {
+      public Builder setEnterSceneToken(int value) {
         
-        retcode_ = value;
+        enterSceneToken_ = value;
         onChanged();
         return this;
       }
@@ -558,12 +558,12 @@ public Builder setRetcode(int value) {
        * Offset: 0x24
        * </pre>
        *
-       * <code>int32 retcode = 10;</code>
+       * <code>uint32 enter_scene_token = 3;</code>
        * @return This builder for chaining.
        */
-      public Builder clearRetcode() {
+      public Builder clearEnterSceneToken() {
         
-        retcode_ = 0;
+        enterSceneToken_ = 0;
         onChanged();
         return this;
       }
@@ -635,8 +635,8 @@ public emu.grasscutter.net.proto.PostEnterSceneRspOuterClass.PostEnterSceneRsp g
   static {
     java.lang.String[] descriptorData = {
       "\n\027PostEnterSceneRsp.proto\"?\n\021PostEnterSc" +
-      "eneRsp\022\031\n\021enter_scene_token\030\r \001(\r\022\017\n\007ret" +
-      "code\030\n \001(\005B\033\n\031emu.grasscutter.net.protob" +
+      "eneRsp\022\017\n\007retcode\030\016 \001(\005\022\031\n\021enter_scene_t" +
+      "oken\030\003 \001(\rB\033\n\031emu.grasscutter.net.protob" +
       "\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -648,7 +648,7 @@ public emu.grasscutter.net.proto.PostEnterSceneRspOuterClass.PostEnterSceneRsp g
     internal_static_PostEnterSceneRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PostEnterSceneRsp_descriptor,
-        new java.lang.String[] { "EnterSceneToken", "Retcode", });
+        new java.lang.String[] { "Retcode", "EnterSceneToken", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PrivateChatNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PrivateChatNotifyOuterClass.java
index b83e15fbf56..773653a8211 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PrivateChatNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PrivateChatNotifyOuterClass.java
@@ -19,23 +19,35 @@ public interface PrivateChatNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.ChatInfo chat_info = 7;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.ChatInfo chat_info = 11;</code>
      * @return Whether the chatInfo field is set.
      */
     boolean hasChatInfo();
     /**
-     * <code>.ChatInfo chat_info = 7;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.ChatInfo chat_info = 11;</code>
      * @return The chatInfo.
      */
     emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo getChatInfo();
     /**
-     * <code>.ChatInfo chat_info = 7;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.ChatInfo chat_info = 11;</code>
      */
     emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfoOrBuilder getChatInfoOrBuilder();
   }
   /**
    * <pre>
-   * CmdId: 6396
+   * CmdId: 26909
    * </pre>
    *
    * Protobuf type {@code PrivateChatNotify}
@@ -82,7 +94,7 @@ private PrivateChatNotify(
             case 0:
               done = true;
               break;
-            case 58: {
+            case 90: {
               emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.Builder subBuilder = null;
               if (chatInfo_ != null) {
                 subBuilder = chatInfo_.toBuilder();
@@ -127,10 +139,14 @@ private PrivateChatNotify(
               emu.grasscutter.net.proto.PrivateChatNotifyOuterClass.PrivateChatNotify.class, emu.grasscutter.net.proto.PrivateChatNotifyOuterClass.PrivateChatNotify.Builder.class);
     }
 
-    public static final int CHAT_INFO_FIELD_NUMBER = 7;
+    public static final int CHAT_INFO_FIELD_NUMBER = 11;
     private emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo chatInfo_;
     /**
-     * <code>.ChatInfo chat_info = 7;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.ChatInfo chat_info = 11;</code>
      * @return Whether the chatInfo field is set.
      */
     @java.lang.Override
@@ -138,7 +154,11 @@ public boolean hasChatInfo() {
       return chatInfo_ != null;
     }
     /**
-     * <code>.ChatInfo chat_info = 7;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.ChatInfo chat_info = 11;</code>
      * @return The chatInfo.
      */
     @java.lang.Override
@@ -146,7 +166,11 @@ public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo getChatInfo() {
       return chatInfo_ == null ? emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.getDefaultInstance() : chatInfo_;
     }
     /**
-     * <code>.ChatInfo chat_info = 7;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.ChatInfo chat_info = 11;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfoOrBuilder getChatInfoOrBuilder() {
@@ -168,7 +192,7 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (chatInfo_ != null) {
-        output.writeMessage(7, getChatInfo());
+        output.writeMessage(11, getChatInfo());
       }
       unknownFields.writeTo(output);
     }
@@ -181,7 +205,7 @@ public int getSerializedSize() {
       size = 0;
       if (chatInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(7, getChatInfo());
+          .computeMessageSize(11, getChatInfo());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -315,7 +339,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 6396
+     * CmdId: 26909
      * </pre>
      *
      * Protobuf type {@code PrivateChatNotify}
@@ -476,14 +500,22 @@ public Builder mergeFrom(
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo, emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.Builder, emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfoOrBuilder> chatInfoBuilder_;
       /**
-       * <code>.ChatInfo chat_info = 7;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.ChatInfo chat_info = 11;</code>
        * @return Whether the chatInfo field is set.
        */
       public boolean hasChatInfo() {
         return chatInfoBuilder_ != null || chatInfo_ != null;
       }
       /**
-       * <code>.ChatInfo chat_info = 7;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.ChatInfo chat_info = 11;</code>
        * @return The chatInfo.
        */
       public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo getChatInfo() {
@@ -494,7 +526,11 @@ public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo getChatInfo() {
         }
       }
       /**
-       * <code>.ChatInfo chat_info = 7;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.ChatInfo chat_info = 11;</code>
        */
       public Builder setChatInfo(emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo value) {
         if (chatInfoBuilder_ == null) {
@@ -510,7 +546,11 @@ public Builder setChatInfo(emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo
         return this;
       }
       /**
-       * <code>.ChatInfo chat_info = 7;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.ChatInfo chat_info = 11;</code>
        */
       public Builder setChatInfo(
           emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.Builder builderForValue) {
@@ -524,7 +564,11 @@ public Builder setChatInfo(
         return this;
       }
       /**
-       * <code>.ChatInfo chat_info = 7;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.ChatInfo chat_info = 11;</code>
        */
       public Builder mergeChatInfo(emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo value) {
         if (chatInfoBuilder_ == null) {
@@ -542,7 +586,11 @@ public Builder mergeChatInfo(emu.grasscutter.net.proto.ChatInfoOuterClass.ChatIn
         return this;
       }
       /**
-       * <code>.ChatInfo chat_info = 7;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.ChatInfo chat_info = 11;</code>
        */
       public Builder clearChatInfo() {
         if (chatInfoBuilder_ == null) {
@@ -556,7 +604,11 @@ public Builder clearChatInfo() {
         return this;
       }
       /**
-       * <code>.ChatInfo chat_info = 7;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.ChatInfo chat_info = 11;</code>
        */
       public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.Builder getChatInfoBuilder() {
         
@@ -564,7 +616,11 @@ public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.Builder getChatInfo
         return getChatInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.ChatInfo chat_info = 7;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.ChatInfo chat_info = 11;</code>
        */
       public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfoOrBuilder getChatInfoOrBuilder() {
         if (chatInfoBuilder_ != null) {
@@ -575,7 +631,11 @@ public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfoOrBuilder getChatInf
         }
       }
       /**
-       * <code>.ChatInfo chat_info = 7;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.ChatInfo chat_info = 11;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo, emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.Builder, emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfoOrBuilder> 
@@ -658,7 +718,7 @@ public emu.grasscutter.net.proto.PrivateChatNotifyOuterClass.PrivateChatNotify g
   static {
     java.lang.String[] descriptorData = {
       "\n\027PrivateChatNotify.proto\032\016ChatInfo.prot" +
-      "o\"1\n\021PrivateChatNotify\022\034\n\tchat_info\030\007 \001(" +
+      "o\"1\n\021PrivateChatNotify\022\034\n\tchat_info\030\013 \001(" +
       "\0132\t.ChatInfoB\033\n\031emu.grasscutter.net.prot" +
       "ob\006proto3"
     };
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PrivateChatReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PrivateChatReqOuterClass.java
index b2c01a81df3..3d83ee53125 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PrivateChatReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PrivateChatReqOuterClass.java
@@ -19,34 +19,34 @@ public interface PrivateChatReqOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 target_uid = 8;</code>
+     * <code>uint32 target_uid = 2;</code>
      * @return The targetUid.
      */
     int getTargetUid();
 
     /**
-     * <code>uint32 icon = 11;</code>
+     * <code>uint32 icon = 3;</code>
      * @return Whether the icon field is set.
      */
     boolean hasIcon();
     /**
-     * <code>uint32 icon = 11;</code>
+     * <code>uint32 icon = 3;</code>
      * @return The icon.
      */
     int getIcon();
 
     /**
-     * <code>string text = 9;</code>
+     * <code>string text = 14;</code>
      * @return Whether the text field is set.
      */
     boolean hasText();
     /**
-     * <code>string text = 9;</code>
+     * <code>string text = 14;</code>
      * @return The text.
      */
     java.lang.String getText();
     /**
-     * <code>string text = 9;</code>
+     * <code>string text = 14;</code>
      * @return The bytes for text.
      */
     com.google.protobuf.ByteString
@@ -103,20 +103,20 @@ private PrivateChatReq(
             case 0:
               done = true;
               break;
-            case 64: {
+            case 16: {
 
               targetUid_ = input.readUInt32();
               break;
             }
-            case 74: {
-              java.lang.String s = input.readStringRequireUtf8();
-              contentCase_ = 9;
-              content_ = s;
+            case 24: {
+              contentCase_ = 3;
+              content_ = input.readUInt32();
               break;
             }
-            case 88: {
-              contentCase_ = 11;
-              content_ = input.readUInt32();
+            case 114: {
+              java.lang.String s = input.readStringRequireUtf8();
+              contentCase_ = 14;
+              content_ = s;
               break;
             }
             default: {
@@ -156,8 +156,8 @@ private PrivateChatReq(
     public enum ContentCase
         implements com.google.protobuf.Internal.EnumLite,
             com.google.protobuf.AbstractMessage.InternalOneOfEnum {
-      ICON(11),
-      TEXT(9),
+      ICON(3),
+      TEXT(14),
       CONTENT_NOT_SET(0);
       private final int value;
       private ContentCase(int value) {
@@ -175,8 +175,8 @@ public static ContentCase valueOf(int value) {
 
       public static ContentCase forNumber(int value) {
         switch (value) {
-          case 11: return ICON;
-          case 9: return TEXT;
+          case 3: return ICON;
+          case 14: return TEXT;
           case 0: return CONTENT_NOT_SET;
           default: return null;
         }
@@ -192,10 +192,10 @@ public int getNumber() {
           contentCase_);
     }
 
-    public static final int TARGET_UID_FIELD_NUMBER = 8;
+    public static final int TARGET_UID_FIELD_NUMBER = 2;
     private int targetUid_;
     /**
-     * <code>uint32 target_uid = 8;</code>
+     * <code>uint32 target_uid = 2;</code>
      * @return The targetUid.
      */
     @java.lang.Override
@@ -203,42 +203,42 @@ public int getTargetUid() {
       return targetUid_;
     }
 
-    public static final int ICON_FIELD_NUMBER = 11;
+    public static final int ICON_FIELD_NUMBER = 3;
     /**
-     * <code>uint32 icon = 11;</code>
+     * <code>uint32 icon = 3;</code>
      * @return Whether the icon field is set.
      */
     @java.lang.Override
     public boolean hasIcon() {
-      return contentCase_ == 11;
+      return contentCase_ == 3;
     }
     /**
-     * <code>uint32 icon = 11;</code>
+     * <code>uint32 icon = 3;</code>
      * @return The icon.
      */
     @java.lang.Override
     public int getIcon() {
-      if (contentCase_ == 11) {
+      if (contentCase_ == 3) {
         return (java.lang.Integer) content_;
       }
       return 0;
     }
 
-    public static final int TEXT_FIELD_NUMBER = 9;
+    public static final int TEXT_FIELD_NUMBER = 14;
     /**
-     * <code>string text = 9;</code>
+     * <code>string text = 14;</code>
      * @return Whether the text field is set.
      */
     public boolean hasText() {
-      return contentCase_ == 9;
+      return contentCase_ == 14;
     }
     /**
-     * <code>string text = 9;</code>
+     * <code>string text = 14;</code>
      * @return The text.
      */
     public java.lang.String getText() {
       java.lang.Object ref = "";
-      if (contentCase_ == 9) {
+      if (contentCase_ == 14) {
         ref = content_;
       }
       if (ref instanceof java.lang.String) {
@@ -247,27 +247,27 @@ public java.lang.String getText() {
         com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
-        if (contentCase_ == 9) {
+        if (contentCase_ == 14) {
           content_ = s;
         }
         return s;
       }
     }
     /**
-     * <code>string text = 9;</code>
+     * <code>string text = 14;</code>
      * @return The bytes for text.
      */
     public com.google.protobuf.ByteString
         getTextBytes() {
       java.lang.Object ref = "";
-      if (contentCase_ == 9) {
+      if (contentCase_ == 14) {
         ref = content_;
       }
       if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
-        if (contentCase_ == 9) {
+        if (contentCase_ == 14) {
           content_ = b;
         }
         return b;
@@ -291,14 +291,14 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (targetUid_ != 0) {
-        output.writeUInt32(8, targetUid_);
-      }
-      if (contentCase_ == 9) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 9, content_);
+        output.writeUInt32(2, targetUid_);
       }
-      if (contentCase_ == 11) {
+      if (contentCase_ == 3) {
         output.writeUInt32(
-            11, (int)((java.lang.Integer) content_));
+            3, (int)((java.lang.Integer) content_));
+      }
+      if (contentCase_ == 14) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 14, content_);
       }
       unknownFields.writeTo(output);
     }
@@ -311,15 +311,15 @@ public int getSerializedSize() {
       size = 0;
       if (targetUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, targetUid_);
+          .computeUInt32Size(2, targetUid_);
       }
-      if (contentCase_ == 9) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, content_);
-      }
-      if (contentCase_ == 11) {
+      if (contentCase_ == 3) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(
-              11, (int)((java.lang.Integer) content_));
+              3, (int)((java.lang.Integer) content_));
+      }
+      if (contentCase_ == 14) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(14, content_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -340,11 +340,11 @@ public boolean equals(final java.lang.Object obj) {
           != other.getTargetUid()) return false;
       if (!getContentCase().equals(other.getContentCase())) return false;
       switch (contentCase_) {
-        case 11:
+        case 3:
           if (getIcon()
               != other.getIcon()) return false;
           break;
-        case 9:
+        case 14:
           if (!getText()
               .equals(other.getText())) return false;
           break;
@@ -365,11 +365,11 @@ public int hashCode() {
       hash = (37 * hash) + TARGET_UID_FIELD_NUMBER;
       hash = (53 * hash) + getTargetUid();
       switch (contentCase_) {
-        case 11:
+        case 3:
           hash = (37 * hash) + ICON_FIELD_NUMBER;
           hash = (53 * hash) + getIcon();
           break;
-        case 9:
+        case 14:
           hash = (37 * hash) + TEXT_FIELD_NUMBER;
           hash = (53 * hash) + getText().hashCode();
           break;
@@ -544,10 +544,10 @@ public emu.grasscutter.net.proto.PrivateChatReqOuterClass.PrivateChatReq build()
       public emu.grasscutter.net.proto.PrivateChatReqOuterClass.PrivateChatReq buildPartial() {
         emu.grasscutter.net.proto.PrivateChatReqOuterClass.PrivateChatReq result = new emu.grasscutter.net.proto.PrivateChatReqOuterClass.PrivateChatReq(this);
         result.targetUid_ = targetUid_;
-        if (contentCase_ == 11) {
+        if (contentCase_ == 3) {
           result.content_ = content_;
         }
-        if (contentCase_ == 9) {
+        if (contentCase_ == 14) {
           result.content_ = content_;
         }
         result.contentCase_ = contentCase_;
@@ -608,7 +608,7 @@ public Builder mergeFrom(emu.grasscutter.net.proto.PrivateChatReqOuterClass.Priv
             break;
           }
           case TEXT: {
-            contentCase_ = 9;
+            contentCase_ = 14;
             content_ = other.content_;
             onChanged();
             break;
@@ -663,7 +663,7 @@ public Builder clearContent() {
 
       private int targetUid_ ;
       /**
-       * <code>uint32 target_uid = 8;</code>
+       * <code>uint32 target_uid = 2;</code>
        * @return The targetUid.
        */
       @java.lang.Override
@@ -671,7 +671,7 @@ public int getTargetUid() {
         return targetUid_;
       }
       /**
-       * <code>uint32 target_uid = 8;</code>
+       * <code>uint32 target_uid = 2;</code>
        * @param value The targetUid to set.
        * @return This builder for chaining.
        */
@@ -682,7 +682,7 @@ public Builder setTargetUid(int value) {
         return this;
       }
       /**
-       * <code>uint32 target_uid = 8;</code>
+       * <code>uint32 target_uid = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearTargetUid() {
@@ -693,39 +693,39 @@ public Builder clearTargetUid() {
       }
 
       /**
-       * <code>uint32 icon = 11;</code>
+       * <code>uint32 icon = 3;</code>
        * @return Whether the icon field is set.
        */
       public boolean hasIcon() {
-        return contentCase_ == 11;
+        return contentCase_ == 3;
       }
       /**
-       * <code>uint32 icon = 11;</code>
+       * <code>uint32 icon = 3;</code>
        * @return The icon.
        */
       public int getIcon() {
-        if (contentCase_ == 11) {
+        if (contentCase_ == 3) {
           return (java.lang.Integer) content_;
         }
         return 0;
       }
       /**
-       * <code>uint32 icon = 11;</code>
+       * <code>uint32 icon = 3;</code>
        * @param value The icon to set.
        * @return This builder for chaining.
        */
       public Builder setIcon(int value) {
-        contentCase_ = 11;
+        contentCase_ = 3;
         content_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 icon = 11;</code>
+       * <code>uint32 icon = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearIcon() {
-        if (contentCase_ == 11) {
+        if (contentCase_ == 3) {
           contentCase_ = 0;
           content_ = null;
           onChanged();
@@ -734,28 +734,28 @@ public Builder clearIcon() {
       }
 
       /**
-       * <code>string text = 9;</code>
+       * <code>string text = 14;</code>
        * @return Whether the text field is set.
        */
       @java.lang.Override
       public boolean hasText() {
-        return contentCase_ == 9;
+        return contentCase_ == 14;
       }
       /**
-       * <code>string text = 9;</code>
+       * <code>string text = 14;</code>
        * @return The text.
        */
       @java.lang.Override
       public java.lang.String getText() {
         java.lang.Object ref = "";
-        if (contentCase_ == 9) {
+        if (contentCase_ == 14) {
           ref = content_;
         }
         if (!(ref instanceof java.lang.String)) {
           com.google.protobuf.ByteString bs =
               (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
-          if (contentCase_ == 9) {
+          if (contentCase_ == 14) {
             content_ = s;
           }
           return s;
@@ -764,21 +764,21 @@ public java.lang.String getText() {
         }
       }
       /**
-       * <code>string text = 9;</code>
+       * <code>string text = 14;</code>
        * @return The bytes for text.
        */
       @java.lang.Override
       public com.google.protobuf.ByteString
           getTextBytes() {
         java.lang.Object ref = "";
-        if (contentCase_ == 9) {
+        if (contentCase_ == 14) {
           ref = content_;
         }
         if (ref instanceof String) {
           com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
-          if (contentCase_ == 9) {
+          if (contentCase_ == 14) {
             content_ = b;
           }
           return b;
@@ -787,7 +787,7 @@ public java.lang.String getText() {
         }
       }
       /**
-       * <code>string text = 9;</code>
+       * <code>string text = 14;</code>
        * @param value The text to set.
        * @return This builder for chaining.
        */
@@ -796,17 +796,17 @@ public Builder setText(
         if (value == null) {
     throw new NullPointerException();
   }
-  contentCase_ = 9;
+  contentCase_ = 14;
         content_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>string text = 9;</code>
+       * <code>string text = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearText() {
-        if (contentCase_ == 9) {
+        if (contentCase_ == 14) {
           contentCase_ = 0;
           content_ = null;
           onChanged();
@@ -814,7 +814,7 @@ public Builder clearText() {
         return this;
       }
       /**
-       * <code>string text = 9;</code>
+       * <code>string text = 14;</code>
        * @param value The bytes for text to set.
        * @return This builder for chaining.
        */
@@ -824,7 +824,7 @@ public Builder setTextBytes(
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-        contentCase_ = 9;
+        contentCase_ = 14;
         content_ = value;
         onChanged();
         return this;
@@ -897,8 +897,8 @@ public emu.grasscutter.net.proto.PrivateChatReqOuterClass.PrivateChatReq getDefa
   static {
     java.lang.String[] descriptorData = {
       "\n\024PrivateChatReq.proto\"O\n\016PrivateChatReq" +
-      "\022\022\n\ntarget_uid\030\010 \001(\r\022\016\n\004icon\030\013 \001(\rH\000\022\016\n\004" +
-      "text\030\t \001(\tH\000B\t\n\007contentB\033\n\031emu.grasscutt" +
+      "\022\022\n\ntarget_uid\030\002 \001(\r\022\016\n\004icon\030\003 \001(\rH\000\022\016\n\004" +
+      "text\030\016 \001(\tH\000B\t\n\007contentB\033\n\031emu.grasscutt" +
       "er.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/QuestDestroyNpcReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/QuestDestroyNpcReqOuterClass.java
index 017e226a282..a63465a5a3f 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/QuestDestroyNpcReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/QuestDestroyNpcReqOuterClass.java
@@ -19,20 +19,28 @@ public interface QuestDestroyNpcReqOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 npc_id = 4;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 npc_id = 1;</code>
      * @return The npcId.
      */
     int getNpcId();
 
     /**
-     * <code>uint32 parent_quest_id = 12;</code>
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 parent_quest_id = 10;</code>
      * @return The parentQuestId.
      */
     int getParentQuestId();
   }
   /**
    * <pre>
-   * CmdId: 1472
+   * CmdId: 20824
    * </pre>
    *
    * Protobuf type {@code QuestDestroyNpcReq}
@@ -79,12 +87,12 @@ private QuestDestroyNpcReq(
             case 0:
               done = true;
               break;
-            case 32: {
+            case 8: {
 
               npcId_ = input.readUInt32();
               break;
             }
-            case 96: {
+            case 80: {
 
               parentQuestId_ = input.readUInt32();
               break;
@@ -121,10 +129,14 @@ private QuestDestroyNpcReq(
               emu.grasscutter.net.proto.QuestDestroyNpcReqOuterClass.QuestDestroyNpcReq.class, emu.grasscutter.net.proto.QuestDestroyNpcReqOuterClass.QuestDestroyNpcReq.Builder.class);
     }
 
-    public static final int NPC_ID_FIELD_NUMBER = 4;
+    public static final int NPC_ID_FIELD_NUMBER = 1;
     private int npcId_;
     /**
-     * <code>uint32 npc_id = 4;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 npc_id = 1;</code>
      * @return The npcId.
      */
     @java.lang.Override
@@ -132,10 +144,14 @@ public int getNpcId() {
       return npcId_;
     }
 
-    public static final int PARENT_QUEST_ID_FIELD_NUMBER = 12;
+    public static final int PARENT_QUEST_ID_FIELD_NUMBER = 10;
     private int parentQuestId_;
     /**
-     * <code>uint32 parent_quest_id = 12;</code>
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 parent_quest_id = 10;</code>
      * @return The parentQuestId.
      */
     @java.lang.Override
@@ -158,10 +174,10 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (npcId_ != 0) {
-        output.writeUInt32(4, npcId_);
+        output.writeUInt32(1, npcId_);
       }
       if (parentQuestId_ != 0) {
-        output.writeUInt32(12, parentQuestId_);
+        output.writeUInt32(10, parentQuestId_);
       }
       unknownFields.writeTo(output);
     }
@@ -174,11 +190,11 @@ public int getSerializedSize() {
       size = 0;
       if (npcId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, npcId_);
+          .computeUInt32Size(1, npcId_);
       }
       if (parentQuestId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, parentQuestId_);
+          .computeUInt32Size(10, parentQuestId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -311,7 +327,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 1472
+     * CmdId: 20824
      * </pre>
      *
      * Protobuf type {@code QuestDestroyNpcReq}
@@ -468,7 +484,11 @@ public Builder mergeFrom(
 
       private int npcId_ ;
       /**
-       * <code>uint32 npc_id = 4;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 npc_id = 1;</code>
        * @return The npcId.
        */
       @java.lang.Override
@@ -476,7 +496,11 @@ public int getNpcId() {
         return npcId_;
       }
       /**
-       * <code>uint32 npc_id = 4;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 npc_id = 1;</code>
        * @param value The npcId to set.
        * @return This builder for chaining.
        */
@@ -487,7 +511,11 @@ public Builder setNpcId(int value) {
         return this;
       }
       /**
-       * <code>uint32 npc_id = 4;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 npc_id = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearNpcId() {
@@ -499,7 +527,11 @@ public Builder clearNpcId() {
 
       private int parentQuestId_ ;
       /**
-       * <code>uint32 parent_quest_id = 12;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 parent_quest_id = 10;</code>
        * @return The parentQuestId.
        */
       @java.lang.Override
@@ -507,7 +539,11 @@ public int getParentQuestId() {
         return parentQuestId_;
       }
       /**
-       * <code>uint32 parent_quest_id = 12;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 parent_quest_id = 10;</code>
        * @param value The parentQuestId to set.
        * @return This builder for chaining.
        */
@@ -518,7 +554,11 @@ public Builder setParentQuestId(int value) {
         return this;
       }
       /**
-       * <code>uint32 parent_quest_id = 12;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 parent_quest_id = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearParentQuestId() {
@@ -595,8 +635,8 @@ public emu.grasscutter.net.proto.QuestDestroyNpcReqOuterClass.QuestDestroyNpcReq
   static {
     java.lang.String[] descriptorData = {
       "\n\030QuestDestroyNpcReq.proto\"=\n\022QuestDestr" +
-      "oyNpcReq\022\016\n\006npc_id\030\004 \001(\r\022\027\n\017parent_quest" +
-      "_id\030\014 \001(\rB\033\n\031emu.grasscutter.net.protob\006" +
+      "oyNpcReq\022\016\n\006npc_id\030\001 \001(\r\022\027\n\017parent_quest" +
+      "_id\030\n \001(\rB\033\n\031emu.grasscutter.net.protob\006" +
       "proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/QuestDestroyNpcRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/QuestDestroyNpcRspOuterClass.java
index 868723e77e5..cda87793cba 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/QuestDestroyNpcRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/QuestDestroyNpcRspOuterClass.java
@@ -19,26 +19,38 @@ public interface QuestDestroyNpcRspOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 parent_quest_id = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 parent_quest_id = 4;</code>
      * @return The parentQuestId.
      */
     int getParentQuestId();
 
     /**
-     * <code>int32 retcode = 4;</code>
-     * @return The retcode.
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 npc_id = 5;</code>
+     * @return The npcId.
      */
-    int getRetcode();
+    int getNpcId();
 
     /**
-     * <code>uint32 npc_id = 8;</code>
-     * @return The npcId.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>int32 retcode = 6;</code>
+     * @return The retcode.
      */
-    int getNpcId();
+    int getRetcode();
   }
   /**
    * <pre>
-   * CmdId: 23800
+   * CmdId: 5629
    * </pre>
    *
    * Protobuf type {@code QuestDestroyNpcRsp}
@@ -85,19 +97,19 @@ private QuestDestroyNpcRsp(
             case 0:
               done = true;
               break;
-            case 8: {
+            case 32: {
 
               parentQuestId_ = input.readUInt32();
               break;
             }
-            case 32: {
+            case 40: {
 
-              retcode_ = input.readInt32();
+              npcId_ = input.readUInt32();
               break;
             }
-            case 64: {
+            case 48: {
 
-              npcId_ = input.readUInt32();
+              retcode_ = input.readInt32();
               break;
             }
             default: {
@@ -132,10 +144,14 @@ private QuestDestroyNpcRsp(
               emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp.class, emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp.Builder.class);
     }
 
-    public static final int PARENT_QUEST_ID_FIELD_NUMBER = 1;
+    public static final int PARENT_QUEST_ID_FIELD_NUMBER = 4;
     private int parentQuestId_;
     /**
-     * <code>uint32 parent_quest_id = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 parent_quest_id = 4;</code>
      * @return The parentQuestId.
      */
     @java.lang.Override
@@ -143,26 +159,34 @@ public int getParentQuestId() {
       return parentQuestId_;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 4;
-    private int retcode_;
+    public static final int NPC_ID_FIELD_NUMBER = 5;
+    private int npcId_;
     /**
-     * <code>int32 retcode = 4;</code>
-     * @return The retcode.
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 npc_id = 5;</code>
+     * @return The npcId.
      */
     @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
+    public int getNpcId() {
+      return npcId_;
     }
 
-    public static final int NPC_ID_FIELD_NUMBER = 8;
-    private int npcId_;
+    public static final int RETCODE_FIELD_NUMBER = 6;
+    private int retcode_;
     /**
-     * <code>uint32 npc_id = 8;</code>
-     * @return The npcId.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>int32 retcode = 6;</code>
+     * @return The retcode.
      */
     @java.lang.Override
-    public int getNpcId() {
-      return npcId_;
+    public int getRetcode() {
+      return retcode_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -180,13 +204,13 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (parentQuestId_ != 0) {
-        output.writeUInt32(1, parentQuestId_);
-      }
-      if (retcode_ != 0) {
-        output.writeInt32(4, retcode_);
+        output.writeUInt32(4, parentQuestId_);
       }
       if (npcId_ != 0) {
-        output.writeUInt32(8, npcId_);
+        output.writeUInt32(5, npcId_);
+      }
+      if (retcode_ != 0) {
+        output.writeInt32(6, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -199,15 +223,15 @@ public int getSerializedSize() {
       size = 0;
       if (parentQuestId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, parentQuestId_);
+          .computeUInt32Size(4, parentQuestId_);
       }
-      if (retcode_ != 0) {
+      if (npcId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(4, retcode_);
+          .computeUInt32Size(5, npcId_);
       }
-      if (npcId_ != 0) {
+      if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, npcId_);
+          .computeInt32Size(6, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -226,10 +250,10 @@ public boolean equals(final java.lang.Object obj) {
 
       if (getParentQuestId()
           != other.getParentQuestId()) return false;
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (getNpcId()
           != other.getNpcId()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -243,10 +267,10 @@ public int hashCode() {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + PARENT_QUEST_ID_FIELD_NUMBER;
       hash = (53 * hash) + getParentQuestId();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + NPC_ID_FIELD_NUMBER;
       hash = (53 * hash) + getNpcId();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -344,7 +368,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 23800
+     * CmdId: 5629
      * </pre>
      *
      * Protobuf type {@code QuestDestroyNpcRsp}
@@ -386,10 +410,10 @@ public Builder clear() {
         super.clear();
         parentQuestId_ = 0;
 
-        retcode_ = 0;
-
         npcId_ = 0;
 
+        retcode_ = 0;
+
         return this;
       }
 
@@ -417,8 +441,8 @@ public emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp
       public emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp buildPartial() {
         emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp result = new emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp(this);
         result.parentQuestId_ = parentQuestId_;
-        result.retcode_ = retcode_;
         result.npcId_ = npcId_;
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -470,12 +494,12 @@ public Builder mergeFrom(emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.
         if (other.getParentQuestId() != 0) {
           setParentQuestId(other.getParentQuestId());
         }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         if (other.getNpcId() != 0) {
           setNpcId(other.getNpcId());
         }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -507,7 +531,11 @@ public Builder mergeFrom(
 
       private int parentQuestId_ ;
       /**
-       * <code>uint32 parent_quest_id = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 parent_quest_id = 4;</code>
        * @return The parentQuestId.
        */
       @java.lang.Override
@@ -515,7 +543,11 @@ public int getParentQuestId() {
         return parentQuestId_;
       }
       /**
-       * <code>uint32 parent_quest_id = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 parent_quest_id = 4;</code>
        * @param value The parentQuestId to set.
        * @return This builder for chaining.
        */
@@ -526,7 +558,11 @@ public Builder setParentQuestId(int value) {
         return this;
       }
       /**
-       * <code>uint32 parent_quest_id = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 parent_quest_id = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearParentQuestId() {
@@ -536,64 +572,88 @@ public Builder clearParentQuestId() {
         return this;
       }
 
-      private int retcode_ ;
+      private int npcId_ ;
       /**
-       * <code>int32 retcode = 4;</code>
-       * @return The retcode.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 npc_id = 5;</code>
+       * @return The npcId.
        */
       @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
+      public int getNpcId() {
+        return npcId_;
       }
       /**
-       * <code>int32 retcode = 4;</code>
-       * @param value The retcode to set.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 npc_id = 5;</code>
+       * @param value The npcId to set.
        * @return This builder for chaining.
        */
-      public Builder setRetcode(int value) {
+      public Builder setNpcId(int value) {
         
-        retcode_ = value;
+        npcId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>int32 retcode = 4;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 npc_id = 5;</code>
        * @return This builder for chaining.
        */
-      public Builder clearRetcode() {
+      public Builder clearNpcId() {
         
-        retcode_ = 0;
+        npcId_ = 0;
         onChanged();
         return this;
       }
 
-      private int npcId_ ;
+      private int retcode_ ;
       /**
-       * <code>uint32 npc_id = 8;</code>
-       * @return The npcId.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>int32 retcode = 6;</code>
+       * @return The retcode.
        */
       @java.lang.Override
-      public int getNpcId() {
-        return npcId_;
+      public int getRetcode() {
+        return retcode_;
       }
       /**
-       * <code>uint32 npc_id = 8;</code>
-       * @param value The npcId to set.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>int32 retcode = 6;</code>
+       * @param value The retcode to set.
        * @return This builder for chaining.
        */
-      public Builder setNpcId(int value) {
+      public Builder setRetcode(int value) {
         
-        npcId_ = value;
+        retcode_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 npc_id = 8;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>int32 retcode = 6;</code>
        * @return This builder for chaining.
        */
-      public Builder clearNpcId() {
+      public Builder clearRetcode() {
         
-        npcId_ = 0;
+        retcode_ = 0;
         onChanged();
         return this;
       }
@@ -665,8 +725,8 @@ public emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp
   static {
     java.lang.String[] descriptorData = {
       "\n\030QuestDestroyNpcRsp.proto\"N\n\022QuestDestr" +
-      "oyNpcRsp\022\027\n\017parent_quest_id\030\001 \001(\r\022\017\n\007ret" +
-      "code\030\004 \001(\005\022\016\n\006npc_id\030\010 \001(\rB\033\n\031emu.grassc" +
+      "oyNpcRsp\022\027\n\017parent_quest_id\030\004 \001(\r\022\016\n\006npc" +
+      "_id\030\005 \001(\r\022\017\n\007retcode\030\006 \001(\005B\033\n\031emu.grassc" +
       "utter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -678,7 +738,7 @@ public emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp
     internal_static_QuestDestroyNpcRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_QuestDestroyNpcRsp_descriptor,
-        new java.lang.String[] { "ParentQuestId", "Retcode", "NpcId", });
+        new java.lang.String[] { "ParentQuestId", "NpcId", "Retcode", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/QuestListNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/QuestListNotifyOuterClass.java
index 3c384d115dc..c63c8b3c3b0 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/QuestListNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/QuestListNotifyOuterClass.java
@@ -19,32 +19,52 @@ public interface QuestListNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .Quest quest_list = 15;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Quest quest_list = 5;</code>
      */
     java.util.List<emu.grasscutter.net.proto.QuestOuterClass.Quest> 
         getQuestListList();
     /**
-     * <code>repeated .Quest quest_list = 15;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Quest quest_list = 5;</code>
      */
     emu.grasscutter.net.proto.QuestOuterClass.Quest getQuestList(int index);
     /**
-     * <code>repeated .Quest quest_list = 15;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Quest quest_list = 5;</code>
      */
     int getQuestListCount();
     /**
-     * <code>repeated .Quest quest_list = 15;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Quest quest_list = 5;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.QuestOuterClass.QuestOrBuilder> 
         getQuestListOrBuilderList();
     /**
-     * <code>repeated .Quest quest_list = 15;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Quest quest_list = 5;</code>
      */
     emu.grasscutter.net.proto.QuestOuterClass.QuestOrBuilder getQuestListOrBuilder(
         int index);
   }
   /**
    * <pre>
-   * CmdId: 23350
+   * CmdId: 4024
    * </pre>
    *
    * Protobuf type {@code QuestListNotify}
@@ -93,7 +113,7 @@ private QuestListNotify(
             case 0:
               done = true;
               break;
-            case 122: {
+            case 42: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 questList_ = new java.util.ArrayList<emu.grasscutter.net.proto.QuestOuterClass.Quest>();
                 mutable_bitField0_ |= 0x00000001;
@@ -137,17 +157,25 @@ private QuestListNotify(
               emu.grasscutter.net.proto.QuestListNotifyOuterClass.QuestListNotify.class, emu.grasscutter.net.proto.QuestListNotifyOuterClass.QuestListNotify.Builder.class);
     }
 
-    public static final int QUEST_LIST_FIELD_NUMBER = 15;
+    public static final int QUEST_LIST_FIELD_NUMBER = 5;
     private java.util.List<emu.grasscutter.net.proto.QuestOuterClass.Quest> questList_;
     /**
-     * <code>repeated .Quest quest_list = 15;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Quest quest_list = 5;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.QuestOuterClass.Quest> getQuestListList() {
       return questList_;
     }
     /**
-     * <code>repeated .Quest quest_list = 15;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Quest quest_list = 5;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.QuestOuterClass.QuestOrBuilder> 
@@ -155,21 +183,33 @@ public java.util.List<emu.grasscutter.net.proto.QuestOuterClass.Quest> getQuestL
       return questList_;
     }
     /**
-     * <code>repeated .Quest quest_list = 15;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Quest quest_list = 5;</code>
      */
     @java.lang.Override
     public int getQuestListCount() {
       return questList_.size();
     }
     /**
-     * <code>repeated .Quest quest_list = 15;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Quest quest_list = 5;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.QuestOuterClass.Quest getQuestList(int index) {
       return questList_.get(index);
     }
     /**
-     * <code>repeated .Quest quest_list = 15;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Quest quest_list = 5;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.QuestOuterClass.QuestOrBuilder getQuestListOrBuilder(
@@ -192,7 +232,7 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < questList_.size(); i++) {
-        output.writeMessage(15, questList_.get(i));
+        output.writeMessage(5, questList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -205,7 +245,7 @@ public int getSerializedSize() {
       size = 0;
       for (int i = 0; i < questList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(15, questList_.get(i));
+          .computeMessageSize(5, questList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -336,7 +376,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 23350
+     * CmdId: 4024
      * </pre>
      *
      * Protobuf type {@code QuestListNotify}
@@ -536,7 +576,11 @@ private void ensureQuestListIsMutable() {
           emu.grasscutter.net.proto.QuestOuterClass.Quest, emu.grasscutter.net.proto.QuestOuterClass.Quest.Builder, emu.grasscutter.net.proto.QuestOuterClass.QuestOrBuilder> questListBuilder_;
 
       /**
-       * <code>repeated .Quest quest_list = 15;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Quest quest_list = 5;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.QuestOuterClass.Quest> getQuestListList() {
         if (questListBuilder_ == null) {
@@ -546,7 +590,11 @@ public java.util.List<emu.grasscutter.net.proto.QuestOuterClass.Quest> getQuestL
         }
       }
       /**
-       * <code>repeated .Quest quest_list = 15;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Quest quest_list = 5;</code>
        */
       public int getQuestListCount() {
         if (questListBuilder_ == null) {
@@ -556,7 +604,11 @@ public int getQuestListCount() {
         }
       }
       /**
-       * <code>repeated .Quest quest_list = 15;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Quest quest_list = 5;</code>
        */
       public emu.grasscutter.net.proto.QuestOuterClass.Quest getQuestList(int index) {
         if (questListBuilder_ == null) {
@@ -566,7 +618,11 @@ public emu.grasscutter.net.proto.QuestOuterClass.Quest getQuestList(int index) {
         }
       }
       /**
-       * <code>repeated .Quest quest_list = 15;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Quest quest_list = 5;</code>
        */
       public Builder setQuestList(
           int index, emu.grasscutter.net.proto.QuestOuterClass.Quest value) {
@@ -583,7 +639,11 @@ public Builder setQuestList(
         return this;
       }
       /**
-       * <code>repeated .Quest quest_list = 15;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Quest quest_list = 5;</code>
        */
       public Builder setQuestList(
           int index, emu.grasscutter.net.proto.QuestOuterClass.Quest.Builder builderForValue) {
@@ -597,7 +657,11 @@ public Builder setQuestList(
         return this;
       }
       /**
-       * <code>repeated .Quest quest_list = 15;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Quest quest_list = 5;</code>
        */
       public Builder addQuestList(emu.grasscutter.net.proto.QuestOuterClass.Quest value) {
         if (questListBuilder_ == null) {
@@ -613,7 +677,11 @@ public Builder addQuestList(emu.grasscutter.net.proto.QuestOuterClass.Quest valu
         return this;
       }
       /**
-       * <code>repeated .Quest quest_list = 15;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Quest quest_list = 5;</code>
        */
       public Builder addQuestList(
           int index, emu.grasscutter.net.proto.QuestOuterClass.Quest value) {
@@ -630,7 +698,11 @@ public Builder addQuestList(
         return this;
       }
       /**
-       * <code>repeated .Quest quest_list = 15;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Quest quest_list = 5;</code>
        */
       public Builder addQuestList(
           emu.grasscutter.net.proto.QuestOuterClass.Quest.Builder builderForValue) {
@@ -644,7 +716,11 @@ public Builder addQuestList(
         return this;
       }
       /**
-       * <code>repeated .Quest quest_list = 15;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Quest quest_list = 5;</code>
        */
       public Builder addQuestList(
           int index, emu.grasscutter.net.proto.QuestOuterClass.Quest.Builder builderForValue) {
@@ -658,7 +734,11 @@ public Builder addQuestList(
         return this;
       }
       /**
-       * <code>repeated .Quest quest_list = 15;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Quest quest_list = 5;</code>
        */
       public Builder addAllQuestList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.QuestOuterClass.Quest> values) {
@@ -673,7 +753,11 @@ public Builder addAllQuestList(
         return this;
       }
       /**
-       * <code>repeated .Quest quest_list = 15;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Quest quest_list = 5;</code>
        */
       public Builder clearQuestList() {
         if (questListBuilder_ == null) {
@@ -686,7 +770,11 @@ public Builder clearQuestList() {
         return this;
       }
       /**
-       * <code>repeated .Quest quest_list = 15;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Quest quest_list = 5;</code>
        */
       public Builder removeQuestList(int index) {
         if (questListBuilder_ == null) {
@@ -699,14 +787,22 @@ public Builder removeQuestList(int index) {
         return this;
       }
       /**
-       * <code>repeated .Quest quest_list = 15;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Quest quest_list = 5;</code>
        */
       public emu.grasscutter.net.proto.QuestOuterClass.Quest.Builder getQuestListBuilder(
           int index) {
         return getQuestListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .Quest quest_list = 15;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Quest quest_list = 5;</code>
        */
       public emu.grasscutter.net.proto.QuestOuterClass.QuestOrBuilder getQuestListOrBuilder(
           int index) {
@@ -716,7 +812,11 @@ public emu.grasscutter.net.proto.QuestOuterClass.QuestOrBuilder getQuestListOrBu
         }
       }
       /**
-       * <code>repeated .Quest quest_list = 15;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Quest quest_list = 5;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.QuestOuterClass.QuestOrBuilder> 
            getQuestListOrBuilderList() {
@@ -727,14 +827,22 @@ public emu.grasscutter.net.proto.QuestOuterClass.QuestOrBuilder getQuestListOrBu
         }
       }
       /**
-       * <code>repeated .Quest quest_list = 15;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Quest quest_list = 5;</code>
        */
       public emu.grasscutter.net.proto.QuestOuterClass.Quest.Builder addQuestListBuilder() {
         return getQuestListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.QuestOuterClass.Quest.getDefaultInstance());
       }
       /**
-       * <code>repeated .Quest quest_list = 15;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Quest quest_list = 5;</code>
        */
       public emu.grasscutter.net.proto.QuestOuterClass.Quest.Builder addQuestListBuilder(
           int index) {
@@ -742,7 +850,11 @@ public emu.grasscutter.net.proto.QuestOuterClass.Quest.Builder addQuestListBuild
             index, emu.grasscutter.net.proto.QuestOuterClass.Quest.getDefaultInstance());
       }
       /**
-       * <code>repeated .Quest quest_list = 15;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Quest quest_list = 5;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.QuestOuterClass.Quest.Builder> 
            getQuestListBuilderList() {
@@ -830,7 +942,7 @@ public emu.grasscutter.net.proto.QuestListNotifyOuterClass.QuestListNotify getDe
   static {
     java.lang.String[] descriptorData = {
       "\n\025QuestListNotify.proto\032\013Quest.proto\"-\n\017" +
-      "QuestListNotify\022\032\n\nquest_list\030\017 \003(\0132\006.Qu" +
+      "QuestListNotify\022\032\n\nquest_list\030\005 \003(\0132\006.Qu" +
       "estB\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/QuestListUpdateNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/QuestListUpdateNotifyOuterClass.java
index 0d8b6ba451f..2461a0d460d 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/QuestListUpdateNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/QuestListUpdateNotifyOuterClass.java
@@ -19,32 +19,52 @@ public interface QuestListUpdateNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .Quest quest_list = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Quest quest_list = 12;</code>
      */
     java.util.List<emu.grasscutter.net.proto.QuestOuterClass.Quest> 
         getQuestListList();
     /**
-     * <code>repeated .Quest quest_list = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Quest quest_list = 12;</code>
      */
     emu.grasscutter.net.proto.QuestOuterClass.Quest getQuestList(int index);
     /**
-     * <code>repeated .Quest quest_list = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Quest quest_list = 12;</code>
      */
     int getQuestListCount();
     /**
-     * <code>repeated .Quest quest_list = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Quest quest_list = 12;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.QuestOuterClass.QuestOrBuilder> 
         getQuestListOrBuilderList();
     /**
-     * <code>repeated .Quest quest_list = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Quest quest_list = 12;</code>
      */
     emu.grasscutter.net.proto.QuestOuterClass.QuestOrBuilder getQuestListOrBuilder(
         int index);
   }
   /**
    * <pre>
-   * CmdId: 3344
+   * CmdId: 29490
    * </pre>
    *
    * Protobuf type {@code QuestListUpdateNotify}
@@ -93,7 +113,7 @@ private QuestListUpdateNotify(
             case 0:
               done = true;
               break;
-            case 26: {
+            case 98: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 questList_ = new java.util.ArrayList<emu.grasscutter.net.proto.QuestOuterClass.Quest>();
                 mutable_bitField0_ |= 0x00000001;
@@ -137,17 +157,25 @@ private QuestListUpdateNotify(
               emu.grasscutter.net.proto.QuestListUpdateNotifyOuterClass.QuestListUpdateNotify.class, emu.grasscutter.net.proto.QuestListUpdateNotifyOuterClass.QuestListUpdateNotify.Builder.class);
     }
 
-    public static final int QUEST_LIST_FIELD_NUMBER = 3;
+    public static final int QUEST_LIST_FIELD_NUMBER = 12;
     private java.util.List<emu.grasscutter.net.proto.QuestOuterClass.Quest> questList_;
     /**
-     * <code>repeated .Quest quest_list = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Quest quest_list = 12;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.QuestOuterClass.Quest> getQuestListList() {
       return questList_;
     }
     /**
-     * <code>repeated .Quest quest_list = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Quest quest_list = 12;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.QuestOuterClass.QuestOrBuilder> 
@@ -155,21 +183,33 @@ public java.util.List<emu.grasscutter.net.proto.QuestOuterClass.Quest> getQuestL
       return questList_;
     }
     /**
-     * <code>repeated .Quest quest_list = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Quest quest_list = 12;</code>
      */
     @java.lang.Override
     public int getQuestListCount() {
       return questList_.size();
     }
     /**
-     * <code>repeated .Quest quest_list = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Quest quest_list = 12;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.QuestOuterClass.Quest getQuestList(int index) {
       return questList_.get(index);
     }
     /**
-     * <code>repeated .Quest quest_list = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Quest quest_list = 12;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.QuestOuterClass.QuestOrBuilder getQuestListOrBuilder(
@@ -192,7 +232,7 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < questList_.size(); i++) {
-        output.writeMessage(3, questList_.get(i));
+        output.writeMessage(12, questList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -205,7 +245,7 @@ public int getSerializedSize() {
       size = 0;
       for (int i = 0; i < questList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, questList_.get(i));
+          .computeMessageSize(12, questList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -336,7 +376,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 3344
+     * CmdId: 29490
      * </pre>
      *
      * Protobuf type {@code QuestListUpdateNotify}
@@ -536,7 +576,11 @@ private void ensureQuestListIsMutable() {
           emu.grasscutter.net.proto.QuestOuterClass.Quest, emu.grasscutter.net.proto.QuestOuterClass.Quest.Builder, emu.grasscutter.net.proto.QuestOuterClass.QuestOrBuilder> questListBuilder_;
 
       /**
-       * <code>repeated .Quest quest_list = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Quest quest_list = 12;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.QuestOuterClass.Quest> getQuestListList() {
         if (questListBuilder_ == null) {
@@ -546,7 +590,11 @@ public java.util.List<emu.grasscutter.net.proto.QuestOuterClass.Quest> getQuestL
         }
       }
       /**
-       * <code>repeated .Quest quest_list = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Quest quest_list = 12;</code>
        */
       public int getQuestListCount() {
         if (questListBuilder_ == null) {
@@ -556,7 +604,11 @@ public int getQuestListCount() {
         }
       }
       /**
-       * <code>repeated .Quest quest_list = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Quest quest_list = 12;</code>
        */
       public emu.grasscutter.net.proto.QuestOuterClass.Quest getQuestList(int index) {
         if (questListBuilder_ == null) {
@@ -566,7 +618,11 @@ public emu.grasscutter.net.proto.QuestOuterClass.Quest getQuestList(int index) {
         }
       }
       /**
-       * <code>repeated .Quest quest_list = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Quest quest_list = 12;</code>
        */
       public Builder setQuestList(
           int index, emu.grasscutter.net.proto.QuestOuterClass.Quest value) {
@@ -583,7 +639,11 @@ public Builder setQuestList(
         return this;
       }
       /**
-       * <code>repeated .Quest quest_list = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Quest quest_list = 12;</code>
        */
       public Builder setQuestList(
           int index, emu.grasscutter.net.proto.QuestOuterClass.Quest.Builder builderForValue) {
@@ -597,7 +657,11 @@ public Builder setQuestList(
         return this;
       }
       /**
-       * <code>repeated .Quest quest_list = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Quest quest_list = 12;</code>
        */
       public Builder addQuestList(emu.grasscutter.net.proto.QuestOuterClass.Quest value) {
         if (questListBuilder_ == null) {
@@ -613,7 +677,11 @@ public Builder addQuestList(emu.grasscutter.net.proto.QuestOuterClass.Quest valu
         return this;
       }
       /**
-       * <code>repeated .Quest quest_list = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Quest quest_list = 12;</code>
        */
       public Builder addQuestList(
           int index, emu.grasscutter.net.proto.QuestOuterClass.Quest value) {
@@ -630,7 +698,11 @@ public Builder addQuestList(
         return this;
       }
       /**
-       * <code>repeated .Quest quest_list = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Quest quest_list = 12;</code>
        */
       public Builder addQuestList(
           emu.grasscutter.net.proto.QuestOuterClass.Quest.Builder builderForValue) {
@@ -644,7 +716,11 @@ public Builder addQuestList(
         return this;
       }
       /**
-       * <code>repeated .Quest quest_list = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Quest quest_list = 12;</code>
        */
       public Builder addQuestList(
           int index, emu.grasscutter.net.proto.QuestOuterClass.Quest.Builder builderForValue) {
@@ -658,7 +734,11 @@ public Builder addQuestList(
         return this;
       }
       /**
-       * <code>repeated .Quest quest_list = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Quest quest_list = 12;</code>
        */
       public Builder addAllQuestList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.QuestOuterClass.Quest> values) {
@@ -673,7 +753,11 @@ public Builder addAllQuestList(
         return this;
       }
       /**
-       * <code>repeated .Quest quest_list = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Quest quest_list = 12;</code>
        */
       public Builder clearQuestList() {
         if (questListBuilder_ == null) {
@@ -686,7 +770,11 @@ public Builder clearQuestList() {
         return this;
       }
       /**
-       * <code>repeated .Quest quest_list = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Quest quest_list = 12;</code>
        */
       public Builder removeQuestList(int index) {
         if (questListBuilder_ == null) {
@@ -699,14 +787,22 @@ public Builder removeQuestList(int index) {
         return this;
       }
       /**
-       * <code>repeated .Quest quest_list = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Quest quest_list = 12;</code>
        */
       public emu.grasscutter.net.proto.QuestOuterClass.Quest.Builder getQuestListBuilder(
           int index) {
         return getQuestListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .Quest quest_list = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Quest quest_list = 12;</code>
        */
       public emu.grasscutter.net.proto.QuestOuterClass.QuestOrBuilder getQuestListOrBuilder(
           int index) {
@@ -716,7 +812,11 @@ public emu.grasscutter.net.proto.QuestOuterClass.QuestOrBuilder getQuestListOrBu
         }
       }
       /**
-       * <code>repeated .Quest quest_list = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Quest quest_list = 12;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.QuestOuterClass.QuestOrBuilder> 
            getQuestListOrBuilderList() {
@@ -727,14 +827,22 @@ public emu.grasscutter.net.proto.QuestOuterClass.QuestOrBuilder getQuestListOrBu
         }
       }
       /**
-       * <code>repeated .Quest quest_list = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Quest quest_list = 12;</code>
        */
       public emu.grasscutter.net.proto.QuestOuterClass.Quest.Builder addQuestListBuilder() {
         return getQuestListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.QuestOuterClass.Quest.getDefaultInstance());
       }
       /**
-       * <code>repeated .Quest quest_list = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Quest quest_list = 12;</code>
        */
       public emu.grasscutter.net.proto.QuestOuterClass.Quest.Builder addQuestListBuilder(
           int index) {
@@ -742,7 +850,11 @@ public emu.grasscutter.net.proto.QuestOuterClass.Quest.Builder addQuestListBuild
             index, emu.grasscutter.net.proto.QuestOuterClass.Quest.getDefaultInstance());
       }
       /**
-       * <code>repeated .Quest quest_list = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Quest quest_list = 12;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.QuestOuterClass.Quest.Builder> 
            getQuestListBuilderList() {
@@ -831,7 +943,7 @@ public emu.grasscutter.net.proto.QuestListUpdateNotifyOuterClass.QuestListUpdate
     java.lang.String[] descriptorData = {
       "\n\033QuestListUpdateNotify.proto\032\013Quest.pro" +
       "to\"3\n\025QuestListUpdateNotify\022\032\n\nquest_lis" +
-      "t\030\003 \003(\0132\006.QuestB\033\n\031emu.grasscutter.net.p" +
+      "t\030\014 \003(\0132\006.QuestB\033\n\031emu.grasscutter.net.p" +
       "rotob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/QuestProgressUpdateNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/QuestProgressUpdateNotifyOuterClass.java
index 6e04ed2fec2..0b2d5772404 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/QuestProgressUpdateNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/QuestProgressUpdateNotifyOuterClass.java
@@ -19,48 +19,76 @@ public interface QuestProgressUpdateNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 fail_progress_list = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 fail_progress_list = 14;</code>
      * @return A list containing the failProgressList.
      */
     java.util.List<java.lang.Integer> getFailProgressListList();
     /**
-     * <code>repeated uint32 fail_progress_list = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 fail_progress_list = 14;</code>
      * @return The count of failProgressList.
      */
     int getFailProgressListCount();
     /**
-     * <code>repeated uint32 fail_progress_list = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 fail_progress_list = 14;</code>
      * @param index The index of the element to return.
      * @return The failProgressList at the given index.
      */
     int getFailProgressList(int index);
 
     /**
-     * <code>repeated uint32 finish_progress_list = 13;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated uint32 finish_progress_list = 9;</code>
      * @return A list containing the finishProgressList.
      */
     java.util.List<java.lang.Integer> getFinishProgressListList();
     /**
-     * <code>repeated uint32 finish_progress_list = 13;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated uint32 finish_progress_list = 9;</code>
      * @return The count of finishProgressList.
      */
     int getFinishProgressListCount();
     /**
-     * <code>repeated uint32 finish_progress_list = 13;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated uint32 finish_progress_list = 9;</code>
      * @param index The index of the element to return.
      * @return The finishProgressList at the given index.
      */
     int getFinishProgressList(int index);
 
     /**
-     * <code>uint32 quest_id = 14;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>uint32 quest_id = 3;</code>
      * @return The questId.
      */
     int getQuestId();
   }
   /**
    * <pre>
-   * CmdId: 28348
+   * CmdId: 28220
    * </pre>
    *
    * Protobuf type {@code QuestProgressUpdateNotify}
@@ -110,28 +138,12 @@ private QuestProgressUpdateNotify(
             case 0:
               done = true;
               break;
-            case 96: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                failProgressList_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              failProgressList_.addInt(input.readUInt32());
-              break;
-            }
-            case 98: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
-                failProgressList_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                failProgressList_.addInt(input.readUInt32());
-              }
-              input.popLimit(limit);
+            case 24: {
+
+              questId_ = input.readUInt32();
               break;
             }
-            case 104: {
+            case 72: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 finishProgressList_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
@@ -139,7 +151,7 @@ private QuestProgressUpdateNotify(
               finishProgressList_.addInt(input.readUInt32());
               break;
             }
-            case 106: {
+            case 74: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
@@ -153,8 +165,24 @@ private QuestProgressUpdateNotify(
               break;
             }
             case 112: {
-
-              questId_ = input.readUInt32();
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                failProgressList_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              failProgressList_.addInt(input.readUInt32());
+              break;
+            }
+            case 114: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
+                failProgressList_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                failProgressList_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
               break;
             }
             default: {
@@ -172,12 +200,12 @@ private QuestProgressUpdateNotify(
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          failProgressList_.makeImmutable(); // C
-        }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
           finishProgressList_.makeImmutable(); // C
         }
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          failProgressList_.makeImmutable(); // C
+        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -195,10 +223,14 @@ private QuestProgressUpdateNotify(
               emu.grasscutter.net.proto.QuestProgressUpdateNotifyOuterClass.QuestProgressUpdateNotify.class, emu.grasscutter.net.proto.QuestProgressUpdateNotifyOuterClass.QuestProgressUpdateNotify.Builder.class);
     }
 
-    public static final int FAIL_PROGRESS_LIST_FIELD_NUMBER = 12;
+    public static final int FAIL_PROGRESS_LIST_FIELD_NUMBER = 14;
     private com.google.protobuf.Internal.IntList failProgressList_;
     /**
-     * <code>repeated uint32 fail_progress_list = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 fail_progress_list = 14;</code>
      * @return A list containing the failProgressList.
      */
     @java.lang.Override
@@ -207,14 +239,22 @@ private QuestProgressUpdateNotify(
       return failProgressList_;
     }
     /**
-     * <code>repeated uint32 fail_progress_list = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 fail_progress_list = 14;</code>
      * @return The count of failProgressList.
      */
     public int getFailProgressListCount() {
       return failProgressList_.size();
     }
     /**
-     * <code>repeated uint32 fail_progress_list = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint32 fail_progress_list = 14;</code>
      * @param index The index of the element to return.
      * @return The failProgressList at the given index.
      */
@@ -223,10 +263,14 @@ public int getFailProgressList(int index) {
     }
     private int failProgressListMemoizedSerializedSize = -1;
 
-    public static final int FINISH_PROGRESS_LIST_FIELD_NUMBER = 13;
+    public static final int FINISH_PROGRESS_LIST_FIELD_NUMBER = 9;
     private com.google.protobuf.Internal.IntList finishProgressList_;
     /**
-     * <code>repeated uint32 finish_progress_list = 13;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated uint32 finish_progress_list = 9;</code>
      * @return A list containing the finishProgressList.
      */
     @java.lang.Override
@@ -235,14 +279,22 @@ public int getFailProgressList(int index) {
       return finishProgressList_;
     }
     /**
-     * <code>repeated uint32 finish_progress_list = 13;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated uint32 finish_progress_list = 9;</code>
      * @return The count of finishProgressList.
      */
     public int getFinishProgressListCount() {
       return finishProgressList_.size();
     }
     /**
-     * <code>repeated uint32 finish_progress_list = 13;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>repeated uint32 finish_progress_list = 9;</code>
      * @param index The index of the element to return.
      * @return The finishProgressList at the given index.
      */
@@ -251,10 +303,14 @@ public int getFinishProgressList(int index) {
     }
     private int finishProgressListMemoizedSerializedSize = -1;
 
-    public static final int QUEST_ID_FIELD_NUMBER = 14;
+    public static final int QUEST_ID_FIELD_NUMBER = 3;
     private int questId_;
     /**
-     * <code>uint32 quest_id = 14;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>uint32 quest_id = 3;</code>
      * @return The questId.
      */
     @java.lang.Override
@@ -277,22 +333,22 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (getFailProgressListList().size() > 0) {
-        output.writeUInt32NoTag(98);
-        output.writeUInt32NoTag(failProgressListMemoizedSerializedSize);
-      }
-      for (int i = 0; i < failProgressList_.size(); i++) {
-        output.writeUInt32NoTag(failProgressList_.getInt(i));
+      if (questId_ != 0) {
+        output.writeUInt32(3, questId_);
       }
       if (getFinishProgressListList().size() > 0) {
-        output.writeUInt32NoTag(106);
+        output.writeUInt32NoTag(74);
         output.writeUInt32NoTag(finishProgressListMemoizedSerializedSize);
       }
       for (int i = 0; i < finishProgressList_.size(); i++) {
         output.writeUInt32NoTag(finishProgressList_.getInt(i));
       }
-      if (questId_ != 0) {
-        output.writeUInt32(14, questId_);
+      if (getFailProgressListList().size() > 0) {
+        output.writeUInt32NoTag(114);
+        output.writeUInt32NoTag(failProgressListMemoizedSerializedSize);
+      }
+      for (int i = 0; i < failProgressList_.size(); i++) {
+        output.writeUInt32NoTag(failProgressList_.getInt(i));
       }
       unknownFields.writeTo(output);
     }
@@ -303,37 +359,37 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
+      if (questId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(3, questId_);
+      }
       {
         int dataSize = 0;
-        for (int i = 0; i < failProgressList_.size(); i++) {
+        for (int i = 0; i < finishProgressList_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(failProgressList_.getInt(i));
+            .computeUInt32SizeNoTag(finishProgressList_.getInt(i));
         }
         size += dataSize;
-        if (!getFailProgressListList().isEmpty()) {
+        if (!getFinishProgressListList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        failProgressListMemoizedSerializedSize = dataSize;
+        finishProgressListMemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < finishProgressList_.size(); i++) {
+        for (int i = 0; i < failProgressList_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(finishProgressList_.getInt(i));
+            .computeUInt32SizeNoTag(failProgressList_.getInt(i));
         }
         size += dataSize;
-        if (!getFinishProgressListList().isEmpty()) {
+        if (!getFailProgressListList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        finishProgressListMemoizedSerializedSize = dataSize;
-      }
-      if (questId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, questId_);
+        failProgressListMemoizedSerializedSize = dataSize;
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -474,7 +530,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 28348
+     * CmdId: 28220
      * </pre>
      *
      * Protobuf type {@code QuestProgressUpdateNotify}
@@ -667,7 +723,11 @@ private void ensureFailProgressListIsMutable() {
          }
       }
       /**
-       * <code>repeated uint32 fail_progress_list = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 fail_progress_list = 14;</code>
        * @return A list containing the failProgressList.
        */
       public java.util.List<java.lang.Integer>
@@ -676,14 +736,22 @@ private void ensureFailProgressListIsMutable() {
                  java.util.Collections.unmodifiableList(failProgressList_) : failProgressList_;
       }
       /**
-       * <code>repeated uint32 fail_progress_list = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 fail_progress_list = 14;</code>
        * @return The count of failProgressList.
        */
       public int getFailProgressListCount() {
         return failProgressList_.size();
       }
       /**
-       * <code>repeated uint32 fail_progress_list = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 fail_progress_list = 14;</code>
        * @param index The index of the element to return.
        * @return The failProgressList at the given index.
        */
@@ -691,7 +759,11 @@ public int getFailProgressList(int index) {
         return failProgressList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 fail_progress_list = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 fail_progress_list = 14;</code>
        * @param index The index to set the value at.
        * @param value The failProgressList to set.
        * @return This builder for chaining.
@@ -704,7 +776,11 @@ public Builder setFailProgressList(
         return this;
       }
       /**
-       * <code>repeated uint32 fail_progress_list = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 fail_progress_list = 14;</code>
        * @param value The failProgressList to add.
        * @return This builder for chaining.
        */
@@ -715,7 +791,11 @@ public Builder addFailProgressList(int value) {
         return this;
       }
       /**
-       * <code>repeated uint32 fail_progress_list = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 fail_progress_list = 14;</code>
        * @param values The failProgressList to add.
        * @return This builder for chaining.
        */
@@ -728,7 +808,11 @@ public Builder addAllFailProgressList(
         return this;
       }
       /**
-       * <code>repeated uint32 fail_progress_list = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint32 fail_progress_list = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearFailProgressList() {
@@ -746,7 +830,11 @@ private void ensureFinishProgressListIsMutable() {
          }
       }
       /**
-       * <code>repeated uint32 finish_progress_list = 13;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated uint32 finish_progress_list = 9;</code>
        * @return A list containing the finishProgressList.
        */
       public java.util.List<java.lang.Integer>
@@ -755,14 +843,22 @@ private void ensureFinishProgressListIsMutable() {
                  java.util.Collections.unmodifiableList(finishProgressList_) : finishProgressList_;
       }
       /**
-       * <code>repeated uint32 finish_progress_list = 13;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated uint32 finish_progress_list = 9;</code>
        * @return The count of finishProgressList.
        */
       public int getFinishProgressListCount() {
         return finishProgressList_.size();
       }
       /**
-       * <code>repeated uint32 finish_progress_list = 13;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated uint32 finish_progress_list = 9;</code>
        * @param index The index of the element to return.
        * @return The finishProgressList at the given index.
        */
@@ -770,7 +866,11 @@ public int getFinishProgressList(int index) {
         return finishProgressList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 finish_progress_list = 13;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated uint32 finish_progress_list = 9;</code>
        * @param index The index to set the value at.
        * @param value The finishProgressList to set.
        * @return This builder for chaining.
@@ -783,7 +883,11 @@ public Builder setFinishProgressList(
         return this;
       }
       /**
-       * <code>repeated uint32 finish_progress_list = 13;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated uint32 finish_progress_list = 9;</code>
        * @param value The finishProgressList to add.
        * @return This builder for chaining.
        */
@@ -794,7 +898,11 @@ public Builder addFinishProgressList(int value) {
         return this;
       }
       /**
-       * <code>repeated uint32 finish_progress_list = 13;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated uint32 finish_progress_list = 9;</code>
        * @param values The finishProgressList to add.
        * @return This builder for chaining.
        */
@@ -807,7 +915,11 @@ public Builder addAllFinishProgressList(
         return this;
       }
       /**
-       * <code>repeated uint32 finish_progress_list = 13;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>repeated uint32 finish_progress_list = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearFinishProgressList() {
@@ -819,7 +931,11 @@ public Builder clearFinishProgressList() {
 
       private int questId_ ;
       /**
-       * <code>uint32 quest_id = 14;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint32 quest_id = 3;</code>
        * @return The questId.
        */
       @java.lang.Override
@@ -827,7 +943,11 @@ public int getQuestId() {
         return questId_;
       }
       /**
-       * <code>uint32 quest_id = 14;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint32 quest_id = 3;</code>
        * @param value The questId to set.
        * @return This builder for chaining.
        */
@@ -838,7 +958,11 @@ public Builder setQuestId(int value) {
         return this;
       }
       /**
-       * <code>uint32 quest_id = 14;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint32 quest_id = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearQuestId() {
@@ -916,8 +1040,8 @@ public emu.grasscutter.net.proto.QuestProgressUpdateNotifyOuterClass.QuestProgre
     java.lang.String[] descriptorData = {
       "\n\037QuestProgressUpdateNotify.proto\"g\n\031Que" +
       "stProgressUpdateNotify\022\032\n\022fail_progress_" +
-      "list\030\014 \003(\r\022\034\n\024finish_progress_list\030\r \003(\r" +
-      "\022\020\n\010quest_id\030\016 \001(\rB\033\n\031emu.grasscutter.ne" +
+      "list\030\016 \003(\r\022\034\n\024finish_progress_list\030\t \003(\r" +
+      "\022\020\n\010quest_id\030\003 \001(\rB\033\n\031emu.grasscutter.ne" +
       "t.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/QuestTransmitRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/QuestTransmitRspOuterClass.java
index e9281ed4b9b..8999cc3f892 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/QuestTransmitRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/QuestTransmitRspOuterClass.java
@@ -19,26 +19,38 @@ public interface QuestTransmitRspOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 quest_id = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 quest_id = 1;</code>
      * @return The questId.
      */
     int getQuestId();
 
     /**
-     * <code>uint32 point_id = 13;</code>
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 point_id = 3;</code>
      * @return The pointId.
      */
     int getPointId();
 
     /**
-     * <code>int32 retcode = 14;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>int32 retcode = 8;</code>
      * @return The retcode.
      */
     int getRetcode();
   }
   /**
    * <pre>
-   * CmdId: 2300
+   * CmdId: 20382
    * </pre>
    *
    * Protobuf type {@code QuestTransmitRsp}
@@ -85,17 +97,17 @@ private QuestTransmitRsp(
             case 0:
               done = true;
               break;
-            case 96: {
+            case 8: {
 
               questId_ = input.readUInt32();
               break;
             }
-            case 104: {
+            case 24: {
 
               pointId_ = input.readUInt32();
               break;
             }
-            case 112: {
+            case 64: {
 
               retcode_ = input.readInt32();
               break;
@@ -132,10 +144,14 @@ private QuestTransmitRsp(
               emu.grasscutter.net.proto.QuestTransmitRspOuterClass.QuestTransmitRsp.class, emu.grasscutter.net.proto.QuestTransmitRspOuterClass.QuestTransmitRsp.Builder.class);
     }
 
-    public static final int QUEST_ID_FIELD_NUMBER = 12;
+    public static final int QUEST_ID_FIELD_NUMBER = 1;
     private int questId_;
     /**
-     * <code>uint32 quest_id = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 quest_id = 1;</code>
      * @return The questId.
      */
     @java.lang.Override
@@ -143,10 +159,14 @@ public int getQuestId() {
       return questId_;
     }
 
-    public static final int POINT_ID_FIELD_NUMBER = 13;
+    public static final int POINT_ID_FIELD_NUMBER = 3;
     private int pointId_;
     /**
-     * <code>uint32 point_id = 13;</code>
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 point_id = 3;</code>
      * @return The pointId.
      */
     @java.lang.Override
@@ -154,10 +174,14 @@ public int getPointId() {
       return pointId_;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 14;
+    public static final int RETCODE_FIELD_NUMBER = 8;
     private int retcode_;
     /**
-     * <code>int32 retcode = 14;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>int32 retcode = 8;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -180,13 +204,13 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (questId_ != 0) {
-        output.writeUInt32(12, questId_);
+        output.writeUInt32(1, questId_);
       }
       if (pointId_ != 0) {
-        output.writeUInt32(13, pointId_);
+        output.writeUInt32(3, pointId_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(14, retcode_);
+        output.writeInt32(8, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -199,15 +223,15 @@ public int getSerializedSize() {
       size = 0;
       if (questId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, questId_);
+          .computeUInt32Size(1, questId_);
       }
       if (pointId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, pointId_);
+          .computeUInt32Size(3, pointId_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(14, retcode_);
+          .computeInt32Size(8, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -344,7 +368,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 2300
+     * CmdId: 20382
      * </pre>
      *
      * Protobuf type {@code QuestTransmitRsp}
@@ -507,7 +531,11 @@ public Builder mergeFrom(
 
       private int questId_ ;
       /**
-       * <code>uint32 quest_id = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 quest_id = 1;</code>
        * @return The questId.
        */
       @java.lang.Override
@@ -515,7 +543,11 @@ public int getQuestId() {
         return questId_;
       }
       /**
-       * <code>uint32 quest_id = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 quest_id = 1;</code>
        * @param value The questId to set.
        * @return This builder for chaining.
        */
@@ -526,7 +558,11 @@ public Builder setQuestId(int value) {
         return this;
       }
       /**
-       * <code>uint32 quest_id = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 quest_id = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearQuestId() {
@@ -538,7 +574,11 @@ public Builder clearQuestId() {
 
       private int pointId_ ;
       /**
-       * <code>uint32 point_id = 13;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 point_id = 3;</code>
        * @return The pointId.
        */
       @java.lang.Override
@@ -546,7 +586,11 @@ public int getPointId() {
         return pointId_;
       }
       /**
-       * <code>uint32 point_id = 13;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 point_id = 3;</code>
        * @param value The pointId to set.
        * @return This builder for chaining.
        */
@@ -557,7 +601,11 @@ public Builder setPointId(int value) {
         return this;
       }
       /**
-       * <code>uint32 point_id = 13;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 point_id = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearPointId() {
@@ -569,7 +617,11 @@ public Builder clearPointId() {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 14;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>int32 retcode = 8;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -577,7 +629,11 @@ public int getRetcode() {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 14;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>int32 retcode = 8;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -588,7 +644,11 @@ public Builder setRetcode(int value) {
         return this;
       }
       /**
-       * <code>int32 retcode = 14;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>int32 retcode = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -665,8 +725,8 @@ public emu.grasscutter.net.proto.QuestTransmitRspOuterClass.QuestTransmitRsp get
   static {
     java.lang.String[] descriptorData = {
       "\n\026QuestTransmitRsp.proto\"G\n\020QuestTransmi" +
-      "tRsp\022\020\n\010quest_id\030\014 \001(\r\022\020\n\010point_id\030\r \001(\r" +
-      "\022\017\n\007retcode\030\016 \001(\005B\033\n\031emu.grasscutter.net" +
+      "tRsp\022\020\n\010quest_id\030\001 \001(\r\022\020\n\010point_id\030\003 \001(\r" +
+      "\022\017\n\007retcode\030\010 \001(\005B\033\n\031emu.grasscutter.net" +
       ".protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/QuestUpdateQuestVarNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/QuestUpdateQuestVarNotifyOuterClass.java
index 4adfe854ddf..631e479f329 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/QuestUpdateQuestVarNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/QuestUpdateQuestVarNotifyOuterClass.java
@@ -19,37 +19,57 @@ public interface QuestUpdateQuestVarNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 parent_quest_id = 1;</code>
-     * @return The parentQuestId.
-     */
-    int getParentQuestId();
-
-    /**
-     * <code>uint32 parent_quest_var_seq = 4;</code>
-     * @return The parentQuestVarSeq.
-     */
-    int getParentQuestVarSeq();
-
-    /**
-     * <code>repeated int32 quest_var = 14;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated int32 quest_var = 11;</code>
      * @return A list containing the questVar.
      */
     java.util.List<java.lang.Integer> getQuestVarList();
     /**
-     * <code>repeated int32 quest_var = 14;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated int32 quest_var = 11;</code>
      * @return The count of questVar.
      */
     int getQuestVarCount();
     /**
-     * <code>repeated int32 quest_var = 14;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated int32 quest_var = 11;</code>
      * @param index The index of the element to return.
      * @return The questVar at the given index.
      */
     int getQuestVar(int index);
+
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 parent_quest_id = 15;</code>
+     * @return The parentQuestId.
+     */
+    int getParentQuestId();
+
+    /**
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>uint32 parent_quest_var_seq = 2;</code>
+     * @return The parentQuestVarSeq.
+     */
+    int getParentQuestVarSeq();
   }
   /**
    * <pre>
-   * CmdId: 29565
+   * CmdId: 2114
    * </pre>
    *
    * Protobuf type {@code QuestUpdateQuestVarNotify}
@@ -98,17 +118,12 @@ private QuestUpdateQuestVarNotify(
             case 0:
               done = true;
               break;
-            case 8: {
-
-              parentQuestId_ = input.readUInt32();
-              break;
-            }
-            case 32: {
+            case 16: {
 
               parentQuestVarSeq_ = input.readUInt32();
               break;
             }
-            case 112: {
+            case 88: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 questVar_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -116,7 +131,7 @@ private QuestUpdateQuestVarNotify(
               questVar_.addInt(input.readInt32());
               break;
             }
-            case 114: {
+            case 90: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -129,6 +144,11 @@ private QuestUpdateQuestVarNotify(
               input.popLimit(limit);
               break;
             }
+            case 120: {
+
+              parentQuestId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -164,32 +184,14 @@ private QuestUpdateQuestVarNotify(
               emu.grasscutter.net.proto.QuestUpdateQuestVarNotifyOuterClass.QuestUpdateQuestVarNotify.class, emu.grasscutter.net.proto.QuestUpdateQuestVarNotifyOuterClass.QuestUpdateQuestVarNotify.Builder.class);
     }
 
-    public static final int PARENT_QUEST_ID_FIELD_NUMBER = 1;
-    private int parentQuestId_;
-    /**
-     * <code>uint32 parent_quest_id = 1;</code>
-     * @return The parentQuestId.
-     */
-    @java.lang.Override
-    public int getParentQuestId() {
-      return parentQuestId_;
-    }
-
-    public static final int PARENT_QUEST_VAR_SEQ_FIELD_NUMBER = 4;
-    private int parentQuestVarSeq_;
-    /**
-     * <code>uint32 parent_quest_var_seq = 4;</code>
-     * @return The parentQuestVarSeq.
-     */
-    @java.lang.Override
-    public int getParentQuestVarSeq() {
-      return parentQuestVarSeq_;
-    }
-
-    public static final int QUEST_VAR_FIELD_NUMBER = 14;
+    public static final int QUEST_VAR_FIELD_NUMBER = 11;
     private com.google.protobuf.Internal.IntList questVar_;
     /**
-     * <code>repeated int32 quest_var = 14;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated int32 quest_var = 11;</code>
      * @return A list containing the questVar.
      */
     @java.lang.Override
@@ -198,14 +200,22 @@ public int getParentQuestVarSeq() {
       return questVar_;
     }
     /**
-     * <code>repeated int32 quest_var = 14;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated int32 quest_var = 11;</code>
      * @return The count of questVar.
      */
     public int getQuestVarCount() {
       return questVar_.size();
     }
     /**
-     * <code>repeated int32 quest_var = 14;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated int32 quest_var = 11;</code>
      * @param index The index of the element to return.
      * @return The questVar at the given index.
      */
@@ -214,6 +224,36 @@ public int getQuestVar(int index) {
     }
     private int questVarMemoizedSerializedSize = -1;
 
+    public static final int PARENT_QUEST_ID_FIELD_NUMBER = 15;
+    private int parentQuestId_;
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 parent_quest_id = 15;</code>
+     * @return The parentQuestId.
+     */
+    @java.lang.Override
+    public int getParentQuestId() {
+      return parentQuestId_;
+    }
+
+    public static final int PARENT_QUEST_VAR_SEQ_FIELD_NUMBER = 2;
+    private int parentQuestVarSeq_;
+    /**
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>uint32 parent_quest_var_seq = 2;</code>
+     * @return The parentQuestVarSeq.
+     */
+    @java.lang.Override
+    public int getParentQuestVarSeq() {
+      return parentQuestVarSeq_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -229,19 +269,19 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (parentQuestId_ != 0) {
-        output.writeUInt32(1, parentQuestId_);
-      }
       if (parentQuestVarSeq_ != 0) {
-        output.writeUInt32(4, parentQuestVarSeq_);
+        output.writeUInt32(2, parentQuestVarSeq_);
       }
       if (getQuestVarList().size() > 0) {
-        output.writeUInt32NoTag(114);
+        output.writeUInt32NoTag(90);
         output.writeUInt32NoTag(questVarMemoizedSerializedSize);
       }
       for (int i = 0; i < questVar_.size(); i++) {
         output.writeInt32NoTag(questVar_.getInt(i));
       }
+      if (parentQuestId_ != 0) {
+        output.writeUInt32(15, parentQuestId_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -251,13 +291,9 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (parentQuestId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, parentQuestId_);
-      }
       if (parentQuestVarSeq_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, parentQuestVarSeq_);
+          .computeUInt32Size(2, parentQuestVarSeq_);
       }
       {
         int dataSize = 0;
@@ -273,6 +309,10 @@ public int getSerializedSize() {
         }
         questVarMemoizedSerializedSize = dataSize;
       }
+      if (parentQuestId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(15, parentQuestId_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -288,12 +328,12 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.QuestUpdateQuestVarNotifyOuterClass.QuestUpdateQuestVarNotify other = (emu.grasscutter.net.proto.QuestUpdateQuestVarNotifyOuterClass.QuestUpdateQuestVarNotify) obj;
 
+      if (!getQuestVarList()
+          .equals(other.getQuestVarList())) return false;
       if (getParentQuestId()
           != other.getParentQuestId()) return false;
       if (getParentQuestVarSeq()
           != other.getParentQuestVarSeq()) return false;
-      if (!getQuestVarList()
-          .equals(other.getQuestVarList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -305,14 +345,14 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + PARENT_QUEST_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getParentQuestId();
-      hash = (37 * hash) + PARENT_QUEST_VAR_SEQ_FIELD_NUMBER;
-      hash = (53 * hash) + getParentQuestVarSeq();
       if (getQuestVarCount() > 0) {
         hash = (37 * hash) + QUEST_VAR_FIELD_NUMBER;
         hash = (53 * hash) + getQuestVarList().hashCode();
       }
+      hash = (37 * hash) + PARENT_QUEST_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getParentQuestId();
+      hash = (37 * hash) + PARENT_QUEST_VAR_SEQ_FIELD_NUMBER;
+      hash = (53 * hash) + getParentQuestVarSeq();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -410,7 +450,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 29565
+     * CmdId: 2114
      * </pre>
      *
      * Protobuf type {@code QuestUpdateQuestVarNotify}
@@ -450,12 +490,12 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        questVar_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
         parentQuestId_ = 0;
 
         parentQuestVarSeq_ = 0;
 
-        questVar_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -483,13 +523,13 @@ public emu.grasscutter.net.proto.QuestUpdateQuestVarNotifyOuterClass.QuestUpdate
       public emu.grasscutter.net.proto.QuestUpdateQuestVarNotifyOuterClass.QuestUpdateQuestVarNotify buildPartial() {
         emu.grasscutter.net.proto.QuestUpdateQuestVarNotifyOuterClass.QuestUpdateQuestVarNotify result = new emu.grasscutter.net.proto.QuestUpdateQuestVarNotifyOuterClass.QuestUpdateQuestVarNotify(this);
         int from_bitField0_ = bitField0_;
-        result.parentQuestId_ = parentQuestId_;
-        result.parentQuestVarSeq_ = parentQuestVarSeq_;
         if (((bitField0_ & 0x00000001) != 0)) {
           questVar_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.questVar_ = questVar_;
+        result.parentQuestId_ = parentQuestId_;
+        result.parentQuestVarSeq_ = parentQuestVarSeq_;
         onBuilt();
         return result;
       }
@@ -538,12 +578,6 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.QuestUpdateQuestVarNotifyOuterClass.QuestUpdateQuestVarNotify other) {
         if (other == emu.grasscutter.net.proto.QuestUpdateQuestVarNotifyOuterClass.QuestUpdateQuestVarNotify.getDefaultInstance()) return this;
-        if (other.getParentQuestId() != 0) {
-          setParentQuestId(other.getParentQuestId());
-        }
-        if (other.getParentQuestVarSeq() != 0) {
-          setParentQuestVarSeq(other.getParentQuestVarSeq());
-        }
         if (!other.questVar_.isEmpty()) {
           if (questVar_.isEmpty()) {
             questVar_ = other.questVar_;
@@ -554,6 +588,12 @@ public Builder mergeFrom(emu.grasscutter.net.proto.QuestUpdateQuestVarNotifyOute
           }
           onChanged();
         }
+        if (other.getParentQuestId() != 0) {
+          setParentQuestId(other.getParentQuestId());
+        }
+        if (other.getParentQuestVarSeq() != 0) {
+          setParentQuestVarSeq(other.getParentQuestVarSeq());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -584,68 +624,6 @@ public Builder mergeFrom(
       }
       private int bitField0_;
 
-      private int parentQuestId_ ;
-      /**
-       * <code>uint32 parent_quest_id = 1;</code>
-       * @return The parentQuestId.
-       */
-      @java.lang.Override
-      public int getParentQuestId() {
-        return parentQuestId_;
-      }
-      /**
-       * <code>uint32 parent_quest_id = 1;</code>
-       * @param value The parentQuestId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setParentQuestId(int value) {
-        
-        parentQuestId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 parent_quest_id = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearParentQuestId() {
-        
-        parentQuestId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int parentQuestVarSeq_ ;
-      /**
-       * <code>uint32 parent_quest_var_seq = 4;</code>
-       * @return The parentQuestVarSeq.
-       */
-      @java.lang.Override
-      public int getParentQuestVarSeq() {
-        return parentQuestVarSeq_;
-      }
-      /**
-       * <code>uint32 parent_quest_var_seq = 4;</code>
-       * @param value The parentQuestVarSeq to set.
-       * @return This builder for chaining.
-       */
-      public Builder setParentQuestVarSeq(int value) {
-        
-        parentQuestVarSeq_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 parent_quest_var_seq = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearParentQuestVarSeq() {
-        
-        parentQuestVarSeq_ = 0;
-        onChanged();
-        return this;
-      }
-
       private com.google.protobuf.Internal.IntList questVar_ = emptyIntList();
       private void ensureQuestVarIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
@@ -654,7 +632,11 @@ private void ensureQuestVarIsMutable() {
          }
       }
       /**
-       * <code>repeated int32 quest_var = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated int32 quest_var = 11;</code>
        * @return A list containing the questVar.
        */
       public java.util.List<java.lang.Integer>
@@ -663,14 +645,22 @@ private void ensureQuestVarIsMutable() {
                  java.util.Collections.unmodifiableList(questVar_) : questVar_;
       }
       /**
-       * <code>repeated int32 quest_var = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated int32 quest_var = 11;</code>
        * @return The count of questVar.
        */
       public int getQuestVarCount() {
         return questVar_.size();
       }
       /**
-       * <code>repeated int32 quest_var = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated int32 quest_var = 11;</code>
        * @param index The index of the element to return.
        * @return The questVar at the given index.
        */
@@ -678,7 +668,11 @@ public int getQuestVar(int index) {
         return questVar_.getInt(index);
       }
       /**
-       * <code>repeated int32 quest_var = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated int32 quest_var = 11;</code>
        * @param index The index to set the value at.
        * @param value The questVar to set.
        * @return This builder for chaining.
@@ -691,7 +685,11 @@ public Builder setQuestVar(
         return this;
       }
       /**
-       * <code>repeated int32 quest_var = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated int32 quest_var = 11;</code>
        * @param value The questVar to add.
        * @return This builder for chaining.
        */
@@ -702,7 +700,11 @@ public Builder addQuestVar(int value) {
         return this;
       }
       /**
-       * <code>repeated int32 quest_var = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated int32 quest_var = 11;</code>
        * @param values The questVar to add.
        * @return This builder for chaining.
        */
@@ -715,7 +717,11 @@ public Builder addAllQuestVar(
         return this;
       }
       /**
-       * <code>repeated int32 quest_var = 14;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated int32 quest_var = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearQuestVar() {
@@ -724,6 +730,92 @@ public Builder clearQuestVar() {
         onChanged();
         return this;
       }
+
+      private int parentQuestId_ ;
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 parent_quest_id = 15;</code>
+       * @return The parentQuestId.
+       */
+      @java.lang.Override
+      public int getParentQuestId() {
+        return parentQuestId_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 parent_quest_id = 15;</code>
+       * @param value The parentQuestId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setParentQuestId(int value) {
+        
+        parentQuestId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 parent_quest_id = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearParentQuestId() {
+        
+        parentQuestId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int parentQuestVarSeq_ ;
+      /**
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 parent_quest_var_seq = 2;</code>
+       * @return The parentQuestVarSeq.
+       */
+      @java.lang.Override
+      public int getParentQuestVarSeq() {
+        return parentQuestVarSeq_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 parent_quest_var_seq = 2;</code>
+       * @param value The parentQuestVarSeq to set.
+       * @return This builder for chaining.
+       */
+      public Builder setParentQuestVarSeq(int value) {
+        
+        parentQuestVarSeq_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 parent_quest_var_seq = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearParentQuestVarSeq() {
+        
+        parentQuestVarSeq_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -792,9 +884,9 @@ public emu.grasscutter.net.proto.QuestUpdateQuestVarNotifyOuterClass.QuestUpdate
   static {
     java.lang.String[] descriptorData = {
       "\n\037QuestUpdateQuestVarNotify.proto\"e\n\031Que" +
-      "stUpdateQuestVarNotify\022\027\n\017parent_quest_i" +
-      "d\030\001 \001(\r\022\034\n\024parent_quest_var_seq\030\004 \001(\r\022\021\n" +
-      "\tquest_var\030\016 \003(\005B\033\n\031emu.grasscutter.net." +
+      "stUpdateQuestVarNotify\022\021\n\tquest_var\030\013 \003(" +
+      "\005\022\027\n\017parent_quest_id\030\017 \001(\r\022\034\n\024parent_que" +
+      "st_var_seq\030\002 \001(\rB\033\n\031emu.grasscutter.net." +
       "protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -806,7 +898,7 @@ public emu.grasscutter.net.proto.QuestUpdateQuestVarNotifyOuterClass.QuestUpdate
     internal_static_QuestUpdateQuestVarNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_QuestUpdateQuestVarNotify_descriptor,
-        new java.lang.String[] { "ParentQuestId", "ParentQuestVarSeq", "QuestVar", });
+        new java.lang.String[] { "QuestVar", "ParentQuestId", "ParentQuestVarSeq", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SceneAreaWeatherNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneAreaWeatherNotifyOuterClass.java
index 783f225ae26..f86c4744d8e 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneAreaWeatherNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneAreaWeatherNotifyOuterClass.java
@@ -19,17 +19,19 @@ public interface SceneAreaWeatherNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>float trans_duration = 4;</code>
-     * @return The transDuration.
-     */
-    float getTransDuration();
-
-    /**
-     * <code>map&lt;uint32, string&gt; weather_value_map = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, string&gt; weather_value_map = 6;</code>
      */
     int getWeatherValueMapCount();
     /**
-     * <code>map&lt;uint32, string&gt; weather_value_map = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, string&gt; weather_value_map = 6;</code>
      */
     boolean containsWeatherValueMap(
         int key);
@@ -40,45 +42,79 @@ boolean containsWeatherValueMap(
     java.util.Map<java.lang.Integer, java.lang.String>
     getWeatherValueMap();
     /**
-     * <code>map&lt;uint32, string&gt; weather_value_map = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, string&gt; weather_value_map = 6;</code>
      */
     java.util.Map<java.lang.Integer, java.lang.String>
     getWeatherValueMapMap();
     /**
-     * <code>map&lt;uint32, string&gt; weather_value_map = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, string&gt; weather_value_map = 6;</code>
      */
 
     java.lang.String getWeatherValueMapOrDefault(
         int key,
         java.lang.String defaultValue);
     /**
-     * <code>map&lt;uint32, string&gt; weather_value_map = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, string&gt; weather_value_map = 6;</code>
      */
 
     java.lang.String getWeatherValueMapOrThrow(
         int key);
 
     /**
-     * <code>uint32 weather_area_id = 12;</code>
-     * @return The weatherAreaId.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>float trans_duration = 15;</code>
+     * @return The transDuration.
      */
-    int getWeatherAreaId();
+    float getTransDuration();
+
+    /**
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>uint32 weather_gadget_id = 10;</code>
+     * @return The weatherGadgetId.
+     */
+    int getWeatherGadgetId();
 
     /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
      * <code>uint32 climate_type = 13;</code>
      * @return The climateType.
      */
     int getClimateType();
 
     /**
-     * <code>uint32 weather_gadget_id = 14;</code>
-     * @return The weatherGadgetId.
+     * <pre>
+     * Offset: 0x34
+     * </pre>
+     *
+     * <code>uint32 weather_area_id = 11;</code>
+     * @return The weatherAreaId.
      */
-    int getWeatherGadgetId();
+    int getWeatherAreaId();
   }
   /**
    * <pre>
-   * CmdId: 21395
+   * CmdId: 23089
    * </pre>
    *
    * Protobuf type {@code SceneAreaWeatherNotify}
@@ -126,12 +162,7 @@ private SceneAreaWeatherNotify(
             case 0:
               done = true;
               break;
-            case 37: {
-
-              transDuration_ = input.readFloat();
-              break;
-            }
-            case 66: {
+            case 50: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 weatherValueMap_ = com.google.protobuf.MapField.newMapField(
                     WeatherValueMapDefaultEntryHolder.defaultEntry);
@@ -144,7 +175,12 @@ private SceneAreaWeatherNotify(
                   weatherValueMap__.getKey(), weatherValueMap__.getValue());
               break;
             }
-            case 96: {
+            case 80: {
+
+              weatherGadgetId_ = input.readUInt32();
+              break;
+            }
+            case 88: {
 
               weatherAreaId_ = input.readUInt32();
               break;
@@ -154,9 +190,9 @@ private SceneAreaWeatherNotify(
               climateType_ = input.readUInt32();
               break;
             }
-            case 112: {
+            case 125: {
 
-              weatherGadgetId_ = input.readUInt32();
+              transDuration_ = input.readFloat();
               break;
             }
             default: {
@@ -188,7 +224,7 @@ private SceneAreaWeatherNotify(
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 8:
+        case 6:
           return internalGetWeatherValueMap();
         default:
           throw new RuntimeException(
@@ -203,18 +239,7 @@ protected com.google.protobuf.MapField internalGetMapField(
               emu.grasscutter.net.proto.SceneAreaWeatherNotifyOuterClass.SceneAreaWeatherNotify.class, emu.grasscutter.net.proto.SceneAreaWeatherNotifyOuterClass.SceneAreaWeatherNotify.Builder.class);
     }
 
-    public static final int TRANS_DURATION_FIELD_NUMBER = 4;
-    private float transDuration_;
-    /**
-     * <code>float trans_duration = 4;</code>
-     * @return The transDuration.
-     */
-    @java.lang.Override
-    public float getTransDuration() {
-      return transDuration_;
-    }
-
-    public static final int WEATHER_VALUE_MAP_FIELD_NUMBER = 8;
+    public static final int WEATHER_VALUE_MAP_FIELD_NUMBER = 6;
     private static final class WeatherValueMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, java.lang.String> defaultEntry =
@@ -241,7 +266,11 @@ public int getWeatherValueMapCount() {
       return internalGetWeatherValueMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, string&gt; weather_value_map = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, string&gt; weather_value_map = 6;</code>
      */
 
     @java.lang.Override
@@ -259,7 +288,11 @@ public java.util.Map<java.lang.Integer, java.lang.String> getWeatherValueMap() {
       return getWeatherValueMapMap();
     }
     /**
-     * <code>map&lt;uint32, string&gt; weather_value_map = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, string&gt; weather_value_map = 6;</code>
      */
     @java.lang.Override
 
@@ -267,7 +300,11 @@ public java.util.Map<java.lang.Integer, java.lang.String> getWeatherValueMapMap(
       return internalGetWeatherValueMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, string&gt; weather_value_map = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, string&gt; weather_value_map = 6;</code>
      */
     @java.lang.Override
 
@@ -280,7 +317,11 @@ public java.lang.String getWeatherValueMapOrDefault(
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, string&gt; weather_value_map = 8;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, string&gt; weather_value_map = 6;</code>
      */
     @java.lang.Override
 
@@ -295,20 +336,43 @@ public java.lang.String getWeatherValueMapOrThrow(
       return map.get(key);
     }
 
-    public static final int WEATHER_AREA_ID_FIELD_NUMBER = 12;
-    private int weatherAreaId_;
+    public static final int TRANS_DURATION_FIELD_NUMBER = 15;
+    private float transDuration_;
     /**
-     * <code>uint32 weather_area_id = 12;</code>
-     * @return The weatherAreaId.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>float trans_duration = 15;</code>
+     * @return The transDuration.
      */
     @java.lang.Override
-    public int getWeatherAreaId() {
-      return weatherAreaId_;
+    public float getTransDuration() {
+      return transDuration_;
+    }
+
+    public static final int WEATHER_GADGET_ID_FIELD_NUMBER = 10;
+    private int weatherGadgetId_;
+    /**
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>uint32 weather_gadget_id = 10;</code>
+     * @return The weatherGadgetId.
+     */
+    @java.lang.Override
+    public int getWeatherGadgetId() {
+      return weatherGadgetId_;
     }
 
     public static final int CLIMATE_TYPE_FIELD_NUMBER = 13;
     private int climateType_;
     /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
      * <code>uint32 climate_type = 13;</code>
      * @return The climateType.
      */
@@ -317,15 +381,19 @@ public int getClimateType() {
       return climateType_;
     }
 
-    public static final int WEATHER_GADGET_ID_FIELD_NUMBER = 14;
-    private int weatherGadgetId_;
+    public static final int WEATHER_AREA_ID_FIELD_NUMBER = 11;
+    private int weatherAreaId_;
     /**
-     * <code>uint32 weather_gadget_id = 14;</code>
-     * @return The weatherGadgetId.
+     * <pre>
+     * Offset: 0x34
+     * </pre>
+     *
+     * <code>uint32 weather_area_id = 11;</code>
+     * @return The weatherAreaId.
      */
     @java.lang.Override
-    public int getWeatherGadgetId() {
-      return weatherGadgetId_;
+    public int getWeatherAreaId() {
+      return weatherAreaId_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -342,23 +410,23 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (transDuration_ != 0F) {
-        output.writeFloat(4, transDuration_);
-      }
       com.google.protobuf.GeneratedMessageV3
         .serializeIntegerMapTo(
           output,
           internalGetWeatherValueMap(),
           WeatherValueMapDefaultEntryHolder.defaultEntry,
-          8);
+          6);
+      if (weatherGadgetId_ != 0) {
+        output.writeUInt32(10, weatherGadgetId_);
+      }
       if (weatherAreaId_ != 0) {
-        output.writeUInt32(12, weatherAreaId_);
+        output.writeUInt32(11, weatherAreaId_);
       }
       if (climateType_ != 0) {
         output.writeUInt32(13, climateType_);
       }
-      if (weatherGadgetId_ != 0) {
-        output.writeUInt32(14, weatherGadgetId_);
+      if (transDuration_ != 0F) {
+        output.writeFloat(15, transDuration_);
       }
       unknownFields.writeTo(output);
     }
@@ -369,10 +437,6 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (transDuration_ != 0F) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(4, transDuration_);
-      }
       for (java.util.Map.Entry<java.lang.Integer, java.lang.String> entry
            : internalGetWeatherValueMap().getMap().entrySet()) {
         com.google.protobuf.MapEntry<java.lang.Integer, java.lang.String>
@@ -381,19 +445,23 @@ public int getSerializedSize() {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(8, weatherValueMap__);
+            .computeMessageSize(6, weatherValueMap__);
+      }
+      if (weatherGadgetId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(10, weatherGadgetId_);
       }
       if (weatherAreaId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, weatherAreaId_);
+          .computeUInt32Size(11, weatherAreaId_);
       }
       if (climateType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(13, climateType_);
       }
-      if (weatherGadgetId_ != 0) {
+      if (transDuration_ != 0F) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, weatherGadgetId_);
+          .computeFloatSize(15, transDuration_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -410,17 +478,17 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.SceneAreaWeatherNotifyOuterClass.SceneAreaWeatherNotify other = (emu.grasscutter.net.proto.SceneAreaWeatherNotifyOuterClass.SceneAreaWeatherNotify) obj;
 
+      if (!internalGetWeatherValueMap().equals(
+          other.internalGetWeatherValueMap())) return false;
       if (java.lang.Float.floatToIntBits(getTransDuration())
           != java.lang.Float.floatToIntBits(
               other.getTransDuration())) return false;
-      if (!internalGetWeatherValueMap().equals(
-          other.internalGetWeatherValueMap())) return false;
-      if (getWeatherAreaId()
-          != other.getWeatherAreaId()) return false;
-      if (getClimateType()
-          != other.getClimateType()) return false;
       if (getWeatherGadgetId()
           != other.getWeatherGadgetId()) return false;
+      if (getClimateType()
+          != other.getClimateType()) return false;
+      if (getWeatherAreaId()
+          != other.getWeatherAreaId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -432,19 +500,19 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + TRANS_DURATION_FIELD_NUMBER;
-      hash = (53 * hash) + java.lang.Float.floatToIntBits(
-          getTransDuration());
       if (!internalGetWeatherValueMap().getMap().isEmpty()) {
         hash = (37 * hash) + WEATHER_VALUE_MAP_FIELD_NUMBER;
         hash = (53 * hash) + internalGetWeatherValueMap().hashCode();
       }
-      hash = (37 * hash) + WEATHER_AREA_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getWeatherAreaId();
-      hash = (37 * hash) + CLIMATE_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + getClimateType();
+      hash = (37 * hash) + TRANS_DURATION_FIELD_NUMBER;
+      hash = (53 * hash) + java.lang.Float.floatToIntBits(
+          getTransDuration());
       hash = (37 * hash) + WEATHER_GADGET_ID_FIELD_NUMBER;
       hash = (53 * hash) + getWeatherGadgetId();
+      hash = (37 * hash) + CLIMATE_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + getClimateType();
+      hash = (37 * hash) + WEATHER_AREA_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getWeatherAreaId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -542,7 +610,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 21395
+     * CmdId: 23089
      * </pre>
      *
      * Protobuf type {@code SceneAreaWeatherNotify}
@@ -560,7 +628,7 @@ public static final class Builder extends
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 8:
+          case 6:
             return internalGetWeatherValueMap();
           default:
             throw new RuntimeException(
@@ -571,7 +639,7 @@ protected com.google.protobuf.MapField internalGetMapField(
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 8:
+          case 6:
             return internalGetMutableWeatherValueMap();
           default:
             throw new RuntimeException(
@@ -604,14 +672,14 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        internalGetMutableWeatherValueMap().clear();
         transDuration_ = 0F;
 
-        internalGetMutableWeatherValueMap().clear();
-        weatherAreaId_ = 0;
+        weatherGadgetId_ = 0;
 
         climateType_ = 0;
 
-        weatherGadgetId_ = 0;
+        weatherAreaId_ = 0;
 
         return this;
       }
@@ -640,12 +708,12 @@ public emu.grasscutter.net.proto.SceneAreaWeatherNotifyOuterClass.SceneAreaWeath
       public emu.grasscutter.net.proto.SceneAreaWeatherNotifyOuterClass.SceneAreaWeatherNotify buildPartial() {
         emu.grasscutter.net.proto.SceneAreaWeatherNotifyOuterClass.SceneAreaWeatherNotify result = new emu.grasscutter.net.proto.SceneAreaWeatherNotifyOuterClass.SceneAreaWeatherNotify(this);
         int from_bitField0_ = bitField0_;
-        result.transDuration_ = transDuration_;
         result.weatherValueMap_ = internalGetWeatherValueMap();
         result.weatherValueMap_.makeImmutable();
-        result.weatherAreaId_ = weatherAreaId_;
-        result.climateType_ = climateType_;
+        result.transDuration_ = transDuration_;
         result.weatherGadgetId_ = weatherGadgetId_;
+        result.climateType_ = climateType_;
+        result.weatherAreaId_ = weatherAreaId_;
         onBuilt();
         return result;
       }
@@ -694,19 +762,19 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.SceneAreaWeatherNotifyOuterClass.SceneAreaWeatherNotify other) {
         if (other == emu.grasscutter.net.proto.SceneAreaWeatherNotifyOuterClass.SceneAreaWeatherNotify.getDefaultInstance()) return this;
+        internalGetMutableWeatherValueMap().mergeFrom(
+            other.internalGetWeatherValueMap());
         if (other.getTransDuration() != 0F) {
           setTransDuration(other.getTransDuration());
         }
-        internalGetMutableWeatherValueMap().mergeFrom(
-            other.internalGetWeatherValueMap());
-        if (other.getWeatherAreaId() != 0) {
-          setWeatherAreaId(other.getWeatherAreaId());
+        if (other.getWeatherGadgetId() != 0) {
+          setWeatherGadgetId(other.getWeatherGadgetId());
         }
         if (other.getClimateType() != 0) {
           setClimateType(other.getClimateType());
         }
-        if (other.getWeatherGadgetId() != 0) {
-          setWeatherGadgetId(other.getWeatherGadgetId());
+        if (other.getWeatherAreaId() != 0) {
+          setWeatherAreaId(other.getWeatherAreaId());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -738,37 +806,6 @@ public Builder mergeFrom(
       }
       private int bitField0_;
 
-      private float transDuration_ ;
-      /**
-       * <code>float trans_duration = 4;</code>
-       * @return The transDuration.
-       */
-      @java.lang.Override
-      public float getTransDuration() {
-        return transDuration_;
-      }
-      /**
-       * <code>float trans_duration = 4;</code>
-       * @param value The transDuration to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTransDuration(float value) {
-        
-        transDuration_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>float trans_duration = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTransDuration() {
-        
-        transDuration_ = 0F;
-        onChanged();
-        return this;
-      }
-
       private com.google.protobuf.MapField<
           java.lang.Integer, java.lang.String> weatherValueMap_;
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.String>
@@ -796,7 +833,11 @@ public int getWeatherValueMapCount() {
         return internalGetWeatherValueMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, string&gt; weather_value_map = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, string&gt; weather_value_map = 6;</code>
        */
 
       @java.lang.Override
@@ -814,7 +855,11 @@ public java.util.Map<java.lang.Integer, java.lang.String> getWeatherValueMap() {
         return getWeatherValueMapMap();
       }
       /**
-       * <code>map&lt;uint32, string&gt; weather_value_map = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, string&gt; weather_value_map = 6;</code>
        */
       @java.lang.Override
 
@@ -822,7 +867,11 @@ public java.util.Map<java.lang.Integer, java.lang.String> getWeatherValueMapMap(
         return internalGetWeatherValueMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, string&gt; weather_value_map = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, string&gt; weather_value_map = 6;</code>
        */
       @java.lang.Override
 
@@ -835,7 +884,11 @@ public java.lang.String getWeatherValueMapOrDefault(
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, string&gt; weather_value_map = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, string&gt; weather_value_map = 6;</code>
        */
       @java.lang.Override
 
@@ -856,7 +909,11 @@ public Builder clearWeatherValueMap() {
         return this;
       }
       /**
-       * <code>map&lt;uint32, string&gt; weather_value_map = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, string&gt; weather_value_map = 6;</code>
        */
 
       public Builder removeWeatherValueMap(
@@ -875,7 +932,11 @@ public Builder removeWeatherValueMap(
         return internalGetMutableWeatherValueMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, string&gt; weather_value_map = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, string&gt; weather_value_map = 6;</code>
        */
       public Builder putWeatherValueMap(
           int key,
@@ -887,7 +948,11 @@ public Builder putWeatherValueMap(
         return this;
       }
       /**
-       * <code>map&lt;uint32, string&gt; weather_value_map = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, string&gt; weather_value_map = 6;</code>
        */
 
       public Builder putAllWeatherValueMap(
@@ -897,39 +962,98 @@ public Builder putAllWeatherValueMap(
         return this;
       }
 
-      private int weatherAreaId_ ;
+      private float transDuration_ ;
       /**
-       * <code>uint32 weather_area_id = 12;</code>
-       * @return The weatherAreaId.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>float trans_duration = 15;</code>
+       * @return The transDuration.
        */
       @java.lang.Override
-      public int getWeatherAreaId() {
-        return weatherAreaId_;
+      public float getTransDuration() {
+        return transDuration_;
       }
       /**
-       * <code>uint32 weather_area_id = 12;</code>
-       * @param value The weatherAreaId to set.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>float trans_duration = 15;</code>
+       * @param value The transDuration to set.
        * @return This builder for chaining.
        */
-      public Builder setWeatherAreaId(int value) {
+      public Builder setTransDuration(float value) {
         
-        weatherAreaId_ = value;
+        transDuration_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 weather_area_id = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>float trans_duration = 15;</code>
        * @return This builder for chaining.
        */
-      public Builder clearWeatherAreaId() {
+      public Builder clearTransDuration() {
         
-        weatherAreaId_ = 0;
+        transDuration_ = 0F;
+        onChanged();
+        return this;
+      }
+
+      private int weatherGadgetId_ ;
+      /**
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 weather_gadget_id = 10;</code>
+       * @return The weatherGadgetId.
+       */
+      @java.lang.Override
+      public int getWeatherGadgetId() {
+        return weatherGadgetId_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 weather_gadget_id = 10;</code>
+       * @param value The weatherGadgetId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setWeatherGadgetId(int value) {
+        
+        weatherGadgetId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 weather_gadget_id = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearWeatherGadgetId() {
+        
+        weatherGadgetId_ = 0;
         onChanged();
         return this;
       }
 
       private int climateType_ ;
       /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
        * <code>uint32 climate_type = 13;</code>
        * @return The climateType.
        */
@@ -938,6 +1062,10 @@ public int getClimateType() {
         return climateType_;
       }
       /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
        * <code>uint32 climate_type = 13;</code>
        * @param value The climateType to set.
        * @return This builder for chaining.
@@ -949,6 +1077,10 @@ public Builder setClimateType(int value) {
         return this;
       }
       /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
        * <code>uint32 climate_type = 13;</code>
        * @return This builder for chaining.
        */
@@ -959,33 +1091,45 @@ public Builder clearClimateType() {
         return this;
       }
 
-      private int weatherGadgetId_ ;
+      private int weatherAreaId_ ;
       /**
-       * <code>uint32 weather_gadget_id = 14;</code>
-       * @return The weatherGadgetId.
+       * <pre>
+       * Offset: 0x34
+       * </pre>
+       *
+       * <code>uint32 weather_area_id = 11;</code>
+       * @return The weatherAreaId.
        */
       @java.lang.Override
-      public int getWeatherGadgetId() {
-        return weatherGadgetId_;
+      public int getWeatherAreaId() {
+        return weatherAreaId_;
       }
       /**
-       * <code>uint32 weather_gadget_id = 14;</code>
-       * @param value The weatherGadgetId to set.
+       * <pre>
+       * Offset: 0x34
+       * </pre>
+       *
+       * <code>uint32 weather_area_id = 11;</code>
+       * @param value The weatherAreaId to set.
        * @return This builder for chaining.
        */
-      public Builder setWeatherGadgetId(int value) {
+      public Builder setWeatherAreaId(int value) {
         
-        weatherGadgetId_ = value;
+        weatherAreaId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 weather_gadget_id = 14;</code>
+       * <pre>
+       * Offset: 0x34
+       * </pre>
+       *
+       * <code>uint32 weather_area_id = 11;</code>
        * @return This builder for chaining.
        */
-      public Builder clearWeatherGadgetId() {
+      public Builder clearWeatherAreaId() {
         
-        weatherGadgetId_ = 0;
+        weatherAreaId_ = 0;
         onChanged();
         return this;
       }
@@ -1062,11 +1206,11 @@ public emu.grasscutter.net.proto.SceneAreaWeatherNotifyOuterClass.SceneAreaWeath
   static {
     java.lang.String[] descriptorData = {
       "\n\034SceneAreaWeatherNotify.proto\"\373\001\n\026Scene" +
-      "AreaWeatherNotify\022\026\n\016trans_duration\030\004 \001(" +
-      "\002\022G\n\021weather_value_map\030\010 \003(\0132,.SceneArea" +
-      "WeatherNotify.WeatherValueMapEntry\022\027\n\017we" +
-      "ather_area_id\030\014 \001(\r\022\024\n\014climate_type\030\r \001(" +
-      "\r\022\031\n\021weather_gadget_id\030\016 \001(\r\0326\n\024WeatherV" +
+      "AreaWeatherNotify\022G\n\021weather_value_map\030\006" +
+      " \003(\0132,.SceneAreaWeatherNotify.WeatherVal" +
+      "ueMapEntry\022\026\n\016trans_duration\030\017 \001(\002\022\031\n\021we" +
+      "ather_gadget_id\030\n \001(\r\022\024\n\014climate_type\030\r " +
+      "\001(\r\022\027\n\017weather_area_id\030\013 \001(\r\0326\n\024WeatherV" +
       "alueMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\t" +
       ":\0028\001B\033\n\031emu.grasscutter.net.protob\006proto" +
       "3"
@@ -1080,7 +1224,7 @@ public emu.grasscutter.net.proto.SceneAreaWeatherNotifyOuterClass.SceneAreaWeath
     internal_static_SceneAreaWeatherNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SceneAreaWeatherNotify_descriptor,
-        new java.lang.String[] { "TransDuration", "WeatherValueMap", "WeatherAreaId", "ClimateType", "WeatherGadgetId", });
+        new java.lang.String[] { "WeatherValueMap", "TransDuration", "WeatherGadgetId", "ClimateType", "WeatherAreaId", });
     internal_static_SceneAreaWeatherNotify_WeatherValueMapEntry_descriptor =
       internal_static_SceneAreaWeatherNotify_descriptor.getNestedTypes().get(0);
     internal_static_SceneAreaWeatherNotify_WeatherValueMapEntry_fieldAccessorTable = new
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityAppearNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityAppearNotifyOuterClass.java
index 14207ffe400..5f8604e3faf 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityAppearNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityAppearNotifyOuterClass.java
@@ -19,49 +19,81 @@ public interface SceneEntityAppearNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .SceneEntityInfo entity_list = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .SceneEntityInfo entity_list = 5;</code>
      */
     java.util.List<emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo> 
         getEntityListList();
     /**
-     * <code>repeated .SceneEntityInfo entity_list = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .SceneEntityInfo entity_list = 5;</code>
      */
     emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo getEntityList(int index);
     /**
-     * <code>repeated .SceneEntityInfo entity_list = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .SceneEntityInfo entity_list = 5;</code>
      */
     int getEntityListCount();
     /**
-     * <code>repeated .SceneEntityInfo entity_list = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .SceneEntityInfo entity_list = 5;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder> 
         getEntityListOrBuilderList();
     /**
-     * <code>repeated .SceneEntityInfo entity_list = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .SceneEntityInfo entity_list = 5;</code>
      */
     emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder getEntityListOrBuilder(
         int index);
 
     /**
-     * <code>.VisionType appear_type = 7;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 param = 8;</code>
+     * @return The param.
+     */
+    int getParam();
+
+    /**
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>.VisionType appear_type = 9;</code>
      * @return The enum numeric value on the wire for appearType.
      */
     int getAppearTypeValue();
     /**
-     * <code>.VisionType appear_type = 7;</code>
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>.VisionType appear_type = 9;</code>
      * @return The appearType.
      */
     emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType getAppearType();
-
-    /**
-     * <code>uint32 param = 9;</code>
-     * @return The param.
-     */
-    int getParam();
   }
   /**
    * <pre>
-   * CmdId: 4793
+   * CmdId: 26789
    * </pre>
    *
    * Protobuf type {@code SceneEntityAppearNotify}
@@ -111,7 +143,7 @@ private SceneEntityAppearNotify(
             case 0:
               done = true;
               break;
-            case 10: {
+            case 42: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 entityList_ = new java.util.ArrayList<emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -120,15 +152,15 @@ private SceneEntityAppearNotify(
                   input.readMessage(emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.parser(), extensionRegistry));
               break;
             }
-            case 56: {
-              int rawValue = input.readEnum();
+            case 64: {
 
-              appearType_ = rawValue;
+              param_ = input.readUInt32();
               break;
             }
             case 72: {
+              int rawValue = input.readEnum();
 
-              param_ = input.readUInt32();
+              appearType_ = rawValue;
               break;
             }
             default: {
@@ -166,17 +198,25 @@ private SceneEntityAppearNotify(
               emu.grasscutter.net.proto.SceneEntityAppearNotifyOuterClass.SceneEntityAppearNotify.class, emu.grasscutter.net.proto.SceneEntityAppearNotifyOuterClass.SceneEntityAppearNotify.Builder.class);
     }
 
-    public static final int ENTITY_LIST_FIELD_NUMBER = 1;
+    public static final int ENTITY_LIST_FIELD_NUMBER = 5;
     private java.util.List<emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo> entityList_;
     /**
-     * <code>repeated .SceneEntityInfo entity_list = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .SceneEntityInfo entity_list = 5;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo> getEntityListList() {
       return entityList_;
     }
     /**
-     * <code>repeated .SceneEntityInfo entity_list = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .SceneEntityInfo entity_list = 5;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder> 
@@ -184,21 +224,33 @@ public java.util.List<emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneE
       return entityList_;
     }
     /**
-     * <code>repeated .SceneEntityInfo entity_list = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .SceneEntityInfo entity_list = 5;</code>
      */
     @java.lang.Override
     public int getEntityListCount() {
       return entityList_.size();
     }
     /**
-     * <code>repeated .SceneEntityInfo entity_list = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .SceneEntityInfo entity_list = 5;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo getEntityList(int index) {
       return entityList_.get(index);
     }
     /**
-     * <code>repeated .SceneEntityInfo entity_list = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .SceneEntityInfo entity_list = 5;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder getEntityListOrBuilder(
@@ -206,17 +258,40 @@ public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuil
       return entityList_.get(index);
     }
 
-    public static final int APPEAR_TYPE_FIELD_NUMBER = 7;
+    public static final int PARAM_FIELD_NUMBER = 8;
+    private int param_;
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 param = 8;</code>
+     * @return The param.
+     */
+    @java.lang.Override
+    public int getParam() {
+      return param_;
+    }
+
+    public static final int APPEAR_TYPE_FIELD_NUMBER = 9;
     private int appearType_;
     /**
-     * <code>.VisionType appear_type = 7;</code>
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>.VisionType appear_type = 9;</code>
      * @return The enum numeric value on the wire for appearType.
      */
     @java.lang.Override public int getAppearTypeValue() {
       return appearType_;
     }
     /**
-     * <code>.VisionType appear_type = 7;</code>
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>.VisionType appear_type = 9;</code>
      * @return The appearType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType getAppearType() {
@@ -225,17 +300,6 @@ public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuil
       return result == null ? emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.UNRECOGNIZED : result;
     }
 
-    public static final int PARAM_FIELD_NUMBER = 9;
-    private int param_;
-    /**
-     * <code>uint32 param = 9;</code>
-     * @return The param.
-     */
-    @java.lang.Override
-    public int getParam() {
-      return param_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -251,13 +315,13 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < entityList_.size(); i++) {
-        output.writeMessage(1, entityList_.get(i));
-      }
-      if (appearType_ != emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.VISION_TYPE_NONE.getNumber()) {
-        output.writeEnum(7, appearType_);
+        output.writeMessage(5, entityList_.get(i));
       }
       if (param_ != 0) {
-        output.writeUInt32(9, param_);
+        output.writeUInt32(8, param_);
+      }
+      if (appearType_ != emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.VISION_TYPE_NONE.getNumber()) {
+        output.writeEnum(9, appearType_);
       }
       unknownFields.writeTo(output);
     }
@@ -270,15 +334,15 @@ public int getSerializedSize() {
       size = 0;
       for (int i = 0; i < entityList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, entityList_.get(i));
+          .computeMessageSize(5, entityList_.get(i));
       }
-      if (appearType_ != emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.VISION_TYPE_NONE.getNumber()) {
+      if (param_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(7, appearType_);
+          .computeUInt32Size(8, param_);
       }
-      if (param_ != 0) {
+      if (appearType_ != emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.VISION_TYPE_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, param_);
+          .computeEnumSize(9, appearType_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -297,9 +361,9 @@ public boolean equals(final java.lang.Object obj) {
 
       if (!getEntityListList()
           .equals(other.getEntityListList())) return false;
-      if (appearType_ != other.appearType_) return false;
       if (getParam()
           != other.getParam()) return false;
+      if (appearType_ != other.appearType_) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -315,10 +379,10 @@ public int hashCode() {
         hash = (37 * hash) + ENTITY_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getEntityListList().hashCode();
       }
-      hash = (37 * hash) + APPEAR_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + appearType_;
       hash = (37 * hash) + PARAM_FIELD_NUMBER;
       hash = (53 * hash) + getParam();
+      hash = (37 * hash) + APPEAR_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + appearType_;
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -416,7 +480,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 4793
+     * CmdId: 26789
      * </pre>
      *
      * Protobuf type {@code SceneEntityAppearNotify}
@@ -463,10 +527,10 @@ public Builder clear() {
         } else {
           entityListBuilder_.clear();
         }
-        appearType_ = 0;
-
         param_ = 0;
 
+        appearType_ = 0;
+
         return this;
       }
 
@@ -503,8 +567,8 @@ public emu.grasscutter.net.proto.SceneEntityAppearNotifyOuterClass.SceneEntityAp
         } else {
           result.entityList_ = entityListBuilder_.build();
         }
-        result.appearType_ = appearType_;
         result.param_ = param_;
+        result.appearType_ = appearType_;
         onBuilt();
         return result;
       }
@@ -579,12 +643,12 @@ public Builder mergeFrom(emu.grasscutter.net.proto.SceneEntityAppearNotifyOuterC
             }
           }
         }
-        if (other.appearType_ != 0) {
-          setAppearTypeValue(other.getAppearTypeValue());
-        }
         if (other.getParam() != 0) {
           setParam(other.getParam());
         }
+        if (other.appearType_ != 0) {
+          setAppearTypeValue(other.getAppearTypeValue());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -628,7 +692,11 @@ private void ensureEntityListIsMutable() {
           emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo, emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder, emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder> entityListBuilder_;
 
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .SceneEntityInfo entity_list = 5;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo> getEntityListList() {
         if (entityListBuilder_ == null) {
@@ -638,7 +706,11 @@ public java.util.List<emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneE
         }
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .SceneEntityInfo entity_list = 5;</code>
        */
       public int getEntityListCount() {
         if (entityListBuilder_ == null) {
@@ -648,7 +720,11 @@ public int getEntityListCount() {
         }
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .SceneEntityInfo entity_list = 5;</code>
        */
       public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo getEntityList(int index) {
         if (entityListBuilder_ == null) {
@@ -658,7 +734,11 @@ public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo getEn
         }
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .SceneEntityInfo entity_list = 5;</code>
        */
       public Builder setEntityList(
           int index, emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo value) {
@@ -675,7 +755,11 @@ public Builder setEntityList(
         return this;
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .SceneEntityInfo entity_list = 5;</code>
        */
       public Builder setEntityList(
           int index, emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder builderForValue) {
@@ -689,7 +773,11 @@ public Builder setEntityList(
         return this;
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .SceneEntityInfo entity_list = 5;</code>
        */
       public Builder addEntityList(emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo value) {
         if (entityListBuilder_ == null) {
@@ -705,7 +793,11 @@ public Builder addEntityList(emu.grasscutter.net.proto.SceneEntityInfoOuterClass
         return this;
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .SceneEntityInfo entity_list = 5;</code>
        */
       public Builder addEntityList(
           int index, emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo value) {
@@ -722,7 +814,11 @@ public Builder addEntityList(
         return this;
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .SceneEntityInfo entity_list = 5;</code>
        */
       public Builder addEntityList(
           emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder builderForValue) {
@@ -736,7 +832,11 @@ public Builder addEntityList(
         return this;
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .SceneEntityInfo entity_list = 5;</code>
        */
       public Builder addEntityList(
           int index, emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder builderForValue) {
@@ -750,7 +850,11 @@ public Builder addEntityList(
         return this;
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .SceneEntityInfo entity_list = 5;</code>
        */
       public Builder addAllEntityList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo> values) {
@@ -765,7 +869,11 @@ public Builder addAllEntityList(
         return this;
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .SceneEntityInfo entity_list = 5;</code>
        */
       public Builder clearEntityList() {
         if (entityListBuilder_ == null) {
@@ -778,7 +886,11 @@ public Builder clearEntityList() {
         return this;
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .SceneEntityInfo entity_list = 5;</code>
        */
       public Builder removeEntityList(int index) {
         if (entityListBuilder_ == null) {
@@ -791,14 +903,22 @@ public Builder removeEntityList(int index) {
         return this;
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .SceneEntityInfo entity_list = 5;</code>
        */
       public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder getEntityListBuilder(
           int index) {
         return getEntityListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .SceneEntityInfo entity_list = 5;</code>
        */
       public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder getEntityListOrBuilder(
           int index) {
@@ -808,7 +928,11 @@ public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuil
         }
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .SceneEntityInfo entity_list = 5;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder> 
            getEntityListOrBuilderList() {
@@ -819,14 +943,22 @@ public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuil
         }
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .SceneEntityInfo entity_list = 5;</code>
        */
       public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder addEntityListBuilder() {
         return getEntityListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .SceneEntityInfo entity_list = 5;</code>
        */
       public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder addEntityListBuilder(
           int index) {
@@ -834,7 +966,11 @@ public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Build
             index, emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .SceneEntityInfo entity_list = 5;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder> 
            getEntityListBuilderList() {
@@ -855,16 +991,67 @@ public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Build
         return entityListBuilder_;
       }
 
+      private int param_ ;
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 param = 8;</code>
+       * @return The param.
+       */
+      @java.lang.Override
+      public int getParam() {
+        return param_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 param = 8;</code>
+       * @param value The param to set.
+       * @return This builder for chaining.
+       */
+      public Builder setParam(int value) {
+        
+        param_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 param = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearParam() {
+        
+        param_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int appearType_ = 0;
       /**
-       * <code>.VisionType appear_type = 7;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>.VisionType appear_type = 9;</code>
        * @return The enum numeric value on the wire for appearType.
        */
       @java.lang.Override public int getAppearTypeValue() {
         return appearType_;
       }
       /**
-       * <code>.VisionType appear_type = 7;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>.VisionType appear_type = 9;</code>
        * @param value The enum numeric value on the wire for appearType to set.
        * @return This builder for chaining.
        */
@@ -875,7 +1062,11 @@ public Builder setAppearTypeValue(int value) {
         return this;
       }
       /**
-       * <code>.VisionType appear_type = 7;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>.VisionType appear_type = 9;</code>
        * @return The appearType.
        */
       @java.lang.Override
@@ -885,7 +1076,11 @@ public emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType getAppearType()
         return result == null ? emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.VisionType appear_type = 7;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>.VisionType appear_type = 9;</code>
        * @param value The appearType to set.
        * @return This builder for chaining.
        */
@@ -899,7 +1094,11 @@ public Builder setAppearType(emu.grasscutter.net.proto.VisionTypeOuterClass.Visi
         return this;
       }
       /**
-       * <code>.VisionType appear_type = 7;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>.VisionType appear_type = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearAppearType() {
@@ -908,37 +1107,6 @@ public Builder clearAppearType() {
         onChanged();
         return this;
       }
-
-      private int param_ ;
-      /**
-       * <code>uint32 param = 9;</code>
-       * @return The param.
-       */
-      @java.lang.Override
-      public int getParam() {
-        return param_;
-      }
-      /**
-       * <code>uint32 param = 9;</code>
-       * @param value The param to set.
-       * @return This builder for chaining.
-       */
-      public Builder setParam(int value) {
-        
-        param_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 param = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearParam() {
-        
-        param_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1008,9 +1176,9 @@ public emu.grasscutter.net.proto.SceneEntityAppearNotifyOuterClass.SceneEntityAp
     java.lang.String[] descriptorData = {
       "\n\035SceneEntityAppearNotify.proto\032\025SceneEn" +
       "tityInfo.proto\032\020VisionType.proto\"q\n\027Scen" +
-      "eEntityAppearNotify\022%\n\013entity_list\030\001 \003(\013" +
-      "2\020.SceneEntityInfo\022 \n\013appear_type\030\007 \001(\0162" +
-      "\013.VisionType\022\r\n\005param\030\t \001(\rB\033\n\031emu.grass" +
+      "eEntityAppearNotify\022%\n\013entity_list\030\005 \003(\013" +
+      "2\020.SceneEntityInfo\022\r\n\005param\030\010 \001(\r\022 \n\013app" +
+      "ear_type\030\t \001(\0162\013.VisionTypeB\033\n\031emu.grass" +
       "cutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1024,7 +1192,7 @@ public emu.grasscutter.net.proto.SceneEntityAppearNotifyOuterClass.SceneEntityAp
     internal_static_SceneEntityAppearNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SceneEntityAppearNotify_descriptor,
-        new java.lang.String[] { "EntityList", "AppearType", "Param", });
+        new java.lang.String[] { "EntityList", "Param", "AppearType", });
     emu.grasscutter.net.proto.SceneEntityInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.VisionTypeOuterClass.getDescriptor();
   }
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SceneInitFinishReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneInitFinishReqOuterClass.java
index 25637fe388d..b4e1745b23a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneInitFinishReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneInitFinishReqOuterClass.java
@@ -19,14 +19,18 @@ public interface SceneInitFinishReqOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 enter_scene_token = 4;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 enter_scene_token = 13;</code>
      * @return The enterSceneToken.
      */
     int getEnterSceneToken();
   }
   /**
    * <pre>
-   * CmdId: 8793
+   * CmdId: 105
    * </pre>
    *
    * Protobuf type {@code SceneInitFinishReq}
@@ -73,7 +77,7 @@ private SceneInitFinishReq(
             case 0:
               done = true;
               break;
-            case 32: {
+            case 104: {
 
               enterSceneToken_ = input.readUInt32();
               break;
@@ -110,10 +114,14 @@ private SceneInitFinishReq(
               emu.grasscutter.net.proto.SceneInitFinishReqOuterClass.SceneInitFinishReq.class, emu.grasscutter.net.proto.SceneInitFinishReqOuterClass.SceneInitFinishReq.Builder.class);
     }
 
-    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 4;
+    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 13;
     private int enterSceneToken_;
     /**
-     * <code>uint32 enter_scene_token = 4;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 enter_scene_token = 13;</code>
      * @return The enterSceneToken.
      */
     @java.lang.Override
@@ -136,7 +144,7 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (enterSceneToken_ != 0) {
-        output.writeUInt32(4, enterSceneToken_);
+        output.writeUInt32(13, enterSceneToken_);
       }
       unknownFields.writeTo(output);
     }
@@ -149,7 +157,7 @@ public int getSerializedSize() {
       size = 0;
       if (enterSceneToken_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, enterSceneToken_);
+          .computeUInt32Size(13, enterSceneToken_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,7 +286,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 8793
+     * CmdId: 105
      * </pre>
      *
      * Protobuf type {@code SceneInitFinishReq}
@@ -429,7 +437,11 @@ public Builder mergeFrom(
 
       private int enterSceneToken_ ;
       /**
-       * <code>uint32 enter_scene_token = 4;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 enter_scene_token = 13;</code>
        * @return The enterSceneToken.
        */
       @java.lang.Override
@@ -437,7 +449,11 @@ public int getEnterSceneToken() {
         return enterSceneToken_;
       }
       /**
-       * <code>uint32 enter_scene_token = 4;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 enter_scene_token = 13;</code>
        * @param value The enterSceneToken to set.
        * @return This builder for chaining.
        */
@@ -448,7 +464,11 @@ public Builder setEnterSceneToken(int value) {
         return this;
       }
       /**
-       * <code>uint32 enter_scene_token = 4;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 enter_scene_token = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearEnterSceneToken() {
@@ -525,7 +545,7 @@ public emu.grasscutter.net.proto.SceneInitFinishReqOuterClass.SceneInitFinishReq
   static {
     java.lang.String[] descriptorData = {
       "\n\030SceneInitFinishReq.proto\"/\n\022SceneInitF" +
-      "inishReq\022\031\n\021enter_scene_token\030\004 \001(\rB\033\n\031e" +
+      "inishReq\022\031\n\021enter_scene_token\030\r \001(\rB\033\n\031e" +
       "mu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SceneInitFinishRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneInitFinishRspOuterClass.java
index b3a779a2672..902c7e67d64 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneInitFinishRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneInitFinishRspOuterClass.java
@@ -23,7 +23,7 @@ public interface SceneInitFinishRspOrBuilder extends
      * Offset: 0x20
      * </pre>
      *
-     * <code>int32 retcode = 1;</code>
+     * <code>int32 retcode = 14;</code>
      * @return The retcode.
      */
     int getRetcode();
@@ -33,14 +33,14 @@ public interface SceneInitFinishRspOrBuilder extends
      * Offset: 0x24
      * </pre>
      *
-     * <code>uint32 enter_scene_token = 4;</code>
+     * <code>uint32 enter_scene_token = 2;</code>
      * @return The enterSceneToken.
      */
     int getEnterSceneToken();
   }
   /**
    * <pre>
-   * CmdId: 4231
+   * CmdId: 3061
    * </pre>
    *
    * Protobuf type {@code SceneInitFinishRsp}
@@ -87,14 +87,14 @@ private SceneInitFinishRsp(
             case 0:
               done = true;
               break;
-            case 8: {
+            case 16: {
 
-              retcode_ = input.readInt32();
+              enterSceneToken_ = input.readUInt32();
               break;
             }
-            case 32: {
+            case 112: {
 
-              enterSceneToken_ = input.readUInt32();
+              retcode_ = input.readInt32();
               break;
             }
             default: {
@@ -129,14 +129,14 @@ private SceneInitFinishRsp(
               emu.grasscutter.net.proto.SceneInitFinishRspOuterClass.SceneInitFinishRsp.class, emu.grasscutter.net.proto.SceneInitFinishRspOuterClass.SceneInitFinishRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 1;
+    public static final int RETCODE_FIELD_NUMBER = 14;
     private int retcode_;
     /**
      * <pre>
      * Offset: 0x20
      * </pre>
      *
-     * <code>int32 retcode = 1;</code>
+     * <code>int32 retcode = 14;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -144,14 +144,14 @@ public int getRetcode() {
       return retcode_;
     }
 
-    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 4;
+    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 2;
     private int enterSceneToken_;
     /**
      * <pre>
      * Offset: 0x24
      * </pre>
      *
-     * <code>uint32 enter_scene_token = 4;</code>
+     * <code>uint32 enter_scene_token = 2;</code>
      * @return The enterSceneToken.
      */
     @java.lang.Override
@@ -173,11 +173,11 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (retcode_ != 0) {
-        output.writeInt32(1, retcode_);
-      }
       if (enterSceneToken_ != 0) {
-        output.writeUInt32(4, enterSceneToken_);
+        output.writeUInt32(2, enterSceneToken_);
+      }
+      if (retcode_ != 0) {
+        output.writeInt32(14, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -188,13 +188,13 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (retcode_ != 0) {
+      if (enterSceneToken_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(1, retcode_);
+          .computeUInt32Size(2, enterSceneToken_);
       }
-      if (enterSceneToken_ != 0) {
+      if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, enterSceneToken_);
+          .computeInt32Size(14, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -327,7 +327,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 4231
+     * CmdId: 3061
      * </pre>
      *
      * Protobuf type {@code SceneInitFinishRsp}
@@ -488,7 +488,7 @@ public Builder mergeFrom(
        * Offset: 0x20
        * </pre>
        *
-       * <code>int32 retcode = 1;</code>
+       * <code>int32 retcode = 14;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -500,7 +500,7 @@ public int getRetcode() {
        * Offset: 0x20
        * </pre>
        *
-       * <code>int32 retcode = 1;</code>
+       * <code>int32 retcode = 14;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -515,7 +515,7 @@ public Builder setRetcode(int value) {
        * Offset: 0x20
        * </pre>
        *
-       * <code>int32 retcode = 1;</code>
+       * <code>int32 retcode = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -531,7 +531,7 @@ public Builder clearRetcode() {
        * Offset: 0x24
        * </pre>
        *
-       * <code>uint32 enter_scene_token = 4;</code>
+       * <code>uint32 enter_scene_token = 2;</code>
        * @return The enterSceneToken.
        */
       @java.lang.Override
@@ -543,7 +543,7 @@ public int getEnterSceneToken() {
        * Offset: 0x24
        * </pre>
        *
-       * <code>uint32 enter_scene_token = 4;</code>
+       * <code>uint32 enter_scene_token = 2;</code>
        * @param value The enterSceneToken to set.
        * @return This builder for chaining.
        */
@@ -558,7 +558,7 @@ public Builder setEnterSceneToken(int value) {
        * Offset: 0x24
        * </pre>
        *
-       * <code>uint32 enter_scene_token = 4;</code>
+       * <code>uint32 enter_scene_token = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearEnterSceneToken() {
@@ -635,8 +635,8 @@ public emu.grasscutter.net.proto.SceneInitFinishRspOuterClass.SceneInitFinishRsp
   static {
     java.lang.String[] descriptorData = {
       "\n\030SceneInitFinishRsp.proto\"@\n\022SceneInitF" +
-      "inishRsp\022\017\n\007retcode\030\001 \001(\005\022\031\n\021enter_scene" +
-      "_token\030\004 \001(\rB\033\n\031emu.grasscutter.net.prot" +
+      "inishRsp\022\017\n\007retcode\030\016 \001(\005\022\031\n\021enter_scene" +
+      "_token\030\002 \001(\rB\033\n\031emu.grasscutter.net.prot" +
       "ob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SceneTeamAvatarOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneTeamAvatarOuterClass.java
index 4a8cd4472d1..0b93fef3b47 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneTeamAvatarOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneTeamAvatarOuterClass.java
@@ -19,172 +19,300 @@ public interface SceneTeamAvatarOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.SceneEntityInfo scene_entity_info = 2;</code>
-     * @return Whether the sceneEntityInfo field is set.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.SceneAvatarInfo scene_avatar_info = 12;</code>
+     * @return Whether the sceneAvatarInfo field is set.
      */
-    boolean hasSceneEntityInfo();
+    boolean hasSceneAvatarInfo();
     /**
-     * <code>.SceneEntityInfo scene_entity_info = 2;</code>
-     * @return The sceneEntityInfo.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.SceneAvatarInfo scene_avatar_info = 12;</code>
+     * @return The sceneAvatarInfo.
      */
-    emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo getSceneEntityInfo();
+    emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo getSceneAvatarInfo();
     /**
-     * <code>.SceneEntityInfo scene_entity_info = 2;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.SceneAvatarInfo scene_avatar_info = 12;</code>
      */
-    emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder getSceneEntityInfoOrBuilder();
+    emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfoOrBuilder getSceneAvatarInfoOrBuilder();
 
     /**
-     * <code>uint32 entity_id = 4;</code>
-     * @return The entityId.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.AbilitySyncStateInfo weapon_ability_info = 6;</code>
+     * @return Whether the weaponAbilityInfo field is set.
      */
-    int getEntityId();
-
+    boolean hasWeaponAbilityInfo();
     /**
-     * <code>uint32 scene_id = 9;</code>
-     * @return The sceneId.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.AbilitySyncStateInfo weapon_ability_info = 6;</code>
+     * @return The weaponAbilityInfo.
      */
-    int getSceneId();
+    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getWeaponAbilityInfo();
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.AbilitySyncStateInfo weapon_ability_info = 6;</code>
+     */
+    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getWeaponAbilityInfoOrBuilder();
 
     /**
-     * <code>repeated .ServerBuff server_buff_list = 110;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 4;</code>
      */
     java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> 
         getServerBuffListList();
     /**
-     * <code>repeated .ServerBuff server_buff_list = 110;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 4;</code>
      */
     emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff getServerBuffList(int index);
     /**
-     * <code>repeated .ServerBuff server_buff_list = 110;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 4;</code>
      */
     int getServerBuffListCount();
     /**
-     * <code>repeated .ServerBuff server_buff_list = 110;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 4;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> 
         getServerBuffListOrBuilderList();
     /**
-     * <code>repeated .ServerBuff server_buff_list = 110;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 4;</code>
      */
     emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getServerBuffListOrBuilder(
         int index);
 
     /**
-     * <code>uint32 weapon_entity_id = 10;</code>
-     * @return The weaponEntityId.
-     */
-    int getWeaponEntityId();
-
-    /**
-     * <code>uint32 player_uid = 12;</code>
-     * @return The playerUid.
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>.AbilityControlBlock ability_control_block = 5;</code>
+     * @return Whether the abilityControlBlock field is set.
      */
-    int getPlayerUid();
-
+    boolean hasAbilityControlBlock();
     /**
-     * <code>uint64 avatar_guid = 5;</code>
-     * @return The avatarGuid.
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>.AbilityControlBlock ability_control_block = 5;</code>
+     * @return The abilityControlBlock.
      */
-    long getAvatarGuid();
-
+    emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock getAbilityControlBlock();
     /**
-     * <code>uint64 weapon_guid = 6;</code>
-     * @return The weaponGuid.
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>.AbilityControlBlock ability_control_block = 5;</code>
      */
-    long getWeaponGuid();
+    emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder();
 
     /**
-     * <code>.AbilityControlBlock ability_control_block = 11;</code>
-     * @return Whether the abilityControlBlock field is set.
+     * <pre>
+     * Offset: 0x40
+     * </pre>
+     *
+     * <code>.AbilitySyncStateInfo avatar_ability_info = 1;</code>
+     * @return Whether the avatarAbilityInfo field is set.
      */
-    boolean hasAbilityControlBlock();
+    boolean hasAvatarAbilityInfo();
     /**
-     * <code>.AbilityControlBlock ability_control_block = 11;</code>
-     * @return The abilityControlBlock.
+     * <pre>
+     * Offset: 0x40
+     * </pre>
+     *
+     * <code>.AbilitySyncStateInfo avatar_ability_info = 1;</code>
+     * @return The avatarAbilityInfo.
      */
-    emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock getAbilityControlBlock();
+    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getAvatarAbilityInfo();
     /**
-     * <code>.AbilityControlBlock ability_control_block = 11;</code>
+     * <pre>
+     * Offset: 0x40
+     * </pre>
+     *
+     * <code>.AbilitySyncStateInfo avatar_ability_info = 1;</code>
      */
-    emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder();
+    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getAvatarAbilityInfoOrBuilder();
 
     /**
-     * <code>.SceneAvatarInfo scene_avatar_info = 8;</code>
-     * @return Whether the sceneAvatarInfo field is set.
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>.SceneEntityInfo scene_entity_info = 9;</code>
+     * @return Whether the sceneEntityInfo field is set.
      */
-    boolean hasSceneAvatarInfo();
+    boolean hasSceneEntityInfo();
     /**
-     * <code>.SceneAvatarInfo scene_avatar_info = 8;</code>
-     * @return The sceneAvatarInfo.
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>.SceneEntityInfo scene_entity_info = 9;</code>
+     * @return The sceneEntityInfo.
      */
-    emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo getSceneAvatarInfo();
+    emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo getSceneEntityInfo();
     /**
-     * <code>.SceneAvatarInfo scene_avatar_info = 8;</code>
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>.SceneEntityInfo scene_entity_info = 9;</code>
      */
-    emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfoOrBuilder getSceneAvatarInfoOrBuilder();
+    emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder getSceneEntityInfoOrBuilder();
 
     /**
-     * <code>.AvatarInfo avatar_info = 14;</code>
+     * <pre>
+     * Offset: 0x50
+     * </pre>
+     *
+     * <code>.AvatarInfo avatar_info = 2;</code>
      * @return Whether the avatarInfo field is set.
      */
     boolean hasAvatarInfo();
     /**
-     * <code>.AvatarInfo avatar_info = 14;</code>
+     * <pre>
+     * Offset: 0x50
+     * </pre>
+     *
+     * <code>.AvatarInfo avatar_info = 2;</code>
      * @return The avatarInfo.
      */
     emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo getAvatarInfo();
     /**
-     * <code>.AvatarInfo avatar_info = 14;</code>
+     * <pre>
+     * Offset: 0x50
+     * </pre>
+     *
+     * <code>.AvatarInfo avatar_info = 2;</code>
      */
     emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAvatarInfoOrBuilder();
 
     /**
-     * <code>.AbilitySyncStateInfo avatar_ability_info = 7;</code>
-     * @return Whether the avatarAbilityInfo field is set.
-     */
-    boolean hasAvatarAbilityInfo();
-    /**
-     * <code>.AbilitySyncStateInfo avatar_ability_info = 7;</code>
-     * @return The avatarAbilityInfo.
-     */
-    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getAvatarAbilityInfo();
-    /**
-     * <code>.AbilitySyncStateInfo avatar_ability_info = 7;</code>
+     * <pre>
+     * Offset: 0x58
+     * </pre>
+     *
+     * <code>uint32 weapon_entity_id = 3;</code>
+     * @return The weaponEntityId.
      */
-    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getAvatarAbilityInfoOrBuilder();
+    int getWeaponEntityId();
 
     /**
-     * <code>.AbilitySyncStateInfo weapon_ability_info = 15;</code>
-     * @return Whether the weaponAbilityInfo field is set.
-     */
-    boolean hasWeaponAbilityInfo();
-    /**
-     * <code>.AbilitySyncStateInfo weapon_ability_info = 15;</code>
-     * @return The weaponAbilityInfo.
+     * <pre>
+     * Offset: 0x60
+     * </pre>
+     *
+     * <code>uint64 avatar_guid = 7;</code>
+     * @return The avatarGuid.
      */
-    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getWeaponAbilityInfo();
+    long getAvatarGuid();
+
     /**
-     * <code>.AbilitySyncStateInfo weapon_ability_info = 15;</code>
+     * <pre>
+     * Offset: 0x68
+     * </pre>
+     *
+     * <code>uint32 player_uid = 10;</code>
+     * @return The playerUid.
      */
-    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getWeaponAbilityInfoOrBuilder();
+    int getPlayerUid();
 
     /**
-     * <code>bool is_reconnect = 500;</code>
+     * <pre>
+     * Offset: 0x6C
+     * </pre>
+     *
+     * <code>bool is_reconnect = 11;</code>
      * @return The isReconnect.
      */
     boolean getIsReconnect();
 
     /**
-     * <code>bool is_player_cur_avatar = 13;</code>
+     * <pre>
+     * Offset: 0x6D
+     * </pre>
+     *
+     * <code>bool is_player_cur_avatar = 15;</code>
      * @return The isPlayerCurAvatar.
      */
     boolean getIsPlayerCurAvatar();
 
     /**
-     * <code>bool is_on_scene = 3;</code>
+     * <pre>
+     * Offset: 0x6E
+     * </pre>
+     *
+     * <code>bool is_on_scene = 36;</code>
      * @return The isOnScene.
      */
     boolean getIsOnScene();
+
+    /**
+     * <pre>
+     * Offset: 0x70
+     * </pre>
+     *
+     * <code>uint64 weapon_guid = 13;</code>
+     * @return The weaponGuid.
+     */
+    long getWeaponGuid();
+
+    /**
+     * <pre>
+     * Offset: 0x78
+     * </pre>
+     *
+     * <code>uint32 scene_id = 8;</code>
+     * @return The sceneId.
+     */
+    int getSceneId();
+
+    /**
+     * <pre>
+     * Offset: 0x7C
+     * </pre>
+     *
+     * <code>uint32 entity_id = 14;</code>
+     * @return The entityId.
+     */
+    int getEntityId();
   }
   /**
    * Protobuf type {@code SceneTeamAvatar}
@@ -233,136 +361,136 @@ private SceneTeamAvatar(
             case 0:
               done = true;
               break;
-            case 18: {
-              emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder subBuilder = null;
-              if (sceneEntityInfo_ != null) {
-                subBuilder = sceneEntityInfo_.toBuilder();
+            case 10: {
+              emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder subBuilder = null;
+              if (avatarAbilityInfo_ != null) {
+                subBuilder = avatarAbilityInfo_.toBuilder();
               }
-              sceneEntityInfo_ = input.readMessage(emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.parser(), extensionRegistry);
+              avatarAbilityInfo_ = input.readMessage(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom(sceneEntityInfo_);
-                sceneEntityInfo_ = subBuilder.buildPartial();
+                subBuilder.mergeFrom(avatarAbilityInfo_);
+                avatarAbilityInfo_ = subBuilder.buildPartial();
               }
 
               break;
             }
-            case 24: {
-
-              isOnScene_ = input.readBool();
-              break;
-            }
-            case 32: {
+            case 18: {
+              emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder subBuilder = null;
+              if (avatarInfo_ != null) {
+                subBuilder = avatarInfo_.toBuilder();
+              }
+              avatarInfo_ = input.readMessage(emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(avatarInfo_);
+                avatarInfo_ = subBuilder.buildPartial();
+              }
 
-              entityId_ = input.readUInt32();
               break;
             }
-            case 40: {
+            case 24: {
 
-              avatarGuid_ = input.readUInt64();
+              weaponEntityId_ = input.readUInt32();
               break;
             }
-            case 48: {
-
-              weaponGuid_ = input.readUInt64();
+            case 34: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                serverBuffList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff>();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              serverBuffList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.parser(), extensionRegistry));
               break;
             }
-            case 58: {
-              emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder subBuilder = null;
-              if (avatarAbilityInfo_ != null) {
-                subBuilder = avatarAbilityInfo_.toBuilder();
+            case 42: {
+              emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder subBuilder = null;
+              if (abilityControlBlock_ != null) {
+                subBuilder = abilityControlBlock_.toBuilder();
               }
-              avatarAbilityInfo_ = input.readMessage(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.parser(), extensionRegistry);
+              abilityControlBlock_ = input.readMessage(emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom(avatarAbilityInfo_);
-                avatarAbilityInfo_ = subBuilder.buildPartial();
+                subBuilder.mergeFrom(abilityControlBlock_);
+                abilityControlBlock_ = subBuilder.buildPartial();
               }
 
               break;
             }
-            case 66: {
-              emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.Builder subBuilder = null;
-              if (sceneAvatarInfo_ != null) {
-                subBuilder = sceneAvatarInfo_.toBuilder();
+            case 50: {
+              emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder subBuilder = null;
+              if (weaponAbilityInfo_ != null) {
+                subBuilder = weaponAbilityInfo_.toBuilder();
               }
-              sceneAvatarInfo_ = input.readMessage(emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.parser(), extensionRegistry);
+              weaponAbilityInfo_ = input.readMessage(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom(sceneAvatarInfo_);
-                sceneAvatarInfo_ = subBuilder.buildPartial();
+                subBuilder.mergeFrom(weaponAbilityInfo_);
+                weaponAbilityInfo_ = subBuilder.buildPartial();
               }
 
               break;
             }
-            case 72: {
+            case 56: {
 
-              sceneId_ = input.readUInt32();
+              avatarGuid_ = input.readUInt64();
               break;
             }
-            case 80: {
+            case 64: {
 
-              weaponEntityId_ = input.readUInt32();
+              sceneId_ = input.readUInt32();
               break;
             }
-            case 90: {
-              emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder subBuilder = null;
-              if (abilityControlBlock_ != null) {
-                subBuilder = abilityControlBlock_.toBuilder();
+            case 74: {
+              emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder subBuilder = null;
+              if (sceneEntityInfo_ != null) {
+                subBuilder = sceneEntityInfo_.toBuilder();
               }
-              abilityControlBlock_ = input.readMessage(emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.parser(), extensionRegistry);
+              sceneEntityInfo_ = input.readMessage(emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom(abilityControlBlock_);
-                abilityControlBlock_ = subBuilder.buildPartial();
+                subBuilder.mergeFrom(sceneEntityInfo_);
+                sceneEntityInfo_ = subBuilder.buildPartial();
               }
 
               break;
             }
-            case 96: {
+            case 80: {
 
               playerUid_ = input.readUInt32();
               break;
             }
-            case 104: {
+            case 88: {
 
-              isPlayerCurAvatar_ = input.readBool();
+              isReconnect_ = input.readBool();
               break;
             }
-            case 114: {
-              emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder subBuilder = null;
-              if (avatarInfo_ != null) {
-                subBuilder = avatarInfo_.toBuilder();
+            case 98: {
+              emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.Builder subBuilder = null;
+              if (sceneAvatarInfo_ != null) {
+                subBuilder = sceneAvatarInfo_.toBuilder();
               }
-              avatarInfo_ = input.readMessage(emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.parser(), extensionRegistry);
+              sceneAvatarInfo_ = input.readMessage(emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom(avatarInfo_);
-                avatarInfo_ = subBuilder.buildPartial();
+                subBuilder.mergeFrom(sceneAvatarInfo_);
+                sceneAvatarInfo_ = subBuilder.buildPartial();
               }
 
               break;
             }
-            case 122: {
-              emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder subBuilder = null;
-              if (weaponAbilityInfo_ != null) {
-                subBuilder = weaponAbilityInfo_.toBuilder();
-              }
-              weaponAbilityInfo_ = input.readMessage(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(weaponAbilityInfo_);
-                weaponAbilityInfo_ = subBuilder.buildPartial();
-              }
+            case 104: {
 
+              weaponGuid_ = input.readUInt64();
               break;
             }
-            case 882: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                serverBuffList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff>();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              serverBuffList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.parser(), extensionRegistry));
+            case 112: {
+
+              entityId_ = input.readUInt32();
               break;
             }
-            case 4000: {
+            case 120: {
 
-              isReconnect_ = input.readBool();
+              isPlayerCurAvatar_ = input.readBool();
+              break;
+            }
+            case 288: {
+
+              isOnScene_ = input.readBool();
               break;
             }
             default: {
@@ -400,65 +528,101 @@ private SceneTeamAvatar(
               emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar.class, emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar.Builder.class);
     }
 
-    public static final int SCENE_ENTITY_INFO_FIELD_NUMBER = 2;
-    private emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo sceneEntityInfo_;
+    public static final int SCENE_AVATAR_INFO_FIELD_NUMBER = 12;
+    private emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo sceneAvatarInfo_;
     /**
-     * <code>.SceneEntityInfo scene_entity_info = 2;</code>
-     * @return Whether the sceneEntityInfo field is set.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.SceneAvatarInfo scene_avatar_info = 12;</code>
+     * @return Whether the sceneAvatarInfo field is set.
      */
     @java.lang.Override
-    public boolean hasSceneEntityInfo() {
-      return sceneEntityInfo_ != null;
+    public boolean hasSceneAvatarInfo() {
+      return sceneAvatarInfo_ != null;
     }
     /**
-     * <code>.SceneEntityInfo scene_entity_info = 2;</code>
-     * @return The sceneEntityInfo.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.SceneAvatarInfo scene_avatar_info = 12;</code>
+     * @return The sceneAvatarInfo.
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo getSceneEntityInfo() {
-      return sceneEntityInfo_ == null ? emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.getDefaultInstance() : sceneEntityInfo_;
+    public emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo getSceneAvatarInfo() {
+      return sceneAvatarInfo_ == null ? emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.getDefaultInstance() : sceneAvatarInfo_;
     }
     /**
-     * <code>.SceneEntityInfo scene_entity_info = 2;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.SceneAvatarInfo scene_avatar_info = 12;</code>
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder getSceneEntityInfoOrBuilder() {
-      return getSceneEntityInfo();
+    public emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfoOrBuilder getSceneAvatarInfoOrBuilder() {
+      return getSceneAvatarInfo();
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 4;
-    private int entityId_;
+    public static final int WEAPON_ABILITY_INFO_FIELD_NUMBER = 6;
+    private emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo weaponAbilityInfo_;
     /**
-     * <code>uint32 entity_id = 4;</code>
-     * @return The entityId.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.AbilitySyncStateInfo weapon_ability_info = 6;</code>
+     * @return Whether the weaponAbilityInfo field is set.
      */
     @java.lang.Override
-    public int getEntityId() {
-      return entityId_;
+    public boolean hasWeaponAbilityInfo() {
+      return weaponAbilityInfo_ != null;
     }
-
-    public static final int SCENE_ID_FIELD_NUMBER = 9;
-    private int sceneId_;
     /**
-     * <code>uint32 scene_id = 9;</code>
-     * @return The sceneId.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.AbilitySyncStateInfo weapon_ability_info = 6;</code>
+     * @return The weaponAbilityInfo.
      */
     @java.lang.Override
-    public int getSceneId() {
-      return sceneId_;
+    public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getWeaponAbilityInfo() {
+      return weaponAbilityInfo_ == null ? emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : weaponAbilityInfo_;
     }
-
-    public static final int SERVER_BUFF_LIST_FIELD_NUMBER = 110;
-    private java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> serverBuffList_;
     /**
-     * <code>repeated .ServerBuff server_buff_list = 110;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.AbilitySyncStateInfo weapon_ability_info = 6;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getWeaponAbilityInfoOrBuilder() {
+      return getWeaponAbilityInfo();
+    }
+
+    public static final int SERVER_BUFF_LIST_FIELD_NUMBER = 4;
+    private java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> serverBuffList_;
+    /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 4;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> getServerBuffListList() {
       return serverBuffList_;
     }
     /**
-     * <code>repeated .ServerBuff server_buff_list = 110;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 4;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> 
@@ -466,21 +630,33 @@ public java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff>
       return serverBuffList_;
     }
     /**
-     * <code>repeated .ServerBuff server_buff_list = 110;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 4;</code>
      */
     @java.lang.Override
     public int getServerBuffListCount() {
       return serverBuffList_.size();
     }
     /**
-     * <code>repeated .ServerBuff server_buff_list = 110;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 4;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff getServerBuffList(int index) {
       return serverBuffList_.get(index);
     }
     /**
-     * <code>repeated .ServerBuff server_buff_list = 110;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>repeated .ServerBuff server_buff_list = 4;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getServerBuffListOrBuilder(
@@ -488,106 +664,128 @@ public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getSer
       return serverBuffList_.get(index);
     }
 
-    public static final int WEAPON_ENTITY_ID_FIELD_NUMBER = 10;
-    private int weaponEntityId_;
-    /**
-     * <code>uint32 weapon_entity_id = 10;</code>
-     * @return The weaponEntityId.
-     */
-    @java.lang.Override
-    public int getWeaponEntityId() {
-      return weaponEntityId_;
-    }
-
-    public static final int PLAYER_UID_FIELD_NUMBER = 12;
-    private int playerUid_;
+    public static final int ABILITY_CONTROL_BLOCK_FIELD_NUMBER = 5;
+    private emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock abilityControlBlock_;
     /**
-     * <code>uint32 player_uid = 12;</code>
-     * @return The playerUid.
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>.AbilityControlBlock ability_control_block = 5;</code>
+     * @return Whether the abilityControlBlock field is set.
      */
     @java.lang.Override
-    public int getPlayerUid() {
-      return playerUid_;
+    public boolean hasAbilityControlBlock() {
+      return abilityControlBlock_ != null;
     }
-
-    public static final int AVATAR_GUID_FIELD_NUMBER = 5;
-    private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 5;</code>
-     * @return The avatarGuid.
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>.AbilityControlBlock ability_control_block = 5;</code>
+     * @return The abilityControlBlock.
      */
     @java.lang.Override
-    public long getAvatarGuid() {
-      return avatarGuid_;
+    public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock getAbilityControlBlock() {
+      return abilityControlBlock_ == null ? emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.getDefaultInstance() : abilityControlBlock_;
     }
-
-    public static final int WEAPON_GUID_FIELD_NUMBER = 6;
-    private long weaponGuid_;
     /**
-     * <code>uint64 weapon_guid = 6;</code>
-     * @return The weaponGuid.
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>.AbilityControlBlock ability_control_block = 5;</code>
      */
     @java.lang.Override
-    public long getWeaponGuid() {
-      return weaponGuid_;
+    public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder() {
+      return getAbilityControlBlock();
     }
 
-    public static final int ABILITY_CONTROL_BLOCK_FIELD_NUMBER = 11;
-    private emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock abilityControlBlock_;
+    public static final int AVATAR_ABILITY_INFO_FIELD_NUMBER = 1;
+    private emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo avatarAbilityInfo_;
     /**
-     * <code>.AbilityControlBlock ability_control_block = 11;</code>
-     * @return Whether the abilityControlBlock field is set.
+     * <pre>
+     * Offset: 0x40
+     * </pre>
+     *
+     * <code>.AbilitySyncStateInfo avatar_ability_info = 1;</code>
+     * @return Whether the avatarAbilityInfo field is set.
      */
     @java.lang.Override
-    public boolean hasAbilityControlBlock() {
-      return abilityControlBlock_ != null;
+    public boolean hasAvatarAbilityInfo() {
+      return avatarAbilityInfo_ != null;
     }
     /**
-     * <code>.AbilityControlBlock ability_control_block = 11;</code>
-     * @return The abilityControlBlock.
+     * <pre>
+     * Offset: 0x40
+     * </pre>
+     *
+     * <code>.AbilitySyncStateInfo avatar_ability_info = 1;</code>
+     * @return The avatarAbilityInfo.
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock getAbilityControlBlock() {
-      return abilityControlBlock_ == null ? emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.getDefaultInstance() : abilityControlBlock_;
+    public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getAvatarAbilityInfo() {
+      return avatarAbilityInfo_ == null ? emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : avatarAbilityInfo_;
     }
     /**
-     * <code>.AbilityControlBlock ability_control_block = 11;</code>
+     * <pre>
+     * Offset: 0x40
+     * </pre>
+     *
+     * <code>.AbilitySyncStateInfo avatar_ability_info = 1;</code>
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder() {
-      return getAbilityControlBlock();
+    public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getAvatarAbilityInfoOrBuilder() {
+      return getAvatarAbilityInfo();
     }
 
-    public static final int SCENE_AVATAR_INFO_FIELD_NUMBER = 8;
-    private emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo sceneAvatarInfo_;
+    public static final int SCENE_ENTITY_INFO_FIELD_NUMBER = 9;
+    private emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo sceneEntityInfo_;
     /**
-     * <code>.SceneAvatarInfo scene_avatar_info = 8;</code>
-     * @return Whether the sceneAvatarInfo field is set.
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>.SceneEntityInfo scene_entity_info = 9;</code>
+     * @return Whether the sceneEntityInfo field is set.
      */
     @java.lang.Override
-    public boolean hasSceneAvatarInfo() {
-      return sceneAvatarInfo_ != null;
+    public boolean hasSceneEntityInfo() {
+      return sceneEntityInfo_ != null;
     }
     /**
-     * <code>.SceneAvatarInfo scene_avatar_info = 8;</code>
-     * @return The sceneAvatarInfo.
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>.SceneEntityInfo scene_entity_info = 9;</code>
+     * @return The sceneEntityInfo.
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo getSceneAvatarInfo() {
-      return sceneAvatarInfo_ == null ? emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.getDefaultInstance() : sceneAvatarInfo_;
+    public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo getSceneEntityInfo() {
+      return sceneEntityInfo_ == null ? emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.getDefaultInstance() : sceneEntityInfo_;
     }
     /**
-     * <code>.SceneAvatarInfo scene_avatar_info = 8;</code>
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>.SceneEntityInfo scene_entity_info = 9;</code>
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfoOrBuilder getSceneAvatarInfoOrBuilder() {
-      return getSceneAvatarInfo();
+    public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder getSceneEntityInfoOrBuilder() {
+      return getSceneEntityInfo();
     }
 
-    public static final int AVATAR_INFO_FIELD_NUMBER = 14;
+    public static final int AVATAR_INFO_FIELD_NUMBER = 2;
     private emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo avatarInfo_;
     /**
-     * <code>.AvatarInfo avatar_info = 14;</code>
+     * <pre>
+     * Offset: 0x50
+     * </pre>
+     *
+     * <code>.AvatarInfo avatar_info = 2;</code>
      * @return Whether the avatarInfo field is set.
      */
     @java.lang.Override
@@ -595,7 +793,11 @@ public boolean hasAvatarInfo() {
       return avatarInfo_ != null;
     }
     /**
-     * <code>.AvatarInfo avatar_info = 14;</code>
+     * <pre>
+     * Offset: 0x50
+     * </pre>
+     *
+     * <code>.AvatarInfo avatar_info = 2;</code>
      * @return The avatarInfo.
      */
     @java.lang.Override
@@ -603,69 +805,70 @@ public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo getAvatarInfo()
       return avatarInfo_ == null ? emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.getDefaultInstance() : avatarInfo_;
     }
     /**
-     * <code>.AvatarInfo avatar_info = 14;</code>
+     * <pre>
+     * Offset: 0x50
+     * </pre>
+     *
+     * <code>.AvatarInfo avatar_info = 2;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAvatarInfoOrBuilder() {
       return getAvatarInfo();
     }
 
-    public static final int AVATAR_ABILITY_INFO_FIELD_NUMBER = 7;
-    private emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo avatarAbilityInfo_;
-    /**
-     * <code>.AbilitySyncStateInfo avatar_ability_info = 7;</code>
-     * @return Whether the avatarAbilityInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasAvatarAbilityInfo() {
-      return avatarAbilityInfo_ != null;
-    }
-    /**
-     * <code>.AbilitySyncStateInfo avatar_ability_info = 7;</code>
-     * @return The avatarAbilityInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getAvatarAbilityInfo() {
-      return avatarAbilityInfo_ == null ? emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : avatarAbilityInfo_;
-    }
+    public static final int WEAPON_ENTITY_ID_FIELD_NUMBER = 3;
+    private int weaponEntityId_;
     /**
-     * <code>.AbilitySyncStateInfo avatar_ability_info = 7;</code>
+     * <pre>
+     * Offset: 0x58
+     * </pre>
+     *
+     * <code>uint32 weapon_entity_id = 3;</code>
+     * @return The weaponEntityId.
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getAvatarAbilityInfoOrBuilder() {
-      return getAvatarAbilityInfo();
+    public int getWeaponEntityId() {
+      return weaponEntityId_;
     }
 
-    public static final int WEAPON_ABILITY_INFO_FIELD_NUMBER = 15;
-    private emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo weaponAbilityInfo_;
-    /**
-     * <code>.AbilitySyncStateInfo weapon_ability_info = 15;</code>
-     * @return Whether the weaponAbilityInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasWeaponAbilityInfo() {
-      return weaponAbilityInfo_ != null;
-    }
+    public static final int AVATAR_GUID_FIELD_NUMBER = 7;
+    private long avatarGuid_;
     /**
-     * <code>.AbilitySyncStateInfo weapon_ability_info = 15;</code>
-     * @return The weaponAbilityInfo.
+     * <pre>
+     * Offset: 0x60
+     * </pre>
+     *
+     * <code>uint64 avatar_guid = 7;</code>
+     * @return The avatarGuid.
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getWeaponAbilityInfo() {
-      return weaponAbilityInfo_ == null ? emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : weaponAbilityInfo_;
+    public long getAvatarGuid() {
+      return avatarGuid_;
     }
+
+    public static final int PLAYER_UID_FIELD_NUMBER = 10;
+    private int playerUid_;
     /**
-     * <code>.AbilitySyncStateInfo weapon_ability_info = 15;</code>
+     * <pre>
+     * Offset: 0x68
+     * </pre>
+     *
+     * <code>uint32 player_uid = 10;</code>
+     * @return The playerUid.
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getWeaponAbilityInfoOrBuilder() {
-      return getWeaponAbilityInfo();
+    public int getPlayerUid() {
+      return playerUid_;
     }
 
-    public static final int IS_RECONNECT_FIELD_NUMBER = 500;
+    public static final int IS_RECONNECT_FIELD_NUMBER = 11;
     private boolean isReconnect_;
     /**
-     * <code>bool is_reconnect = 500;</code>
+     * <pre>
+     * Offset: 0x6C
+     * </pre>
+     *
+     * <code>bool is_reconnect = 11;</code>
      * @return The isReconnect.
      */
     @java.lang.Override
@@ -673,10 +876,14 @@ public boolean getIsReconnect() {
       return isReconnect_;
     }
 
-    public static final int IS_PLAYER_CUR_AVATAR_FIELD_NUMBER = 13;
+    public static final int IS_PLAYER_CUR_AVATAR_FIELD_NUMBER = 15;
     private boolean isPlayerCurAvatar_;
     /**
-     * <code>bool is_player_cur_avatar = 13;</code>
+     * <pre>
+     * Offset: 0x6D
+     * </pre>
+     *
+     * <code>bool is_player_cur_avatar = 15;</code>
      * @return The isPlayerCurAvatar.
      */
     @java.lang.Override
@@ -684,10 +891,14 @@ public boolean getIsPlayerCurAvatar() {
       return isPlayerCurAvatar_;
     }
 
-    public static final int IS_ON_SCENE_FIELD_NUMBER = 3;
+    public static final int IS_ON_SCENE_FIELD_NUMBER = 36;
     private boolean isOnScene_;
     /**
-     * <code>bool is_on_scene = 3;</code>
+     * <pre>
+     * Offset: 0x6E
+     * </pre>
+     *
+     * <code>bool is_on_scene = 36;</code>
      * @return The isOnScene.
      */
     @java.lang.Override
@@ -695,6 +906,51 @@ public boolean getIsOnScene() {
       return isOnScene_;
     }
 
+    public static final int WEAPON_GUID_FIELD_NUMBER = 13;
+    private long weaponGuid_;
+    /**
+     * <pre>
+     * Offset: 0x70
+     * </pre>
+     *
+     * <code>uint64 weapon_guid = 13;</code>
+     * @return The weaponGuid.
+     */
+    @java.lang.Override
+    public long getWeaponGuid() {
+      return weaponGuid_;
+    }
+
+    public static final int SCENE_ID_FIELD_NUMBER = 8;
+    private int sceneId_;
+    /**
+     * <pre>
+     * Offset: 0x78
+     * </pre>
+     *
+     * <code>uint32 scene_id = 8;</code>
+     * @return The sceneId.
+     */
+    @java.lang.Override
+    public int getSceneId() {
+      return sceneId_;
+    }
+
+    public static final int ENTITY_ID_FIELD_NUMBER = 14;
+    private int entityId_;
+    /**
+     * <pre>
+     * Offset: 0x7C
+     * </pre>
+     *
+     * <code>uint32 entity_id = 14;</code>
+     * @return The entityId.
+     */
+    @java.lang.Override
+    public int getEntityId() {
+      return entityId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -709,53 +965,53 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (sceneEntityInfo_ != null) {
-        output.writeMessage(2, getSceneEntityInfo());
+      if (avatarAbilityInfo_ != null) {
+        output.writeMessage(1, getAvatarAbilityInfo());
       }
-      if (isOnScene_ != false) {
-        output.writeBool(3, isOnScene_);
+      if (avatarInfo_ != null) {
+        output.writeMessage(2, getAvatarInfo());
       }
-      if (entityId_ != 0) {
-        output.writeUInt32(4, entityId_);
+      if (weaponEntityId_ != 0) {
+        output.writeUInt32(3, weaponEntityId_);
       }
-      if (avatarGuid_ != 0L) {
-        output.writeUInt64(5, avatarGuid_);
+      for (int i = 0; i < serverBuffList_.size(); i++) {
+        output.writeMessage(4, serverBuffList_.get(i));
       }
-      if (weaponGuid_ != 0L) {
-        output.writeUInt64(6, weaponGuid_);
+      if (abilityControlBlock_ != null) {
+        output.writeMessage(5, getAbilityControlBlock());
       }
-      if (avatarAbilityInfo_ != null) {
-        output.writeMessage(7, getAvatarAbilityInfo());
+      if (weaponAbilityInfo_ != null) {
+        output.writeMessage(6, getWeaponAbilityInfo());
       }
-      if (sceneAvatarInfo_ != null) {
-        output.writeMessage(8, getSceneAvatarInfo());
+      if (avatarGuid_ != 0L) {
+        output.writeUInt64(7, avatarGuid_);
       }
       if (sceneId_ != 0) {
-        output.writeUInt32(9, sceneId_);
+        output.writeUInt32(8, sceneId_);
       }
-      if (weaponEntityId_ != 0) {
-        output.writeUInt32(10, weaponEntityId_);
-      }
-      if (abilityControlBlock_ != null) {
-        output.writeMessage(11, getAbilityControlBlock());
+      if (sceneEntityInfo_ != null) {
+        output.writeMessage(9, getSceneEntityInfo());
       }
       if (playerUid_ != 0) {
-        output.writeUInt32(12, playerUid_);
+        output.writeUInt32(10, playerUid_);
       }
-      if (isPlayerCurAvatar_ != false) {
-        output.writeBool(13, isPlayerCurAvatar_);
+      if (isReconnect_ != false) {
+        output.writeBool(11, isReconnect_);
       }
-      if (avatarInfo_ != null) {
-        output.writeMessage(14, getAvatarInfo());
+      if (sceneAvatarInfo_ != null) {
+        output.writeMessage(12, getSceneAvatarInfo());
       }
-      if (weaponAbilityInfo_ != null) {
-        output.writeMessage(15, getWeaponAbilityInfo());
+      if (weaponGuid_ != 0L) {
+        output.writeUInt64(13, weaponGuid_);
       }
-      for (int i = 0; i < serverBuffList_.size(); i++) {
-        output.writeMessage(110, serverBuffList_.get(i));
+      if (entityId_ != 0) {
+        output.writeUInt32(14, entityId_);
       }
-      if (isReconnect_ != false) {
-        output.writeBool(500, isReconnect_);
+      if (isPlayerCurAvatar_ != false) {
+        output.writeBool(15, isPlayerCurAvatar_);
+      }
+      if (isOnScene_ != false) {
+        output.writeBool(36, isOnScene_);
       }
       unknownFields.writeTo(output);
     }
@@ -766,69 +1022,69 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (sceneEntityInfo_ != null) {
+      if (avatarAbilityInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, getSceneEntityInfo());
+          .computeMessageSize(1, getAvatarAbilityInfo());
       }
-      if (isOnScene_ != false) {
+      if (avatarInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(3, isOnScene_);
+          .computeMessageSize(2, getAvatarInfo());
       }
-      if (entityId_ != 0) {
+      if (weaponEntityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, entityId_);
+          .computeUInt32Size(3, weaponEntityId_);
       }
-      if (avatarGuid_ != 0L) {
+      for (int i = 0; i < serverBuffList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(5, avatarGuid_);
+          .computeMessageSize(4, serverBuffList_.get(i));
       }
-      if (weaponGuid_ != 0L) {
+      if (abilityControlBlock_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(6, weaponGuid_);
+          .computeMessageSize(5, getAbilityControlBlock());
       }
-      if (avatarAbilityInfo_ != null) {
+      if (weaponAbilityInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(7, getAvatarAbilityInfo());
+          .computeMessageSize(6, getWeaponAbilityInfo());
       }
-      if (sceneAvatarInfo_ != null) {
+      if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(8, getSceneAvatarInfo());
+          .computeUInt64Size(7, avatarGuid_);
       }
       if (sceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, sceneId_);
+          .computeUInt32Size(8, sceneId_);
       }
-      if (weaponEntityId_ != 0) {
+      if (sceneEntityInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, weaponEntityId_);
+          .computeMessageSize(9, getSceneEntityInfo());
       }
-      if (abilityControlBlock_ != null) {
+      if (playerUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(11, getAbilityControlBlock());
+          .computeUInt32Size(10, playerUid_);
       }
-      if (playerUid_ != 0) {
+      if (isReconnect_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, playerUid_);
+          .computeBoolSize(11, isReconnect_);
       }
-      if (isPlayerCurAvatar_ != false) {
+      if (sceneAvatarInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(13, isPlayerCurAvatar_);
+          .computeMessageSize(12, getSceneAvatarInfo());
       }
-      if (avatarInfo_ != null) {
+      if (weaponGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(14, getAvatarInfo());
+          .computeUInt64Size(13, weaponGuid_);
       }
-      if (weaponAbilityInfo_ != null) {
+      if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(15, getWeaponAbilityInfo());
+          .computeUInt32Size(14, entityId_);
       }
-      for (int i = 0; i < serverBuffList_.size(); i++) {
+      if (isPlayerCurAvatar_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(110, serverBuffList_.get(i));
+          .computeBoolSize(15, isPlayerCurAvatar_);
       }
-      if (isReconnect_ != false) {
+      if (isOnScene_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(500, isReconnect_);
+          .computeBoolSize(36, isOnScene_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -845,57 +1101,57 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar other = (emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar) obj;
 
-      if (hasSceneEntityInfo() != other.hasSceneEntityInfo()) return false;
-      if (hasSceneEntityInfo()) {
-        if (!getSceneEntityInfo()
-            .equals(other.getSceneEntityInfo())) return false;
+      if (hasSceneAvatarInfo() != other.hasSceneAvatarInfo()) return false;
+      if (hasSceneAvatarInfo()) {
+        if (!getSceneAvatarInfo()
+            .equals(other.getSceneAvatarInfo())) return false;
+      }
+      if (hasWeaponAbilityInfo() != other.hasWeaponAbilityInfo()) return false;
+      if (hasWeaponAbilityInfo()) {
+        if (!getWeaponAbilityInfo()
+            .equals(other.getWeaponAbilityInfo())) return false;
       }
-      if (getEntityId()
-          != other.getEntityId()) return false;
-      if (getSceneId()
-          != other.getSceneId()) return false;
       if (!getServerBuffListList()
           .equals(other.getServerBuffListList())) return false;
-      if (getWeaponEntityId()
-          != other.getWeaponEntityId()) return false;
-      if (getPlayerUid()
-          != other.getPlayerUid()) return false;
-      if (getAvatarGuid()
-          != other.getAvatarGuid()) return false;
-      if (getWeaponGuid()
-          != other.getWeaponGuid()) return false;
       if (hasAbilityControlBlock() != other.hasAbilityControlBlock()) return false;
       if (hasAbilityControlBlock()) {
         if (!getAbilityControlBlock()
             .equals(other.getAbilityControlBlock())) return false;
       }
-      if (hasSceneAvatarInfo() != other.hasSceneAvatarInfo()) return false;
-      if (hasSceneAvatarInfo()) {
-        if (!getSceneAvatarInfo()
-            .equals(other.getSceneAvatarInfo())) return false;
-      }
-      if (hasAvatarInfo() != other.hasAvatarInfo()) return false;
-      if (hasAvatarInfo()) {
-        if (!getAvatarInfo()
-            .equals(other.getAvatarInfo())) return false;
-      }
       if (hasAvatarAbilityInfo() != other.hasAvatarAbilityInfo()) return false;
       if (hasAvatarAbilityInfo()) {
         if (!getAvatarAbilityInfo()
             .equals(other.getAvatarAbilityInfo())) return false;
       }
-      if (hasWeaponAbilityInfo() != other.hasWeaponAbilityInfo()) return false;
-      if (hasWeaponAbilityInfo()) {
-        if (!getWeaponAbilityInfo()
-            .equals(other.getWeaponAbilityInfo())) return false;
+      if (hasSceneEntityInfo() != other.hasSceneEntityInfo()) return false;
+      if (hasSceneEntityInfo()) {
+        if (!getSceneEntityInfo()
+            .equals(other.getSceneEntityInfo())) return false;
       }
-      if (getIsReconnect()
-          != other.getIsReconnect()) return false;
-      if (getIsPlayerCurAvatar()
-          != other.getIsPlayerCurAvatar()) return false;
-      if (getIsOnScene()
-          != other.getIsOnScene()) return false;
-      if (!unknownFields.equals(other.unknownFields)) return false;
+      if (hasAvatarInfo() != other.hasAvatarInfo()) return false;
+      if (hasAvatarInfo()) {
+        if (!getAvatarInfo()
+            .equals(other.getAvatarInfo())) return false;
+      }
+      if (getWeaponEntityId()
+          != other.getWeaponEntityId()) return false;
+      if (getAvatarGuid()
+          != other.getAvatarGuid()) return false;
+      if (getPlayerUid()
+          != other.getPlayerUid()) return false;
+      if (getIsReconnect()
+          != other.getIsReconnect()) return false;
+      if (getIsPlayerCurAvatar()
+          != other.getIsPlayerCurAvatar()) return false;
+      if (getIsOnScene()
+          != other.getIsOnScene()) return false;
+      if (getWeaponGuid()
+          != other.getWeaponGuid()) return false;
+      if (getSceneId()
+          != other.getSceneId()) return false;
+      if (getEntityId()
+          != other.getEntityId()) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
 
@@ -906,48 +1162,41 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasSceneEntityInfo()) {
-        hash = (37 * hash) + SCENE_ENTITY_INFO_FIELD_NUMBER;
-        hash = (53 * hash) + getSceneEntityInfo().hashCode();
+      if (hasSceneAvatarInfo()) {
+        hash = (37 * hash) + SCENE_AVATAR_INFO_FIELD_NUMBER;
+        hash = (53 * hash) + getSceneAvatarInfo().hashCode();
+      }
+      if (hasWeaponAbilityInfo()) {
+        hash = (37 * hash) + WEAPON_ABILITY_INFO_FIELD_NUMBER;
+        hash = (53 * hash) + getWeaponAbilityInfo().hashCode();
       }
-      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getEntityId();
-      hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getSceneId();
       if (getServerBuffListCount() > 0) {
         hash = (37 * hash) + SERVER_BUFF_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getServerBuffListList().hashCode();
       }
-      hash = (37 * hash) + WEAPON_ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getWeaponEntityId();
-      hash = (37 * hash) + PLAYER_UID_FIELD_NUMBER;
-      hash = (53 * hash) + getPlayerUid();
-      hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getAvatarGuid());
-      hash = (37 * hash) + WEAPON_GUID_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getWeaponGuid());
       if (hasAbilityControlBlock()) {
         hash = (37 * hash) + ABILITY_CONTROL_BLOCK_FIELD_NUMBER;
         hash = (53 * hash) + getAbilityControlBlock().hashCode();
       }
-      if (hasSceneAvatarInfo()) {
-        hash = (37 * hash) + SCENE_AVATAR_INFO_FIELD_NUMBER;
-        hash = (53 * hash) + getSceneAvatarInfo().hashCode();
-      }
-      if (hasAvatarInfo()) {
-        hash = (37 * hash) + AVATAR_INFO_FIELD_NUMBER;
-        hash = (53 * hash) + getAvatarInfo().hashCode();
-      }
       if (hasAvatarAbilityInfo()) {
         hash = (37 * hash) + AVATAR_ABILITY_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getAvatarAbilityInfo().hashCode();
       }
-      if (hasWeaponAbilityInfo()) {
-        hash = (37 * hash) + WEAPON_ABILITY_INFO_FIELD_NUMBER;
-        hash = (53 * hash) + getWeaponAbilityInfo().hashCode();
+      if (hasSceneEntityInfo()) {
+        hash = (37 * hash) + SCENE_ENTITY_INFO_FIELD_NUMBER;
+        hash = (53 * hash) + getSceneEntityInfo().hashCode();
+      }
+      if (hasAvatarInfo()) {
+        hash = (37 * hash) + AVATAR_INFO_FIELD_NUMBER;
+        hash = (53 * hash) + getAvatarInfo().hashCode();
       }
+      hash = (37 * hash) + WEAPON_ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getWeaponEntityId();
+      hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getAvatarGuid());
+      hash = (37 * hash) + PLAYER_UID_FIELD_NUMBER;
+      hash = (53 * hash) + getPlayerUid();
       hash = (37 * hash) + IS_RECONNECT_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsReconnect());
@@ -957,6 +1206,13 @@ public int hashCode() {
       hash = (37 * hash) + IS_ON_SCENE_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsOnScene());
+      hash = (37 * hash) + WEAPON_GUID_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getWeaponGuid());
+      hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getSceneId();
+      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getEntityId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -1091,66 +1347,66 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (sceneEntityInfoBuilder_ == null) {
-          sceneEntityInfo_ = null;
+        if (sceneAvatarInfoBuilder_ == null) {
+          sceneAvatarInfo_ = null;
         } else {
-          sceneEntityInfo_ = null;
-          sceneEntityInfoBuilder_ = null;
+          sceneAvatarInfo_ = null;
+          sceneAvatarInfoBuilder_ = null;
+        }
+        if (weaponAbilityInfoBuilder_ == null) {
+          weaponAbilityInfo_ = null;
+        } else {
+          weaponAbilityInfo_ = null;
+          weaponAbilityInfoBuilder_ = null;
         }
-        entityId_ = 0;
-
-        sceneId_ = 0;
-
         if (serverBuffListBuilder_ == null) {
           serverBuffList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           serverBuffListBuilder_.clear();
         }
-        weaponEntityId_ = 0;
-
-        playerUid_ = 0;
-
-        avatarGuid_ = 0L;
-
-        weaponGuid_ = 0L;
-
         if (abilityControlBlockBuilder_ == null) {
           abilityControlBlock_ = null;
         } else {
           abilityControlBlock_ = null;
           abilityControlBlockBuilder_ = null;
         }
-        if (sceneAvatarInfoBuilder_ == null) {
-          sceneAvatarInfo_ = null;
-        } else {
-          sceneAvatarInfo_ = null;
-          sceneAvatarInfoBuilder_ = null;
-        }
-        if (avatarInfoBuilder_ == null) {
-          avatarInfo_ = null;
-        } else {
-          avatarInfo_ = null;
-          avatarInfoBuilder_ = null;
-        }
         if (avatarAbilityInfoBuilder_ == null) {
           avatarAbilityInfo_ = null;
         } else {
           avatarAbilityInfo_ = null;
           avatarAbilityInfoBuilder_ = null;
         }
-        if (weaponAbilityInfoBuilder_ == null) {
-          weaponAbilityInfo_ = null;
+        if (sceneEntityInfoBuilder_ == null) {
+          sceneEntityInfo_ = null;
         } else {
-          weaponAbilityInfo_ = null;
-          weaponAbilityInfoBuilder_ = null;
+          sceneEntityInfo_ = null;
+          sceneEntityInfoBuilder_ = null;
+        }
+        if (avatarInfoBuilder_ == null) {
+          avatarInfo_ = null;
+        } else {
+          avatarInfo_ = null;
+          avatarInfoBuilder_ = null;
         }
+        weaponEntityId_ = 0;
+
+        avatarGuid_ = 0L;
+
+        playerUid_ = 0;
+
         isReconnect_ = false;
 
         isPlayerCurAvatar_ = false;
 
         isOnScene_ = false;
 
+        weaponGuid_ = 0L;
+
+        sceneId_ = 0;
+
+        entityId_ = 0;
+
         return this;
       }
 
@@ -1178,13 +1434,16 @@ public emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar build
       public emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar buildPartial() {
         emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar result = new emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar(this);
         int from_bitField0_ = bitField0_;
-        if (sceneEntityInfoBuilder_ == null) {
-          result.sceneEntityInfo_ = sceneEntityInfo_;
+        if (sceneAvatarInfoBuilder_ == null) {
+          result.sceneAvatarInfo_ = sceneAvatarInfo_;
         } else {
-          result.sceneEntityInfo_ = sceneEntityInfoBuilder_.build();
+          result.sceneAvatarInfo_ = sceneAvatarInfoBuilder_.build();
+        }
+        if (weaponAbilityInfoBuilder_ == null) {
+          result.weaponAbilityInfo_ = weaponAbilityInfo_;
+        } else {
+          result.weaponAbilityInfo_ = weaponAbilityInfoBuilder_.build();
         }
-        result.entityId_ = entityId_;
-        result.sceneId_ = sceneId_;
         if (serverBuffListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             serverBuffList_ = java.util.Collections.unmodifiableList(serverBuffList_);
@@ -1194,38 +1453,35 @@ public emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar build
         } else {
           result.serverBuffList_ = serverBuffListBuilder_.build();
         }
-        result.weaponEntityId_ = weaponEntityId_;
-        result.playerUid_ = playerUid_;
-        result.avatarGuid_ = avatarGuid_;
-        result.weaponGuid_ = weaponGuid_;
         if (abilityControlBlockBuilder_ == null) {
           result.abilityControlBlock_ = abilityControlBlock_;
         } else {
           result.abilityControlBlock_ = abilityControlBlockBuilder_.build();
         }
-        if (sceneAvatarInfoBuilder_ == null) {
-          result.sceneAvatarInfo_ = sceneAvatarInfo_;
-        } else {
-          result.sceneAvatarInfo_ = sceneAvatarInfoBuilder_.build();
-        }
-        if (avatarInfoBuilder_ == null) {
-          result.avatarInfo_ = avatarInfo_;
-        } else {
-          result.avatarInfo_ = avatarInfoBuilder_.build();
-        }
         if (avatarAbilityInfoBuilder_ == null) {
           result.avatarAbilityInfo_ = avatarAbilityInfo_;
         } else {
           result.avatarAbilityInfo_ = avatarAbilityInfoBuilder_.build();
         }
-        if (weaponAbilityInfoBuilder_ == null) {
-          result.weaponAbilityInfo_ = weaponAbilityInfo_;
+        if (sceneEntityInfoBuilder_ == null) {
+          result.sceneEntityInfo_ = sceneEntityInfo_;
         } else {
-          result.weaponAbilityInfo_ = weaponAbilityInfoBuilder_.build();
+          result.sceneEntityInfo_ = sceneEntityInfoBuilder_.build();
+        }
+        if (avatarInfoBuilder_ == null) {
+          result.avatarInfo_ = avatarInfo_;
+        } else {
+          result.avatarInfo_ = avatarInfoBuilder_.build();
         }
+        result.weaponEntityId_ = weaponEntityId_;
+        result.avatarGuid_ = avatarGuid_;
+        result.playerUid_ = playerUid_;
         result.isReconnect_ = isReconnect_;
         result.isPlayerCurAvatar_ = isPlayerCurAvatar_;
         result.isOnScene_ = isOnScene_;
+        result.weaponGuid_ = weaponGuid_;
+        result.sceneId_ = sceneId_;
+        result.entityId_ = entityId_;
         onBuilt();
         return result;
       }
@@ -1274,14 +1530,11 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar other) {
         if (other == emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar.getDefaultInstance()) return this;
-        if (other.hasSceneEntityInfo()) {
-          mergeSceneEntityInfo(other.getSceneEntityInfo());
-        }
-        if (other.getEntityId() != 0) {
-          setEntityId(other.getEntityId());
+        if (other.hasSceneAvatarInfo()) {
+          mergeSceneAvatarInfo(other.getSceneAvatarInfo());
         }
-        if (other.getSceneId() != 0) {
-          setSceneId(other.getSceneId());
+        if (other.hasWeaponAbilityInfo()) {
+          mergeWeaponAbilityInfo(other.getWeaponAbilityInfo());
         }
         if (serverBuffListBuilder_ == null) {
           if (!other.serverBuffList_.isEmpty()) {
@@ -1309,32 +1562,26 @@ public Builder mergeFrom(emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.Sce
             }
           }
         }
-        if (other.getWeaponEntityId() != 0) {
-          setWeaponEntityId(other.getWeaponEntityId());
-        }
-        if (other.getPlayerUid() != 0) {
-          setPlayerUid(other.getPlayerUid());
-        }
-        if (other.getAvatarGuid() != 0L) {
-          setAvatarGuid(other.getAvatarGuid());
-        }
-        if (other.getWeaponGuid() != 0L) {
-          setWeaponGuid(other.getWeaponGuid());
-        }
         if (other.hasAbilityControlBlock()) {
           mergeAbilityControlBlock(other.getAbilityControlBlock());
         }
-        if (other.hasSceneAvatarInfo()) {
-          mergeSceneAvatarInfo(other.getSceneAvatarInfo());
+        if (other.hasAvatarAbilityInfo()) {
+          mergeAvatarAbilityInfo(other.getAvatarAbilityInfo());
+        }
+        if (other.hasSceneEntityInfo()) {
+          mergeSceneEntityInfo(other.getSceneEntityInfo());
         }
         if (other.hasAvatarInfo()) {
           mergeAvatarInfo(other.getAvatarInfo());
         }
-        if (other.hasAvatarAbilityInfo()) {
-          mergeAvatarAbilityInfo(other.getAvatarAbilityInfo());
+        if (other.getWeaponEntityId() != 0) {
+          setWeaponEntityId(other.getWeaponEntityId());
         }
-        if (other.hasWeaponAbilityInfo()) {
-          mergeWeaponAbilityInfo(other.getWeaponAbilityInfo());
+        if (other.getAvatarGuid() != 0L) {
+          setAvatarGuid(other.getAvatarGuid());
+        }
+        if (other.getPlayerUid() != 0) {
+          setPlayerUid(other.getPlayerUid());
         }
         if (other.getIsReconnect() != false) {
           setIsReconnect(other.getIsReconnect());
@@ -1345,6 +1592,15 @@ public Builder mergeFrom(emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.Sce
         if (other.getIsOnScene() != false) {
           setIsOnScene(other.getIsOnScene());
         }
+        if (other.getWeaponGuid() != 0L) {
+          setWeaponGuid(other.getWeaponGuid());
+        }
+        if (other.getSceneId() != 0) {
+          setSceneId(other.getSceneId());
+        }
+        if (other.getEntityId() != 0) {
+          setEntityId(other.getEntityId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -1375,185 +1631,314 @@ public Builder mergeFrom(
       }
       private int bitField0_;
 
-      private emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo sceneEntityInfo_;
+      private emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo sceneAvatarInfo_;
       private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo, emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder, emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder> sceneEntityInfoBuilder_;
+          emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo, emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.Builder, emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfoOrBuilder> sceneAvatarInfoBuilder_;
       /**
-       * <code>.SceneEntityInfo scene_entity_info = 2;</code>
-       * @return Whether the sceneEntityInfo field is set.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.SceneAvatarInfo scene_avatar_info = 12;</code>
+       * @return Whether the sceneAvatarInfo field is set.
        */
-      public boolean hasSceneEntityInfo() {
-        return sceneEntityInfoBuilder_ != null || sceneEntityInfo_ != null;
+      public boolean hasSceneAvatarInfo() {
+        return sceneAvatarInfoBuilder_ != null || sceneAvatarInfo_ != null;
       }
       /**
-       * <code>.SceneEntityInfo scene_entity_info = 2;</code>
-       * @return The sceneEntityInfo.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.SceneAvatarInfo scene_avatar_info = 12;</code>
+       * @return The sceneAvatarInfo.
        */
-      public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo getSceneEntityInfo() {
-        if (sceneEntityInfoBuilder_ == null) {
-          return sceneEntityInfo_ == null ? emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.getDefaultInstance() : sceneEntityInfo_;
+      public emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo getSceneAvatarInfo() {
+        if (sceneAvatarInfoBuilder_ == null) {
+          return sceneAvatarInfo_ == null ? emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.getDefaultInstance() : sceneAvatarInfo_;
         } else {
-          return sceneEntityInfoBuilder_.getMessage();
+          return sceneAvatarInfoBuilder_.getMessage();
         }
       }
       /**
-       * <code>.SceneEntityInfo scene_entity_info = 2;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.SceneAvatarInfo scene_avatar_info = 12;</code>
        */
-      public Builder setSceneEntityInfo(emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo value) {
-        if (sceneEntityInfoBuilder_ == null) {
+      public Builder setSceneAvatarInfo(emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo value) {
+        if (sceneAvatarInfoBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          sceneEntityInfo_ = value;
+          sceneAvatarInfo_ = value;
           onChanged();
         } else {
-          sceneEntityInfoBuilder_.setMessage(value);
+          sceneAvatarInfoBuilder_.setMessage(value);
         }
 
         return this;
       }
       /**
-       * <code>.SceneEntityInfo scene_entity_info = 2;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.SceneAvatarInfo scene_avatar_info = 12;</code>
        */
-      public Builder setSceneEntityInfo(
-          emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder builderForValue) {
-        if (sceneEntityInfoBuilder_ == null) {
-          sceneEntityInfo_ = builderForValue.build();
+      public Builder setSceneAvatarInfo(
+          emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.Builder builderForValue) {
+        if (sceneAvatarInfoBuilder_ == null) {
+          sceneAvatarInfo_ = builderForValue.build();
           onChanged();
         } else {
-          sceneEntityInfoBuilder_.setMessage(builderForValue.build());
+          sceneAvatarInfoBuilder_.setMessage(builderForValue.build());
         }
 
         return this;
       }
       /**
-       * <code>.SceneEntityInfo scene_entity_info = 2;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.SceneAvatarInfo scene_avatar_info = 12;</code>
        */
-      public Builder mergeSceneEntityInfo(emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo value) {
-        if (sceneEntityInfoBuilder_ == null) {
-          if (sceneEntityInfo_ != null) {
-            sceneEntityInfo_ =
-              emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.newBuilder(sceneEntityInfo_).mergeFrom(value).buildPartial();
+      public Builder mergeSceneAvatarInfo(emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo value) {
+        if (sceneAvatarInfoBuilder_ == null) {
+          if (sceneAvatarInfo_ != null) {
+            sceneAvatarInfo_ =
+              emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.newBuilder(sceneAvatarInfo_).mergeFrom(value).buildPartial();
           } else {
-            sceneEntityInfo_ = value;
+            sceneAvatarInfo_ = value;
           }
           onChanged();
         } else {
-          sceneEntityInfoBuilder_.mergeFrom(value);
+          sceneAvatarInfoBuilder_.mergeFrom(value);
         }
 
         return this;
       }
       /**
-       * <code>.SceneEntityInfo scene_entity_info = 2;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.SceneAvatarInfo scene_avatar_info = 12;</code>
        */
-      public Builder clearSceneEntityInfo() {
-        if (sceneEntityInfoBuilder_ == null) {
-          sceneEntityInfo_ = null;
+      public Builder clearSceneAvatarInfo() {
+        if (sceneAvatarInfoBuilder_ == null) {
+          sceneAvatarInfo_ = null;
           onChanged();
         } else {
-          sceneEntityInfo_ = null;
-          sceneEntityInfoBuilder_ = null;
+          sceneAvatarInfo_ = null;
+          sceneAvatarInfoBuilder_ = null;
         }
 
         return this;
       }
       /**
-       * <code>.SceneEntityInfo scene_entity_info = 2;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.SceneAvatarInfo scene_avatar_info = 12;</code>
        */
-      public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder getSceneEntityInfoBuilder() {
+      public emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.Builder getSceneAvatarInfoBuilder() {
         
         onChanged();
-        return getSceneEntityInfoFieldBuilder().getBuilder();
+        return getSceneAvatarInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.SceneEntityInfo scene_entity_info = 2;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.SceneAvatarInfo scene_avatar_info = 12;</code>
        */
-      public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder getSceneEntityInfoOrBuilder() {
-        if (sceneEntityInfoBuilder_ != null) {
-          return sceneEntityInfoBuilder_.getMessageOrBuilder();
+      public emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfoOrBuilder getSceneAvatarInfoOrBuilder() {
+        if (sceneAvatarInfoBuilder_ != null) {
+          return sceneAvatarInfoBuilder_.getMessageOrBuilder();
         } else {
-          return sceneEntityInfo_ == null ?
-              emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.getDefaultInstance() : sceneEntityInfo_;
+          return sceneAvatarInfo_ == null ?
+              emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.getDefaultInstance() : sceneAvatarInfo_;
         }
       }
       /**
-       * <code>.SceneEntityInfo scene_entity_info = 2;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.SceneAvatarInfo scene_avatar_info = 12;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo, emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder, emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder> 
-          getSceneEntityInfoFieldBuilder() {
-        if (sceneEntityInfoBuilder_ == null) {
-          sceneEntityInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo, emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder, emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder>(
-                  getSceneEntityInfo(),
+          emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo, emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.Builder, emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfoOrBuilder> 
+          getSceneAvatarInfoFieldBuilder() {
+        if (sceneAvatarInfoBuilder_ == null) {
+          sceneAvatarInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo, emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.Builder, emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfoOrBuilder>(
+                  getSceneAvatarInfo(),
                   getParentForChildren(),
                   isClean());
-          sceneEntityInfo_ = null;
+          sceneAvatarInfo_ = null;
         }
-        return sceneEntityInfoBuilder_;
+        return sceneAvatarInfoBuilder_;
       }
 
-      private int entityId_ ;
+      private emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo weaponAbilityInfo_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder> weaponAbilityInfoBuilder_;
       /**
-       * <code>uint32 entity_id = 4;</code>
-       * @return The entityId.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo weapon_ability_info = 6;</code>
+       * @return Whether the weaponAbilityInfo field is set.
        */
-      @java.lang.Override
-      public int getEntityId() {
-        return entityId_;
+      public boolean hasWeaponAbilityInfo() {
+        return weaponAbilityInfoBuilder_ != null || weaponAbilityInfo_ != null;
       }
       /**
-       * <code>uint32 entity_id = 4;</code>
-       * @param value The entityId to set.
-       * @return This builder for chaining.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo weapon_ability_info = 6;</code>
+       * @return The weaponAbilityInfo.
        */
-      public Builder setEntityId(int value) {
-        
-        entityId_ = value;
-        onChanged();
-        return this;
+      public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getWeaponAbilityInfo() {
+        if (weaponAbilityInfoBuilder_ == null) {
+          return weaponAbilityInfo_ == null ? emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : weaponAbilityInfo_;
+        } else {
+          return weaponAbilityInfoBuilder_.getMessage();
+        }
       }
       /**
-       * <code>uint32 entity_id = 4;</code>
-       * @return This builder for chaining.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo weapon_ability_info = 6;</code>
        */
-      public Builder clearEntityId() {
-        
-        entityId_ = 0;
-        onChanged();
+      public Builder setWeaponAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
+        if (weaponAbilityInfoBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          weaponAbilityInfo_ = value;
+          onChanged();
+        } else {
+          weaponAbilityInfoBuilder_.setMessage(value);
+        }
+
         return this;
       }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo weapon_ability_info = 6;</code>
+       */
+      public Builder setWeaponAbilityInfo(
+          emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder builderForValue) {
+        if (weaponAbilityInfoBuilder_ == null) {
+          weaponAbilityInfo_ = builderForValue.build();
+          onChanged();
+        } else {
+          weaponAbilityInfoBuilder_.setMessage(builderForValue.build());
+        }
 
-      private int sceneId_ ;
+        return this;
+      }
       /**
-       * <code>uint32 scene_id = 9;</code>
-       * @return The sceneId.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo weapon_ability_info = 6;</code>
        */
-      @java.lang.Override
-      public int getSceneId() {
-        return sceneId_;
+      public Builder mergeWeaponAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
+        if (weaponAbilityInfoBuilder_ == null) {
+          if (weaponAbilityInfo_ != null) {
+            weaponAbilityInfo_ =
+              emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.newBuilder(weaponAbilityInfo_).mergeFrom(value).buildPartial();
+          } else {
+            weaponAbilityInfo_ = value;
+          }
+          onChanged();
+        } else {
+          weaponAbilityInfoBuilder_.mergeFrom(value);
+        }
+
+        return this;
       }
       /**
-       * <code>uint32 scene_id = 9;</code>
-       * @param value The sceneId to set.
-       * @return This builder for chaining.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo weapon_ability_info = 6;</code>
        */
-      public Builder setSceneId(int value) {
-        
-        sceneId_ = value;
-        onChanged();
+      public Builder clearWeaponAbilityInfo() {
+        if (weaponAbilityInfoBuilder_ == null) {
+          weaponAbilityInfo_ = null;
+          onChanged();
+        } else {
+          weaponAbilityInfo_ = null;
+          weaponAbilityInfoBuilder_ = null;
+        }
+
         return this;
       }
       /**
-       * <code>uint32 scene_id = 9;</code>
-       * @return This builder for chaining.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo weapon_ability_info = 6;</code>
        */
-      public Builder clearSceneId() {
+      public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder getWeaponAbilityInfoBuilder() {
         
-        sceneId_ = 0;
         onChanged();
-        return this;
+        return getWeaponAbilityInfoFieldBuilder().getBuilder();
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo weapon_ability_info = 6;</code>
+       */
+      public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getWeaponAbilityInfoOrBuilder() {
+        if (weaponAbilityInfoBuilder_ != null) {
+          return weaponAbilityInfoBuilder_.getMessageOrBuilder();
+        } else {
+          return weaponAbilityInfo_ == null ?
+              emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : weaponAbilityInfo_;
+        }
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo weapon_ability_info = 6;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder> 
+          getWeaponAbilityInfoFieldBuilder() {
+        if (weaponAbilityInfoBuilder_ == null) {
+          weaponAbilityInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder>(
+                  getWeaponAbilityInfo(),
+                  getParentForChildren(),
+                  isClean());
+          weaponAbilityInfo_ = null;
+        }
+        return weaponAbilityInfoBuilder_;
       }
 
       private java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> serverBuffList_ =
@@ -1569,7 +1954,11 @@ private void ensureServerBuffListIsMutable() {
           emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> serverBuffListBuilder_;
 
       /**
-       * <code>repeated .ServerBuff server_buff_list = 110;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 4;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> getServerBuffListList() {
         if (serverBuffListBuilder_ == null) {
@@ -1579,7 +1968,11 @@ public java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff>
         }
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 110;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 4;</code>
        */
       public int getServerBuffListCount() {
         if (serverBuffListBuilder_ == null) {
@@ -1589,7 +1982,11 @@ public int getServerBuffListCount() {
         }
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 110;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 4;</code>
        */
       public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff getServerBuffList(int index) {
         if (serverBuffListBuilder_ == null) {
@@ -1599,7 +1996,11 @@ public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff getServerBuffLi
         }
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 110;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 4;</code>
        */
       public Builder setServerBuffList(
           int index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff value) {
@@ -1616,7 +2017,11 @@ public Builder setServerBuffList(
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 110;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 4;</code>
        */
       public Builder setServerBuffList(
           int index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder builderForValue) {
@@ -1630,7 +2035,11 @@ public Builder setServerBuffList(
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 110;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 4;</code>
        */
       public Builder addServerBuffList(emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff value) {
         if (serverBuffListBuilder_ == null) {
@@ -1646,7 +2055,11 @@ public Builder addServerBuffList(emu.grasscutter.net.proto.ServerBuffOuterClass.
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 110;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 4;</code>
        */
       public Builder addServerBuffList(
           int index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff value) {
@@ -1663,7 +2076,11 @@ public Builder addServerBuffList(
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 110;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 4;</code>
        */
       public Builder addServerBuffList(
           emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder builderForValue) {
@@ -1677,7 +2094,11 @@ public Builder addServerBuffList(
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 110;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 4;</code>
        */
       public Builder addServerBuffList(
           int index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder builderForValue) {
@@ -1691,7 +2112,11 @@ public Builder addServerBuffList(
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 110;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 4;</code>
        */
       public Builder addAllServerBuffList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> values) {
@@ -1706,7 +2131,11 @@ public Builder addAllServerBuffList(
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 110;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 4;</code>
        */
       public Builder clearServerBuffList() {
         if (serverBuffListBuilder_ == null) {
@@ -1719,7 +2148,11 @@ public Builder clearServerBuffList() {
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 110;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 4;</code>
        */
       public Builder removeServerBuffList(int index) {
         if (serverBuffListBuilder_ == null) {
@@ -1732,14 +2165,22 @@ public Builder removeServerBuffList(int index) {
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 110;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 4;</code>
        */
       public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder getServerBuffListBuilder(
           int index) {
         return getServerBuffListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 110;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 4;</code>
        */
       public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getServerBuffListOrBuilder(
           int index) {
@@ -1749,7 +2190,11 @@ public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getSer
         }
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 110;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 4;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> 
            getServerBuffListOrBuilderList() {
@@ -1760,14 +2205,22 @@ public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getSer
         }
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 110;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 4;</code>
        */
       public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder addServerBuffListBuilder() {
         return getServerBuffListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.getDefaultInstance());
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 110;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 4;</code>
        */
       public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder addServerBuffListBuilder(
           int index) {
@@ -1775,7 +2228,11 @@ public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder addServ
             index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.getDefaultInstance());
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 110;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>repeated .ServerBuff server_buff_list = 4;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder> 
            getServerBuffListBuilderList() {
@@ -1796,183 +2253,79 @@ public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder addServ
         return serverBuffListBuilder_;
       }
 
-      private int weaponEntityId_ ;
+      private emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock abilityControlBlock_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder> abilityControlBlockBuilder_;
       /**
-       * <code>uint32 weapon_entity_id = 10;</code>
-       * @return The weaponEntityId.
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>.AbilityControlBlock ability_control_block = 5;</code>
+       * @return Whether the abilityControlBlock field is set.
        */
-      @java.lang.Override
-      public int getWeaponEntityId() {
-        return weaponEntityId_;
+      public boolean hasAbilityControlBlock() {
+        return abilityControlBlockBuilder_ != null || abilityControlBlock_ != null;
       }
       /**
-       * <code>uint32 weapon_entity_id = 10;</code>
-       * @param value The weaponEntityId to set.
-       * @return This builder for chaining.
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>.AbilityControlBlock ability_control_block = 5;</code>
+       * @return The abilityControlBlock.
        */
-      public Builder setWeaponEntityId(int value) {
-        
-        weaponEntityId_ = value;
-        onChanged();
-        return this;
+      public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock getAbilityControlBlock() {
+        if (abilityControlBlockBuilder_ == null) {
+          return abilityControlBlock_ == null ? emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.getDefaultInstance() : abilityControlBlock_;
+        } else {
+          return abilityControlBlockBuilder_.getMessage();
+        }
       }
       /**
-       * <code>uint32 weapon_entity_id = 10;</code>
-       * @return This builder for chaining.
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>.AbilityControlBlock ability_control_block = 5;</code>
        */
-      public Builder clearWeaponEntityId() {
-        
-        weaponEntityId_ = 0;
-        onChanged();
+      public Builder setAbilityControlBlock(emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock value) {
+        if (abilityControlBlockBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          abilityControlBlock_ = value;
+          onChanged();
+        } else {
+          abilityControlBlockBuilder_.setMessage(value);
+        }
+
         return this;
       }
-
-      private int playerUid_ ;
       /**
-       * <code>uint32 player_uid = 12;</code>
-       * @return The playerUid.
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>.AbilityControlBlock ability_control_block = 5;</code>
        */
-      @java.lang.Override
-      public int getPlayerUid() {
-        return playerUid_;
+      public Builder setAbilityControlBlock(
+          emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder builderForValue) {
+        if (abilityControlBlockBuilder_ == null) {
+          abilityControlBlock_ = builderForValue.build();
+          onChanged();
+        } else {
+          abilityControlBlockBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
       }
       /**
-       * <code>uint32 player_uid = 12;</code>
-       * @param value The playerUid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPlayerUid(int value) {
-        
-        playerUid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 player_uid = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPlayerUid() {
-        
-        playerUid_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private long avatarGuid_ ;
-      /**
-       * <code>uint64 avatar_guid = 5;</code>
-       * @return The avatarGuid.
-       */
-      @java.lang.Override
-      public long getAvatarGuid() {
-        return avatarGuid_;
-      }
-      /**
-       * <code>uint64 avatar_guid = 5;</code>
-       * @param value The avatarGuid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAvatarGuid(long value) {
-        
-        avatarGuid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 avatar_guid = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAvatarGuid() {
-        
-        avatarGuid_ = 0L;
-        onChanged();
-        return this;
-      }
-
-      private long weaponGuid_ ;
-      /**
-       * <code>uint64 weapon_guid = 6;</code>
-       * @return The weaponGuid.
-       */
-      @java.lang.Override
-      public long getWeaponGuid() {
-        return weaponGuid_;
-      }
-      /**
-       * <code>uint64 weapon_guid = 6;</code>
-       * @param value The weaponGuid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setWeaponGuid(long value) {
-        
-        weaponGuid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 weapon_guid = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearWeaponGuid() {
-        
-        weaponGuid_ = 0L;
-        onChanged();
-        return this;
-      }
-
-      private emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock abilityControlBlock_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder> abilityControlBlockBuilder_;
-      /**
-       * <code>.AbilityControlBlock ability_control_block = 11;</code>
-       * @return Whether the abilityControlBlock field is set.
-       */
-      public boolean hasAbilityControlBlock() {
-        return abilityControlBlockBuilder_ != null || abilityControlBlock_ != null;
-      }
-      /**
-       * <code>.AbilityControlBlock ability_control_block = 11;</code>
-       * @return The abilityControlBlock.
-       */
-      public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock getAbilityControlBlock() {
-        if (abilityControlBlockBuilder_ == null) {
-          return abilityControlBlock_ == null ? emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.getDefaultInstance() : abilityControlBlock_;
-        } else {
-          return abilityControlBlockBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.AbilityControlBlock ability_control_block = 11;</code>
-       */
-      public Builder setAbilityControlBlock(emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock value) {
-        if (abilityControlBlockBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          abilityControlBlock_ = value;
-          onChanged();
-        } else {
-          abilityControlBlockBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.AbilityControlBlock ability_control_block = 11;</code>
-       */
-      public Builder setAbilityControlBlock(
-          emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder builderForValue) {
-        if (abilityControlBlockBuilder_ == null) {
-          abilityControlBlock_ = builderForValue.build();
-          onChanged();
-        } else {
-          abilityControlBlockBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.AbilityControlBlock ability_control_block = 11;</code>
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>.AbilityControlBlock ability_control_block = 5;</code>
        */
       public Builder mergeAbilityControlBlock(emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock value) {
         if (abilityControlBlockBuilder_ == null) {
@@ -1990,7 +2343,11 @@ public Builder mergeAbilityControlBlock(emu.grasscutter.net.proto.AbilityControl
         return this;
       }
       /**
-       * <code>.AbilityControlBlock ability_control_block = 11;</code>
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>.AbilityControlBlock ability_control_block = 5;</code>
        */
       public Builder clearAbilityControlBlock() {
         if (abilityControlBlockBuilder_ == null) {
@@ -2004,7 +2361,11 @@ public Builder clearAbilityControlBlock() {
         return this;
       }
       /**
-       * <code>.AbilityControlBlock ability_control_block = 11;</code>
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>.AbilityControlBlock ability_control_block = 5;</code>
        */
       public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder getAbilityControlBlockBuilder() {
         
@@ -2012,7 +2373,11 @@ public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlo
         return getAbilityControlBlockFieldBuilder().getBuilder();
       }
       /**
-       * <code>.AbilityControlBlock ability_control_block = 11;</code>
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>.AbilityControlBlock ability_control_block = 5;</code>
        */
       public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder() {
         if (abilityControlBlockBuilder_ != null) {
@@ -2023,7 +2388,11 @@ public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlo
         }
       }
       /**
-       * <code>.AbilityControlBlock ability_control_block = 11;</code>
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>.AbilityControlBlock ability_control_block = 5;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder> 
@@ -2039,485 +2408,607 @@ public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlo
         return abilityControlBlockBuilder_;
       }
 
-      private emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo sceneAvatarInfo_;
+      private emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo avatarAbilityInfo_;
       private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo, emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.Builder, emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfoOrBuilder> sceneAvatarInfoBuilder_;
+          emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder> avatarAbilityInfoBuilder_;
       /**
-       * <code>.SceneAvatarInfo scene_avatar_info = 8;</code>
-       * @return Whether the sceneAvatarInfo field is set.
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo avatar_ability_info = 1;</code>
+       * @return Whether the avatarAbilityInfo field is set.
        */
-      public boolean hasSceneAvatarInfo() {
-        return sceneAvatarInfoBuilder_ != null || sceneAvatarInfo_ != null;
+      public boolean hasAvatarAbilityInfo() {
+        return avatarAbilityInfoBuilder_ != null || avatarAbilityInfo_ != null;
       }
       /**
-       * <code>.SceneAvatarInfo scene_avatar_info = 8;</code>
-       * @return The sceneAvatarInfo.
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo avatar_ability_info = 1;</code>
+       * @return The avatarAbilityInfo.
        */
-      public emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo getSceneAvatarInfo() {
-        if (sceneAvatarInfoBuilder_ == null) {
-          return sceneAvatarInfo_ == null ? emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.getDefaultInstance() : sceneAvatarInfo_;
+      public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getAvatarAbilityInfo() {
+        if (avatarAbilityInfoBuilder_ == null) {
+          return avatarAbilityInfo_ == null ? emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : avatarAbilityInfo_;
         } else {
-          return sceneAvatarInfoBuilder_.getMessage();
+          return avatarAbilityInfoBuilder_.getMessage();
         }
       }
       /**
-       * <code>.SceneAvatarInfo scene_avatar_info = 8;</code>
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo avatar_ability_info = 1;</code>
        */
-      public Builder setSceneAvatarInfo(emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo value) {
-        if (sceneAvatarInfoBuilder_ == null) {
+      public Builder setAvatarAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
+        if (avatarAbilityInfoBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          sceneAvatarInfo_ = value;
+          avatarAbilityInfo_ = value;
           onChanged();
         } else {
-          sceneAvatarInfoBuilder_.setMessage(value);
+          avatarAbilityInfoBuilder_.setMessage(value);
         }
 
         return this;
       }
       /**
-       * <code>.SceneAvatarInfo scene_avatar_info = 8;</code>
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo avatar_ability_info = 1;</code>
        */
-      public Builder setSceneAvatarInfo(
-          emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.Builder builderForValue) {
-        if (sceneAvatarInfoBuilder_ == null) {
-          sceneAvatarInfo_ = builderForValue.build();
+      public Builder setAvatarAbilityInfo(
+          emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder builderForValue) {
+        if (avatarAbilityInfoBuilder_ == null) {
+          avatarAbilityInfo_ = builderForValue.build();
           onChanged();
         } else {
-          sceneAvatarInfoBuilder_.setMessage(builderForValue.build());
+          avatarAbilityInfoBuilder_.setMessage(builderForValue.build());
         }
 
         return this;
       }
       /**
-       * <code>.SceneAvatarInfo scene_avatar_info = 8;</code>
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo avatar_ability_info = 1;</code>
        */
-      public Builder mergeSceneAvatarInfo(emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo value) {
-        if (sceneAvatarInfoBuilder_ == null) {
-          if (sceneAvatarInfo_ != null) {
-            sceneAvatarInfo_ =
-              emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.newBuilder(sceneAvatarInfo_).mergeFrom(value).buildPartial();
+      public Builder mergeAvatarAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
+        if (avatarAbilityInfoBuilder_ == null) {
+          if (avatarAbilityInfo_ != null) {
+            avatarAbilityInfo_ =
+              emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.newBuilder(avatarAbilityInfo_).mergeFrom(value).buildPartial();
           } else {
-            sceneAvatarInfo_ = value;
+            avatarAbilityInfo_ = value;
           }
           onChanged();
         } else {
-          sceneAvatarInfoBuilder_.mergeFrom(value);
+          avatarAbilityInfoBuilder_.mergeFrom(value);
         }
 
         return this;
       }
       /**
-       * <code>.SceneAvatarInfo scene_avatar_info = 8;</code>
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo avatar_ability_info = 1;</code>
        */
-      public Builder clearSceneAvatarInfo() {
-        if (sceneAvatarInfoBuilder_ == null) {
-          sceneAvatarInfo_ = null;
+      public Builder clearAvatarAbilityInfo() {
+        if (avatarAbilityInfoBuilder_ == null) {
+          avatarAbilityInfo_ = null;
           onChanged();
         } else {
-          sceneAvatarInfo_ = null;
-          sceneAvatarInfoBuilder_ = null;
+          avatarAbilityInfo_ = null;
+          avatarAbilityInfoBuilder_ = null;
         }
 
         return this;
       }
       /**
-       * <code>.SceneAvatarInfo scene_avatar_info = 8;</code>
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo avatar_ability_info = 1;</code>
        */
-      public emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.Builder getSceneAvatarInfoBuilder() {
+      public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder getAvatarAbilityInfoBuilder() {
         
         onChanged();
-        return getSceneAvatarInfoFieldBuilder().getBuilder();
+        return getAvatarAbilityInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.SceneAvatarInfo scene_avatar_info = 8;</code>
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo avatar_ability_info = 1;</code>
        */
-      public emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfoOrBuilder getSceneAvatarInfoOrBuilder() {
-        if (sceneAvatarInfoBuilder_ != null) {
-          return sceneAvatarInfoBuilder_.getMessageOrBuilder();
+      public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getAvatarAbilityInfoOrBuilder() {
+        if (avatarAbilityInfoBuilder_ != null) {
+          return avatarAbilityInfoBuilder_.getMessageOrBuilder();
         } else {
-          return sceneAvatarInfo_ == null ?
-              emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.getDefaultInstance() : sceneAvatarInfo_;
+          return avatarAbilityInfo_ == null ?
+              emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : avatarAbilityInfo_;
         }
       }
       /**
-       * <code>.SceneAvatarInfo scene_avatar_info = 8;</code>
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>.AbilitySyncStateInfo avatar_ability_info = 1;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo, emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.Builder, emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfoOrBuilder> 
-          getSceneAvatarInfoFieldBuilder() {
-        if (sceneAvatarInfoBuilder_ == null) {
-          sceneAvatarInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo, emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.Builder, emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfoOrBuilder>(
-                  getSceneAvatarInfo(),
+          emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder> 
+          getAvatarAbilityInfoFieldBuilder() {
+        if (avatarAbilityInfoBuilder_ == null) {
+          avatarAbilityInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder>(
+                  getAvatarAbilityInfo(),
                   getParentForChildren(),
                   isClean());
-          sceneAvatarInfo_ = null;
+          avatarAbilityInfo_ = null;
         }
-        return sceneAvatarInfoBuilder_;
+        return avatarAbilityInfoBuilder_;
       }
 
-      private emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo avatarInfo_;
+      private emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo sceneEntityInfo_;
       private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder> avatarInfoBuilder_;
+          emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo, emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder, emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder> sceneEntityInfoBuilder_;
       /**
-       * <code>.AvatarInfo avatar_info = 14;</code>
-       * @return Whether the avatarInfo field is set.
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>.SceneEntityInfo scene_entity_info = 9;</code>
+       * @return Whether the sceneEntityInfo field is set.
        */
-      public boolean hasAvatarInfo() {
-        return avatarInfoBuilder_ != null || avatarInfo_ != null;
+      public boolean hasSceneEntityInfo() {
+        return sceneEntityInfoBuilder_ != null || sceneEntityInfo_ != null;
       }
       /**
-       * <code>.AvatarInfo avatar_info = 14;</code>
-       * @return The avatarInfo.
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>.SceneEntityInfo scene_entity_info = 9;</code>
+       * @return The sceneEntityInfo.
        */
-      public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo getAvatarInfo() {
-        if (avatarInfoBuilder_ == null) {
-          return avatarInfo_ == null ? emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.getDefaultInstance() : avatarInfo_;
+      public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo getSceneEntityInfo() {
+        if (sceneEntityInfoBuilder_ == null) {
+          return sceneEntityInfo_ == null ? emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.getDefaultInstance() : sceneEntityInfo_;
         } else {
-          return avatarInfoBuilder_.getMessage();
+          return sceneEntityInfoBuilder_.getMessage();
         }
       }
       /**
-       * <code>.AvatarInfo avatar_info = 14;</code>
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>.SceneEntityInfo scene_entity_info = 9;</code>
        */
-      public Builder setAvatarInfo(emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo value) {
-        if (avatarInfoBuilder_ == null) {
+      public Builder setSceneEntityInfo(emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo value) {
+        if (sceneEntityInfoBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          avatarInfo_ = value;
+          sceneEntityInfo_ = value;
           onChanged();
         } else {
-          avatarInfoBuilder_.setMessage(value);
+          sceneEntityInfoBuilder_.setMessage(value);
         }
 
         return this;
       }
       /**
-       * <code>.AvatarInfo avatar_info = 14;</code>
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>.SceneEntityInfo scene_entity_info = 9;</code>
        */
-      public Builder setAvatarInfo(
-          emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder builderForValue) {
-        if (avatarInfoBuilder_ == null) {
-          avatarInfo_ = builderForValue.build();
+      public Builder setSceneEntityInfo(
+          emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder builderForValue) {
+        if (sceneEntityInfoBuilder_ == null) {
+          sceneEntityInfo_ = builderForValue.build();
           onChanged();
         } else {
-          avatarInfoBuilder_.setMessage(builderForValue.build());
+          sceneEntityInfoBuilder_.setMessage(builderForValue.build());
         }
 
         return this;
       }
       /**
-       * <code>.AvatarInfo avatar_info = 14;</code>
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>.SceneEntityInfo scene_entity_info = 9;</code>
        */
-      public Builder mergeAvatarInfo(emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo value) {
-        if (avatarInfoBuilder_ == null) {
-          if (avatarInfo_ != null) {
-            avatarInfo_ =
-              emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.newBuilder(avatarInfo_).mergeFrom(value).buildPartial();
+      public Builder mergeSceneEntityInfo(emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo value) {
+        if (sceneEntityInfoBuilder_ == null) {
+          if (sceneEntityInfo_ != null) {
+            sceneEntityInfo_ =
+              emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.newBuilder(sceneEntityInfo_).mergeFrom(value).buildPartial();
           } else {
-            avatarInfo_ = value;
+            sceneEntityInfo_ = value;
           }
           onChanged();
         } else {
-          avatarInfoBuilder_.mergeFrom(value);
+          sceneEntityInfoBuilder_.mergeFrom(value);
         }
 
         return this;
       }
       /**
-       * <code>.AvatarInfo avatar_info = 14;</code>
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>.SceneEntityInfo scene_entity_info = 9;</code>
        */
-      public Builder clearAvatarInfo() {
-        if (avatarInfoBuilder_ == null) {
-          avatarInfo_ = null;
+      public Builder clearSceneEntityInfo() {
+        if (sceneEntityInfoBuilder_ == null) {
+          sceneEntityInfo_ = null;
           onChanged();
         } else {
-          avatarInfo_ = null;
-          avatarInfoBuilder_ = null;
+          sceneEntityInfo_ = null;
+          sceneEntityInfoBuilder_ = null;
         }
 
         return this;
       }
       /**
-       * <code>.AvatarInfo avatar_info = 14;</code>
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>.SceneEntityInfo scene_entity_info = 9;</code>
        */
-      public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder getAvatarInfoBuilder() {
+      public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder getSceneEntityInfoBuilder() {
         
         onChanged();
-        return getAvatarInfoFieldBuilder().getBuilder();
+        return getSceneEntityInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.AvatarInfo avatar_info = 14;</code>
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>.SceneEntityInfo scene_entity_info = 9;</code>
        */
-      public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAvatarInfoOrBuilder() {
-        if (avatarInfoBuilder_ != null) {
-          return avatarInfoBuilder_.getMessageOrBuilder();
+      public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder getSceneEntityInfoOrBuilder() {
+        if (sceneEntityInfoBuilder_ != null) {
+          return sceneEntityInfoBuilder_.getMessageOrBuilder();
         } else {
-          return avatarInfo_ == null ?
-              emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.getDefaultInstance() : avatarInfo_;
+          return sceneEntityInfo_ == null ?
+              emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.getDefaultInstance() : sceneEntityInfo_;
         }
       }
       /**
-       * <code>.AvatarInfo avatar_info = 14;</code>
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>.SceneEntityInfo scene_entity_info = 9;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder> 
-          getAvatarInfoFieldBuilder() {
-        if (avatarInfoBuilder_ == null) {
-          avatarInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder>(
-                  getAvatarInfo(),
+          emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo, emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder, emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder> 
+          getSceneEntityInfoFieldBuilder() {
+        if (sceneEntityInfoBuilder_ == null) {
+          sceneEntityInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo, emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder, emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder>(
+                  getSceneEntityInfo(),
                   getParentForChildren(),
                   isClean());
-          avatarInfo_ = null;
+          sceneEntityInfo_ = null;
         }
-        return avatarInfoBuilder_;
+        return sceneEntityInfoBuilder_;
       }
 
-      private emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo avatarAbilityInfo_;
+      private emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo avatarInfo_;
       private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder> avatarAbilityInfoBuilder_;
+          emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder> avatarInfoBuilder_;
       /**
-       * <code>.AbilitySyncStateInfo avatar_ability_info = 7;</code>
-       * @return Whether the avatarAbilityInfo field is set.
+       * <pre>
+       * Offset: 0x50
+       * </pre>
+       *
+       * <code>.AvatarInfo avatar_info = 2;</code>
+       * @return Whether the avatarInfo field is set.
        */
-      public boolean hasAvatarAbilityInfo() {
-        return avatarAbilityInfoBuilder_ != null || avatarAbilityInfo_ != null;
+      public boolean hasAvatarInfo() {
+        return avatarInfoBuilder_ != null || avatarInfo_ != null;
       }
       /**
-       * <code>.AbilitySyncStateInfo avatar_ability_info = 7;</code>
-       * @return The avatarAbilityInfo.
+       * <pre>
+       * Offset: 0x50
+       * </pre>
+       *
+       * <code>.AvatarInfo avatar_info = 2;</code>
+       * @return The avatarInfo.
        */
-      public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getAvatarAbilityInfo() {
-        if (avatarAbilityInfoBuilder_ == null) {
-          return avatarAbilityInfo_ == null ? emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : avatarAbilityInfo_;
+      public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo getAvatarInfo() {
+        if (avatarInfoBuilder_ == null) {
+          return avatarInfo_ == null ? emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.getDefaultInstance() : avatarInfo_;
         } else {
-          return avatarAbilityInfoBuilder_.getMessage();
+          return avatarInfoBuilder_.getMessage();
         }
       }
       /**
-       * <code>.AbilitySyncStateInfo avatar_ability_info = 7;</code>
+       * <pre>
+       * Offset: 0x50
+       * </pre>
+       *
+       * <code>.AvatarInfo avatar_info = 2;</code>
        */
-      public Builder setAvatarAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
-        if (avatarAbilityInfoBuilder_ == null) {
+      public Builder setAvatarInfo(emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo value) {
+        if (avatarInfoBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          avatarAbilityInfo_ = value;
+          avatarInfo_ = value;
           onChanged();
         } else {
-          avatarAbilityInfoBuilder_.setMessage(value);
+          avatarInfoBuilder_.setMessage(value);
         }
 
         return this;
       }
       /**
-       * <code>.AbilitySyncStateInfo avatar_ability_info = 7;</code>
+       * <pre>
+       * Offset: 0x50
+       * </pre>
+       *
+       * <code>.AvatarInfo avatar_info = 2;</code>
        */
-      public Builder setAvatarAbilityInfo(
-          emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder builderForValue) {
-        if (avatarAbilityInfoBuilder_ == null) {
-          avatarAbilityInfo_ = builderForValue.build();
+      public Builder setAvatarInfo(
+          emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder builderForValue) {
+        if (avatarInfoBuilder_ == null) {
+          avatarInfo_ = builderForValue.build();
           onChanged();
         } else {
-          avatarAbilityInfoBuilder_.setMessage(builderForValue.build());
+          avatarInfoBuilder_.setMessage(builderForValue.build());
         }
 
         return this;
       }
       /**
-       * <code>.AbilitySyncStateInfo avatar_ability_info = 7;</code>
+       * <pre>
+       * Offset: 0x50
+       * </pre>
+       *
+       * <code>.AvatarInfo avatar_info = 2;</code>
        */
-      public Builder mergeAvatarAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
-        if (avatarAbilityInfoBuilder_ == null) {
-          if (avatarAbilityInfo_ != null) {
-            avatarAbilityInfo_ =
-              emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.newBuilder(avatarAbilityInfo_).mergeFrom(value).buildPartial();
+      public Builder mergeAvatarInfo(emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo value) {
+        if (avatarInfoBuilder_ == null) {
+          if (avatarInfo_ != null) {
+            avatarInfo_ =
+              emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.newBuilder(avatarInfo_).mergeFrom(value).buildPartial();
           } else {
-            avatarAbilityInfo_ = value;
+            avatarInfo_ = value;
           }
           onChanged();
         } else {
-          avatarAbilityInfoBuilder_.mergeFrom(value);
+          avatarInfoBuilder_.mergeFrom(value);
         }
 
         return this;
       }
       /**
-       * <code>.AbilitySyncStateInfo avatar_ability_info = 7;</code>
+       * <pre>
+       * Offset: 0x50
+       * </pre>
+       *
+       * <code>.AvatarInfo avatar_info = 2;</code>
        */
-      public Builder clearAvatarAbilityInfo() {
-        if (avatarAbilityInfoBuilder_ == null) {
-          avatarAbilityInfo_ = null;
+      public Builder clearAvatarInfo() {
+        if (avatarInfoBuilder_ == null) {
+          avatarInfo_ = null;
           onChanged();
         } else {
-          avatarAbilityInfo_ = null;
-          avatarAbilityInfoBuilder_ = null;
+          avatarInfo_ = null;
+          avatarInfoBuilder_ = null;
         }
 
         return this;
       }
       /**
-       * <code>.AbilitySyncStateInfo avatar_ability_info = 7;</code>
+       * <pre>
+       * Offset: 0x50
+       * </pre>
+       *
+       * <code>.AvatarInfo avatar_info = 2;</code>
        */
-      public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder getAvatarAbilityInfoBuilder() {
+      public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder getAvatarInfoBuilder() {
         
         onChanged();
-        return getAvatarAbilityInfoFieldBuilder().getBuilder();
+        return getAvatarInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.AbilitySyncStateInfo avatar_ability_info = 7;</code>
+       * <pre>
+       * Offset: 0x50
+       * </pre>
+       *
+       * <code>.AvatarInfo avatar_info = 2;</code>
        */
-      public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getAvatarAbilityInfoOrBuilder() {
-        if (avatarAbilityInfoBuilder_ != null) {
-          return avatarAbilityInfoBuilder_.getMessageOrBuilder();
+      public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAvatarInfoOrBuilder() {
+        if (avatarInfoBuilder_ != null) {
+          return avatarInfoBuilder_.getMessageOrBuilder();
         } else {
-          return avatarAbilityInfo_ == null ?
-              emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : avatarAbilityInfo_;
+          return avatarInfo_ == null ?
+              emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.getDefaultInstance() : avatarInfo_;
         }
       }
       /**
-       * <code>.AbilitySyncStateInfo avatar_ability_info = 7;</code>
+       * <pre>
+       * Offset: 0x50
+       * </pre>
+       *
+       * <code>.AvatarInfo avatar_info = 2;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder> 
-          getAvatarAbilityInfoFieldBuilder() {
-        if (avatarAbilityInfoBuilder_ == null) {
-          avatarAbilityInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder>(
-                  getAvatarAbilityInfo(),
+          emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder> 
+          getAvatarInfoFieldBuilder() {
+        if (avatarInfoBuilder_ == null) {
+          avatarInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder>(
+                  getAvatarInfo(),
                   getParentForChildren(),
                   isClean());
-          avatarAbilityInfo_ = null;
+          avatarInfo_ = null;
         }
-        return avatarAbilityInfoBuilder_;
+        return avatarInfoBuilder_;
       }
 
-      private emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo weaponAbilityInfo_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder> weaponAbilityInfoBuilder_;
+      private int weaponEntityId_ ;
       /**
-       * <code>.AbilitySyncStateInfo weapon_ability_info = 15;</code>
-       * @return Whether the weaponAbilityInfo field is set.
+       * <pre>
+       * Offset: 0x58
+       * </pre>
+       *
+       * <code>uint32 weapon_entity_id = 3;</code>
+       * @return The weaponEntityId.
        */
-      public boolean hasWeaponAbilityInfo() {
-        return weaponAbilityInfoBuilder_ != null || weaponAbilityInfo_ != null;
+      @java.lang.Override
+      public int getWeaponEntityId() {
+        return weaponEntityId_;
       }
       /**
-       * <code>.AbilitySyncStateInfo weapon_ability_info = 15;</code>
-       * @return The weaponAbilityInfo.
+       * <pre>
+       * Offset: 0x58
+       * </pre>
+       *
+       * <code>uint32 weapon_entity_id = 3;</code>
+       * @param value The weaponEntityId to set.
+       * @return This builder for chaining.
        */
-      public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getWeaponAbilityInfo() {
-        if (weaponAbilityInfoBuilder_ == null) {
-          return weaponAbilityInfo_ == null ? emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : weaponAbilityInfo_;
-        } else {
-          return weaponAbilityInfoBuilder_.getMessage();
-        }
+      public Builder setWeaponEntityId(int value) {
+        
+        weaponEntityId_ = value;
+        onChanged();
+        return this;
       }
       /**
-       * <code>.AbilitySyncStateInfo weapon_ability_info = 15;</code>
+       * <pre>
+       * Offset: 0x58
+       * </pre>
+       *
+       * <code>uint32 weapon_entity_id = 3;</code>
+       * @return This builder for chaining.
        */
-      public Builder setWeaponAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
-        if (weaponAbilityInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          weaponAbilityInfo_ = value;
-          onChanged();
-        } else {
-          weaponAbilityInfoBuilder_.setMessage(value);
-        }
-
+      public Builder clearWeaponEntityId() {
+        
+        weaponEntityId_ = 0;
+        onChanged();
         return this;
       }
+
+      private long avatarGuid_ ;
       /**
-       * <code>.AbilitySyncStateInfo weapon_ability_info = 15;</code>
+       * <pre>
+       * Offset: 0x60
+       * </pre>
+       *
+       * <code>uint64 avatar_guid = 7;</code>
+       * @return The avatarGuid.
        */
-      public Builder setWeaponAbilityInfo(
-          emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder builderForValue) {
-        if (weaponAbilityInfoBuilder_ == null) {
-          weaponAbilityInfo_ = builderForValue.build();
-          onChanged();
-        } else {
-          weaponAbilityInfoBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
+      @java.lang.Override
+      public long getAvatarGuid() {
+        return avatarGuid_;
       }
       /**
-       * <code>.AbilitySyncStateInfo weapon_ability_info = 15;</code>
+       * <pre>
+       * Offset: 0x60
+       * </pre>
+       *
+       * <code>uint64 avatar_guid = 7;</code>
+       * @param value The avatarGuid to set.
+       * @return This builder for chaining.
        */
-      public Builder mergeWeaponAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
-        if (weaponAbilityInfoBuilder_ == null) {
-          if (weaponAbilityInfo_ != null) {
-            weaponAbilityInfo_ =
-              emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.newBuilder(weaponAbilityInfo_).mergeFrom(value).buildPartial();
-          } else {
-            weaponAbilityInfo_ = value;
-          }
-          onChanged();
-        } else {
-          weaponAbilityInfoBuilder_.mergeFrom(value);
-        }
-
+      public Builder setAvatarGuid(long value) {
+        
+        avatarGuid_ = value;
+        onChanged();
         return this;
       }
       /**
-       * <code>.AbilitySyncStateInfo weapon_ability_info = 15;</code>
+       * <pre>
+       * Offset: 0x60
+       * </pre>
+       *
+       * <code>uint64 avatar_guid = 7;</code>
+       * @return This builder for chaining.
        */
-      public Builder clearWeaponAbilityInfo() {
-        if (weaponAbilityInfoBuilder_ == null) {
-          weaponAbilityInfo_ = null;
-          onChanged();
-        } else {
-          weaponAbilityInfo_ = null;
-          weaponAbilityInfoBuilder_ = null;
-        }
-
+      public Builder clearAvatarGuid() {
+        
+        avatarGuid_ = 0L;
+        onChanged();
         return this;
       }
+
+      private int playerUid_ ;
       /**
-       * <code>.AbilitySyncStateInfo weapon_ability_info = 15;</code>
+       * <pre>
+       * Offset: 0x68
+       * </pre>
+       *
+       * <code>uint32 player_uid = 10;</code>
+       * @return The playerUid.
        */
-      public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder getWeaponAbilityInfoBuilder() {
-        
-        onChanged();
-        return getWeaponAbilityInfoFieldBuilder().getBuilder();
+      @java.lang.Override
+      public int getPlayerUid() {
+        return playerUid_;
       }
       /**
-       * <code>.AbilitySyncStateInfo weapon_ability_info = 15;</code>
+       * <pre>
+       * Offset: 0x68
+       * </pre>
+       *
+       * <code>uint32 player_uid = 10;</code>
+       * @param value The playerUid to set.
+       * @return This builder for chaining.
        */
-      public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getWeaponAbilityInfoOrBuilder() {
-        if (weaponAbilityInfoBuilder_ != null) {
-          return weaponAbilityInfoBuilder_.getMessageOrBuilder();
-        } else {
-          return weaponAbilityInfo_ == null ?
-              emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : weaponAbilityInfo_;
-        }
+      public Builder setPlayerUid(int value) {
+        
+        playerUid_ = value;
+        onChanged();
+        return this;
       }
       /**
-       * <code>.AbilitySyncStateInfo weapon_ability_info = 15;</code>
+       * <pre>
+       * Offset: 0x68
+       * </pre>
+       *
+       * <code>uint32 player_uid = 10;</code>
+       * @return This builder for chaining.
        */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder> 
-          getWeaponAbilityInfoFieldBuilder() {
-        if (weaponAbilityInfoBuilder_ == null) {
-          weaponAbilityInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder>(
-                  getWeaponAbilityInfo(),
-                  getParentForChildren(),
-                  isClean());
-          weaponAbilityInfo_ = null;
-        }
-        return weaponAbilityInfoBuilder_;
+      public Builder clearPlayerUid() {
+        
+        playerUid_ = 0;
+        onChanged();
+        return this;
       }
 
       private boolean isReconnect_ ;
       /**
-       * <code>bool is_reconnect = 500;</code>
+       * <pre>
+       * Offset: 0x6C
+       * </pre>
+       *
+       * <code>bool is_reconnect = 11;</code>
        * @return The isReconnect.
        */
       @java.lang.Override
@@ -2525,7 +3016,11 @@ public boolean getIsReconnect() {
         return isReconnect_;
       }
       /**
-       * <code>bool is_reconnect = 500;</code>
+       * <pre>
+       * Offset: 0x6C
+       * </pre>
+       *
+       * <code>bool is_reconnect = 11;</code>
        * @param value The isReconnect to set.
        * @return This builder for chaining.
        */
@@ -2536,7 +3031,11 @@ public Builder setIsReconnect(boolean value) {
         return this;
       }
       /**
-       * <code>bool is_reconnect = 500;</code>
+       * <pre>
+       * Offset: 0x6C
+       * </pre>
+       *
+       * <code>bool is_reconnect = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsReconnect() {
@@ -2548,7 +3047,11 @@ public Builder clearIsReconnect() {
 
       private boolean isPlayerCurAvatar_ ;
       /**
-       * <code>bool is_player_cur_avatar = 13;</code>
+       * <pre>
+       * Offset: 0x6D
+       * </pre>
+       *
+       * <code>bool is_player_cur_avatar = 15;</code>
        * @return The isPlayerCurAvatar.
        */
       @java.lang.Override
@@ -2556,7 +3059,11 @@ public boolean getIsPlayerCurAvatar() {
         return isPlayerCurAvatar_;
       }
       /**
-       * <code>bool is_player_cur_avatar = 13;</code>
+       * <pre>
+       * Offset: 0x6D
+       * </pre>
+       *
+       * <code>bool is_player_cur_avatar = 15;</code>
        * @param value The isPlayerCurAvatar to set.
        * @return This builder for chaining.
        */
@@ -2567,7 +3074,11 @@ public Builder setIsPlayerCurAvatar(boolean value) {
         return this;
       }
       /**
-       * <code>bool is_player_cur_avatar = 13;</code>
+       * <pre>
+       * Offset: 0x6D
+       * </pre>
+       *
+       * <code>bool is_player_cur_avatar = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsPlayerCurAvatar() {
@@ -2579,7 +3090,11 @@ public Builder clearIsPlayerCurAvatar() {
 
       private boolean isOnScene_ ;
       /**
-       * <code>bool is_on_scene = 3;</code>
+       * <pre>
+       * Offset: 0x6E
+       * </pre>
+       *
+       * <code>bool is_on_scene = 36;</code>
        * @return The isOnScene.
        */
       @java.lang.Override
@@ -2587,7 +3102,11 @@ public boolean getIsOnScene() {
         return isOnScene_;
       }
       /**
-       * <code>bool is_on_scene = 3;</code>
+       * <pre>
+       * Offset: 0x6E
+       * </pre>
+       *
+       * <code>bool is_on_scene = 36;</code>
        * @param value The isOnScene to set.
        * @return This builder for chaining.
        */
@@ -2598,7 +3117,11 @@ public Builder setIsOnScene(boolean value) {
         return this;
       }
       /**
-       * <code>bool is_on_scene = 3;</code>
+       * <pre>
+       * Offset: 0x6E
+       * </pre>
+       *
+       * <code>bool is_on_scene = 36;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsOnScene() {
@@ -2607,6 +3130,135 @@ public Builder clearIsOnScene() {
         onChanged();
         return this;
       }
+
+      private long weaponGuid_ ;
+      /**
+       * <pre>
+       * Offset: 0x70
+       * </pre>
+       *
+       * <code>uint64 weapon_guid = 13;</code>
+       * @return The weaponGuid.
+       */
+      @java.lang.Override
+      public long getWeaponGuid() {
+        return weaponGuid_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x70
+       * </pre>
+       *
+       * <code>uint64 weapon_guid = 13;</code>
+       * @param value The weaponGuid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setWeaponGuid(long value) {
+        
+        weaponGuid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x70
+       * </pre>
+       *
+       * <code>uint64 weapon_guid = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearWeaponGuid() {
+        
+        weaponGuid_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private int sceneId_ ;
+      /**
+       * <pre>
+       * Offset: 0x78
+       * </pre>
+       *
+       * <code>uint32 scene_id = 8;</code>
+       * @return The sceneId.
+       */
+      @java.lang.Override
+      public int getSceneId() {
+        return sceneId_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x78
+       * </pre>
+       *
+       * <code>uint32 scene_id = 8;</code>
+       * @param value The sceneId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSceneId(int value) {
+        
+        sceneId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x78
+       * </pre>
+       *
+       * <code>uint32 scene_id = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearSceneId() {
+        
+        sceneId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int entityId_ ;
+      /**
+       * <pre>
+       * Offset: 0x7C
+       * </pre>
+       *
+       * <code>uint32 entity_id = 14;</code>
+       * @return The entityId.
+       */
+      @java.lang.Override
+      public int getEntityId() {
+        return entityId_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x7C
+       * </pre>
+       *
+       * <code>uint32 entity_id = 14;</code>
+       * @param value The entityId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setEntityId(int value) {
+        
+        entityId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x7C
+       * </pre>
+       *
+       * <code>uint32 entity_id = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEntityId() {
+        
+        entityId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -2678,21 +3330,21 @@ public emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar getDe
       ".proto\032\032AbilitySyncStateInfo.proto\032\020Serv" +
       "erBuff.proto\032\020AvatarInfo.proto\032\031AbilityC" +
       "ontrolBlock.proto\032\025SceneAvatarInfo.proto" +
-      "\"\230\004\n\017SceneTeamAvatar\022+\n\021scene_entity_inf" +
-      "o\030\002 \001(\0132\020.SceneEntityInfo\022\021\n\tentity_id\030\004" +
-      " \001(\r\022\020\n\010scene_id\030\t \001(\r\022%\n\020server_buff_li" +
-      "st\030n \003(\0132\013.ServerBuff\022\030\n\020weapon_entity_i" +
-      "d\030\n \001(\r\022\022\n\nplayer_uid\030\014 \001(\r\022\023\n\013avatar_gu" +
-      "id\030\005 \001(\004\022\023\n\013weapon_guid\030\006 \001(\004\0223\n\025ability" +
-      "_control_block\030\013 \001(\0132\024.AbilityControlBlo" +
-      "ck\022+\n\021scene_avatar_info\030\010 \001(\0132\020.SceneAva" +
-      "tarInfo\022 \n\013avatar_info\030\016 \001(\0132\013.AvatarInf" +
-      "o\0222\n\023avatar_ability_info\030\007 \001(\0132\025.Ability" +
-      "SyncStateInfo\0222\n\023weapon_ability_info\030\017 \001" +
-      "(\0132\025.AbilitySyncStateInfo\022\025\n\014is_reconnec" +
-      "t\030\364\003 \001(\010\022\034\n\024is_player_cur_avatar\030\r \001(\010\022\023" +
-      "\n\013is_on_scene\030\003 \001(\010B\033\n\031emu.grasscutter.n" +
-      "et.protob\006proto3"
+      "\"\227\004\n\017SceneTeamAvatar\022+\n\021scene_avatar_inf" +
+      "o\030\014 \001(\0132\020.SceneAvatarInfo\0222\n\023weapon_abil" +
+      "ity_info\030\006 \001(\0132\025.AbilitySyncStateInfo\022%\n" +
+      "\020server_buff_list\030\004 \003(\0132\013.ServerBuff\0223\n\025" +
+      "ability_control_block\030\005 \001(\0132\024.AbilityCon" +
+      "trolBlock\0222\n\023avatar_ability_info\030\001 \001(\0132\025" +
+      ".AbilitySyncStateInfo\022+\n\021scene_entity_in" +
+      "fo\030\t \001(\0132\020.SceneEntityInfo\022 \n\013avatar_inf" +
+      "o\030\002 \001(\0132\013.AvatarInfo\022\030\n\020weapon_entity_id" +
+      "\030\003 \001(\r\022\023\n\013avatar_guid\030\007 \001(\004\022\022\n\nplayer_ui" +
+      "d\030\n \001(\r\022\024\n\014is_reconnect\030\013 \001(\010\022\034\n\024is_play" +
+      "er_cur_avatar\030\017 \001(\010\022\023\n\013is_on_scene\030$ \001(\010" +
+      "\022\023\n\013weapon_guid\030\r \001(\004\022\020\n\010scene_id\030\010 \001(\r\022" +
+      "\021\n\tentity_id\030\016 \001(\rB\033\n\031emu.grasscutter.ne" +
+      "t.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -2709,7 +3361,7 @@ public emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar getDe
     internal_static_SceneTeamAvatar_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SceneTeamAvatar_descriptor,
-        new java.lang.String[] { "SceneEntityInfo", "EntityId", "SceneId", "ServerBuffList", "WeaponEntityId", "PlayerUid", "AvatarGuid", "WeaponGuid", "AbilityControlBlock", "SceneAvatarInfo", "AvatarInfo", "AvatarAbilityInfo", "WeaponAbilityInfo", "IsReconnect", "IsPlayerCurAvatar", "IsOnScene", });
+        new java.lang.String[] { "SceneAvatarInfo", "WeaponAbilityInfo", "ServerBuffList", "AbilityControlBlock", "AvatarAbilityInfo", "SceneEntityInfo", "AvatarInfo", "WeaponEntityId", "AvatarGuid", "PlayerUid", "IsReconnect", "IsPlayerCurAvatar", "IsOnScene", "WeaponGuid", "SceneId", "EntityId", });
     emu.grasscutter.net.proto.SceneEntityInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.ServerBuffOuterClass.getDescriptor();
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SceneTeamUpdateNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneTeamUpdateNotifyOuterClass.java
index 0e3ee126cb5..9c3161d2b43 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneTeamUpdateNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneTeamUpdateNotifyOuterClass.java
@@ -19,38 +19,62 @@ public interface SceneTeamUpdateNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 1;</code>
      */
     java.util.List<emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar> 
         getSceneTeamAvatarListList();
     /**
-     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 1;</code>
      */
     emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar getSceneTeamAvatarList(int index);
     /**
-     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 1;</code>
      */
     int getSceneTeamAvatarListCount();
     /**
-     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 1;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatarOrBuilder> 
         getSceneTeamAvatarListOrBuilderList();
     /**
-     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 1;</code>
      */
     emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatarOrBuilder getSceneTeamAvatarListOrBuilder(
         int index);
 
     /**
-     * <code>bool is_in_mp = 11;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>bool is_in_mp = 8;</code>
      * @return The isInMp.
      */
     boolean getIsInMp();
   }
   /**
    * <pre>
-   * CmdId: 1778
+   * CmdId: 1067
    * </pre>
    *
    * Protobuf type {@code SceneTeamUpdateNotify}
@@ -99,7 +123,7 @@ private SceneTeamUpdateNotify(
             case 0:
               done = true;
               break;
-            case 50: {
+            case 10: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 sceneTeamAvatarList_ = new java.util.ArrayList<emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar>();
                 mutable_bitField0_ |= 0x00000001;
@@ -108,7 +132,7 @@ private SceneTeamUpdateNotify(
                   input.readMessage(emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar.parser(), extensionRegistry));
               break;
             }
-            case 88: {
+            case 64: {
 
               isInMp_ = input.readBool();
               break;
@@ -148,17 +172,25 @@ private SceneTeamUpdateNotify(
               emu.grasscutter.net.proto.SceneTeamUpdateNotifyOuterClass.SceneTeamUpdateNotify.class, emu.grasscutter.net.proto.SceneTeamUpdateNotifyOuterClass.SceneTeamUpdateNotify.Builder.class);
     }
 
-    public static final int SCENE_TEAM_AVATAR_LIST_FIELD_NUMBER = 6;
+    public static final int SCENE_TEAM_AVATAR_LIST_FIELD_NUMBER = 1;
     private java.util.List<emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar> sceneTeamAvatarList_;
     /**
-     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 1;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar> getSceneTeamAvatarListList() {
       return sceneTeamAvatarList_;
     }
     /**
-     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 1;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatarOrBuilder> 
@@ -166,21 +198,33 @@ public java.util.List<emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneT
       return sceneTeamAvatarList_;
     }
     /**
-     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 1;</code>
      */
     @java.lang.Override
     public int getSceneTeamAvatarListCount() {
       return sceneTeamAvatarList_.size();
     }
     /**
-     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 1;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar getSceneTeamAvatarList(int index) {
       return sceneTeamAvatarList_.get(index);
     }
     /**
-     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 1;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatarOrBuilder getSceneTeamAvatarListOrBuilder(
@@ -188,10 +232,14 @@ public emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatarOrBuil
       return sceneTeamAvatarList_.get(index);
     }
 
-    public static final int IS_IN_MP_FIELD_NUMBER = 11;
+    public static final int IS_IN_MP_FIELD_NUMBER = 8;
     private boolean isInMp_;
     /**
-     * <code>bool is_in_mp = 11;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>bool is_in_mp = 8;</code>
      * @return The isInMp.
      */
     @java.lang.Override
@@ -214,10 +262,10 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < sceneTeamAvatarList_.size(); i++) {
-        output.writeMessage(6, sceneTeamAvatarList_.get(i));
+        output.writeMessage(1, sceneTeamAvatarList_.get(i));
       }
       if (isInMp_ != false) {
-        output.writeBool(11, isInMp_);
+        output.writeBool(8, isInMp_);
       }
       unknownFields.writeTo(output);
     }
@@ -230,11 +278,11 @@ public int getSerializedSize() {
       size = 0;
       for (int i = 0; i < sceneTeamAvatarList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, sceneTeamAvatarList_.get(i));
+          .computeMessageSize(1, sceneTeamAvatarList_.get(i));
       }
       if (isInMp_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(11, isInMp_);
+          .computeBoolSize(8, isInMp_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -370,7 +418,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 1778
+     * CmdId: 1067
      * </pre>
      *
      * Protobuf type {@code SceneTeamUpdateNotify}
@@ -576,7 +624,11 @@ private void ensureSceneTeamAvatarListIsMutable() {
           emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar, emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar.Builder, emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatarOrBuilder> sceneTeamAvatarListBuilder_;
 
       /**
-       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 1;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar> getSceneTeamAvatarListList() {
         if (sceneTeamAvatarListBuilder_ == null) {
@@ -586,7 +638,11 @@ public java.util.List<emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneT
         }
       }
       /**
-       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 1;</code>
        */
       public int getSceneTeamAvatarListCount() {
         if (sceneTeamAvatarListBuilder_ == null) {
@@ -596,7 +652,11 @@ public int getSceneTeamAvatarListCount() {
         }
       }
       /**
-       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 1;</code>
        */
       public emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar getSceneTeamAvatarList(int index) {
         if (sceneTeamAvatarListBuilder_ == null) {
@@ -606,7 +666,11 @@ public emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar getSc
         }
       }
       /**
-       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 1;</code>
        */
       public Builder setSceneTeamAvatarList(
           int index, emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar value) {
@@ -623,7 +687,11 @@ public Builder setSceneTeamAvatarList(
         return this;
       }
       /**
-       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 1;</code>
        */
       public Builder setSceneTeamAvatarList(
           int index, emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar.Builder builderForValue) {
@@ -637,7 +705,11 @@ public Builder setSceneTeamAvatarList(
         return this;
       }
       /**
-       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 1;</code>
        */
       public Builder addSceneTeamAvatarList(emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar value) {
         if (sceneTeamAvatarListBuilder_ == null) {
@@ -653,7 +725,11 @@ public Builder addSceneTeamAvatarList(emu.grasscutter.net.proto.SceneTeamAvatarO
         return this;
       }
       /**
-       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 1;</code>
        */
       public Builder addSceneTeamAvatarList(
           int index, emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar value) {
@@ -670,7 +746,11 @@ public Builder addSceneTeamAvatarList(
         return this;
       }
       /**
-       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 1;</code>
        */
       public Builder addSceneTeamAvatarList(
           emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar.Builder builderForValue) {
@@ -684,7 +764,11 @@ public Builder addSceneTeamAvatarList(
         return this;
       }
       /**
-       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 1;</code>
        */
       public Builder addSceneTeamAvatarList(
           int index, emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar.Builder builderForValue) {
@@ -698,7 +782,11 @@ public Builder addSceneTeamAvatarList(
         return this;
       }
       /**
-       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 1;</code>
        */
       public Builder addAllSceneTeamAvatarList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar> values) {
@@ -713,7 +801,11 @@ public Builder addAllSceneTeamAvatarList(
         return this;
       }
       /**
-       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 1;</code>
        */
       public Builder clearSceneTeamAvatarList() {
         if (sceneTeamAvatarListBuilder_ == null) {
@@ -726,7 +818,11 @@ public Builder clearSceneTeamAvatarList() {
         return this;
       }
       /**
-       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 1;</code>
        */
       public Builder removeSceneTeamAvatarList(int index) {
         if (sceneTeamAvatarListBuilder_ == null) {
@@ -739,14 +835,22 @@ public Builder removeSceneTeamAvatarList(int index) {
         return this;
       }
       /**
-       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 1;</code>
        */
       public emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar.Builder getSceneTeamAvatarListBuilder(
           int index) {
         return getSceneTeamAvatarListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 1;</code>
        */
       public emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatarOrBuilder getSceneTeamAvatarListOrBuilder(
           int index) {
@@ -756,7 +860,11 @@ public emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatarOrBuil
         }
       }
       /**
-       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 1;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatarOrBuilder> 
            getSceneTeamAvatarListOrBuilderList() {
@@ -767,14 +875,22 @@ public emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatarOrBuil
         }
       }
       /**
-       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 1;</code>
        */
       public emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar.Builder addSceneTeamAvatarListBuilder() {
         return getSceneTeamAvatarListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar.getDefaultInstance());
       }
       /**
-       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 1;</code>
        */
       public emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar.Builder addSceneTeamAvatarListBuilder(
           int index) {
@@ -782,7 +898,11 @@ public emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar.Build
             index, emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar.getDefaultInstance());
       }
       /**
-       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 1;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar.Builder> 
            getSceneTeamAvatarListBuilderList() {
@@ -805,7 +925,11 @@ public emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar.Build
 
       private boolean isInMp_ ;
       /**
-       * <code>bool is_in_mp = 11;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>bool is_in_mp = 8;</code>
        * @return The isInMp.
        */
       @java.lang.Override
@@ -813,7 +937,11 @@ public boolean getIsInMp() {
         return isInMp_;
       }
       /**
-       * <code>bool is_in_mp = 11;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>bool is_in_mp = 8;</code>
        * @param value The isInMp to set.
        * @return This builder for chaining.
        */
@@ -824,7 +952,11 @@ public Builder setIsInMp(boolean value) {
         return this;
       }
       /**
-       * <code>bool is_in_mp = 11;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>bool is_in_mp = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsInMp() {
@@ -902,8 +1034,8 @@ public emu.grasscutter.net.proto.SceneTeamUpdateNotifyOuterClass.SceneTeamUpdate
     java.lang.String[] descriptorData = {
       "\n\033SceneTeamUpdateNotify.proto\032\025SceneTeam" +
       "Avatar.proto\"[\n\025SceneTeamUpdateNotify\0220\n" +
-      "\026scene_team_avatar_list\030\006 \003(\0132\020.SceneTea" +
-      "mAvatar\022\020\n\010is_in_mp\030\013 \001(\010B\033\n\031emu.grasscu" +
+      "\026scene_team_avatar_list\030\001 \003(\0132\020.SceneTea" +
+      "mAvatar\022\020\n\010is_in_mp\030\010 \001(\010B\033\n\031emu.grasscu" +
       "tter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SceneTimeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneTimeNotifyOuterClass.java
index a6ba74c3185..1e73eb12707 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneTimeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneTimeNotifyOuterClass.java
@@ -19,26 +19,38 @@ public interface SceneTimeNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 scene_id = 7;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 scene_id = 13;</code>
      * @return The sceneId.
      */
     int getSceneId();
 
     /**
-     * <code>uint64 scene_time = 11;</code>
-     * @return The sceneTime.
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>bool is_paused = 4;</code>
+     * @return The isPaused.
      */
-    long getSceneTime();
+    boolean getIsPaused();
 
     /**
-     * <code>bool is_paused = 13;</code>
-     * @return The isPaused.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint64 scene_time = 6;</code>
+     * @return The sceneTime.
      */
-    boolean getIsPaused();
+    long getSceneTime();
   }
   /**
    * <pre>
-   * CmdId: 29187
+   * CmdId: 1184
    * </pre>
    *
    * Protobuf type {@code SceneTimeNotify}
@@ -85,19 +97,19 @@ private SceneTimeNotify(
             case 0:
               done = true;
               break;
-            case 56: {
+            case 32: {
 
-              sceneId_ = input.readUInt32();
+              isPaused_ = input.readBool();
               break;
             }
-            case 88: {
+            case 48: {
 
               sceneTime_ = input.readUInt64();
               break;
             }
             case 104: {
 
-              isPaused_ = input.readBool();
+              sceneId_ = input.readUInt32();
               break;
             }
             default: {
@@ -132,10 +144,14 @@ private SceneTimeNotify(
               emu.grasscutter.net.proto.SceneTimeNotifyOuterClass.SceneTimeNotify.class, emu.grasscutter.net.proto.SceneTimeNotifyOuterClass.SceneTimeNotify.Builder.class);
     }
 
-    public static final int SCENE_ID_FIELD_NUMBER = 7;
+    public static final int SCENE_ID_FIELD_NUMBER = 13;
     private int sceneId_;
     /**
-     * <code>uint32 scene_id = 7;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 scene_id = 13;</code>
      * @return The sceneId.
      */
     @java.lang.Override
@@ -143,26 +159,34 @@ public int getSceneId() {
       return sceneId_;
     }
 
-    public static final int SCENE_TIME_FIELD_NUMBER = 11;
-    private long sceneTime_;
+    public static final int IS_PAUSED_FIELD_NUMBER = 4;
+    private boolean isPaused_;
     /**
-     * <code>uint64 scene_time = 11;</code>
-     * @return The sceneTime.
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>bool is_paused = 4;</code>
+     * @return The isPaused.
      */
     @java.lang.Override
-    public long getSceneTime() {
-      return sceneTime_;
+    public boolean getIsPaused() {
+      return isPaused_;
     }
 
-    public static final int IS_PAUSED_FIELD_NUMBER = 13;
-    private boolean isPaused_;
+    public static final int SCENE_TIME_FIELD_NUMBER = 6;
+    private long sceneTime_;
     /**
-     * <code>bool is_paused = 13;</code>
-     * @return The isPaused.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint64 scene_time = 6;</code>
+     * @return The sceneTime.
      */
     @java.lang.Override
-    public boolean getIsPaused() {
-      return isPaused_;
+    public long getSceneTime() {
+      return sceneTime_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -179,14 +203,14 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (sceneId_ != 0) {
-        output.writeUInt32(7, sceneId_);
+      if (isPaused_ != false) {
+        output.writeBool(4, isPaused_);
       }
       if (sceneTime_ != 0L) {
-        output.writeUInt64(11, sceneTime_);
+        output.writeUInt64(6, sceneTime_);
       }
-      if (isPaused_ != false) {
-        output.writeBool(13, isPaused_);
+      if (sceneId_ != 0) {
+        output.writeUInt32(13, sceneId_);
       }
       unknownFields.writeTo(output);
     }
@@ -197,17 +221,17 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (sceneId_ != 0) {
+      if (isPaused_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, sceneId_);
+          .computeBoolSize(4, isPaused_);
       }
       if (sceneTime_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(11, sceneTime_);
+          .computeUInt64Size(6, sceneTime_);
       }
-      if (isPaused_ != false) {
+      if (sceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(13, isPaused_);
+          .computeUInt32Size(13, sceneId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -226,10 +250,10 @@ public boolean equals(final java.lang.Object obj) {
 
       if (getSceneId()
           != other.getSceneId()) return false;
-      if (getSceneTime()
-          != other.getSceneTime()) return false;
       if (getIsPaused()
           != other.getIsPaused()) return false;
+      if (getSceneTime()
+          != other.getSceneTime()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -243,12 +267,12 @@ public int hashCode() {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getSceneId();
-      hash = (37 * hash) + SCENE_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getSceneTime());
       hash = (37 * hash) + IS_PAUSED_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsPaused());
+      hash = (37 * hash) + SCENE_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getSceneTime());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -346,7 +370,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 29187
+     * CmdId: 1184
      * </pre>
      *
      * Protobuf type {@code SceneTimeNotify}
@@ -388,10 +412,10 @@ public Builder clear() {
         super.clear();
         sceneId_ = 0;
 
-        sceneTime_ = 0L;
-
         isPaused_ = false;
 
+        sceneTime_ = 0L;
+
         return this;
       }
 
@@ -419,8 +443,8 @@ public emu.grasscutter.net.proto.SceneTimeNotifyOuterClass.SceneTimeNotify build
       public emu.grasscutter.net.proto.SceneTimeNotifyOuterClass.SceneTimeNotify buildPartial() {
         emu.grasscutter.net.proto.SceneTimeNotifyOuterClass.SceneTimeNotify result = new emu.grasscutter.net.proto.SceneTimeNotifyOuterClass.SceneTimeNotify(this);
         result.sceneId_ = sceneId_;
-        result.sceneTime_ = sceneTime_;
         result.isPaused_ = isPaused_;
+        result.sceneTime_ = sceneTime_;
         onBuilt();
         return result;
       }
@@ -472,12 +496,12 @@ public Builder mergeFrom(emu.grasscutter.net.proto.SceneTimeNotifyOuterClass.Sce
         if (other.getSceneId() != 0) {
           setSceneId(other.getSceneId());
         }
-        if (other.getSceneTime() != 0L) {
-          setSceneTime(other.getSceneTime());
-        }
         if (other.getIsPaused() != false) {
           setIsPaused(other.getIsPaused());
         }
+        if (other.getSceneTime() != 0L) {
+          setSceneTime(other.getSceneTime());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -509,7 +533,11 @@ public Builder mergeFrom(
 
       private int sceneId_ ;
       /**
-       * <code>uint32 scene_id = 7;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 scene_id = 13;</code>
        * @return The sceneId.
        */
       @java.lang.Override
@@ -517,7 +545,11 @@ public int getSceneId() {
         return sceneId_;
       }
       /**
-       * <code>uint32 scene_id = 7;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 scene_id = 13;</code>
        * @param value The sceneId to set.
        * @return This builder for chaining.
        */
@@ -528,7 +560,11 @@ public Builder setSceneId(int value) {
         return this;
       }
       /**
-       * <code>uint32 scene_id = 7;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 scene_id = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearSceneId() {
@@ -538,64 +574,88 @@ public Builder clearSceneId() {
         return this;
       }
 
-      private long sceneTime_ ;
+      private boolean isPaused_ ;
       /**
-       * <code>uint64 scene_time = 11;</code>
-       * @return The sceneTime.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>bool is_paused = 4;</code>
+       * @return The isPaused.
        */
       @java.lang.Override
-      public long getSceneTime() {
-        return sceneTime_;
+      public boolean getIsPaused() {
+        return isPaused_;
       }
       /**
-       * <code>uint64 scene_time = 11;</code>
-       * @param value The sceneTime to set.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>bool is_paused = 4;</code>
+       * @param value The isPaused to set.
        * @return This builder for chaining.
        */
-      public Builder setSceneTime(long value) {
+      public Builder setIsPaused(boolean value) {
         
-        sceneTime_ = value;
+        isPaused_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint64 scene_time = 11;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>bool is_paused = 4;</code>
        * @return This builder for chaining.
        */
-      public Builder clearSceneTime() {
+      public Builder clearIsPaused() {
         
-        sceneTime_ = 0L;
+        isPaused_ = false;
         onChanged();
         return this;
       }
 
-      private boolean isPaused_ ;
+      private long sceneTime_ ;
       /**
-       * <code>bool is_paused = 13;</code>
-       * @return The isPaused.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint64 scene_time = 6;</code>
+       * @return The sceneTime.
        */
       @java.lang.Override
-      public boolean getIsPaused() {
-        return isPaused_;
+      public long getSceneTime() {
+        return sceneTime_;
       }
       /**
-       * <code>bool is_paused = 13;</code>
-       * @param value The isPaused to set.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint64 scene_time = 6;</code>
+       * @param value The sceneTime to set.
        * @return This builder for chaining.
        */
-      public Builder setIsPaused(boolean value) {
+      public Builder setSceneTime(long value) {
         
-        isPaused_ = value;
+        sceneTime_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bool is_paused = 13;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint64 scene_time = 6;</code>
        * @return This builder for chaining.
        */
-      public Builder clearIsPaused() {
+      public Builder clearSceneTime() {
         
-        isPaused_ = false;
+        sceneTime_ = 0L;
         onChanged();
         return this;
       }
@@ -667,8 +727,8 @@ public emu.grasscutter.net.proto.SceneTimeNotifyOuterClass.SceneTimeNotify getDe
   static {
     java.lang.String[] descriptorData = {
       "\n\025SceneTimeNotify.proto\"J\n\017SceneTimeNoti" +
-      "fy\022\020\n\010scene_id\030\007 \001(\r\022\022\n\nscene_time\030\013 \001(\004" +
-      "\022\021\n\tis_paused\030\r \001(\010B\033\n\031emu.grasscutter.n" +
+      "fy\022\020\n\010scene_id\030\r \001(\r\022\021\n\tis_paused\030\004 \001(\010\022" +
+      "\022\n\nscene_time\030\006 \001(\004B\033\n\031emu.grasscutter.n" +
       "et.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -680,7 +740,7 @@ public emu.grasscutter.net.proto.SceneTimeNotifyOuterClass.SceneTimeNotify getDe
     internal_static_SceneTimeNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SceneTimeNotify_descriptor,
-        new java.lang.String[] { "SceneId", "SceneTime", "IsPaused", });
+        new java.lang.String[] { "SceneId", "IsPaused", "SceneTime", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SceneTransToPointReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneTransToPointReqOuterClass.java
index e6fae90c2ce..d8a02619854 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneTransToPointReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneTransToPointReqOuterClass.java
@@ -19,20 +19,28 @@ public interface SceneTransToPointReqOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 scene_id = 7;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 scene_id = 3;</code>
      * @return The sceneId.
      */
     int getSceneId();
 
     /**
-     * <code>uint32 point_id = 11;</code>
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 point_id = 13;</code>
      * @return The pointId.
      */
     int getPointId();
   }
   /**
    * <pre>
-   * CmdId: 4027
+   * CmdId: 5345
    * </pre>
    *
    * Protobuf type {@code SceneTransToPointReq}
@@ -79,12 +87,12 @@ private SceneTransToPointReq(
             case 0:
               done = true;
               break;
-            case 56: {
+            case 24: {
 
               sceneId_ = input.readUInt32();
               break;
             }
-            case 88: {
+            case 104: {
 
               pointId_ = input.readUInt32();
               break;
@@ -121,10 +129,14 @@ private SceneTransToPointReq(
               emu.grasscutter.net.proto.SceneTransToPointReqOuterClass.SceneTransToPointReq.class, emu.grasscutter.net.proto.SceneTransToPointReqOuterClass.SceneTransToPointReq.Builder.class);
     }
 
-    public static final int SCENE_ID_FIELD_NUMBER = 7;
+    public static final int SCENE_ID_FIELD_NUMBER = 3;
     private int sceneId_;
     /**
-     * <code>uint32 scene_id = 7;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 scene_id = 3;</code>
      * @return The sceneId.
      */
     @java.lang.Override
@@ -132,10 +144,14 @@ public int getSceneId() {
       return sceneId_;
     }
 
-    public static final int POINT_ID_FIELD_NUMBER = 11;
+    public static final int POINT_ID_FIELD_NUMBER = 13;
     private int pointId_;
     /**
-     * <code>uint32 point_id = 11;</code>
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 point_id = 13;</code>
      * @return The pointId.
      */
     @java.lang.Override
@@ -158,10 +174,10 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (sceneId_ != 0) {
-        output.writeUInt32(7, sceneId_);
+        output.writeUInt32(3, sceneId_);
       }
       if (pointId_ != 0) {
-        output.writeUInt32(11, pointId_);
+        output.writeUInt32(13, pointId_);
       }
       unknownFields.writeTo(output);
     }
@@ -174,11 +190,11 @@ public int getSerializedSize() {
       size = 0;
       if (sceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, sceneId_);
+          .computeUInt32Size(3, sceneId_);
       }
       if (pointId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, pointId_);
+          .computeUInt32Size(13, pointId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -311,7 +327,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 4027
+     * CmdId: 5345
      * </pre>
      *
      * Protobuf type {@code SceneTransToPointReq}
@@ -468,7 +484,11 @@ public Builder mergeFrom(
 
       private int sceneId_ ;
       /**
-       * <code>uint32 scene_id = 7;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 scene_id = 3;</code>
        * @return The sceneId.
        */
       @java.lang.Override
@@ -476,7 +496,11 @@ public int getSceneId() {
         return sceneId_;
       }
       /**
-       * <code>uint32 scene_id = 7;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 scene_id = 3;</code>
        * @param value The sceneId to set.
        * @return This builder for chaining.
        */
@@ -487,7 +511,11 @@ public Builder setSceneId(int value) {
         return this;
       }
       /**
-       * <code>uint32 scene_id = 7;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 scene_id = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearSceneId() {
@@ -499,7 +527,11 @@ public Builder clearSceneId() {
 
       private int pointId_ ;
       /**
-       * <code>uint32 point_id = 11;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 point_id = 13;</code>
        * @return The pointId.
        */
       @java.lang.Override
@@ -507,7 +539,11 @@ public int getPointId() {
         return pointId_;
       }
       /**
-       * <code>uint32 point_id = 11;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 point_id = 13;</code>
        * @param value The pointId to set.
        * @return This builder for chaining.
        */
@@ -518,7 +554,11 @@ public Builder setPointId(int value) {
         return this;
       }
       /**
-       * <code>uint32 point_id = 11;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 point_id = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearPointId() {
@@ -595,8 +635,8 @@ public emu.grasscutter.net.proto.SceneTransToPointReqOuterClass.SceneTransToPoin
   static {
     java.lang.String[] descriptorData = {
       "\n\032SceneTransToPointReq.proto\":\n\024SceneTra" +
-      "nsToPointReq\022\020\n\010scene_id\030\007 \001(\r\022\020\n\010point_" +
-      "id\030\013 \001(\rB\033\n\031emu.grasscutter.net.protob\006p" +
+      "nsToPointReq\022\020\n\010scene_id\030\003 \001(\r\022\020\n\010point_" +
+      "id\030\r \001(\rB\033\n\031emu.grasscutter.net.protob\006p" +
       "roto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SceneTransToPointRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneTransToPointRspOuterClass.java
index edc5ac01013..c2840a576ad 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneTransToPointRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneTransToPointRspOuterClass.java
@@ -19,26 +19,38 @@ public interface SceneTransToPointRspOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 scene_id = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 point_id = 11;</code>
+     * @return The pointId.
+     */
+    int getPointId();
+
+    /**
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 scene_id = 4;</code>
      * @return The sceneId.
      */
     int getSceneId();
 
     /**
-     * <code>int32 retcode = 10;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>int32 retcode = 15;</code>
      * @return The retcode.
      */
     int getRetcode();
-
-    /**
-     * <code>uint32 point_id = 11;</code>
-     * @return The pointId.
-     */
-    int getPointId();
   }
   /**
    * <pre>
-   * CmdId: 24104
+   * CmdId: 8183
    * </pre>
    *
    * Protobuf type {@code SceneTransToPointRsp}
@@ -85,19 +97,19 @@ private SceneTransToPointRsp(
             case 0:
               done = true;
               break;
-            case 24: {
+            case 32: {
 
               sceneId_ = input.readUInt32();
               break;
             }
-            case 80: {
+            case 88: {
 
-              retcode_ = input.readInt32();
+              pointId_ = input.readUInt32();
               break;
             }
-            case 88: {
+            case 120: {
 
-              pointId_ = input.readUInt32();
+              retcode_ = input.readInt32();
               break;
             }
             default: {
@@ -132,10 +144,29 @@ private SceneTransToPointRsp(
               emu.grasscutter.net.proto.SceneTransToPointRspOuterClass.SceneTransToPointRsp.class, emu.grasscutter.net.proto.SceneTransToPointRspOuterClass.SceneTransToPointRsp.Builder.class);
     }
 
-    public static final int SCENE_ID_FIELD_NUMBER = 3;
+    public static final int POINT_ID_FIELD_NUMBER = 11;
+    private int pointId_;
+    /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 point_id = 11;</code>
+     * @return The pointId.
+     */
+    @java.lang.Override
+    public int getPointId() {
+      return pointId_;
+    }
+
+    public static final int SCENE_ID_FIELD_NUMBER = 4;
     private int sceneId_;
     /**
-     * <code>uint32 scene_id = 3;</code>
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 scene_id = 4;</code>
      * @return The sceneId.
      */
     @java.lang.Override
@@ -143,10 +174,14 @@ public int getSceneId() {
       return sceneId_;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 10;
+    public static final int RETCODE_FIELD_NUMBER = 15;
     private int retcode_;
     /**
-     * <code>int32 retcode = 10;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>int32 retcode = 15;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -154,17 +189,6 @@ public int getRetcode() {
       return retcode_;
     }
 
-    public static final int POINT_ID_FIELD_NUMBER = 11;
-    private int pointId_;
-    /**
-     * <code>uint32 point_id = 11;</code>
-     * @return The pointId.
-     */
-    @java.lang.Override
-    public int getPointId() {
-      return pointId_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -180,14 +204,14 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (sceneId_ != 0) {
-        output.writeUInt32(3, sceneId_);
-      }
-      if (retcode_ != 0) {
-        output.writeInt32(10, retcode_);
+        output.writeUInt32(4, sceneId_);
       }
       if (pointId_ != 0) {
         output.writeUInt32(11, pointId_);
       }
+      if (retcode_ != 0) {
+        output.writeInt32(15, retcode_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -199,16 +223,16 @@ public int getSerializedSize() {
       size = 0;
       if (sceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, sceneId_);
-      }
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(10, retcode_);
+          .computeUInt32Size(4, sceneId_);
       }
       if (pointId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(11, pointId_);
       }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(15, retcode_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -224,12 +248,12 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.SceneTransToPointRspOuterClass.SceneTransToPointRsp other = (emu.grasscutter.net.proto.SceneTransToPointRspOuterClass.SceneTransToPointRsp) obj;
 
+      if (getPointId()
+          != other.getPointId()) return false;
       if (getSceneId()
           != other.getSceneId()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
-      if (getPointId()
-          != other.getPointId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -241,12 +265,12 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + POINT_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getPointId();
       hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getSceneId();
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
-      hash = (37 * hash) + POINT_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getPointId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -344,7 +368,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 24104
+     * CmdId: 8183
      * </pre>
      *
      * Protobuf type {@code SceneTransToPointRsp}
@@ -384,12 +408,12 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        pointId_ = 0;
+
         sceneId_ = 0;
 
         retcode_ = 0;
 
-        pointId_ = 0;
-
         return this;
       }
 
@@ -416,9 +440,9 @@ public emu.grasscutter.net.proto.SceneTransToPointRspOuterClass.SceneTransToPoin
       @java.lang.Override
       public emu.grasscutter.net.proto.SceneTransToPointRspOuterClass.SceneTransToPointRsp buildPartial() {
         emu.grasscutter.net.proto.SceneTransToPointRspOuterClass.SceneTransToPointRsp result = new emu.grasscutter.net.proto.SceneTransToPointRspOuterClass.SceneTransToPointRsp(this);
+        result.pointId_ = pointId_;
         result.sceneId_ = sceneId_;
         result.retcode_ = retcode_;
-        result.pointId_ = pointId_;
         onBuilt();
         return result;
       }
@@ -467,15 +491,15 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.SceneTransToPointRspOuterClass.SceneTransToPointRsp other) {
         if (other == emu.grasscutter.net.proto.SceneTransToPointRspOuterClass.SceneTransToPointRsp.getDefaultInstance()) return this;
+        if (other.getPointId() != 0) {
+          setPointId(other.getPointId());
+        }
         if (other.getSceneId() != 0) {
           setSceneId(other.getSceneId());
         }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
-        if (other.getPointId() != 0) {
-          setPointId(other.getPointId());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -505,95 +529,131 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int sceneId_ ;
+      private int pointId_ ;
       /**
-       * <code>uint32 scene_id = 3;</code>
-       * @return The sceneId.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 point_id = 11;</code>
+       * @return The pointId.
        */
       @java.lang.Override
-      public int getSceneId() {
-        return sceneId_;
+      public int getPointId() {
+        return pointId_;
       }
       /**
-       * <code>uint32 scene_id = 3;</code>
-       * @param value The sceneId to set.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 point_id = 11;</code>
+       * @param value The pointId to set.
        * @return This builder for chaining.
        */
-      public Builder setSceneId(int value) {
+      public Builder setPointId(int value) {
         
-        sceneId_ = value;
+        pointId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 scene_id = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 point_id = 11;</code>
        * @return This builder for chaining.
        */
-      public Builder clearSceneId() {
+      public Builder clearPointId() {
         
-        sceneId_ = 0;
+        pointId_ = 0;
         onChanged();
         return this;
       }
 
-      private int retcode_ ;
+      private int sceneId_ ;
       /**
-       * <code>int32 retcode = 10;</code>
-       * @return The retcode.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 scene_id = 4;</code>
+       * @return The sceneId.
        */
       @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
+      public int getSceneId() {
+        return sceneId_;
       }
       /**
-       * <code>int32 retcode = 10;</code>
-       * @param value The retcode to set.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 scene_id = 4;</code>
+       * @param value The sceneId to set.
        * @return This builder for chaining.
        */
-      public Builder setRetcode(int value) {
+      public Builder setSceneId(int value) {
         
-        retcode_ = value;
+        sceneId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>int32 retcode = 10;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 scene_id = 4;</code>
        * @return This builder for chaining.
        */
-      public Builder clearRetcode() {
+      public Builder clearSceneId() {
         
-        retcode_ = 0;
+        sceneId_ = 0;
         onChanged();
         return this;
       }
 
-      private int pointId_ ;
+      private int retcode_ ;
       /**
-       * <code>uint32 point_id = 11;</code>
-       * @return The pointId.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>int32 retcode = 15;</code>
+       * @return The retcode.
        */
       @java.lang.Override
-      public int getPointId() {
-        return pointId_;
+      public int getRetcode() {
+        return retcode_;
       }
       /**
-       * <code>uint32 point_id = 11;</code>
-       * @param value The pointId to set.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>int32 retcode = 15;</code>
+       * @param value The retcode to set.
        * @return This builder for chaining.
        */
-      public Builder setPointId(int value) {
+      public Builder setRetcode(int value) {
         
-        pointId_ = value;
+        retcode_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 point_id = 11;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>int32 retcode = 15;</code>
        * @return This builder for chaining.
        */
-      public Builder clearPointId() {
+      public Builder clearRetcode() {
         
-        pointId_ = 0;
+        retcode_ = 0;
         onChanged();
         return this;
       }
@@ -665,8 +725,8 @@ public emu.grasscutter.net.proto.SceneTransToPointRspOuterClass.SceneTransToPoin
   static {
     java.lang.String[] descriptorData = {
       "\n\032SceneTransToPointRsp.proto\"K\n\024SceneTra" +
-      "nsToPointRsp\022\020\n\010scene_id\030\003 \001(\r\022\017\n\007retcod" +
-      "e\030\n \001(\005\022\020\n\010point_id\030\013 \001(\rB\033\n\031emu.grasscu" +
+      "nsToPointRsp\022\020\n\010point_id\030\013 \001(\r\022\020\n\010scene_" +
+      "id\030\004 \001(\r\022\017\n\007retcode\030\017 \001(\005B\033\n\031emu.grasscu" +
       "tter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -678,7 +738,7 @@ public emu.grasscutter.net.proto.SceneTransToPointRspOuterClass.SceneTransToPoin
     internal_static_SceneTransToPointRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SceneTransToPointRsp_descriptor,
-        new java.lang.String[] { "SceneId", "Retcode", "PointId", });
+        new java.lang.String[] { "PointId", "SceneId", "Retcode", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ServerGlobalValueChangeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ServerGlobalValueChangeNotifyOuterClass.java
index 76722b33fe7..1f1c91444bc 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ServerGlobalValueChangeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ServerGlobalValueChangeNotifyOuterClass.java
@@ -19,26 +19,38 @@ public interface ServerGlobalValueChangeNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 key_hash = 5;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>float value = 13;</code>
+     * @return The value.
+     */
+    float getValue();
+
+    /**
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 key_hash = 9;</code>
      * @return The keyHash.
      */
     int getKeyHash();
 
     /**
-     * <code>uint32 entity_id = 7;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 entity_id = 1;</code>
      * @return The entityId.
      */
     int getEntityId();
-
-    /**
-     * <code>float value = 9;</code>
-     * @return The value.
-     */
-    float getValue();
   }
   /**
    * <pre>
-   * CmdId: 25816
+   * CmdId: 29440
    * </pre>
    *
    * Protobuf type {@code ServerGlobalValueChangeNotify}
@@ -85,17 +97,17 @@ private ServerGlobalValueChangeNotify(
             case 0:
               done = true;
               break;
-            case 40: {
+            case 8: {
 
-              keyHash_ = input.readUInt32();
+              entityId_ = input.readUInt32();
               break;
             }
-            case 56: {
+            case 72: {
 
-              entityId_ = input.readUInt32();
+              keyHash_ = input.readUInt32();
               break;
             }
-            case 77: {
+            case 109: {
 
               value_ = input.readFloat();
               break;
@@ -132,10 +144,29 @@ private ServerGlobalValueChangeNotify(
               emu.grasscutter.net.proto.ServerGlobalValueChangeNotifyOuterClass.ServerGlobalValueChangeNotify.class, emu.grasscutter.net.proto.ServerGlobalValueChangeNotifyOuterClass.ServerGlobalValueChangeNotify.Builder.class);
     }
 
-    public static final int KEY_HASH_FIELD_NUMBER = 5;
+    public static final int VALUE_FIELD_NUMBER = 13;
+    private float value_;
+    /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>float value = 13;</code>
+     * @return The value.
+     */
+    @java.lang.Override
+    public float getValue() {
+      return value_;
+    }
+
+    public static final int KEY_HASH_FIELD_NUMBER = 9;
     private int keyHash_;
     /**
-     * <code>uint32 key_hash = 5;</code>
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 key_hash = 9;</code>
      * @return The keyHash.
      */
     @java.lang.Override
@@ -143,10 +174,14 @@ public int getKeyHash() {
       return keyHash_;
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 7;
+    public static final int ENTITY_ID_FIELD_NUMBER = 1;
     private int entityId_;
     /**
-     * <code>uint32 entity_id = 7;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 entity_id = 1;</code>
      * @return The entityId.
      */
     @java.lang.Override
@@ -154,17 +189,6 @@ public int getEntityId() {
       return entityId_;
     }
 
-    public static final int VALUE_FIELD_NUMBER = 9;
-    private float value_;
-    /**
-     * <code>float value = 9;</code>
-     * @return The value.
-     */
-    @java.lang.Override
-    public float getValue() {
-      return value_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -179,14 +203,14 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (keyHash_ != 0) {
-        output.writeUInt32(5, keyHash_);
-      }
       if (entityId_ != 0) {
-        output.writeUInt32(7, entityId_);
+        output.writeUInt32(1, entityId_);
+      }
+      if (keyHash_ != 0) {
+        output.writeUInt32(9, keyHash_);
       }
       if (value_ != 0F) {
-        output.writeFloat(9, value_);
+        output.writeFloat(13, value_);
       }
       unknownFields.writeTo(output);
     }
@@ -197,17 +221,17 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (keyHash_ != 0) {
+      if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, keyHash_);
+          .computeUInt32Size(1, entityId_);
       }
-      if (entityId_ != 0) {
+      if (keyHash_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, entityId_);
+          .computeUInt32Size(9, keyHash_);
       }
       if (value_ != 0F) {
         size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(9, value_);
+          .computeFloatSize(13, value_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -224,13 +248,13 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.ServerGlobalValueChangeNotifyOuterClass.ServerGlobalValueChangeNotify other = (emu.grasscutter.net.proto.ServerGlobalValueChangeNotifyOuterClass.ServerGlobalValueChangeNotify) obj;
 
+      if (java.lang.Float.floatToIntBits(getValue())
+          != java.lang.Float.floatToIntBits(
+              other.getValue())) return false;
       if (getKeyHash()
           != other.getKeyHash()) return false;
       if (getEntityId()
           != other.getEntityId()) return false;
-      if (java.lang.Float.floatToIntBits(getValue())
-          != java.lang.Float.floatToIntBits(
-              other.getValue())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -242,13 +266,13 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + VALUE_FIELD_NUMBER;
+      hash = (53 * hash) + java.lang.Float.floatToIntBits(
+          getValue());
       hash = (37 * hash) + KEY_HASH_FIELD_NUMBER;
       hash = (53 * hash) + getKeyHash();
       hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getEntityId();
-      hash = (37 * hash) + VALUE_FIELD_NUMBER;
-      hash = (53 * hash) + java.lang.Float.floatToIntBits(
-          getValue());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -346,7 +370,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 25816
+     * CmdId: 29440
      * </pre>
      *
      * Protobuf type {@code ServerGlobalValueChangeNotify}
@@ -386,12 +410,12 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        value_ = 0F;
+
         keyHash_ = 0;
 
         entityId_ = 0;
 
-        value_ = 0F;
-
         return this;
       }
 
@@ -418,9 +442,9 @@ public emu.grasscutter.net.proto.ServerGlobalValueChangeNotifyOuterClass.ServerG
       @java.lang.Override
       public emu.grasscutter.net.proto.ServerGlobalValueChangeNotifyOuterClass.ServerGlobalValueChangeNotify buildPartial() {
         emu.grasscutter.net.proto.ServerGlobalValueChangeNotifyOuterClass.ServerGlobalValueChangeNotify result = new emu.grasscutter.net.proto.ServerGlobalValueChangeNotifyOuterClass.ServerGlobalValueChangeNotify(this);
+        result.value_ = value_;
         result.keyHash_ = keyHash_;
         result.entityId_ = entityId_;
-        result.value_ = value_;
         onBuilt();
         return result;
       }
@@ -469,15 +493,15 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ServerGlobalValueChangeNotifyOuterClass.ServerGlobalValueChangeNotify other) {
         if (other == emu.grasscutter.net.proto.ServerGlobalValueChangeNotifyOuterClass.ServerGlobalValueChangeNotify.getDefaultInstance()) return this;
+        if (other.getValue() != 0F) {
+          setValue(other.getValue());
+        }
         if (other.getKeyHash() != 0) {
           setKeyHash(other.getKeyHash());
         }
         if (other.getEntityId() != 0) {
           setEntityId(other.getEntityId());
         }
-        if (other.getValue() != 0F) {
-          setValue(other.getValue());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -507,95 +531,131 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int keyHash_ ;
+      private float value_ ;
       /**
-       * <code>uint32 key_hash = 5;</code>
-       * @return The keyHash.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>float value = 13;</code>
+       * @return The value.
        */
       @java.lang.Override
-      public int getKeyHash() {
-        return keyHash_;
+      public float getValue() {
+        return value_;
       }
       /**
-       * <code>uint32 key_hash = 5;</code>
-       * @param value The keyHash to set.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>float value = 13;</code>
+       * @param value The value to set.
        * @return This builder for chaining.
        */
-      public Builder setKeyHash(int value) {
+      public Builder setValue(float value) {
         
-        keyHash_ = value;
+        value_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 key_hash = 5;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>float value = 13;</code>
        * @return This builder for chaining.
        */
-      public Builder clearKeyHash() {
+      public Builder clearValue() {
         
-        keyHash_ = 0;
+        value_ = 0F;
         onChanged();
         return this;
       }
 
-      private int entityId_ ;
+      private int keyHash_ ;
       /**
-       * <code>uint32 entity_id = 7;</code>
-       * @return The entityId.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 key_hash = 9;</code>
+       * @return The keyHash.
        */
       @java.lang.Override
-      public int getEntityId() {
-        return entityId_;
+      public int getKeyHash() {
+        return keyHash_;
       }
       /**
-       * <code>uint32 entity_id = 7;</code>
-       * @param value The entityId to set.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 key_hash = 9;</code>
+       * @param value The keyHash to set.
        * @return This builder for chaining.
        */
-      public Builder setEntityId(int value) {
+      public Builder setKeyHash(int value) {
         
-        entityId_ = value;
+        keyHash_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 entity_id = 7;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 key_hash = 9;</code>
        * @return This builder for chaining.
        */
-      public Builder clearEntityId() {
+      public Builder clearKeyHash() {
         
-        entityId_ = 0;
+        keyHash_ = 0;
         onChanged();
         return this;
       }
 
-      private float value_ ;
+      private int entityId_ ;
       /**
-       * <code>float value = 9;</code>
-       * @return The value.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 entity_id = 1;</code>
+       * @return The entityId.
        */
       @java.lang.Override
-      public float getValue() {
-        return value_;
+      public int getEntityId() {
+        return entityId_;
       }
       /**
-       * <code>float value = 9;</code>
-       * @param value The value to set.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 entity_id = 1;</code>
+       * @param value The entityId to set.
        * @return This builder for chaining.
        */
-      public Builder setValue(float value) {
+      public Builder setEntityId(int value) {
         
-        value_ = value;
+        entityId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>float value = 9;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 entity_id = 1;</code>
        * @return This builder for chaining.
        */
-      public Builder clearValue() {
+      public Builder clearEntityId() {
         
-        value_ = 0F;
+        entityId_ = 0;
         onChanged();
         return this;
       }
@@ -667,9 +727,9 @@ public emu.grasscutter.net.proto.ServerGlobalValueChangeNotifyOuterClass.ServerG
   static {
     java.lang.String[] descriptorData = {
       "\n#ServerGlobalValueChangeNotify.proto\"S\n" +
-      "\035ServerGlobalValueChangeNotify\022\020\n\010key_ha" +
-      "sh\030\005 \001(\r\022\021\n\tentity_id\030\007 \001(\r\022\r\n\005value\030\t \001" +
-      "(\002B\033\n\031emu.grasscutter.net.protob\006proto3"
+      "\035ServerGlobalValueChangeNotify\022\r\n\005value\030" +
+      "\r \001(\002\022\020\n\010key_hash\030\t \001(\r\022\021\n\tentity_id\030\001 \001" +
+      "(\rB\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -680,7 +740,7 @@ public emu.grasscutter.net.proto.ServerGlobalValueChangeNotifyOuterClass.ServerG
     internal_static_ServerGlobalValueChangeNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ServerGlobalValueChangeNotify_descriptor,
-        new java.lang.String[] { "KeyHash", "EntityId", "Value", });
+        new java.lang.String[] { "Value", "KeyHash", "EntityId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ServerTimeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ServerTimeNotifyOuterClass.java
index 0faa03a8c94..18cd4d8c387 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ServerTimeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ServerTimeNotifyOuterClass.java
@@ -19,14 +19,18 @@ public interface ServerTimeNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 server_time = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint64 server_time = 6;</code>
      * @return The serverTime.
      */
     long getServerTime();
   }
   /**
    * <pre>
-   * CmdId: 28606
+   * CmdId: 9404
    * </pre>
    *
    * Protobuf type {@code ServerTimeNotify}
@@ -73,7 +77,7 @@ private ServerTimeNotify(
             case 0:
               done = true;
               break;
-            case 8: {
+            case 48: {
 
               serverTime_ = input.readUInt64();
               break;
@@ -110,10 +114,14 @@ private ServerTimeNotify(
               emu.grasscutter.net.proto.ServerTimeNotifyOuterClass.ServerTimeNotify.class, emu.grasscutter.net.proto.ServerTimeNotifyOuterClass.ServerTimeNotify.Builder.class);
     }
 
-    public static final int SERVER_TIME_FIELD_NUMBER = 1;
+    public static final int SERVER_TIME_FIELD_NUMBER = 6;
     private long serverTime_;
     /**
-     * <code>uint64 server_time = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint64 server_time = 6;</code>
      * @return The serverTime.
      */
     @java.lang.Override
@@ -136,7 +144,7 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (serverTime_ != 0L) {
-        output.writeUInt64(1, serverTime_);
+        output.writeUInt64(6, serverTime_);
       }
       unknownFields.writeTo(output);
     }
@@ -149,7 +157,7 @@ public int getSerializedSize() {
       size = 0;
       if (serverTime_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(1, serverTime_);
+          .computeUInt64Size(6, serverTime_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -279,7 +287,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 28606
+     * CmdId: 9404
      * </pre>
      *
      * Protobuf type {@code ServerTimeNotify}
@@ -430,7 +438,11 @@ public Builder mergeFrom(
 
       private long serverTime_ ;
       /**
-       * <code>uint64 server_time = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint64 server_time = 6;</code>
        * @return The serverTime.
        */
       @java.lang.Override
@@ -438,7 +450,11 @@ public long getServerTime() {
         return serverTime_;
       }
       /**
-       * <code>uint64 server_time = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint64 server_time = 6;</code>
        * @param value The serverTime to set.
        * @return This builder for chaining.
        */
@@ -449,7 +465,11 @@ public Builder setServerTime(long value) {
         return this;
       }
       /**
-       * <code>uint64 server_time = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint64 server_time = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearServerTime() {
@@ -526,7 +546,7 @@ public emu.grasscutter.net.proto.ServerTimeNotifyOuterClass.ServerTimeNotify get
   static {
     java.lang.String[] descriptorData = {
       "\n\026ServerTimeNotify.proto\"\'\n\020ServerTimeNo" +
-      "tify\022\023\n\013server_time\030\001 \001(\004B\033\n\031emu.grasscu" +
+      "tify\022\023\n\013server_time\030\006 \001(\004B\033\n\031emu.grasscu" +
       "tter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SetNameCardReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SetNameCardReqOuterClass.java
index f33e699670d..80c4ed19efe 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SetNameCardReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SetNameCardReqOuterClass.java
@@ -19,6 +19,10 @@ public interface SetNameCardReqOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
      * <code>uint32 name_card_id = 11;</code>
      * @return The nameCardId.
      */
@@ -26,7 +30,7 @@ public interface SetNameCardReqOrBuilder extends
   }
   /**
    * <pre>
-   * CmdId: 20106
+   * CmdId: 26218
    * </pre>
    *
    * Protobuf type {@code SetNameCardReq}
@@ -113,6 +117,10 @@ private SetNameCardReq(
     public static final int NAME_CARD_ID_FIELD_NUMBER = 11;
     private int nameCardId_;
     /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
      * <code>uint32 name_card_id = 11;</code>
      * @return The nameCardId.
      */
@@ -278,7 +286,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 20106
+     * CmdId: 26218
      * </pre>
      *
      * Protobuf type {@code SetNameCardReq}
@@ -429,6 +437,10 @@ public Builder mergeFrom(
 
       private int nameCardId_ ;
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>uint32 name_card_id = 11;</code>
        * @return The nameCardId.
        */
@@ -437,6 +449,10 @@ public int getNameCardId() {
         return nameCardId_;
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>uint32 name_card_id = 11;</code>
        * @param value The nameCardId to set.
        * @return This builder for chaining.
@@ -448,6 +464,10 @@ public Builder setNameCardId(int value) {
         return this;
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>uint32 name_card_id = 11;</code>
        * @return This builder for chaining.
        */
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SetNameCardRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SetNameCardRspOuterClass.java
index 6a524005d16..b044093a951 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SetNameCardRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SetNameCardRspOuterClass.java
@@ -19,20 +19,28 @@ public interface SetNameCardRspOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 6;</code>
-     * @return The retcode.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 name_card_id = 15;</code>
+     * @return The nameCardId.
      */
-    int getRetcode();
+    int getNameCardId();
 
     /**
-     * <code>uint32 name_card_id = 11;</code>
-     * @return The nameCardId.
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>int32 retcode = 9;</code>
+     * @return The retcode.
      */
-    int getNameCardId();
+    int getRetcode();
   }
   /**
    * <pre>
-   * CmdId: 27175
+   * CmdId: 21402
    * </pre>
    *
    * Protobuf type {@code SetNameCardRsp}
@@ -79,12 +87,12 @@ private SetNameCardRsp(
             case 0:
               done = true;
               break;
-            case 48: {
+            case 72: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 88: {
+            case 120: {
 
               nameCardId_ = input.readUInt32();
               break;
@@ -121,26 +129,34 @@ private SetNameCardRsp(
               emu.grasscutter.net.proto.SetNameCardRspOuterClass.SetNameCardRsp.class, emu.grasscutter.net.proto.SetNameCardRspOuterClass.SetNameCardRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 6;
-    private int retcode_;
+    public static final int NAME_CARD_ID_FIELD_NUMBER = 15;
+    private int nameCardId_;
     /**
-     * <code>int32 retcode = 6;</code>
-     * @return The retcode.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 name_card_id = 15;</code>
+     * @return The nameCardId.
      */
     @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
+    public int getNameCardId() {
+      return nameCardId_;
     }
 
-    public static final int NAME_CARD_ID_FIELD_NUMBER = 11;
-    private int nameCardId_;
+    public static final int RETCODE_FIELD_NUMBER = 9;
+    private int retcode_;
     /**
-     * <code>uint32 name_card_id = 11;</code>
-     * @return The nameCardId.
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>int32 retcode = 9;</code>
+     * @return The retcode.
      */
     @java.lang.Override
-    public int getNameCardId() {
-      return nameCardId_;
+    public int getRetcode() {
+      return retcode_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -158,10 +174,10 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (retcode_ != 0) {
-        output.writeInt32(6, retcode_);
+        output.writeInt32(9, retcode_);
       }
       if (nameCardId_ != 0) {
-        output.writeUInt32(11, nameCardId_);
+        output.writeUInt32(15, nameCardId_);
       }
       unknownFields.writeTo(output);
     }
@@ -174,11 +190,11 @@ public int getSerializedSize() {
       size = 0;
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(6, retcode_);
+          .computeInt32Size(9, retcode_);
       }
       if (nameCardId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, nameCardId_);
+          .computeUInt32Size(15, nameCardId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -195,10 +211,10 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.SetNameCardRspOuterClass.SetNameCardRsp other = (emu.grasscutter.net.proto.SetNameCardRspOuterClass.SetNameCardRsp) obj;
 
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (getNameCardId()
           != other.getNameCardId()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -210,10 +226,10 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + NAME_CARD_ID_FIELD_NUMBER;
       hash = (53 * hash) + getNameCardId();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -311,7 +327,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 27175
+     * CmdId: 21402
      * </pre>
      *
      * Protobuf type {@code SetNameCardRsp}
@@ -351,10 +367,10 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        retcode_ = 0;
-
         nameCardId_ = 0;
 
+        retcode_ = 0;
+
         return this;
       }
 
@@ -381,8 +397,8 @@ public emu.grasscutter.net.proto.SetNameCardRspOuterClass.SetNameCardRsp build()
       @java.lang.Override
       public emu.grasscutter.net.proto.SetNameCardRspOuterClass.SetNameCardRsp buildPartial() {
         emu.grasscutter.net.proto.SetNameCardRspOuterClass.SetNameCardRsp result = new emu.grasscutter.net.proto.SetNameCardRspOuterClass.SetNameCardRsp(this);
-        result.retcode_ = retcode_;
         result.nameCardId_ = nameCardId_;
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -431,12 +447,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.SetNameCardRspOuterClass.SetNameCardRsp other) {
         if (other == emu.grasscutter.net.proto.SetNameCardRspOuterClass.SetNameCardRsp.getDefaultInstance()) return this;
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         if (other.getNameCardId() != 0) {
           setNameCardId(other.getNameCardId());
         }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -466,64 +482,88 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int retcode_ ;
+      private int nameCardId_ ;
       /**
-       * <code>int32 retcode = 6;</code>
-       * @return The retcode.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 name_card_id = 15;</code>
+       * @return The nameCardId.
        */
       @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
+      public int getNameCardId() {
+        return nameCardId_;
       }
       /**
-       * <code>int32 retcode = 6;</code>
-       * @param value The retcode to set.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 name_card_id = 15;</code>
+       * @param value The nameCardId to set.
        * @return This builder for chaining.
        */
-      public Builder setRetcode(int value) {
+      public Builder setNameCardId(int value) {
         
-        retcode_ = value;
+        nameCardId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>int32 retcode = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 name_card_id = 15;</code>
        * @return This builder for chaining.
        */
-      public Builder clearRetcode() {
+      public Builder clearNameCardId() {
         
-        retcode_ = 0;
+        nameCardId_ = 0;
         onChanged();
         return this;
       }
 
-      private int nameCardId_ ;
+      private int retcode_ ;
       /**
-       * <code>uint32 name_card_id = 11;</code>
-       * @return The nameCardId.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>int32 retcode = 9;</code>
+       * @return The retcode.
        */
       @java.lang.Override
-      public int getNameCardId() {
-        return nameCardId_;
+      public int getRetcode() {
+        return retcode_;
       }
       /**
-       * <code>uint32 name_card_id = 11;</code>
-       * @param value The nameCardId to set.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>int32 retcode = 9;</code>
+       * @param value The retcode to set.
        * @return This builder for chaining.
        */
-      public Builder setNameCardId(int value) {
+      public Builder setRetcode(int value) {
         
-        nameCardId_ = value;
+        retcode_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 name_card_id = 11;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>int32 retcode = 9;</code>
        * @return This builder for chaining.
        */
-      public Builder clearNameCardId() {
+      public Builder clearRetcode() {
         
-        nameCardId_ = 0;
+        retcode_ = 0;
         onChanged();
         return this;
       }
@@ -595,7 +635,7 @@ public emu.grasscutter.net.proto.SetNameCardRspOuterClass.SetNameCardRsp getDefa
   static {
     java.lang.String[] descriptorData = {
       "\n\024SetNameCardRsp.proto\"7\n\016SetNameCardRsp" +
-      "\022\017\n\007retcode\030\006 \001(\005\022\024\n\014name_card_id\030\013 \001(\rB" +
+      "\022\024\n\014name_card_id\030\017 \001(\r\022\017\n\007retcode\030\t \001(\005B" +
       "\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -607,7 +647,7 @@ public emu.grasscutter.net.proto.SetNameCardRspOuterClass.SetNameCardRsp getDefa
     internal_static_SetNameCardRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SetNameCardRsp_descriptor,
-        new java.lang.String[] { "Retcode", "NameCardId", });
+        new java.lang.String[] { "NameCardId", "Retcode", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SetUpAvatarTeamReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SetUpAvatarTeamReqOuterClass.java
index bc47b1c0b63..c97fc9d146a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SetUpAvatarTeamReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SetUpAvatarTeamReqOuterClass.java
@@ -19,37 +19,57 @@ public interface SetUpAvatarTeamReqOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint64 avatar_team_guid_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint64 avatar_team_guid_list = 8;</code>
      * @return A list containing the avatarTeamGuidList.
      */
     java.util.List<java.lang.Long> getAvatarTeamGuidListList();
     /**
-     * <code>repeated uint64 avatar_team_guid_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint64 avatar_team_guid_list = 8;</code>
      * @return The count of avatarTeamGuidList.
      */
     int getAvatarTeamGuidListCount();
     /**
-     * <code>repeated uint64 avatar_team_guid_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint64 avatar_team_guid_list = 8;</code>
      * @param index The index of the element to return.
      * @return The avatarTeamGuidList at the given index.
      */
     long getAvatarTeamGuidList(int index);
 
     /**
-     * <code>uint64 cur_avatar_guid = 2;</code>
-     * @return The curAvatarGuid.
-     */
-    long getCurAvatarGuid();
-
-    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
      * <code>uint32 team_id = 3;</code>
      * @return The teamId.
      */
     int getTeamId();
+
+    /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>uint64 cur_avatar_guid = 9;</code>
+     * @return The curAvatarGuid.
+     */
+    long getCurAvatarGuid();
   }
   /**
    * <pre>
-   * CmdId: 22244
+   * CmdId: 25215
    * </pre>
    *
    * Protobuf type {@code SetUpAvatarTeamReq}
@@ -98,17 +118,12 @@ private SetUpAvatarTeamReq(
             case 0:
               done = true;
               break;
-            case 16: {
-
-              curAvatarGuid_ = input.readUInt64();
-              break;
-            }
             case 24: {
 
               teamId_ = input.readUInt32();
               break;
             }
-            case 80: {
+            case 64: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 avatarTeamGuidList_ = newLongList();
                 mutable_bitField0_ |= 0x00000001;
@@ -116,7 +131,7 @@ private SetUpAvatarTeamReq(
               avatarTeamGuidList_.addLong(input.readUInt64());
               break;
             }
-            case 82: {
+            case 66: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -129,6 +144,11 @@ private SetUpAvatarTeamReq(
               input.popLimit(limit);
               break;
             }
+            case 72: {
+
+              curAvatarGuid_ = input.readUInt64();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -164,10 +184,14 @@ private SetUpAvatarTeamReq(
               emu.grasscutter.net.proto.SetUpAvatarTeamReqOuterClass.SetUpAvatarTeamReq.class, emu.grasscutter.net.proto.SetUpAvatarTeamReqOuterClass.SetUpAvatarTeamReq.Builder.class);
     }
 
-    public static final int AVATAR_TEAM_GUID_LIST_FIELD_NUMBER = 10;
+    public static final int AVATAR_TEAM_GUID_LIST_FIELD_NUMBER = 8;
     private com.google.protobuf.Internal.LongList avatarTeamGuidList_;
     /**
-     * <code>repeated uint64 avatar_team_guid_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint64 avatar_team_guid_list = 8;</code>
      * @return A list containing the avatarTeamGuidList.
      */
     @java.lang.Override
@@ -176,14 +200,22 @@ private SetUpAvatarTeamReq(
       return avatarTeamGuidList_;
     }
     /**
-     * <code>repeated uint64 avatar_team_guid_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint64 avatar_team_guid_list = 8;</code>
      * @return The count of avatarTeamGuidList.
      */
     public int getAvatarTeamGuidListCount() {
       return avatarTeamGuidList_.size();
     }
     /**
-     * <code>repeated uint64 avatar_team_guid_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint64 avatar_team_guid_list = 8;</code>
      * @param index The index of the element to return.
      * @return The avatarTeamGuidList at the given index.
      */
@@ -192,20 +224,13 @@ public long getAvatarTeamGuidList(int index) {
     }
     private int avatarTeamGuidListMemoizedSerializedSize = -1;
 
-    public static final int CUR_AVATAR_GUID_FIELD_NUMBER = 2;
-    private long curAvatarGuid_;
-    /**
-     * <code>uint64 cur_avatar_guid = 2;</code>
-     * @return The curAvatarGuid.
-     */
-    @java.lang.Override
-    public long getCurAvatarGuid() {
-      return curAvatarGuid_;
-    }
-
     public static final int TEAM_ID_FIELD_NUMBER = 3;
     private int teamId_;
     /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
      * <code>uint32 team_id = 3;</code>
      * @return The teamId.
      */
@@ -214,6 +239,21 @@ public int getTeamId() {
       return teamId_;
     }
 
+    public static final int CUR_AVATAR_GUID_FIELD_NUMBER = 9;
+    private long curAvatarGuid_;
+    /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>uint64 cur_avatar_guid = 9;</code>
+     * @return The curAvatarGuid.
+     */
+    @java.lang.Override
+    public long getCurAvatarGuid() {
+      return curAvatarGuid_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -229,19 +269,19 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (curAvatarGuid_ != 0L) {
-        output.writeUInt64(2, curAvatarGuid_);
-      }
       if (teamId_ != 0) {
         output.writeUInt32(3, teamId_);
       }
       if (getAvatarTeamGuidListList().size() > 0) {
-        output.writeUInt32NoTag(82);
+        output.writeUInt32NoTag(66);
         output.writeUInt32NoTag(avatarTeamGuidListMemoizedSerializedSize);
       }
       for (int i = 0; i < avatarTeamGuidList_.size(); i++) {
         output.writeUInt64NoTag(avatarTeamGuidList_.getLong(i));
       }
+      if (curAvatarGuid_ != 0L) {
+        output.writeUInt64(9, curAvatarGuid_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -251,10 +291,6 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (curAvatarGuid_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(2, curAvatarGuid_);
-      }
       if (teamId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(3, teamId_);
@@ -273,6 +309,10 @@ public int getSerializedSize() {
         }
         avatarTeamGuidListMemoizedSerializedSize = dataSize;
       }
+      if (curAvatarGuid_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(9, curAvatarGuid_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -290,10 +330,10 @@ public boolean equals(final java.lang.Object obj) {
 
       if (!getAvatarTeamGuidListList()
           .equals(other.getAvatarTeamGuidListList())) return false;
-      if (getCurAvatarGuid()
-          != other.getCurAvatarGuid()) return false;
       if (getTeamId()
           != other.getTeamId()) return false;
+      if (getCurAvatarGuid()
+          != other.getCurAvatarGuid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -309,11 +349,11 @@ public int hashCode() {
         hash = (37 * hash) + AVATAR_TEAM_GUID_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getAvatarTeamGuidListList().hashCode();
       }
+      hash = (37 * hash) + TEAM_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getTeamId();
       hash = (37 * hash) + CUR_AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getCurAvatarGuid());
-      hash = (37 * hash) + TEAM_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getTeamId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -411,7 +451,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 22244
+     * CmdId: 25215
      * </pre>
      *
      * Protobuf type {@code SetUpAvatarTeamReq}
@@ -453,10 +493,10 @@ public Builder clear() {
         super.clear();
         avatarTeamGuidList_ = emptyLongList();
         bitField0_ = (bitField0_ & ~0x00000001);
-        curAvatarGuid_ = 0L;
-
         teamId_ = 0;
 
+        curAvatarGuid_ = 0L;
+
         return this;
       }
 
@@ -489,8 +529,8 @@ public emu.grasscutter.net.proto.SetUpAvatarTeamReqOuterClass.SetUpAvatarTeamReq
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.avatarTeamGuidList_ = avatarTeamGuidList_;
-        result.curAvatarGuid_ = curAvatarGuid_;
         result.teamId_ = teamId_;
+        result.curAvatarGuid_ = curAvatarGuid_;
         onBuilt();
         return result;
       }
@@ -549,12 +589,12 @@ public Builder mergeFrom(emu.grasscutter.net.proto.SetUpAvatarTeamReqOuterClass.
           }
           onChanged();
         }
-        if (other.getCurAvatarGuid() != 0L) {
-          setCurAvatarGuid(other.getCurAvatarGuid());
-        }
         if (other.getTeamId() != 0) {
           setTeamId(other.getTeamId());
         }
+        if (other.getCurAvatarGuid() != 0L) {
+          setCurAvatarGuid(other.getCurAvatarGuid());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -593,7 +633,11 @@ private void ensureAvatarTeamGuidListIsMutable() {
          }
       }
       /**
-       * <code>repeated uint64 avatar_team_guid_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint64 avatar_team_guid_list = 8;</code>
        * @return A list containing the avatarTeamGuidList.
        */
       public java.util.List<java.lang.Long>
@@ -602,14 +646,22 @@ private void ensureAvatarTeamGuidListIsMutable() {
                  java.util.Collections.unmodifiableList(avatarTeamGuidList_) : avatarTeamGuidList_;
       }
       /**
-       * <code>repeated uint64 avatar_team_guid_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint64 avatar_team_guid_list = 8;</code>
        * @return The count of avatarTeamGuidList.
        */
       public int getAvatarTeamGuidListCount() {
         return avatarTeamGuidList_.size();
       }
       /**
-       * <code>repeated uint64 avatar_team_guid_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint64 avatar_team_guid_list = 8;</code>
        * @param index The index of the element to return.
        * @return The avatarTeamGuidList at the given index.
        */
@@ -617,7 +669,11 @@ public long getAvatarTeamGuidList(int index) {
         return avatarTeamGuidList_.getLong(index);
       }
       /**
-       * <code>repeated uint64 avatar_team_guid_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint64 avatar_team_guid_list = 8;</code>
        * @param index The index to set the value at.
        * @param value The avatarTeamGuidList to set.
        * @return This builder for chaining.
@@ -630,7 +686,11 @@ public Builder setAvatarTeamGuidList(
         return this;
       }
       /**
-       * <code>repeated uint64 avatar_team_guid_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint64 avatar_team_guid_list = 8;</code>
        * @param value The avatarTeamGuidList to add.
        * @return This builder for chaining.
        */
@@ -641,7 +701,11 @@ public Builder addAvatarTeamGuidList(long value) {
         return this;
       }
       /**
-       * <code>repeated uint64 avatar_team_guid_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint64 avatar_team_guid_list = 8;</code>
        * @param values The avatarTeamGuidList to add.
        * @return This builder for chaining.
        */
@@ -654,7 +718,11 @@ public Builder addAllAvatarTeamGuidList(
         return this;
       }
       /**
-       * <code>repeated uint64 avatar_team_guid_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint64 avatar_team_guid_list = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarTeamGuidList() {
@@ -664,64 +732,88 @@ public Builder clearAvatarTeamGuidList() {
         return this;
       }
 
-      private long curAvatarGuid_ ;
+      private int teamId_ ;
       /**
-       * <code>uint64 cur_avatar_guid = 2;</code>
-       * @return The curAvatarGuid.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 team_id = 3;</code>
+       * @return The teamId.
        */
       @java.lang.Override
-      public long getCurAvatarGuid() {
-        return curAvatarGuid_;
+      public int getTeamId() {
+        return teamId_;
       }
       /**
-       * <code>uint64 cur_avatar_guid = 2;</code>
-       * @param value The curAvatarGuid to set.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 team_id = 3;</code>
+       * @param value The teamId to set.
        * @return This builder for chaining.
        */
-      public Builder setCurAvatarGuid(long value) {
+      public Builder setTeamId(int value) {
         
-        curAvatarGuid_ = value;
+        teamId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint64 cur_avatar_guid = 2;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 team_id = 3;</code>
        * @return This builder for chaining.
        */
-      public Builder clearCurAvatarGuid() {
+      public Builder clearTeamId() {
         
-        curAvatarGuid_ = 0L;
+        teamId_ = 0;
         onChanged();
         return this;
       }
 
-      private int teamId_ ;
+      private long curAvatarGuid_ ;
       /**
-       * <code>uint32 team_id = 3;</code>
-       * @return The teamId.
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint64 cur_avatar_guid = 9;</code>
+       * @return The curAvatarGuid.
        */
       @java.lang.Override
-      public int getTeamId() {
-        return teamId_;
+      public long getCurAvatarGuid() {
+        return curAvatarGuid_;
       }
       /**
-       * <code>uint32 team_id = 3;</code>
-       * @param value The teamId to set.
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint64 cur_avatar_guid = 9;</code>
+       * @param value The curAvatarGuid to set.
        * @return This builder for chaining.
        */
-      public Builder setTeamId(int value) {
+      public Builder setCurAvatarGuid(long value) {
         
-        teamId_ = value;
+        curAvatarGuid_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 team_id = 3;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint64 cur_avatar_guid = 9;</code>
        * @return This builder for chaining.
        */
-      public Builder clearTeamId() {
+      public Builder clearCurAvatarGuid() {
         
-        teamId_ = 0;
+        curAvatarGuid_ = 0L;
         onChanged();
         return this;
       }
@@ -793,9 +885,9 @@ public emu.grasscutter.net.proto.SetUpAvatarTeamReqOuterClass.SetUpAvatarTeamReq
   static {
     java.lang.String[] descriptorData = {
       "\n\030SetUpAvatarTeamReq.proto\"]\n\022SetUpAvata" +
-      "rTeamReq\022\035\n\025avatar_team_guid_list\030\n \003(\004\022" +
-      "\027\n\017cur_avatar_guid\030\002 \001(\004\022\017\n\007team_id\030\003 \001(" +
-      "\rB\033\n\031emu.grasscutter.net.protob\006proto3"
+      "rTeamReq\022\035\n\025avatar_team_guid_list\030\010 \003(\004\022" +
+      "\017\n\007team_id\030\003 \001(\r\022\027\n\017cur_avatar_guid\030\t \001(" +
+      "\004B\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -806,7 +898,7 @@ public emu.grasscutter.net.proto.SetUpAvatarTeamReqOuterClass.SetUpAvatarTeamReq
     internal_static_SetUpAvatarTeamReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SetUpAvatarTeamReq_descriptor,
-        new java.lang.String[] { "AvatarTeamGuidList", "CurAvatarGuid", "TeamId", });
+        new java.lang.String[] { "AvatarTeamGuidList", "TeamId", "CurAvatarGuid", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SetUpAvatarTeamRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SetUpAvatarTeamRspOuterClass.java
index c9f32baf9f1..f14aa055626 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SetUpAvatarTeamRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SetUpAvatarTeamRspOuterClass.java
@@ -19,43 +19,67 @@ public interface SetUpAvatarTeamRspOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 cur_avatar_guid = 2;</code>
-     * @return The curAvatarGuid.
-     */
-    long getCurAvatarGuid();
-
-    /**
-     * <code>uint32 team_id = 3;</code>
-     * @return The teamId.
-     */
-    int getTeamId();
-
-    /**
-     * <code>repeated uint64 avatar_team_guid_list = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint64 avatar_team_guid_list = 4;</code>
      * @return A list containing the avatarTeamGuidList.
      */
     java.util.List<java.lang.Long> getAvatarTeamGuidListList();
     /**
-     * <code>repeated uint64 avatar_team_guid_list = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint64 avatar_team_guid_list = 4;</code>
      * @return The count of avatarTeamGuidList.
      */
     int getAvatarTeamGuidListCount();
     /**
-     * <code>repeated uint64 avatar_team_guid_list = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint64 avatar_team_guid_list = 4;</code>
      * @param index The index of the element to return.
      * @return The avatarTeamGuidList at the given index.
      */
     long getAvatarTeamGuidList(int index);
 
     /**
-     * <code>int32 retcode = 8;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint64 cur_avatar_guid = 13;</code>
+     * @return The curAvatarGuid.
+     */
+    long getCurAvatarGuid();
+
+    /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>uint32 team_id = 5;</code>
+     * @return The teamId.
+     */
+    int getTeamId();
+
+    /**
+     * <pre>
+     * Offset: 0x34
+     * </pre>
+     *
+     * <code>int32 retcode = 14;</code>
      * @return The retcode.
      */
     int getRetcode();
   }
   /**
    * <pre>
-   * CmdId: 306
+   * CmdId: 9133
    * </pre>
    *
    * Protobuf type {@code SetUpAvatarTeamRsp}
@@ -104,17 +128,7 @@ private SetUpAvatarTeamRsp(
             case 0:
               done = true;
               break;
-            case 16: {
-
-              curAvatarGuid_ = input.readUInt64();
-              break;
-            }
-            case 24: {
-
-              teamId_ = input.readUInt32();
-              break;
-            }
-            case 48: {
+            case 32: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 avatarTeamGuidList_ = newLongList();
                 mutable_bitField0_ |= 0x00000001;
@@ -122,7 +136,7 @@ private SetUpAvatarTeamRsp(
               avatarTeamGuidList_.addLong(input.readUInt64());
               break;
             }
-            case 50: {
+            case 34: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -135,7 +149,17 @@ private SetUpAvatarTeamRsp(
               input.popLimit(limit);
               break;
             }
-            case 64: {
+            case 40: {
+
+              teamId_ = input.readUInt32();
+              break;
+            }
+            case 104: {
+
+              curAvatarGuid_ = input.readUInt64();
+              break;
+            }
+            case 112: {
 
               retcode_ = input.readInt32();
               break;
@@ -175,32 +199,14 @@ private SetUpAvatarTeamRsp(
               emu.grasscutter.net.proto.SetUpAvatarTeamRspOuterClass.SetUpAvatarTeamRsp.class, emu.grasscutter.net.proto.SetUpAvatarTeamRspOuterClass.SetUpAvatarTeamRsp.Builder.class);
     }
 
-    public static final int CUR_AVATAR_GUID_FIELD_NUMBER = 2;
-    private long curAvatarGuid_;
-    /**
-     * <code>uint64 cur_avatar_guid = 2;</code>
-     * @return The curAvatarGuid.
-     */
-    @java.lang.Override
-    public long getCurAvatarGuid() {
-      return curAvatarGuid_;
-    }
-
-    public static final int TEAM_ID_FIELD_NUMBER = 3;
-    private int teamId_;
-    /**
-     * <code>uint32 team_id = 3;</code>
-     * @return The teamId.
-     */
-    @java.lang.Override
-    public int getTeamId() {
-      return teamId_;
-    }
-
-    public static final int AVATAR_TEAM_GUID_LIST_FIELD_NUMBER = 6;
+    public static final int AVATAR_TEAM_GUID_LIST_FIELD_NUMBER = 4;
     private com.google.protobuf.Internal.LongList avatarTeamGuidList_;
     /**
-     * <code>repeated uint64 avatar_team_guid_list = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint64 avatar_team_guid_list = 4;</code>
      * @return A list containing the avatarTeamGuidList.
      */
     @java.lang.Override
@@ -209,14 +215,22 @@ public int getTeamId() {
       return avatarTeamGuidList_;
     }
     /**
-     * <code>repeated uint64 avatar_team_guid_list = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint64 avatar_team_guid_list = 4;</code>
      * @return The count of avatarTeamGuidList.
      */
     public int getAvatarTeamGuidListCount() {
       return avatarTeamGuidList_.size();
     }
     /**
-     * <code>repeated uint64 avatar_team_guid_list = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated uint64 avatar_team_guid_list = 4;</code>
      * @param index The index of the element to return.
      * @return The avatarTeamGuidList at the given index.
      */
@@ -225,10 +239,44 @@ public long getAvatarTeamGuidList(int index) {
     }
     private int avatarTeamGuidListMemoizedSerializedSize = -1;
 
-    public static final int RETCODE_FIELD_NUMBER = 8;
+    public static final int CUR_AVATAR_GUID_FIELD_NUMBER = 13;
+    private long curAvatarGuid_;
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint64 cur_avatar_guid = 13;</code>
+     * @return The curAvatarGuid.
+     */
+    @java.lang.Override
+    public long getCurAvatarGuid() {
+      return curAvatarGuid_;
+    }
+
+    public static final int TEAM_ID_FIELD_NUMBER = 5;
+    private int teamId_;
+    /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>uint32 team_id = 5;</code>
+     * @return The teamId.
+     */
+    @java.lang.Override
+    public int getTeamId() {
+      return teamId_;
+    }
+
+    public static final int RETCODE_FIELD_NUMBER = 14;
     private int retcode_;
     /**
-     * <code>int32 retcode = 8;</code>
+     * <pre>
+     * Offset: 0x34
+     * </pre>
+     *
+     * <code>int32 retcode = 14;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -251,21 +299,21 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (curAvatarGuid_ != 0L) {
-        output.writeUInt64(2, curAvatarGuid_);
-      }
-      if (teamId_ != 0) {
-        output.writeUInt32(3, teamId_);
-      }
       if (getAvatarTeamGuidListList().size() > 0) {
-        output.writeUInt32NoTag(50);
+        output.writeUInt32NoTag(34);
         output.writeUInt32NoTag(avatarTeamGuidListMemoizedSerializedSize);
       }
       for (int i = 0; i < avatarTeamGuidList_.size(); i++) {
         output.writeUInt64NoTag(avatarTeamGuidList_.getLong(i));
       }
+      if (teamId_ != 0) {
+        output.writeUInt32(5, teamId_);
+      }
+      if (curAvatarGuid_ != 0L) {
+        output.writeUInt64(13, curAvatarGuid_);
+      }
       if (retcode_ != 0) {
-        output.writeInt32(8, retcode_);
+        output.writeInt32(14, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -276,14 +324,6 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (curAvatarGuid_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(2, curAvatarGuid_);
-      }
-      if (teamId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, teamId_);
-      }
       {
         int dataSize = 0;
         for (int i = 0; i < avatarTeamGuidList_.size(); i++) {
@@ -298,9 +338,17 @@ public int getSerializedSize() {
         }
         avatarTeamGuidListMemoizedSerializedSize = dataSize;
       }
+      if (teamId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(5, teamId_);
+      }
+      if (curAvatarGuid_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(13, curAvatarGuid_);
+      }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(8, retcode_);
+          .computeInt32Size(14, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -317,12 +365,12 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.SetUpAvatarTeamRspOuterClass.SetUpAvatarTeamRsp other = (emu.grasscutter.net.proto.SetUpAvatarTeamRspOuterClass.SetUpAvatarTeamRsp) obj;
 
+      if (!getAvatarTeamGuidListList()
+          .equals(other.getAvatarTeamGuidListList())) return false;
       if (getCurAvatarGuid()
           != other.getCurAvatarGuid()) return false;
       if (getTeamId()
           != other.getTeamId()) return false;
-      if (!getAvatarTeamGuidListList()
-          .equals(other.getAvatarTeamGuidListList())) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -336,15 +384,15 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      if (getAvatarTeamGuidListCount() > 0) {
+        hash = (37 * hash) + AVATAR_TEAM_GUID_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getAvatarTeamGuidListList().hashCode();
+      }
       hash = (37 * hash) + CUR_AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getCurAvatarGuid());
       hash = (37 * hash) + TEAM_ID_FIELD_NUMBER;
       hash = (53 * hash) + getTeamId();
-      if (getAvatarTeamGuidListCount() > 0) {
-        hash = (37 * hash) + AVATAR_TEAM_GUID_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getAvatarTeamGuidListList().hashCode();
-      }
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -444,7 +492,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 306
+     * CmdId: 9133
      * </pre>
      *
      * Protobuf type {@code SetUpAvatarTeamRsp}
@@ -484,12 +532,12 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        avatarTeamGuidList_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x00000001);
         curAvatarGuid_ = 0L;
 
         teamId_ = 0;
 
-        avatarTeamGuidList_ = emptyLongList();
-        bitField0_ = (bitField0_ & ~0x00000001);
         retcode_ = 0;
 
         return this;
@@ -519,13 +567,13 @@ public emu.grasscutter.net.proto.SetUpAvatarTeamRspOuterClass.SetUpAvatarTeamRsp
       public emu.grasscutter.net.proto.SetUpAvatarTeamRspOuterClass.SetUpAvatarTeamRsp buildPartial() {
         emu.grasscutter.net.proto.SetUpAvatarTeamRspOuterClass.SetUpAvatarTeamRsp result = new emu.grasscutter.net.proto.SetUpAvatarTeamRspOuterClass.SetUpAvatarTeamRsp(this);
         int from_bitField0_ = bitField0_;
-        result.curAvatarGuid_ = curAvatarGuid_;
-        result.teamId_ = teamId_;
         if (((bitField0_ & 0x00000001) != 0)) {
           avatarTeamGuidList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.avatarTeamGuidList_ = avatarTeamGuidList_;
+        result.curAvatarGuid_ = curAvatarGuid_;
+        result.teamId_ = teamId_;
         result.retcode_ = retcode_;
         onBuilt();
         return result;
@@ -575,12 +623,6 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.SetUpAvatarTeamRspOuterClass.SetUpAvatarTeamRsp other) {
         if (other == emu.grasscutter.net.proto.SetUpAvatarTeamRspOuterClass.SetUpAvatarTeamRsp.getDefaultInstance()) return this;
-        if (other.getCurAvatarGuid() != 0L) {
-          setCurAvatarGuid(other.getCurAvatarGuid());
-        }
-        if (other.getTeamId() != 0) {
-          setTeamId(other.getTeamId());
-        }
         if (!other.avatarTeamGuidList_.isEmpty()) {
           if (avatarTeamGuidList_.isEmpty()) {
             avatarTeamGuidList_ = other.avatarTeamGuidList_;
@@ -591,6 +633,12 @@ public Builder mergeFrom(emu.grasscutter.net.proto.SetUpAvatarTeamRspOuterClass.
           }
           onChanged();
         }
+        if (other.getCurAvatarGuid() != 0L) {
+          setCurAvatarGuid(other.getCurAvatarGuid());
+        }
+        if (other.getTeamId() != 0) {
+          setTeamId(other.getTeamId());
+        }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
@@ -624,68 +672,6 @@ public Builder mergeFrom(
       }
       private int bitField0_;
 
-      private long curAvatarGuid_ ;
-      /**
-       * <code>uint64 cur_avatar_guid = 2;</code>
-       * @return The curAvatarGuid.
-       */
-      @java.lang.Override
-      public long getCurAvatarGuid() {
-        return curAvatarGuid_;
-      }
-      /**
-       * <code>uint64 cur_avatar_guid = 2;</code>
-       * @param value The curAvatarGuid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCurAvatarGuid(long value) {
-        
-        curAvatarGuid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 cur_avatar_guid = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCurAvatarGuid() {
-        
-        curAvatarGuid_ = 0L;
-        onChanged();
-        return this;
-      }
-
-      private int teamId_ ;
-      /**
-       * <code>uint32 team_id = 3;</code>
-       * @return The teamId.
-       */
-      @java.lang.Override
-      public int getTeamId() {
-        return teamId_;
-      }
-      /**
-       * <code>uint32 team_id = 3;</code>
-       * @param value The teamId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTeamId(int value) {
-        
-        teamId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 team_id = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTeamId() {
-        
-        teamId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private com.google.protobuf.Internal.LongList avatarTeamGuidList_ = emptyLongList();
       private void ensureAvatarTeamGuidListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
@@ -694,7 +680,11 @@ private void ensureAvatarTeamGuidListIsMutable() {
          }
       }
       /**
-       * <code>repeated uint64 avatar_team_guid_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint64 avatar_team_guid_list = 4;</code>
        * @return A list containing the avatarTeamGuidList.
        */
       public java.util.List<java.lang.Long>
@@ -703,14 +693,22 @@ private void ensureAvatarTeamGuidListIsMutable() {
                  java.util.Collections.unmodifiableList(avatarTeamGuidList_) : avatarTeamGuidList_;
       }
       /**
-       * <code>repeated uint64 avatar_team_guid_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint64 avatar_team_guid_list = 4;</code>
        * @return The count of avatarTeamGuidList.
        */
       public int getAvatarTeamGuidListCount() {
         return avatarTeamGuidList_.size();
       }
       /**
-       * <code>repeated uint64 avatar_team_guid_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint64 avatar_team_guid_list = 4;</code>
        * @param index The index of the element to return.
        * @return The avatarTeamGuidList at the given index.
        */
@@ -718,7 +716,11 @@ public long getAvatarTeamGuidList(int index) {
         return avatarTeamGuidList_.getLong(index);
       }
       /**
-       * <code>repeated uint64 avatar_team_guid_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint64 avatar_team_guid_list = 4;</code>
        * @param index The index to set the value at.
        * @param value The avatarTeamGuidList to set.
        * @return This builder for chaining.
@@ -731,7 +733,11 @@ public Builder setAvatarTeamGuidList(
         return this;
       }
       /**
-       * <code>repeated uint64 avatar_team_guid_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint64 avatar_team_guid_list = 4;</code>
        * @param value The avatarTeamGuidList to add.
        * @return This builder for chaining.
        */
@@ -742,7 +748,11 @@ public Builder addAvatarTeamGuidList(long value) {
         return this;
       }
       /**
-       * <code>repeated uint64 avatar_team_guid_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint64 avatar_team_guid_list = 4;</code>
        * @param values The avatarTeamGuidList to add.
        * @return This builder for chaining.
        */
@@ -755,7 +765,11 @@ public Builder addAllAvatarTeamGuidList(
         return this;
       }
       /**
-       * <code>repeated uint64 avatar_team_guid_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated uint64 avatar_team_guid_list = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarTeamGuidList() {
@@ -765,9 +779,99 @@ public Builder clearAvatarTeamGuidList() {
         return this;
       }
 
+      private long curAvatarGuid_ ;
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint64 cur_avatar_guid = 13;</code>
+       * @return The curAvatarGuid.
+       */
+      @java.lang.Override
+      public long getCurAvatarGuid() {
+        return curAvatarGuid_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint64 cur_avatar_guid = 13;</code>
+       * @param value The curAvatarGuid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCurAvatarGuid(long value) {
+        
+        curAvatarGuid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint64 cur_avatar_guid = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCurAvatarGuid() {
+        
+        curAvatarGuid_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private int teamId_ ;
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint32 team_id = 5;</code>
+       * @return The teamId.
+       */
+      @java.lang.Override
+      public int getTeamId() {
+        return teamId_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint32 team_id = 5;</code>
+       * @param value The teamId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTeamId(int value) {
+        
+        teamId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint32 team_id = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTeamId() {
+        
+        teamId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 8;</code>
+       * <pre>
+       * Offset: 0x34
+       * </pre>
+       *
+       * <code>int32 retcode = 14;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -775,7 +879,11 @@ public int getRetcode() {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 8;</code>
+       * <pre>
+       * Offset: 0x34
+       * </pre>
+       *
+       * <code>int32 retcode = 14;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -786,7 +894,11 @@ public Builder setRetcode(int value) {
         return this;
       }
       /**
-       * <code>int32 retcode = 8;</code>
+       * <pre>
+       * Offset: 0x34
+       * </pre>
+       *
+       * <code>int32 retcode = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -863,9 +975,9 @@ public emu.grasscutter.net.proto.SetUpAvatarTeamRspOuterClass.SetUpAvatarTeamRsp
   static {
     java.lang.String[] descriptorData = {
       "\n\030SetUpAvatarTeamRsp.proto\"n\n\022SetUpAvata" +
-      "rTeamRsp\022\027\n\017cur_avatar_guid\030\002 \001(\004\022\017\n\007tea" +
-      "m_id\030\003 \001(\r\022\035\n\025avatar_team_guid_list\030\006 \003(" +
-      "\004\022\017\n\007retcode\030\010 \001(\005B\033\n\031emu.grasscutter.ne" +
+      "rTeamRsp\022\035\n\025avatar_team_guid_list\030\004 \003(\004\022" +
+      "\027\n\017cur_avatar_guid\030\r \001(\004\022\017\n\007team_id\030\005 \001(" +
+      "\r\022\017\n\007retcode\030\016 \001(\005B\033\n\031emu.grasscutter.ne" +
       "t.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -877,7 +989,7 @@ public emu.grasscutter.net.proto.SetUpAvatarTeamRspOuterClass.SetUpAvatarTeamRsp
     internal_static_SetUpAvatarTeamRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SetUpAvatarTeamRsp_descriptor,
-        new java.lang.String[] { "CurAvatarGuid", "TeamId", "AvatarTeamGuidList", "Retcode", });
+        new java.lang.String[] { "AvatarTeamGuidList", "CurAvatarGuid", "TeamId", "Retcode", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SetWidgetSlotReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SetWidgetSlotReqOuterClass.java
index b21903319c0..cff29eb3b58 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SetWidgetSlotReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SetWidgetSlotReqOuterClass.java
@@ -19,28 +19,48 @@ public interface SetWidgetSlotReqOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
      * <code>repeated .WidgetSlotTag tag_list = 2;</code>
      * @return A list containing the tagList.
      */
     java.util.List<emu.grasscutter.net.proto.WidgetSlotTagOuterClass.WidgetSlotTag> getTagListList();
     /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
      * <code>repeated .WidgetSlotTag tag_list = 2;</code>
      * @return The count of tagList.
      */
     int getTagListCount();
     /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
      * <code>repeated .WidgetSlotTag tag_list = 2;</code>
      * @param index The index of the element to return.
      * @return The tagList at the given index.
      */
     emu.grasscutter.net.proto.WidgetSlotTagOuterClass.WidgetSlotTag getTagList(int index);
     /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
      * <code>repeated .WidgetSlotTag tag_list = 2;</code>
      * @return A list containing the enum numeric values on the wire for tagList.
      */
     java.util.List<java.lang.Integer>
     getTagListValueList();
     /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
      * <code>repeated .WidgetSlotTag tag_list = 2;</code>
      * @param index The index of the value to return.
      * @return The enum numeric value on the wire of tagList at the given index.
@@ -48,25 +68,37 @@ public interface SetWidgetSlotReqOrBuilder extends
     int getTagListValue(int index);
 
     /**
-     * <code>.WidgetSlotOp op = 12;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.WidgetSlotOp op = 13;</code>
      * @return The enum numeric value on the wire for op.
      */
     int getOpValue();
     /**
-     * <code>.WidgetSlotOp op = 12;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.WidgetSlotOp op = 13;</code>
      * @return The op.
      */
     emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp getOp();
 
     /**
-     * <code>uint32 material_id = 8;</code>
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>uint32 material_id = 11;</code>
      * @return The materialId.
      */
     int getMaterialId();
   }
   /**
    * <pre>
-   * CmdId: 22701
+   * CmdId: 2490
    * </pre>
    *
    * Protobuf type {@code SetWidgetSlotReq}
@@ -139,12 +171,12 @@ private SetWidgetSlotReq(
               input.popLimit(oldLimit);
               break;
             }
-            case 64: {
+            case 88: {
 
               materialId_ = input.readUInt32();
               break;
             }
-            case 96: {
+            case 104: {
               int rawValue = input.readEnum();
 
               op_ = rawValue;
@@ -198,6 +230,10 @@ public emu.grasscutter.net.proto.WidgetSlotTagOuterClass.WidgetSlotTag convert(j
               }
             };
     /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
      * <code>repeated .WidgetSlotTag tag_list = 2;</code>
      * @return A list containing the tagList.
      */
@@ -207,6 +243,10 @@ public java.util.List<emu.grasscutter.net.proto.WidgetSlotTagOuterClass.WidgetSl
           java.lang.Integer, emu.grasscutter.net.proto.WidgetSlotTagOuterClass.WidgetSlotTag>(tagList_, tagList_converter_);
     }
     /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
      * <code>repeated .WidgetSlotTag tag_list = 2;</code>
      * @return The count of tagList.
      */
@@ -215,6 +255,10 @@ public int getTagListCount() {
       return tagList_.size();
     }
     /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
      * <code>repeated .WidgetSlotTag tag_list = 2;</code>
      * @param index The index of the element to return.
      * @return The tagList at the given index.
@@ -224,6 +268,10 @@ public emu.grasscutter.net.proto.WidgetSlotTagOuterClass.WidgetSlotTag getTagLis
       return tagList_converter_.convert(tagList_.get(index));
     }
     /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
      * <code>repeated .WidgetSlotTag tag_list = 2;</code>
      * @return A list containing the enum numeric values on the wire for tagList.
      */
@@ -233,6 +281,10 @@ public emu.grasscutter.net.proto.WidgetSlotTagOuterClass.WidgetSlotTag getTagLis
       return tagList_;
     }
     /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
      * <code>repeated .WidgetSlotTag tag_list = 2;</code>
      * @param index The index of the value to return.
      * @return The enum numeric value on the wire of tagList at the given index.
@@ -243,17 +295,25 @@ public int getTagListValue(int index) {
     }
     private int tagListMemoizedSerializedSize;
 
-    public static final int OP_FIELD_NUMBER = 12;
+    public static final int OP_FIELD_NUMBER = 13;
     private int op_;
     /**
-     * <code>.WidgetSlotOp op = 12;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.WidgetSlotOp op = 13;</code>
      * @return The enum numeric value on the wire for op.
      */
     @java.lang.Override public int getOpValue() {
       return op_;
     }
     /**
-     * <code>.WidgetSlotOp op = 12;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.WidgetSlotOp op = 13;</code>
      * @return The op.
      */
     @java.lang.Override public emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp getOp() {
@@ -262,10 +322,14 @@ public int getTagListValue(int index) {
       return result == null ? emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp.UNRECOGNIZED : result;
     }
 
-    public static final int MATERIAL_ID_FIELD_NUMBER = 8;
+    public static final int MATERIAL_ID_FIELD_NUMBER = 11;
     private int materialId_;
     /**
-     * <code>uint32 material_id = 8;</code>
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>uint32 material_id = 11;</code>
      * @return The materialId.
      */
     @java.lang.Override
@@ -296,10 +360,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
         output.writeEnumNoTag(tagList_.get(i));
       }
       if (materialId_ != 0) {
-        output.writeUInt32(8, materialId_);
+        output.writeUInt32(11, materialId_);
       }
       if (op_ != emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp.WIDGET_SLOT_OP_ATTACH.getNumber()) {
-        output.writeEnum(12, op_);
+        output.writeEnum(13, op_);
       }
       unknownFields.writeTo(output);
     }
@@ -324,11 +388,11 @@ public int getSerializedSize() {
       }
       if (materialId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, materialId_);
+          .computeUInt32Size(11, materialId_);
       }
       if (op_ != emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp.WIDGET_SLOT_OP_ATTACH.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(12, op_);
+          .computeEnumSize(13, op_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -465,7 +529,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 22701
+     * CmdId: 2490
      * </pre>
      *
      * Protobuf type {@code SetWidgetSlotReq}
@@ -648,6 +712,10 @@ private void ensureTagListIsMutable() {
         }
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>repeated .WidgetSlotTag tag_list = 2;</code>
        * @return A list containing the tagList.
        */
@@ -656,6 +724,10 @@ public java.util.List<emu.grasscutter.net.proto.WidgetSlotTagOuterClass.WidgetSl
             java.lang.Integer, emu.grasscutter.net.proto.WidgetSlotTagOuterClass.WidgetSlotTag>(tagList_, tagList_converter_);
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>repeated .WidgetSlotTag tag_list = 2;</code>
        * @return The count of tagList.
        */
@@ -663,6 +735,10 @@ public int getTagListCount() {
         return tagList_.size();
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>repeated .WidgetSlotTag tag_list = 2;</code>
        * @param index The index of the element to return.
        * @return The tagList at the given index.
@@ -671,6 +747,10 @@ public emu.grasscutter.net.proto.WidgetSlotTagOuterClass.WidgetSlotTag getTagLis
         return tagList_converter_.convert(tagList_.get(index));
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>repeated .WidgetSlotTag tag_list = 2;</code>
        * @param index The index to set the value at.
        * @param value The tagList to set.
@@ -687,6 +767,10 @@ public Builder setTagList(
         return this;
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>repeated .WidgetSlotTag tag_list = 2;</code>
        * @param value The tagList to add.
        * @return This builder for chaining.
@@ -701,6 +785,10 @@ public Builder addTagList(emu.grasscutter.net.proto.WidgetSlotTagOuterClass.Widg
         return this;
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>repeated .WidgetSlotTag tag_list = 2;</code>
        * @param values The tagList to add.
        * @return This builder for chaining.
@@ -715,6 +803,10 @@ public Builder addAllTagList(
         return this;
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>repeated .WidgetSlotTag tag_list = 2;</code>
        * @return This builder for chaining.
        */
@@ -725,6 +817,10 @@ public Builder clearTagList() {
         return this;
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>repeated .WidgetSlotTag tag_list = 2;</code>
        * @return A list containing the enum numeric values on the wire for tagList.
        */
@@ -733,6 +829,10 @@ public Builder clearTagList() {
         return java.util.Collections.unmodifiableList(tagList_);
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>repeated .WidgetSlotTag tag_list = 2;</code>
        * @param index The index of the value to return.
        * @return The enum numeric value on the wire of tagList at the given index.
@@ -741,6 +841,10 @@ public int getTagListValue(int index) {
         return tagList_.get(index);
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>repeated .WidgetSlotTag tag_list = 2;</code>
        * @param index The index of the value to return.
        * @return The enum numeric value on the wire of tagList at the given index.
@@ -754,6 +858,10 @@ public Builder setTagListValue(
         return this;
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>repeated .WidgetSlotTag tag_list = 2;</code>
        * @param value The enum numeric value on the wire for tagList to add.
        * @return This builder for chaining.
@@ -765,6 +873,10 @@ public Builder addTagListValue(int value) {
         return this;
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>repeated .WidgetSlotTag tag_list = 2;</code>
        * @param values The enum numeric values on the wire for tagList to add.
        * @return This builder for chaining.
@@ -781,14 +893,22 @@ public Builder addAllTagListValue(
 
       private int op_ = 0;
       /**
-       * <code>.WidgetSlotOp op = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.WidgetSlotOp op = 13;</code>
        * @return The enum numeric value on the wire for op.
        */
       @java.lang.Override public int getOpValue() {
         return op_;
       }
       /**
-       * <code>.WidgetSlotOp op = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.WidgetSlotOp op = 13;</code>
        * @param value The enum numeric value on the wire for op to set.
        * @return This builder for chaining.
        */
@@ -799,7 +919,11 @@ public Builder setOpValue(int value) {
         return this;
       }
       /**
-       * <code>.WidgetSlotOp op = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.WidgetSlotOp op = 13;</code>
        * @return The op.
        */
       @java.lang.Override
@@ -809,7 +933,11 @@ public emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp getOp() {
         return result == null ? emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp.UNRECOGNIZED : result;
       }
       /**
-       * <code>.WidgetSlotOp op = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.WidgetSlotOp op = 13;</code>
        * @param value The op to set.
        * @return This builder for chaining.
        */
@@ -823,7 +951,11 @@ public Builder setOp(emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlot
         return this;
       }
       /**
-       * <code>.WidgetSlotOp op = 12;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.WidgetSlotOp op = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearOp() {
@@ -835,7 +967,11 @@ public Builder clearOp() {
 
       private int materialId_ ;
       /**
-       * <code>uint32 material_id = 8;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 material_id = 11;</code>
        * @return The materialId.
        */
       @java.lang.Override
@@ -843,7 +979,11 @@ public int getMaterialId() {
         return materialId_;
       }
       /**
-       * <code>uint32 material_id = 8;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 material_id = 11;</code>
        * @param value The materialId to set.
        * @return This builder for chaining.
        */
@@ -854,7 +994,11 @@ public Builder setMaterialId(int value) {
         return this;
       }
       /**
-       * <code>uint32 material_id = 8;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 material_id = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearMaterialId() {
@@ -933,8 +1077,8 @@ public emu.grasscutter.net.proto.SetWidgetSlotReqOuterClass.SetWidgetSlotReq get
       "\n\026SetWidgetSlotReq.proto\032\022WidgetSlotOp.p" +
       "roto\032\023WidgetSlotTag.proto\"d\n\020SetWidgetSl" +
       "otReq\022 \n\010tag_list\030\002 \003(\0162\016.WidgetSlotTag\022" +
-      "\031\n\002op\030\014 \001(\0162\r.WidgetSlotOp\022\023\n\013material_i" +
-      "d\030\010 \001(\rB\033\n\031emu.grasscutter.net.protob\006pr" +
+      "\031\n\002op\030\r \001(\0162\r.WidgetSlotOp\022\023\n\013material_i" +
+      "d\030\013 \001(\rB\033\n\031emu.grasscutter.net.protob\006pr" +
       "oto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SetWidgetSlotRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SetWidgetSlotRspOuterClass.java
index d0d74ba310b..4acf4bdfba8 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SetWidgetSlotRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SetWidgetSlotRspOuterClass.java
@@ -19,60 +19,96 @@ public interface SetWidgetSlotRspOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 1;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
-    /**
-     * <code>.WidgetSlotOp op = 6;</code>
-     * @return The enum numeric value on the wire for op.
-     */
-    int getOpValue();
-    /**
-     * <code>.WidgetSlotOp op = 6;</code>
-     * @return The op.
-     */
-    emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp getOp();
-
-    /**
-     * <code>uint32 material_id = 10;</code>
-     * @return The materialId.
-     */
-    int getMaterialId();
-
-    /**
-     * <code>repeated .WidgetSlotTag tag_list = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .WidgetSlotTag tag_list = 10;</code>
      * @return A list containing the tagList.
      */
     java.util.List<emu.grasscutter.net.proto.WidgetSlotTagOuterClass.WidgetSlotTag> getTagListList();
     /**
-     * <code>repeated .WidgetSlotTag tag_list = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .WidgetSlotTag tag_list = 10;</code>
      * @return The count of tagList.
      */
     int getTagListCount();
     /**
-     * <code>repeated .WidgetSlotTag tag_list = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .WidgetSlotTag tag_list = 10;</code>
      * @param index The index of the element to return.
      * @return The tagList at the given index.
      */
     emu.grasscutter.net.proto.WidgetSlotTagOuterClass.WidgetSlotTag getTagList(int index);
     /**
-     * <code>repeated .WidgetSlotTag tag_list = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .WidgetSlotTag tag_list = 10;</code>
      * @return A list containing the enum numeric values on the wire for tagList.
      */
     java.util.List<java.lang.Integer>
     getTagListValueList();
     /**
-     * <code>repeated .WidgetSlotTag tag_list = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .WidgetSlotTag tag_list = 10;</code>
      * @param index The index of the value to return.
      * @return The enum numeric value on the wire of tagList at the given index.
      */
     int getTagListValue(int index);
+
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.WidgetSlotOp op = 3;</code>
+     * @return The enum numeric value on the wire for op.
+     */
+    int getOpValue();
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.WidgetSlotOp op = 3;</code>
+     * @return The op.
+     */
+    emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp getOp();
+
+    /**
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>uint32 material_id = 5;</code>
+     * @return The materialId.
+     */
+    int getMaterialId();
+
+    /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>int32 retcode = 4;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
   }
   /**
    * <pre>
-   * CmdId: 7049
+   * CmdId: 2644
    * </pre>
    *
    * Protobuf type {@code SetWidgetSlotRsp}
@@ -87,8 +123,8 @@ private SetWidgetSlotRsp(com.google.protobuf.GeneratedMessageV3.Builder<?> build
       super(builder);
     }
     private SetWidgetSlotRsp() {
-      op_ = 0;
       tagList_ = java.util.Collections.emptyList();
+      op_ = 0;
     }
 
     @java.lang.Override
@@ -122,23 +158,23 @@ private SetWidgetSlotRsp(
             case 0:
               done = true;
               break;
-            case 8: {
+            case 24: {
+              int rawValue = input.readEnum();
 
-              retcode_ = input.readInt32();
+              op_ = rawValue;
               break;
             }
-            case 48: {
-              int rawValue = input.readEnum();
+            case 32: {
 
-              op_ = rawValue;
+              retcode_ = input.readInt32();
               break;
             }
-            case 80: {
+            case 40: {
 
               materialId_ = input.readUInt32();
               break;
             }
-            case 96: {
+            case 80: {
               int rawValue = input.readEnum();
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 tagList_ = new java.util.ArrayList<java.lang.Integer>();
@@ -147,7 +183,7 @@ private SetWidgetSlotRsp(
               tagList_.add(rawValue);
               break;
             }
-            case 98: {
+            case 82: {
               int length = input.readRawVarint32();
               int oldLimit = input.pushLimit(length);
               while(input.getBytesUntilLimit() > 0) {
@@ -196,48 +232,7 @@ private SetWidgetSlotRsp(
               emu.grasscutter.net.proto.SetWidgetSlotRspOuterClass.SetWidgetSlotRsp.class, emu.grasscutter.net.proto.SetWidgetSlotRspOuterClass.SetWidgetSlotRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 1;
-    private int retcode_;
-    /**
-     * <code>int32 retcode = 1;</code>
-     * @return The retcode.
-     */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
-    }
-
-    public static final int OP_FIELD_NUMBER = 6;
-    private int op_;
-    /**
-     * <code>.WidgetSlotOp op = 6;</code>
-     * @return The enum numeric value on the wire for op.
-     */
-    @java.lang.Override public int getOpValue() {
-      return op_;
-    }
-    /**
-     * <code>.WidgetSlotOp op = 6;</code>
-     * @return The op.
-     */
-    @java.lang.Override public emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp getOp() {
-      @SuppressWarnings("deprecation")
-      emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp result = emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp.valueOf(op_);
-      return result == null ? emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp.UNRECOGNIZED : result;
-    }
-
-    public static final int MATERIAL_ID_FIELD_NUMBER = 10;
-    private int materialId_;
-    /**
-     * <code>uint32 material_id = 10;</code>
-     * @return The materialId.
-     */
-    @java.lang.Override
-    public int getMaterialId() {
-      return materialId_;
-    }
-
-    public static final int TAG_LIST_FIELD_NUMBER = 12;
+    public static final int TAG_LIST_FIELD_NUMBER = 10;
     private java.util.List<java.lang.Integer> tagList_;
     private static final com.google.protobuf.Internal.ListAdapter.Converter<
         java.lang.Integer, emu.grasscutter.net.proto.WidgetSlotTagOuterClass.WidgetSlotTag> tagList_converter_ =
@@ -250,7 +245,11 @@ public emu.grasscutter.net.proto.WidgetSlotTagOuterClass.WidgetSlotTag convert(j
               }
             };
     /**
-     * <code>repeated .WidgetSlotTag tag_list = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .WidgetSlotTag tag_list = 10;</code>
      * @return A list containing the tagList.
      */
     @java.lang.Override
@@ -259,7 +258,11 @@ public java.util.List<emu.grasscutter.net.proto.WidgetSlotTagOuterClass.WidgetSl
           java.lang.Integer, emu.grasscutter.net.proto.WidgetSlotTagOuterClass.WidgetSlotTag>(tagList_, tagList_converter_);
     }
     /**
-     * <code>repeated .WidgetSlotTag tag_list = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .WidgetSlotTag tag_list = 10;</code>
      * @return The count of tagList.
      */
     @java.lang.Override
@@ -267,7 +270,11 @@ public int getTagListCount() {
       return tagList_.size();
     }
     /**
-     * <code>repeated .WidgetSlotTag tag_list = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .WidgetSlotTag tag_list = 10;</code>
      * @param index The index of the element to return.
      * @return The tagList at the given index.
      */
@@ -276,7 +283,11 @@ public emu.grasscutter.net.proto.WidgetSlotTagOuterClass.WidgetSlotTag getTagLis
       return tagList_converter_.convert(tagList_.get(index));
     }
     /**
-     * <code>repeated .WidgetSlotTag tag_list = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .WidgetSlotTag tag_list = 10;</code>
      * @return A list containing the enum numeric values on the wire for tagList.
      */
     @java.lang.Override
@@ -285,7 +296,11 @@ public emu.grasscutter.net.proto.WidgetSlotTagOuterClass.WidgetSlotTag getTagLis
       return tagList_;
     }
     /**
-     * <code>repeated .WidgetSlotTag tag_list = 12;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .WidgetSlotTag tag_list = 10;</code>
      * @param index The index of the value to return.
      * @return The enum numeric value on the wire of tagList at the given index.
      */
@@ -295,6 +310,63 @@ public int getTagListValue(int index) {
     }
     private int tagListMemoizedSerializedSize;
 
+    public static final int OP_FIELD_NUMBER = 3;
+    private int op_;
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.WidgetSlotOp op = 3;</code>
+     * @return The enum numeric value on the wire for op.
+     */
+    @java.lang.Override public int getOpValue() {
+      return op_;
+    }
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.WidgetSlotOp op = 3;</code>
+     * @return The op.
+     */
+    @java.lang.Override public emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp getOp() {
+      @SuppressWarnings("deprecation")
+      emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp result = emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp.valueOf(op_);
+      return result == null ? emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp.UNRECOGNIZED : result;
+    }
+
+    public static final int MATERIAL_ID_FIELD_NUMBER = 5;
+    private int materialId_;
+    /**
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>uint32 material_id = 5;</code>
+     * @return The materialId.
+     */
+    @java.lang.Override
+    public int getMaterialId() {
+      return materialId_;
+    }
+
+    public static final int RETCODE_FIELD_NUMBER = 4;
+    private int retcode_;
+    /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>int32 retcode = 4;</code>
+     * @return The retcode.
+     */
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -310,17 +382,17 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (retcode_ != 0) {
-        output.writeInt32(1, retcode_);
-      }
       if (op_ != emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp.WIDGET_SLOT_OP_ATTACH.getNumber()) {
-        output.writeEnum(6, op_);
+        output.writeEnum(3, op_);
+      }
+      if (retcode_ != 0) {
+        output.writeInt32(4, retcode_);
       }
       if (materialId_ != 0) {
-        output.writeUInt32(10, materialId_);
+        output.writeUInt32(5, materialId_);
       }
       if (getTagListList().size() > 0) {
-        output.writeUInt32NoTag(98);
+        output.writeUInt32NoTag(82);
         output.writeUInt32NoTag(tagListMemoizedSerializedSize);
       }
       for (int i = 0; i < tagList_.size(); i++) {
@@ -335,17 +407,17 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (retcode_ != 0) {
+      if (op_ != emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp.WIDGET_SLOT_OP_ATTACH.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(1, retcode_);
+          .computeEnumSize(3, op_);
       }
-      if (op_ != emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp.WIDGET_SLOT_OP_ATTACH.getNumber()) {
+      if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(6, op_);
+          .computeInt32Size(4, retcode_);
       }
       if (materialId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, materialId_);
+          .computeUInt32Size(5, materialId_);
       }
       {
         int dataSize = 0;
@@ -374,12 +446,12 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.SetWidgetSlotRspOuterClass.SetWidgetSlotRsp other = (emu.grasscutter.net.proto.SetWidgetSlotRspOuterClass.SetWidgetSlotRsp) obj;
 
-      if (getRetcode()
-          != other.getRetcode()) return false;
+      if (!tagList_.equals(other.tagList_)) return false;
       if (op_ != other.op_) return false;
       if (getMaterialId()
           != other.getMaterialId()) return false;
-      if (!tagList_.equals(other.tagList_)) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -391,16 +463,16 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
-      hash = (37 * hash) + OP_FIELD_NUMBER;
-      hash = (53 * hash) + op_;
-      hash = (37 * hash) + MATERIAL_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getMaterialId();
       if (getTagListCount() > 0) {
         hash = (37 * hash) + TAG_LIST_FIELD_NUMBER;
         hash = (53 * hash) + tagList_.hashCode();
       }
+      hash = (37 * hash) + OP_FIELD_NUMBER;
+      hash = (53 * hash) + op_;
+      hash = (37 * hash) + MATERIAL_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getMaterialId();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -498,7 +570,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 7049
+     * CmdId: 2644
      * </pre>
      *
      * Protobuf type {@code SetWidgetSlotRsp}
@@ -538,14 +610,14 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        retcode_ = 0;
-
+        tagList_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
         op_ = 0;
 
         materialId_ = 0;
 
-        tagList_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        retcode_ = 0;
+
         return this;
       }
 
@@ -573,14 +645,14 @@ public emu.grasscutter.net.proto.SetWidgetSlotRspOuterClass.SetWidgetSlotRsp bui
       public emu.grasscutter.net.proto.SetWidgetSlotRspOuterClass.SetWidgetSlotRsp buildPartial() {
         emu.grasscutter.net.proto.SetWidgetSlotRspOuterClass.SetWidgetSlotRsp result = new emu.grasscutter.net.proto.SetWidgetSlotRspOuterClass.SetWidgetSlotRsp(this);
         int from_bitField0_ = bitField0_;
-        result.retcode_ = retcode_;
-        result.op_ = op_;
-        result.materialId_ = materialId_;
         if (((bitField0_ & 0x00000001) != 0)) {
           tagList_ = java.util.Collections.unmodifiableList(tagList_);
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.tagList_ = tagList_;
+        result.op_ = op_;
+        result.materialId_ = materialId_;
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -629,15 +701,6 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.SetWidgetSlotRspOuterClass.SetWidgetSlotRsp other) {
         if (other == emu.grasscutter.net.proto.SetWidgetSlotRspOuterClass.SetWidgetSlotRsp.getDefaultInstance()) return this;
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
-        if (other.op_ != 0) {
-          setOpValue(other.getOpValue());
-        }
-        if (other.getMaterialId() != 0) {
-          setMaterialId(other.getMaterialId());
-        }
         if (!other.tagList_.isEmpty()) {
           if (tagList_.isEmpty()) {
             tagList_ = other.tagList_;
@@ -648,6 +711,15 @@ public Builder mergeFrom(emu.grasscutter.net.proto.SetWidgetSlotRspOuterClass.Se
           }
           onChanged();
         }
+        if (other.op_ != 0) {
+          setOpValue(other.getOpValue());
+        }
+        if (other.getMaterialId() != 0) {
+          setMaterialId(other.getMaterialId());
+        }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -678,122 +750,6 @@ public Builder mergeFrom(
       }
       private int bitField0_;
 
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 1;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <code>int32 retcode = 1;</code>
-       * @param value The retcode to set.
-       * @return This builder for chaining.
-       */
-      public Builder setRetcode(int value) {
-        
-        retcode_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>int32 retcode = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int op_ = 0;
-      /**
-       * <code>.WidgetSlotOp op = 6;</code>
-       * @return The enum numeric value on the wire for op.
-       */
-      @java.lang.Override public int getOpValue() {
-        return op_;
-      }
-      /**
-       * <code>.WidgetSlotOp op = 6;</code>
-       * @param value The enum numeric value on the wire for op to set.
-       * @return This builder for chaining.
-       */
-      public Builder setOpValue(int value) {
-        
-        op_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.WidgetSlotOp op = 6;</code>
-       * @return The op.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp getOp() {
-        @SuppressWarnings("deprecation")
-        emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp result = emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp.valueOf(op_);
-        return result == null ? emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp.UNRECOGNIZED : result;
-      }
-      /**
-       * <code>.WidgetSlotOp op = 6;</code>
-       * @param value The op to set.
-       * @return This builder for chaining.
-       */
-      public Builder setOp(emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        
-        op_ = value.getNumber();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.WidgetSlotOp op = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearOp() {
-        
-        op_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int materialId_ ;
-      /**
-       * <code>uint32 material_id = 10;</code>
-       * @return The materialId.
-       */
-      @java.lang.Override
-      public int getMaterialId() {
-        return materialId_;
-      }
-      /**
-       * <code>uint32 material_id = 10;</code>
-       * @param value The materialId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setMaterialId(int value) {
-        
-        materialId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 material_id = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearMaterialId() {
-        
-        materialId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private java.util.List<java.lang.Integer> tagList_ =
         java.util.Collections.emptyList();
       private void ensureTagListIsMutable() {
@@ -803,7 +759,11 @@ private void ensureTagListIsMutable() {
         }
       }
       /**
-       * <code>repeated .WidgetSlotTag tag_list = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .WidgetSlotTag tag_list = 10;</code>
        * @return A list containing the tagList.
        */
       public java.util.List<emu.grasscutter.net.proto.WidgetSlotTagOuterClass.WidgetSlotTag> getTagListList() {
@@ -811,14 +771,22 @@ public java.util.List<emu.grasscutter.net.proto.WidgetSlotTagOuterClass.WidgetSl
             java.lang.Integer, emu.grasscutter.net.proto.WidgetSlotTagOuterClass.WidgetSlotTag>(tagList_, tagList_converter_);
       }
       /**
-       * <code>repeated .WidgetSlotTag tag_list = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .WidgetSlotTag tag_list = 10;</code>
        * @return The count of tagList.
        */
       public int getTagListCount() {
         return tagList_.size();
       }
       /**
-       * <code>repeated .WidgetSlotTag tag_list = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .WidgetSlotTag tag_list = 10;</code>
        * @param index The index of the element to return.
        * @return The tagList at the given index.
        */
@@ -826,7 +794,11 @@ public emu.grasscutter.net.proto.WidgetSlotTagOuterClass.WidgetSlotTag getTagLis
         return tagList_converter_.convert(tagList_.get(index));
       }
       /**
-       * <code>repeated .WidgetSlotTag tag_list = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .WidgetSlotTag tag_list = 10;</code>
        * @param index The index to set the value at.
        * @param value The tagList to set.
        * @return This builder for chaining.
@@ -842,7 +814,11 @@ public Builder setTagList(
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotTag tag_list = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .WidgetSlotTag tag_list = 10;</code>
        * @param value The tagList to add.
        * @return This builder for chaining.
        */
@@ -856,7 +832,11 @@ public Builder addTagList(emu.grasscutter.net.proto.WidgetSlotTagOuterClass.Widg
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotTag tag_list = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .WidgetSlotTag tag_list = 10;</code>
        * @param values The tagList to add.
        * @return This builder for chaining.
        */
@@ -870,7 +850,11 @@ public Builder addAllTagList(
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotTag tag_list = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .WidgetSlotTag tag_list = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearTagList() {
@@ -880,7 +864,11 @@ public Builder clearTagList() {
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotTag tag_list = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .WidgetSlotTag tag_list = 10;</code>
        * @return A list containing the enum numeric values on the wire for tagList.
        */
       public java.util.List<java.lang.Integer>
@@ -888,7 +876,11 @@ public Builder clearTagList() {
         return java.util.Collections.unmodifiableList(tagList_);
       }
       /**
-       * <code>repeated .WidgetSlotTag tag_list = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .WidgetSlotTag tag_list = 10;</code>
        * @param index The index of the value to return.
        * @return The enum numeric value on the wire of tagList at the given index.
        */
@@ -896,7 +888,11 @@ public int getTagListValue(int index) {
         return tagList_.get(index);
       }
       /**
-       * <code>repeated .WidgetSlotTag tag_list = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .WidgetSlotTag tag_list = 10;</code>
        * @param index The index of the value to return.
        * @return The enum numeric value on the wire of tagList at the given index.
        * @return This builder for chaining.
@@ -909,7 +905,11 @@ public Builder setTagListValue(
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotTag tag_list = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .WidgetSlotTag tag_list = 10;</code>
        * @param value The enum numeric value on the wire for tagList to add.
        * @return This builder for chaining.
        */
@@ -920,7 +920,11 @@ public Builder addTagListValue(int value) {
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotTag tag_list = 12;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .WidgetSlotTag tag_list = 10;</code>
        * @param values The enum numeric values on the wire for tagList to add.
        * @return This builder for chaining.
        */
@@ -933,6 +937,166 @@ public Builder addAllTagListValue(
         onChanged();
         return this;
       }
+
+      private int op_ = 0;
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.WidgetSlotOp op = 3;</code>
+       * @return The enum numeric value on the wire for op.
+       */
+      @java.lang.Override public int getOpValue() {
+        return op_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.WidgetSlotOp op = 3;</code>
+       * @param value The enum numeric value on the wire for op to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOpValue(int value) {
+        
+        op_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.WidgetSlotOp op = 3;</code>
+       * @return The op.
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp getOp() {
+        @SuppressWarnings("deprecation")
+        emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp result = emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp.valueOf(op_);
+        return result == null ? emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp.UNRECOGNIZED : result;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.WidgetSlotOp op = 3;</code>
+       * @param value The op to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOp(emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        
+        op_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.WidgetSlotOp op = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOp() {
+        
+        op_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int materialId_ ;
+      /**
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 material_id = 5;</code>
+       * @return The materialId.
+       */
+      @java.lang.Override
+      public int getMaterialId() {
+        return materialId_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 material_id = 5;</code>
+       * @param value The materialId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setMaterialId(int value) {
+        
+        materialId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 material_id = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearMaterialId() {
+        
+        materialId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int retcode_ ;
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>int32 retcode = 4;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>int32 retcode = 4;</code>
+       * @param value The retcode to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRetcode(int value) {
+        
+        retcode_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>int32 retcode = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRetcode() {
+        
+        retcode_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1002,9 +1166,9 @@ public emu.grasscutter.net.proto.SetWidgetSlotRspOuterClass.SetWidgetSlotRsp get
     java.lang.String[] descriptorData = {
       "\n\026SetWidgetSlotRsp.proto\032\023WidgetSlotTag." +
       "proto\032\022WidgetSlotOp.proto\"u\n\020SetWidgetSl" +
-      "otRsp\022\017\n\007retcode\030\001 \001(\005\022\031\n\002op\030\006 \001(\0162\r.Wid" +
-      "getSlotOp\022\023\n\013material_id\030\n \001(\r\022 \n\010tag_li" +
-      "st\030\014 \003(\0162\016.WidgetSlotTagB\033\n\031emu.grasscut" +
+      "otRsp\022 \n\010tag_list\030\n \003(\0162\016.WidgetSlotTag\022" +
+      "\031\n\002op\030\003 \001(\0162\r.WidgetSlotOp\022\023\n\013material_i" +
+      "d\030\005 \001(\r\022\017\n\007retcode\030\004 \001(\005B\033\n\031emu.grasscut" +
       "ter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1018,7 +1182,7 @@ public emu.grasscutter.net.proto.SetWidgetSlotRspOuterClass.SetWidgetSlotRsp get
     internal_static_SetWidgetSlotRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SetWidgetSlotRsp_descriptor,
-        new java.lang.String[] { "Retcode", "Op", "MaterialId", "TagList", });
+        new java.lang.String[] { "TagList", "Op", "MaterialId", "Retcode", });
     emu.grasscutter.net.proto.WidgetSlotTagOuterClass.getDescriptor();
     emu.grasscutter.net.proto.WidgetSlotOpOuterClass.getDescriptor();
   }
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/StoreItemChangeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/StoreItemChangeNotifyOuterClass.java
index dd122c79f95..f1f965f6df1 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/StoreItemChangeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/StoreItemChangeNotifyOuterClass.java
@@ -19,43 +19,71 @@ public interface StoreItemChangeNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .Item item_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Item item_list = 12;</code>
      */
     java.util.List<emu.grasscutter.net.proto.ItemOuterClass.Item> 
         getItemListList();
     /**
-     * <code>repeated .Item item_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Item item_list = 12;</code>
      */
     emu.grasscutter.net.proto.ItemOuterClass.Item getItemList(int index);
     /**
-     * <code>repeated .Item item_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Item item_list = 12;</code>
      */
     int getItemListCount();
     /**
-     * <code>repeated .Item item_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Item item_list = 12;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder> 
         getItemListOrBuilderList();
     /**
-     * <code>repeated .Item item_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Item item_list = 12;</code>
      */
     emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder getItemListOrBuilder(
         int index);
 
     /**
-     * <code>.StoreType store_type = 12;</code>
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>.StoreType store_type = 10;</code>
      * @return The enum numeric value on the wire for storeType.
      */
     int getStoreTypeValue();
     /**
-     * <code>.StoreType store_type = 12;</code>
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>.StoreType store_type = 10;</code>
      * @return The storeType.
      */
     emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType getStoreType();
   }
   /**
    * <pre>
-   * CmdId: 2646
+   * CmdId: 8622
    * </pre>
    *
    * Protobuf type {@code StoreItemChangeNotify}
@@ -105,7 +133,13 @@ private StoreItemChangeNotify(
             case 0:
               done = true;
               break;
-            case 82: {
+            case 80: {
+              int rawValue = input.readEnum();
+
+              storeType_ = rawValue;
+              break;
+            }
+            case 98: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 itemList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemOuterClass.Item>();
                 mutable_bitField0_ |= 0x00000001;
@@ -114,12 +148,6 @@ private StoreItemChangeNotify(
                   input.readMessage(emu.grasscutter.net.proto.ItemOuterClass.Item.parser(), extensionRegistry));
               break;
             }
-            case 96: {
-              int rawValue = input.readEnum();
-
-              storeType_ = rawValue;
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -155,17 +183,25 @@ private StoreItemChangeNotify(
               emu.grasscutter.net.proto.StoreItemChangeNotifyOuterClass.StoreItemChangeNotify.class, emu.grasscutter.net.proto.StoreItemChangeNotifyOuterClass.StoreItemChangeNotify.Builder.class);
     }
 
-    public static final int ITEM_LIST_FIELD_NUMBER = 10;
+    public static final int ITEM_LIST_FIELD_NUMBER = 12;
     private java.util.List<emu.grasscutter.net.proto.ItemOuterClass.Item> itemList_;
     /**
-     * <code>repeated .Item item_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Item item_list = 12;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.ItemOuterClass.Item> getItemListList() {
       return itemList_;
     }
     /**
-     * <code>repeated .Item item_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Item item_list = 12;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder> 
@@ -173,21 +209,33 @@ public java.util.List<emu.grasscutter.net.proto.ItemOuterClass.Item> getItemList
       return itemList_;
     }
     /**
-     * <code>repeated .Item item_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Item item_list = 12;</code>
      */
     @java.lang.Override
     public int getItemListCount() {
       return itemList_.size();
     }
     /**
-     * <code>repeated .Item item_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Item item_list = 12;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ItemOuterClass.Item getItemList(int index) {
       return itemList_.get(index);
     }
     /**
-     * <code>repeated .Item item_list = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .Item item_list = 12;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder getItemListOrBuilder(
@@ -195,17 +243,25 @@ public emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder getItemListOrBuild
       return itemList_.get(index);
     }
 
-    public static final int STORE_TYPE_FIELD_NUMBER = 12;
+    public static final int STORE_TYPE_FIELD_NUMBER = 10;
     private int storeType_;
     /**
-     * <code>.StoreType store_type = 12;</code>
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>.StoreType store_type = 10;</code>
      * @return The enum numeric value on the wire for storeType.
      */
     @java.lang.Override public int getStoreTypeValue() {
       return storeType_;
     }
     /**
-     * <code>.StoreType store_type = 12;</code>
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>.StoreType store_type = 10;</code>
      * @return The storeType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType getStoreType() {
@@ -228,11 +284,11 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      for (int i = 0; i < itemList_.size(); i++) {
-        output.writeMessage(10, itemList_.get(i));
-      }
       if (storeType_ != emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.STORE_TYPE_NONE.getNumber()) {
-        output.writeEnum(12, storeType_);
+        output.writeEnum(10, storeType_);
+      }
+      for (int i = 0; i < itemList_.size(); i++) {
+        output.writeMessage(12, itemList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -243,13 +299,13 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      for (int i = 0; i < itemList_.size(); i++) {
+      if (storeType_ != emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.STORE_TYPE_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(10, itemList_.get(i));
+          .computeEnumSize(10, storeType_);
       }
-      if (storeType_ != emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.STORE_TYPE_NONE.getNumber()) {
+      for (int i = 0; i < itemList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(12, storeType_);
+          .computeMessageSize(12, itemList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -383,7 +439,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 2646
+     * CmdId: 8622
      * </pre>
      *
      * Protobuf type {@code StoreItemChangeNotify}
@@ -589,7 +645,11 @@ private void ensureItemListIsMutable() {
           emu.grasscutter.net.proto.ItemOuterClass.Item, emu.grasscutter.net.proto.ItemOuterClass.Item.Builder, emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder> itemListBuilder_;
 
       /**
-       * <code>repeated .Item item_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Item item_list = 12;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ItemOuterClass.Item> getItemListList() {
         if (itemListBuilder_ == null) {
@@ -599,7 +659,11 @@ public java.util.List<emu.grasscutter.net.proto.ItemOuterClass.Item> getItemList
         }
       }
       /**
-       * <code>repeated .Item item_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Item item_list = 12;</code>
        */
       public int getItemListCount() {
         if (itemListBuilder_ == null) {
@@ -609,7 +673,11 @@ public int getItemListCount() {
         }
       }
       /**
-       * <code>repeated .Item item_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Item item_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ItemOuterClass.Item getItemList(int index) {
         if (itemListBuilder_ == null) {
@@ -619,7 +687,11 @@ public emu.grasscutter.net.proto.ItemOuterClass.Item getItemList(int index) {
         }
       }
       /**
-       * <code>repeated .Item item_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Item item_list = 12;</code>
        */
       public Builder setItemList(
           int index, emu.grasscutter.net.proto.ItemOuterClass.Item value) {
@@ -636,7 +708,11 @@ public Builder setItemList(
         return this;
       }
       /**
-       * <code>repeated .Item item_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Item item_list = 12;</code>
        */
       public Builder setItemList(
           int index, emu.grasscutter.net.proto.ItemOuterClass.Item.Builder builderForValue) {
@@ -650,7 +726,11 @@ public Builder setItemList(
         return this;
       }
       /**
-       * <code>repeated .Item item_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Item item_list = 12;</code>
        */
       public Builder addItemList(emu.grasscutter.net.proto.ItemOuterClass.Item value) {
         if (itemListBuilder_ == null) {
@@ -666,7 +746,11 @@ public Builder addItemList(emu.grasscutter.net.proto.ItemOuterClass.Item value)
         return this;
       }
       /**
-       * <code>repeated .Item item_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Item item_list = 12;</code>
        */
       public Builder addItemList(
           int index, emu.grasscutter.net.proto.ItemOuterClass.Item value) {
@@ -683,7 +767,11 @@ public Builder addItemList(
         return this;
       }
       /**
-       * <code>repeated .Item item_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Item item_list = 12;</code>
        */
       public Builder addItemList(
           emu.grasscutter.net.proto.ItemOuterClass.Item.Builder builderForValue) {
@@ -697,7 +785,11 @@ public Builder addItemList(
         return this;
       }
       /**
-       * <code>repeated .Item item_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Item item_list = 12;</code>
        */
       public Builder addItemList(
           int index, emu.grasscutter.net.proto.ItemOuterClass.Item.Builder builderForValue) {
@@ -711,7 +803,11 @@ public Builder addItemList(
         return this;
       }
       /**
-       * <code>repeated .Item item_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Item item_list = 12;</code>
        */
       public Builder addAllItemList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ItemOuterClass.Item> values) {
@@ -726,7 +822,11 @@ public Builder addAllItemList(
         return this;
       }
       /**
-       * <code>repeated .Item item_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Item item_list = 12;</code>
        */
       public Builder clearItemList() {
         if (itemListBuilder_ == null) {
@@ -739,7 +839,11 @@ public Builder clearItemList() {
         return this;
       }
       /**
-       * <code>repeated .Item item_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Item item_list = 12;</code>
        */
       public Builder removeItemList(int index) {
         if (itemListBuilder_ == null) {
@@ -752,14 +856,22 @@ public Builder removeItemList(int index) {
         return this;
       }
       /**
-       * <code>repeated .Item item_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Item item_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ItemOuterClass.Item.Builder getItemListBuilder(
           int index) {
         return getItemListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .Item item_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Item item_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder getItemListOrBuilder(
           int index) {
@@ -769,7 +881,11 @@ public emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder getItemListOrBuild
         }
       }
       /**
-       * <code>repeated .Item item_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Item item_list = 12;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder> 
            getItemListOrBuilderList() {
@@ -780,14 +896,22 @@ public emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder getItemListOrBuild
         }
       }
       /**
-       * <code>repeated .Item item_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Item item_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ItemOuterClass.Item.Builder addItemListBuilder() {
         return getItemListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ItemOuterClass.Item.getDefaultInstance());
       }
       /**
-       * <code>repeated .Item item_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Item item_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ItemOuterClass.Item.Builder addItemListBuilder(
           int index) {
@@ -795,7 +919,11 @@ public emu.grasscutter.net.proto.ItemOuterClass.Item.Builder addItemListBuilder(
             index, emu.grasscutter.net.proto.ItemOuterClass.Item.getDefaultInstance());
       }
       /**
-       * <code>repeated .Item item_list = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .Item item_list = 12;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ItemOuterClass.Item.Builder> 
            getItemListBuilderList() {
@@ -818,14 +946,22 @@ public emu.grasscutter.net.proto.ItemOuterClass.Item.Builder addItemListBuilder(
 
       private int storeType_ = 0;
       /**
-       * <code>.StoreType store_type = 12;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>.StoreType store_type = 10;</code>
        * @return The enum numeric value on the wire for storeType.
        */
       @java.lang.Override public int getStoreTypeValue() {
         return storeType_;
       }
       /**
-       * <code>.StoreType store_type = 12;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>.StoreType store_type = 10;</code>
        * @param value The enum numeric value on the wire for storeType to set.
        * @return This builder for chaining.
        */
@@ -836,7 +972,11 @@ public Builder setStoreTypeValue(int value) {
         return this;
       }
       /**
-       * <code>.StoreType store_type = 12;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>.StoreType store_type = 10;</code>
        * @return The storeType.
        */
       @java.lang.Override
@@ -846,7 +986,11 @@ public emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType getStoreType() {
         return result == null ? emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.StoreType store_type = 12;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>.StoreType store_type = 10;</code>
        * @param value The storeType to set.
        * @return This builder for chaining.
        */
@@ -860,7 +1004,11 @@ public Builder setStoreType(emu.grasscutter.net.proto.StoreTypeOuterClass.StoreT
         return this;
       }
       /**
-       * <code>.StoreType store_type = 12;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>.StoreType store_type = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearStoreType() {
@@ -938,8 +1086,8 @@ public emu.grasscutter.net.proto.StoreItemChangeNotifyOuterClass.StoreItemChange
     java.lang.String[] descriptorData = {
       "\n\033StoreItemChangeNotify.proto\032\nItem.prot" +
       "o\032\017StoreType.proto\"Q\n\025StoreItemChangeNot" +
-      "ify\022\030\n\titem_list\030\n \003(\0132\005.Item\022\036\n\nstore_t" +
-      "ype\030\014 \001(\0162\n.StoreTypeB\033\n\031emu.grasscutter" +
+      "ify\022\030\n\titem_list\030\014 \003(\0132\005.Item\022\036\n\nstore_t" +
+      "ype\030\n \001(\0162\n.StoreTypeB\033\n\031emu.grasscutter" +
       ".net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/StoreWeightLimitNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/StoreWeightLimitNotifyOuterClass.java
index 5ee9088cf87..40efebd7468 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/StoreWeightLimitNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/StoreWeightLimitNotifyOuterClass.java
@@ -19,49 +19,77 @@ public interface StoreWeightLimitNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 weapon_count_limit = 3;</code>
-     * @return The weaponCountLimit.
-     */
-    int getWeaponCountLimit();
-
-    /**
-     * <code>uint32 weight_limit = 5;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 weight_limit = 3;</code>
      * @return The weightLimit.
      */
     int getWeightLimit();
 
     /**
-     * <code>uint32 furniture_count_limit = 7;</code>
-     * @return The furnitureCountLimit.
-     */
-    int getFurnitureCountLimit();
-
-    /**
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
      * <code>uint32 material_count_limit = 11;</code>
      * @return The materialCountLimit.
      */
     int getMaterialCountLimit();
 
     /**
-     * <code>uint32 reliquary_count_limit = 14;</code>
-     * @return The reliquaryCountLimit.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 furniture_count_limit = 14;</code>
+     * @return The furnitureCountLimit.
      */
-    int getReliquaryCountLimit();
+    int getFurnitureCountLimit();
 
     /**
-     * <code>.StoreType store_type = 15;</code>
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>uint32 weapon_count_limit = 1;</code>
+     * @return The weaponCountLimit.
+     */
+    int getWeaponCountLimit();
+
+    /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>.StoreType store_type = 8;</code>
      * @return The enum numeric value on the wire for storeType.
      */
     int getStoreTypeValue();
     /**
-     * <code>.StoreType store_type = 15;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>.StoreType store_type = 8;</code>
      * @return The storeType.
      */
     emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType getStoreType();
+
+    /**
+     * <pre>
+     * Offset: 0x34
+     * </pre>
+     *
+     * <code>uint32 reliquary_count_limit = 13;</code>
+     * @return The reliquaryCountLimit.
+     */
+    int getReliquaryCountLimit();
   }
   /**
    * <pre>
-   * CmdId: 3034
+   * CmdId: 29185
    * </pre>
    *
    * Protobuf type {@code StoreWeightLimitNotify}
@@ -109,19 +137,20 @@ private StoreWeightLimitNotify(
             case 0:
               done = true;
               break;
-            case 24: {
+            case 8: {
 
               weaponCountLimit_ = input.readUInt32();
               break;
             }
-            case 40: {
+            case 24: {
 
               weightLimit_ = input.readUInt32();
               break;
             }
-            case 56: {
+            case 64: {
+              int rawValue = input.readEnum();
 
-              furnitureCountLimit_ = input.readUInt32();
+              storeType_ = rawValue;
               break;
             }
             case 88: {
@@ -129,15 +158,14 @@ private StoreWeightLimitNotify(
               materialCountLimit_ = input.readUInt32();
               break;
             }
-            case 112: {
+            case 104: {
 
               reliquaryCountLimit_ = input.readUInt32();
               break;
             }
-            case 120: {
-              int rawValue = input.readEnum();
+            case 112: {
 
-              storeType_ = rawValue;
+              furnitureCountLimit_ = input.readUInt32();
               break;
             }
             default: {
@@ -172,21 +200,14 @@ private StoreWeightLimitNotify(
               emu.grasscutter.net.proto.StoreWeightLimitNotifyOuterClass.StoreWeightLimitNotify.class, emu.grasscutter.net.proto.StoreWeightLimitNotifyOuterClass.StoreWeightLimitNotify.Builder.class);
     }
 
-    public static final int WEAPON_COUNT_LIMIT_FIELD_NUMBER = 3;
-    private int weaponCountLimit_;
-    /**
-     * <code>uint32 weapon_count_limit = 3;</code>
-     * @return The weaponCountLimit.
-     */
-    @java.lang.Override
-    public int getWeaponCountLimit() {
-      return weaponCountLimit_;
-    }
-
-    public static final int WEIGHT_LIMIT_FIELD_NUMBER = 5;
+    public static final int WEIGHT_LIMIT_FIELD_NUMBER = 3;
     private int weightLimit_;
     /**
-     * <code>uint32 weight_limit = 5;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 weight_limit = 3;</code>
      * @return The weightLimit.
      */
     @java.lang.Override
@@ -194,20 +215,13 @@ public int getWeightLimit() {
       return weightLimit_;
     }
 
-    public static final int FURNITURE_COUNT_LIMIT_FIELD_NUMBER = 7;
-    private int furnitureCountLimit_;
-    /**
-     * <code>uint32 furniture_count_limit = 7;</code>
-     * @return The furnitureCountLimit.
-     */
-    @java.lang.Override
-    public int getFurnitureCountLimit() {
-      return furnitureCountLimit_;
-    }
-
     public static final int MATERIAL_COUNT_LIMIT_FIELD_NUMBER = 11;
     private int materialCountLimit_;
     /**
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
      * <code>uint32 material_count_limit = 11;</code>
      * @return The materialCountLimit.
      */
@@ -216,28 +230,55 @@ public int getMaterialCountLimit() {
       return materialCountLimit_;
     }
 
-    public static final int RELIQUARY_COUNT_LIMIT_FIELD_NUMBER = 14;
-    private int reliquaryCountLimit_;
+    public static final int FURNITURE_COUNT_LIMIT_FIELD_NUMBER = 14;
+    private int furnitureCountLimit_;
     /**
-     * <code>uint32 reliquary_count_limit = 14;</code>
-     * @return The reliquaryCountLimit.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 furniture_count_limit = 14;</code>
+     * @return The furnitureCountLimit.
      */
     @java.lang.Override
-    public int getReliquaryCountLimit() {
-      return reliquaryCountLimit_;
+    public int getFurnitureCountLimit() {
+      return furnitureCountLimit_;
     }
 
-    public static final int STORE_TYPE_FIELD_NUMBER = 15;
+    public static final int WEAPON_COUNT_LIMIT_FIELD_NUMBER = 1;
+    private int weaponCountLimit_;
+    /**
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>uint32 weapon_count_limit = 1;</code>
+     * @return The weaponCountLimit.
+     */
+    @java.lang.Override
+    public int getWeaponCountLimit() {
+      return weaponCountLimit_;
+    }
+
+    public static final int STORE_TYPE_FIELD_NUMBER = 8;
     private int storeType_;
     /**
-     * <code>.StoreType store_type = 15;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>.StoreType store_type = 8;</code>
      * @return The enum numeric value on the wire for storeType.
      */
     @java.lang.Override public int getStoreTypeValue() {
       return storeType_;
     }
     /**
-     * <code>.StoreType store_type = 15;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>.StoreType store_type = 8;</code>
      * @return The storeType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType getStoreType() {
@@ -246,6 +287,21 @@ public int getReliquaryCountLimit() {
       return result == null ? emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.UNRECOGNIZED : result;
     }
 
+    public static final int RELIQUARY_COUNT_LIMIT_FIELD_NUMBER = 13;
+    private int reliquaryCountLimit_;
+    /**
+     * <pre>
+     * Offset: 0x34
+     * </pre>
+     *
+     * <code>uint32 reliquary_count_limit = 13;</code>
+     * @return The reliquaryCountLimit.
+     */
+    @java.lang.Override
+    public int getReliquaryCountLimit() {
+      return reliquaryCountLimit_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -261,22 +317,22 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (weaponCountLimit_ != 0) {
-        output.writeUInt32(3, weaponCountLimit_);
+        output.writeUInt32(1, weaponCountLimit_);
       }
       if (weightLimit_ != 0) {
-        output.writeUInt32(5, weightLimit_);
+        output.writeUInt32(3, weightLimit_);
       }
-      if (furnitureCountLimit_ != 0) {
-        output.writeUInt32(7, furnitureCountLimit_);
+      if (storeType_ != emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.STORE_TYPE_NONE.getNumber()) {
+        output.writeEnum(8, storeType_);
       }
       if (materialCountLimit_ != 0) {
         output.writeUInt32(11, materialCountLimit_);
       }
       if (reliquaryCountLimit_ != 0) {
-        output.writeUInt32(14, reliquaryCountLimit_);
+        output.writeUInt32(13, reliquaryCountLimit_);
       }
-      if (storeType_ != emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.STORE_TYPE_NONE.getNumber()) {
-        output.writeEnum(15, storeType_);
+      if (furnitureCountLimit_ != 0) {
+        output.writeUInt32(14, furnitureCountLimit_);
       }
       unknownFields.writeTo(output);
     }
@@ -289,15 +345,15 @@ public int getSerializedSize() {
       size = 0;
       if (weaponCountLimit_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, weaponCountLimit_);
+          .computeUInt32Size(1, weaponCountLimit_);
       }
       if (weightLimit_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, weightLimit_);
+          .computeUInt32Size(3, weightLimit_);
       }
-      if (furnitureCountLimit_ != 0) {
+      if (storeType_ != emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.STORE_TYPE_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, furnitureCountLimit_);
+          .computeEnumSize(8, storeType_);
       }
       if (materialCountLimit_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -305,11 +361,11 @@ public int getSerializedSize() {
       }
       if (reliquaryCountLimit_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, reliquaryCountLimit_);
+          .computeUInt32Size(13, reliquaryCountLimit_);
       }
-      if (storeType_ != emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.STORE_TYPE_NONE.getNumber()) {
+      if (furnitureCountLimit_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(15, storeType_);
+          .computeUInt32Size(14, furnitureCountLimit_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -326,17 +382,17 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.StoreWeightLimitNotifyOuterClass.StoreWeightLimitNotify other = (emu.grasscutter.net.proto.StoreWeightLimitNotifyOuterClass.StoreWeightLimitNotify) obj;
 
-      if (getWeaponCountLimit()
-          != other.getWeaponCountLimit()) return false;
       if (getWeightLimit()
           != other.getWeightLimit()) return false;
-      if (getFurnitureCountLimit()
-          != other.getFurnitureCountLimit()) return false;
       if (getMaterialCountLimit()
           != other.getMaterialCountLimit()) return false;
+      if (getFurnitureCountLimit()
+          != other.getFurnitureCountLimit()) return false;
+      if (getWeaponCountLimit()
+          != other.getWeaponCountLimit()) return false;
+      if (storeType_ != other.storeType_) return false;
       if (getReliquaryCountLimit()
           != other.getReliquaryCountLimit()) return false;
-      if (storeType_ != other.storeType_) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -348,18 +404,18 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + WEAPON_COUNT_LIMIT_FIELD_NUMBER;
-      hash = (53 * hash) + getWeaponCountLimit();
       hash = (37 * hash) + WEIGHT_LIMIT_FIELD_NUMBER;
       hash = (53 * hash) + getWeightLimit();
-      hash = (37 * hash) + FURNITURE_COUNT_LIMIT_FIELD_NUMBER;
-      hash = (53 * hash) + getFurnitureCountLimit();
       hash = (37 * hash) + MATERIAL_COUNT_LIMIT_FIELD_NUMBER;
       hash = (53 * hash) + getMaterialCountLimit();
-      hash = (37 * hash) + RELIQUARY_COUNT_LIMIT_FIELD_NUMBER;
-      hash = (53 * hash) + getReliquaryCountLimit();
+      hash = (37 * hash) + FURNITURE_COUNT_LIMIT_FIELD_NUMBER;
+      hash = (53 * hash) + getFurnitureCountLimit();
+      hash = (37 * hash) + WEAPON_COUNT_LIMIT_FIELD_NUMBER;
+      hash = (53 * hash) + getWeaponCountLimit();
       hash = (37 * hash) + STORE_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + storeType_;
+      hash = (37 * hash) + RELIQUARY_COUNT_LIMIT_FIELD_NUMBER;
+      hash = (53 * hash) + getReliquaryCountLimit();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -457,7 +513,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 3034
+     * CmdId: 29185
      * </pre>
      *
      * Protobuf type {@code StoreWeightLimitNotify}
@@ -497,18 +553,18 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        weaponCountLimit_ = 0;
-
         weightLimit_ = 0;
 
-        furnitureCountLimit_ = 0;
-
         materialCountLimit_ = 0;
 
-        reliquaryCountLimit_ = 0;
+        furnitureCountLimit_ = 0;
+
+        weaponCountLimit_ = 0;
 
         storeType_ = 0;
 
+        reliquaryCountLimit_ = 0;
+
         return this;
       }
 
@@ -535,12 +591,12 @@ public emu.grasscutter.net.proto.StoreWeightLimitNotifyOuterClass.StoreWeightLim
       @java.lang.Override
       public emu.grasscutter.net.proto.StoreWeightLimitNotifyOuterClass.StoreWeightLimitNotify buildPartial() {
         emu.grasscutter.net.proto.StoreWeightLimitNotifyOuterClass.StoreWeightLimitNotify result = new emu.grasscutter.net.proto.StoreWeightLimitNotifyOuterClass.StoreWeightLimitNotify(this);
-        result.weaponCountLimit_ = weaponCountLimit_;
         result.weightLimit_ = weightLimit_;
-        result.furnitureCountLimit_ = furnitureCountLimit_;
         result.materialCountLimit_ = materialCountLimit_;
-        result.reliquaryCountLimit_ = reliquaryCountLimit_;
+        result.furnitureCountLimit_ = furnitureCountLimit_;
+        result.weaponCountLimit_ = weaponCountLimit_;
         result.storeType_ = storeType_;
+        result.reliquaryCountLimit_ = reliquaryCountLimit_;
         onBuilt();
         return result;
       }
@@ -589,24 +645,24 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.StoreWeightLimitNotifyOuterClass.StoreWeightLimitNotify other) {
         if (other == emu.grasscutter.net.proto.StoreWeightLimitNotifyOuterClass.StoreWeightLimitNotify.getDefaultInstance()) return this;
-        if (other.getWeaponCountLimit() != 0) {
-          setWeaponCountLimit(other.getWeaponCountLimit());
-        }
         if (other.getWeightLimit() != 0) {
           setWeightLimit(other.getWeightLimit());
         }
-        if (other.getFurnitureCountLimit() != 0) {
-          setFurnitureCountLimit(other.getFurnitureCountLimit());
-        }
         if (other.getMaterialCountLimit() != 0) {
           setMaterialCountLimit(other.getMaterialCountLimit());
         }
-        if (other.getReliquaryCountLimit() != 0) {
-          setReliquaryCountLimit(other.getReliquaryCountLimit());
+        if (other.getFurnitureCountLimit() != 0) {
+          setFurnitureCountLimit(other.getFurnitureCountLimit());
+        }
+        if (other.getWeaponCountLimit() != 0) {
+          setWeaponCountLimit(other.getWeaponCountLimit());
         }
         if (other.storeType_ != 0) {
           setStoreTypeValue(other.getStoreTypeValue());
         }
+        if (other.getReliquaryCountLimit() != 0) {
+          setReliquaryCountLimit(other.getReliquaryCountLimit());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -636,40 +692,13 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int weaponCountLimit_ ;
-      /**
-       * <code>uint32 weapon_count_limit = 3;</code>
-       * @return The weaponCountLimit.
-       */
-      @java.lang.Override
-      public int getWeaponCountLimit() {
-        return weaponCountLimit_;
-      }
-      /**
-       * <code>uint32 weapon_count_limit = 3;</code>
-       * @param value The weaponCountLimit to set.
-       * @return This builder for chaining.
-       */
-      public Builder setWeaponCountLimit(int value) {
-        
-        weaponCountLimit_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 weapon_count_limit = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearWeaponCountLimit() {
-        
-        weaponCountLimit_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int weightLimit_ ;
       /**
-       * <code>uint32 weight_limit = 5;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 weight_limit = 3;</code>
        * @return The weightLimit.
        */
       @java.lang.Override
@@ -677,7 +706,11 @@ public int getWeightLimit() {
         return weightLimit_;
       }
       /**
-       * <code>uint32 weight_limit = 5;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 weight_limit = 3;</code>
        * @param value The weightLimit to set.
        * @return This builder for chaining.
        */
@@ -688,7 +721,11 @@ public Builder setWeightLimit(int value) {
         return this;
       }
       /**
-       * <code>uint32 weight_limit = 5;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 weight_limit = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearWeightLimit() {
@@ -698,109 +735,153 @@ public Builder clearWeightLimit() {
         return this;
       }
 
-      private int furnitureCountLimit_ ;
+      private int materialCountLimit_ ;
       /**
-       * <code>uint32 furniture_count_limit = 7;</code>
-       * @return The furnitureCountLimit.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 material_count_limit = 11;</code>
+       * @return The materialCountLimit.
        */
       @java.lang.Override
-      public int getFurnitureCountLimit() {
-        return furnitureCountLimit_;
+      public int getMaterialCountLimit() {
+        return materialCountLimit_;
       }
       /**
-       * <code>uint32 furniture_count_limit = 7;</code>
-       * @param value The furnitureCountLimit to set.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 material_count_limit = 11;</code>
+       * @param value The materialCountLimit to set.
        * @return This builder for chaining.
        */
-      public Builder setFurnitureCountLimit(int value) {
+      public Builder setMaterialCountLimit(int value) {
         
-        furnitureCountLimit_ = value;
+        materialCountLimit_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 furniture_count_limit = 7;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 material_count_limit = 11;</code>
        * @return This builder for chaining.
        */
-      public Builder clearFurnitureCountLimit() {
+      public Builder clearMaterialCountLimit() {
         
-        furnitureCountLimit_ = 0;
+        materialCountLimit_ = 0;
         onChanged();
         return this;
       }
 
-      private int materialCountLimit_ ;
+      private int furnitureCountLimit_ ;
       /**
-       * <code>uint32 material_count_limit = 11;</code>
-       * @return The materialCountLimit.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 furniture_count_limit = 14;</code>
+       * @return The furnitureCountLimit.
        */
       @java.lang.Override
-      public int getMaterialCountLimit() {
-        return materialCountLimit_;
+      public int getFurnitureCountLimit() {
+        return furnitureCountLimit_;
       }
       /**
-       * <code>uint32 material_count_limit = 11;</code>
-       * @param value The materialCountLimit to set.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 furniture_count_limit = 14;</code>
+       * @param value The furnitureCountLimit to set.
        * @return This builder for chaining.
        */
-      public Builder setMaterialCountLimit(int value) {
+      public Builder setFurnitureCountLimit(int value) {
         
-        materialCountLimit_ = value;
+        furnitureCountLimit_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 material_count_limit = 11;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 furniture_count_limit = 14;</code>
        * @return This builder for chaining.
        */
-      public Builder clearMaterialCountLimit() {
+      public Builder clearFurnitureCountLimit() {
         
-        materialCountLimit_ = 0;
+        furnitureCountLimit_ = 0;
         onChanged();
         return this;
       }
 
-      private int reliquaryCountLimit_ ;
+      private int weaponCountLimit_ ;
       /**
-       * <code>uint32 reliquary_count_limit = 14;</code>
-       * @return The reliquaryCountLimit.
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 weapon_count_limit = 1;</code>
+       * @return The weaponCountLimit.
        */
       @java.lang.Override
-      public int getReliquaryCountLimit() {
-        return reliquaryCountLimit_;
+      public int getWeaponCountLimit() {
+        return weaponCountLimit_;
       }
       /**
-       * <code>uint32 reliquary_count_limit = 14;</code>
-       * @param value The reliquaryCountLimit to set.
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 weapon_count_limit = 1;</code>
+       * @param value The weaponCountLimit to set.
        * @return This builder for chaining.
        */
-      public Builder setReliquaryCountLimit(int value) {
+      public Builder setWeaponCountLimit(int value) {
         
-        reliquaryCountLimit_ = value;
+        weaponCountLimit_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 reliquary_count_limit = 14;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 weapon_count_limit = 1;</code>
        * @return This builder for chaining.
        */
-      public Builder clearReliquaryCountLimit() {
+      public Builder clearWeaponCountLimit() {
         
-        reliquaryCountLimit_ = 0;
+        weaponCountLimit_ = 0;
         onChanged();
         return this;
       }
 
       private int storeType_ = 0;
       /**
-       * <code>.StoreType store_type = 15;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>.StoreType store_type = 8;</code>
        * @return The enum numeric value on the wire for storeType.
        */
       @java.lang.Override public int getStoreTypeValue() {
         return storeType_;
       }
       /**
-       * <code>.StoreType store_type = 15;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>.StoreType store_type = 8;</code>
        * @param value The enum numeric value on the wire for storeType to set.
        * @return This builder for chaining.
        */
@@ -811,7 +892,11 @@ public Builder setStoreTypeValue(int value) {
         return this;
       }
       /**
-       * <code>.StoreType store_type = 15;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>.StoreType store_type = 8;</code>
        * @return The storeType.
        */
       @java.lang.Override
@@ -821,7 +906,11 @@ public emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType getStoreType() {
         return result == null ? emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.StoreType store_type = 15;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>.StoreType store_type = 8;</code>
        * @param value The storeType to set.
        * @return This builder for chaining.
        */
@@ -835,7 +924,11 @@ public Builder setStoreType(emu.grasscutter.net.proto.StoreTypeOuterClass.StoreT
         return this;
       }
       /**
-       * <code>.StoreType store_type = 15;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>.StoreType store_type = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearStoreType() {
@@ -844,6 +937,49 @@ public Builder clearStoreType() {
         onChanged();
         return this;
       }
+
+      private int reliquaryCountLimit_ ;
+      /**
+       * <pre>
+       * Offset: 0x34
+       * </pre>
+       *
+       * <code>uint32 reliquary_count_limit = 13;</code>
+       * @return The reliquaryCountLimit.
+       */
+      @java.lang.Override
+      public int getReliquaryCountLimit() {
+        return reliquaryCountLimit_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x34
+       * </pre>
+       *
+       * <code>uint32 reliquary_count_limit = 13;</code>
+       * @param value The reliquaryCountLimit to set.
+       * @return This builder for chaining.
+       */
+      public Builder setReliquaryCountLimit(int value) {
+        
+        reliquaryCountLimit_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x34
+       * </pre>
+       *
+       * <code>uint32 reliquary_count_limit = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearReliquaryCountLimit() {
+        
+        reliquaryCountLimit_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -912,12 +1048,12 @@ public emu.grasscutter.net.proto.StoreWeightLimitNotifyOuterClass.StoreWeightLim
   static {
     java.lang.String[] descriptorData = {
       "\n\034StoreWeightLimitNotify.proto\032\017StoreTyp" +
-      "e.proto\"\306\001\n\026StoreWeightLimitNotify\022\032\n\022we" +
-      "apon_count_limit\030\003 \001(\r\022\024\n\014weight_limit\030\005" +
-      " \001(\r\022\035\n\025furniture_count_limit\030\007 \001(\r\022\034\n\024m" +
-      "aterial_count_limit\030\013 \001(\r\022\035\n\025reliquary_c" +
-      "ount_limit\030\016 \001(\r\022\036\n\nstore_type\030\017 \001(\0162\n.S" +
-      "toreTypeB\033\n\031emu.grasscutter.net.protob\006p" +
+      "e.proto\"\306\001\n\026StoreWeightLimitNotify\022\024\n\014we" +
+      "ight_limit\030\003 \001(\r\022\034\n\024material_count_limit" +
+      "\030\013 \001(\r\022\035\n\025furniture_count_limit\030\016 \001(\r\022\032\n" +
+      "\022weapon_count_limit\030\001 \001(\r\022\036\n\nstore_type\030" +
+      "\010 \001(\0162\n.StoreType\022\035\n\025reliquary_count_lim" +
+      "it\030\r \001(\rB\033\n\031emu.grasscutter.net.protob\006p" +
       "roto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -930,7 +1066,7 @@ public emu.grasscutter.net.proto.StoreWeightLimitNotifyOuterClass.StoreWeightLim
     internal_static_StoreWeightLimitNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_StoreWeightLimitNotify_descriptor,
-        new java.lang.String[] { "WeaponCountLimit", "WeightLimit", "FurnitureCountLimit", "MaterialCountLimit", "ReliquaryCountLimit", "StoreType", });
+        new java.lang.String[] { "WeightLimit", "MaterialCountLimit", "FurnitureCountLimit", "WeaponCountLimit", "StoreType", "ReliquaryCountLimit", });
     emu.grasscutter.net.proto.StoreTypeOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TeamEnterSceneInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TeamEnterSceneInfoOuterClass.java
index 2c54df2e808..c8ba33d0e68 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/TeamEnterSceneInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/TeamEnterSceneInfoOuterClass.java
@@ -19,40 +19,68 @@ public interface TeamEnterSceneInfoOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 team_entity_id = 14;</code>
-     * @return The teamEntityId.
-     */
-    int getTeamEntityId();
-
-    /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
      * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
      * @return Whether the teamAbilityInfo field is set.
      */
     boolean hasTeamAbilityInfo();
     /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
      * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
      * @return The teamAbilityInfo.
      */
     emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getTeamAbilityInfo();
     /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
      * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
      */
     emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getTeamAbilityInfoOrBuilder();
 
     /**
-     * <code>.AbilityControlBlock ability_control_block = 1;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.AbilityControlBlock ability_control_block = 4;</code>
      * @return Whether the abilityControlBlock field is set.
      */
     boolean hasAbilityControlBlock();
     /**
-     * <code>.AbilityControlBlock ability_control_block = 1;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.AbilityControlBlock ability_control_block = 4;</code>
      * @return The abilityControlBlock.
      */
     emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock getAbilityControlBlock();
     /**
-     * <code>.AbilityControlBlock ability_control_block = 1;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.AbilityControlBlock ability_control_block = 4;</code>
      */
     emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder();
+
+    /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>uint32 team_entity_id = 13;</code>
+     * @return The teamEntityId.
+     */
+    int getTeamEntityId();
   }
   /**
    * Protobuf type {@code TeamEnterSceneInfo}
@@ -99,7 +127,7 @@ private TeamEnterSceneInfo(
             case 0:
               done = true;
               break;
-            case 10: {
+            case 34: {
               emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder subBuilder = null;
               if (abilityControlBlock_ != null) {
                 subBuilder = abilityControlBlock_.toBuilder();
@@ -125,7 +153,7 @@ private TeamEnterSceneInfo(
 
               break;
             }
-            case 112: {
+            case 104: {
 
               teamEntityId_ = input.readUInt32();
               break;
@@ -162,20 +190,13 @@ private TeamEnterSceneInfo(
               emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo.class, emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo.Builder.class);
     }
 
-    public static final int TEAM_ENTITY_ID_FIELD_NUMBER = 14;
-    private int teamEntityId_;
-    /**
-     * <code>uint32 team_entity_id = 14;</code>
-     * @return The teamEntityId.
-     */
-    @java.lang.Override
-    public int getTeamEntityId() {
-      return teamEntityId_;
-    }
-
     public static final int TEAM_ABILITY_INFO_FIELD_NUMBER = 8;
     private emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo teamAbilityInfo_;
     /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
      * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
      * @return Whether the teamAbilityInfo field is set.
      */
@@ -184,6 +205,10 @@ public boolean hasTeamAbilityInfo() {
       return teamAbilityInfo_ != null;
     }
     /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
      * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
      * @return The teamAbilityInfo.
      */
@@ -192,6 +217,10 @@ public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncState
       return teamAbilityInfo_ == null ? emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : teamAbilityInfo_;
     }
     /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
      * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
      */
     @java.lang.Override
@@ -199,10 +228,14 @@ public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncState
       return getTeamAbilityInfo();
     }
 
-    public static final int ABILITY_CONTROL_BLOCK_FIELD_NUMBER = 1;
+    public static final int ABILITY_CONTROL_BLOCK_FIELD_NUMBER = 4;
     private emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock abilityControlBlock_;
     /**
-     * <code>.AbilityControlBlock ability_control_block = 1;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.AbilityControlBlock ability_control_block = 4;</code>
      * @return Whether the abilityControlBlock field is set.
      */
     @java.lang.Override
@@ -210,7 +243,11 @@ public boolean hasAbilityControlBlock() {
       return abilityControlBlock_ != null;
     }
     /**
-     * <code>.AbilityControlBlock ability_control_block = 1;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.AbilityControlBlock ability_control_block = 4;</code>
      * @return The abilityControlBlock.
      */
     @java.lang.Override
@@ -218,13 +255,32 @@ public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlo
       return abilityControlBlock_ == null ? emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.getDefaultInstance() : abilityControlBlock_;
     }
     /**
-     * <code>.AbilityControlBlock ability_control_block = 1;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.AbilityControlBlock ability_control_block = 4;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder() {
       return getAbilityControlBlock();
     }
 
+    public static final int TEAM_ENTITY_ID_FIELD_NUMBER = 13;
+    private int teamEntityId_;
+    /**
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>uint32 team_entity_id = 13;</code>
+     * @return The teamEntityId.
+     */
+    @java.lang.Override
+    public int getTeamEntityId() {
+      return teamEntityId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -240,13 +296,13 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (abilityControlBlock_ != null) {
-        output.writeMessage(1, getAbilityControlBlock());
+        output.writeMessage(4, getAbilityControlBlock());
       }
       if (teamAbilityInfo_ != null) {
         output.writeMessage(8, getTeamAbilityInfo());
       }
       if (teamEntityId_ != 0) {
-        output.writeUInt32(14, teamEntityId_);
+        output.writeUInt32(13, teamEntityId_);
       }
       unknownFields.writeTo(output);
     }
@@ -259,7 +315,7 @@ public int getSerializedSize() {
       size = 0;
       if (abilityControlBlock_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getAbilityControlBlock());
+          .computeMessageSize(4, getAbilityControlBlock());
       }
       if (teamAbilityInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
@@ -267,7 +323,7 @@ public int getSerializedSize() {
       }
       if (teamEntityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, teamEntityId_);
+          .computeUInt32Size(13, teamEntityId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -284,8 +340,6 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo other = (emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo) obj;
 
-      if (getTeamEntityId()
-          != other.getTeamEntityId()) return false;
       if (hasTeamAbilityInfo() != other.hasTeamAbilityInfo()) return false;
       if (hasTeamAbilityInfo()) {
         if (!getTeamAbilityInfo()
@@ -296,6 +350,8 @@ public boolean equals(final java.lang.Object obj) {
         if (!getAbilityControlBlock()
             .equals(other.getAbilityControlBlock())) return false;
       }
+      if (getTeamEntityId()
+          != other.getTeamEntityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -307,8 +363,6 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + TEAM_ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getTeamEntityId();
       if (hasTeamAbilityInfo()) {
         hash = (37 * hash) + TEAM_ABILITY_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getTeamAbilityInfo().hashCode();
@@ -317,6 +371,8 @@ public int hashCode() {
         hash = (37 * hash) + ABILITY_CONTROL_BLOCK_FIELD_NUMBER;
         hash = (53 * hash) + getAbilityControlBlock().hashCode();
       }
+      hash = (37 * hash) + TEAM_ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getTeamEntityId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -450,8 +506,6 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        teamEntityId_ = 0;
-
         if (teamAbilityInfoBuilder_ == null) {
           teamAbilityInfo_ = null;
         } else {
@@ -464,6 +518,8 @@ public Builder clear() {
           abilityControlBlock_ = null;
           abilityControlBlockBuilder_ = null;
         }
+        teamEntityId_ = 0;
+
         return this;
       }
 
@@ -490,7 +546,6 @@ public emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo
       @java.lang.Override
       public emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo buildPartial() {
         emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo result = new emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo(this);
-        result.teamEntityId_ = teamEntityId_;
         if (teamAbilityInfoBuilder_ == null) {
           result.teamAbilityInfo_ = teamAbilityInfo_;
         } else {
@@ -501,6 +556,7 @@ public emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo
         } else {
           result.abilityControlBlock_ = abilityControlBlockBuilder_.build();
         }
+        result.teamEntityId_ = teamEntityId_;
         onBuilt();
         return result;
       }
@@ -549,15 +605,15 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo other) {
         if (other == emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo.getDefaultInstance()) return this;
-        if (other.getTeamEntityId() != 0) {
-          setTeamEntityId(other.getTeamEntityId());
-        }
         if (other.hasTeamAbilityInfo()) {
           mergeTeamAbilityInfo(other.getTeamAbilityInfo());
         }
         if (other.hasAbilityControlBlock()) {
           mergeAbilityControlBlock(other.getAbilityControlBlock());
         }
+        if (other.getTeamEntityId() != 0) {
+          setTeamEntityId(other.getTeamEntityId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -587,41 +643,14 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int teamEntityId_ ;
-      /**
-       * <code>uint32 team_entity_id = 14;</code>
-       * @return The teamEntityId.
-       */
-      @java.lang.Override
-      public int getTeamEntityId() {
-        return teamEntityId_;
-      }
-      /**
-       * <code>uint32 team_entity_id = 14;</code>
-       * @param value The teamEntityId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTeamEntityId(int value) {
-        
-        teamEntityId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 team_entity_id = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTeamEntityId() {
-        
-        teamEntityId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo teamAbilityInfo_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder, emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder> teamAbilityInfoBuilder_;
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
        * @return Whether the teamAbilityInfo field is set.
        */
@@ -629,6 +658,10 @@ public boolean hasTeamAbilityInfo() {
         return teamAbilityInfoBuilder_ != null || teamAbilityInfo_ != null;
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
        * @return The teamAbilityInfo.
        */
@@ -640,6 +673,10 @@ public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncState
         }
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
        */
       public Builder setTeamAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
@@ -656,6 +693,10 @@ public Builder setTeamAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfo
         return this;
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
        */
       public Builder setTeamAbilityInfo(
@@ -670,6 +711,10 @@ public Builder setTeamAbilityInfo(
         return this;
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
        */
       public Builder mergeTeamAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
@@ -688,6 +733,10 @@ public Builder mergeTeamAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateIn
         return this;
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
        */
       public Builder clearTeamAbilityInfo() {
@@ -702,6 +751,10 @@ public Builder clearTeamAbilityInfo() {
         return this;
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
        */
       public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder getTeamAbilityInfoBuilder() {
@@ -710,6 +763,10 @@ public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncState
         return getTeamAbilityInfoFieldBuilder().getBuilder();
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
        */
       public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getTeamAbilityInfoOrBuilder() {
@@ -721,6 +778,10 @@ public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncState
         }
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
@@ -741,14 +802,22 @@ public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncState
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder> abilityControlBlockBuilder_;
       /**
-       * <code>.AbilityControlBlock ability_control_block = 1;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.AbilityControlBlock ability_control_block = 4;</code>
        * @return Whether the abilityControlBlock field is set.
        */
       public boolean hasAbilityControlBlock() {
         return abilityControlBlockBuilder_ != null || abilityControlBlock_ != null;
       }
       /**
-       * <code>.AbilityControlBlock ability_control_block = 1;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.AbilityControlBlock ability_control_block = 4;</code>
        * @return The abilityControlBlock.
        */
       public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock getAbilityControlBlock() {
@@ -759,7 +828,11 @@ public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlo
         }
       }
       /**
-       * <code>.AbilityControlBlock ability_control_block = 1;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.AbilityControlBlock ability_control_block = 4;</code>
        */
       public Builder setAbilityControlBlock(emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock value) {
         if (abilityControlBlockBuilder_ == null) {
@@ -775,7 +848,11 @@ public Builder setAbilityControlBlock(emu.grasscutter.net.proto.AbilityControlBl
         return this;
       }
       /**
-       * <code>.AbilityControlBlock ability_control_block = 1;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.AbilityControlBlock ability_control_block = 4;</code>
        */
       public Builder setAbilityControlBlock(
           emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder builderForValue) {
@@ -789,7 +866,11 @@ public Builder setAbilityControlBlock(
         return this;
       }
       /**
-       * <code>.AbilityControlBlock ability_control_block = 1;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.AbilityControlBlock ability_control_block = 4;</code>
        */
       public Builder mergeAbilityControlBlock(emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock value) {
         if (abilityControlBlockBuilder_ == null) {
@@ -807,7 +888,11 @@ public Builder mergeAbilityControlBlock(emu.grasscutter.net.proto.AbilityControl
         return this;
       }
       /**
-       * <code>.AbilityControlBlock ability_control_block = 1;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.AbilityControlBlock ability_control_block = 4;</code>
        */
       public Builder clearAbilityControlBlock() {
         if (abilityControlBlockBuilder_ == null) {
@@ -821,7 +906,11 @@ public Builder clearAbilityControlBlock() {
         return this;
       }
       /**
-       * <code>.AbilityControlBlock ability_control_block = 1;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.AbilityControlBlock ability_control_block = 4;</code>
        */
       public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder getAbilityControlBlockBuilder() {
         
@@ -829,7 +918,11 @@ public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlo
         return getAbilityControlBlockFieldBuilder().getBuilder();
       }
       /**
-       * <code>.AbilityControlBlock ability_control_block = 1;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.AbilityControlBlock ability_control_block = 4;</code>
        */
       public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder() {
         if (abilityControlBlockBuilder_ != null) {
@@ -840,7 +933,11 @@ public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlo
         }
       }
       /**
-       * <code>.AbilityControlBlock ability_control_block = 1;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.AbilityControlBlock ability_control_block = 4;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder> 
@@ -855,6 +952,49 @@ public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlo
         }
         return abilityControlBlockBuilder_;
       }
+
+      private int teamEntityId_ ;
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint32 team_entity_id = 13;</code>
+       * @return The teamEntityId.
+       */
+      @java.lang.Override
+      public int getTeamEntityId() {
+        return teamEntityId_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint32 team_entity_id = 13;</code>
+       * @param value The teamEntityId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTeamEntityId(int value) {
+        
+        teamEntityId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>uint32 team_entity_id = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTeamEntityId() {
+        
+        teamEntityId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -924,10 +1064,10 @@ public emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo
     java.lang.String[] descriptorData = {
       "\n\030TeamEnterSceneInfo.proto\032\031AbilityContr" +
       "olBlock.proto\032\032AbilitySyncStateInfo.prot" +
-      "o\"\223\001\n\022TeamEnterSceneInfo\022\026\n\016team_entity_" +
-      "id\030\016 \001(\r\0220\n\021team_ability_info\030\010 \001(\0132\025.Ab" +
-      "ilitySyncStateInfo\0223\n\025ability_control_bl" +
-      "ock\030\001 \001(\0132\024.AbilityControlBlockB\033\n\031emu.g" +
+      "o\"\223\001\n\022TeamEnterSceneInfo\0220\n\021team_ability" +
+      "_info\030\010 \001(\0132\025.AbilitySyncStateInfo\0223\n\025ab" +
+      "ility_control_block\030\004 \001(\0132\024.AbilityContr" +
+      "olBlock\022\026\n\016team_entity_id\030\r \001(\rB\033\n\031emu.g" +
       "rasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -941,7 +1081,7 @@ public emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo
     internal_static_TeamEnterSceneInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_TeamEnterSceneInfo_descriptor,
-        new java.lang.String[] { "TeamEntityId", "TeamAbilityInfo", "AbilityControlBlock", });
+        new java.lang.String[] { "TeamAbilityInfo", "AbilityControlBlock", "TeamEntityId", });
     emu.grasscutter.net.proto.AbilityControlBlockOuterClass.getDescriptor();
     emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.getDescriptor();
   }
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ToTheMoonEnterSceneReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ToTheMoonEnterSceneReqOuterClass.java
index 0d7b337bb63..8990fcc12a9 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ToTheMoonEnterSceneReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ToTheMoonEnterSceneReqOuterClass.java
@@ -19,32 +19,48 @@ public interface ToTheMoonEnterSceneReqOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 DKEOBFMAFPK = 5;</code>
-     * @return The dKEOBFMAFPK.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 scene_id = 12;</code>
+     * @return The sceneId.
      */
-    int getDKEOBFMAFPK();
+    int getSceneId();
 
     /**
-     * <code>uint32 CDDPHGDDCCN = 2;</code>
-     * @return The cDDPHGDDCCN.
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 EGJDKPKGDIB = 15;</code>
+     * @return The eGJDKPKGDIB.
      */
-    int getCDDPHGDDCCN();
+    int getEGJDKPKGDIB();
 
     /**
-     * <code>uint32 scene_id = 3;</code>
-     * @return The sceneId.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 version = 1;</code>
+     * @return The version.
      */
-    int getSceneId();
+    int getVersion();
 
     /**
-     * <code>uint32 version = 4;</code>
-     * @return The version.
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>uint32 HHAIIFODEOO = 8;</code>
+     * @return The hHAIIFODEOO.
      */
-    int getVersion();
+    int getHHAIIFODEOO();
   }
   /**
    * <pre>
-   * CmdId: 6116
+   * CmdId: 6184
    * </pre>
    *
    * Protobuf type {@code ToTheMoonEnterSceneReq}
@@ -91,24 +107,24 @@ private ToTheMoonEnterSceneReq(
             case 0:
               done = true;
               break;
-            case 16: {
+            case 8: {
 
-              cDDPHGDDCCN_ = input.readUInt32();
+              version_ = input.readUInt32();
               break;
             }
-            case 24: {
+            case 64: {
 
-              sceneId_ = input.readUInt32();
+              hHAIIFODEOO_ = input.readUInt32();
               break;
             }
-            case 32: {
+            case 96: {
 
-              version_ = input.readUInt32();
+              sceneId_ = input.readUInt32();
               break;
             }
-            case 40: {
+            case 120: {
 
-              dKEOBFMAFPK_ = input.readUInt32();
+              eGJDKPKGDIB_ = input.readUInt32();
               break;
             }
             default: {
@@ -143,48 +159,64 @@ private ToTheMoonEnterSceneReq(
               emu.grasscutter.net.proto.ToTheMoonEnterSceneReqOuterClass.ToTheMoonEnterSceneReq.class, emu.grasscutter.net.proto.ToTheMoonEnterSceneReqOuterClass.ToTheMoonEnterSceneReq.Builder.class);
     }
 
-    public static final int DKEOBFMAFPK_FIELD_NUMBER = 5;
-    private int dKEOBFMAFPK_;
+    public static final int SCENE_ID_FIELD_NUMBER = 12;
+    private int sceneId_;
     /**
-     * <code>uint32 DKEOBFMAFPK = 5;</code>
-     * @return The dKEOBFMAFPK.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 scene_id = 12;</code>
+     * @return The sceneId.
      */
     @java.lang.Override
-    public int getDKEOBFMAFPK() {
-      return dKEOBFMAFPK_;
+    public int getSceneId() {
+      return sceneId_;
     }
 
-    public static final int CDDPHGDDCCN_FIELD_NUMBER = 2;
-    private int cDDPHGDDCCN_;
+    public static final int EGJDKPKGDIB_FIELD_NUMBER = 15;
+    private int eGJDKPKGDIB_;
     /**
-     * <code>uint32 CDDPHGDDCCN = 2;</code>
-     * @return The cDDPHGDDCCN.
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>uint32 EGJDKPKGDIB = 15;</code>
+     * @return The eGJDKPKGDIB.
      */
     @java.lang.Override
-    public int getCDDPHGDDCCN() {
-      return cDDPHGDDCCN_;
+    public int getEGJDKPKGDIB() {
+      return eGJDKPKGDIB_;
     }
 
-    public static final int SCENE_ID_FIELD_NUMBER = 3;
-    private int sceneId_;
+    public static final int VERSION_FIELD_NUMBER = 1;
+    private int version_;
     /**
-     * <code>uint32 scene_id = 3;</code>
-     * @return The sceneId.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 version = 1;</code>
+     * @return The version.
      */
     @java.lang.Override
-    public int getSceneId() {
-      return sceneId_;
+    public int getVersion() {
+      return version_;
     }
 
-    public static final int VERSION_FIELD_NUMBER = 4;
-    private int version_;
+    public static final int HHAIIFODEOO_FIELD_NUMBER = 8;
+    private int hHAIIFODEOO_;
     /**
-     * <code>uint32 version = 4;</code>
-     * @return The version.
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>uint32 HHAIIFODEOO = 8;</code>
+     * @return The hHAIIFODEOO.
      */
     @java.lang.Override
-    public int getVersion() {
-      return version_;
+    public int getHHAIIFODEOO() {
+      return hHAIIFODEOO_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -201,17 +233,17 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (cDDPHGDDCCN_ != 0) {
-        output.writeUInt32(2, cDDPHGDDCCN_);
+      if (version_ != 0) {
+        output.writeUInt32(1, version_);
       }
-      if (sceneId_ != 0) {
-        output.writeUInt32(3, sceneId_);
+      if (hHAIIFODEOO_ != 0) {
+        output.writeUInt32(8, hHAIIFODEOO_);
       }
-      if (version_ != 0) {
-        output.writeUInt32(4, version_);
+      if (sceneId_ != 0) {
+        output.writeUInt32(12, sceneId_);
       }
-      if (dKEOBFMAFPK_ != 0) {
-        output.writeUInt32(5, dKEOBFMAFPK_);
+      if (eGJDKPKGDIB_ != 0) {
+        output.writeUInt32(15, eGJDKPKGDIB_);
       }
       unknownFields.writeTo(output);
     }
@@ -222,21 +254,21 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (cDDPHGDDCCN_ != 0) {
+      if (version_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, cDDPHGDDCCN_);
+          .computeUInt32Size(1, version_);
       }
-      if (sceneId_ != 0) {
+      if (hHAIIFODEOO_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, sceneId_);
+          .computeUInt32Size(8, hHAIIFODEOO_);
       }
-      if (version_ != 0) {
+      if (sceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, version_);
+          .computeUInt32Size(12, sceneId_);
       }
-      if (dKEOBFMAFPK_ != 0) {
+      if (eGJDKPKGDIB_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, dKEOBFMAFPK_);
+          .computeUInt32Size(15, eGJDKPKGDIB_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -253,14 +285,14 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.ToTheMoonEnterSceneReqOuterClass.ToTheMoonEnterSceneReq other = (emu.grasscutter.net.proto.ToTheMoonEnterSceneReqOuterClass.ToTheMoonEnterSceneReq) obj;
 
-      if (getDKEOBFMAFPK()
-          != other.getDKEOBFMAFPK()) return false;
-      if (getCDDPHGDDCCN()
-          != other.getCDDPHGDDCCN()) return false;
       if (getSceneId()
           != other.getSceneId()) return false;
+      if (getEGJDKPKGDIB()
+          != other.getEGJDKPKGDIB()) return false;
       if (getVersion()
           != other.getVersion()) return false;
+      if (getHHAIIFODEOO()
+          != other.getHHAIIFODEOO()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -272,14 +304,14 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + DKEOBFMAFPK_FIELD_NUMBER;
-      hash = (53 * hash) + getDKEOBFMAFPK();
-      hash = (37 * hash) + CDDPHGDDCCN_FIELD_NUMBER;
-      hash = (53 * hash) + getCDDPHGDDCCN();
       hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getSceneId();
+      hash = (37 * hash) + EGJDKPKGDIB_FIELD_NUMBER;
+      hash = (53 * hash) + getEGJDKPKGDIB();
       hash = (37 * hash) + VERSION_FIELD_NUMBER;
       hash = (53 * hash) + getVersion();
+      hash = (37 * hash) + HHAIIFODEOO_FIELD_NUMBER;
+      hash = (53 * hash) + getHHAIIFODEOO();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -377,7 +409,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 6116
+     * CmdId: 6184
      * </pre>
      *
      * Protobuf type {@code ToTheMoonEnterSceneReq}
@@ -417,14 +449,14 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        dKEOBFMAFPK_ = 0;
-
-        cDDPHGDDCCN_ = 0;
-
         sceneId_ = 0;
 
+        eGJDKPKGDIB_ = 0;
+
         version_ = 0;
 
+        hHAIIFODEOO_ = 0;
+
         return this;
       }
 
@@ -451,10 +483,10 @@ public emu.grasscutter.net.proto.ToTheMoonEnterSceneReqOuterClass.ToTheMoonEnter
       @java.lang.Override
       public emu.grasscutter.net.proto.ToTheMoonEnterSceneReqOuterClass.ToTheMoonEnterSceneReq buildPartial() {
         emu.grasscutter.net.proto.ToTheMoonEnterSceneReqOuterClass.ToTheMoonEnterSceneReq result = new emu.grasscutter.net.proto.ToTheMoonEnterSceneReqOuterClass.ToTheMoonEnterSceneReq(this);
-        result.dKEOBFMAFPK_ = dKEOBFMAFPK_;
-        result.cDDPHGDDCCN_ = cDDPHGDDCCN_;
         result.sceneId_ = sceneId_;
+        result.eGJDKPKGDIB_ = eGJDKPKGDIB_;
         result.version_ = version_;
+        result.hHAIIFODEOO_ = hHAIIFODEOO_;
         onBuilt();
         return result;
       }
@@ -503,18 +535,18 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ToTheMoonEnterSceneReqOuterClass.ToTheMoonEnterSceneReq other) {
         if (other == emu.grasscutter.net.proto.ToTheMoonEnterSceneReqOuterClass.ToTheMoonEnterSceneReq.getDefaultInstance()) return this;
-        if (other.getDKEOBFMAFPK() != 0) {
-          setDKEOBFMAFPK(other.getDKEOBFMAFPK());
-        }
-        if (other.getCDDPHGDDCCN() != 0) {
-          setCDDPHGDDCCN(other.getCDDPHGDDCCN());
-        }
         if (other.getSceneId() != 0) {
           setSceneId(other.getSceneId());
         }
+        if (other.getEGJDKPKGDIB() != 0) {
+          setEGJDKPKGDIB(other.getEGJDKPKGDIB());
+        }
         if (other.getVersion() != 0) {
           setVersion(other.getVersion());
         }
+        if (other.getHHAIIFODEOO() != 0) {
+          setHHAIIFODEOO(other.getHHAIIFODEOO());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -544,126 +576,174 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int dKEOBFMAFPK_ ;
+      private int sceneId_ ;
       /**
-       * <code>uint32 DKEOBFMAFPK = 5;</code>
-       * @return The dKEOBFMAFPK.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 scene_id = 12;</code>
+       * @return The sceneId.
        */
       @java.lang.Override
-      public int getDKEOBFMAFPK() {
-        return dKEOBFMAFPK_;
+      public int getSceneId() {
+        return sceneId_;
       }
       /**
-       * <code>uint32 DKEOBFMAFPK = 5;</code>
-       * @param value The dKEOBFMAFPK to set.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 scene_id = 12;</code>
+       * @param value The sceneId to set.
        * @return This builder for chaining.
        */
-      public Builder setDKEOBFMAFPK(int value) {
+      public Builder setSceneId(int value) {
         
-        dKEOBFMAFPK_ = value;
+        sceneId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 DKEOBFMAFPK = 5;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 scene_id = 12;</code>
        * @return This builder for chaining.
        */
-      public Builder clearDKEOBFMAFPK() {
+      public Builder clearSceneId() {
         
-        dKEOBFMAFPK_ = 0;
+        sceneId_ = 0;
         onChanged();
         return this;
       }
 
-      private int cDDPHGDDCCN_ ;
+      private int eGJDKPKGDIB_ ;
       /**
-       * <code>uint32 CDDPHGDDCCN = 2;</code>
-       * @return The cDDPHGDDCCN.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 EGJDKPKGDIB = 15;</code>
+       * @return The eGJDKPKGDIB.
        */
       @java.lang.Override
-      public int getCDDPHGDDCCN() {
-        return cDDPHGDDCCN_;
+      public int getEGJDKPKGDIB() {
+        return eGJDKPKGDIB_;
       }
       /**
-       * <code>uint32 CDDPHGDDCCN = 2;</code>
-       * @param value The cDDPHGDDCCN to set.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 EGJDKPKGDIB = 15;</code>
+       * @param value The eGJDKPKGDIB to set.
        * @return This builder for chaining.
        */
-      public Builder setCDDPHGDDCCN(int value) {
+      public Builder setEGJDKPKGDIB(int value) {
         
-        cDDPHGDDCCN_ = value;
+        eGJDKPKGDIB_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 CDDPHGDDCCN = 2;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 EGJDKPKGDIB = 15;</code>
        * @return This builder for chaining.
        */
-      public Builder clearCDDPHGDDCCN() {
+      public Builder clearEGJDKPKGDIB() {
         
-        cDDPHGDDCCN_ = 0;
+        eGJDKPKGDIB_ = 0;
         onChanged();
         return this;
       }
 
-      private int sceneId_ ;
+      private int version_ ;
       /**
-       * <code>uint32 scene_id = 3;</code>
-       * @return The sceneId.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 version = 1;</code>
+       * @return The version.
        */
       @java.lang.Override
-      public int getSceneId() {
-        return sceneId_;
+      public int getVersion() {
+        return version_;
       }
       /**
-       * <code>uint32 scene_id = 3;</code>
-       * @param value The sceneId to set.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 version = 1;</code>
+       * @param value The version to set.
        * @return This builder for chaining.
        */
-      public Builder setSceneId(int value) {
+      public Builder setVersion(int value) {
         
-        sceneId_ = value;
+        version_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 scene_id = 3;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 version = 1;</code>
        * @return This builder for chaining.
        */
-      public Builder clearSceneId() {
+      public Builder clearVersion() {
         
-        sceneId_ = 0;
+        version_ = 0;
         onChanged();
         return this;
       }
 
-      private int version_ ;
+      private int hHAIIFODEOO_ ;
       /**
-       * <code>uint32 version = 4;</code>
-       * @return The version.
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 HHAIIFODEOO = 8;</code>
+       * @return The hHAIIFODEOO.
        */
       @java.lang.Override
-      public int getVersion() {
-        return version_;
+      public int getHHAIIFODEOO() {
+        return hHAIIFODEOO_;
       }
       /**
-       * <code>uint32 version = 4;</code>
-       * @param value The version to set.
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 HHAIIFODEOO = 8;</code>
+       * @param value The hHAIIFODEOO to set.
        * @return This builder for chaining.
        */
-      public Builder setVersion(int value) {
+      public Builder setHHAIIFODEOO(int value) {
         
-        version_ = value;
+        hHAIIFODEOO_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 version = 4;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 HHAIIFODEOO = 8;</code>
        * @return This builder for chaining.
        */
-      public Builder clearVersion() {
+      public Builder clearHHAIIFODEOO() {
         
-        version_ = 0;
+        hHAIIFODEOO_ = 0;
         onChanged();
         return this;
       }
@@ -735,9 +815,9 @@ public emu.grasscutter.net.proto.ToTheMoonEnterSceneReqOuterClass.ToTheMoonEnter
   static {
     java.lang.String[] descriptorData = {
       "\n\034ToTheMoonEnterSceneReq.proto\"e\n\026ToTheM" +
-      "oonEnterSceneReq\022\023\n\013DKEOBFMAFPK\030\005 \001(\r\022\023\n" +
-      "\013CDDPHGDDCCN\030\002 \001(\r\022\020\n\010scene_id\030\003 \001(\r\022\017\n\007" +
-      "version\030\004 \001(\rB\033\n\031emu.grasscutter.net.pro" +
+      "oonEnterSceneReq\022\020\n\010scene_id\030\014 \001(\r\022\023\n\013EG" +
+      "JDKPKGDIB\030\017 \001(\r\022\017\n\007version\030\001 \001(\r\022\023\n\013HHAI" +
+      "IFODEOO\030\010 \001(\rB\033\n\031emu.grasscutter.net.pro" +
       "tob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -749,7 +829,7 @@ public emu.grasscutter.net.proto.ToTheMoonEnterSceneReqOuterClass.ToTheMoonEnter
     internal_static_ToTheMoonEnterSceneReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ToTheMoonEnterSceneReq_descriptor,
-        new java.lang.String[] { "DKEOBFMAFPK", "CDDPHGDDCCN", "SceneId", "Version", });
+        new java.lang.String[] { "SceneId", "EGJDKPKGDIB", "Version", "HHAIIFODEOO", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/Uint32PairOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/Uint32PairOuterClass.java
index 227f4c5e147..3544ebb6aeb 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/Uint32PairOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/Uint32PairOuterClass.java
@@ -19,12 +19,20 @@ public interface Uint32PairOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
      * <code>uint32 key = 1;</code>
      * @return The key.
      */
     int getKey();
 
     /**
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
      * <code>uint32 value = 2;</code>
      * @return The value.
      */
@@ -120,6 +128,10 @@ private Uint32Pair(
     public static final int KEY_FIELD_NUMBER = 1;
     private int key_;
     /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
      * <code>uint32 key = 1;</code>
      * @return The key.
      */
@@ -131,6 +143,10 @@ public int getKey() {
     public static final int VALUE_FIELD_NUMBER = 2;
     private int value_;
     /**
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
      * <code>uint32 value = 2;</code>
      * @return The value.
      */
@@ -460,6 +476,10 @@ public Builder mergeFrom(
 
       private int key_ ;
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>uint32 key = 1;</code>
        * @return The key.
        */
@@ -468,6 +488,10 @@ public int getKey() {
         return key_;
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>uint32 key = 1;</code>
        * @param value The key to set.
        * @return This builder for chaining.
@@ -479,6 +503,10 @@ public Builder setKey(int value) {
         return this;
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>uint32 key = 1;</code>
        * @return This builder for chaining.
        */
@@ -491,6 +519,10 @@ public Builder clearKey() {
 
       private int value_ ;
       /**
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
        * <code>uint32 value = 2;</code>
        * @return The value.
        */
@@ -499,6 +531,10 @@ public int getValue() {
         return value_;
       }
       /**
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
        * <code>uint32 value = 2;</code>
        * @param value The value to set.
        * @return This builder for chaining.
@@ -510,6 +546,10 @@ public Builder setValue(int value) {
         return this;
       }
       /**
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
        * <code>uint32 value = 2;</code>
        * @return This builder for chaining.
        */
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/UnionCmdNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/UnionCmdNotifyOuterClass.java
index eb04a45fd52..e8b6f9b5926 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/UnionCmdNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/UnionCmdNotifyOuterClass.java
@@ -19,32 +19,52 @@ public interface UnionCmdNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .UnionCmd cmd_list = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .UnionCmd cmd_list = 15;</code>
      */
     java.util.List<emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd> 
         getCmdListList();
     /**
-     * <code>repeated .UnionCmd cmd_list = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .UnionCmd cmd_list = 15;</code>
      */
     emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd getCmdList(int index);
     /**
-     * <code>repeated .UnionCmd cmd_list = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .UnionCmd cmd_list = 15;</code>
      */
     int getCmdListCount();
     /**
-     * <code>repeated .UnionCmd cmd_list = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .UnionCmd cmd_list = 15;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmdOrBuilder> 
         getCmdListOrBuilderList();
     /**
-     * <code>repeated .UnionCmd cmd_list = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .UnionCmd cmd_list = 15;</code>
      */
     emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmdOrBuilder getCmdListOrBuilder(
         int index);
   }
   /**
    * <pre>
-   * CmdId: 9762
+   * CmdId: 1350
    * </pre>
    *
    * Protobuf type {@code UnionCmdNotify}
@@ -93,7 +113,7 @@ private UnionCmdNotify(
             case 0:
               done = true;
               break;
-            case 50: {
+            case 122: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 cmdList_ = new java.util.ArrayList<emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd>();
                 mutable_bitField0_ |= 0x00000001;
@@ -137,17 +157,25 @@ private UnionCmdNotify(
               emu.grasscutter.net.proto.UnionCmdNotifyOuterClass.UnionCmdNotify.class, emu.grasscutter.net.proto.UnionCmdNotifyOuterClass.UnionCmdNotify.Builder.class);
     }
 
-    public static final int CMD_LIST_FIELD_NUMBER = 6;
+    public static final int CMD_LIST_FIELD_NUMBER = 15;
     private java.util.List<emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd> cmdList_;
     /**
-     * <code>repeated .UnionCmd cmd_list = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .UnionCmd cmd_list = 15;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd> getCmdListList() {
       return cmdList_;
     }
     /**
-     * <code>repeated .UnionCmd cmd_list = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .UnionCmd cmd_list = 15;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmdOrBuilder> 
@@ -155,21 +183,33 @@ public java.util.List<emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd> get
       return cmdList_;
     }
     /**
-     * <code>repeated .UnionCmd cmd_list = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .UnionCmd cmd_list = 15;</code>
      */
     @java.lang.Override
     public int getCmdListCount() {
       return cmdList_.size();
     }
     /**
-     * <code>repeated .UnionCmd cmd_list = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .UnionCmd cmd_list = 15;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd getCmdList(int index) {
       return cmdList_.get(index);
     }
     /**
-     * <code>repeated .UnionCmd cmd_list = 6;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>repeated .UnionCmd cmd_list = 15;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmdOrBuilder getCmdListOrBuilder(
@@ -192,7 +232,7 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < cmdList_.size(); i++) {
-        output.writeMessage(6, cmdList_.get(i));
+        output.writeMessage(15, cmdList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -205,7 +245,7 @@ public int getSerializedSize() {
       size = 0;
       for (int i = 0; i < cmdList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, cmdList_.get(i));
+          .computeMessageSize(15, cmdList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -336,7 +376,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 9762
+     * CmdId: 1350
      * </pre>
      *
      * Protobuf type {@code UnionCmdNotify}
@@ -536,7 +576,11 @@ private void ensureCmdListIsMutable() {
           emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd, emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd.Builder, emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmdOrBuilder> cmdListBuilder_;
 
       /**
-       * <code>repeated .UnionCmd cmd_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .UnionCmd cmd_list = 15;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd> getCmdListList() {
         if (cmdListBuilder_ == null) {
@@ -546,7 +590,11 @@ public java.util.List<emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd> get
         }
       }
       /**
-       * <code>repeated .UnionCmd cmd_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .UnionCmd cmd_list = 15;</code>
        */
       public int getCmdListCount() {
         if (cmdListBuilder_ == null) {
@@ -556,7 +604,11 @@ public int getCmdListCount() {
         }
       }
       /**
-       * <code>repeated .UnionCmd cmd_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .UnionCmd cmd_list = 15;</code>
        */
       public emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd getCmdList(int index) {
         if (cmdListBuilder_ == null) {
@@ -566,7 +618,11 @@ public emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd getCmdList(int inde
         }
       }
       /**
-       * <code>repeated .UnionCmd cmd_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .UnionCmd cmd_list = 15;</code>
        */
       public Builder setCmdList(
           int index, emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd value) {
@@ -583,7 +639,11 @@ public Builder setCmdList(
         return this;
       }
       /**
-       * <code>repeated .UnionCmd cmd_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .UnionCmd cmd_list = 15;</code>
        */
       public Builder setCmdList(
           int index, emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd.Builder builderForValue) {
@@ -597,7 +657,11 @@ public Builder setCmdList(
         return this;
       }
       /**
-       * <code>repeated .UnionCmd cmd_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .UnionCmd cmd_list = 15;</code>
        */
       public Builder addCmdList(emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd value) {
         if (cmdListBuilder_ == null) {
@@ -613,7 +677,11 @@ public Builder addCmdList(emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd
         return this;
       }
       /**
-       * <code>repeated .UnionCmd cmd_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .UnionCmd cmd_list = 15;</code>
        */
       public Builder addCmdList(
           int index, emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd value) {
@@ -630,7 +698,11 @@ public Builder addCmdList(
         return this;
       }
       /**
-       * <code>repeated .UnionCmd cmd_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .UnionCmd cmd_list = 15;</code>
        */
       public Builder addCmdList(
           emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd.Builder builderForValue) {
@@ -644,7 +716,11 @@ public Builder addCmdList(
         return this;
       }
       /**
-       * <code>repeated .UnionCmd cmd_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .UnionCmd cmd_list = 15;</code>
        */
       public Builder addCmdList(
           int index, emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd.Builder builderForValue) {
@@ -658,7 +734,11 @@ public Builder addCmdList(
         return this;
       }
       /**
-       * <code>repeated .UnionCmd cmd_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .UnionCmd cmd_list = 15;</code>
        */
       public Builder addAllCmdList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd> values) {
@@ -673,7 +753,11 @@ public Builder addAllCmdList(
         return this;
       }
       /**
-       * <code>repeated .UnionCmd cmd_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .UnionCmd cmd_list = 15;</code>
        */
       public Builder clearCmdList() {
         if (cmdListBuilder_ == null) {
@@ -686,7 +770,11 @@ public Builder clearCmdList() {
         return this;
       }
       /**
-       * <code>repeated .UnionCmd cmd_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .UnionCmd cmd_list = 15;</code>
        */
       public Builder removeCmdList(int index) {
         if (cmdListBuilder_ == null) {
@@ -699,14 +787,22 @@ public Builder removeCmdList(int index) {
         return this;
       }
       /**
-       * <code>repeated .UnionCmd cmd_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .UnionCmd cmd_list = 15;</code>
        */
       public emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd.Builder getCmdListBuilder(
           int index) {
         return getCmdListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .UnionCmd cmd_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .UnionCmd cmd_list = 15;</code>
        */
       public emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmdOrBuilder getCmdListOrBuilder(
           int index) {
@@ -716,7 +812,11 @@ public emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmdOrBuilder getCmdList
         }
       }
       /**
-       * <code>repeated .UnionCmd cmd_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .UnionCmd cmd_list = 15;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmdOrBuilder> 
            getCmdListOrBuilderList() {
@@ -727,14 +827,22 @@ public emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmdOrBuilder getCmdList
         }
       }
       /**
-       * <code>repeated .UnionCmd cmd_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .UnionCmd cmd_list = 15;</code>
        */
       public emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd.Builder addCmdListBuilder() {
         return getCmdListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd.getDefaultInstance());
       }
       /**
-       * <code>repeated .UnionCmd cmd_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .UnionCmd cmd_list = 15;</code>
        */
       public emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd.Builder addCmdListBuilder(
           int index) {
@@ -742,7 +850,11 @@ public emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd.Builder addCmdListB
             index, emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd.getDefaultInstance());
       }
       /**
-       * <code>repeated .UnionCmd cmd_list = 6;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>repeated .UnionCmd cmd_list = 15;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd.Builder> 
            getCmdListBuilderList() {
@@ -830,7 +942,7 @@ public emu.grasscutter.net.proto.UnionCmdNotifyOuterClass.UnionCmdNotify getDefa
   static {
     java.lang.String[] descriptorData = {
       "\n\024UnionCmdNotify.proto\032\016UnionCmd.proto\"-" +
-      "\n\016UnionCmdNotify\022\033\n\010cmd_list\030\006 \003(\0132\t.Uni" +
+      "\n\016UnionCmdNotify\022\033\n\010cmd_list\030\017 \003(\0132\t.Uni" +
       "onCmdB\033\n\031emu.grasscutter.net.protob\006prot" +
       "o3"
     };
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/UnionCmdOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/UnionCmdOuterClass.java
index 98a993077df..509a845def5 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/UnionCmdOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/UnionCmdOuterClass.java
@@ -19,16 +19,24 @@ public interface UnionCmdOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 message_id = 8;</code>
-     * @return The messageId.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>bytes body = 11;</code>
+     * @return The body.
      */
-    int getMessageId();
+    com.google.protobuf.ByteString getBody();
 
     /**
-     * <code>bytes body = 14;</code>
-     * @return The body.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 message_id = 5;</code>
+     * @return The messageId.
      */
-    com.google.protobuf.ByteString getBody();
+    int getMessageId();
   }
   /**
    * Protobuf type {@code UnionCmd}
@@ -76,12 +84,12 @@ private UnionCmd(
             case 0:
               done = true;
               break;
-            case 64: {
+            case 40: {
 
               messageId_ = input.readUInt32();
               break;
             }
-            case 114: {
+            case 90: {
 
               body_ = input.readBytes();
               break;
@@ -118,26 +126,34 @@ private UnionCmd(
               emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd.class, emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd.Builder.class);
     }
 
-    public static final int MESSAGE_ID_FIELD_NUMBER = 8;
-    private int messageId_;
+    public static final int BODY_FIELD_NUMBER = 11;
+    private com.google.protobuf.ByteString body_;
     /**
-     * <code>uint32 message_id = 8;</code>
-     * @return The messageId.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>bytes body = 11;</code>
+     * @return The body.
      */
     @java.lang.Override
-    public int getMessageId() {
-      return messageId_;
+    public com.google.protobuf.ByteString getBody() {
+      return body_;
     }
 
-    public static final int BODY_FIELD_NUMBER = 14;
-    private com.google.protobuf.ByteString body_;
+    public static final int MESSAGE_ID_FIELD_NUMBER = 5;
+    private int messageId_;
     /**
-     * <code>bytes body = 14;</code>
-     * @return The body.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 message_id = 5;</code>
+     * @return The messageId.
      */
     @java.lang.Override
-    public com.google.protobuf.ByteString getBody() {
-      return body_;
+    public int getMessageId() {
+      return messageId_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -155,10 +171,10 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (messageId_ != 0) {
-        output.writeUInt32(8, messageId_);
+        output.writeUInt32(5, messageId_);
       }
       if (!body_.isEmpty()) {
-        output.writeBytes(14, body_);
+        output.writeBytes(11, body_);
       }
       unknownFields.writeTo(output);
     }
@@ -171,11 +187,11 @@ public int getSerializedSize() {
       size = 0;
       if (messageId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, messageId_);
+          .computeUInt32Size(5, messageId_);
       }
       if (!body_.isEmpty()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(14, body_);
+          .computeBytesSize(11, body_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -192,10 +208,10 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd other = (emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd) obj;
 
-      if (getMessageId()
-          != other.getMessageId()) return false;
       if (!getBody()
           .equals(other.getBody())) return false;
+      if (getMessageId()
+          != other.getMessageId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -207,10 +223,10 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + MESSAGE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getMessageId();
       hash = (37 * hash) + BODY_FIELD_NUMBER;
       hash = (53 * hash) + getBody().hashCode();
+      hash = (37 * hash) + MESSAGE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getMessageId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -344,10 +360,10 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        messageId_ = 0;
-
         body_ = com.google.protobuf.ByteString.EMPTY;
 
+        messageId_ = 0;
+
         return this;
       }
 
@@ -374,8 +390,8 @@ public emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd build() {
       @java.lang.Override
       public emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd buildPartial() {
         emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd result = new emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd(this);
-        result.messageId_ = messageId_;
         result.body_ = body_;
+        result.messageId_ = messageId_;
         onBuilt();
         return result;
       }
@@ -424,12 +440,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd other) {
         if (other == emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd.getDefaultInstance()) return this;
-        if (other.getMessageId() != 0) {
-          setMessageId(other.getMessageId());
-        }
         if (other.getBody() != com.google.protobuf.ByteString.EMPTY) {
           setBody(other.getBody());
         }
+        if (other.getMessageId() != 0) {
+          setMessageId(other.getMessageId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -459,67 +475,91 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int messageId_ ;
+      private com.google.protobuf.ByteString body_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>uint32 message_id = 8;</code>
-       * @return The messageId.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>bytes body = 11;</code>
+       * @return The body.
        */
       @java.lang.Override
-      public int getMessageId() {
-        return messageId_;
+      public com.google.protobuf.ByteString getBody() {
+        return body_;
       }
       /**
-       * <code>uint32 message_id = 8;</code>
-       * @param value The messageId to set.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>bytes body = 11;</code>
+       * @param value The body to set.
        * @return This builder for chaining.
        */
-      public Builder setMessageId(int value) {
-        
-        messageId_ = value;
+      public Builder setBody(com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        body_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 message_id = 8;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>bytes body = 11;</code>
        * @return This builder for chaining.
        */
-      public Builder clearMessageId() {
+      public Builder clearBody() {
         
-        messageId_ = 0;
+        body_ = getDefaultInstance().getBody();
         onChanged();
         return this;
       }
 
-      private com.google.protobuf.ByteString body_ = com.google.protobuf.ByteString.EMPTY;
+      private int messageId_ ;
       /**
-       * <code>bytes body = 14;</code>
-       * @return The body.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 message_id = 5;</code>
+       * @return The messageId.
        */
       @java.lang.Override
-      public com.google.protobuf.ByteString getBody() {
-        return body_;
+      public int getMessageId() {
+        return messageId_;
       }
       /**
-       * <code>bytes body = 14;</code>
-       * @param value The body to set.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 message_id = 5;</code>
+       * @param value The messageId to set.
        * @return This builder for chaining.
        */
-      public Builder setBody(com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        body_ = value;
+      public Builder setMessageId(int value) {
+        
+        messageId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bytes body = 14;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 message_id = 5;</code>
        * @return This builder for chaining.
        */
-      public Builder clearBody() {
+      public Builder clearMessageId() {
         
-        body_ = getDefaultInstance().getBody();
+        messageId_ = 0;
         onChanged();
         return this;
       }
@@ -590,8 +630,8 @@ public emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd getDefaultInstanceF
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\016UnionCmd.proto\",\n\010UnionCmd\022\022\n\nmessage_" +
-      "id\030\010 \001(\r\022\014\n\004body\030\016 \001(\014B\033\n\031emu.grasscutte" +
+      "\n\016UnionCmd.proto\",\n\010UnionCmd\022\014\n\004body\030\013 \001" +
+      "(\014\022\022\n\nmessage_id\030\005 \001(\rB\033\n\031emu.grasscutte" +
       "r.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -603,7 +643,7 @@ public emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd getDefaultInstanceF
     internal_static_UnionCmd_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_UnionCmd_descriptor,
-        new java.lang.String[] { "MessageId", "Body", });
+        new java.lang.String[] { "Body", "MessageId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/VehicleInteractReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/VehicleInteractReqOuterClass.java
index 3c935e20e84..653476145b2 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/VehicleInteractReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/VehicleInteractReqOuterClass.java
@@ -19,37 +19,57 @@ public interface VehicleInteractReqOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 pos = 13;</code>
-     * @return The pos.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.VehicleInteractType interact_type = 11;</code>
+     * @return The enum numeric value on the wire for interactType.
      */
-    int getPos();
-
+    int getInteractTypeValue();
     /**
-     * <code>uint32 entity_id = 5;</code>
-     * @return The entityId.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.VehicleInteractType interact_type = 11;</code>
+     * @return The interactType.
      */
-    int getEntityId();
+    emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType getInteractType();
 
     /**
-     * <code>bool EILHBJJEPOK = 1;</code>
-     * @return The eILHBJJEPOK.
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>bool EOGLFOGEKLA = 5;</code>
+     * @return The eOGLFOGEKLA.
      */
-    boolean getEILHBJJEPOK();
+    boolean getEOGLFOGEKLA();
 
     /**
-     * <code>.VehicleInteractType interact_type = 8;</code>
-     * @return The enum numeric value on the wire for interactType.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 entity_id = 12;</code>
+     * @return The entityId.
      */
-    int getInteractTypeValue();
+    int getEntityId();
+
     /**
-     * <code>.VehicleInteractType interact_type = 8;</code>
-     * @return The interactType.
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>uint32 pos = 7;</code>
+     * @return The pos.
      */
-    emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType getInteractType();
+    int getPos();
   }
   /**
    * <pre>
-   * CmdId: 25867
+   * CmdId: 1121
    * </pre>
    *
    * Protobuf type {@code VehicleInteractReq}
@@ -97,25 +117,25 @@ private VehicleInteractReq(
             case 0:
               done = true;
               break;
-            case 8: {
+            case 40: {
 
-              eILHBJJEPOK_ = input.readBool();
+              eOGLFOGEKLA_ = input.readBool();
               break;
             }
-            case 40: {
+            case 56: {
 
-              entityId_ = input.readUInt32();
+              pos_ = input.readUInt32();
               break;
             }
-            case 64: {
+            case 88: {
               int rawValue = input.readEnum();
 
               interactType_ = rawValue;
               break;
             }
-            case 104: {
+            case 96: {
 
-              pos_ = input.readUInt32();
+              entityId_ = input.readUInt32();
               break;
             }
             default: {
@@ -150,56 +170,76 @@ private VehicleInteractReq(
               emu.grasscutter.net.proto.VehicleInteractReqOuterClass.VehicleInteractReq.class, emu.grasscutter.net.proto.VehicleInteractReqOuterClass.VehicleInteractReq.Builder.class);
     }
 
-    public static final int POS_FIELD_NUMBER = 13;
-    private int pos_;
+    public static final int INTERACT_TYPE_FIELD_NUMBER = 11;
+    private int interactType_;
     /**
-     * <code>uint32 pos = 13;</code>
-     * @return The pos.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.VehicleInteractType interact_type = 11;</code>
+     * @return The enum numeric value on the wire for interactType.
      */
-    @java.lang.Override
-    public int getPos() {
-      return pos_;
+    @java.lang.Override public int getInteractTypeValue() {
+      return interactType_;
     }
-
-    public static final int ENTITY_ID_FIELD_NUMBER = 5;
-    private int entityId_;
     /**
-     * <code>uint32 entity_id = 5;</code>
-     * @return The entityId.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.VehicleInteractType interact_type = 11;</code>
+     * @return The interactType.
      */
-    @java.lang.Override
-    public int getEntityId() {
-      return entityId_;
+    @java.lang.Override public emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType getInteractType() {
+      @SuppressWarnings("deprecation")
+      emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType result = emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType.valueOf(interactType_);
+      return result == null ? emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType.UNRECOGNIZED : result;
     }
 
-    public static final int EILHBJJEPOK_FIELD_NUMBER = 1;
-    private boolean eILHBJJEPOK_;
+    public static final int EOGLFOGEKLA_FIELD_NUMBER = 5;
+    private boolean eOGLFOGEKLA_;
     /**
-     * <code>bool EILHBJJEPOK = 1;</code>
-     * @return The eILHBJJEPOK.
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>bool EOGLFOGEKLA = 5;</code>
+     * @return The eOGLFOGEKLA.
      */
     @java.lang.Override
-    public boolean getEILHBJJEPOK() {
-      return eILHBJJEPOK_;
+    public boolean getEOGLFOGEKLA() {
+      return eOGLFOGEKLA_;
     }
 
-    public static final int INTERACT_TYPE_FIELD_NUMBER = 8;
-    private int interactType_;
+    public static final int ENTITY_ID_FIELD_NUMBER = 12;
+    private int entityId_;
     /**
-     * <code>.VehicleInteractType interact_type = 8;</code>
-     * @return The enum numeric value on the wire for interactType.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 entity_id = 12;</code>
+     * @return The entityId.
      */
-    @java.lang.Override public int getInteractTypeValue() {
-      return interactType_;
+    @java.lang.Override
+    public int getEntityId() {
+      return entityId_;
     }
+
+    public static final int POS_FIELD_NUMBER = 7;
+    private int pos_;
     /**
-     * <code>.VehicleInteractType interact_type = 8;</code>
-     * @return The interactType.
+     * <pre>
+     * Offset: 0x2C
+     * </pre>
+     *
+     * <code>uint32 pos = 7;</code>
+     * @return The pos.
      */
-    @java.lang.Override public emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType getInteractType() {
-      @SuppressWarnings("deprecation")
-      emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType result = emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType.valueOf(interactType_);
-      return result == null ? emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType.UNRECOGNIZED : result;
+    @java.lang.Override
+    public int getPos() {
+      return pos_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -216,17 +256,17 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (eILHBJJEPOK_ != false) {
-        output.writeBool(1, eILHBJJEPOK_);
+      if (eOGLFOGEKLA_ != false) {
+        output.writeBool(5, eOGLFOGEKLA_);
       }
-      if (entityId_ != 0) {
-        output.writeUInt32(5, entityId_);
+      if (pos_ != 0) {
+        output.writeUInt32(7, pos_);
       }
       if (interactType_ != emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType.VEHICLE_INTERACT_TYPE_NONE.getNumber()) {
-        output.writeEnum(8, interactType_);
+        output.writeEnum(11, interactType_);
       }
-      if (pos_ != 0) {
-        output.writeUInt32(13, pos_);
+      if (entityId_ != 0) {
+        output.writeUInt32(12, entityId_);
       }
       unknownFields.writeTo(output);
     }
@@ -237,21 +277,21 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (eILHBJJEPOK_ != false) {
+      if (eOGLFOGEKLA_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(1, eILHBJJEPOK_);
+          .computeBoolSize(5, eOGLFOGEKLA_);
       }
-      if (entityId_ != 0) {
+      if (pos_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, entityId_);
+          .computeUInt32Size(7, pos_);
       }
       if (interactType_ != emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType.VEHICLE_INTERACT_TYPE_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(8, interactType_);
+          .computeEnumSize(11, interactType_);
       }
-      if (pos_ != 0) {
+      if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, pos_);
+          .computeUInt32Size(12, entityId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -268,13 +308,13 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.VehicleInteractReqOuterClass.VehicleInteractReq other = (emu.grasscutter.net.proto.VehicleInteractReqOuterClass.VehicleInteractReq) obj;
 
-      if (getPos()
-          != other.getPos()) return false;
+      if (interactType_ != other.interactType_) return false;
+      if (getEOGLFOGEKLA()
+          != other.getEOGLFOGEKLA()) return false;
       if (getEntityId()
           != other.getEntityId()) return false;
-      if (getEILHBJJEPOK()
-          != other.getEILHBJJEPOK()) return false;
-      if (interactType_ != other.interactType_) return false;
+      if (getPos()
+          != other.getPos()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -286,15 +326,15 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + POS_FIELD_NUMBER;
-      hash = (53 * hash) + getPos();
-      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getEntityId();
-      hash = (37 * hash) + EILHBJJEPOK_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getEILHBJJEPOK());
       hash = (37 * hash) + INTERACT_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + interactType_;
+      hash = (37 * hash) + EOGLFOGEKLA_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getEOGLFOGEKLA());
+      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getEntityId();
+      hash = (37 * hash) + POS_FIELD_NUMBER;
+      hash = (53 * hash) + getPos();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -392,7 +432,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 25867
+     * CmdId: 1121
      * </pre>
      *
      * Protobuf type {@code VehicleInteractReq}
@@ -432,13 +472,13 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        pos_ = 0;
+        interactType_ = 0;
 
-        entityId_ = 0;
+        eOGLFOGEKLA_ = false;
 
-        eILHBJJEPOK_ = false;
+        entityId_ = 0;
 
-        interactType_ = 0;
+        pos_ = 0;
 
         return this;
       }
@@ -466,10 +506,10 @@ public emu.grasscutter.net.proto.VehicleInteractReqOuterClass.VehicleInteractReq
       @java.lang.Override
       public emu.grasscutter.net.proto.VehicleInteractReqOuterClass.VehicleInteractReq buildPartial() {
         emu.grasscutter.net.proto.VehicleInteractReqOuterClass.VehicleInteractReq result = new emu.grasscutter.net.proto.VehicleInteractReqOuterClass.VehicleInteractReq(this);
-        result.pos_ = pos_;
-        result.entityId_ = entityId_;
-        result.eILHBJJEPOK_ = eILHBJJEPOK_;
         result.interactType_ = interactType_;
+        result.eOGLFOGEKLA_ = eOGLFOGEKLA_;
+        result.entityId_ = entityId_;
+        result.pos_ = pos_;
         onBuilt();
         return result;
       }
@@ -518,17 +558,17 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.VehicleInteractReqOuterClass.VehicleInteractReq other) {
         if (other == emu.grasscutter.net.proto.VehicleInteractReqOuterClass.VehicleInteractReq.getDefaultInstance()) return this;
-        if (other.getPos() != 0) {
-          setPos(other.getPos());
+        if (other.interactType_ != 0) {
+          setInteractTypeValue(other.getInteractTypeValue());
+        }
+        if (other.getEOGLFOGEKLA() != false) {
+          setEOGLFOGEKLA(other.getEOGLFOGEKLA());
         }
         if (other.getEntityId() != 0) {
           setEntityId(other.getEntityId());
         }
-        if (other.getEILHBJJEPOK() != false) {
-          setEILHBJJEPOK(other.getEILHBJJEPOK());
-        }
-        if (other.interactType_ != 0) {
-          setInteractTypeValue(other.getInteractTypeValue());
+        if (other.getPos() != 0) {
+          setPos(other.getPos());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -559,149 +599,205 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int pos_ ;
-      /**
-       * <code>uint32 pos = 13;</code>
-       * @return The pos.
-       */
-      @java.lang.Override
-      public int getPos() {
-        return pos_;
-      }
+      private int interactType_ = 0;
       /**
-       * <code>uint32 pos = 13;</code>
-       * @param value The pos to set.
-       * @return This builder for chaining.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.VehicleInteractType interact_type = 11;</code>
+       * @return The enum numeric value on the wire for interactType.
        */
-      public Builder setPos(int value) {
-        
-        pos_ = value;
-        onChanged();
-        return this;
+      @java.lang.Override public int getInteractTypeValue() {
+        return interactType_;
       }
       /**
-       * <code>uint32 pos = 13;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.VehicleInteractType interact_type = 11;</code>
+       * @param value The enum numeric value on the wire for interactType to set.
        * @return This builder for chaining.
        */
-      public Builder clearPos() {
+      public Builder setInteractTypeValue(int value) {
         
-        pos_ = 0;
+        interactType_ = value;
         onChanged();
         return this;
       }
-
-      private int entityId_ ;
       /**
-       * <code>uint32 entity_id = 5;</code>
-       * @return The entityId.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.VehicleInteractType interact_type = 11;</code>
+       * @return The interactType.
        */
       @java.lang.Override
-      public int getEntityId() {
-        return entityId_;
+      public emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType getInteractType() {
+        @SuppressWarnings("deprecation")
+        emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType result = emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType.valueOf(interactType_);
+        return result == null ? emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType.UNRECOGNIZED : result;
       }
       /**
-       * <code>uint32 entity_id = 5;</code>
-       * @param value The entityId to set.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.VehicleInteractType interact_type = 11;</code>
+       * @param value The interactType to set.
        * @return This builder for chaining.
        */
-      public Builder setEntityId(int value) {
+      public Builder setInteractType(emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
         
-        entityId_ = value;
+        interactType_ = value.getNumber();
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 entity_id = 5;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.VehicleInteractType interact_type = 11;</code>
        * @return This builder for chaining.
        */
-      public Builder clearEntityId() {
+      public Builder clearInteractType() {
         
-        entityId_ = 0;
+        interactType_ = 0;
         onChanged();
         return this;
       }
 
-      private boolean eILHBJJEPOK_ ;
+      private boolean eOGLFOGEKLA_ ;
       /**
-       * <code>bool EILHBJJEPOK = 1;</code>
-       * @return The eILHBJJEPOK.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>bool EOGLFOGEKLA = 5;</code>
+       * @return The eOGLFOGEKLA.
        */
       @java.lang.Override
-      public boolean getEILHBJJEPOK() {
-        return eILHBJJEPOK_;
+      public boolean getEOGLFOGEKLA() {
+        return eOGLFOGEKLA_;
       }
       /**
-       * <code>bool EILHBJJEPOK = 1;</code>
-       * @param value The eILHBJJEPOK to set.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>bool EOGLFOGEKLA = 5;</code>
+       * @param value The eOGLFOGEKLA to set.
        * @return This builder for chaining.
        */
-      public Builder setEILHBJJEPOK(boolean value) {
+      public Builder setEOGLFOGEKLA(boolean value) {
         
-        eILHBJJEPOK_ = value;
+        eOGLFOGEKLA_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bool EILHBJJEPOK = 1;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>bool EOGLFOGEKLA = 5;</code>
        * @return This builder for chaining.
        */
-      public Builder clearEILHBJJEPOK() {
+      public Builder clearEOGLFOGEKLA() {
         
-        eILHBJJEPOK_ = false;
+        eOGLFOGEKLA_ = false;
         onChanged();
         return this;
       }
 
-      private int interactType_ = 0;
+      private int entityId_ ;
       /**
-       * <code>.VehicleInteractType interact_type = 8;</code>
-       * @return The enum numeric value on the wire for interactType.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 entity_id = 12;</code>
+       * @return The entityId.
        */
-      @java.lang.Override public int getInteractTypeValue() {
-        return interactType_;
+      @java.lang.Override
+      public int getEntityId() {
+        return entityId_;
       }
       /**
-       * <code>.VehicleInteractType interact_type = 8;</code>
-       * @param value The enum numeric value on the wire for interactType to set.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 entity_id = 12;</code>
+       * @param value The entityId to set.
        * @return This builder for chaining.
        */
-      public Builder setInteractTypeValue(int value) {
+      public Builder setEntityId(int value) {
         
-        interactType_ = value;
+        entityId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>.VehicleInteractType interact_type = 8;</code>
-       * @return The interactType.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 entity_id = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEntityId() {
+        
+        entityId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int pos_ ;
+      /**
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 pos = 7;</code>
+       * @return The pos.
        */
       @java.lang.Override
-      public emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType getInteractType() {
-        @SuppressWarnings("deprecation")
-        emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType result = emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType.valueOf(interactType_);
-        return result == null ? emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType.UNRECOGNIZED : result;
+      public int getPos() {
+        return pos_;
       }
       /**
-       * <code>.VehicleInteractType interact_type = 8;</code>
-       * @param value The interactType to set.
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 pos = 7;</code>
+       * @param value The pos to set.
        * @return This builder for chaining.
        */
-      public Builder setInteractType(emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder setPos(int value) {
         
-        interactType_ = value.getNumber();
+        pos_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>.VehicleInteractType interact_type = 8;</code>
+       * <pre>
+       * Offset: 0x2C
+       * </pre>
+       *
+       * <code>uint32 pos = 7;</code>
        * @return This builder for chaining.
        */
-      public Builder clearInteractType() {
+      public Builder clearPos() {
         
-        interactType_ = 0;
+        pos_ = 0;
         onChanged();
         return this;
       }
@@ -773,10 +869,10 @@ public emu.grasscutter.net.proto.VehicleInteractReqOuterClass.VehicleInteractReq
   static {
     java.lang.String[] descriptorData = {
       "\n\030VehicleInteractReq.proto\032\031VehicleInter" +
-      "actType.proto\"v\n\022VehicleInteractReq\022\013\n\003p" +
-      "os\030\r \001(\r\022\021\n\tentity_id\030\005 \001(\r\022\023\n\013EILHBJJEP" +
-      "OK\030\001 \001(\010\022+\n\rinteract_type\030\010 \001(\0162\024.Vehicl" +
-      "eInteractTypeB\033\n\031emu.grasscutter.net.pro" +
+      "actType.proto\"v\n\022VehicleInteractReq\022+\n\ri" +
+      "nteract_type\030\013 \001(\0162\024.VehicleInteractType" +
+      "\022\023\n\013EOGLFOGEKLA\030\005 \001(\010\022\021\n\tentity_id\030\014 \001(\r" +
+      "\022\013\n\003pos\030\007 \001(\rB\033\n\031emu.grasscutter.net.pro" +
       "tob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -789,7 +885,7 @@ public emu.grasscutter.net.proto.VehicleInteractReqOuterClass.VehicleInteractReq
     internal_static_VehicleInteractReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_VehicleInteractReq_descriptor,
-        new java.lang.String[] { "Pos", "EntityId", "EILHBJJEPOK", "InteractType", });
+        new java.lang.String[] { "InteractType", "EOGLFOGEKLA", "EntityId", "Pos", });
     emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/VehicleInteractRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/VehicleInteractRspOuterClass.java
index 1d53a6a2632..0cdcd8f1a19 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/VehicleInteractRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/VehicleInteractRspOuterClass.java
@@ -19,88 +19,148 @@ public interface VehicleInteractRspOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.VehicleMember member = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.VehicleMember member = 12;</code>
      * @return Whether the member field is set.
      */
     boolean hasMember();
     /**
-     * <code>.VehicleMember member = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.VehicleMember member = 12;</code>
      * @return The member.
      */
     emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember getMember();
     /**
-     * <code>.VehicleMember member = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.VehicleMember member = 12;</code>
      */
     emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMemberOrBuilder getMemberOrBuilder();
 
     /**
-     * <code>uint32 GIICKAOFKDB = 4;</code>
-     * @return The gIICKAOFKDB.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.Vector vehicle_pos = 15;</code>
+     * @return Whether the vehiclePos field is set.
      */
-    int getGIICKAOFKDB();
-
+    boolean hasVehiclePos();
     /**
-     * <code>int32 retcode = 5;</code>
-     * @return The retcode.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.Vector vehicle_pos = 15;</code>
+     * @return The vehiclePos.
      */
-    int getRetcode();
-
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getVehiclePos();
     /**
-     * <code>uint32 gadget_id = 7;</code>
-     * @return The gadgetId.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.Vector vehicle_pos = 15;</code>
      */
-    int getGadgetId();
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getVehiclePosOrBuilder();
 
     /**
-     * <code>uint32 entity_id = 8;</code>
-     * @return The entityId.
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>.Vector vehicle_rot = 7;</code>
+     * @return Whether the vehicleRot field is set.
      */
-    int getEntityId();
-
+    boolean hasVehicleRot();
     /**
-     * <code>.Vector vehicle_pos = 10;</code>
-     * @return Whether the vehiclePos field is set.
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>.Vector vehicle_rot = 7;</code>
+     * @return The vehicleRot.
      */
-    boolean hasVehiclePos();
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getVehicleRot();
     /**
-     * <code>.Vector vehicle_pos = 10;</code>
-     * @return The vehiclePos.
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>.Vector vehicle_rot = 7;</code>
      */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getVehiclePos();
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getVehicleRotOrBuilder();
+
     /**
-     * <code>.Vector vehicle_pos = 10;</code>
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>uint32 JLKDLPCMPAN = 8;</code>
+     * @return The jLKDLPCMPAN.
      */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getVehiclePosOrBuilder();
+    int getJLKDLPCMPAN();
+
+    /**
+     * <pre>
+     * Offset: 0x3C
+     * </pre>
+     *
+     * <code>uint32 gadget_id = 13;</code>
+     * @return The gadgetId.
+     */
+    int getGadgetId();
 
     /**
-     * <code>.VehicleInteractType interact_type = 11;</code>
+     * <pre>
+     * Offset: 0x40
+     * </pre>
+     *
+     * <code>.VehicleInteractType interact_type = 2;</code>
      * @return The enum numeric value on the wire for interactType.
      */
     int getInteractTypeValue();
     /**
-     * <code>.VehicleInteractType interact_type = 11;</code>
+     * <pre>
+     * Offset: 0x40
+     * </pre>
+     *
+     * <code>.VehicleInteractType interact_type = 2;</code>
      * @return The interactType.
      */
     emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType getInteractType();
 
     /**
-     * <code>.Vector vehicle_rot = 15;</code>
-     * @return Whether the vehicleRot field is set.
-     */
-    boolean hasVehicleRot();
-    /**
-     * <code>.Vector vehicle_rot = 15;</code>
-     * @return The vehicleRot.
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>int32 retcode = 4;</code>
+     * @return The retcode.
      */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getVehicleRot();
+    int getRetcode();
+
     /**
-     * <code>.Vector vehicle_rot = 15;</code>
+     * <pre>
+     * Offset: 0x4C
+     * </pre>
+     *
+     * <code>uint32 entity_id = 1;</code>
+     * @return The entityId.
      */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getVehicleRotOrBuilder();
+    int getEntityId();
   }
   /**
    * <pre>
-   * CmdId: 27433
+   * CmdId: 21684
    * </pre>
    *
    * Protobuf type {@code VehicleInteractRsp}
@@ -148,67 +208,67 @@ private VehicleInteractRsp(
             case 0:
               done = true;
               break;
-            case 26: {
-              emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember.Builder subBuilder = null;
-              if (member_ != null) {
-                subBuilder = member_.toBuilder();
-              }
-              member_ = input.readMessage(emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(member_);
-                member_ = subBuilder.buildPartial();
-              }
+            case 8: {
 
+              entityId_ = input.readUInt32();
               break;
             }
-            case 32: {
+            case 16: {
+              int rawValue = input.readEnum();
 
-              gIICKAOFKDB_ = input.readUInt32();
+              interactType_ = rawValue;
               break;
             }
-            case 40: {
+            case 32: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 56: {
+            case 58: {
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
+              if (vehicleRot_ != null) {
+                subBuilder = vehicleRot_.toBuilder();
+              }
+              vehicleRot_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(vehicleRot_);
+                vehicleRot_ = subBuilder.buildPartial();
+              }
 
-              gadgetId_ = input.readUInt32();
               break;
             }
             case 64: {
 
-              entityId_ = input.readUInt32();
+              jLKDLPCMPAN_ = input.readUInt32();
               break;
             }
-            case 82: {
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
-              if (vehiclePos_ != null) {
-                subBuilder = vehiclePos_.toBuilder();
+            case 98: {
+              emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember.Builder subBuilder = null;
+              if (member_ != null) {
+                subBuilder = member_.toBuilder();
               }
-              vehiclePos_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
+              member_ = input.readMessage(emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom(vehiclePos_);
-                vehiclePos_ = subBuilder.buildPartial();
+                subBuilder.mergeFrom(member_);
+                member_ = subBuilder.buildPartial();
               }
 
               break;
             }
-            case 88: {
-              int rawValue = input.readEnum();
+            case 104: {
 
-              interactType_ = rawValue;
+              gadgetId_ = input.readUInt32();
               break;
             }
             case 122: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
-              if (vehicleRot_ != null) {
-                subBuilder = vehicleRot_.toBuilder();
+              if (vehiclePos_ != null) {
+                subBuilder = vehiclePos_.toBuilder();
               }
-              vehicleRot_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
+              vehiclePos_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom(vehicleRot_);
-                vehicleRot_ = subBuilder.buildPartial();
+                subBuilder.mergeFrom(vehiclePos_);
+                vehiclePos_ = subBuilder.buildPartial();
               }
 
               break;
@@ -245,10 +305,14 @@ private VehicleInteractRsp(
               emu.grasscutter.net.proto.VehicleInteractRspOuterClass.VehicleInteractRsp.class, emu.grasscutter.net.proto.VehicleInteractRspOuterClass.VehicleInteractRsp.Builder.class);
     }
 
-    public static final int MEMBER_FIELD_NUMBER = 3;
+    public static final int MEMBER_FIELD_NUMBER = 12;
     private emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember member_;
     /**
-     * <code>.VehicleMember member = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.VehicleMember member = 12;</code>
      * @return Whether the member field is set.
      */
     @java.lang.Override
@@ -256,7 +320,11 @@ public boolean hasMember() {
       return member_ != null;
     }
     /**
-     * <code>.VehicleMember member = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.VehicleMember member = 12;</code>
      * @return The member.
      */
     @java.lang.Override
@@ -264,94 +332,142 @@ public emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember getMember
       return member_ == null ? emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember.getDefaultInstance() : member_;
     }
     /**
-     * <code>.VehicleMember member = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>.VehicleMember member = 12;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMemberOrBuilder getMemberOrBuilder() {
       return getMember();
     }
 
-    public static final int GIICKAOFKDB_FIELD_NUMBER = 4;
-    private int gIICKAOFKDB_;
+    public static final int VEHICLE_POS_FIELD_NUMBER = 15;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector vehiclePos_;
     /**
-     * <code>uint32 GIICKAOFKDB = 4;</code>
-     * @return The gIICKAOFKDB.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.Vector vehicle_pos = 15;</code>
+     * @return Whether the vehiclePos field is set.
      */
     @java.lang.Override
-    public int getGIICKAOFKDB() {
-      return gIICKAOFKDB_;
+    public boolean hasVehiclePos() {
+      return vehiclePos_ != null;
     }
-
-    public static final int RETCODE_FIELD_NUMBER = 5;
-    private int retcode_;
     /**
-     * <code>int32 retcode = 5;</code>
-     * @return The retcode.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.Vector vehicle_pos = 15;</code>
+     * @return The vehiclePos.
      */
     @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getVehiclePos() {
+      return vehiclePos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : vehiclePos_;
     }
-
-    public static final int GADGET_ID_FIELD_NUMBER = 7;
-    private int gadgetId_;
     /**
-     * <code>uint32 gadget_id = 7;</code>
-     * @return The gadgetId.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>.Vector vehicle_pos = 15;</code>
      */
     @java.lang.Override
-    public int getGadgetId() {
-      return gadgetId_;
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getVehiclePosOrBuilder() {
+      return getVehiclePos();
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 8;
-    private int entityId_;
+    public static final int VEHICLE_ROT_FIELD_NUMBER = 7;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector vehicleRot_;
     /**
-     * <code>uint32 entity_id = 8;</code>
-     * @return The entityId.
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>.Vector vehicle_rot = 7;</code>
+     * @return Whether the vehicleRot field is set.
      */
     @java.lang.Override
-    public int getEntityId() {
-      return entityId_;
+    public boolean hasVehicleRot() {
+      return vehicleRot_ != null;
     }
-
-    public static final int VEHICLE_POS_FIELD_NUMBER = 10;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector vehiclePos_;
     /**
-     * <code>.Vector vehicle_pos = 10;</code>
-     * @return Whether the vehiclePos field is set.
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>.Vector vehicle_rot = 7;</code>
+     * @return The vehicleRot.
      */
     @java.lang.Override
-    public boolean hasVehiclePos() {
-      return vehiclePos_ != null;
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getVehicleRot() {
+      return vehicleRot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : vehicleRot_;
     }
     /**
-     * <code>.Vector vehicle_pos = 10;</code>
-     * @return The vehiclePos.
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>.Vector vehicle_rot = 7;</code>
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getVehiclePos() {
-      return vehiclePos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : vehiclePos_;
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getVehicleRotOrBuilder() {
+      return getVehicleRot();
+    }
+
+    public static final int JLKDLPCMPAN_FIELD_NUMBER = 8;
+    private int jLKDLPCMPAN_;
+    /**
+     * <pre>
+     * Offset: 0x38
+     * </pre>
+     *
+     * <code>uint32 JLKDLPCMPAN = 8;</code>
+     * @return The jLKDLPCMPAN.
+     */
+    @java.lang.Override
+    public int getJLKDLPCMPAN() {
+      return jLKDLPCMPAN_;
     }
+
+    public static final int GADGET_ID_FIELD_NUMBER = 13;
+    private int gadgetId_;
     /**
-     * <code>.Vector vehicle_pos = 10;</code>
+     * <pre>
+     * Offset: 0x3C
+     * </pre>
+     *
+     * <code>uint32 gadget_id = 13;</code>
+     * @return The gadgetId.
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getVehiclePosOrBuilder() {
-      return getVehiclePos();
+    public int getGadgetId() {
+      return gadgetId_;
     }
 
-    public static final int INTERACT_TYPE_FIELD_NUMBER = 11;
+    public static final int INTERACT_TYPE_FIELD_NUMBER = 2;
     private int interactType_;
     /**
-     * <code>.VehicleInteractType interact_type = 11;</code>
+     * <pre>
+     * Offset: 0x40
+     * </pre>
+     *
+     * <code>.VehicleInteractType interact_type = 2;</code>
      * @return The enum numeric value on the wire for interactType.
      */
     @java.lang.Override public int getInteractTypeValue() {
       return interactType_;
     }
     /**
-     * <code>.VehicleInteractType interact_type = 11;</code>
+     * <pre>
+     * Offset: 0x40
+     * </pre>
+     *
+     * <code>.VehicleInteractType interact_type = 2;</code>
      * @return The interactType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType getInteractType() {
@@ -360,30 +476,34 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getVehiclePosO
       return result == null ? emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType.UNRECOGNIZED : result;
     }
 
-    public static final int VEHICLE_ROT_FIELD_NUMBER = 15;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector vehicleRot_;
-    /**
-     * <code>.Vector vehicle_rot = 15;</code>
-     * @return Whether the vehicleRot field is set.
-     */
-    @java.lang.Override
-    public boolean hasVehicleRot() {
-      return vehicleRot_ != null;
-    }
+    public static final int RETCODE_FIELD_NUMBER = 4;
+    private int retcode_;
     /**
-     * <code>.Vector vehicle_rot = 15;</code>
-     * @return The vehicleRot.
+     * <pre>
+     * Offset: 0x48
+     * </pre>
+     *
+     * <code>int32 retcode = 4;</code>
+     * @return The retcode.
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getVehicleRot() {
-      return vehicleRot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : vehicleRot_;
+    public int getRetcode() {
+      return retcode_;
     }
+
+    public static final int ENTITY_ID_FIELD_NUMBER = 1;
+    private int entityId_;
     /**
-     * <code>.Vector vehicle_rot = 15;</code>
+     * <pre>
+     * Offset: 0x4C
+     * </pre>
+     *
+     * <code>uint32 entity_id = 1;</code>
+     * @return The entityId.
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getVehicleRotOrBuilder() {
-      return getVehicleRot();
+    public int getEntityId() {
+      return entityId_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -400,29 +520,29 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (member_ != null) {
-        output.writeMessage(3, getMember());
+      if (entityId_ != 0) {
+        output.writeUInt32(1, entityId_);
       }
-      if (gIICKAOFKDB_ != 0) {
-        output.writeUInt32(4, gIICKAOFKDB_);
+      if (interactType_ != emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType.VEHICLE_INTERACT_TYPE_NONE.getNumber()) {
+        output.writeEnum(2, interactType_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(5, retcode_);
+        output.writeInt32(4, retcode_);
       }
-      if (gadgetId_ != 0) {
-        output.writeUInt32(7, gadgetId_);
+      if (vehicleRot_ != null) {
+        output.writeMessage(7, getVehicleRot());
       }
-      if (entityId_ != 0) {
-        output.writeUInt32(8, entityId_);
+      if (jLKDLPCMPAN_ != 0) {
+        output.writeUInt32(8, jLKDLPCMPAN_);
       }
-      if (vehiclePos_ != null) {
-        output.writeMessage(10, getVehiclePos());
+      if (member_ != null) {
+        output.writeMessage(12, getMember());
       }
-      if (interactType_ != emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType.VEHICLE_INTERACT_TYPE_NONE.getNumber()) {
-        output.writeEnum(11, interactType_);
+      if (gadgetId_ != 0) {
+        output.writeUInt32(13, gadgetId_);
       }
-      if (vehicleRot_ != null) {
-        output.writeMessage(15, getVehicleRot());
+      if (vehiclePos_ != null) {
+        output.writeMessage(15, getVehiclePos());
       }
       unknownFields.writeTo(output);
     }
@@ -433,37 +553,37 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (member_ != null) {
+      if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, getMember());
+          .computeUInt32Size(1, entityId_);
       }
-      if (gIICKAOFKDB_ != 0) {
+      if (interactType_ != emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType.VEHICLE_INTERACT_TYPE_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, gIICKAOFKDB_);
+          .computeEnumSize(2, interactType_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(5, retcode_);
+          .computeInt32Size(4, retcode_);
       }
-      if (gadgetId_ != 0) {
+      if (vehicleRot_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, gadgetId_);
+          .computeMessageSize(7, getVehicleRot());
       }
-      if (entityId_ != 0) {
+      if (jLKDLPCMPAN_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, entityId_);
+          .computeUInt32Size(8, jLKDLPCMPAN_);
       }
-      if (vehiclePos_ != null) {
+      if (member_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(10, getVehiclePos());
+          .computeMessageSize(12, getMember());
       }
-      if (interactType_ != emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType.VEHICLE_INTERACT_TYPE_NONE.getNumber()) {
+      if (gadgetId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(11, interactType_);
+          .computeUInt32Size(13, gadgetId_);
       }
-      if (vehicleRot_ != null) {
+      if (vehiclePos_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(15, getVehicleRot());
+          .computeMessageSize(15, getVehiclePos());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -485,25 +605,25 @@ public boolean equals(final java.lang.Object obj) {
         if (!getMember()
             .equals(other.getMember())) return false;
       }
-      if (getGIICKAOFKDB()
-          != other.getGIICKAOFKDB()) return false;
-      if (getRetcode()
-          != other.getRetcode()) return false;
-      if (getGadgetId()
-          != other.getGadgetId()) return false;
-      if (getEntityId()
-          != other.getEntityId()) return false;
       if (hasVehiclePos() != other.hasVehiclePos()) return false;
       if (hasVehiclePos()) {
         if (!getVehiclePos()
             .equals(other.getVehiclePos())) return false;
       }
-      if (interactType_ != other.interactType_) return false;
       if (hasVehicleRot() != other.hasVehicleRot()) return false;
       if (hasVehicleRot()) {
         if (!getVehicleRot()
             .equals(other.getVehicleRot())) return false;
       }
+      if (getJLKDLPCMPAN()
+          != other.getJLKDLPCMPAN()) return false;
+      if (getGadgetId()
+          != other.getGadgetId()) return false;
+      if (interactType_ != other.interactType_) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
+      if (getEntityId()
+          != other.getEntityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -519,24 +639,24 @@ public int hashCode() {
         hash = (37 * hash) + MEMBER_FIELD_NUMBER;
         hash = (53 * hash) + getMember().hashCode();
       }
-      hash = (37 * hash) + GIICKAOFKDB_FIELD_NUMBER;
-      hash = (53 * hash) + getGIICKAOFKDB();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
-      hash = (37 * hash) + GADGET_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getGadgetId();
-      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getEntityId();
       if (hasVehiclePos()) {
         hash = (37 * hash) + VEHICLE_POS_FIELD_NUMBER;
         hash = (53 * hash) + getVehiclePos().hashCode();
       }
-      hash = (37 * hash) + INTERACT_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + interactType_;
       if (hasVehicleRot()) {
         hash = (37 * hash) + VEHICLE_ROT_FIELD_NUMBER;
         hash = (53 * hash) + getVehicleRot().hashCode();
       }
+      hash = (37 * hash) + JLKDLPCMPAN_FIELD_NUMBER;
+      hash = (53 * hash) + getJLKDLPCMPAN();
+      hash = (37 * hash) + GADGET_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getGadgetId();
+      hash = (37 * hash) + INTERACT_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + interactType_;
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getEntityId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -634,7 +754,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 27433
+     * CmdId: 21684
      * </pre>
      *
      * Protobuf type {@code VehicleInteractRsp}
@@ -680,28 +800,28 @@ public Builder clear() {
           member_ = null;
           memberBuilder_ = null;
         }
-        gIICKAOFKDB_ = 0;
-
-        retcode_ = 0;
-
-        gadgetId_ = 0;
-
-        entityId_ = 0;
-
         if (vehiclePosBuilder_ == null) {
           vehiclePos_ = null;
         } else {
           vehiclePos_ = null;
           vehiclePosBuilder_ = null;
         }
-        interactType_ = 0;
-
         if (vehicleRotBuilder_ == null) {
           vehicleRot_ = null;
         } else {
           vehicleRot_ = null;
           vehicleRotBuilder_ = null;
         }
+        jLKDLPCMPAN_ = 0;
+
+        gadgetId_ = 0;
+
+        interactType_ = 0;
+
+        retcode_ = 0;
+
+        entityId_ = 0;
+
         return this;
       }
 
@@ -733,21 +853,21 @@ public emu.grasscutter.net.proto.VehicleInteractRspOuterClass.VehicleInteractRsp
         } else {
           result.member_ = memberBuilder_.build();
         }
-        result.gIICKAOFKDB_ = gIICKAOFKDB_;
-        result.retcode_ = retcode_;
-        result.gadgetId_ = gadgetId_;
-        result.entityId_ = entityId_;
         if (vehiclePosBuilder_ == null) {
           result.vehiclePos_ = vehiclePos_;
         } else {
           result.vehiclePos_ = vehiclePosBuilder_.build();
         }
-        result.interactType_ = interactType_;
         if (vehicleRotBuilder_ == null) {
           result.vehicleRot_ = vehicleRot_;
         } else {
           result.vehicleRot_ = vehicleRotBuilder_.build();
         }
+        result.jLKDLPCMPAN_ = jLKDLPCMPAN_;
+        result.gadgetId_ = gadgetId_;
+        result.interactType_ = interactType_;
+        result.retcode_ = retcode_;
+        result.entityId_ = entityId_;
         onBuilt();
         return result;
       }
@@ -799,26 +919,26 @@ public Builder mergeFrom(emu.grasscutter.net.proto.VehicleInteractRspOuterClass.
         if (other.hasMember()) {
           mergeMember(other.getMember());
         }
-        if (other.getGIICKAOFKDB() != 0) {
-          setGIICKAOFKDB(other.getGIICKAOFKDB());
+        if (other.hasVehiclePos()) {
+          mergeVehiclePos(other.getVehiclePos());
         }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
+        if (other.hasVehicleRot()) {
+          mergeVehicleRot(other.getVehicleRot());
+        }
+        if (other.getJLKDLPCMPAN() != 0) {
+          setJLKDLPCMPAN(other.getJLKDLPCMPAN());
         }
         if (other.getGadgetId() != 0) {
           setGadgetId(other.getGadgetId());
         }
-        if (other.getEntityId() != 0) {
-          setEntityId(other.getEntityId());
-        }
-        if (other.hasVehiclePos()) {
-          mergeVehiclePos(other.getVehiclePos());
-        }
         if (other.interactType_ != 0) {
           setInteractTypeValue(other.getInteractTypeValue());
         }
-        if (other.hasVehicleRot()) {
-          mergeVehicleRot(other.getVehicleRot());
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
+        if (other.getEntityId() != 0) {
+          setEntityId(other.getEntityId());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -853,14 +973,22 @@ public Builder mergeFrom(
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember, emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember.Builder, emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMemberOrBuilder> memberBuilder_;
       /**
-       * <code>.VehicleMember member = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.VehicleMember member = 12;</code>
        * @return Whether the member field is set.
        */
       public boolean hasMember() {
         return memberBuilder_ != null || member_ != null;
       }
       /**
-       * <code>.VehicleMember member = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.VehicleMember member = 12;</code>
        * @return The member.
        */
       public emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember getMember() {
@@ -871,7 +999,11 @@ public emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember getMember
         }
       }
       /**
-       * <code>.VehicleMember member = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.VehicleMember member = 12;</code>
        */
       public Builder setMember(emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember value) {
         if (memberBuilder_ == null) {
@@ -887,7 +1019,11 @@ public Builder setMember(emu.grasscutter.net.proto.VehicleMemberOuterClass.Vehic
         return this;
       }
       /**
-       * <code>.VehicleMember member = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.VehicleMember member = 12;</code>
        */
       public Builder setMember(
           emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember.Builder builderForValue) {
@@ -901,7 +1037,11 @@ public Builder setMember(
         return this;
       }
       /**
-       * <code>.VehicleMember member = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.VehicleMember member = 12;</code>
        */
       public Builder mergeMember(emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember value) {
         if (memberBuilder_ == null) {
@@ -919,7 +1059,11 @@ public Builder mergeMember(emu.grasscutter.net.proto.VehicleMemberOuterClass.Veh
         return this;
       }
       /**
-       * <code>.VehicleMember member = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.VehicleMember member = 12;</code>
        */
       public Builder clearMember() {
         if (memberBuilder_ == null) {
@@ -933,7 +1077,11 @@ public Builder clearMember() {
         return this;
       }
       /**
-       * <code>.VehicleMember member = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.VehicleMember member = 12;</code>
        */
       public emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember.Builder getMemberBuilder() {
         
@@ -941,7 +1089,11 @@ public emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember.Builder g
         return getMemberFieldBuilder().getBuilder();
       }
       /**
-       * <code>.VehicleMember member = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.VehicleMember member = 12;</code>
        */
       public emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMemberOrBuilder getMemberOrBuilder() {
         if (memberBuilder_ != null) {
@@ -952,7 +1104,11 @@ public emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMemberOrBuilder
         }
       }
       /**
-       * <code>.VehicleMember member = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>.VehicleMember member = 12;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember, emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember.Builder, emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMemberOrBuilder> 
@@ -968,142 +1124,26 @@ public emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMemberOrBuilder
         return memberBuilder_;
       }
 
-      private int gIICKAOFKDB_ ;
-      /**
-       * <code>uint32 GIICKAOFKDB = 4;</code>
-       * @return The gIICKAOFKDB.
-       */
-      @java.lang.Override
-      public int getGIICKAOFKDB() {
-        return gIICKAOFKDB_;
-      }
-      /**
-       * <code>uint32 GIICKAOFKDB = 4;</code>
-       * @param value The gIICKAOFKDB to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGIICKAOFKDB(int value) {
-        
-        gIICKAOFKDB_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 GIICKAOFKDB = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGIICKAOFKDB() {
-        
-        gIICKAOFKDB_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 5;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <code>int32 retcode = 5;</code>
-       * @param value The retcode to set.
-       * @return This builder for chaining.
-       */
-      public Builder setRetcode(int value) {
-        
-        retcode_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>int32 retcode = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int gadgetId_ ;
-      /**
-       * <code>uint32 gadget_id = 7;</code>
-       * @return The gadgetId.
-       */
-      @java.lang.Override
-      public int getGadgetId() {
-        return gadgetId_;
-      }
-      /**
-       * <code>uint32 gadget_id = 7;</code>
-       * @param value The gadgetId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGadgetId(int value) {
-        
-        gadgetId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 gadget_id = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGadgetId() {
-        
-        gadgetId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int entityId_ ;
-      /**
-       * <code>uint32 entity_id = 8;</code>
-       * @return The entityId.
-       */
-      @java.lang.Override
-      public int getEntityId() {
-        return entityId_;
-      }
-      /**
-       * <code>uint32 entity_id = 8;</code>
-       * @param value The entityId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEntityId(int value) {
-        
-        entityId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 entity_id = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEntityId() {
-        
-        entityId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.VectorOuterClass.Vector vehiclePos_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> vehiclePosBuilder_;
       /**
-       * <code>.Vector vehicle_pos = 10;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.Vector vehicle_pos = 15;</code>
        * @return Whether the vehiclePos field is set.
        */
       public boolean hasVehiclePos() {
         return vehiclePosBuilder_ != null || vehiclePos_ != null;
       }
       /**
-       * <code>.Vector vehicle_pos = 10;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.Vector vehicle_pos = 15;</code>
        * @return The vehiclePos.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getVehiclePos() {
@@ -1114,7 +1154,11 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getVehiclePos() {
         }
       }
       /**
-       * <code>.Vector vehicle_pos = 10;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.Vector vehicle_pos = 15;</code>
        */
       public Builder setVehiclePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (vehiclePosBuilder_ == null) {
@@ -1130,7 +1174,11 @@ public Builder setVehiclePos(emu.grasscutter.net.proto.VectorOuterClass.Vector v
         return this;
       }
       /**
-       * <code>.Vector vehicle_pos = 10;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.Vector vehicle_pos = 15;</code>
        */
       public Builder setVehiclePos(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -1144,7 +1192,11 @@ public Builder setVehiclePos(
         return this;
       }
       /**
-       * <code>.Vector vehicle_pos = 10;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.Vector vehicle_pos = 15;</code>
        */
       public Builder mergeVehiclePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (vehiclePosBuilder_ == null) {
@@ -1162,7 +1214,11 @@ public Builder mergeVehiclePos(emu.grasscutter.net.proto.VectorOuterClass.Vector
         return this;
       }
       /**
-       * <code>.Vector vehicle_pos = 10;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.Vector vehicle_pos = 15;</code>
        */
       public Builder clearVehiclePos() {
         if (vehiclePosBuilder_ == null) {
@@ -1176,7 +1232,11 @@ public Builder clearVehiclePos() {
         return this;
       }
       /**
-       * <code>.Vector vehicle_pos = 10;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.Vector vehicle_pos = 15;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getVehiclePosBuilder() {
         
@@ -1184,7 +1244,11 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getVehiclePosBu
         return getVehiclePosFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector vehicle_pos = 10;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.Vector vehicle_pos = 15;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getVehiclePosOrBuilder() {
         if (vehiclePosBuilder_ != null) {
@@ -1195,7 +1259,11 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getVehiclePosO
         }
       }
       /**
-       * <code>.Vector vehicle_pos = 10;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>.Vector vehicle_pos = 15;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
@@ -1211,72 +1279,26 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getVehiclePosO
         return vehiclePosBuilder_;
       }
 
-      private int interactType_ = 0;
-      /**
-       * <code>.VehicleInteractType interact_type = 11;</code>
-       * @return The enum numeric value on the wire for interactType.
-       */
-      @java.lang.Override public int getInteractTypeValue() {
-        return interactType_;
-      }
-      /**
-       * <code>.VehicleInteractType interact_type = 11;</code>
-       * @param value The enum numeric value on the wire for interactType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setInteractTypeValue(int value) {
-        
-        interactType_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.VehicleInteractType interact_type = 11;</code>
-       * @return The interactType.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType getInteractType() {
-        @SuppressWarnings("deprecation")
-        emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType result = emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType.valueOf(interactType_);
-        return result == null ? emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType.UNRECOGNIZED : result;
-      }
-      /**
-       * <code>.VehicleInteractType interact_type = 11;</code>
-       * @param value The interactType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setInteractType(emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        
-        interactType_ = value.getNumber();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.VehicleInteractType interact_type = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearInteractType() {
-        
-        interactType_ = 0;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.VectorOuterClass.Vector vehicleRot_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> vehicleRotBuilder_;
       /**
-       * <code>.Vector vehicle_rot = 15;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>.Vector vehicle_rot = 7;</code>
        * @return Whether the vehicleRot field is set.
        */
       public boolean hasVehicleRot() {
         return vehicleRotBuilder_ != null || vehicleRot_ != null;
       }
       /**
-       * <code>.Vector vehicle_rot = 15;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>.Vector vehicle_rot = 7;</code>
        * @return The vehicleRot.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getVehicleRot() {
@@ -1287,7 +1309,11 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector getVehicleRot() {
         }
       }
       /**
-       * <code>.Vector vehicle_rot = 15;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>.Vector vehicle_rot = 7;</code>
        */
       public Builder setVehicleRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (vehicleRotBuilder_ == null) {
@@ -1303,7 +1329,11 @@ public Builder setVehicleRot(emu.grasscutter.net.proto.VectorOuterClass.Vector v
         return this;
       }
       /**
-       * <code>.Vector vehicle_rot = 15;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>.Vector vehicle_rot = 7;</code>
        */
       public Builder setVehicleRot(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -1317,7 +1347,11 @@ public Builder setVehicleRot(
         return this;
       }
       /**
-       * <code>.Vector vehicle_rot = 15;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>.Vector vehicle_rot = 7;</code>
        */
       public Builder mergeVehicleRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (vehicleRotBuilder_ == null) {
@@ -1335,7 +1369,11 @@ public Builder mergeVehicleRot(emu.grasscutter.net.proto.VectorOuterClass.Vector
         return this;
       }
       /**
-       * <code>.Vector vehicle_rot = 15;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>.Vector vehicle_rot = 7;</code>
        */
       public Builder clearVehicleRot() {
         if (vehicleRotBuilder_ == null) {
@@ -1349,7 +1387,11 @@ public Builder clearVehicleRot() {
         return this;
       }
       /**
-       * <code>.Vector vehicle_rot = 15;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>.Vector vehicle_rot = 7;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getVehicleRotBuilder() {
         
@@ -1357,7 +1399,11 @@ public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getVehicleRotBu
         return getVehicleRotFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector vehicle_rot = 15;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>.Vector vehicle_rot = 7;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getVehicleRotOrBuilder() {
         if (vehicleRotBuilder_ != null) {
@@ -1368,7 +1414,11 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getVehicleRotO
         }
       }
       /**
-       * <code>.Vector vehicle_rot = 15;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>.Vector vehicle_rot = 7;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
@@ -1383,6 +1433,252 @@ public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getVehicleRotO
         }
         return vehicleRotBuilder_;
       }
+
+      private int jLKDLPCMPAN_ ;
+      /**
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>uint32 JLKDLPCMPAN = 8;</code>
+       * @return The jLKDLPCMPAN.
+       */
+      @java.lang.Override
+      public int getJLKDLPCMPAN() {
+        return jLKDLPCMPAN_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>uint32 JLKDLPCMPAN = 8;</code>
+       * @param value The jLKDLPCMPAN to set.
+       * @return This builder for chaining.
+       */
+      public Builder setJLKDLPCMPAN(int value) {
+        
+        jLKDLPCMPAN_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x38
+       * </pre>
+       *
+       * <code>uint32 JLKDLPCMPAN = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearJLKDLPCMPAN() {
+        
+        jLKDLPCMPAN_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int gadgetId_ ;
+      /**
+       * <pre>
+       * Offset: 0x3C
+       * </pre>
+       *
+       * <code>uint32 gadget_id = 13;</code>
+       * @return The gadgetId.
+       */
+      @java.lang.Override
+      public int getGadgetId() {
+        return gadgetId_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x3C
+       * </pre>
+       *
+       * <code>uint32 gadget_id = 13;</code>
+       * @param value The gadgetId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGadgetId(int value) {
+        
+        gadgetId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x3C
+       * </pre>
+       *
+       * <code>uint32 gadget_id = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGadgetId() {
+        
+        gadgetId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int interactType_ = 0;
+      /**
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>.VehicleInteractType interact_type = 2;</code>
+       * @return The enum numeric value on the wire for interactType.
+       */
+      @java.lang.Override public int getInteractTypeValue() {
+        return interactType_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>.VehicleInteractType interact_type = 2;</code>
+       * @param value The enum numeric value on the wire for interactType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setInteractTypeValue(int value) {
+        
+        interactType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>.VehicleInteractType interact_type = 2;</code>
+       * @return The interactType.
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType getInteractType() {
+        @SuppressWarnings("deprecation")
+        emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType result = emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType.valueOf(interactType_);
+        return result == null ? emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType.UNRECOGNIZED : result;
+      }
+      /**
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>.VehicleInteractType interact_type = 2;</code>
+       * @param value The interactType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setInteractType(emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        
+        interactType_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x40
+       * </pre>
+       *
+       * <code>.VehicleInteractType interact_type = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearInteractType() {
+        
+        interactType_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int retcode_ ;
+      /**
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>int32 retcode = 4;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>int32 retcode = 4;</code>
+       * @param value The retcode to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRetcode(int value) {
+        
+        retcode_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x48
+       * </pre>
+       *
+       * <code>int32 retcode = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRetcode() {
+        
+        retcode_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int entityId_ ;
+      /**
+       * <pre>
+       * Offset: 0x4C
+       * </pre>
+       *
+       * <code>uint32 entity_id = 1;</code>
+       * @return The entityId.
+       */
+      @java.lang.Override
+      public int getEntityId() {
+        return entityId_;
+      }
+      /**
+       * <pre>
+       * Offset: 0x4C
+       * </pre>
+       *
+       * <code>uint32 entity_id = 1;</code>
+       * @param value The entityId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setEntityId(int value) {
+        
+        entityId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * Offset: 0x4C
+       * </pre>
+       *
+       * <code>uint32 entity_id = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEntityId() {
+        
+        entityId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1453,12 +1749,12 @@ public emu.grasscutter.net.proto.VehicleInteractRspOuterClass.VehicleInteractRsp
       "\n\030VehicleInteractRsp.proto\032\023VehicleMembe" +
       "r.proto\032\014Vector.proto\032\031VehicleInteractTy" +
       "pe.proto\"\351\001\n\022VehicleInteractRsp\022\036\n\006membe" +
-      "r\030\003 \001(\0132\016.VehicleMember\022\023\n\013GIICKAOFKDB\030\004" +
-      " \001(\r\022\017\n\007retcode\030\005 \001(\005\022\021\n\tgadget_id\030\007 \001(\r" +
-      "\022\021\n\tentity_id\030\010 \001(\r\022\034\n\013vehicle_pos\030\n \001(\013" +
-      "2\007.Vector\022+\n\rinteract_type\030\013 \001(\0162\024.Vehic" +
-      "leInteractType\022\034\n\013vehicle_rot\030\017 \001(\0132\007.Ve" +
-      "ctorB\033\n\031emu.grasscutter.net.protob\006proto" +
+      "r\030\014 \001(\0132\016.VehicleMember\022\034\n\013vehicle_pos\030\017" +
+      " \001(\0132\007.Vector\022\034\n\013vehicle_rot\030\007 \001(\0132\007.Vec" +
+      "tor\022\023\n\013JLKDLPCMPAN\030\010 \001(\r\022\021\n\tgadget_id\030\r " +
+      "\001(\r\022+\n\rinteract_type\030\002 \001(\0162\024.VehicleInte" +
+      "ractType\022\017\n\007retcode\030\004 \001(\005\022\021\n\tentity_id\030\001" +
+      " \001(\rB\033\n\031emu.grasscutter.net.protob\006proto" +
       "3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1473,7 +1769,7 @@ public emu.grasscutter.net.proto.VehicleInteractRspOuterClass.VehicleInteractRsp
     internal_static_VehicleInteractRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_VehicleInteractRsp_descriptor,
-        new java.lang.String[] { "Member", "GIICKAOFKDB", "Retcode", "GadgetId", "EntityId", "VehiclePos", "InteractType", "VehicleRot", });
+        new java.lang.String[] { "Member", "VehiclePos", "VehicleRot", "JLKDLPCMPAN", "GadgetId", "InteractType", "Retcode", "EntityId", });
     emu.grasscutter.net.proto.VehicleMemberOuterClass.getDescriptor();
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
     emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.getDescriptor();
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/VehicleMemberOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/VehicleMemberOuterClass.java
index 90b4a093f33..33331ec6040 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/VehicleMemberOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/VehicleMemberOuterClass.java
@@ -19,22 +19,34 @@ public interface VehicleMemberOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
      * <code>uint32 uid = 1;</code>
      * @return The uid.
      */
     int getUid();
 
     /**
-     * <code>uint64 avatar_guid = 2;</code>
-     * @return The avatarGuid.
-     */
-    long getAvatarGuid();
-
-    /**
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
      * <code>uint32 pos = 3;</code>
      * @return The pos.
      */
     int getPos();
+
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint64 avatar_guid = 2;</code>
+     * @return The avatarGuid.
+     */
+    long getAvatarGuid();
   }
   /**
    * Protobuf type {@code VehicleMember}
@@ -131,6 +143,10 @@ private VehicleMember(
     public static final int UID_FIELD_NUMBER = 1;
     private int uid_;
     /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
      * <code>uint32 uid = 1;</code>
      * @return The uid.
      */
@@ -139,20 +155,13 @@ public int getUid() {
       return uid_;
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 2;
-    private long avatarGuid_;
-    /**
-     * <code>uint64 avatar_guid = 2;</code>
-     * @return The avatarGuid.
-     */
-    @java.lang.Override
-    public long getAvatarGuid() {
-      return avatarGuid_;
-    }
-
     public static final int POS_FIELD_NUMBER = 3;
     private int pos_;
     /**
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
      * <code>uint32 pos = 3;</code>
      * @return The pos.
      */
@@ -161,6 +170,21 @@ public int getPos() {
       return pos_;
     }
 
+    public static final int AVATAR_GUID_FIELD_NUMBER = 2;
+    private long avatarGuid_;
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint64 avatar_guid = 2;</code>
+     * @return The avatarGuid.
+     */
+    @java.lang.Override
+    public long getAvatarGuid() {
+      return avatarGuid_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -222,10 +246,10 @@ public boolean equals(final java.lang.Object obj) {
 
       if (getUid()
           != other.getUid()) return false;
-      if (getAvatarGuid()
-          != other.getAvatarGuid()) return false;
       if (getPos()
           != other.getPos()) return false;
+      if (getAvatarGuid()
+          != other.getAvatarGuid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -239,11 +263,11 @@ public int hashCode() {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + UID_FIELD_NUMBER;
       hash = (53 * hash) + getUid();
+      hash = (37 * hash) + POS_FIELD_NUMBER;
+      hash = (53 * hash) + getPos();
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getAvatarGuid());
-      hash = (37 * hash) + POS_FIELD_NUMBER;
-      hash = (53 * hash) + getPos();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -379,10 +403,10 @@ public Builder clear() {
         super.clear();
         uid_ = 0;
 
-        avatarGuid_ = 0L;
-
         pos_ = 0;
 
+        avatarGuid_ = 0L;
+
         return this;
       }
 
@@ -410,8 +434,8 @@ public emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember build() {
       public emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember buildPartial() {
         emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember result = new emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember(this);
         result.uid_ = uid_;
-        result.avatarGuid_ = avatarGuid_;
         result.pos_ = pos_;
+        result.avatarGuid_ = avatarGuid_;
         onBuilt();
         return result;
       }
@@ -463,12 +487,12 @@ public Builder mergeFrom(emu.grasscutter.net.proto.VehicleMemberOuterClass.Vehic
         if (other.getUid() != 0) {
           setUid(other.getUid());
         }
-        if (other.getAvatarGuid() != 0L) {
-          setAvatarGuid(other.getAvatarGuid());
-        }
         if (other.getPos() != 0) {
           setPos(other.getPos());
         }
+        if (other.getAvatarGuid() != 0L) {
+          setAvatarGuid(other.getAvatarGuid());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -500,6 +524,10 @@ public Builder mergeFrom(
 
       private int uid_ ;
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>uint32 uid = 1;</code>
        * @return The uid.
        */
@@ -508,6 +536,10 @@ public int getUid() {
         return uid_;
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>uint32 uid = 1;</code>
        * @param value The uid to set.
        * @return This builder for chaining.
@@ -519,6 +551,10 @@ public Builder setUid(int value) {
         return this;
       }
       /**
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
        * <code>uint32 uid = 1;</code>
        * @return This builder for chaining.
        */
@@ -529,64 +565,88 @@ public Builder clearUid() {
         return this;
       }
 
-      private long avatarGuid_ ;
+      private int pos_ ;
       /**
-       * <code>uint64 avatar_guid = 2;</code>
-       * @return The avatarGuid.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 pos = 3;</code>
+       * @return The pos.
        */
       @java.lang.Override
-      public long getAvatarGuid() {
-        return avatarGuid_;
+      public int getPos() {
+        return pos_;
       }
       /**
-       * <code>uint64 avatar_guid = 2;</code>
-       * @param value The avatarGuid to set.
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 pos = 3;</code>
+       * @param value The pos to set.
        * @return This builder for chaining.
        */
-      public Builder setAvatarGuid(long value) {
+      public Builder setPos(int value) {
         
-        avatarGuid_ = value;
+        pos_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 2;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>uint32 pos = 3;</code>
        * @return This builder for chaining.
        */
-      public Builder clearAvatarGuid() {
+      public Builder clearPos() {
         
-        avatarGuid_ = 0L;
+        pos_ = 0;
         onChanged();
         return this;
       }
 
-      private int pos_ ;
+      private long avatarGuid_ ;
       /**
-       * <code>uint32 pos = 3;</code>
-       * @return The pos.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint64 avatar_guid = 2;</code>
+       * @return The avatarGuid.
        */
       @java.lang.Override
-      public int getPos() {
-        return pos_;
+      public long getAvatarGuid() {
+        return avatarGuid_;
       }
       /**
-       * <code>uint32 pos = 3;</code>
-       * @param value The pos to set.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint64 avatar_guid = 2;</code>
+       * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
-      public Builder setPos(int value) {
+      public Builder setAvatarGuid(long value) {
         
-        pos_ = value;
+        avatarGuid_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 pos = 3;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint64 avatar_guid = 2;</code>
        * @return This builder for chaining.
        */
-      public Builder clearPos() {
+      public Builder clearAvatarGuid() {
         
-        pos_ = 0;
+        avatarGuid_ = 0L;
         onChanged();
         return this;
       }
@@ -658,8 +718,8 @@ public emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember getDefaul
   static {
     java.lang.String[] descriptorData = {
       "\n\023VehicleMember.proto\">\n\rVehicleMember\022\013" +
-      "\n\003uid\030\001 \001(\r\022\023\n\013avatar_guid\030\002 \001(\004\022\013\n\003pos\030" +
-      "\003 \001(\rB\033\n\031emu.grasscutter.net.protob\006prot" +
+      "\n\003uid\030\001 \001(\r\022\013\n\003pos\030\003 \001(\r\022\023\n\013avatar_guid\030" +
+      "\002 \001(\004B\033\n\031emu.grasscutter.net.protob\006prot" +
       "o3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -671,7 +731,7 @@ public emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember getDefaul
     internal_static_VehicleMember_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_VehicleMember_descriptor,
-        new java.lang.String[] { "Uid", "AvatarGuid", "Pos", });
+        new java.lang.String[] { "Uid", "Pos", "AvatarGuid", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/VehicleStaminaNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/VehicleStaminaNotifyOuterClass.java
index 0bbdb543a22..cc4f26e7491 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/VehicleStaminaNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/VehicleStaminaNotifyOuterClass.java
@@ -19,20 +19,28 @@ public interface VehicleStaminaNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 entity_id = 5;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 entity_id = 4;</code>
      * @return The entityId.
      */
     int getEntityId();
 
     /**
-     * <code>float cur_stamina = 6;</code>
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>float cur_stamina = 15;</code>
      * @return The curStamina.
      */
     float getCurStamina();
   }
   /**
    * <pre>
-   * CmdId: 1047
+   * CmdId: 26419
    * </pre>
    *
    * Protobuf type {@code VehicleStaminaNotify}
@@ -79,12 +87,12 @@ private VehicleStaminaNotify(
             case 0:
               done = true;
               break;
-            case 40: {
+            case 32: {
 
               entityId_ = input.readUInt32();
               break;
             }
-            case 53: {
+            case 125: {
 
               curStamina_ = input.readFloat();
               break;
@@ -121,10 +129,14 @@ private VehicleStaminaNotify(
               emu.grasscutter.net.proto.VehicleStaminaNotifyOuterClass.VehicleStaminaNotify.class, emu.grasscutter.net.proto.VehicleStaminaNotifyOuterClass.VehicleStaminaNotify.Builder.class);
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 5;
+    public static final int ENTITY_ID_FIELD_NUMBER = 4;
     private int entityId_;
     /**
-     * <code>uint32 entity_id = 5;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint32 entity_id = 4;</code>
      * @return The entityId.
      */
     @java.lang.Override
@@ -132,10 +144,14 @@ public int getEntityId() {
       return entityId_;
     }
 
-    public static final int CUR_STAMINA_FIELD_NUMBER = 6;
+    public static final int CUR_STAMINA_FIELD_NUMBER = 15;
     private float curStamina_;
     /**
-     * <code>float cur_stamina = 6;</code>
+     * <pre>
+     * Offset: 0x24
+     * </pre>
+     *
+     * <code>float cur_stamina = 15;</code>
      * @return The curStamina.
      */
     @java.lang.Override
@@ -158,10 +174,10 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (entityId_ != 0) {
-        output.writeUInt32(5, entityId_);
+        output.writeUInt32(4, entityId_);
       }
       if (curStamina_ != 0F) {
-        output.writeFloat(6, curStamina_);
+        output.writeFloat(15, curStamina_);
       }
       unknownFields.writeTo(output);
     }
@@ -174,11 +190,11 @@ public int getSerializedSize() {
       size = 0;
       if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, entityId_);
+          .computeUInt32Size(4, entityId_);
       }
       if (curStamina_ != 0F) {
         size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(6, curStamina_);
+          .computeFloatSize(15, curStamina_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -313,7 +329,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 1047
+     * CmdId: 26419
      * </pre>
      *
      * Protobuf type {@code VehicleStaminaNotify}
@@ -470,7 +486,11 @@ public Builder mergeFrom(
 
       private int entityId_ ;
       /**
-       * <code>uint32 entity_id = 5;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 entity_id = 4;</code>
        * @return The entityId.
        */
       @java.lang.Override
@@ -478,7 +498,11 @@ public int getEntityId() {
         return entityId_;
       }
       /**
-       * <code>uint32 entity_id = 5;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 entity_id = 4;</code>
        * @param value The entityId to set.
        * @return This builder for chaining.
        */
@@ -489,7 +513,11 @@ public Builder setEntityId(int value) {
         return this;
       }
       /**
-       * <code>uint32 entity_id = 5;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint32 entity_id = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearEntityId() {
@@ -501,7 +529,11 @@ public Builder clearEntityId() {
 
       private float curStamina_ ;
       /**
-       * <code>float cur_stamina = 6;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>float cur_stamina = 15;</code>
        * @return The curStamina.
        */
       @java.lang.Override
@@ -509,7 +541,11 @@ public float getCurStamina() {
         return curStamina_;
       }
       /**
-       * <code>float cur_stamina = 6;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>float cur_stamina = 15;</code>
        * @param value The curStamina to set.
        * @return This builder for chaining.
        */
@@ -520,7 +556,11 @@ public Builder setCurStamina(float value) {
         return this;
       }
       /**
-       * <code>float cur_stamina = 6;</code>
+       * <pre>
+       * Offset: 0x24
+       * </pre>
+       *
+       * <code>float cur_stamina = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearCurStamina() {
@@ -597,8 +637,8 @@ public emu.grasscutter.net.proto.VehicleStaminaNotifyOuterClass.VehicleStaminaNo
   static {
     java.lang.String[] descriptorData = {
       "\n\032VehicleStaminaNotify.proto\">\n\024VehicleS" +
-      "taminaNotify\022\021\n\tentity_id\030\005 \001(\r\022\023\n\013cur_s" +
-      "tamina\030\006 \001(\002B\033\n\031emu.grasscutter.net.prot" +
+      "taminaNotify\022\021\n\tentity_id\030\004 \001(\r\022\023\n\013cur_s" +
+      "tamina\030\017 \001(\002B\033\n\031emu.grasscutter.net.prot" +
       "ob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WearEquipReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WearEquipReqOuterClass.java
index 2dbf04b63e5..810eede4219 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WearEquipReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WearEquipReqOuterClass.java
@@ -19,20 +19,28 @@ public interface WearEquipReqOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 equip_guid = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint64 equip_guid = 14;</code>
      * @return The equipGuid.
      */
     long getEquipGuid();
 
     /**
-     * <code>uint64 avatar_guid = 6;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint64 avatar_guid = 1;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
   }
   /**
    * <pre>
-   * CmdId: 7023
+   * CmdId: 20231
    * </pre>
    *
    * Protobuf type {@code WearEquipReq}
@@ -79,12 +87,12 @@ private WearEquipReq(
             case 0:
               done = true;
               break;
-            case 48: {
+            case 8: {
 
               avatarGuid_ = input.readUInt64();
               break;
             }
-            case 80: {
+            case 112: {
 
               equipGuid_ = input.readUInt64();
               break;
@@ -121,10 +129,14 @@ private WearEquipReq(
               emu.grasscutter.net.proto.WearEquipReqOuterClass.WearEquipReq.class, emu.grasscutter.net.proto.WearEquipReqOuterClass.WearEquipReq.Builder.class);
     }
 
-    public static final int EQUIP_GUID_FIELD_NUMBER = 10;
+    public static final int EQUIP_GUID_FIELD_NUMBER = 14;
     private long equipGuid_;
     /**
-     * <code>uint64 equip_guid = 10;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint64 equip_guid = 14;</code>
      * @return The equipGuid.
      */
     @java.lang.Override
@@ -132,10 +144,14 @@ public long getEquipGuid() {
       return equipGuid_;
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 6;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 1;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 6;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint64 avatar_guid = 1;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -158,10 +174,10 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(6, avatarGuid_);
+        output.writeUInt64(1, avatarGuid_);
       }
       if (equipGuid_ != 0L) {
-        output.writeUInt64(10, equipGuid_);
+        output.writeUInt64(14, equipGuid_);
       }
       unknownFields.writeTo(output);
     }
@@ -174,11 +190,11 @@ public int getSerializedSize() {
       size = 0;
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(6, avatarGuid_);
+          .computeUInt64Size(1, avatarGuid_);
       }
       if (equipGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(10, equipGuid_);
+          .computeUInt64Size(14, equipGuid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -313,7 +329,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 7023
+     * CmdId: 20231
      * </pre>
      *
      * Protobuf type {@code WearEquipReq}
@@ -470,7 +486,11 @@ public Builder mergeFrom(
 
       private long equipGuid_ ;
       /**
-       * <code>uint64 equip_guid = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint64 equip_guid = 14;</code>
        * @return The equipGuid.
        */
       @java.lang.Override
@@ -478,7 +498,11 @@ public long getEquipGuid() {
         return equipGuid_;
       }
       /**
-       * <code>uint64 equip_guid = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint64 equip_guid = 14;</code>
        * @param value The equipGuid to set.
        * @return This builder for chaining.
        */
@@ -489,7 +513,11 @@ public Builder setEquipGuid(long value) {
         return this;
       }
       /**
-       * <code>uint64 equip_guid = 10;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint64 equip_guid = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearEquipGuid() {
@@ -501,7 +529,11 @@ public Builder clearEquipGuid() {
 
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 6;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint64 avatar_guid = 1;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -509,7 +541,11 @@ public long getAvatarGuid() {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 6;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint64 avatar_guid = 1;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -520,7 +556,11 @@ public Builder setAvatarGuid(long value) {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 6;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint64 avatar_guid = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -597,7 +637,7 @@ public emu.grasscutter.net.proto.WearEquipReqOuterClass.WearEquipReq getDefaultI
   static {
     java.lang.String[] descriptorData = {
       "\n\022WearEquipReq.proto\"7\n\014WearEquipReq\022\022\n\n" +
-      "equip_guid\030\n \001(\004\022\023\n\013avatar_guid\030\006 \001(\004B\033\n" +
+      "equip_guid\030\016 \001(\004\022\023\n\013avatar_guid\030\001 \001(\004B\033\n" +
       "\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WearEquipRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WearEquipRspOuterClass.java
index 67d554b01c7..395edc23db4 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WearEquipRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WearEquipRspOuterClass.java
@@ -19,26 +19,38 @@ public interface WearEquipRspOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 avatar_guid = 1;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint64 equip_guid = 6;</code>
+     * @return The equipGuid.
+     */
+    long getEquipGuid();
+
+    /**
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint64 avatar_guid = 4;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
 
     /**
-     * <code>int32 retcode = 9;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>int32 retcode = 8;</code>
      * @return The retcode.
      */
     int getRetcode();
-
-    /**
-     * <code>uint64 equip_guid = 13;</code>
-     * @return The equipGuid.
-     */
-    long getEquipGuid();
   }
   /**
    * <pre>
-   * CmdId: 3218
+   * CmdId: 23386
    * </pre>
    *
    * Protobuf type {@code WearEquipRsp}
@@ -85,19 +97,19 @@ private WearEquipRsp(
             case 0:
               done = true;
               break;
-            case 8: {
+            case 32: {
 
               avatarGuid_ = input.readUInt64();
               break;
             }
-            case 72: {
+            case 48: {
 
-              retcode_ = input.readInt32();
+              equipGuid_ = input.readUInt64();
               break;
             }
-            case 104: {
+            case 64: {
 
-              equipGuid_ = input.readUInt64();
+              retcode_ = input.readInt32();
               break;
             }
             default: {
@@ -132,10 +144,29 @@ private WearEquipRsp(
               emu.grasscutter.net.proto.WearEquipRspOuterClass.WearEquipRsp.class, emu.grasscutter.net.proto.WearEquipRspOuterClass.WearEquipRsp.Builder.class);
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 1;
+    public static final int EQUIP_GUID_FIELD_NUMBER = 6;
+    private long equipGuid_;
+    /**
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>uint64 equip_guid = 6;</code>
+     * @return The equipGuid.
+     */
+    @java.lang.Override
+    public long getEquipGuid() {
+      return equipGuid_;
+    }
+
+    public static final int AVATAR_GUID_FIELD_NUMBER = 4;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 1;</code>
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint64 avatar_guid = 4;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -143,10 +174,14 @@ public long getAvatarGuid() {
       return avatarGuid_;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 9;
+    public static final int RETCODE_FIELD_NUMBER = 8;
     private int retcode_;
     /**
-     * <code>int32 retcode = 9;</code>
+     * <pre>
+     * Offset: 0x30
+     * </pre>
+     *
+     * <code>int32 retcode = 8;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -154,17 +189,6 @@ public int getRetcode() {
       return retcode_;
     }
 
-    public static final int EQUIP_GUID_FIELD_NUMBER = 13;
-    private long equipGuid_;
-    /**
-     * <code>uint64 equip_guid = 13;</code>
-     * @return The equipGuid.
-     */
-    @java.lang.Override
-    public long getEquipGuid() {
-      return equipGuid_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -180,13 +204,13 @@ public final boolean isInitialized() {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(1, avatarGuid_);
-      }
-      if (retcode_ != 0) {
-        output.writeInt32(9, retcode_);
+        output.writeUInt64(4, avatarGuid_);
       }
       if (equipGuid_ != 0L) {
-        output.writeUInt64(13, equipGuid_);
+        output.writeUInt64(6, equipGuid_);
+      }
+      if (retcode_ != 0) {
+        output.writeInt32(8, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -199,15 +223,15 @@ public int getSerializedSize() {
       size = 0;
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(1, avatarGuid_);
+          .computeUInt64Size(4, avatarGuid_);
       }
-      if (retcode_ != 0) {
+      if (equipGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(9, retcode_);
+          .computeUInt64Size(6, equipGuid_);
       }
-      if (equipGuid_ != 0L) {
+      if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(13, equipGuid_);
+          .computeInt32Size(8, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -224,12 +248,12 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.WearEquipRspOuterClass.WearEquipRsp other = (emu.grasscutter.net.proto.WearEquipRspOuterClass.WearEquipRsp) obj;
 
+      if (getEquipGuid()
+          != other.getEquipGuid()) return false;
       if (getAvatarGuid()
           != other.getAvatarGuid()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
-      if (getEquipGuid()
-          != other.getEquipGuid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -241,14 +265,14 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + EQUIP_GUID_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getEquipGuid());
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getAvatarGuid());
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
-      hash = (37 * hash) + EQUIP_GUID_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getEquipGuid());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -346,7 +370,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 3218
+     * CmdId: 23386
      * </pre>
      *
      * Protobuf type {@code WearEquipRsp}
@@ -386,12 +410,12 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        equipGuid_ = 0L;
+
         avatarGuid_ = 0L;
 
         retcode_ = 0;
 
-        equipGuid_ = 0L;
-
         return this;
       }
 
@@ -418,9 +442,9 @@ public emu.grasscutter.net.proto.WearEquipRspOuterClass.WearEquipRsp build() {
       @java.lang.Override
       public emu.grasscutter.net.proto.WearEquipRspOuterClass.WearEquipRsp buildPartial() {
         emu.grasscutter.net.proto.WearEquipRspOuterClass.WearEquipRsp result = new emu.grasscutter.net.proto.WearEquipRspOuterClass.WearEquipRsp(this);
+        result.equipGuid_ = equipGuid_;
         result.avatarGuid_ = avatarGuid_;
         result.retcode_ = retcode_;
-        result.equipGuid_ = equipGuid_;
         onBuilt();
         return result;
       }
@@ -469,15 +493,15 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.WearEquipRspOuterClass.WearEquipRsp other) {
         if (other == emu.grasscutter.net.proto.WearEquipRspOuterClass.WearEquipRsp.getDefaultInstance()) return this;
+        if (other.getEquipGuid() != 0L) {
+          setEquipGuid(other.getEquipGuid());
+        }
         if (other.getAvatarGuid() != 0L) {
           setAvatarGuid(other.getAvatarGuid());
         }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
-        if (other.getEquipGuid() != 0L) {
-          setEquipGuid(other.getEquipGuid());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -507,95 +531,131 @@ public Builder mergeFrom(
         return this;
       }
 
-      private long avatarGuid_ ;
+      private long equipGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 1;</code>
-       * @return The avatarGuid.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint64 equip_guid = 6;</code>
+       * @return The equipGuid.
        */
       @java.lang.Override
-      public long getAvatarGuid() {
-        return avatarGuid_;
+      public long getEquipGuid() {
+        return equipGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 1;</code>
-       * @param value The avatarGuid to set.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint64 equip_guid = 6;</code>
+       * @param value The equipGuid to set.
        * @return This builder for chaining.
        */
-      public Builder setAvatarGuid(long value) {
+      public Builder setEquipGuid(long value) {
         
-        avatarGuid_ = value;
+        equipGuid_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 1;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>uint64 equip_guid = 6;</code>
        * @return This builder for chaining.
        */
-      public Builder clearAvatarGuid() {
+      public Builder clearEquipGuid() {
         
-        avatarGuid_ = 0L;
+        equipGuid_ = 0L;
         onChanged();
         return this;
       }
 
-      private int retcode_ ;
+      private long avatarGuid_ ;
       /**
-       * <code>int32 retcode = 9;</code>
-       * @return The retcode.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint64 avatar_guid = 4;</code>
+       * @return The avatarGuid.
        */
       @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
+      public long getAvatarGuid() {
+        return avatarGuid_;
       }
       /**
-       * <code>int32 retcode = 9;</code>
-       * @param value The retcode to set.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint64 avatar_guid = 4;</code>
+       * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
-      public Builder setRetcode(int value) {
+      public Builder setAvatarGuid(long value) {
         
-        retcode_ = value;
+        avatarGuid_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>int32 retcode = 9;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint64 avatar_guid = 4;</code>
        * @return This builder for chaining.
        */
-      public Builder clearRetcode() {
+      public Builder clearAvatarGuid() {
         
-        retcode_ = 0;
+        avatarGuid_ = 0L;
         onChanged();
         return this;
       }
 
-      private long equipGuid_ ;
+      private int retcode_ ;
       /**
-       * <code>uint64 equip_guid = 13;</code>
-       * @return The equipGuid.
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>int32 retcode = 8;</code>
+       * @return The retcode.
        */
       @java.lang.Override
-      public long getEquipGuid() {
-        return equipGuid_;
+      public int getRetcode() {
+        return retcode_;
       }
       /**
-       * <code>uint64 equip_guid = 13;</code>
-       * @param value The equipGuid to set.
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>int32 retcode = 8;</code>
+       * @param value The retcode to set.
        * @return This builder for chaining.
        */
-      public Builder setEquipGuid(long value) {
+      public Builder setRetcode(int value) {
         
-        equipGuid_ = value;
+        retcode_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint64 equip_guid = 13;</code>
+       * <pre>
+       * Offset: 0x30
+       * </pre>
+       *
+       * <code>int32 retcode = 8;</code>
        * @return This builder for chaining.
        */
-      public Builder clearEquipGuid() {
+      public Builder clearRetcode() {
         
-        equipGuid_ = 0L;
+        retcode_ = 0;
         onChanged();
         return this;
       }
@@ -666,9 +726,9 @@ public emu.grasscutter.net.proto.WearEquipRspOuterClass.WearEquipRsp getDefaultI
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\022WearEquipRsp.proto\"H\n\014WearEquipRsp\022\023\n\013" +
-      "avatar_guid\030\001 \001(\004\022\017\n\007retcode\030\t \001(\005\022\022\n\neq" +
-      "uip_guid\030\r \001(\004B\033\n\031emu.grasscutter.net.pr" +
+      "\n\022WearEquipRsp.proto\"H\n\014WearEquipRsp\022\022\n\n" +
+      "equip_guid\030\006 \001(\004\022\023\n\013avatar_guid\030\004 \001(\004\022\017\n" +
+      "\007retcode\030\010 \001(\005B\033\n\031emu.grasscutter.net.pr" +
       "otob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -680,7 +740,7 @@ public emu.grasscutter.net.proto.WearEquipRspOuterClass.WearEquipRsp getDefaultI
     internal_static_WearEquipRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_WearEquipRsp_descriptor,
-        new java.lang.String[] { "AvatarGuid", "Retcode", "EquipGuid", });
+        new java.lang.String[] { "EquipGuid", "AvatarGuid", "Retcode", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WindSeedType1NotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WindSeedType1NotifyOuterClass.java
index 29608f93c11..ec34cb7d6ae 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WindSeedType1NotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WindSeedType1NotifyOuterClass.java
@@ -19,20 +19,28 @@ public interface WindSeedType1NotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 config_id = 5;</code>
-     * @return The configId.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>bytes payload = 3;</code>
+     * @return The payload.
      */
-    int getConfigId();
+    com.google.protobuf.ByteString getPayload();
 
     /**
-     * <code>bytes payload = 8;</code>
-     * @return The payload.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 config_id = 15;</code>
+     * @return The configId.
      */
-    com.google.protobuf.ByteString getPayload();
+    int getConfigId();
   }
   /**
    * <pre>
-   * CmdId: 7486
+   * CmdId: 3429
    * </pre>
    *
    * Protobuf type {@code WindSeedType1Notify}
@@ -80,14 +88,14 @@ private WindSeedType1Notify(
             case 0:
               done = true;
               break;
-            case 40: {
+            case 26: {
 
-              configId_ = input.readUInt32();
+              payload_ = input.readBytes();
               break;
             }
-            case 66: {
+            case 120: {
 
-              payload_ = input.readBytes();
+              configId_ = input.readUInt32();
               break;
             }
             default: {
@@ -122,26 +130,34 @@ private WindSeedType1Notify(
               emu.grasscutter.net.proto.WindSeedType1NotifyOuterClass.WindSeedType1Notify.class, emu.grasscutter.net.proto.WindSeedType1NotifyOuterClass.WindSeedType1Notify.Builder.class);
     }
 
-    public static final int CONFIG_ID_FIELD_NUMBER = 5;
-    private int configId_;
+    public static final int PAYLOAD_FIELD_NUMBER = 3;
+    private com.google.protobuf.ByteString payload_;
     /**
-     * <code>uint32 config_id = 5;</code>
-     * @return The configId.
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>bytes payload = 3;</code>
+     * @return The payload.
      */
     @java.lang.Override
-    public int getConfigId() {
-      return configId_;
+    public com.google.protobuf.ByteString getPayload() {
+      return payload_;
     }
 
-    public static final int PAYLOAD_FIELD_NUMBER = 8;
-    private com.google.protobuf.ByteString payload_;
+    public static final int CONFIG_ID_FIELD_NUMBER = 15;
+    private int configId_;
     /**
-     * <code>bytes payload = 8;</code>
-     * @return The payload.
+     * <pre>
+     * Offset: 0x28
+     * </pre>
+     *
+     * <code>uint32 config_id = 15;</code>
+     * @return The configId.
      */
     @java.lang.Override
-    public com.google.protobuf.ByteString getPayload() {
-      return payload_;
+    public int getConfigId() {
+      return configId_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -158,11 +174,11 @@ public final boolean isInitialized() {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (configId_ != 0) {
-        output.writeUInt32(5, configId_);
-      }
       if (!payload_.isEmpty()) {
-        output.writeBytes(8, payload_);
+        output.writeBytes(3, payload_);
+      }
+      if (configId_ != 0) {
+        output.writeUInt32(15, configId_);
       }
       unknownFields.writeTo(output);
     }
@@ -173,13 +189,13 @@ public int getSerializedSize() {
       if (size != -1) return size;
 
       size = 0;
-      if (configId_ != 0) {
+      if (!payload_.isEmpty()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, configId_);
+          .computeBytesSize(3, payload_);
       }
-      if (!payload_.isEmpty()) {
+      if (configId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(8, payload_);
+          .computeUInt32Size(15, configId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -196,10 +212,10 @@ public boolean equals(final java.lang.Object obj) {
       }
       emu.grasscutter.net.proto.WindSeedType1NotifyOuterClass.WindSeedType1Notify other = (emu.grasscutter.net.proto.WindSeedType1NotifyOuterClass.WindSeedType1Notify) obj;
 
-      if (getConfigId()
-          != other.getConfigId()) return false;
       if (!getPayload()
           .equals(other.getPayload())) return false;
+      if (getConfigId()
+          != other.getConfigId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -211,10 +227,10 @@ public int hashCode() {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + CONFIG_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getConfigId();
       hash = (37 * hash) + PAYLOAD_FIELD_NUMBER;
       hash = (53 * hash) + getPayload().hashCode();
+      hash = (37 * hash) + CONFIG_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getConfigId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -312,7 +328,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 7486
+     * CmdId: 3429
      * </pre>
      *
      * Protobuf type {@code WindSeedType1Notify}
@@ -352,10 +368,10 @@ private void maybeForceBuilderInitialization() {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        configId_ = 0;
-
         payload_ = com.google.protobuf.ByteString.EMPTY;
 
+        configId_ = 0;
+
         return this;
       }
 
@@ -382,8 +398,8 @@ public emu.grasscutter.net.proto.WindSeedType1NotifyOuterClass.WindSeedType1Noti
       @java.lang.Override
       public emu.grasscutter.net.proto.WindSeedType1NotifyOuterClass.WindSeedType1Notify buildPartial() {
         emu.grasscutter.net.proto.WindSeedType1NotifyOuterClass.WindSeedType1Notify result = new emu.grasscutter.net.proto.WindSeedType1NotifyOuterClass.WindSeedType1Notify(this);
-        result.configId_ = configId_;
         result.payload_ = payload_;
+        result.configId_ = configId_;
         onBuilt();
         return result;
       }
@@ -432,12 +448,12 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.WindSeedType1NotifyOuterClass.WindSeedType1Notify other) {
         if (other == emu.grasscutter.net.proto.WindSeedType1NotifyOuterClass.WindSeedType1Notify.getDefaultInstance()) return this;
-        if (other.getConfigId() != 0) {
-          setConfigId(other.getConfigId());
-        }
         if (other.getPayload() != com.google.protobuf.ByteString.EMPTY) {
           setPayload(other.getPayload());
         }
+        if (other.getConfigId() != 0) {
+          setConfigId(other.getConfigId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -467,67 +483,91 @@ public Builder mergeFrom(
         return this;
       }
 
-      private int configId_ ;
+      private com.google.protobuf.ByteString payload_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>uint32 config_id = 5;</code>
-       * @return The configId.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>bytes payload = 3;</code>
+       * @return The payload.
        */
       @java.lang.Override
-      public int getConfigId() {
-        return configId_;
+      public com.google.protobuf.ByteString getPayload() {
+        return payload_;
       }
       /**
-       * <code>uint32 config_id = 5;</code>
-       * @param value The configId to set.
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>bytes payload = 3;</code>
+       * @param value The payload to set.
        * @return This builder for chaining.
        */
-      public Builder setConfigId(int value) {
-        
-        configId_ = value;
+      public Builder setPayload(com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        payload_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 config_id = 5;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>bytes payload = 3;</code>
        * @return This builder for chaining.
        */
-      public Builder clearConfigId() {
+      public Builder clearPayload() {
         
-        configId_ = 0;
+        payload_ = getDefaultInstance().getPayload();
         onChanged();
         return this;
       }
 
-      private com.google.protobuf.ByteString payload_ = com.google.protobuf.ByteString.EMPTY;
+      private int configId_ ;
       /**
-       * <code>bytes payload = 8;</code>
-       * @return The payload.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 config_id = 15;</code>
+       * @return The configId.
        */
       @java.lang.Override
-      public com.google.protobuf.ByteString getPayload() {
-        return payload_;
+      public int getConfigId() {
+        return configId_;
       }
       /**
-       * <code>bytes payload = 8;</code>
-       * @param value The payload to set.
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 config_id = 15;</code>
+       * @param value The configId to set.
        * @return This builder for chaining.
        */
-      public Builder setPayload(com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        payload_ = value;
+      public Builder setConfigId(int value) {
+        
+        configId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bytes payload = 8;</code>
+       * <pre>
+       * Offset: 0x28
+       * </pre>
+       *
+       * <code>uint32 config_id = 15;</code>
        * @return This builder for chaining.
        */
-      public Builder clearPayload() {
+      public Builder clearConfigId() {
         
-        payload_ = getDefaultInstance().getPayload();
+        configId_ = 0;
         onChanged();
         return this;
       }
@@ -599,8 +639,8 @@ public emu.grasscutter.net.proto.WindSeedType1NotifyOuterClass.WindSeedType1Noti
   static {
     java.lang.String[] descriptorData = {
       "\n\031WindSeedType1Notify.proto\"9\n\023WindSeedT" +
-      "ype1Notify\022\021\n\tconfig_id\030\005 \001(\r\022\017\n\007payload" +
-      "\030\010 \001(\014B\033\n\031emu.grasscutter.net.protob\006pro" +
+      "ype1Notify\022\017\n\007payload\030\003 \001(\014\022\021\n\tconfig_id" +
+      "\030\017 \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" +
       "to3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -612,7 +652,7 @@ public emu.grasscutter.net.proto.WindSeedType1NotifyOuterClass.WindSeedType1Noti
     internal_static_WindSeedType1Notify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_WindSeedType1Notify_descriptor,
-        new java.lang.String[] { "ConfigId", "Payload", });
+        new java.lang.String[] { "Payload", "ConfigId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WorldDataNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WorldDataNotifyOuterClass.java
index 49940524344..724483d107d 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WorldDataNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WorldDataNotifyOuterClass.java
@@ -19,11 +19,19 @@ public interface WorldDataNotifyOrBuilder extends
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 13;</code>
      */
     int getWorldPropMapCount();
     /**
-     * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 13;</code>
      */
     boolean containsWorldPropMap(
         int key);
@@ -34,19 +42,31 @@ boolean containsWorldPropMap(
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.PropValueOuterClass.PropValue>
     getWorldPropMap();
     /**
-     * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 13;</code>
      */
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.PropValueOuterClass.PropValue>
     getWorldPropMapMap();
     /**
-     * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 13;</code>
      */
 
     emu.grasscutter.net.proto.PropValueOuterClass.PropValue getWorldPropMapOrDefault(
         int key,
         emu.grasscutter.net.proto.PropValueOuterClass.PropValue defaultValue);
     /**
-     * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 13;</code>
      */
 
     emu.grasscutter.net.proto.PropValueOuterClass.PropValue getWorldPropMapOrThrow(
@@ -54,7 +74,7 @@ emu.grasscutter.net.proto.PropValueOuterClass.PropValue getWorldPropMapOrThrow(
   }
   /**
    * <pre>
-   * CmdId: 23950
+   * CmdId: 28304
    * </pre>
    *
    * Protobuf type {@code WorldDataNotify}
@@ -102,7 +122,7 @@ private WorldDataNotify(
             case 0:
               done = true;
               break;
-            case 26: {
+            case 106: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 worldPropMap_ = com.google.protobuf.MapField.newMapField(
                     WorldPropMapDefaultEntryHolder.defaultEntry);
@@ -144,7 +164,7 @@ private WorldDataNotify(
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 3:
+        case 13:
           return internalGetWorldPropMap();
         default:
           throw new RuntimeException(
@@ -159,7 +179,7 @@ protected com.google.protobuf.MapField internalGetMapField(
               emu.grasscutter.net.proto.WorldDataNotifyOuterClass.WorldDataNotify.class, emu.grasscutter.net.proto.WorldDataNotifyOuterClass.WorldDataNotify.Builder.class);
     }
 
-    public static final int WORLD_PROP_MAP_FIELD_NUMBER = 3;
+    public static final int WORLD_PROP_MAP_FIELD_NUMBER = 13;
     private static final class WorldPropMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, emu.grasscutter.net.proto.PropValueOuterClass.PropValue> defaultEntry =
@@ -186,7 +206,11 @@ public int getWorldPropMapCount() {
       return internalGetWorldPropMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 13;</code>
      */
 
     @java.lang.Override
@@ -204,7 +228,11 @@ public java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.PropValueOuter
       return getWorldPropMapMap();
     }
     /**
-     * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 13;</code>
      */
     @java.lang.Override
 
@@ -212,7 +240,11 @@ public java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.PropValueOuter
       return internalGetWorldPropMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 13;</code>
      */
     @java.lang.Override
 
@@ -225,7 +257,11 @@ public emu.grasscutter.net.proto.PropValueOuterClass.PropValue getWorldPropMapOr
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 3;</code>
+     * <pre>
+     * Offset: 0x20
+     * </pre>
+     *
+     * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 13;</code>
      */
     @java.lang.Override
 
@@ -259,7 +295,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
           output,
           internalGetWorldPropMap(),
           WorldPropMapDefaultEntryHolder.defaultEntry,
-          3);
+          13);
       unknownFields.writeTo(output);
     }
 
@@ -277,7 +313,7 @@ public int getSerializedSize() {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(3, worldPropMap__);
+            .computeMessageSize(13, worldPropMap__);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -408,7 +444,7 @@ protected Builder newBuilderForType(
     }
     /**
      * <pre>
-     * CmdId: 23950
+     * CmdId: 28304
      * </pre>
      *
      * Protobuf type {@code WorldDataNotify}
@@ -426,7 +462,7 @@ public static final class Builder extends
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 3:
+          case 13:
             return internalGetWorldPropMap();
           default:
             throw new RuntimeException(
@@ -437,7 +473,7 @@ protected com.google.protobuf.MapField internalGetMapField(
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 3:
+          case 13:
             return internalGetMutableWorldPropMap();
           default:
             throw new RuntimeException(
@@ -607,7 +643,11 @@ public int getWorldPropMapCount() {
         return internalGetWorldPropMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 13;</code>
        */
 
       @java.lang.Override
@@ -625,7 +665,11 @@ public java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.PropValueOuter
         return getWorldPropMapMap();
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 13;</code>
        */
       @java.lang.Override
 
@@ -633,7 +677,11 @@ public java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.PropValueOuter
         return internalGetWorldPropMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 13;</code>
        */
       @java.lang.Override
 
@@ -646,7 +694,11 @@ public emu.grasscutter.net.proto.PropValueOuterClass.PropValue getWorldPropMapOr
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 13;</code>
        */
       @java.lang.Override
 
@@ -667,7 +719,11 @@ public Builder clearWorldPropMap() {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 13;</code>
        */
 
       public Builder removeWorldPropMap(
@@ -686,7 +742,11 @@ public Builder removeWorldPropMap(
         return internalGetMutableWorldPropMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 13;</code>
        */
       public Builder putWorldPropMap(
           int key,
@@ -698,7 +758,11 @@ public Builder putWorldPropMap(
         return this;
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 3;</code>
+       * <pre>
+       * Offset: 0x20
+       * </pre>
+       *
+       * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 13;</code>
        */
 
       public Builder putAllWorldPropMap(
@@ -780,7 +844,7 @@ public emu.grasscutter.net.proto.WorldDataNotifyOuterClass.WorldDataNotify getDe
   static {
     java.lang.String[] descriptorData = {
       "\n\025WorldDataNotify.proto\032\017PropValue.proto" +
-      "\"\216\001\n\017WorldDataNotify\022:\n\016world_prop_map\030\003" +
+      "\"\216\001\n\017WorldDataNotify\022:\n\016world_prop_map\030\r" +
       " \003(\0132\".WorldDataNotify.WorldPropMapEntry" +
       "\032?\n\021WorldPropMapEntry\022\013\n\003key\030\001 \001(\r\022\031\n\005va" +
       "lue\030\002 \001(\0132\n.PropValue:\0028\001B\033\n\031emu.grasscu" +
diff --git a/src/main/java/emu/grasscutter/GameConstants.java b/src/main/java/emu/grasscutter/GameConstants.java
index 6da52ecf7d9..0630f06bfbe 100644
--- a/src/main/java/emu/grasscutter/GameConstants.java
+++ b/src/main/java/emu/grasscutter/GameConstants.java
@@ -7,8 +7,8 @@
 import java.util.Arrays;
 
 public final class GameConstants {
-    public static String VERSION = "5.1.0";
-    public static int[] VERSION_PARTS = {5, 1, 0};
+    public static String VERSION = "5.2.0";
+    public static int[] VERSION_PARTS = {5, 2, 0};
     public static boolean DEBUG = false;
 
     public static final int DEFAULT_TEAMS = 4;
diff --git a/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java b/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java
index 4b77efaf808..c164b59cd94 100644
--- a/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java
+++ b/src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java
@@ -7,111 +7,232 @@ public class PacketOpcodes {
     public static final int NONE = 1;
 
     // Opcodes
-    public static final int GetPlayerTokenReq = 8611;
-    public static final int GetPlayerTokenRsp = 23639;
-    public static final int PingReq = 6255;
-    public static final int PingRsp = 21110;
-    public static final int PlayerLoginReq = 20206;
-    public static final int PlayerLoginRsp = 6816;
-    public static final int PlayerEnterSceneNotify = 27933;
-    public static final int EnterSceneReadyReq = 23920;
-    public static final int EnterScenePeerNotify = 502;
-    public static final int EnterSceneReadyRsp = 2248;
-    public static final int SceneInitFinishReq = 8793;
-    public static final int PlayerEnterSceneInfoNotify = 21773;
-    public static final int SceneInitFinishRsp = 4231;
-    public static final int EnterSceneDoneReq = 26406;
-    public static final int EnterSceneDoneRsp = 3918;
-    public static final int PostEnterSceneReq = 20778;
-    public static final int PostEnterSceneRsp = 2709;
-    public static final int GetSceneAreaReq = 28474;
-    public static final int GetSceneAreaRsp = 23079;
-    public static final int GetScenePointReq = 22769;
-    public static final int GetScenePointRsp = 1907;
-    public static final int SceneTeamUpdateNotify = 1778;
-    public static final int AvatarDataNotify = 9997;
-    public static final int SceneEntityAppearNotify = 4793;
-    public static final int SceneEntityDisappearNotify = 1;
-    public static final int OpenStateUpdateNotify = 1064;
-    public static final int OpenStateChangeNotify = 20111;
+    public static final int GetPlayerTokenReq = 8726;
+    public static final int GetPlayerTokenRsp = 87;
+    public static final int PingReq = 8341;
+    public static final int PingRsp = 25458;
+    public static final int PlayerLoginReq = 6606;
+    public static final int PlayerLoginRsp = 27700;
+    public static final int PlayerEnterSceneNotify = 26231;
+    public static final int EnterSceneReadyReq = 6733;
+    public static final int EnterScenePeerNotify = 26301;
+    public static final int EnterSceneReadyRsp = 25386;
+    public static final int SceneInitFinishReq = 105;
+    public static final int PlayerEnterSceneInfoNotify = 1315;
+    public static final int SceneInitFinishRsp = 3061;
+    public static final int EnterSceneDoneReq = 7223;
+    public static final int EnterSceneDoneRsp = 2896;
+    public static final int PostEnterSceneReq = 23191;
+    public static final int PostEnterSceneRsp = 3887;
+    public static final int GetSceneAreaReq = 1854;
+    public static final int GetSceneAreaRsp = 28096;
+    public static final int GetScenePointReq = 23975;
+    public static final int GetScenePointRsp = 7599;
+    public static final int SceneTeamUpdateNotify = 1067;
+    public static final int AvatarDataNotify = 23485;
+    public static final int SceneEntityAppearNotify = 26789;
+    public static final int SceneEntityDisappearNotify = 29134;
+    public static final int OpenStateUpdateNotify = 28079;
+    public static final int AddQuestContentProgressReq = 4657;
+    public static final int AddQuestContentProgressRsp = 23529;
+    public static final int AvatarChangeCostumeNotify = 21259; // weird
+    public static final int AvatarEquipChangeNotify = 1124;
+    public static final int AvatarTeamUpdateNotify = 26216;
+    public static final int ChangeAvatarReq = 25492;
+    public static final int ChangeAvatarRsp = 25243;
+    public static final int ClientAbilityChangeNotify = 8119;
+    public static final int ClientAbilityInitFinishNotify = 22991;
+    public static final int CombatInvocationsNotify = 5355;
+    public static final int EntityFightPropChangeReasonNotify = 20950;
+    public static final int EntityFightPropNotify = 3088;
+    public static final int EntityFightPropUpdateNotify = 27166;
+    public static final int EvtBeingHitNotify = 20487; // no proto
+    public static final int EvtBeingHealedNotify = 20599; // no proto
+    public static final int EvtBeingHitsCombineNotify = 4921; // no proto
+    public static final int EvtCreateGadgetNotify = 27241; // lazy
+    public static final int EvtDoSkillSuccNotify = 26782;
+    public static final int FinishedParentQuestNotify = 4998;
+    public static final int FinishedParentQuestUpdateNotify = 5859;
+    public static final int GadgetInteractReq = 25100;
+    public static final int GadgetInteractRsp = 1140;
+    public static final int GetPlayerFriendListReq = 21177;
+    public static final int GetPlayerFriendListRsp = 25600; // VMPd
+    public static final int GetPlayerSocialDetailReq = 8346;
+    public static final int GetPlayerSocialDetailRsp = 4953;
+    public static final int HostPlayerNotify = 5855;
+    public static final int LifeStateChangeNotify = 20981;
+    public static final int MarkMapReq = 26646;
+    public static final int NpcTalkReq = 26161;
+    public static final int NpcTalkRsp = 21566;
+    public static final int PlayerDataNotify = 28579;
+    public static final int PlayerGameTimeNotify = 1970;
+    public static final int PlayerSetPauseReq = 5330;
+    public static final int PlayerSetPauseRsp = 4816;
+    public static final int PlayerStoreNotify = 424;
+    public static final int PlayerWorldSceneInfoListNotify = 4320;
+    public static final int PrivateChatNotify = 26909;
+    public static final int PrivateChatReq = 7698;
+    public static final int QuestDestroyNpcReq = 20824;
+    public static final int QuestDestroyNpcRsp = 5629;
+    public static final int QuestListNotify = 4024;
+    public static final int QuestListUpdateNotify = 29490;
+    public static final int QuestProgressUpdateNotify = 28220;
+    public static final int SceneAreaWeatherNotify = 23089;
+    public static final int SceneDataNotify = 5085;
+    public static final int SceneTimeNotify = 1184;
+    public static final int SceneTransToPointReq = 5345;
+    public static final int SceneTransToPointRsp = 8183;
+    public static final int ServerTimeNotify = 9404;
+    public static final int SetUpAvatarTeamReq = 25215; // list
+    public static final int SetUpAvatarTeamRsp = 9133;
+    public static final int StoreItemChangeNotify = 8622;
+    public static final int StoreWeightLimitNotify = 29185;
+    public static final int ToTheMoonEnterSceneReq = 6184;
+    public static final int UnionCmdNotify = 1350;
+    public static final int WearEquipReq = 20231;
+    public static final int WearEquipRsp = 23386;
+    public static final int WindSeedType1Notify = 3429;
+    public static final int WorldDataNotify = 28304;
+    public static final int EvtAvatarLockChairRsp = 25542;
+    public static final int AvatarChangeCostumeRsp = 3472;
+    public static final int EvtAvatarStandUpNotify = 9534;
+    public static final int AvatarLifeStateChangeNotify = 24346;
+    public static final int AvatarFlycloakChangeNotify = 9820;
+    public static final int AvatarPropNotify = 3178;
+    public static final int QuestTransmitRsp = 20382;
+    public static final int PlayerTimeNotify = 274;
+    public static final int QuestUpdateQuestVarNotify = 2114;
+    public static final int ServerGlobalValueChangeNotify = 29440;
+    public static final int AvatarDieAnimationEndReq = 26240;
+    public static final int AvatarDieAnimationEndRsp = 9399;
+    public static final int SetNameCardReq = 26218;
+    public static final int SetNameCardRsp = 21402;
+    public static final int PersonalSceneJumpReq = 5277;
+    public static final int GetProfilePictureDataReq = 9548;
+    public static final int GetProfilePictureDataRsp = 9376;
+    public static final int GetAllUnlockNameCardReq = 22565;
+    public static final int GetAllUnlockNameCardRsp = 3223;
+    public static final int GetWidgetSlotRsp = 25921;
+    public static final int GetParentQuestVideoKeyRsp = 24426;
+    public static final int VehicleStaminaNotify = 26419;
+    public static final int ServerBuffChangeNotify = 28886; // lazy
+    public static final int VehicleInteractReq = 1121;
+    public static final int VehicleInteractRsp = 21684;
+    public static final int PlayerPropChangeNotify = 7793;
+    public static final int PlayerPropChangeReasonNotify = 407;
+    public static final int PlayerPropNotify = 5911;
+    public static final int AchievementAllDataNotify = 1007;
+    public static final int GetActivityInfoReq = 22015; // list
+    public static final int GetActivityInfoRsp = 3417;
+    public static final int SetWidgetSlotReq = 2490; // list
+    public static final int SetWidgetSlotRsp = 2644;
+    public static final int ChangeGameTimeReq = 25379;
+    public static final int ChangeGameTimeRsp = 23828; // stop
+    public static final int WidgetSlotChangeNotify = 26509;
+    public static final int UseItemReq = 22853;
+    public static final int UseItemRsp = 4487;
+    public static final int EvtAiSyncSkillCdNotify = 27816;
+    public static final int WorktopOptionNotify = 25362;
+    public static final int GadgetStateNotify = 5469;
+    public static final int WorldPlayerDieNotify = 4233;
+    public static final int WorldPlayerReviveReq = 25406;
+    public static final int AvatarFetterDataNotify = 4428;
+    public static final int ItemAddHintNotify = 5491;
+    public static final int GetAreaExplorePointReq = 9385;
+    public static final int GetAreaExplorePointRsp = 22313;
+    public static final int ActivityScheduleInfoNotify = 29674;
+    public static final int ActivityInfoNotify = 22089;
+    public static final int GetGachaInfoReq = 27492;
+    public static final int GetGachaInfoRsp = 3581;
+    public static final int DoGachaReq = 3994;
+    public static final int DoGachaRsp = 794;
+    public static final int AvatarChangeCostumeReq = 437;
+    public static final int AvatarWearFlycloakReq = 20729;
+    public static final int AvatarWearFlycloakRsp = 22022;
+    public static final int AvatarGainFlycloakNotify = 21822;
+    public static final int AvatarChangeTraceEffectReq = 20665;
+    public static final int EvtDestroyGadgetNotify = 4819;
+    public static final int GetWidgetSlotReq = 4378;
+    public static final int EvtAvatarLockChairReq = 3378;
+    public static final int ObstacleModifyNotify = 2361;
+    public static final int GetMapAreaReq = 26032;
+    public static final int GetMapAreaRsp = 436;
+    public static final int EnterWorldAreaReq = 27065;
+    public static final int EnterWorldAreaRsp = 4418;
+    public static final int AbilityChangeNotify = 5798;
+    public static final int SceneAreaUnlockNotify = 27888;
+    public static final int ScenePointUnlockNotify = 22900;
+    public static final int AbilityInvocationsNotify = 7193;
+    public static final int AvatarSkillUpgradeReq = 25985;
+    public static final int AvatarSkillUpgradeRsp = 26846;
+    public static final int SkipPlayerGameTimeRsp = 28990;
+    public static final int SkipPlayerGameTimeReq = 29247;
+    public static final int AbilityInvocationFailNotify = 23877;
+    public static final int AbilityInvocationFixedNotify = 29769;
+    public static final int AchievementUpdateNotify = 25279;
+    public static final int AddNoGachaAvatarCardNotify = 29234;
+    public static final int AllWidgetDataNotify = 2474;
+    public static final int AreaPlayInfoNotify = 8822;
+    public static final int AvatarAddNotify = 7866;
+    public static final int AvatarFetterLevelRewardReq = 7303;
+    public static final int AvatarFetterLevelRewardRsp = 28320;
+    public static final int AvatarFightPropNotify = 25573;
+    public static final int AvatarFightPropUpdateNotify = 3777;
+    public static final int AvatarPropChangeReasonNotify = 29342;
+    public static final int AvatarSkillChangeNotify = 9948;
+    public static final int AvatarSkillInfoNotify = 20109;
+    public static final int AvatarSkillMaxChargeCountNotify = 23327;
+    public static final int ClientAbilitiesInitFinishCombineNotify = 27198;
+    public static final int ClientReconnectNotify = 26180;
+    public static final int DoSetPlayerBornDataNotify = 8937;
+    public static final int EntityAiSyncNotify = 24576;
+    public static final int EntityTagChangeNotify = 23421;
+    public static final int EvtAiSyncCombatThreatInfoNotify = 2189;
+    public static final int EvtAvatarSitDownNotify = 22742;
+    public static final int EvtEntityRenderersChangedNotify = 3479;
+    public static final int LevelTagDataNotify = 22426;
+    public static final int ServerCondMeetQuestListUpdateNotify = 27989;
+    public static final int ParentQuestInferenceDataNotify = 5755;
+    public static final int PersonalSceneJumpRsp = 28560;
+    public static final int QuestCreateEntityReq = 24286;
+    public static final int QuestCreateEntityRsp = 9840;
+    public static final int QuestDelNotify = 22109;
+    public static final int QuestDestroyEntityReq = 26354;
+    public static final int QuestDestroyEntityRsp = 27962;
+    public static final int QuestGlobalVarNotify = 20952;
+    public static final int QuestTransmitReq = 1922;
+    public static final int QuestUpdateQuestTimeVarNotify = 27599;
+    public static final int QuestUpdateQuestVarReq = 5072;
+    public static final int QuestUpdateQuestVarRsp = 2698;
+    public static final int QuickUseWidgetReq = 2594;
+    public static final int QuickUseWidgetRsp = 27657;
+    public static final int SceneEntityDrownReq = 29583;
+    public static final int SceneForceLockNotify = 1842;
+    public static final int SceneForceUnlockNotify = 2589;
+    public static final int ServerDisconnectClientNotify = 9131;
+    public static final int SetPlayerBornDataReq = 28772;
+    public static final int SetPlayerBornDataRsp = 9322;
+    public static final int SetUpLunchBoxWidgetReq = 28495;
+    public static final int SetUpLunchBoxWidgetRsp = 18;
 
     // Packet Names
-    public static final int AddQuestContentProgressReq = 1;
-    public static final int AddQuestContentProgressRsp = 1;
-    public static final int AvatarChangeCostumeNotify = 1;
-    public static final int AvatarEquipChangeNotify = 1;
+    public static final int OpenStateChangeNotify = 1;
     public static final int AvatarTeamAllDataNotify = 1;
-    public static final int AvatarTeamUpdateNotify = 1;
-    public static final int ChangeAvatarReq = 1;
-    public static final int ChangeAvatarRsp = 1;
-    public static final int ClientAbilityChangeNotify = 1;
-    public static final int ClientAbilityInitFinishNotify = 1;
-    public static final int CombatInvocationsNotify = 1;
     public static final int CutSceneBeginNotify = 1;
     public static final int CutSceneEndNotify = 1;
     public static final int CutSceneFinishNotify = 1;
     public static final int DungeonEntryInfoReq = 1;
     public static final int DropItemReq = 1;
     public static final int DropItemRsp = 1;
-    public static final int EntityFightPropChangeReasonNotify = 1;
-    public static final int EntityFightPropNotify = 1;
-    public static final int EntityFightPropUpdateNotify = 1;
-    public static final int EvtBeingHitNotify = 1;
-    public static final int EvtBeingHealedNotify = 1;
-    public static final int EvtBeingHitsCombineNotify = 1;
-    public static final int EvtCreateGadgetNotify = 1;
-    public static final int EvtDoSkillSuccNotify = 1;
-    public static final int FinishedParentQuestNotify = 1;
-    public static final int FinishedParentQuestUpdateNotify = 1;
-    public static final int GadgetInteractReq = 1;
-    public static final int GadgetInteractRsp = 1;
-    public static final int GetPlayerFriendListReq = 1;
-    public static final int GetPlayerFriendListRsp = 1;
-    public static final int GetPlayerSocialDetailReq = 1;
-    public static final int GetPlayerSocialDetailRsp = 1;
-    public static final int HostPlayerNotify = 1;
-    public static final int LifeStateChangeNotify = 1;
-    public static final int MarkMapReq = 1;
-    public static final int NpcTalkReq = 1;
-    public static final int NpcTalkRsp = 1;
     public static final int PathfindingEnterSceneReq = 1;
-    public static final int PlayerDataNotify = 1;
-    public static final int PlayerGameTimeNotify = 1;
-    public static final int PlayerSetPauseReq = 1;
-    public static final int PlayerSetPauseRsp = 1;
-    public static final int PlayerStoreNotify = 1;
-    public static final int PlayerWorldSceneInfoListNotify = 1;
-    public static final int PrivateChatNotify = 1;
-    public static final int PrivateChatReq = 1;
     public static final int PullPrivateChatReq = 1;
     public static final int PullPrivateChatRsp = 1;
     public static final int PullRecentChatReq = 1;
     public static final int PullRecentChatRsp = 1;
-    public static final int QuestDestroyNpcReq = 1;
-    public static final int QuestDestroyNpcRsp = 1;
-    public static final int QuestListNotify = 1;
-    public static final int QuestListUpdateNotify = 1;
-    public static final int QuestProgressUpdateNotify = 1;
-    public static final int SceneAreaWeatherNotify = 1;
-    public static final int SceneDataNotify = 1;
     public static final int ScenePlayerInfoNotify = 1;
-    public static final int SceneTimeNotify = 1;
-    public static final int SceneTransToPointReq = 1;
-    public static final int SceneTransToPointRsp = 1;
-    public static final int ServerTimeNotify = 1;
-    public static final int SetUpAvatarTeamReq = 1;
-    public static final int SetUpAvatarTeamRsp = 1;
     public static final int SetEntityClientDataNotify = 1;
-    public static final int StoreItemChangeNotify = 1;
-    public static final int StoreWeightLimitNotify = 1;
     public static final int SyncScenePlayTeamEntityNotify = 1;
     public static final int SyncTeamEntityNotify = 1;
-    public static final int ToTheMoonEnterSceneReq = 1;
-    public static final int UnionCmdNotify = 1;
-    public static final int WearEquipReq = 1;
-    public static final int WearEquipRsp = 1;
-    public static final int WindSeedType1Notify = 1;
-    public static final int WorldDataNotify = 1;
     public static final int WorldRoutineChangeNotify = 1;
     public static final int WorldRoutineTypeRefreshNotify = 1;
     public static final int WorldRoutineTypeCloseNotify = 1;
@@ -127,62 +248,34 @@ public class PacketOpcodes {
     public static final int BattlePassAllDataNotify = 1;
     public static final int PlayerGameTimeByLuaNotify = 1;
     public static final int PlayerInvestigationAllInfoNotify = 1;
-    public static final int EvtAvatarLockChairRsp = 1;
-    public static final int AvatarChangeCostumeRsp = 1;
     public static final int TakeBattlePassMissionPointRsp = 1;
-    public static final int EvtAvatarStandUpNotify = 1;
-    public static final int AvatarLifeStateChangeNotify = 1;
     public static final int PlayerInvestigationTargetNotify = 1;
-    public static final int AvatarFlycloakChangeNotify = 1;
     public static final int EvtBulletHitNotify = 1;
     public static final int AvatarPromoteGetRewardRsp = 1;
-    public static final int AvatarPropNotify = 1;
     public static final int SetOpenStateRsp = 1;
     public static final int RedeemLegendaryKeyRsp = 1;
     public static final int BattlePassCurScheduleUpdateNotify = 1;
-    public static final int QuestTransmitRsp = 1;
     public static final int NormalUidOpNotify = 1;
     public static final int ShowTemplateReminderNotify = 1;
     public static final int SceneEntityDrownRsp = 1;
     public static final int EntityAuthorityChangeNotify = 1;
-    public static final int PlayerTimeNotify = 1;
-    public static final int QuestUpdateQuestVarNotify = 1;
-    public static final int ServerGlobalValueChangeNotify = 1;
     public static final int GetInvestigationMonsterRsp = 1;
-    public static final int AvatarDieAnimationEndReq = 1;
-    public static final int AvatarDieAnimationEndRsp = 1;
-    public static final int SetNameCardReq = 1;
-    public static final int SetNameCardRsp = 1;
     public static final int SetPlayerNameReq = 1;
     public static final int SetPlayerNameRsp = 1;
     public static final int SetPlayerSignatureReq = 1;
     public static final int SetPlayerSignatureRsp = 1;
-    public static final int PersonalSceneJumpReq = 1;
-    public static final int GetProfilePictureDataReq = 1;
-    public static final int GetProfilePictureDataRsp = 1;
     public static final int ProfilePictureUpdateNotify = 1;
     public static final int SetPlayerHeadImageReq = 1;
     public static final int SetPlayerHeadImageRsp = 1;
-    public static final int GetAllUnlockNameCardReq = 1;
-    public static final int GetAllUnlockNameCardRsp = 1;
     public static final int SetPlayerBirthdayReq = 1;
-    public static final int SetPlayerBirthdayRsp = 1; 
+    public static final int SetPlayerBirthdayRsp = 1;
     public static final int GalleryWillStartCountdownNotify = 1;
-    public static final int GetWidgetSlotRsp = 1;
     public static final int AvatarExpeditionDataNotify = 1;
     public static final int BattlePassChangeRewardPlanReq = 1;
     public static final int BattlePassChangeRewardPlanRsp = 1;
     public static final int BattlePassMissionUpdateNotify = 1;
     public static final int GetParentQuestVideoKeyReq = 1;
-    public static final int GetParentQuestVideoKeyRsp = 1;
-    public static final int VehicleStaminaNotify = 1;
-    public static final int ServerBuffChangeNotify = 1;
-    public static final int VehicleInteractReq = 1;
-    public static final int VehicleInteractRsp = 1;
     public static final int ScenePlayerLocationNotify = 1;
-    public static final int PlayerPropChangeNotify = 1;
-    public static final int PlayerPropChangeReasonNotify = 1;
-    public static final int PlayerPropNotify = 1;
     public static final int GetDailyDungeonEntryInfoRsp = 1;
     public static final int DungeonPreloadMonsterNotify = 1;
     public static final int RegionSearchNotify = 1;
@@ -193,7 +286,6 @@ public class PacketOpcodes {
     public static final int CodexDataUpdateNotify = 1;
     public static final int FishBattleEndRsp = 1;
     public static final int GetUgcDungeonBriefListRsp = 1;
-    public static final int AchievementAllDataNotify = 1;
     public static final int HideAndSeekSelectAvatarRsp = 1;
     public static final int ChapterStateNotify = 1;
     public static final int DataResVersionNotify = 1;
@@ -204,14 +296,9 @@ public class PacketOpcodes {
     public static final int OtherPlayerEnterHomeNotify = 1;
     public static final int SalvagePreventSettleNotify = 1;
     public static final int SceneEntitiesMovesRsp = 1;
-    public static final int GetActivityInfoReq = 1;
-    public static final int GetActivityInfoRsp = 1;
     public static final int ChatChannelUpdateNotify = 1;
     public static final int ChatChannelInfoNotify = 1;
     public static final int PlayerChatNotify = 1;
-    public static final int SetWidgetSlotReq = 1;
-    public static final int SetWidgetSlotRsp = 1;
-    public static final int WidgetSlotChangeNotify = 1;
     public static final int CreateVehicleReq = 1;
     public static final int CreateVehicleRsp = 1;
     public static final int DungeonEntryInfoRsp = 1;
@@ -220,21 +307,14 @@ public class PacketOpcodes {
     public static final int PlayerQuitDungeonReq = 1;
     public static final int SelectWorktopOptionReq = 1;
     public static final int SelectWorktopOptionRsp = 1;
-    public static final int UseItemReq = 1;
-    public static final int UseItemRsp = 1;
-    public static final int EvtAiSyncSkillCdNotify = 1;
     public static final int DungeonChallengeBeginNotify = 1;
     public static final int ChallengeDataNotify = 1;
     public static final int GetCityReputationInfoReq = 1;
     public static final int GetCityReputationInfoRsp = 1;
     public static final int GetTribeReputationInfoReq = 1;
     public static final int GetTribeReputationInfoRsp = 1;
-    public static final int WorktopOptionNotify = 1;
-    public static final int GadgetStateNotify = 1;
     public static final int DungeonChallengeFinishNotify = 1;
     public static final int ToTheMoonEnterSceneRsp = 1;
-    public static final int WorldPlayerDieNotify = 1;
-    public static final int WorldPlayerReviveReq = 1;
     public static final int WorldPlayerReviveRsp = 1;
     public static final int EntityPropNotify = 1;
     public static final int GetFriendShowAvatarInfoRsp = 1;
@@ -246,7 +326,6 @@ public class PacketOpcodes {
     public static final int UpdatePlayerShowAvatarListRsp = 1;
     public static final int UpdatePlayerShowNameCardListReq = 1;
     public static final int UpdatePlayerShowNameCardListRsp = 1;
-    public static final int AvatarFetterDataNotify = 1;
     public static final int WidgetDoBagReq = 1;
     public static final int WidgetDoBagRsp = 1;
     public static final int WidgetGadgetAllDataNotify = 1;
@@ -265,10 +344,7 @@ public class PacketOpcodes {
     public static final int BatchDelMapMarkRsp = 1;
     public static final int HomeModuleSeenReq = 1;
     public static final int HomeModuleSeenRsp = 1;
-    public static final int ItemAddHintNotify = 1;
     public static final int PlayerHomeCompInfoNotify = 1;
-    public static final int GetAreaExplorePointReq = 1;
-    public static final int GetAreaExplorePointRsp = 1;
     public static final int HomeComfortInfoNotify = 1;
     public static final int HomeModuleUnlockNotify = 1;
     public static final int FurnitureCurModuleArrangeCountNotify = 1;
@@ -289,7 +365,6 @@ public class PacketOpcodes {
     public static final int HomeUpdateArrangementInfoReq = 1;
     public static final int GetShopReq = 1;
     public static final int GetShopRsp = 1;
-    public static final int ActivityScheduleInfoNotify = 1;
     public static final int GetActivityScheduleRsp = 1;
     public static final int PersonalLineAllDataReq = 1;
     public static final int CodexDataFullNotify = 1;
@@ -299,7 +374,6 @@ public class PacketOpcodes {
     public static final int UgcDungeonPlayRecordNotify = 1;
     public static final int ViewCodexRsp = 1;
     public static final int SaveUgcRsp = 1;
-    public static final int ActivityInfoNotify = 1;
     public static final int HomeAvatarSummonAllEventNotify = 1;
     public static final int HomeAvatarSummonEventReq = 1;
     public static final int HomeAvatarRewardEventNotify = 1;
@@ -313,16 +387,7 @@ public class PacketOpcodes {
     public static final int HomeAvatarRewardEventGetReq = 1;
     public static final int HomeAvatarRewardEventGetRsp = 1;
     public static final int GetAllMailNotify = 1;
-    public static final int GetGachaInfoReq = 1;
-    public static final int GetGachaInfoRsp = 1;
-    public static final int DoGachaReq = 1;
-    public static final int DoGachaRsp = 1;
-    public static final int AvatarChangeCostumeReq = 1;
     public static final int HomeAvatarCostumeChangeNotify = 1;
-    public static final int AvatarWearFlycloakReq = 1;
-    public static final int AvatarWearFlycloakRsp = 1;
-    public static final int AvatarGainFlycloakNotify = 1;
-    public static final int AvatarChangeTraceEffectReq = 1;
     public static final int PlayerApplyEnterMpResultNotify = 1;
     public static final int GetOnlinePlayerInfoRsp = 1;
     public static final int PlayerApplyEnterMpNotify = 1;
@@ -347,11 +412,9 @@ public class PacketOpcodes {
     public static final int GetActivityShopSheetInfoReq = 1;
     public static final int GetActivityShopSheetInfoRsp = 1;
     public static final int ServerAnnounceNotify = 1;
-    public static final int EvtDestroyGadgetNotify = 1;
     public static final int ChangeWorldToSingleModeRsp = 1;
     public static final int GetWorldMpInfoReq = 1;
     public static final int GetWorldMpInfoRsp = 1;
-    public static final int GetWidgetSlotReq = 1;
     public static final int HomeSaveBlueprintToSlotRsp = 1;
     public static final int HomeGetBlueprintSlotInfoReq = 1;
     public static final int HomeGetBlueprintSlotInfoRsp = 1;
@@ -370,25 +433,17 @@ public class PacketOpcodes {
     public static final int HitTreeNotify = 1;
     public static final int TheaterLobbySceneJumpReq = 1;
     public static final int TheaterLobbySceneJumpRsp = 1;
-    public static final int EvtAvatarLockChairReq = 1;
-    public static final int ObstacleModifyNotify = 1;
     public static final int SetOpenStateReq = 1;
     public static final int GetMapMarkTipsReq = 1;
     public static final int GetMapMarkTipsRsp = 1;
     public static final int GetCityReputationMapInfoReq = 1;
     public static final int GetCityReputationMapInfoRsp = 1;
-    public static final int GetMapAreaReq = 1;
-    public static final int GetMapAreaRsp = 1;
     public static final int GetQuestLackingResourceReq = 1;
     public static final int PlayerOfferingDataNotify = 1;
     public static final int PlayerOfferingReq = 1;
     public static final int PlayerOfferingRsp = 1;
     public static final int OfferingInteractReq = 1;
     public static final int OfferingInteractRsp = 1;
-    public static final int EnterWorldAreaReq = 1;
-    public static final int EnterWorldAreaRsp = 1;
-    public static final int AbilityChangeNotify = 1;
-    public static final int SceneAreaUnlockNotify = 1;
     public static final int UnfreezeGroupLimitNotify = 1;
     public static final int MapAreaChangeNotify = 1;
     public static final int QueryCodexMonsterBeKilledNumReq = 1;
@@ -410,14 +465,12 @@ public class PacketOpcodes {
     public static final int OfferingPariTakeFinishRewardRsp = 1;
     public static final int TakeOfferingLevelRewardReq = 1;
     public static final int TakeOfferingLevelRewardRsp = 1;
-    public static final int ScenePointUnlockNotify = 1;
     public static final int OpenBlossomCircleCampGuideNotify = 1;
     public static final int DungeonPlayerDieNotify = 1;
     public static final int DungeonDieOptionReq = 1;
     public static final int DungeonDieOptionRsp = 1;
     public static final int ChangeTeamNameReq = 1;
     public static final int ChangeTeamNameRsp = 1;
-    public static final int AbilityInvocationsNotify = 1;
     public static final int WorldPlayerRTTNotify = 1;
     public static final int PlayerApplyEnterMpResultRsp = 1;
     public static final int PlayerGetForceQuitBanInfoRsp = 1;
@@ -435,8 +488,6 @@ public class PacketOpcodes {
     public static final int SetEquipLockStateRsp = 1;
     public static final int AvatarUpgradeReq = 1;
     public static final int AvatarUpgradeRsp = 1;
-    public static final int AvatarSkillUpgradeReq = 1;
-    public static final int AvatarSkillUpgradeRsp = 1;
     public static final int AvatarUnlockTalentNotify = 1;
     public static final int HomeAvatarTalkReq = 1;
     public static final int GetQuestLackingResourceRsp = 1;
@@ -445,10 +496,8 @@ public class PacketOpcodes {
     public static final int UnlockTransPointReq = 1;
     public static final int UnlockTransPointRsp = 1;
     public static final int PersonalLineAllDataRsp = 1;
-    public static final int SkipPlayerGameTimeRsp = 1;
     public static final int PlayerEnterChildMapLayerNotify = 1;
     public static final int PlayerEnterMapLayerNotify = 1;
-    public static final int SkipPlayerGameTimeReq = 1;
     public static final int GetOnlinePlayerInfoReq = 1;
     public static final int GetShopmallDataRsp = 1;
     public static final int ServerAnnounceRevokeNotify = 1;
@@ -460,11 +509,8 @@ public class PacketOpcodes {
     public static final int TowerAllDataRsp = 1;
     public static final int GetAllSceneGalleryInfoRsp = 1;
     public static final int FurnitureMakeRsp = 1;
-    public static final int AbilityInvocationFailNotify = 1;
-    public static final int AbilityInvocationFixedNotify = 1;
     public static final int AcceptCityReputationRequestReq = 1;
     public static final int AcceptCityReputationRequestRsp = 1;
-    public static final int AchievementUpdateNotify = 1;
     public static final int ActivityAcceptAllGiveGiftReq = 1;
     public static final int ActivityAcceptAllGiveGiftRsp = 1;
     public static final int ActivityAcceptGiveGiftReq = 1;
@@ -509,7 +555,6 @@ public class PacketOpcodes {
     public static final int AddBlacklistRsp = 1;
     public static final int AddNewUgcDungeonReq = 1;
     public static final int AddNewUgcDungeonRsp = 1;
-    public static final int AddNoGachaAvatarCardNotify = 1;
     public static final int AddRandTaskInfoNotify = 1;
     public static final int AddReunionReportedTypeReq = 1;
     public static final int AddReunionReportedTypeRsp = 1;
@@ -539,14 +584,12 @@ public class PacketOpcodes {
     public static final int AllSeenMonsterNotify = 1;
     public static final int AllShareCDDataNotify = 1;
     public static final int AllWidgetBackgroundActiveStateNotify = 1;
-    public static final int AllWidgetDataNotify = 1;
     public static final int AnchorPointDataNotify = 1;
     public static final int AnchorPointOpReq = 1;
     public static final int AnchorPointOpRsp = 1;
     public static final int AnimatorForceSetAirMoveNotify = 1;
     public static final int AntiAddictNotify = 1;
     public static final int AranaraCollectionDataNotify = 1;
-    public static final int AreaPlayInfoNotify = 1;
     public static final int ArenaChallengeFinishNotify = 1;
     public static final int AskAddFriendRsp = 1;
     public static final int AssociateInferenceWordReq = 1;
@@ -557,7 +600,6 @@ public class PacketOpcodes {
     public static final int AsterMidInfoNotify = 1;
     public static final int AsterMiscInfoNotify = 1;
     public static final int AsterProgressInfoNotify = 1;
-    public static final int AvatarAddNotify = 1;
     public static final int AvatarBuffAddNotify = 1;
     public static final int AvatarBuffDelNotify = 1;
     public static final int AvatarCardChangeReq = 1;
@@ -577,21 +619,13 @@ public class PacketOpcodes {
     public static final int AvatarExpeditionGetRewardRsp = 1;
     public static final int AvatarExpeditionStartReq = 1;
     public static final int AvatarExpeditionStartRsp = 1;
-    public static final int AvatarFetterLevelRewardReq = 1;
-    public static final int AvatarFetterLevelRewardRsp = 1;
-    public static final int AvatarFightPropNotify = 1;
-    public static final int AvatarFightPropUpdateNotify = 1;
     public static final int AvatarFollowRouteNotify = 1;
     public static final int AvatarPromoteGetRewardReq = 1;
     public static final int AvatarPromoteReq = 1;
     public static final int AvatarPromoteRsp = 1;
-    public static final int AvatarPropChangeReasonNotify = 1;
     public static final int AvatarRenameInfoNotify = 1;
     public static final int AvatarSatiationDataNotify = 1;
-    public static final int AvatarSkillChangeNotify = 1;
     public static final int AvatarSkillDepotChangeNotify = 1;
-    public static final int AvatarSkillInfoNotify = 1;
-    public static final int AvatarSkillMaxChargeCountNotify = 1;
     public static final int BackPlayCustomDungeonOfficialReq = 1;
     public static final int BackPlayCustomDungeonOfficialRsp = 1;
     public static final int BackRebornGalleryReq = 1;
@@ -682,8 +716,6 @@ public class PacketOpcodes {
     public static final int ChallengeRecordNotify = 1;
     public static final int ChangeCustomDungeonRoomReq = 1;
     public static final int ChangeCustomDungeonRoomRsp = 1;
-    public static final int ChangeGameTimeReq = 1;
-    public static final int ChangeGameTimeRsp = 1;
     public static final int ChangeMpTeamAvatarReq = 1;
     public static final int ChangeMpTeamAvatarRsp = 1;
     public static final int ChangePublishedUgcDungeonSettingReq = 1;
@@ -747,7 +779,6 @@ public class PacketOpcodes {
     public static final int CityReputationLevelupNotify = 1;
     public static final int ClearRoguelikeCurseNotify = 1;
     public static final int ClientAIStateNotify = 1;
-    public static final int ClientAbilitiesInitFinishCombineNotify = 1;
     public static final int ClientAbilityInitBeginNotify = 1;
     public static final int ClientBulletCreateNotify = 1;
     public static final int ClientCollectorDataNotify = 1;
@@ -756,7 +787,6 @@ public class PacketOpcodes {
     public static final int ClientLockGameTimeNotify = 1;
     public static final int ClientNewMailNotify = 1;
     public static final int ClientPauseNotify = 1;
-    public static final int ClientReconnectNotify = 1;
     public static final int ClientRemoveCombatEndModifierNotify = 1;
     public static final int ClientReportNotify = 1;
     public static final int ClientScriptEventNotify = 1;
@@ -837,7 +867,6 @@ public class PacketOpcodes {
     public static final int DisableRoguelikeTrapNotify = 1;
     public static final int DoRoguelikeDungeonCardGachaReq = 1;
     public static final int DoRoguelikeDungeonCardGachaRsp = 1;
-    public static final int DoSetPlayerBornDataNotify = 1;
     public static final int DraftGuestReplyInviteNotify = 1;
     public static final int DraftGuestReplyInviteReq = 1;
     public static final int DraftGuestReplyInviteRsp = 1;
@@ -984,27 +1013,22 @@ public class PacketOpcodes {
     public static final int EnterUgcDungeonReq = 1;
     public static final int EnterUgcDungeonRsp = 1;
     public static final int EntityAiKillSelfNotify = 1;
-    public static final int EntityAiSyncNotify = 1;
     public static final int EntityConfigHashNotify = 1;
     public static final int EntityForceSyncReq = 1;
     public static final int EntityForceSyncRsp = 1;
     public static final int EntityJumpNotify = 1;
     public static final int EntityMoveRoomNotify = 1;
-    public static final int EntityTagChangeNotify = 1;
     public static final int EquipRoguelikeRuneReq = 1;
     public static final int EquipRoguelikeRuneRsp = 1;
-    public static final int EvtAiSyncCombatThreatInfoNotify = 1;
     public static final int EvtAnimatorParameterNotify = 1;
     public static final int EvtAnimatorStateChangedNotify = 1;
     public static final int EvtAvatarEnterFocusNotify = 1;
     public static final int EvtAvatarExitFocusNotify = 1;
-    public static final int EvtAvatarSitDownNotify = 1;
     public static final int EvtAvatarUpdateFocusNotify = 1;
     public static final int EvtBulletDeactiveNotify = 1;
     public static final int EvtBulletMoveNotify = 1;
     public static final int EvtCostStaminaNotify = 1;
     public static final int EvtDestroyServerGadgetNotify = 1;
-    public static final int EvtEntityRenderersChangedNotify = 1;
     public static final int EvtEntityStartDieEndNotify = 1;
     public static final int EvtFaceToDirNotify = 1;
     public static final int EvtFaceToEntityNotify = 1;
@@ -1598,7 +1622,6 @@ public class PacketOpcodes {
     public static final int LeaveSceneReq = 1;
     public static final int LeaveSceneRsp = 1;
     public static final int LeaveWorldNotify = 1;
-    public static final int LevelTagDataNotify = 1;
     public static final int LevelupCityReq = 1;
     public static final int LevelupCityRsp = 1;
     public static final int LikeCustomDungeonReq = 1;
@@ -1610,7 +1633,6 @@ public class PacketOpcodes {
     public static final int LoadActivityTerrainNotify = 1;
     public static final int LuaEnvironmentEffectNotify = 1;
     public static final int LuaSetOptionNotify = 1;
-    public static final int ServerCondMeetQuestListUpdateNotify = 1;
     public static final int LuminanceStoneChallengeSettleNotify = 1;
     public static final int LunaRiteAreaFinishNotify = 1;
     public static final int LunaRiteGroupBundleRegisterNotify = 1;
@@ -1736,14 +1758,12 @@ public class PacketOpcodes {
     public static final int PacmanRestartDungeonRsp = 1;
     public static final int PacmanSetMapRotateTypeReq = 1;
     public static final int PacmanSetMapRotateTypeRsp = 1;
-    public static final int ParentQuestInferenceDataNotify = 1;
     public static final int PathfindingEnterSceneRsp = 1;
     public static final int PathfindingPingNotify = 1;
     public static final int PerformOperationNotify = 1;
     public static final int PersistentDungeonSwitchAvatarReq = 1;
     public static final int PersistentDungeonSwitchAvatarRsp = 1;
     public static final int PersonalLineNewUnlockNotify = 1;
-    public static final int PersonalSceneJumpRsp = 1;
     public static final int PhotoActivityClientViewReq = 1;
     public static final int PhotoActivityClientViewRsp = 1;
     public static final int PhotoActivityFinishReq = 1;
@@ -1861,22 +1881,10 @@ public class PacketOpcodes {
     public static final int PushTipsChangeNotify = 1;
     public static final int PushTipsReadFinishReq = 1;
     public static final int PushTipsReadFinishRsp = 1;
-    public static final int QuestCreateEntityReq = 1;
-    public static final int QuestCreateEntityRsp = 1;
-    public static final int QuestDelNotify = 1;
-    public static final int QuestDestroyEntityReq = 1;
-    public static final int QuestDestroyEntityRsp = 1;
-    public static final int QuestGlobalVarNotify = 1;
     public static final int QuestRenameAvatarReq = 1;
     public static final int QuestRenameAvatarRsp = 1;
-    public static final int QuestTransmitReq = 1;
-    public static final int QuestUpdateQuestTimeVarNotify = 1;
-    public static final int QuestUpdateQuestVarReq = 1;
-    public static final int QuestUpdateQuestVarRsp = 1;
     public static final int QuickOpenActivityReq = 1;
     public static final int QuickOpenActivityRsp = 1;
-    public static final int QuickUseWidgetReq = 1;
-    public static final int QuickUseWidgetRsp = 1;
     public static final int ReadNicknameAuditReq = 1;
     public static final int ReadNicknameAuditRsp = 1;
     public static final int ReadPrivateChatReq = 1;
@@ -2008,13 +2016,10 @@ public class PacketOpcodes {
     public static final int SceneDestroyEntityRsp = 1;
     public static final int SceneEntitiesMoveCombineNotify = 1;
     public static final int SceneEntitiesMovesReq = 1;
-    public static final int SceneEntityDrownReq = 1;
     public static final int SceneEntityMoveNotify = 1;
     public static final int SceneEntityMoveReq = 1;
     public static final int SceneEntityMoveRsp = 1;
     public static final int SceneEntityUpdateNotify = 1;
-    public static final int SceneForceLockNotify = 1;
-    public static final int SceneForceUnlockNotify = 1;
     public static final int SceneGalleryInfoNotify = 1;
     public static final int SceneGalleryVintageHuntingSettleNotify = 1;
     public static final int SceneKickPlayerNotify = 1;
@@ -2067,7 +2072,6 @@ public class PacketOpcodes {
     public static final int SelectRoguelikeDungeonCardReq = 1;
     public static final int SelectRoguelikeDungeonCardRsp = 1;
     public static final int ServerCombatEndNotify = 1;
-    public static final int ServerDisconnectClientNotify = 1;
     public static final int ServerLogNotify = 1;
     public static final int ServerMessageNotify = 1;
     public static final int ServerTryCancelGeneralMatchNotify = 1;
@@ -2087,13 +2091,9 @@ public class PacketOpcodes {
     public static final int SetIsAutoUnlockSpecificEquipReq = 1;
     public static final int SetIsAutoUnlockSpecificEquipRsp = 1;
     public static final int SetLimitOptimizationNotify = 1;
-    public static final int SetPlayerBornDataReq = 1;
-    public static final int SetPlayerBornDataRsp = 1;
     public static final int SetPlayerPropRsp = 1;
     public static final int SetSceneWeatherAreaReq = 1;
     public static final int SetSceneWeatherAreaRsp = 1;
-    public static final int SetUpLunchBoxWidgetReq = 1;
-    public static final int SetUpLunchBoxWidgetRsp = 1;
     public static final int SetWidgetQuickSlotListReq = 1;
     public static final int SetWidgetQuickSlotListRsp = 1;
     public static final int ShowClientGuideNotify = 1;
diff --git a/src/main/java/emu/grasscutter/net/packet/PacketOpcodesUtils.java b/src/main/java/emu/grasscutter/net/packet/PacketOpcodesUtils.java
index 9e24942e6ee..8b8f62332c5 100644
--- a/src/main/java/emu/grasscutter/net/packet/PacketOpcodesUtils.java
+++ b/src/main/java/emu/grasscutter/net/packet/PacketOpcodesUtils.java
@@ -12,21 +12,21 @@ public class PacketOpcodesUtils {
             Set.of(
                     PacketOpcodes.PingReq,
                     PacketOpcodes.PingRsp,
-                    PacketOpcodes.WorldPlayerRTTNotify
-                    // PacketOpcodes.UnionCmdNotify,
-                    // PacketOpcodes.SceneTimeNotify,
+                    // PacketOpcodes.WorldPlayerRTTNotify,
+                    PacketOpcodes.UnionCmdNotify,
+                    PacketOpcodes.SceneTimeNotify,
                     // PacketOpcodes.QueryPathReq,
                     // PacketOpcodes.QueryPathRsp,
 
                     // Satiation sends these every tick
-                    // PacketOpcodes.PlayerTimeNotify,
-                    // PacketOpcodes.PlayerPropNotify,
+                    PacketOpcodes.PlayerTimeNotify,
+                    PacketOpcodes.PlayerPropNotify,
 
-                    // PacketOpcodes.AbilityInvocationsNotify,
-                    // PacketOpcodes.CombatInvocationsNotify,
-                    // PacketOpcodes.PlayerGameTimeNotify,
-                    // PacketOpcodes.AvatarPropNotify,
-                    // PacketOpcodes.AvatarSatiationDataNotify
+                    PacketOpcodes.AbilityInvocationsNotify,
+                    PacketOpcodes.CombatInvocationsNotify,
+                    PacketOpcodes.PlayerGameTimeNotify,
+                    PacketOpcodes.AvatarPropNotify,
+                    PacketOpcodes.AvatarSatiationDataNotify
             );
     private static final Int2ObjectMap<String> opcodeMap;
 
diff --git a/src/main/java/emu/grasscutter/server/http/dispatch/RegionHandler.java b/src/main/java/emu/grasscutter/server/http/dispatch/RegionHandler.java
index 0db2c89858d..519e53b0965 100644
--- a/src/main/java/emu/grasscutter/server/http/dispatch/RegionHandler.java
+++ b/src/main/java/emu/grasscutter/server/http/dispatch/RegionHandler.java
@@ -2,30 +2,24 @@
 
 import static emu.grasscutter.config.Configuration.*;
 
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
+import com.google.gson.*;
 import com.google.protobuf.ByteString;
-import emu.grasscutter.GameConstants;
-import emu.grasscutter.Grasscutter;
+import emu.grasscutter.*;
 import emu.grasscutter.Grasscutter.ServerRunMode;
 import emu.grasscutter.net.proto.QueryCurrRegionHttpRspOuterClass.QueryCurrRegionHttpRsp;
 import emu.grasscutter.net.proto.QueryRegionListHttpRspOuterClass.QueryRegionListHttpRsp;
 import emu.grasscutter.net.proto.RegionInfoOuterClass.RegionInfo;
 import emu.grasscutter.net.proto.RegionSimpleInfoOuterClass.RegionSimpleInfo;
-import emu.grasscutter.net.proto.ResVersionConfigOuterClass;
 import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
 import emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo;
 import emu.grasscutter.server.event.dispatch.*;
 import emu.grasscutter.server.http.Router;
 import emu.grasscutter.server.http.objects.QueryCurRegionRspJson;
-import emu.grasscutter.utils.Crypto;
-import emu.grasscutter.utils.JsonUtils;
-import emu.grasscutter.utils.Utils;
+import emu.grasscutter.utils.*;
 import io.javalin.Javalin;
 import io.javalin.http.Context;
 import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Pattern;
 import org.slf4j.Logger;
@@ -78,6 +72,8 @@ private void initialize() {
                         Grasscutter.getLogger().error("Region name already in use.");
                         return;
                     }
+
+                    // Create a region identifier.
                     var identifier =
                             RegionSimpleInfo.newBuilder()
                                     .setName(region.Name)
@@ -87,38 +83,14 @@ private void initialize() {
                                     .build();
                     usedNames.add(region.Name);
                     servers.add(identifier);
-                    hotfix.Resource hotfix = new hotfix.Resource();
-                    RegionInfo regionInfo =
+                    
+                    // Create a region info object.
+                    var regionInfo =
                             RegionInfo.newBuilder()
                                     .setGateserverIp(region.Ip)
                                     .setGateserverPort(region.Port)
-                                    .setResourceUrl(hotfix.resourceUrl)
-                                    .setDataUrl(hotfix.dataUrl)
-                                    .setResourceUrlBak(hotfix.resourceUrlBak)
-                                    .setClientDataVersion(hotfix.clientDataVersion)
-                                    .setClientSilenceDataVersion(hotfix.clientSilenceDataVersion)
-                                    .setClientDataMd5(hotfix.clientDataMd5)
-                                    .setClientSilenceDataMd5(hotfix.clientSilenceDataMd5)
-                                    .setResVersionConfig(
-                                            ResVersionConfigOuterClass.ResVersionConfig.newBuilder()
-                                                    .setVersion(hotfix.resVersionConfig.version)
-                                                    .setMd5(hotfix.resVersionConfig.md5)
-                                                    .setReleaseTotalSize(hotfix.resVersionConfig.releaseTotalSize)
-                                                    .setVersionSuffix(hotfix.resVersionConfig.versionSuffix)
-                                                    .setBranch(hotfix.resVersionConfig.branch)
-                                                    .build())
-                                    .setClientVersionSuffix(hotfix.clientVersionSuffix)
-                                    .setClientSilenceVersionSuffix(hotfix.clientSilenceVersionSuffix)
-                                    .setNextResourceUrl(hotfix.nextResourceUrl)
-                                    .setNextResVersionConfig(
-                                            ResVersionConfigOuterClass.ResVersionConfig.newBuilder()
-                                                    .setVersion(hotfix.nextResVersionConfig.version)
-                                                    .setMd5(hotfix.nextResVersionConfig.md5)
-                                                    .setReleaseTotalSize(hotfix.nextResVersionConfig.releaseTotalSize)
-                                                    .setVersionSuffix(hotfix.nextResVersionConfig.versionSuffix)
-                                                    .setBranch(hotfix.nextResVersionConfig.branch))
                                     .build();
-                    QueryCurrRegionHttpRsp updatedQuery =
+                    var updatedQuery =
                             QueryCurrRegionHttpRsp.newBuilder()
                                     .setRegionInfo(regionInfo)
                                     .setClientSecretKey(ByteString.copyFrom(Crypto.DISPATCH_SEED))
diff --git a/src/main/java/emu/grasscutter/server/http/dispatch/hotfix.java b/src/main/java/emu/grasscutter/server/http/dispatch/hotfix.java
deleted file mode 100644
index af67955161d..00000000000
--- a/src/main/java/emu/grasscutter/server/http/dispatch/hotfix.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package emu.grasscutter.server.http.dispatch;
-
-public class hotfix {
-
-    public static class ResVersionConfig {
-        public int version = 26458901;
-        public String md5 =
-                "{\"remoteName\": \"res_versions_external\", \"md5\": \"5f1ba25c0da41520d3d3057b1a32fd29\", \"hash\": \"ed66319e5bf7ec7e\", \"fileSize\": 153828}\r\n{\"remoteName\": \"res_versions_medium\", \"md5\": \"5907101204778f6b2f4bf3d8e4251d42\", \"hash\": \"5369f779aa07021d\", \"fileSize\": 8988}\r\n{\"remoteName\": \"res_versions_streaming\", \"md5\": \"bb50a573cbe1c9a5360578f006016a78\", \"hash\": \"a12089af1c385746\", \"fileSize\": 1833}\r\n{\"remoteName\": \"base_revision\", \"md5\": \"149cad27b543e345df504a496949ec7d\", \"hash\": \"8bb70126e5cd8ba0\", \"fileSize\": 19}\r\n{\"remoteName\": \"patch_node_versions\", \"md5\": \"68df81e80dd3e13bb8b55d4794b9948e\", \"hash\": \"38e59d29a11bdeaf\", \"fileSize\": 1751}\r\n{\"remoteName\": \"audio_diff_versions_26458901-24822834\", \"md5\": \"8d3b4e9a18b8ef5932287fc68106e63e\", \"hash\": \"6d6877dd57e08f73\", \"fileSize\": 36439}";
-        public String releaseTotalSize = "0";
-        public String versionSuffix = "befdda25ff";
-        public String branch = "5.0_live";
-    }
-
-    public static class Resource {
-        public String resourceUrl = "https://autopatchhk.yuanshen.com/client_game_res/5.0_live";
-        public String dataUrl = "https://autopatchhk.yuanshen.com/client_design_data/5.0_live";
-        public String resourceUrlBak = "5.0_live";
-        public int clientDataVersion = 26487341;
-        public int clientSilenceDataVersion = 26368837;
-        public String clientDataMd5 =
-                "{\"remoteName\": \"data_versions\", \"md5\": \"88a0d1f6825ec3b6aaf9ea39a02f78da\", \"hash\": \"a72baf3b5c76f0ac\", \"fileSize\": 68545}\r\n{\"remoteName\": \"data_versions_medium\", \"md5\": \"9429b4e9dd8cbdaf19c41ff05f18b384\", \"hash\": \"a79950c775cf1630\", \"fileSize\": 6662}";
-        public String clientSilenceDataMd5 =
-                "{\"remoteName\": \"data_versions\", \"md5\": \"8ae3d12ddeffa27349ab306ce05ec0b7\", \"hash\": \"ef8cb53633584c7a\", \"fileSize\": 522}";
-        public ResVersionConfig resVersionConfig = new ResVersionConfig();
-        public String clientVersionSuffix = "57a90bbd52";
-        public String clientSilenceVersionSuffix = "0af120923b";
-        public String nextResourceUrl = "https://autopatchhk.yuanshen.com/client_game_res/5.0_live";
-        public ResVersionConfig nextResVersionConfig = new ResVersionConfig();
-    }
-}